From 17c265bdd7ae09e752e1182e2c8739ac942ef638 Mon Sep 17 00:00:00 2001 From: str4d Date: Wed, 5 Mar 2014 02:43:53 +0000 Subject: [PATCH] Strip out commented-out translations after update This is necessary because: - Transifex runs 'msgfmt -c' on any uploaded .po file - pybabel adds a spurious '#~ msgid ""' to the end of some files - 'msgfmt -c' ignores that this is commented out, and treats it as a syntax error (clashing with the top file definition) --- i2p2www/translations/de/LC_MESSAGES/about.po | 12 ------------ i2p2www/translations/de/LC_MESSAGES/blog.po | 3 --- i2p2www/translations/de/LC_MESSAGES/docs.po | 3 --- i2p2www/translations/de/LC_MESSAGES/get-involved.po | 3 --- i2p2www/translations/de/LC_MESSAGES/priority.po | 6 ------ i2p2www/translations/es/LC_MESSAGES/priority.po | 3 --- i2p2www/translations/fr/LC_MESSAGES/docs.po | 3 --- i2p2www/translations/fr/LC_MESSAGES/priority.po | 3 --- i2p2www/translations/he/LC_MESSAGES/about.po | 12 ------------ i2p2www/translations/he/LC_MESSAGES/blog.po | 3 --- i2p2www/translations/he/LC_MESSAGES/docs.po | 12 ------------ i2p2www/translations/he/LC_MESSAGES/get-involved.po | 3 --- i2p2www/translations/he/LC_MESSAGES/priority.po | 6 ------ i2p2www/translations/it/LC_MESSAGES/priority.po | 6 ------ i2p2www/translations/ja/LC_MESSAGES/priority.po | 3 --- i2p2www/translations/ko/LC_MESSAGES/priority.po | 3 --- i2p2www/translations/mg/LC_MESSAGES/priority.po | 3 --- i2p2www/translations/pl/LC_MESSAGES/priority.po | 9 --------- i2p2www/translations/pt/LC_MESSAGES/priority.po | 6 ------ i2p2www/translations/pt_BR/LC_MESSAGES/docs.po | 3 --- i2p2www/translations/pt_BR/LC_MESSAGES/priority.po | 3 --- i2p2www/translations/ro/LC_MESSAGES/priority.po | 6 ------ i2p2www/translations/ru/LC_MESSAGES/docs.po | 3 --- i2p2www/translations/ru/LC_MESSAGES/priority.po | 6 ------ i2p2www/translations/sv/LC_MESSAGES/docs.po | 12 ------------ i2p2www/translations/sv/LC_MESSAGES/get-involved.po | 3 --- i2p2www/translations/sv/LC_MESSAGES/priority.po | 6 ------ i2p2www/translations/zh/LC_MESSAGES/priority.po | 6 ------ update-existing-po.sh | 6 ++++++ 29 files changed, 6 insertions(+), 150 deletions(-) diff --git a/i2p2www/translations/de/LC_MESSAGES/about.po b/i2p2www/translations/de/LC_MESSAGES/about.po index 2c6ae796..42513393 100644 --- a/i2p2www/translations/de/LC_MESSAGES/about.po +++ b/i2p2www/translations/de/LC_MESSAGES/about.po @@ -2211,15 +2211,3 @@ msgid "" "Future Performance Improvements." msgstr "" -#~ msgid "Native IPv6 I2P" -#~ msgstr "" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "Mirrors admin" -#~ msgstr "" - -#~ msgid "manage the project mirrors" -#~ msgstr "" - diff --git a/i2p2www/translations/de/LC_MESSAGES/blog.po b/i2p2www/translations/de/LC_MESSAGES/blog.po index bee16016..a68b0177 100644 --- a/i2p2www/translations/de/LC_MESSAGES/blog.po +++ b/i2p2www/translations/de/LC_MESSAGES/blog.po @@ -1861,6 +1861,3 @@ msgstr "" msgid "`release signing key`" msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/de/LC_MESSAGES/docs.po b/i2p2www/translations/de/LC_MESSAGES/docs.po index 93ffd8bc..2e66f2b0 100644 --- a/i2p2www/translations/de/LC_MESSAGES/docs.po +++ b/i2p2www/translations/de/LC_MESSAGES/docs.po @@ -17143,6 +17143,3 @@ msgid "" "conclusion is not supported by the paper." msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/de/LC_MESSAGES/get-involved.po b/i2p2www/translations/de/LC_MESSAGES/get-involved.po index 10a4d6cd..4665c456 100644 --- a/i2p2www/translations/de/LC_MESSAGES/get-involved.po +++ b/i2p2www/translations/de/LC_MESSAGES/get-involved.po @@ -4092,6 +4092,3 @@ msgid "" "href=\"http://%(zzz)s/forums/14\">translation forum on %(zzz)s." msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/de/LC_MESSAGES/priority.po b/i2p2www/translations/de/LC_MESSAGES/priority.po index 73fd3192..cbec94c0 100644 --- a/i2p2www/translations/de/LC_MESSAGES/priority.po +++ b/i2p2www/translations/de/LC_MESSAGES/priority.po @@ -3182,9 +3182,3 @@ msgstr "Foren, Newsseiten, anderes" msgid "Very Old Stuff" msgstr "Sehr altes Material" -#~ msgid "" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "Hilfskanal" - diff --git a/i2p2www/translations/es/LC_MESSAGES/priority.po b/i2p2www/translations/es/LC_MESSAGES/priority.po index e7dc1c12..3eff2053 100644 --- a/i2p2www/translations/es/LC_MESSAGES/priority.po +++ b/i2p2www/translations/es/LC_MESSAGES/priority.po @@ -3394,6 +3394,3 @@ msgstr "Anuncios, noticias y otros" msgid "Very Old Stuff" msgstr "Cosas muy antiguas" -#~ msgid "Help channel" -#~ msgstr "Canal de ayuda" - diff --git a/i2p2www/translations/fr/LC_MESSAGES/docs.po b/i2p2www/translations/fr/LC_MESSAGES/docs.po index d0c7ce57..4754ee0e 100644 --- a/i2p2www/translations/fr/LC_MESSAGES/docs.po +++ b/i2p2www/translations/fr/LC_MESSAGES/docs.po @@ -18014,6 +18014,3 @@ msgid "" "conclusion is not supported by the paper." msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/fr/LC_MESSAGES/priority.po b/i2p2www/translations/fr/LC_MESSAGES/priority.po index bc8d756e..fcc1ed65 100644 --- a/i2p2www/translations/fr/LC_MESSAGES/priority.po +++ b/i2p2www/translations/fr/LC_MESSAGES/priority.po @@ -3531,6 +3531,3 @@ msgstr "Forums, actualités sur ce site web, autres" msgid "Very Old Stuff" msgstr "Très vieilles choses" -#~ msgid "Help channel" -#~ msgstr "Canal d'aide" - diff --git a/i2p2www/translations/he/LC_MESSAGES/about.po b/i2p2www/translations/he/LC_MESSAGES/about.po index ee2aef05..7a2e358d 100644 --- a/i2p2www/translations/he/LC_MESSAGES/about.po +++ b/i2p2www/translations/he/LC_MESSAGES/about.po @@ -2207,15 +2207,3 @@ msgid "" "Future Performance Improvements." msgstr "" -#~ msgid "Native IPv6 I2P" -#~ msgstr "" - -#~ msgid "" -#~ msgstr "" - -#~ msgid "Mirrors admin" -#~ msgstr "" - -#~ msgid "manage the project mirrors" -#~ msgstr "" - diff --git a/i2p2www/translations/he/LC_MESSAGES/blog.po b/i2p2www/translations/he/LC_MESSAGES/blog.po index 42595641..44f234e9 100644 --- a/i2p2www/translations/he/LC_MESSAGES/blog.po +++ b/i2p2www/translations/he/LC_MESSAGES/blog.po @@ -1837,6 +1837,3 @@ msgstr "" msgid "`release signing key`" msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/he/LC_MESSAGES/docs.po b/i2p2www/translations/he/LC_MESSAGES/docs.po index 492980ef..626fb97a 100644 --- a/i2p2www/translations/he/LC_MESSAGES/docs.po +++ b/i2p2www/translations/he/LC_MESSAGES/docs.po @@ -16947,15 +16947,3 @@ msgid "" "conclusion is not supported by the paper." msgstr "" -#~ msgid "" -#~ msgstr "" - -#~ msgid "This format is obsolte as of release 0.9.9." -#~ msgstr "" - -#~ msgid "February 2013" -#~ msgstr "" - -#~ msgid "Review and possibly disable 'check connection'" -#~ msgstr "" - diff --git a/i2p2www/translations/he/LC_MESSAGES/get-involved.po b/i2p2www/translations/he/LC_MESSAGES/get-involved.po index 71dd67e1..160f6998 100644 --- a/i2p2www/translations/he/LC_MESSAGES/get-involved.po +++ b/i2p2www/translations/he/LC_MESSAGES/get-involved.po @@ -4088,6 +4088,3 @@ msgid "" "href=\"http://%(zzz)s/forums/14\">translation forum on %(zzz)s." msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/he/LC_MESSAGES/priority.po b/i2p2www/translations/he/LC_MESSAGES/priority.po index 2148dba9..de7c74a8 100644 --- a/i2p2www/translations/he/LC_MESSAGES/priority.po +++ b/i2p2www/translations/he/LC_MESSAGES/priority.po @@ -2794,9 +2794,3 @@ msgstr "" msgid "Very Old Stuff" msgstr "" -#~ msgid "" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "ערוץ עזרה" - diff --git a/i2p2www/translations/it/LC_MESSAGES/priority.po b/i2p2www/translations/it/LC_MESSAGES/priority.po index 10c16546..332980fe 100644 --- a/i2p2www/translations/it/LC_MESSAGES/priority.po +++ b/i2p2www/translations/it/LC_MESSAGES/priority.po @@ -3504,9 +3504,3 @@ msgstr "Bacheche, siti di notizie, altri" msgid "Very Old Stuff" msgstr "Materiale molto vecchio" -#~ msgid "" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "Canale di aiuto" - diff --git a/i2p2www/translations/ja/LC_MESSAGES/priority.po b/i2p2www/translations/ja/LC_MESSAGES/priority.po index 156ecaec..6428562c 100644 --- a/i2p2www/translations/ja/LC_MESSAGES/priority.po +++ b/i2p2www/translations/ja/LC_MESSAGES/priority.po @@ -3076,6 +3076,3 @@ msgstr "掲示板、ニュースサイト他" msgid "Very Old Stuff" msgstr "かなり昔のもの" -#~ msgid "Help channel" -#~ msgstr "チャンネルのヘルプ" - diff --git a/i2p2www/translations/ko/LC_MESSAGES/priority.po b/i2p2www/translations/ko/LC_MESSAGES/priority.po index 0e5d1883..9e0d5136 100644 --- a/i2p2www/translations/ko/LC_MESSAGES/priority.po +++ b/i2p2www/translations/ko/LC_MESSAGES/priority.po @@ -2644,6 +2644,3 @@ msgstr "" msgid "Very Old Stuff" msgstr "" -#~ msgid "Help channel" -#~ msgstr "지원 채널" - diff --git a/i2p2www/translations/mg/LC_MESSAGES/priority.po b/i2p2www/translations/mg/LC_MESSAGES/priority.po index da86aa93..5a9717c2 100644 --- a/i2p2www/translations/mg/LC_MESSAGES/priority.po +++ b/i2p2www/translations/mg/LC_MESSAGES/priority.po @@ -3458,6 +3458,3 @@ msgstr "Solaitra, toeram-baovao, ny hafa rehetra" msgid "Very Old Stuff" msgstr "Rakitry ny ela" -#~ msgid "Help channel" -#~ msgstr "Toerana firesahana sy fifanampiana" - diff --git a/i2p2www/translations/pl/LC_MESSAGES/priority.po b/i2p2www/translations/pl/LC_MESSAGES/priority.po index 5712454f..1321c484 100644 --- a/i2p2www/translations/pl/LC_MESSAGES/priority.po +++ b/i2p2www/translations/pl/LC_MESSAGES/priority.po @@ -2667,12 +2667,3 @@ msgstr "" msgid "Very Old Stuff" msgstr "" -#~ msgid "" -#~ msgstr "" - -#~ msgid "General i2p discussion" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "Kanał pomocy" - diff --git a/i2p2www/translations/pt/LC_MESSAGES/priority.po b/i2p2www/translations/pt/LC_MESSAGES/priority.po index 08cc6079..1b50718c 100644 --- a/i2p2www/translations/pt/LC_MESSAGES/priority.po +++ b/i2p2www/translations/pt/LC_MESSAGES/priority.po @@ -3392,9 +3392,3 @@ msgstr "Conselhos, portal de notícias, outros" msgid "Very Old Stuff" msgstr "Coisas Muito Antigas" -#~ msgid "" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "Canal de ajuda" - diff --git a/i2p2www/translations/pt_BR/LC_MESSAGES/docs.po b/i2p2www/translations/pt_BR/LC_MESSAGES/docs.po index a353f0db..0ba331fd 100644 --- a/i2p2www/translations/pt_BR/LC_MESSAGES/docs.po +++ b/i2p2www/translations/pt_BR/LC_MESSAGES/docs.po @@ -16976,6 +16976,3 @@ msgid "" "conclusion is not supported by the paper." msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/pt_BR/LC_MESSAGES/priority.po b/i2p2www/translations/pt_BR/LC_MESSAGES/priority.po index 3018935d..cec4b53d 100644 --- a/i2p2www/translations/pt_BR/LC_MESSAGES/priority.po +++ b/i2p2www/translations/pt_BR/LC_MESSAGES/priority.po @@ -2755,6 +2755,3 @@ msgstr "" msgid "Very Old Stuff" msgstr "Velharias" -#~ msgid "Help channel" -#~ msgstr "Canal de ajuda" - diff --git a/i2p2www/translations/ro/LC_MESSAGES/priority.po b/i2p2www/translations/ro/LC_MESSAGES/priority.po index d15cd784..c00a7c09 100644 --- a/i2p2www/translations/ro/LC_MESSAGES/priority.po +++ b/i2p2www/translations/ro/LC_MESSAGES/priority.po @@ -3349,9 +3349,3 @@ msgstr "Panouri, saituri cu noutati, altele" msgid "Very Old Stuff" msgstr "Chestii foarte vechi" -#~ msgid "" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "Canal pentru ajutor" - diff --git a/i2p2www/translations/ru/LC_MESSAGES/docs.po b/i2p2www/translations/ru/LC_MESSAGES/docs.po index a2563553..02572e99 100644 --- a/i2p2www/translations/ru/LC_MESSAGES/docs.po +++ b/i2p2www/translations/ru/LC_MESSAGES/docs.po @@ -17538,6 +17538,3 @@ msgid "" "conclusion is not supported by the paper." msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/ru/LC_MESSAGES/priority.po b/i2p2www/translations/ru/LC_MESSAGES/priority.po index 779943fe..02e00d53 100644 --- a/i2p2www/translations/ru/LC_MESSAGES/priority.po +++ b/i2p2www/translations/ru/LC_MESSAGES/priority.po @@ -3420,9 +3420,3 @@ msgstr "Доски, новостные сайты, другое" msgid "Very Old Stuff" msgstr "Очень старое добро" -#~ msgid "" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "Канал помощи" - diff --git a/i2p2www/translations/sv/LC_MESSAGES/docs.po b/i2p2www/translations/sv/LC_MESSAGES/docs.po index 0b5fb8b5..8cea2fbf 100644 --- a/i2p2www/translations/sv/LC_MESSAGES/docs.po +++ b/i2p2www/translations/sv/LC_MESSAGES/docs.po @@ -16949,15 +16949,3 @@ msgid "" "conclusion is not supported by the paper." msgstr "" -#~ msgid "" -#~ msgstr "" - -#~ msgid "This format is obsolte as of release 0.9.9." -#~ msgstr "" - -#~ msgid "February 2013" -#~ msgstr "" - -#~ msgid "Review and possibly disable 'check connection'" -#~ msgstr "" - diff --git a/i2p2www/translations/sv/LC_MESSAGES/get-involved.po b/i2p2www/translations/sv/LC_MESSAGES/get-involved.po index 9a462a84..6d265b3e 100644 --- a/i2p2www/translations/sv/LC_MESSAGES/get-involved.po +++ b/i2p2www/translations/sv/LC_MESSAGES/get-involved.po @@ -4090,6 +4090,3 @@ msgid "" "href=\"http://%(zzz)s/forums/14\">translation forum on %(zzz)s." msgstr "" -#~ msgid "" -#~ msgstr "" - diff --git a/i2p2www/translations/sv/LC_MESSAGES/priority.po b/i2p2www/translations/sv/LC_MESSAGES/priority.po index e05c68b6..d63bb4b1 100644 --- a/i2p2www/translations/sv/LC_MESSAGES/priority.po +++ b/i2p2www/translations/sv/LC_MESSAGES/priority.po @@ -3394,9 +3394,3 @@ msgstr "Anslagstavlor, nyhetssida, annat" msgid "Very Old Stuff" msgstr "Väldigt Gamla Saker" -#~ msgid "" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "Hjälpkanal" - diff --git a/i2p2www/translations/zh/LC_MESSAGES/priority.po b/i2p2www/translations/zh/LC_MESSAGES/priority.po index 33973571..202c0ce2 100644 --- a/i2p2www/translations/zh/LC_MESSAGES/priority.po +++ b/i2p2www/translations/zh/LC_MESSAGES/priority.po @@ -2875,9 +2875,3 @@ msgstr "论坛，新闻站，其它" msgid "Very Old Stuff" msgstr "非常老的东西" -#~ msgid "" -#~ msgstr "" - -#~ msgid "Help channel" -#~ msgstr "帮助频道" - diff --git a/update-existing-po.sh b/update-existing-po.sh index 4ddedef2..decca88d 100755 --- a/update-existing-po.sh +++ b/update-existing-po.sh @@ -5,8 +5,14 @@ export TZ=UTC if [ $# -ge 1 ] then $PYBABEL update -D $1 -i $POTDIR/$1.pot -d $TRANSDIR + for file in $(ls i2p2www/translations/*/LC_MESSAGES/$1.po); do + sed -i '/^#~/,+2d' $file + done else for domain in $(ls $BABELCFG); do $PYBABEL update -D $domain -i $POTDIR/$domain.pot -d $TRANSDIR + for file in $(ls i2p2www/translations/*/LC_MESSAGES/$domain.po); do + sed -i '/^#~/,+2d' $file + done done fi