diff --git a/po/cs.po b/po/cs.po index e1fdf8e15..ce4789907 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -4368,8 +4368,8 @@ msgstr "Složky:" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/de.po b/po/de.po index db621b95d..0f385e8aa 100644 --- a/po/de.po +++ b/po/de.po @@ -26,7 +26,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-11-22 10:05+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German - Germany \n" @@ -5508,10 +5508,14 @@ msgstr "TEMPORÄR, wird beim Beenden gelöscht" msgid "Directories:" msgstr "Verzeichnisse:" -#, c-format +#, fuzzy, c-format +#| msgid "" +#| "Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/" +#| "%s utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +#| "gui_chat_strlen_screen:" msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" "Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " diff --git a/po/es.po b/po/es.po index c4bba2a18..80b84e637 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Santiago Forero \n" "Language-Team: weechat-dev \n" @@ -4924,8 +4924,8 @@ msgstr "" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/fr.po b/po/fr.po index 9abc87517..f73b6653a 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: 2022-11-21 12:10+0100\n" -"PO-Revision-Date: 2022-11-21 20:42+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" +"PO-Revision-Date: 2022-12-03 10:12+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -5374,11 +5374,11 @@ msgstr "Répertoires :" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" -"Unicode : \"caractère\" (point de code, point de code en hexa, séquence " +"Unicode : \"caractère\" (point de code en hexa, point de code, séquence " "UTF-8) : strlen %s/%s utf8_strlen, gui_chat_strlen %s/%s wcswidth, " "utf8_strlen_screen, gui_chat_strlen_screen :" diff --git a/po/hu.po b/po/hu.po index b593ce3a9..1611d94aa 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -3958,8 +3958,8 @@ msgstr "" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/it.po b/po/it.po index e874dc95d..223bfb8f3 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -4632,8 +4632,8 @@ msgstr "Directory:" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/ja.po b/po/ja.po index c74e54052..1ac27051a 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language-Team: Polish \n" @@ -5475,8 +5475,8 @@ msgstr "Katalogi:" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/pt.po b/po/pt.po index ffc357605..98f438411 100644 --- a/po/pt.po +++ b/po/pt.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -5125,8 +5125,8 @@ msgstr "Diretórios:" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 645a2c9f2..19e4dc814 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Érico Nogueira \n" "Language-Team: weechat-dev \n" @@ -4623,8 +4623,8 @@ msgstr "" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/ru.po b/po/ru.po index e92f00074..d6c6050de 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -3986,8 +3986,8 @@ msgstr "" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/sr.po b/po/sr.po index 1332f98e1..aeb70f1e7 100644 --- a/po/sr.po +++ b/po/sr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Ivan Pešić \n" "Language-Team: weechat-dev \n" @@ -5474,8 +5474,8 @@ msgstr "Директоријуми:" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/tr.po b/po/tr.po index b52a225cd..3336e11cd 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: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2022-10-15 22:51+0200\n" "Last-Translator: Emir SARI \n" "Language-Team: weechat-dev \n" @@ -5424,8 +5424,8 @@ msgstr "Dizinler:" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index 482720274..b84700e7e 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: 2022-11-21 12:10+0100\n" +"POT-Creation-Date: 2022-12-03 10:09+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -3606,8 +3606,8 @@ msgstr "" #, c-format msgid "" -"Unicode: \"char\" (codepoint, hex codepoint, UTF-8 sequence): strlen %s/%s " -"utf8_strlen, gui_chat_strlen %s/%s wcswidth, utf8_strlen_screen, " +"Unicode: \"char\" (hex codepoint, codepoint, UTF-8 sequence): strlen %s/%s " +"utf8_strlen, gui_chat_strlen %s/%s wcwidth, utf8_strlen_screen, " "gui_chat_strlen_screen:" msgstr "" diff --git a/src/core/wee-debug.c b/src/core/wee-debug.c index ebe370735..32717c67d 100644 --- a/src/core/wee-debug.c +++ b/src/core/wee-debug.c @@ -793,7 +793,7 @@ debug_unicode_char (unsigned int codepoint) ptr_hexa[0] = '\0'; gui_chat_printf (NULL, - "\t \"%s\" (%u, U+%04X, %s): %d %s/%s %d, %d %s/%s %d, %d, %d", + "\t \"%s\" (U+%04X, %u, %s): %d %s/%s %d, %d %s/%s %d, %d, %d", utf8_char, codepoint, codepoint, @@ -824,7 +824,7 @@ debug_unicode_string (const char *string) gui_chat_printf (NULL, ""); gui_chat_printf (NULL, _("Unicode: \"char\" " - "(codepoint, hex codepoint, UTF-8 sequence): " + "(hex codepoint, codepoint, UTF-8 sequence): " "strlen %s/%s " "utf8_strlen, gui_chat_strlen %s/%s " "wcwidth, utf8_strlen_screen, gui_chat_strlen_screen:"), diff --git a/tests/unit/core/test-core-command.cpp b/tests/unit/core/test-core-command.cpp index 9732db0b3..df1671bf4 100644 --- a/tests/unit/core/test-core-command.cpp +++ b/tests/unit/core/test-core-command.cpp @@ -215,9 +215,9 @@ TEST(CoreCommand, Debug) /* test command "/debug unicode" */ WEE_CMD_CORE(command_debug_unicode); - WEE_CHECK_MSG_CORE(" \"\u00AD\" (173, U+00AD, 0xC2 0xAD): 2 / 1, 1 / 1, 1, 1"); - WEE_CHECK_MSG_CORE(" \"\u00E9\" (233, U+00E9, 0xC3 0xA9): 2 / 1, 1 / 1, 1, 1"); - WEE_CHECK_MSG_CORE(" \"\u200B\" (8203, U+200B, 0xE2 0x80 0x8B): 3 / 1, 1 / 0, 0, 0"); + WEE_CHECK_MSG_CORE(" \"\u00AD\" (U+00AD, 173, 0xC2 0xAD): 2 / 1, 1 / 1, 1, 1"); + WEE_CHECK_MSG_CORE(" \"\u00E9\" (U+00E9, 233, 0xC3 0xA9): 2 / 1, 1 / 1, 1, 1"); + WEE_CHECK_MSG_CORE(" \"\u200B\" (U+200B, 8203, 0xE2 0x80 0x8B): 3 / 1, 1 / 0, 0, 0"); /* test command "/debug windows" */ /* TODO: write tests */