diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt index 1f3c9d02e..fadfb1336 100644 --- a/doc/en/autogen/user/weechat_commands.txt +++ b/doc/en/autogen/user/weechat_commands.txt @@ -45,12 +45,12 @@ /bar scroll nicklist * ye ........................................ -• *`/buffer`* `[clear [number | -all] | move number | merge number | unmerge [number] | close [n1[-n2]]| list | notify level | localvar | set property value | number | name]`:: +• *`/buffer`* `[clear [number | -merged | -all] | move number | merge number | unmerge [number] | close [n1[-n2]] | list | notify level | localvar | set property value | number | name]`:: ........................................ manage buffers - clear: clear buffer content (-all for all buffers, number for a buffer, or nothing for current buffer) + clear: clear buffer content (number for a buffer, -merged for merged buffers, -all for all buffers, or nothing for current buffer) move: move buffer in the list (may be relative, for example -1) merge: merge current buffer to another buffer (chat area will be mix of both buffers) (by default ctrl-x switches between merged buffers) diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index ba2f0d09d..2ded851e3 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -54,7 +54,7 @@ ** valeurs: toute chaîne (valeur par défaut: "irc_privmsg,irc_notice") * *irc.look.item_display_server* -** description: name of bar item where IRC server is displayed (for status bar) +** description: nom de l'objet de barre où est affiché le serveur IRC (pour la barre de statut) ** type: entier ** valeurs: buffer_plugin, buffer_name (valeur par défaut: buffer_plugin) diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt index 02cee7365..9dd8e8c2c 100644 --- a/doc/fr/autogen/user/weechat_commands.txt +++ b/doc/fr/autogen/user/weechat_commands.txt @@ -45,12 +45,12 @@ /bar scroll nicklist * ye ........................................ -• *`/buffer`* `[clear [nombre | -all] | move nombre | merge nombre | unmerge [nombre] | close [n1[-n2]] | list | notify niveau | localvar | set propriété valeur | nombre | nom]`:: +• *`/buffer`* `[clear [nombre | -merged | -all] | move nombre | merge nombre | unmerge [nombre] | close [n1[-n2]] | list | notify niveau | localvar | set propriété valeur | nombre | nom]`:: ........................................ gestion des tampons - clear: efface le contenu du tampon (-all pour tous les tampons, un numéro pour un tampon, ou rien pour le tampon courant) + clear: efface le contenu du tampon (un numéro pour un tampon, -merged pour les tampons mélangés, -all pour tous les tampons, ou rien pour le tampon courant) move: déplace le tampon dans la liste (peut être relatif, par exemple -1) merge: mélange le tampon courant avec un autre tampon (la zone de discussion sera un mélange des deux tampons) (par défaut ctrl-x bascule entre les tampons mélangés) diff --git a/po/cs.po b/po/cs.po index a66bc1a81..41888fb43 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-12 16:00+0200\n" +"POT-Creation-Date: 2009-06-14 10:45+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -771,15 +771,15 @@ msgid "manage buffers" msgstr "řídit buffery" msgid "" -"[clear [number | -all] | move number | merge number | unmerge [number] | " -"close [n1[-n2]]| list | notify level | localvar | set property value | " -"number | name]" +"[clear [number | -merged | -all] | move number | merge number | unmerge " +"[number] | close [n1[-n2]] | list | notify level | localvar | set property " +"value | number | name]" msgstr "" #, fuzzy msgid "" -" clear: clear buffer content (-all for all buffers, number for a buffer, " -"or nothing for current buffer)\n" +" clear: clear buffer content (number for a buffer, -merged for merged " +"buffers, -all for all buffers, or nothing for current buffer)\n" " move: move buffer in the list (may be relative, for example -1)\n" " merge: merge current buffer to another buffer (chat area will be mix of " "both buffers)\n" diff --git a/po/de.po b/po/de.po index b5f211ceb..df48dfe9e 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-12 16:00+0200\n" +"POT-Creation-Date: 2009-06-14 10:45+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: weechat-dev \n" @@ -828,15 +828,15 @@ msgid "manage buffers" msgstr "Puffer verwalten" msgid "" -"[clear [number | -all] | move number | merge number | unmerge [number] | " -"close [n1[-n2]]| list | notify level | localvar | set property value | " -"number | name]" +"[clear [number | -merged | -all] | move number | merge number | unmerge " +"[number] | close [n1[-n2]] | list | notify level | localvar | set property " +"value | number | name]" msgstr "" #, fuzzy msgid "" -" clear: clear buffer content (-all for all buffers, number for a buffer, " -"or nothing for current buffer)\n" +" clear: clear buffer content (number for a buffer, -merged for merged " +"buffers, -all for all buffers, or nothing for current buffer)\n" " move: move buffer in the list (may be relative, for example -1)\n" " merge: merge current buffer to another buffer (chat area will be mix of " "both buffers)\n" diff --git a/po/es.po b/po/es.po index 1291d55f1..a37b05bd9 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-12 16:00+0200\n" +"POT-Creation-Date: 2009-06-14 10:45+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Roberto González Cardenete \n" "Language-Team: weechat-dev \n" @@ -824,15 +824,15 @@ msgid "manage buffers" msgstr "gestionar los búfers" msgid "" -"[clear [number | -all] | move number | merge number | unmerge [number] | " -"close [n1[-n2]]| list | notify level | localvar | set property value | " -"number | name]" +"[clear [number | -merged | -all] | move number | merge number | unmerge " +"[number] | close [n1[-n2]] | list | notify level | localvar | set property " +"value | number | name]" msgstr "" #, fuzzy msgid "" -" clear: clear buffer content (-all for all buffers, number for a buffer, " -"or nothing for current buffer)\n" +" clear: clear buffer content (number for a buffer, -merged for merged " +"buffers, -all for all buffers, or nothing for current buffer)\n" " move: move buffer in the list (may be relative, for example -1)\n" " merge: merge current buffer to another buffer (chat area will be mix of " "both buffers)\n" diff --git a/po/fr.po b/po/fr.po index 50d95157e..78c1ecb0b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-12 16:00+0200\n" -"PO-Revision-Date: 2009-06-12 16:00+0200\n" +"POT-Creation-Date: 2009-06-14 10:45+0200\n" +"PO-Revision-Date: 2009-06-14 10:45+0200\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -827,17 +827,17 @@ msgid "manage buffers" msgstr "gestion des tampons" msgid "" -"[clear [number | -all] | move number | merge number | unmerge [number] | " -"close [n1[-n2]]| list | notify level | localvar | set property value | " -"number | name]" +"[clear [number | -merged | -all] | move number | merge number | unmerge " +"[number] | close [n1[-n2]] | list | notify level | localvar | set property " +"value | number | name]" msgstr "" -"[clear [nombre | -all] | move nombre | merge nombre | unmerge [nombre] | " -"close [n1[-n2]] | list | notify niveau | localvar | set propriété valeur | " -"nombre | nom]" +"[clear [nombre | -merged | -all] | move nombre | merge nombre | unmerge " +"[nombre] | close [n1[-n2]] | list | notify niveau | localvar | set propriété " +"valeur | nombre | nom]" msgid "" -" clear: clear buffer content (-all for all buffers, number for a buffer, " -"or nothing for current buffer)\n" +" clear: clear buffer content (number for a buffer, -merged for merged " +"buffers, -all for all buffers, or nothing for current buffer)\n" " move: move buffer in the list (may be relative, for example -1)\n" " merge: merge current buffer to another buffer (chat area will be mix of " "both buffers)\n" @@ -872,8 +872,9 @@ msgid "" " jump to #weechat: /buffer #weechat\n" " jump to next buffer: /buffer +1" msgstr "" -" clear: efface le contenu du tampon (-all pour tous les tampons, un numéro " -"pour un tampon, ou rien pour le tampon courant)\n" +" clear: efface le contenu du tampon (un numéro pour un tampon, -merged " +"pour les tampons mélangés, -all pour tous les tampons, ou rien pour le " +"tampon courant)\n" " move: déplace le tampon dans la liste (peut être relatif, par exemple -" "1)\n" " merge: mélange le tampon courant avec un autre tampon (la zone de " diff --git a/po/hu.po b/po/hu.po index 15387393a..0ed9e8eb7 100644 --- a/po/hu.po +++ b/po/hu.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-12 16:00+0200\n" +"POT-Creation-Date: 2009-06-14 10:45+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -828,15 +828,15 @@ msgid "manage buffers" msgstr "pufferek kezelése" msgid "" -"[clear [number | -all] | move number | merge number | unmerge [number] | " -"close [n1[-n2]]| list | notify level | localvar | set property value | " -"number | name]" +"[clear [number | -merged | -all] | move number | merge number | unmerge " +"[number] | close [n1[-n2]] | list | notify level | localvar | set property " +"value | number | name]" msgstr "" #, fuzzy msgid "" -" clear: clear buffer content (-all for all buffers, number for a buffer, " -"or nothing for current buffer)\n" +" clear: clear buffer content (number for a buffer, -merged for merged " +"buffers, -all for all buffers, or nothing for current buffer)\n" " move: move buffer in the list (may be relative, for example -1)\n" " merge: merge current buffer to another buffer (chat area will be mix of " "both buffers)\n" diff --git a/po/pl.po b/po/pl.po index f0341c35d..d55dd9b0f 100644 --- a/po/pl.po +++ b/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-12 16:00+0200\n" +"POT-Creation-Date: 2009-06-14 10:45+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: \n" "Language-Team: Polish\n" @@ -770,14 +770,14 @@ msgid "manage buffers" msgstr "" msgid "" -"[clear [number | -all] | move number | merge number | unmerge [number] | " -"close [n1[-n2]]| list | notify level | localvar | set property value | " -"number | name]" +"[clear [number | -merged | -all] | move number | merge number | unmerge " +"[number] | close [n1[-n2]] | list | notify level | localvar | set property " +"value | number | name]" msgstr "" msgid "" -" clear: clear buffer content (-all for all buffers, number for a buffer, " -"or nothing for current buffer)\n" +" clear: clear buffer content (number for a buffer, -merged for merged " +"buffers, -all for all buffers, or nothing for current buffer)\n" " move: move buffer in the list (may be relative, for example -1)\n" " merge: merge current buffer to another buffer (chat area will be mix of " "both buffers)\n" diff --git a/po/ru.po b/po/ru.po index bab6157fa..3ba86d7aa 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.0-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2009-06-12 16:00+0200\n" +"POT-Creation-Date: 2009-06-14 10:45+0200\n" "PO-Revision-Date: 2009-05-11 13:02+0200\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -822,15 +822,15 @@ msgid "manage buffers" msgstr "управление буферами" msgid "" -"[clear [number | -all] | move number | merge number | unmerge [number] | " -"close [n1[-n2]]| list | notify level | localvar | set property value | " -"number | name]" +"[clear [number | -merged | -all] | move number | merge number | unmerge " +"[number] | close [n1[-n2]] | list | notify level | localvar | set property " +"value | number | name]" msgstr "" #, fuzzy msgid "" -" clear: clear buffer content (-all for all buffers, number for a buffer, " -"or nothing for current buffer)\n" +" clear: clear buffer content (number for a buffer, -merged for merged " +"buffers, -all for all buffers, or nothing for current buffer)\n" " move: move buffer in the list (may be relative, for example -1)\n" " merge: merge current buffer to another buffer (chat area will be mix of " "both buffers)\n" diff --git a/po/weechat.pot b/po/weechat.pot index 501fb2dea..0d44d8177 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-06-12 16:00+0200\n" +"POT-Creation-Date: 2009-06-14 10:45+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -738,14 +738,14 @@ msgid "manage buffers" msgstr "" msgid "" -"[clear [number | -all] | move number | merge number | unmerge [number] | " -"close [n1[-n2]]| list | notify level | localvar | set property value | " -"number | name]" +"[clear [number | -merged | -all] | move number | merge number | unmerge " +"[number] | close [n1[-n2]] | list | notify level | localvar | set property " +"value | number | name]" msgstr "" msgid "" -" clear: clear buffer content (-all for all buffers, number for a buffer, " -"or nothing for current buffer)\n" +" clear: clear buffer content (number for a buffer, -merged for merged " +"buffers, -all for all buffers, or nothing for current buffer)\n" " move: move buffer in the list (may be relative, for example -1)\n" " merge: merge current buffer to another buffer (chat area will be mix of " "both buffers)\n" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 6076cb758..4a50e1adf 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -536,6 +536,18 @@ command_buffer (void *data, struct t_gui_buffer *buffer, { if (string_strcasecmp (argv[2], "-all") == 0) gui_buffer_clear_all (); + else if (string_strcasecmp (argv[2], "-merged") == 0) + { + for (ptr_buffer = gui_buffers; ptr_buffer; + ptr_buffer = ptr_buffer->next_buffer) + { + if ((ptr_buffer->number == buffer->number) + && (ptr_buffer->type == GUI_BUFFER_TYPE_FORMATTED)) + { + gui_buffer_clear (ptr_buffer); + } + } + } else { for (i = 2; i < argc; i++) @@ -3963,11 +3975,13 @@ command_init () &command_bar, NULL); hook_command (NULL, "buffer", N_("manage buffers"), - N_("[clear [number | -all] | move number | merge number | " - "unmerge [number] | close [n1[-n2]]| list | notify level | " - "localvar | set property value | number | name]"), - N_(" clear: clear buffer content (-all for all buffers, " - "number for a buffer, or nothing for current buffer)\n" + N_("[clear [number | -merged | -all] | move number | " + "merge number | unmerge [number] | close [n1[-n2]] | " + "list | notify level | localvar | set property value | " + "number | name]"), + N_(" clear: clear buffer content (number for a buffer, " + "-merged for merged buffers, -all for all buffers, or " + "nothing for current buffer)\n" " move: move buffer in the list (may be relative, for " "example -1)\n" " merge: merge current buffer to another buffer (chat " @@ -4004,7 +4018,7 @@ command_init () " close buffers 5 to 7: /buffer close 5-7\n" " jump to #weechat: /buffer #weechat\n" " jump to next buffer: /buffer +1"), - "clear -all|%(buffers_numbers)" + "clear -merged|-all|%(buffers_numbers)" " || move %(buffers_numbers)" " || merge %(buffers_numbers)" " || unmerge %(buffers_numbers)"