po cleaning and good "diff"-ing; help us

[Teika Kazura <teika lavabit com>]

If you know po file or how to take "good" diff to resolve edit
conflicts, please help us.

Old fragments seem to remain in *.po. For example, the top line of the
following seems to be a comment line, which starts with "#", not "#.":

# ../lisp/menus.jl
#. ../themes/mxflat/theme.jl
#. ../themes/gradient/theme.jl
msgid "vertical"

Some lines seem outdated at all:

#, fuzzy
#~ msgid "Arguments given to the `xterm' command."

(What's "#~"?)

Are there easy way to clean them up? I tried Emacs po-mode, but
it doesn't help much.
# po_es, the Spanish, is well maintained and a browse gave me the
# impression that it's clean, but many po's are not.


I'd also like to ask how to take diff to match our aim. Two updates of
a po file is submitted independently, but the based pot files differ.
I'd like to ask Gnome translation team to review them, so we should
take "diff" in a human readable way.

In po files, "msgid" strings seem to be the key, so it'll be good if
items of the same key can be compared side-by-side. (But msgid can be
multi-line.)

Two po files are:
http://l10n.gnome.org/media/upload/sawfish-master-po-zh_CN-18625.merged.po
http://old.nabble.com/Re%3A--README--looking-for-translators-p29558251.html

The former is sent by a gnome translation team of simplified Chinese,
and the latter is by Wang Lei to this list on 25 Aug. Lei, wait a bit
more.

Thanks in advance,
Teika (Teika kazura)
-----------
I criticized Chinese goverment, not the people living in China, nor
Chinese living abroad.