diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index a7094cc37..1d99f7395 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -17,6 +17,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] === Bugs fixed +* core: fix translation of message displayed after /upgrade * tests: fix memory leak in tests launcher * aspell: fix crash with command "/aspell addword" if no word is given (closes #164, closes #165) diff --git a/po/cs.po b/po/cs.po index dc9e614b8..59d534ad9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-07-25 07:49+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" "Language: cs\n" @@ -3930,9 +3930,9 @@ msgstr[2] "bajt" msgid "debug: removing file: %s" msgstr "ladění: odstraňuji soubor: %s" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" -#, c-format -msgid "Upgrade done (%.02f %s)" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") +#, fuzzy, c-format +msgid "Upgrade done (%.02fs)" msgstr "Aktualizace dokončena (%.02f %s)" #, c-format @@ -10741,6 +10741,3 @@ msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: vypršel časový limit \"%s\" pro %s" - -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "%sCTCP odpověď od %s%s%s: %s%s%s %ld.%ld %s" diff --git a/po/de.po b/po/de.po index 0e63dd49f..a0a09a9e9 100644 --- a/po/de.po +++ b/po/de.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-07-25 09:12+0100\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" "Language: de_DE\n" @@ -4602,9 +4602,9 @@ msgstr[1] "Bytes" msgid "debug: removing file: %s" msgstr "debug: lösche Datei: %s" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" -#, c-format -msgid "Upgrade done (%.02f %s)" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") +#, fuzzy, c-format +msgid "Upgrade done (%.02fs)" msgstr "Upgrade durchgeführt (%.02f %s)" #, c-format @@ -12109,6 +12109,3 @@ msgstr "" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s" - -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "%sCTCP Antwort von %s%s%s: %s%s%s %ld.%ld %s" diff --git a/po/es.po b/po/es.po index 3c2ce498f..957d0c63b 100644 --- a/po/es.po +++ b/po/es.po @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-07-25 07:49+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" "Language: es\n" @@ -4140,9 +4140,9 @@ msgstr[1] "byte" msgid "debug: removing file: %s" msgstr "depurado: removiendo el archivo: %s" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" -#, c-format -msgid "Upgrade done (%.02f %s)" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") +#, fuzzy, c-format +msgid "Upgrade done (%.02fs)" msgstr "Actualización hecha (%.02f %s)" #, c-format @@ -11024,6 +11024,3 @@ msgstr "%s%s: no es posible configurar la opción \"nonblock\" para el socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s" - -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "%srespuesta CTCP de %s%s%s: %s%s%s %ld.%ld %s" diff --git a/po/fr.po b/po/fr.po index 207f80921..a0d98d6f5 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-08-16 11:31+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -4503,10 +4503,10 @@ msgstr[1] "octets" msgid "debug: removing file: %s" msgstr "debug : suppression du fichier : %s" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") #, c-format -msgid "Upgrade done (%.02f %s)" -msgstr "Mise à jour terminée (%.02f %s)" +msgid "Upgrade done (%.02fs)" +msgstr "Mise à jour terminée (%.02fs)" #, c-format msgid "%sError upgrading WeeChat with file \"%s\":" @@ -11862,6 +11862,3 @@ msgstr "" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" - -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "%sRéponse CTCP de %s%s%s : %s%s%s %ld.%ld %s" diff --git a/po/hu.po b/po/hu.po index efa173d8c..b84c45ec7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-07-25 07:49+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" "Language: hu\n" @@ -3551,9 +3551,9 @@ msgstr[1] "byte" msgid "debug: removing file: %s" msgstr " IRC(%s)\n" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") #, c-format -msgid "Upgrade done (%.02f %s)" +msgid "Upgrade done (%.02fs)" msgstr "" #, fuzzy, c-format @@ -10126,7 +10126,3 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n" #, fuzzy, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" - -#, fuzzy -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "CTCP %sPING%s válasz %s%s%s felhasználótól: %ld.%ld másodperc\n" diff --git a/po/it.po b/po/it.po index 31cfd6054..86596915d 100644 --- a/po/it.po +++ b/po/it.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-07-25 07:49+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" "Language: it\n" @@ -4263,9 +4263,9 @@ msgstr[1] "byte" msgid "debug: removing file: %s" msgstr "debug: rimozione del file: %s" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" -#, c-format -msgid "Upgrade done (%.02f %s)" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") +#, fuzzy, c-format +msgid "Upgrade done (%.02fs)" msgstr "Aggiornamento completato (%.02f %s)" #, c-format @@ -11195,6 +11195,3 @@ msgstr "" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: timeout per \"%s\" con %s" - -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "%sRisposta CTCP da %s%s%s: %s%s%s %ld,%ld %s" diff --git a/po/ja.po b/po/ja.po index d0bcf49d9..15ea0b3a6 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-08-03 00:32+0900\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -4315,9 +4315,9 @@ msgstr[0] "バイト" msgid "debug: removing file: %s" msgstr "デバッグ: ファイル削除中: %s" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" -#, c-format -msgid "Upgrade done (%.02f %s)" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") +#, fuzzy, c-format +msgid "Upgrade done (%.02fs)" msgstr "アップグレード完了 (%.02f %s)" #, c-format @@ -11409,6 +11409,3 @@ msgstr "%s%s: ソケットにオプション \"nonblock\" を設定できませ #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: \"%s\" のタイムアウト %s" - -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "%s%s%s%s からの CTCP 応答: %s%s%s %ld.%ld %s" diff --git a/po/pl.po b/po/pl.po index fdae4e003..59d81e0d7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-08-13 21:27+0100\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" "Language: pl\n" @@ -4416,9 +4416,9 @@ msgstr[2] "bajtów" msgid "debug: removing file: %s" msgstr "debug: usuwam plik: %s" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" -#, c-format -msgid "Upgrade done (%.02f %s)" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") +#, fuzzy, c-format +msgid "Upgrade done (%.02fs)" msgstr "Uaktualnienie zakończyło się powodzeniem (%.02f %s)" #, c-format @@ -11620,6 +11620,3 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda: błąd %d %s" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: przekroczono czas na \"%s\" z %s" - -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "%sOdpowiedź CTCP od %s%s%s: %s%s%s %ld.%ld %s" diff --git a/po/pt_BR.po b/po/pt_BR.po index 298fa5b5f..3f9ae2a01 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-07-14 18:44+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" "Language: pt_BR\n" @@ -4030,9 +4030,9 @@ msgstr[1] "" msgid "debug: removing file: %s" msgstr "" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") #, c-format -msgid "Upgrade done (%.02f %s)" +msgid "Upgrade done (%.02fs)" msgstr "" #, c-format @@ -10388,6 +10388,3 @@ msgstr "%s%s: não foi possível setar opção \"nonblock\" para o socket" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: tempo esgotado para \"%s\" com %s" - -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "%sresposta CTCP de %s%s%s: %s%s%s %ld.%ld %s" diff --git a/po/ru.po b/po/ru.po index 0809af290..ddc4aab92 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" -"PO-Revision-Date: 2014-07-25 07:50+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" +"PO-Revision-Date: 2014-08-16 11:46+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" "Language: ru\n" @@ -3581,9 +3581,9 @@ msgstr[2] "байтов" msgid "debug: removing file: %s" msgstr " IRC(%s)\n" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") #, c-format -msgid "Upgrade done (%.02f %s)" +msgid "Upgrade done (%.02fs)" msgstr "" #, fuzzy, c-format @@ -10148,7 +10148,3 @@ msgstr "%s DCC: не могу установить неблокирующий р #, fuzzy, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s нет аргумента для параметра \"%s\"\n" - -#, fuzzy -#~ msgid "%sCTCP reply from %s%s%s: %s%s%s %ld.%ld %s" -#~ msgstr "Ответ на %sPING%s от %s%s%s: %ld.%ld секунд\n" diff --git a/po/tr.po b/po/tr.po index 7c1d4d3fc..1697e5fb4 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" "PO-Revision-Date: 2014-07-25 07:50+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -3192,9 +3192,9 @@ msgstr[0] "bayt" msgid "debug: removing file: %s" msgstr "" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") #, c-format -msgid "Upgrade done (%.02f %s)" +msgid "Upgrade done (%.02fs)" msgstr "" #, c-format diff --git a/po/weechat.pot b/po/weechat.pot index da64d1a2c..0101f57be 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-08-16 11:34+0200\n" +"POT-Creation-Date: 2014-08-16 11:45+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -3190,9 +3190,9 @@ msgstr[1] "" msgid "debug: removing file: %s" msgstr "" -#. TRANSLATORS: "%s" is translation of "second" or "seconds" +#. TRANSLATORS: %.02fs is a float number + "s" ("seconds") #, c-format -msgid "Upgrade done (%.02f %s)" +msgid "Upgrade done (%.02fs)" msgstr "" #, c-format diff --git a/src/core/wee-upgrade.c b/src/core/wee-upgrade.c index bb15aebeb..5826399a5 100644 --- a/src/core/wee-upgrade.c +++ b/src/core/wee-upgrade.c @@ -910,10 +910,9 @@ upgrade_weechat_end () gettimeofday (&tv_now, NULL); time_diff = util_timeval_diff (&weechat_current_start_timeval, &tv_now); gui_chat_printf (NULL, - /* TRANSLATORS: "%s" is translation of "second" or "seconds" */ - _("Upgrade done (%.02f %s)"), - ((float)time_diff) / 1000, - NG_("second", "seconds", time_diff / 1000)); + /* TRANSLATORS: %.02fs is a float number + "s" ("seconds") */ + _("Upgrade done (%.02fs)"), + ((float)time_diff) / 1000); /* upgrading ended */ weechat_upgrading = 0;