Move translations from branch-0_9

Author: Stephen Kennedy

po/ChangeLog

@@ -1,3 +1,12 @@
+2005-10-26  Stephen Kennedy <stevek@gnome.org>
+	
+	* bg.po, cs.po, de.po, en_CA.po, en_GB.po, es.po,
+	  fr.po, hu.po, it.po, ja.po, ko.po, ne.po, nl.po,
+	  ru.po, sr.po, sr@Latn.po, sv.po, vi.po, zh_CN.po,
+	  zh_TW.po: Move translations from branch-0_9
+
+        * vi.po: Updated Vietnamese translation.
+
 2005-09-01  Clytie Siddall <clytie@riverland.net.au>
 
         * vi.po: Updated Vietnamese translation.

po/GNUmakefile

@@ -1,8 +1,7 @@
 
 .SUFFIXES:
 
-prefix := $(strip $(shell grep "^prefix" ../GNUmakefile | cut -d = -f 2))
-localedir := $(prefix)/share/locale
+include ../INSTALL
 
 PO:=$(wildcard *.po)
 MO:=$(PO:.po=/LC_MESSAGES/meld.mo)

po/Makevars

@@ -6,7 +6,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=N_ngettext:1,2
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

po/POTFILES.in

@@ -1,26 +1,20 @@
-data/meld.desktop.in
+meld.desktop.in
+cvsview.py
 diffutil.py
 dirdiff.py
-fakedbus.py
 filediff.py
-fileprint.py
-glade2/dirdiff.glade
-glade2/filediff.glade
-glade2/meldapp.glade
-glade2/wocoview.glade
-main.py
+gnomeglade.py
 meld
+meldapp.py
 melddoc.py
 misc.py
 paths.py
 prefs.py
-prefsui.py
-sourceview.py
-stock.py
 svnview.py
 task.py
 tree.py
 undo.py
-undoaction.py
-wocotree.py
-wocoview.py
+glade2/cvsview.glade
+glade2/filediff.glade
+glade2/dirdiff.glade
+glade2/meldapp.glade