From c2300c40956464a9fa4b89fa75c2b0dc0f9da0a0 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Tue, 15 Sep 2009 16:36:24 +0200 Subject: [PATCH] Fix plural form in IRC message with list of nicks on channel (bug #27436) --- po/cs.po | 56 +++++++++++++++++++++++----------- po/de.po | 51 ++++++++++++++++++++----------- po/es.po | 51 ++++++++++++++++++++----------- po/fr.po | 48 +++++++++++++++++------------ po/hu.po | 51 ++++++++++++++++++++----------- po/pl.po | 56 +++++++++++++++++++++++----------- po/ru.po | 51 ++++++++++++++++++++----------- po/weechat.pot | 34 ++++++++++----------- src/plugins/irc/irc-protocol.c | 10 +++--- 9 files changed, 258 insertions(+), 150 deletions(-) diff --git a/po/cs.po b/po/cs.po index ae95b3233..e294d59ea 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-15 14:36+0200\n" +"POT-Creation-Date: 2009-09-15 16:27+0200\n" "PO-Revision-Date: 2009-09-14 10:56+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -4292,32 +4292,40 @@ msgid "" msgstr "" "%sKanál %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)" -msgid "nicks" -msgstr "přezdívky" - +#, fuzzy msgid "nick" -msgstr "přezdívka" - -msgid "ops" -msgstr "ops" +msgid_plural "nicks" +msgstr[0] "přezdívka" +msgstr[1] "přezdívka" +msgstr[2] "přezdívka" +#, fuzzy msgid "op" -msgstr "op" - -msgid "halfops" -msgstr "částeční-ops" +msgid_plural "ops" +msgstr[0] "op" +msgstr[1] "op" +msgstr[2] "op" +#, fuzzy msgid "halfop" -msgstr "částečný-op" - -msgid "voices" -msgstr "voices" +msgid_plural "halfops" +msgstr[0] "částečný-op" +msgstr[1] "částečný-op" +msgstr[2] "částečný-op" +#, fuzzy msgid "voice" -msgstr "voice" +msgid_plural "voices" +msgstr[0] "voice" +msgstr[1] "voice" +msgstr[2] "voice" +#, fuzzy msgid "normal" -msgstr "normální" +msgid_plural "normals" +msgstr[0] "normální" +msgstr[1] "normální" +msgstr[2] "normální" #, c-format msgid "%s%s[%s%s%s] %s%s%s banned by %s%s %s(%s%s%s)%s on %s" @@ -5621,6 +5629,18 @@ msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: vypršel časový limit \"%s\" pro %s" +#~ msgid "nicks" +#~ msgstr "přezdívky" + +#~ msgid "ops" +#~ msgstr "ops" + +#~ msgid "halfops" +#~ msgstr "částeční-ops" + +#~ msgid "voices" +#~ msgstr "voices" + #~ msgid "%sCTCP %sVERSION%s reply from %s%s%s: %s" #~ msgstr "%sCTCP %sVERSION%s odpověď od %s%s%s: %s" diff --git a/po/de.po b/po/de.po index 1d127afd6..5c39e7f2a 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-15 14:36+0200\n" +"POT-Creation-Date: 2009-09-15 16:27+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -4120,32 +4120,35 @@ msgid "" msgstr "" "%sChannel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)" -msgid "nicks" -msgstr "Nicks" - +#, fuzzy msgid "nick" -msgstr "Nick" - -msgid "ops" -msgstr "Operatoren" +msgid_plural "nicks" +msgstr[0] "Nick" +msgstr[1] "Nick" +#, fuzzy msgid "op" -msgstr "Operator" - -msgid "halfops" -msgstr "Halb-Operatoren" +msgid_plural "ops" +msgstr[0] "Operator" +msgstr[1] "Operator" +#, fuzzy msgid "halfop" -msgstr "Halb-Operator" - -msgid "voices" -msgstr "Gevoicete" +msgid_plural "halfops" +msgstr[0] "Halb-Operator" +msgstr[1] "Halb-Operator" +#, fuzzy msgid "voice" -msgstr "Gevoiceter" +msgid_plural "voices" +msgstr[0] "Gevoiceter" +msgstr[1] "Gevoiceter" +#, fuzzy msgid "normal" -msgstr "normal" +msgid_plural "normals" +msgstr[0] "normal" +msgstr[1] "normal" #, c-format msgid "%s%s[%s%s%s] %s%s%s banned by %s%s %s(%s%s%s)%s on %s" @@ -5445,6 +5448,18 @@ msgstr "%s DCC: kann die 'nonblock'-Option für den Socket nicht festlegen\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s fehlende Argumente für die \"--dir\"-Option\n" +#~ msgid "nicks" +#~ msgstr "Nicks" + +#~ msgid "ops" +#~ msgstr "Operatoren" + +#~ msgid "halfops" +#~ msgstr "Halb-Operatoren" + +#~ msgid "voices" +#~ msgstr "Gevoicete" + #~ msgid "%sCTCP %sVERSION%s reply from %s%s%s: %s" #~ msgstr "%sCTCP %sVERSION%s Antwort von %s%s%s: %s" diff --git a/po/es.po b/po/es.po index aa6c5b1b6..2eb6e8859 100644 --- a/po/es.po +++ b/po/es.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-15 14:36+0200\n" +"POT-Creation-Date: 2009-09-15 16:27+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -4117,32 +4117,35 @@ msgid "" msgstr "" "%sCanal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)" -msgid "nicks" -msgstr "apodos" - +#, fuzzy msgid "nick" -msgstr "apodo" - -msgid "ops" -msgstr "ops" +msgid_plural "nicks" +msgstr[0] "apodo" +msgstr[1] "apodo" +#, fuzzy msgid "op" -msgstr "op" - -msgid "halfops" -msgstr "semi-ops" +msgid_plural "ops" +msgstr[0] "op" +msgstr[1] "op" +#, fuzzy msgid "halfop" -msgstr "semi-op" - -msgid "voices" -msgstr "voces" +msgid_plural "halfops" +msgstr[0] "semi-op" +msgstr[1] "semi-op" +#, fuzzy msgid "voice" -msgstr "voz" +msgid_plural "voices" +msgstr[0] "voz" +msgstr[1] "voz" +#, fuzzy msgid "normal" -msgstr "normal" +msgid_plural "normals" +msgstr[0] "normal" +msgstr[1] "normal" #, c-format msgid "%s%s[%s%s%s] %s%s%s banned by %s%s %s(%s%s%s)%s on %s" @@ -5476,6 +5479,18 @@ msgstr "%s no es posible crear el servidor\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s falta un argumento para la opción --dir\n" +#~ msgid "nicks" +#~ msgstr "apodos" + +#~ msgid "ops" +#~ msgstr "ops" + +#~ msgid "halfops" +#~ msgstr "semi-ops" + +#~ msgid "voices" +#~ msgstr "voces" + #~ msgid "%sCTCP %sVERSION%s reply from %s%s%s: %s" #~ msgstr "%sCTCP %sVERSION%s respuesta de %s%s%s: %s" diff --git a/po/fr.po b/po/fr.po index 2d47eb2b0..0634cc464 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-15 14:36+0200\n" -"PO-Revision-Date: 2009-09-15 14:36+0200\n" +"POT-Creation-Date: 2009-09-15 16:27+0200\n" +"PO-Revision-Date: 2009-09-15 16:31+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -4383,32 +4383,30 @@ msgid "" msgstr "" "%sCanal %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)" -msgid "nicks" -msgstr "pseudos" - msgid "nick" -msgstr "pseudo" - -msgid "ops" -msgstr "ops" +msgid_plural "nicks" +msgstr[0] "pseudo" +msgstr[1] "pseudos" msgid "op" -msgstr "op" - -msgid "halfops" -msgstr "halfops" +msgid_plural "ops" +msgstr[0] "op" +msgstr[1] "ops" msgid "halfop" -msgstr "halfop" - -msgid "voices" -msgstr "voices" +msgid_plural "halfops" +msgstr[0] "halfop" +msgstr[1] "halfops" msgid "voice" -msgstr "voice" +msgid_plural "voices" +msgstr[0] "voice" +msgstr[1] "voices" msgid "normal" -msgstr "normal" +msgid_plural "normals" +msgstr[0] "normal" +msgstr[1] "normaux" #, c-format msgid "%s%s[%s%s%s] %s%s%s banned by %s%s %s(%s%s%s)%s on %s" @@ -5744,3 +5742,15 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s" + +#~ msgid "nicks" +#~ msgstr "pseudos" + +#~ msgid "ops" +#~ msgstr "ops" + +#~ msgid "halfops" +#~ msgstr "halfops" + +#~ msgid "voices" +#~ msgstr "voices" diff --git a/po/hu.po b/po/hu.po index 2f78fdf9e..3f5205bce 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-15 14:36+0200\n" +"POT-Creation-Date: 2009-09-15 16:27+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -4243,32 +4243,35 @@ msgid "" msgstr "" "%s%s%s szoba: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n" -msgid "nicks" -msgstr "név" - +#, fuzzy msgid "nick" -msgstr "név" - -msgid "ops" -msgstr "operátor" +msgid_plural "nicks" +msgstr[0] "név" +msgstr[1] "név" +#, fuzzy msgid "op" -msgstr "operátor" - -msgid "halfops" -msgstr "féloperátor" +msgid_plural "ops" +msgstr[0] "operátor" +msgstr[1] "operátor" +#, fuzzy msgid "halfop" -msgstr "féloperátor" - -msgid "voices" -msgstr "voice" +msgid_plural "halfops" +msgstr[0] "féloperátor" +msgstr[1] "féloperátor" +#, fuzzy msgid "voice" -msgstr "voice" +msgid_plural "voices" +msgstr[0] "voice" +msgstr[1] "voice" +#, fuzzy msgid "normal" -msgstr "normál" +msgid_plural "normals" +msgstr[0] "normál" +msgstr[1] "normál" #, fuzzy, c-format msgid "%s%s[%s%s%s] %s%s%s banned by %s%s %s(%s%s%s)%s on %s" @@ -5564,6 +5567,18 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" +#~ msgid "nicks" +#~ msgstr "név" + +#~ msgid "ops" +#~ msgstr "operátor" + +#~ msgid "halfops" +#~ msgstr "féloperátor" + +#~ msgid "voices" +#~ msgstr "voice" + #, fuzzy #~ msgid "%sCTCP %sVERSION%s reply from %s%s%s: %s" #~ msgstr "CTCP %sVERSION%s válasz %s%s%s felhasználótól: %s\n" diff --git a/po/pl.po b/po/pl.po index 7c9740d21..ce4a3aba6 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-15 14:36+0200\n" +"POT-Creation-Date: 2009-09-15 16:27+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: Polish\n" @@ -4335,32 +4335,40 @@ msgid "" msgstr "" "%sKanał %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)" -msgid "nicks" -msgstr "nicki" - +#, fuzzy msgid "nick" -msgstr "nick" - -msgid "ops" -msgstr "opy" +msgid_plural "nicks" +msgstr[0] "nick" +msgstr[1] "nick" +msgstr[2] "nick" +#, fuzzy msgid "op" -msgstr "op" - -msgid "halfops" -msgstr "halfopy" +msgid_plural "ops" +msgstr[0] "op" +msgstr[1] "op" +msgstr[2] "op" +#, fuzzy msgid "halfop" -msgstr "halfop" - -msgid "voices" -msgstr "voice" +msgid_plural "halfops" +msgstr[0] "halfop" +msgstr[1] "halfop" +msgstr[2] "halfop" +#, fuzzy msgid "voice" -msgstr "voice" +msgid_plural "voices" +msgstr[0] "voice" +msgstr[1] "voice" +msgstr[2] "voice" +#, fuzzy msgid "normal" -msgstr "normalnych" +msgid_plural "normals" +msgstr[0] "normalnych" +msgstr[1] "normalnych" +msgstr[2] "normalnych" #, c-format msgid "%s%s[%s%s%s] %s%s%s banned by %s%s %s(%s%s%s)%s on %s" @@ -5666,6 +5674,18 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda" msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: przekroczono czas na \"%s\" z %s" +#~ msgid "nicks" +#~ msgstr "nicki" + +#~ msgid "ops" +#~ msgstr "opy" + +#~ msgid "halfops" +#~ msgstr "halfopy" + +#~ msgid "voices" +#~ msgstr "voice" + #~ msgid "%sCTCP %sVERSION%s reply from %s%s%s: %s" #~ msgstr "%sCTCP %sVERSION%s odpowiedź od %s%s%s: %s" diff --git a/po/ru.po b/po/ru.po index 27c2f01b0..640dc0b47 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-15 14:36+0200\n" +"POT-Creation-Date: 2009-09-15 16:27+0200\n" "PO-Revision-Date: 2009-09-06 21:25+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -4235,32 +4235,35 @@ msgid "" msgstr "" "Канал %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)\n" -msgid "nicks" -msgstr "ники" - +#, fuzzy msgid "nick" -msgstr "ник" - -msgid "ops" -msgstr "опы" +msgid_plural "nicks" +msgstr[0] "ник" +msgstr[1] "ник" +#, fuzzy msgid "op" -msgstr "оп" - -msgid "halfops" -msgstr "полуопы" +msgid_plural "ops" +msgstr[0] "оп" +msgstr[1] "оп" +#, fuzzy msgid "halfop" -msgstr "полуоп" - -msgid "voices" -msgstr "войсы" +msgid_plural "halfops" +msgstr[0] "полуоп" +msgstr[1] "полуоп" +#, fuzzy msgid "voice" -msgstr "войс" +msgid_plural "voices" +msgstr[0] "войс" +msgstr[1] "войс" +#, fuzzy msgid "normal" -msgstr "обычные" +msgid_plural "normals" +msgstr[0] "обычные" +msgstr[1] "обычные" #, fuzzy, c-format msgid "%s%s[%s%s%s] %s%s%s banned by %s%s %s(%s%s%s)%s on %s" @@ -5543,6 +5546,18 @@ msgstr "%s DCC: не могу установить неблокирующий р msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s нет аргумента для параметра \"%s\"\n" +#~ msgid "nicks" +#~ msgstr "ники" + +#~ msgid "ops" +#~ msgstr "опы" + +#~ msgid "halfops" +#~ msgstr "полуопы" + +#~ msgid "voices" +#~ msgstr "войсы" + #, fuzzy #~ msgid "%sCTCP %sVERSION%s reply from %s%s%s: %s" #~ msgstr "Ответ на CTCP %sVERSION%s от %s%s%s: %s\n" diff --git a/po/weechat.pot b/po/weechat.pot index 31b636d0d..8528ff49b 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-09-15 14:36+0200\n" +"POT-Creation-Date: 2009-09-15 16:27+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -3638,32 +3638,30 @@ msgid "" "%sChannel %s%s%s: %s%d%s %s %s(%s%d%s %s, %s%d%s %s, %s%d%s %s, %s%d%s %s%s)" msgstr "" -msgid "nicks" -msgstr "" - msgid "nick" -msgstr "" - -msgid "ops" -msgstr "" +msgid_plural "nicks" +msgstr[0] "" +msgstr[1] "" msgid "op" -msgstr "" - -msgid "halfops" -msgstr "" +msgid_plural "ops" +msgstr[0] "" +msgstr[1] "" msgid "halfop" -msgstr "" - -msgid "voices" -msgstr "" +msgid_plural "halfops" +msgstr[0] "" +msgstr[1] "" msgid "voice" -msgstr "" +msgid_plural "voices" +msgstr[0] "" +msgstr[1] "" msgid "normal" -msgstr "" +msgid_plural "normals" +msgstr[0] "" +msgstr[1] "" #, c-format msgid "%s%s[%s%s%s] %s%s%s banned by %s%s %s(%s%s%s)%s on %s" diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 7155366d2..a32d92ea1 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -3195,24 +3195,24 @@ irc_protocol_cmd_366 (struct t_irc_server *server, const char *command, IRC_COLOR_CHAT_CHANNEL, num_nicks, IRC_COLOR_CHAT, - (num_nicks > 1) ? _("nicks") : _("nick"), + NG_("nick", "nicks", num_nicks), IRC_COLOR_CHAT_DELIMITERS, IRC_COLOR_CHAT_CHANNEL, num_op, IRC_COLOR_CHAT, - (num_op > 1) ? _("ops") : _("op"), + NG_("op", "ops", num_op), IRC_COLOR_CHAT_CHANNEL, num_halfop, IRC_COLOR_CHAT, - (num_halfop > 1) ? _("halfops") : _("halfop"), + NG_("halfop", "halfops", num_halfop), IRC_COLOR_CHAT_CHANNEL, num_voice, IRC_COLOR_CHAT, - (num_voice > 1) ? _("voices") : _("voice"), + NG_("voice", "voices", num_voice), IRC_COLOR_CHAT_CHANNEL, num_normal, IRC_COLOR_CHAT, - _("normal"), + NG_("normal", "normals", num_normal), IRC_COLOR_CHAT_DELIMITERS); irc_command_mode_server (server, ptr_channel, NULL);