From 96bd473887ca9265629b7f813ad8c2bfcf0724f2 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sat, 9 Jul 2005 17:08:26 +0000 Subject: [PATCH] Internal functions descriptions for keys are now displayed and translated --- po/POTFILES.in | 1 + po/es.po | 144 ++++++++++++++++++++++++++++++++-- po/fr.po | 145 +++++++++++++++++++++++++++++++++-- po/weechat.pot | 142 ++++++++++++++++++++++++++++++++-- src/common/command.c | 7 +- src/common/weechat.c | 7 +- weechat/po/POTFILES.in | 1 + weechat/po/es.po | 144 ++++++++++++++++++++++++++++++++-- weechat/po/fr.po | 145 +++++++++++++++++++++++++++++++++-- weechat/po/weechat.pot | 142 ++++++++++++++++++++++++++++++++-- weechat/src/common/command.c | 7 +- weechat/src/common/weechat.c | 7 +- 12 files changed, 840 insertions(+), 52 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index cfd8fb9bd..298b0b30d 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -18,6 +18,7 @@ ./src/gui/gtk/gui-display.c ./src/gui/gtk/gui-input.c ./src/gui/gui-common.c +./src/gui/gui-keyboard.c ./src/gui/gui.h ./src/common/command.c ./src/common/command.h diff --git a/po/es.po b/po/es.po index 7207bd263..8aa9721cf 100644 --- a/po/es.po +++ b/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-07-09 17:25+0200\n" -"PO-Revision-Date: 2005-07-09 14:35+0200\n" +"POT-Creation-Date: 2005-07-09 18:34+0200\n" +"PO-Revision-Date: 2005-07-09 18:50+0200\n" "Last-Translator: Roberto González Cardenete \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -2167,6 +2167,141 @@ msgstr "No hay suficiente memoria para una nueva l msgid "Not enough memory for new message\n" msgstr "No hay suficiente memoria para el mensaje de la barra de información\n" +#: src/gui/gui-keyboard.c:43 +msgid "terminate line" +msgstr "" + +#: src/gui/gui-keyboard.c:45 +msgid "complete word" +msgstr "" + +#: src/gui/gui-keyboard.c:47 +msgid "delete previous char" +msgstr "" + +#: src/gui/gui-keyboard.c:49 +msgid "delete next char" +msgstr "" + +#: src/gui/gui-keyboard.c:51 +msgid "delete until end of line" +msgstr "" + +#: src/gui/gui-keyboard.c:53 +msgid "delete until beginning of line" +msgstr "" + +#: src/gui/gui-keyboard.c:55 +msgid "delete entire line" +msgstr "" + +#: src/gui/gui-keyboard.c:57 +msgid "delete previous word" +msgstr "" + +#: src/gui/gui-keyboard.c:59 +msgid "delete next word" +msgstr "" + +#: src/gui/gui-keyboard.c:61 +msgid "go to beginning of line" +msgstr "" + +#: src/gui/gui-keyboard.c:63 +msgid "go to end of line" +msgstr "" + +#: src/gui/gui-keyboard.c:65 +msgid "move one char left" +msgstr "" + +#: src/gui/gui-keyboard.c:67 +msgid "move to previous word" +msgstr "" + +#: src/gui/gui-keyboard.c:69 +msgid "move one char right" +msgstr "" + +#: src/gui/gui-keyboard.c:71 +msgid "move to next word" +msgstr "" + +#: src/gui/gui-keyboard.c:73 +msgid "call previous command in history" +msgstr "" + +#: src/gui/gui-keyboard.c:75 +msgid "call next command in history" +msgstr "" + +#: src/gui/gui-keyboard.c:77 +msgid "scroll one page up" +msgstr "" + +#: src/gui/gui-keyboard.c:79 +msgid "scroll one page down" +msgstr "" + +#: src/gui/gui-keyboard.c:81 +msgid "clear infobar" +msgstr "" + +#: src/gui/gui-keyboard.c:83 +msgid "scroll nicklist one page up" +msgstr "" + +#: src/gui/gui-keyboard.c:85 +msgid "scroll nicklist one page down" +msgstr "" + +#: src/gui/gui-keyboard.c:87 +msgid "display beginning of nicklist" +msgstr "" + +#: src/gui/gui-keyboard.c:89 +msgid "display end of nicklist" +msgstr "" + +#: src/gui/gui-keyboard.c:91 +msgid "refresh screen" +msgstr "" + +#: src/gui/gui-keyboard.c:93 +msgid "jump to buffer with activity" +msgstr "" + +#: src/gui/gui-keyboard.c:95 +msgid "jump to DCC buffer" +msgstr "" + +#: src/gui/gui-keyboard.c:97 +msgid "jump to server buffer" +msgstr "" + +#: src/gui/gui-keyboard.c:99 +msgid "jump to next server" +msgstr "" + +#: src/gui/gui-keyboard.c:101 +msgid "clear hotlist" +msgstr "" + +#: src/gui/gui-keyboard.c:399 src/common/command.c:1470 +#, c-format +msgid "%s unable to bind key \"%s\"\n" +msgstr "" + +#: src/gui/gui-keyboard.c:410 +#, c-format +msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" +msgstr "" + +#: src/gui/gui-keyboard.c:423 +#, c-format +msgid "%s not enough memory for key binding\n" +msgstr "" + #: src/common/command.c:42 msgid "create an alias for a command" msgstr "crear un alias para un comando" @@ -2652,11 +2787,6 @@ msgstr "" msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" -#: src/common/command.c:1470 -#, c-format -msgid "%s unable to bind key \"%s\"\n" -msgstr "" - #: src/common/command.c:1497 src/common/command.c:1640 #, c-format msgid "Registered %s scripts:\n" diff --git a/po/fr.po b/po/fr.po index 667a96f5f..1c6420c50 100644 --- a/po/fr.po +++ b/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-07-09 17:25+0200\n" -"PO-Revision-Date: 2005-07-09 14:34+0200\n" +"POT-Creation-Date: 2005-07-09 18:34+0200\n" +"PO-Revision-Date: 2005-07-09 18:48+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -2172,6 +2172,142 @@ msgstr "Pas assez de m msgid "Not enough memory for new message\n" msgstr "Pas assez de mémoire pour un message de la barre d'infos\n" +#: src/gui/gui-keyboard.c:43 +msgid "terminate line" +msgstr "terminer la ligne" + +#: src/gui/gui-keyboard.c:45 +msgid "complete word" +msgstr "compléter le mot" + +#: src/gui/gui-keyboard.c:47 +msgid "delete previous char" +msgstr "effacer le caractère précédent" + +#: src/gui/gui-keyboard.c:49 +msgid "delete next char" +msgstr "effacer le caractère suivant" + +#: src/gui/gui-keyboard.c:51 +msgid "delete until end of line" +msgstr "effacer jusqu'à la fin de la ligne" + +#: src/gui/gui-keyboard.c:53 +msgid "delete until beginning of line" +msgstr "effacer jusqu'au début de la ligne" + +#: src/gui/gui-keyboard.c:55 +msgid "delete entire line" +msgstr "effacer la ligne entière" + +#: src/gui/gui-keyboard.c:57 +msgid "delete previous word" +msgstr "effacer le mot précédent" + +#: src/gui/gui-keyboard.c:59 +msgid "delete next word" +msgstr "effacer le mot suivant" + +#: src/gui/gui-keyboard.c:61 +msgid "go to beginning of line" +msgstr "aller au début de la ligne" + +#: src/gui/gui-keyboard.c:63 +msgid "go to end of line" +msgstr "aller à la fin de la ligne" + +#: src/gui/gui-keyboard.c:65 +msgid "move one char left" +msgstr "se déplacer d'un caractère à gauche" + +#: src/gui/gui-keyboard.c:67 +msgid "move to previous word" +msgstr "se déplacer au mot précédent" + +#: src/gui/gui-keyboard.c:69 +msgid "move one char right" +msgstr "se déplacer d'un caractère à droite" + +#: src/gui/gui-keyboard.c:71 +msgid "move to next word" +msgstr "se déplacer au mot suivant" + +#: src/gui/gui-keyboard.c:73 +msgid "call previous command in history" +msgstr "appeler la commande précédente dans l'historique" + +#: src/gui/gui-keyboard.c:75 +msgid "call next command in history" +msgstr "appeler la commande suivante dans l'historique" + +#: src/gui/gui-keyboard.c:77 +msgid "scroll one page up" +msgstr "faire défiler d'une page vers le haut" + +#: src/gui/gui-keyboard.c:79 +msgid "scroll one page down" +msgstr "faire défiler d'une page vers le bas" + +#: src/gui/gui-keyboard.c:81 +msgid "clear infobar" +msgstr "effacer la barre d'infos" + +#: src/gui/gui-keyboard.c:83 +msgid "scroll nicklist one page up" +msgstr "faire défiler la liste des pseudos d'une page vers le haut" + +#: src/gui/gui-keyboard.c:85 +msgid "scroll nicklist one page down" +msgstr "faire défiler la liste des pseudos d'une page vers le bas" + +#: src/gui/gui-keyboard.c:87 +msgid "display beginning of nicklist" +msgstr "afficher le début de la liste des pseudos" + +#: src/gui/gui-keyboard.c:89 +msgid "display end of nicklist" +msgstr "afficher la fin de la liste des pseudos" + +#: src/gui/gui-keyboard.c:91 +msgid "refresh screen" +msgstr "rafraichir l'écran" + +#: src/gui/gui-keyboard.c:93 +msgid "jump to buffer with activity" +msgstr "sauter au tampon avec de l'activité" + +#: src/gui/gui-keyboard.c:95 +msgid "jump to DCC buffer" +msgstr "sauter au tampon DCC" + +#: src/gui/gui-keyboard.c:97 +msgid "jump to server buffer" +msgstr "sauter au tampon du serveur" + +#: src/gui/gui-keyboard.c:99 +msgid "jump to next server" +msgstr "sauter au prochain serveur" + +#: src/gui/gui-keyboard.c:101 +msgid "clear hotlist" +msgstr "effacer la liste d'activité" + +#: src/gui/gui-keyboard.c:399 src/common/command.c:1470 +#, c-format +msgid "%s unable to bind key \"%s\"\n" +msgstr "%s impossible de créer la touche \"%s\"\n" + +#: src/gui/gui-keyboard.c:410 +#, c-format +msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" +msgstr "" +"%s impossible de créer la touche \"%s\" (nom fonction incorrect: \"%s\")\n" + +#: src/gui/gui-keyboard.c:423 +#, c-format +msgid "%s not enough memory for key binding\n" +msgstr "%s pas assez de mémoire pour la touche\n" + #: src/common/command.c:42 msgid "create an alias for a command" msgstr "créer un alias pour une commande" @@ -2667,11 +2803,6 @@ msgstr "" "%s le paramètre \"-yes\" est requis pour la réinitialisation des touches " "(raison de sécurité)\n" -#: src/common/command.c:1470 -#, c-format -msgid "%s unable to bind key \"%s\"\n" -msgstr "%s impossible de créer la touche \"%s\"\n" - #: src/common/command.c:1497 src/common/command.c:1640 #, c-format msgid "Registered %s scripts:\n" diff --git a/po/weechat.pot b/po/weechat.pot index e6d8e8350..21c620580 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: 2005-07-09 17:25+0200\n" +"POT-Creation-Date: 2005-07-09 18:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2039,6 +2039,141 @@ msgstr "" msgid "Not enough memory for new message\n" msgstr "" +#: src/gui/gui-keyboard.c:43 +msgid "terminate line" +msgstr "" + +#: src/gui/gui-keyboard.c:45 +msgid "complete word" +msgstr "" + +#: src/gui/gui-keyboard.c:47 +msgid "delete previous char" +msgstr "" + +#: src/gui/gui-keyboard.c:49 +msgid "delete next char" +msgstr "" + +#: src/gui/gui-keyboard.c:51 +msgid "delete until end of line" +msgstr "" + +#: src/gui/gui-keyboard.c:53 +msgid "delete until beginning of line" +msgstr "" + +#: src/gui/gui-keyboard.c:55 +msgid "delete entire line" +msgstr "" + +#: src/gui/gui-keyboard.c:57 +msgid "delete previous word" +msgstr "" + +#: src/gui/gui-keyboard.c:59 +msgid "delete next word" +msgstr "" + +#: src/gui/gui-keyboard.c:61 +msgid "go to beginning of line" +msgstr "" + +#: src/gui/gui-keyboard.c:63 +msgid "go to end of line" +msgstr "" + +#: src/gui/gui-keyboard.c:65 +msgid "move one char left" +msgstr "" + +#: src/gui/gui-keyboard.c:67 +msgid "move to previous word" +msgstr "" + +#: src/gui/gui-keyboard.c:69 +msgid "move one char right" +msgstr "" + +#: src/gui/gui-keyboard.c:71 +msgid "move to next word" +msgstr "" + +#: src/gui/gui-keyboard.c:73 +msgid "call previous command in history" +msgstr "" + +#: src/gui/gui-keyboard.c:75 +msgid "call next command in history" +msgstr "" + +#: src/gui/gui-keyboard.c:77 +msgid "scroll one page up" +msgstr "" + +#: src/gui/gui-keyboard.c:79 +msgid "scroll one page down" +msgstr "" + +#: src/gui/gui-keyboard.c:81 +msgid "clear infobar" +msgstr "" + +#: src/gui/gui-keyboard.c:83 +msgid "scroll nicklist one page up" +msgstr "" + +#: src/gui/gui-keyboard.c:85 +msgid "scroll nicklist one page down" +msgstr "" + +#: src/gui/gui-keyboard.c:87 +msgid "display beginning of nicklist" +msgstr "" + +#: src/gui/gui-keyboard.c:89 +msgid "display end of nicklist" +msgstr "" + +#: src/gui/gui-keyboard.c:91 +msgid "refresh screen" +msgstr "" + +#: src/gui/gui-keyboard.c:93 +msgid "jump to buffer with activity" +msgstr "" + +#: src/gui/gui-keyboard.c:95 +msgid "jump to DCC buffer" +msgstr "" + +#: src/gui/gui-keyboard.c:97 +msgid "jump to server buffer" +msgstr "" + +#: src/gui/gui-keyboard.c:99 +msgid "jump to next server" +msgstr "" + +#: src/gui/gui-keyboard.c:101 +msgid "clear hotlist" +msgstr "" + +#: src/gui/gui-keyboard.c:399 src/common/command.c:1470 +#, c-format +msgid "%s unable to bind key \"%s\"\n" +msgstr "" + +#: src/gui/gui-keyboard.c:410 +#, c-format +msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" +msgstr "" + +#: src/gui/gui-keyboard.c:423 +#, c-format +msgid "%s not enough memory for key binding\n" +msgstr "" + #: src/common/command.c:42 msgid "create an alias for a command" msgstr "" @@ -2473,11 +2608,6 @@ msgstr "" msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" -#: src/common/command.c:1470 -#, c-format -msgid "%s unable to bind key \"%s\"\n" -msgstr "" - #: src/common/command.c:1497 src/common/command.c:1640 #, c-format msgid "Registered %s scripts:\n" diff --git a/src/common/command.c b/src/common/command.c index 977568fee..beeb2cb83 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -1418,8 +1418,9 @@ weechat_cmd_key (char *arguments) i = 0; while (gui_key_functions[i].function_name) { - gui_printf (NULL, " %s\n", - gui_key_functions[i].function_name); + gui_printf (NULL, "%25s %s\n", + gui_key_functions[i].function_name, + _(gui_key_functions[i].description)); i++; } } @@ -1428,7 +1429,7 @@ weechat_cmd_key (char *arguments) arguments += 5; while (arguments[0] == ' ') arguments++; - if (strcmp (arguments, "-yes") == 0) + if (strcasecmp (arguments, "-yes") == 0) { gui_key_free_all (); gui_key_init (); diff --git a/src/common/weechat.c b/src/common/weechat.c index 0eb311d25..c3f9a8352 100644 --- a/src/common/weechat.c +++ b/src/common/weechat.c @@ -326,8 +326,9 @@ void wee_display_key_functions () i = 0; while (gui_key_functions[i].function_name) { - printf (" %s\n", - gui_key_functions[i].function_name); + printf ("* %s: %s\n", + gui_key_functions[i].function_name, + _(gui_key_functions[i].description)); i++; } } @@ -346,7 +347,7 @@ void wee_display_keys () for (ptr_key = gui_keys; ptr_key; ptr_key = ptr_key->next_key) { expanded_name = gui_key_get_expanded_name (ptr_key->key); - printf (" %20s => %s\n", + printf ("* %s => %s\n", (expanded_name) ? expanded_name : ptr_key->key, (ptr_key->function) ? gui_key_function_search_by_ptr (ptr_key->function) : ptr_key->command); if (expanded_name) diff --git a/weechat/po/POTFILES.in b/weechat/po/POTFILES.in index cfd8fb9bd..298b0b30d 100644 --- a/weechat/po/POTFILES.in +++ b/weechat/po/POTFILES.in @@ -18,6 +18,7 @@ ./src/gui/gtk/gui-display.c ./src/gui/gtk/gui-input.c ./src/gui/gui-common.c +./src/gui/gui-keyboard.c ./src/gui/gui.h ./src/common/command.c ./src/common/command.h diff --git a/weechat/po/es.po b/weechat/po/es.po index 7207bd263..8aa9721cf 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-07-09 17:25+0200\n" -"PO-Revision-Date: 2005-07-09 14:35+0200\n" +"POT-Creation-Date: 2005-07-09 18:34+0200\n" +"PO-Revision-Date: 2005-07-09 18:50+0200\n" "Last-Translator: Roberto González Cardenete \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -2167,6 +2167,141 @@ msgstr "No hay suficiente memoria para una nueva l msgid "Not enough memory for new message\n" msgstr "No hay suficiente memoria para el mensaje de la barra de información\n" +#: src/gui/gui-keyboard.c:43 +msgid "terminate line" +msgstr "" + +#: src/gui/gui-keyboard.c:45 +msgid "complete word" +msgstr "" + +#: src/gui/gui-keyboard.c:47 +msgid "delete previous char" +msgstr "" + +#: src/gui/gui-keyboard.c:49 +msgid "delete next char" +msgstr "" + +#: src/gui/gui-keyboard.c:51 +msgid "delete until end of line" +msgstr "" + +#: src/gui/gui-keyboard.c:53 +msgid "delete until beginning of line" +msgstr "" + +#: src/gui/gui-keyboard.c:55 +msgid "delete entire line" +msgstr "" + +#: src/gui/gui-keyboard.c:57 +msgid "delete previous word" +msgstr "" + +#: src/gui/gui-keyboard.c:59 +msgid "delete next word" +msgstr "" + +#: src/gui/gui-keyboard.c:61 +msgid "go to beginning of line" +msgstr "" + +#: src/gui/gui-keyboard.c:63 +msgid "go to end of line" +msgstr "" + +#: src/gui/gui-keyboard.c:65 +msgid "move one char left" +msgstr "" + +#: src/gui/gui-keyboard.c:67 +msgid "move to previous word" +msgstr "" + +#: src/gui/gui-keyboard.c:69 +msgid "move one char right" +msgstr "" + +#: src/gui/gui-keyboard.c:71 +msgid "move to next word" +msgstr "" + +#: src/gui/gui-keyboard.c:73 +msgid "call previous command in history" +msgstr "" + +#: src/gui/gui-keyboard.c:75 +msgid "call next command in history" +msgstr "" + +#: src/gui/gui-keyboard.c:77 +msgid "scroll one page up" +msgstr "" + +#: src/gui/gui-keyboard.c:79 +msgid "scroll one page down" +msgstr "" + +#: src/gui/gui-keyboard.c:81 +msgid "clear infobar" +msgstr "" + +#: src/gui/gui-keyboard.c:83 +msgid "scroll nicklist one page up" +msgstr "" + +#: src/gui/gui-keyboard.c:85 +msgid "scroll nicklist one page down" +msgstr "" + +#: src/gui/gui-keyboard.c:87 +msgid "display beginning of nicklist" +msgstr "" + +#: src/gui/gui-keyboard.c:89 +msgid "display end of nicklist" +msgstr "" + +#: src/gui/gui-keyboard.c:91 +msgid "refresh screen" +msgstr "" + +#: src/gui/gui-keyboard.c:93 +msgid "jump to buffer with activity" +msgstr "" + +#: src/gui/gui-keyboard.c:95 +msgid "jump to DCC buffer" +msgstr "" + +#: src/gui/gui-keyboard.c:97 +msgid "jump to server buffer" +msgstr "" + +#: src/gui/gui-keyboard.c:99 +msgid "jump to next server" +msgstr "" + +#: src/gui/gui-keyboard.c:101 +msgid "clear hotlist" +msgstr "" + +#: src/gui/gui-keyboard.c:399 src/common/command.c:1470 +#, c-format +msgid "%s unable to bind key \"%s\"\n" +msgstr "" + +#: src/gui/gui-keyboard.c:410 +#, c-format +msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" +msgstr "" + +#: src/gui/gui-keyboard.c:423 +#, c-format +msgid "%s not enough memory for key binding\n" +msgstr "" + #: src/common/command.c:42 msgid "create an alias for a command" msgstr "crear un alias para un comando" @@ -2652,11 +2787,6 @@ msgstr "" msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" -#: src/common/command.c:1470 -#, c-format -msgid "%s unable to bind key \"%s\"\n" -msgstr "" - #: src/common/command.c:1497 src/common/command.c:1640 #, c-format msgid "Registered %s scripts:\n" diff --git a/weechat/po/fr.po b/weechat/po/fr.po index 667a96f5f..1c6420c50 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-07-09 17:25+0200\n" -"PO-Revision-Date: 2005-07-09 14:34+0200\n" +"POT-Creation-Date: 2005-07-09 18:34+0200\n" +"PO-Revision-Date: 2005-07-09 18:48+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -2172,6 +2172,142 @@ msgstr "Pas assez de m msgid "Not enough memory for new message\n" msgstr "Pas assez de mémoire pour un message de la barre d'infos\n" +#: src/gui/gui-keyboard.c:43 +msgid "terminate line" +msgstr "terminer la ligne" + +#: src/gui/gui-keyboard.c:45 +msgid "complete word" +msgstr "compléter le mot" + +#: src/gui/gui-keyboard.c:47 +msgid "delete previous char" +msgstr "effacer le caractère précédent" + +#: src/gui/gui-keyboard.c:49 +msgid "delete next char" +msgstr "effacer le caractère suivant" + +#: src/gui/gui-keyboard.c:51 +msgid "delete until end of line" +msgstr "effacer jusqu'à la fin de la ligne" + +#: src/gui/gui-keyboard.c:53 +msgid "delete until beginning of line" +msgstr "effacer jusqu'au début de la ligne" + +#: src/gui/gui-keyboard.c:55 +msgid "delete entire line" +msgstr "effacer la ligne entière" + +#: src/gui/gui-keyboard.c:57 +msgid "delete previous word" +msgstr "effacer le mot précédent" + +#: src/gui/gui-keyboard.c:59 +msgid "delete next word" +msgstr "effacer le mot suivant" + +#: src/gui/gui-keyboard.c:61 +msgid "go to beginning of line" +msgstr "aller au début de la ligne" + +#: src/gui/gui-keyboard.c:63 +msgid "go to end of line" +msgstr "aller à la fin de la ligne" + +#: src/gui/gui-keyboard.c:65 +msgid "move one char left" +msgstr "se déplacer d'un caractère à gauche" + +#: src/gui/gui-keyboard.c:67 +msgid "move to previous word" +msgstr "se déplacer au mot précédent" + +#: src/gui/gui-keyboard.c:69 +msgid "move one char right" +msgstr "se déplacer d'un caractère à droite" + +#: src/gui/gui-keyboard.c:71 +msgid "move to next word" +msgstr "se déplacer au mot suivant" + +#: src/gui/gui-keyboard.c:73 +msgid "call previous command in history" +msgstr "appeler la commande précédente dans l'historique" + +#: src/gui/gui-keyboard.c:75 +msgid "call next command in history" +msgstr "appeler la commande suivante dans l'historique" + +#: src/gui/gui-keyboard.c:77 +msgid "scroll one page up" +msgstr "faire défiler d'une page vers le haut" + +#: src/gui/gui-keyboard.c:79 +msgid "scroll one page down" +msgstr "faire défiler d'une page vers le bas" + +#: src/gui/gui-keyboard.c:81 +msgid "clear infobar" +msgstr "effacer la barre d'infos" + +#: src/gui/gui-keyboard.c:83 +msgid "scroll nicklist one page up" +msgstr "faire défiler la liste des pseudos d'une page vers le haut" + +#: src/gui/gui-keyboard.c:85 +msgid "scroll nicklist one page down" +msgstr "faire défiler la liste des pseudos d'une page vers le bas" + +#: src/gui/gui-keyboard.c:87 +msgid "display beginning of nicklist" +msgstr "afficher le début de la liste des pseudos" + +#: src/gui/gui-keyboard.c:89 +msgid "display end of nicklist" +msgstr "afficher la fin de la liste des pseudos" + +#: src/gui/gui-keyboard.c:91 +msgid "refresh screen" +msgstr "rafraichir l'écran" + +#: src/gui/gui-keyboard.c:93 +msgid "jump to buffer with activity" +msgstr "sauter au tampon avec de l'activité" + +#: src/gui/gui-keyboard.c:95 +msgid "jump to DCC buffer" +msgstr "sauter au tampon DCC" + +#: src/gui/gui-keyboard.c:97 +msgid "jump to server buffer" +msgstr "sauter au tampon du serveur" + +#: src/gui/gui-keyboard.c:99 +msgid "jump to next server" +msgstr "sauter au prochain serveur" + +#: src/gui/gui-keyboard.c:101 +msgid "clear hotlist" +msgstr "effacer la liste d'activité" + +#: src/gui/gui-keyboard.c:399 src/common/command.c:1470 +#, c-format +msgid "%s unable to bind key \"%s\"\n" +msgstr "%s impossible de créer la touche \"%s\"\n" + +#: src/gui/gui-keyboard.c:410 +#, c-format +msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" +msgstr "" +"%s impossible de créer la touche \"%s\" (nom fonction incorrect: \"%s\")\n" + +#: src/gui/gui-keyboard.c:423 +#, c-format +msgid "%s not enough memory for key binding\n" +msgstr "%s pas assez de mémoire pour la touche\n" + #: src/common/command.c:42 msgid "create an alias for a command" msgstr "créer un alias pour une commande" @@ -2667,11 +2803,6 @@ msgstr "" "%s le paramètre \"-yes\" est requis pour la réinitialisation des touches " "(raison de sécurité)\n" -#: src/common/command.c:1470 -#, c-format -msgid "%s unable to bind key \"%s\"\n" -msgstr "%s impossible de créer la touche \"%s\"\n" - #: src/common/command.c:1497 src/common/command.c:1640 #, c-format msgid "Registered %s scripts:\n" diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index e6d8e8350..21c620580 100644 --- a/weechat/po/weechat.pot +++ b/weechat/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: 2005-07-09 17:25+0200\n" +"POT-Creation-Date: 2005-07-09 18:34+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2039,6 +2039,141 @@ msgstr "" msgid "Not enough memory for new message\n" msgstr "" +#: src/gui/gui-keyboard.c:43 +msgid "terminate line" +msgstr "" + +#: src/gui/gui-keyboard.c:45 +msgid "complete word" +msgstr "" + +#: src/gui/gui-keyboard.c:47 +msgid "delete previous char" +msgstr "" + +#: src/gui/gui-keyboard.c:49 +msgid "delete next char" +msgstr "" + +#: src/gui/gui-keyboard.c:51 +msgid "delete until end of line" +msgstr "" + +#: src/gui/gui-keyboard.c:53 +msgid "delete until beginning of line" +msgstr "" + +#: src/gui/gui-keyboard.c:55 +msgid "delete entire line" +msgstr "" + +#: src/gui/gui-keyboard.c:57 +msgid "delete previous word" +msgstr "" + +#: src/gui/gui-keyboard.c:59 +msgid "delete next word" +msgstr "" + +#: src/gui/gui-keyboard.c:61 +msgid "go to beginning of line" +msgstr "" + +#: src/gui/gui-keyboard.c:63 +msgid "go to end of line" +msgstr "" + +#: src/gui/gui-keyboard.c:65 +msgid "move one char left" +msgstr "" + +#: src/gui/gui-keyboard.c:67 +msgid "move to previous word" +msgstr "" + +#: src/gui/gui-keyboard.c:69 +msgid "move one char right" +msgstr "" + +#: src/gui/gui-keyboard.c:71 +msgid "move to next word" +msgstr "" + +#: src/gui/gui-keyboard.c:73 +msgid "call previous command in history" +msgstr "" + +#: src/gui/gui-keyboard.c:75 +msgid "call next command in history" +msgstr "" + +#: src/gui/gui-keyboard.c:77 +msgid "scroll one page up" +msgstr "" + +#: src/gui/gui-keyboard.c:79 +msgid "scroll one page down" +msgstr "" + +#: src/gui/gui-keyboard.c:81 +msgid "clear infobar" +msgstr "" + +#: src/gui/gui-keyboard.c:83 +msgid "scroll nicklist one page up" +msgstr "" + +#: src/gui/gui-keyboard.c:85 +msgid "scroll nicklist one page down" +msgstr "" + +#: src/gui/gui-keyboard.c:87 +msgid "display beginning of nicklist" +msgstr "" + +#: src/gui/gui-keyboard.c:89 +msgid "display end of nicklist" +msgstr "" + +#: src/gui/gui-keyboard.c:91 +msgid "refresh screen" +msgstr "" + +#: src/gui/gui-keyboard.c:93 +msgid "jump to buffer with activity" +msgstr "" + +#: src/gui/gui-keyboard.c:95 +msgid "jump to DCC buffer" +msgstr "" + +#: src/gui/gui-keyboard.c:97 +msgid "jump to server buffer" +msgstr "" + +#: src/gui/gui-keyboard.c:99 +msgid "jump to next server" +msgstr "" + +#: src/gui/gui-keyboard.c:101 +msgid "clear hotlist" +msgstr "" + +#: src/gui/gui-keyboard.c:399 src/common/command.c:1470 +#, c-format +msgid "%s unable to bind key \"%s\"\n" +msgstr "" + +#: src/gui/gui-keyboard.c:410 +#, c-format +msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" +msgstr "" + +#: src/gui/gui-keyboard.c:423 +#, c-format +msgid "%s not enough memory for key binding\n" +msgstr "" + #: src/common/command.c:42 msgid "create an alias for a command" msgstr "" @@ -2473,11 +2608,6 @@ msgstr "" msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" -#: src/common/command.c:1470 -#, c-format -msgid "%s unable to bind key \"%s\"\n" -msgstr "" - #: src/common/command.c:1497 src/common/command.c:1640 #, c-format msgid "Registered %s scripts:\n" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index 977568fee..beeb2cb83 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -1418,8 +1418,9 @@ weechat_cmd_key (char *arguments) i = 0; while (gui_key_functions[i].function_name) { - gui_printf (NULL, " %s\n", - gui_key_functions[i].function_name); + gui_printf (NULL, "%25s %s\n", + gui_key_functions[i].function_name, + _(gui_key_functions[i].description)); i++; } } @@ -1428,7 +1429,7 @@ weechat_cmd_key (char *arguments) arguments += 5; while (arguments[0] == ' ') arguments++; - if (strcmp (arguments, "-yes") == 0) + if (strcasecmp (arguments, "-yes") == 0) { gui_key_free_all (); gui_key_init (); diff --git a/weechat/src/common/weechat.c b/weechat/src/common/weechat.c index 0eb311d25..c3f9a8352 100644 --- a/weechat/src/common/weechat.c +++ b/weechat/src/common/weechat.c @@ -326,8 +326,9 @@ void wee_display_key_functions () i = 0; while (gui_key_functions[i].function_name) { - printf (" %s\n", - gui_key_functions[i].function_name); + printf ("* %s: %s\n", + gui_key_functions[i].function_name, + _(gui_key_functions[i].description)); i++; } } @@ -346,7 +347,7 @@ void wee_display_keys () for (ptr_key = gui_keys; ptr_key; ptr_key = ptr_key->next_key) { expanded_name = gui_key_get_expanded_name (ptr_key->key); - printf (" %20s => %s\n", + printf ("* %s => %s\n", (expanded_name) ? expanded_name : ptr_key->key, (ptr_key->function) ? gui_key_function_search_by_ptr (ptr_key->function) : ptr_key->command); if (expanded_name)