Merge branch 'master' into next

packaging/gentoo/current.ebuild

@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 #note: fpdb has only been tested on x86 and amd64, but should work on other arches, too
 
-IUSE="graph mysql postgres sqlite linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_pl linguas_ru"
+IUSE="graph mysql postgres sqlite linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_pl linguas_pt linguas_ru linguas_zh"
 RDEPEND="
 	mysql? ( virtual/mysql
 		dev-python/mysql-python )
@@ -63,10 +63,18 @@ src_install() {
 		msgfmt pyfpdb/locale/fpdb-pl_PL.po -o pyfpdb/locale/pl.mo || die "failed to create Polish mo file"
 	fi
 
+	if use linguas_pt; then
+		msgfmt pyfpdb/locale/fpdb-pt_BR.po -o pyfpdb/locale/pt.mo || die "failed to create Portugese mo file"
+	fi
+
 	if use linguas_ru; then
 		msgfmt pyfpdb/locale/fpdb-ru_RU.po -o pyfpdb/locale/ru.mo || die "failed to create Russian mo file"
 	fi
 
+	if use linguas_zh; then
+		msgfmt pyfpdb/locale/fpdb-zh_CN.po -o pyfpdb/locale/zh.mo || die "failed to create Chinese mo file"
+	fi
+
 	domo pyfpdb/locale/*.mo || die "failed to install mo files"
 
 	doins readme.txt || die "failed to install readme.txt file"

packaging/gentoo/fpdb-9999.ebuild

@@ -17,7 +17,7 @@ SLOT="0"
 KEYWORDS=""
 #note: fpdb has only been tested on x86 and amd64, but should work on other arches, too
 
-IUSE="graph mysql postgres sqlite linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_pl linguas_ru"
+IUSE="graph mysql postgres sqlite linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_pl linguas_pt linguas_ru linguas_zh"
 RDEPEND="
 	mysql? ( virtual/mysql
 		dev-python/mysql-python )
@@ -66,10 +66,18 @@ src_install() {
 		msgfmt pyfpdb/locale/fpdb-pl_PL.po -o pyfpdb/locale/pl.mo || die "failed to create Polish mo file"
 	fi
 
+	if use linguas_pt; then
+		msgfmt pyfpdb/locale/fpdb-pt_BR.po -o pyfpdb/locale/pt.mo || die "failed to create Portugese mo file"
+	fi
+
 	if use linguas_ru; then
 		msgfmt pyfpdb/locale/fpdb-ru_RU.po -o pyfpdb/locale/ru.mo || die "failed to create Russian mo file"
 	fi
 
+	if use linguas_zh; then
+		msgfmt pyfpdb/locale/fpdb-zh_CN.po -o pyfpdb/locale/zh.mo || die "failed to create Chinese mo file"
+	fi
+
 	domo pyfpdb/locale/*.mo || die "failed to install mo files"
 
 	doins readme.txt || die "failed to install readme.txt file"

pyfpdb/locale/fpdb-en_GB.pot

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2011-04-05 11:31+CEST\n"
+"POT-Creation-Date: 2011-04-06 23:56+CEST\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

pyfpdb/locale/localise.sh

@@ -5,29 +5,42 @@ echo "creating template po file"
 python /usr/share/doc/python-2.*/examples/Tools/i18n/pygettext.py --output-dir=locale --default-domain=fpdb --output=fpdb-en_GB.pot *.py *.pyw
 
 echo "merging template with existing translations"
+#msgmerge --update locale/fpdb-.po locale/fpdb-en_GB.pot
 msgmerge --update locale/fpdb-de_DE.po locale/fpdb-en_GB.pot
 msgmerge --update locale/fpdb-es_ES.po locale/fpdb-en_GB.pot
 msgmerge --update locale/fpdb-fr_FR.po locale/fpdb-en_GB.pot
 msgmerge --update locale/fpdb-hu_HU.po locale/fpdb-en_GB.pot
 msgmerge --update locale/fpdb-it_IT.po locale/fpdb-en_GB.pot
 msgmerge --update locale/fpdb-pl_PL.po locale/fpdb-en_GB.pot
+msgmerge --update locale/fpdb-pt_BR.po locale/fpdb-en_GB.pot
 msgmerge --update locale/fpdb-ru_RU.po locale/fpdb-en_GB.pot
+msgmerge --update locale/fpdb-zh_CN.po locale/fpdb-en_GB.pot
 
+echo "checking translated files"
+#msgfmt -c --check-accelerators locale/fpdb-.po
 msgfmt -c --check-accelerators locale/fpdb-de_DE.po
 msgfmt -c --check-accelerators locale/fpdb-es_ES.po
 msgfmt -c --check-accelerators locale/fpdb-fr_FR.po
 msgfmt -c --check-accelerators locale/fpdb-hu_HU.po
 msgfmt -c --check-accelerators locale/fpdb-it_IT.po
 msgfmt -c --check-accelerators locale/fpdb-pl_PL.po
+msgfmt -c --check-accelerators locale/fpdb-pt_BR.po
 msgfmt -c --check-accelerators locale/fpdb-ru_RU.po
+msgfmt -c --check-accelerators locale/fpdb-zh_CN.po
+
+echo "check the following output for misplaced \\\\"
+grep "[\\][\\]" locale/*.po
 
 echo "compiling mo files"
+#python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale//LC_MESSAGES/fpdb.mo locale/fpdb-.po
 python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/de/LC_MESSAGES/fpdb.mo locale/fpdb-de_DE.po
 python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/es/LC_MESSAGES/fpdb.mo locale/fpdb-es_ES.po
 python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/fr/LC_MESSAGES/fpdb.mo locale/fpdb-fr_FR.po
 python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/hu/LC_MESSAGES/fpdb.mo locale/fpdb-hu_HU.po
 python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/it/LC_MESSAGES/fpdb.mo locale/fpdb-it_IT.po
 python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/pl/LC_MESSAGES/fpdb.mo locale/fpdb-pl_PL.po
+python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/pt/LC_MESSAGES/fpdb.mo locale/fpdb-pt_BR.po
 python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/ru/LC_MESSAGES/fpdb.mo locale/fpdb-ru_RU.po
+python /usr/share/doc/python-2.*/examples/Tools/i18n/msgfmt.py --output-file=locale/zh/LC_MESSAGES/fpdb.mo locale/fpdb-zh_CN.po
 
 pocount locale/*.po