Mercurial > pidgin.yaz

changeset 11098:df3b825c1b46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 13136] " I was playing with some new versions of gettext and friends at debconf, and found some horrific bugs in the .po files. Here's the general summary of the problems and their fixes: * no.po should be called nb.po - renamed * a Makevars is required for gettext 0.14.4 - added * am.po was missing a plural form - added * da.po had some mismatched C format types - marked as fuzzy * ka.po had "nplurals=INTEGER; plural=EXPRESSION;" instead of the actual plural form - turns out nplural is 1, so deleted the duplicate identical 2nd strings * mk.po had the same problem, added the plural form but nplural is 3 and the translations in the file only have 2 entries, so I marked them as fuzzy * pl.po - fixed mismatched C format type * ru.po - basically the same as mk.po. had a crap plural form. added it and marked the wrongly-numbered plurals as fuzzy * sq.po - added plural form, but file looks correct otherwise (nplurals=2) * tr.po - tweaks to the header, and nplurals=1 so set this and deleted pointless duplicate second forms You need to move no.po to nb.po - it would be silly to include that in the patch obviously. Please apply to HEAD ASAP before it stops applying (obviously if anyone changes the po files the patch will break very easily) but also please leave this item open until me or someone else has looked for and corrected the same issues in oldstable. Regards, Rob" I've been ignoring translations in HEAD as its really rather pointless for now. I plan to continue doing so. but as I was less than clear talking to robot101, i didn't think it was fair to penalize him. committer: Tailor Script <tailor@pidgin.im>
author Luke Schierer <lschiere@pidgin.im>
date Wed, 13 Jul 2005 00:59:44 +0000
parents 97b47ec310df
children 228be32674b5
files configure.ac po/am.po po/da.po po/ka.po po/mk.po po/pt.po po/ru.po po/sq.po po/tr.po
diffstat 9 files changed, 37 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Tue Jul 12 06:56:32 2005 +0000
+++ b/configure.ac	Wed Jul 13 00:59:44 2005 +0000
@@ -33,7 +33,7 @@
 	;;
 esac
 
-ALL_LINGUAS="am bg ca cs da de en_CA en_GB es fi fr he hi hu it ja ka ko lt mk nl no pl pt_BR pt ro ru sk sl sq sr sr@Latn sv vi tr uk zh_CN zh_TW"
+ALL_LINGUAS="am bg ca cs da de en_CA en_GB es fi fr he hi hu it ja ka ko lt mk nb nl pl pt_BR pt ro ru sk sl sq sr sr@Latn sv vi tr uk zh_CN zh_TW"
 AM_GNU_GETTEXT_VERSION(0.10.40)
 AM_GNU_GETTEXT
 
--- a/po/am.po	Tue Jul 12 06:56:32 2005 +0000
+++ b/po/am.po	Wed Jul 13 00:59:44 2005 +0000
@@ -14,6 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n>1\n"
 
 #: plugins/autorecon.c:276
 msgid "Error Message Suppression"
--- a/po/da.po	Tue Jul 12 06:56:32 2005 +0000
+++ b/po/da.po	Wed Jul 13 00:59:44 2005 +0000
@@ -6401,7 +6401,7 @@
 msgstr "%s har sat emnet til: %s"
 
 #: src/protocols/jabber/message.c:177
-#, c-format
+#, c-format, fuzzy
 msgid "The topic is: %s"
 msgstr "Emnet for %s er: %s"
 
@@ -9031,7 +9031,7 @@
 msgstr "<b>Kanal navn:</b> %s"
 
 #: src/protocols/silc/chat.c:120
-#, c-format
+#, c-format, fuzzy
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Bruger antal:</b> %s"
 
--- a/po/ka.po	Tue Jul 12 06:56:32 2005 +0000
+++ b/po/ka.po	Wed Jul 13 00:59:44 2005 +0000
@@ -9,7 +9,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 msgid "%s (%d new/%d total)"
 msgstr "%s (%d ახალი/%d სულ)"
@@ -1473,7 +1473,6 @@
 msgid "day"
 msgid_plural "days"
 msgstr[0] "დღე"
-msgstr[1] "დღე"
 
 msgid "g003: Error opening connection.\n"
 msgstr "კავშირის შეცდომა.\n"
@@ -1481,7 +1480,6 @@
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "საათი"
-msgstr[1] "საათი"
 
 msgid "iChat Timestamp"
 msgstr "iChatის დროის შტამპი "
@@ -1489,7 +1487,6 @@
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "წუთი"
-msgstr[1] "წუთი"
 
 msgid "minutes."
 msgstr "წუთი."
@@ -1500,4 +1497,3 @@
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "წამი"
-msgstr[1] "წამი"
--- a/po/mk.po	Tue Jul 12 06:56:32 2005 +0000
+++ b/po/mk.po	Wed Jul 13 00:59:44 2005 +0000
@@ -14,7 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :    n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: KBabel 1.2\n"
 
 #: plugins/autorecon.c:276
@@ -2741,7 +2742,7 @@
 msgstr "Затвори разговор"
 
 #: src/gtkconv.c:5169 src/gtkconv.c:5198 src/gtkconv.c:5294 src/gtkconv.c:5352
-#, c-format
+#, c-format, fuzzy
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d корисник во собата"
@@ -10616,6 +10617,7 @@
 msgstr[1] "Испрати"
 
 #: src/util.c:2401
+#, fuzzy
 msgid "day"
 msgid_plural "days"
 msgstr[0] "ден"
@@ -10623,6 +10625,7 @@
 msgstr[2] "ден"
 
 #: src/util.c:2409
+#, fuzzy
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
@@ -10630,6 +10633,7 @@
 msgstr[2] "час"
 
 #: src/util.c:2417
+#, fuzzy
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
--- a/po/pt.po	Tue Jul 12 06:56:32 2005 +0000
+++ b/po/pt.po	Wed Jul 13 00:59:44 2005 +0000
@@ -7391,7 +7391,7 @@
 msgstr "Impossível obter detalhes do utilizador %s (%s)."
 
 #: src/protocols/novell/novell.c:736 src/protocols/novell/novell.c:882
-#, c-format
+#, c-format, fuzzy
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Impossível adicionar %s à lista privada (%s)."
 
--- a/po/ru.po	Tue Jul 12 06:56:32 2005 +0000
+++ b/po/ru.po	Wed Jul 13 00:59:44 2005 +0000
@@ -16,7 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: plugins/autorecon.c:276
 msgid "Error Message Suppression"
@@ -1323,7 +1324,7 @@
 msgstr "Чаты"
 
 #: src/blist.c:1352
-#, c-format
+#, c-format, fuzzy
 msgid ""
 "%d buddy from group %s was not removed because its account was not logged "
 "in.  This buddy and the group were not removed.\n"
@@ -2805,7 +2806,7 @@
 msgstr "Закрыть беседу"
 
 #: src/gtkconv.c:5169 src/gtkconv.c:5198 src/gtkconv.c:5294 src/gtkconv.c:5352
-#, c-format
+#, c-format, fuzzy
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d пользователь в комнате"
@@ -3582,7 +3583,7 @@
 
 #. Descriptive label
 #: src/gtknotify.c:218
-#, c-format
+#, c-format, fuzzy
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s имеет %d новое сообщение."
@@ -6965,7 +6966,7 @@
 msgstr ""
 
 #: src/protocols/msn/notification.c:1128
-#, c-format
+#, c-format, fuzzy
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
 "automatically be signed out at that time.  Please finish any conversations "
@@ -7991,14 +7992,14 @@
 msgstr "Отклонить"
 
 #: src/protocols/oscar/oscar.c:3890
-#, c-format
+#, c-format, fuzzy
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] "Вы не получили %hu сообщение от %s, так как оно было некорректно."
 msgstr[1] "Вы не получили %hu сообщений от %s, так как они были некорректны."
 
 #: src/protocols/oscar/oscar.c:3899
-#, c-format
+#, c-format, fuzzy
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
@@ -8007,7 +8008,7 @@
 "Вы не получили %hu сообщений от %s, так как они были слишком велики."
 
 #: src/protocols/oscar/oscar.c:3908
-#, c-format
+#, c-format, fuzzy
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
 msgid_plural ""
@@ -8018,7 +8019,7 @@
 "Вы не получили %hu сообщений от %s, так как был превышен предел оценки."
 
 #: src/protocols/oscar/oscar.c:3917
-#, c-format
+#, c-format, fuzzy
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
@@ -8027,7 +8028,7 @@
 "Вы не получили %hu сообщений от %s, потому что он слишком надоедлив."
 
 #: src/protocols/oscar/oscar.c:3926
-#, c-format
+#, c-format, fuzzy
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
@@ -8036,7 +8037,7 @@
 "Вы не получили %hu сообщений от %s, потому что вы слишком надоедливы."
 
 #: src/protocols/oscar/oscar.c:3935
-#, c-format
+#, c-format, fuzzy
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] "Вы не получили %hu сообщение от %s по неизвестной причине."
@@ -8320,7 +8321,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:5533
-#, c-format
+#, c-format, fuzzy
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  Gaim has truncated "
 "it for you."
@@ -8346,7 +8347,7 @@
 msgstr ""
 
 #: src/protocols/oscar/oscar.c:5615
-#, c-format
+#, c-format, fuzzy
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  Gaim has "
 "truncated it for you."
@@ -10109,7 +10110,7 @@
 msgstr "Gaim - Сохранить как..."
 
 #: src/protocols/toc/toc.c:2100
-#, c-format
+#, c-format, fuzzy
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
@@ -10784,7 +10785,7 @@
 msgstr "%s теперь известен как %s.\n"
 
 #: src/server.c:895
-#, c-format
+#, c-format, fuzzy
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d сообщение)"
@@ -10841,24 +10842,28 @@
 msgstr "Неизвестно."
 
 #: src/util.c:2387
+#, fuzzy
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "секунда"
 msgstr[1] "секунд"
 
 #: src/util.c:2401
+#, fuzzy
 msgid "day"
 msgid_plural "days"
 msgstr[0] "день"
 msgstr[1] "дней"
 
 #: src/util.c:2409
+#, fuzzy
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "час"
 msgstr[1] "часов"
 
 #: src/util.c:2417
+#, fuzzy
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минута"
--- a/po/sq.po	Tue Jul 12 06:56:32 2005 +0000
+++ b/po/sq.po	Wed Jul 13 00:59:44 2005 +0000
@@ -17,6 +17,7 @@
 "X-Generator: KBabel 1.0.2\n"
 "X-Poedit-Language: Albanian\n"
 "X-Poedit-Country: ALBANIA\n"
+"Plural-Form: nplurals=2; plural=n != 1;\n"
 
 #: plugins/autorecon.c:281
 msgid "Error Message Suppression"
--- a/po/tr.po	Tue Jul 12 06:56:32 2005 +0000
+++ b/po/tr.po	Wed Jul 13 00:59:44 2005 +0000
@@ -3,10 +3,9 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Onur Kktun onurcc@gmail.com, 2004.
 #
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+msgid ""
+msgstr ""
+"Project-Id-Version: gaim\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2004-11-28 00:03-0500\n"
 "PO-Revision-Date: 2004-11-30 23:34+MET\n"
@@ -15,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-9\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: plugins/autorecon.c:234
 msgid "Error Message Suppression"
@@ -1362,7 +1361,6 @@
 "%d buddies from group %s were not removed because their accounts were not "
 "logged in.  These buddies and the group were not removed.\n"
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/blist.c:1358
 msgid "Group not removed"
@@ -2717,7 +2715,6 @@
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d kii odada"
-msgstr[1] "%d kii odada"
 
 #: src/gtkconv.c:6079 src/gtkconv.c:6082
 msgid "<main>/Conversation/Close"
@@ -3384,7 +3381,6 @@
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s, %d yeni mesaj."
-msgstr[1] "%s, %d yeni mesaj."
 
 #: src/gtknotify.c:230
 #, c-format
@@ -6736,7 +6732,6 @@
 "After the maintenance has been completed, you will be able to successfully "
 "sign in."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/msn/notification.c:1152
 msgid "Syncing with server"
@@ -7709,14 +7704,12 @@
 msgid "You missed %hu message from %s because it was invalid."
 msgid_plural "You missed %hu messages from %s because they were invalid."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/oscar/oscar.c:3878
 #, c-format
 msgid "You missed %hu message from %s because it was too large."
 msgid_plural "You missed %hu messages from %s because they were too large."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/oscar/oscar.c:3887
 #, c-format
@@ -7725,28 +7718,24 @@
 msgid_plural ""
 "You missed %hu messages from %s because the rate limit has been exceeded."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/oscar/oscar.c:3896
 #, c-format
 msgid "You missed %hu message from %s because he/she was too evil."
 msgid_plural "You missed %hu messages from %s because he/she was too evil."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/oscar/oscar.c:3905
 #, c-format
 msgid "You missed %hu message from %s because you are too evil."
 msgid_plural "You missed %hu messages from %s because you are too evil."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/oscar/oscar.c:3914
 #, c-format
 msgid "You missed %hu message from %s for an unknown reason."
 msgid_plural "You missed %hu messages from %s for an unknown reason."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/oscar/oscar.c:3968 src/protocols/oscar/oscar.c:4200
 #, c-format
@@ -8012,7 +8001,6 @@
 "The maximum profile length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/oscar/oscar.c:5511
 msgid "Profile too long."
@@ -8042,7 +8030,6 @@
 "The maximum away message length of %d bytes has been exceeded.  Gaim has "
 "truncated it for you."
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/oscar/oscar.c:5591
 msgid "Away message too long."
@@ -9742,7 +9729,6 @@
 msgid "%s requests %s to accept %d file: %s (%.2f %s)%s%s"
 msgid_plural "%s requests %s to accept %d files: %s (%.2f %s)%s%s"
 msgstr[0] ""
-msgstr[1] ""
 
 #: src/protocols/toc/toc.c:2100
 #, c-format
@@ -10397,7 +10383,6 @@
 msgid "(%d message)"
 msgid_plural "(%d messages)"
 msgstr[0] "(%d mesaj)"
-msgstr[1] "(%d mesaj)"
 
 #: src/server.c:958
 msgid "(1 message)"
@@ -10513,25 +10498,21 @@
 msgid "second"
 msgid_plural "seconds"
 msgstr[0] "saniye"
-msgstr[1] "saniye"
 
 #: src/util.c:2401
 msgid "day"
 msgid_plural "days"
 msgstr[0] "gn"
-msgstr[1] "gn"
 
 #: src/util.c:2409
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "saat"
-msgstr[1] "saat"
 
 #: src/util.c:2417
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "dakika"
-msgstr[1] "dakika"
 
 #: src/util.c:2834
 msgid "g003: Error opening connection.\n"