From 91f792416bd40c8e47d7f035e15f49732be368ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 6 Jan 2018 14:19:50 +0100 Subject: [PATCH] core: add option "add" in command /buffer (issue #1113) --- ChangeLog.adoc | 1 + doc/de/autogen/user/weechat_commands.adoc | 84 ++++++++-------- doc/en/autogen/user/weechat_commands.adoc | 2 + doc/fr/autogen/user/weechat_commands.adoc | 2 + doc/it/autogen/user/weechat_commands.adoc | 2 + doc/ja/autogen/user/weechat_commands.adoc | 84 ++++++++-------- doc/pl/autogen/user/weechat_commands.adoc | 112 +++++++++++----------- po/cs.po | 23 +++-- po/de.po | 25 +++-- po/es.po | 23 +++-- po/fr.po | 42 ++++---- po/hu.po | 23 +++-- po/it.po | 23 +++-- po/ja.po | 25 +++-- po/pl.po | 25 +++-- po/pt.po | 25 +++-- po/pt_BR.po | 23 +++-- po/ru.po | 23 +++-- po/tr.po | 23 +++-- po/weechat.pot | 23 +++-- src/core/wee-command.c | 73 +++++++++++++- src/gui/gui-buffer.c | 6 ++ src/gui/gui-buffer.h | 1 + 23 files changed, 442 insertions(+), 251 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 844d13050..6f38cc272 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -20,6 +20,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] New features:: + * core: add option "add" in command /buffer (issue #1113) * core: add option weechat.completion.partial_completion_templates to force partial completion on specific templates * api: add hashtable with variables in plugin structure * scripts: add "eval" option in script commands and info "xxx_eval" (python, perl, ruby, lua and guile) (issue #128) diff --git a/doc/de/autogen/user/weechat_commands.adoc b/doc/de/autogen/user/weechat_commands.adoc index 96774ba9b..4d864ef01 100644 --- a/doc/de/autogen/user/weechat_commands.adoc +++ b/doc/de/autogen/user/weechat_commands.adoc @@ -69,6 +69,7 @@ Beispiele: ---- /buffer list + add [-free] [-switch] clear [||-merged|-all [|...]] move |-|+ swap | [|] @@ -85,59 +86,60 @@ Beispiele: get |-|+| - list: alle geöffneten Buffer werden aufgelistet (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben) - clear: leert den Inhalt des Buffers (entweder durch Angabe der entsprechenden Nummer des Buffers oder "-merged " für zusammengefügte Buffer oder "-all" für alle Buffer. Ohne Angabe eines Arguments wird der aktuelle Buffer gelöscht) - move: Buffer in der Liste verschieben (kann auch relativ sein, z.B. -1); "-" = auf erste Position verschieben, "+" = auf letzte Position + 1 verschieben - swap: tauscht zwei Buffer miteinander aus (bei Angabe von nur einem Buffer (Buffernummer/-name), wird der aktuelle Buffer mit dem angegebenen Buffer getauscht) - cycle: springt in einer Schleife von einem Buffer zum nächsten, die in einer Liste angegeben werden - merge: fügt den aktuellen Buffer mit einem anderen Buffer zusammen (bei einem Chat-Buffer entsteht eine Zusammenfügung von zwei Buffer - (Bei der Standardtastenbelegung kann mittels "CTRL-x" zwischen zusammengefügten Buffern umgeschaltet werden) - unmerge: trennt Buffer wieder voneinander, falls zwei Buffer die selbe Nummer teilen - hide: versteckt einen Buffer - unhide: macht Buffer wieder sichtbar -renumber: Buffer werden um nummeriert (Einstellung weechat.look.buffer_auto_renumber muss deaktiviert sein) - close: Buffer schließen (Nummer oder Bereich ist optional) - notify: setzt den Status der Benachrichtigung für den aktuellen Buffer. Folgende Möglichkeiten bestimmen den Grad der Benachrichtigung: - none: keine Benachrichtigung - highlight: Benachrichtigung bei hervorgehobenen Nachrichten (Highlights) - message: Benachrichtigung bei Nachrichten von Usern + Highlights - all: Benachrichtigung bei allen Nachrichten - reset: Benachrichtigung auf Standardwert zurück setzen (all) -localvar: zeigt die lokalen Variablen für den aktuellen Buffer an - set: setzt eine Eigenschaft für den aktuellen Buffer - get: zeigt eine Eigenschaft für den aktuellen Buffer an - number: wechselt von einem Buffer zu einem anderen, mögliche Optionen: - '+': relativer Sprung um 'n'-Buffer - '-': relativer Sprung, um 'n'-Buffer - '*': wechselt zum Buffer mit der Nummer 'n'; nutzt die interne Einstellung "weechat.look.jump_current_to_previous_buffer" - -: springt zum ersten Buffer - +: springt zum letzten Buffer - name: wechselt zum Buffer mit dem angegebenen Namen + list: list buffers (without argument, this list is displayed) + add: add a new buffer (it can be closed with "/buffer close" or input "q") + 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); "-" = move to first buffer number, "+" = move to last buffer number + 1 + swap: swap two buffers (swap with current buffer if only one number/name given) + cycle: jump loop between a list of buffers + merge: merge current buffer to another buffer (chat area will be mix of both buffers) + (by default ctrl-x switches between merged buffers) + unmerge: unmerge buffer from other buffers which have same number + hide: hide the buffer + unhide: unhide the buffer +renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) + close: close buffer (number/range or name is optional) + notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: + none: never + highlight: for highlights only + message: for messages from users + highlights + all: all messages + reset: reset to default value (all) +localvar: display local variables for current buffer + set: set a property for current buffer + get: display a property of current buffer + number: jump to buffer by number, possible prefix: + '+': relative jump, add number to current + '-': relative jump, sub number to current + '*': jump to number, using option "weechat.look.jump_current_to_previous_buffer" + -: jump to first buffer number + +: jump to last buffer number + name: jump to buffer by (partial) name -Beispiele: - leert den aktuellen Buffer: +Examples: + clear current buffer: /buffer clear - verschiebt Buffer auf Position 5: + move buffer to number 5: /buffer move 5 - tauscht Buffer 1 und 3: + swap buffer 1 with 3: /buffer swap 1 3 - tauscht Buffer #weechat und den aktuellen Buffer: + swap buffer #weechat with current buffer: /buffer swap #weechat - springt in einer Schleife zu den Buffern #chan1, #chan2, #chan3: + jump on #chan1, #chan2, #chan3 and loop: /buffer cycle #chan1 #chan2 #chan3 - verbindet Buffer mit dem Core-Buffer: + merge with core buffer: /buffer merge 1 - trennt Buffer voneinander: + unmerge buffer: /buffer unmerge - schließt aktuellen Buffer: + close current buffer: /buffer close - schließt Buffer 5 bis 7: + close buffers 5 to 7: /buffer close 5-7 - wechselt zum Buffer: #weechat: + jump to #weechat: /buffer #weechat - wechselt zum nächsten Buffer: + jump to next buffer: /buffer +1 - springt zum letzten Buffer: + jump to last buffer number: /buffer + ---- diff --git a/doc/en/autogen/user/weechat_commands.adoc b/doc/en/autogen/user/weechat_commands.adoc index 26829031a..9a1e4c939 100644 --- a/doc/en/autogen/user/weechat_commands.adoc +++ b/doc/en/autogen/user/weechat_commands.adoc @@ -69,6 +69,7 @@ Examples: ---- /buffer list + add [-free] [-switch] clear [||-merged|-all [|...]] move |-|+ swap | [|] @@ -86,6 +87,7 @@ Examples: |-|+| list: list buffers (without argument, this list is displayed) + add: add a new buffer (it can be closed with "/buffer close" or input "q") 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); "-" = move to first buffer number, "+" = move to last buffer number + 1 swap: swap two buffers (swap with current buffer if only one number/name given) diff --git a/doc/fr/autogen/user/weechat_commands.adoc b/doc/fr/autogen/user/weechat_commands.adoc index 150bb89de..52a1d97cd 100644 --- a/doc/fr/autogen/user/weechat_commands.adoc +++ b/doc/fr/autogen/user/weechat_commands.adoc @@ -69,6 +69,7 @@ Exemples : ---- /buffer list + add [-free] [-switch] clear [||-merged|-all [|...]] move |-|+ swap | [|] @@ -86,6 +87,7 @@ Exemples : | list : lister les tampons ouverts (sans paramètre, cette liste est affichée) + add : ajouter un nouveau tampon (il peut être fermé avec "/buffer close" ou l'entrée "q") clear : effacer 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éplacer le tampon dans la liste (peut être relatif, par exemple -1) ; "-" = déplacer vers le premier numéro de tampon, "+" = déplacer vers le dernier numéro de tampon + 1 swap : échanger deux tampons (échanger avec le tampon courant si un seul numéro/nom donné) diff --git a/doc/it/autogen/user/weechat_commands.adoc b/doc/it/autogen/user/weechat_commands.adoc index e2b379f0d..f39208bfd 100644 --- a/doc/it/autogen/user/weechat_commands.adoc +++ b/doc/it/autogen/user/weechat_commands.adoc @@ -69,6 +69,7 @@ Examples: ---- /buffer list + add [-free] [-switch] clear [||-merged|-all [|...]] move |-|+ swap | [|] @@ -86,6 +87,7 @@ Examples: |-|+| list: list buffers (without argument, this list is displayed) + add: add a new buffer (it can be closed with "/buffer close" or input "q") 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); "-" = move to first buffer number, "+" = move to last buffer number + 1 swap: swap two buffers (swap with current buffer if only one number/name given) diff --git a/doc/ja/autogen/user/weechat_commands.adoc b/doc/ja/autogen/user/weechat_commands.adoc index 1b99ca951..a841df508 100644 --- a/doc/ja/autogen/user/weechat_commands.adoc +++ b/doc/ja/autogen/user/weechat_commands.adoc @@ -69,6 +69,7 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態 ---- /buffer list + add [-free] [-switch] clear [||-merged|-all [|...]] move |-|+ swap | [|] @@ -85,59 +86,60 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態 get |-|+| - list: バッファをリストアップ (引数無しの場合、このリストが表示されます) - clear: バッファの内容を削除 (number はバッファ番号、マージバッファに対しては -merged、全てのバッファに対しては -all、何も無ければ現在のバッファ) - move: リストにバッファを移動 (相対指定も可能、例えば -1); "-" = 最初のバッファ番号に移動、"+" = 最後のバッファ番号 + 1 に移動 - swap: 2 つのバッファを入れ替え (現在のバッファと引数で与えた番号/名称で指定されるバッファを入れ替える) - cycle: 指定したバッファ間でバッファを循環させる - merge: 現在のバッファを他のバッファにマージ (2 つのバッファのチャットエリアが一緒になります) - (デフォルトでは ctrl-x でマージバッファの切り替え) - unmerge: 同じ番号を持つ他のバッファとのマージを解除 - hide: バッファを隠す - unhide: バッファを隠すことを止める -renumber: バッファを記憶 (weechat.look.buffer_auto_renumber オプションがオフの場合にのみ有効) - close: バッファを閉じる (番号/範囲または名前は任意) - notify: 現在のバッファの通知レベルを設定: このレベルでバッファがホットリストに追加されるかどうかを定義します: - none: 通知しない - highlight: ハイライトがあった場合のみ通知 - message: ユーザからのメッセージとハイライトがあった場合に通知 - all: 全てのメッセージを通知 - reset: デフォルトの値 (all) にリセット -localvar: 現在のバッファのローカル変数を表示 - set: 現在のバッファのプロパティを設定 - get: 現在のバッファのプロパティを表示 - number: 番号でバッファ移動、可能なプレフィックス: - '+': 相対移動、現在の番号に数を足す - '-': 相対移動、現在の番号から数を引く - '*': 番号に移動、オプション "weechat.look.jump_current_to_previous_buffer" が使われる - -: 最初のバッファ番号に移動 - +: 最後のバッファ番号に移動 - name: バッファ名 (一部) でバッファに移動 + list: list buffers (without argument, this list is displayed) + add: add a new buffer (it can be closed with "/buffer close" or input "q") + 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); "-" = move to first buffer number, "+" = move to last buffer number + 1 + swap: swap two buffers (swap with current buffer if only one number/name given) + cycle: jump loop between a list of buffers + merge: merge current buffer to another buffer (chat area will be mix of both buffers) + (by default ctrl-x switches between merged buffers) + unmerge: unmerge buffer from other buffers which have same number + hide: hide the buffer + unhide: unhide the buffer +renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) + close: close buffer (number/range or name is optional) + notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: + none: never + highlight: for highlights only + message: for messages from users + highlights + all: all messages + reset: reset to default value (all) +localvar: display local variables for current buffer + set: set a property for current buffer + get: display a property of current buffer + number: jump to buffer by number, possible prefix: + '+': relative jump, add number to current + '-': relative jump, sub number to current + '*': jump to number, using option "weechat.look.jump_current_to_previous_buffer" + -: jump to first buffer number + +: jump to last buffer number + name: jump to buffer by (partial) name -例: - 現在のバッファの内容を消去: +Examples: + clear current buffer: /buffer clear - バッファを 5 番に移動: + move buffer to number 5: /buffer move 5 - バッファ 1 番と 3 番を入れ替え: + swap buffer 1 with 3: /buffer swap 1 3 - 現在のバッファと #weechat バッファを入れ替え: + swap buffer #weechat with current buffer: /buffer swap #weechat - #chan1、#chan2、#chan3 に移動してそれを繰り返す: + jump on #chan1, #chan2, #chan3 and loop: /buffer cycle #chan1 #chan2 #chan3 - コアバッファとマージ: + merge with core buffer: /buffer merge 1 - バッファマージの解除: + unmerge buffer: /buffer unmerge - 現在のバッファを閉じる: + close current buffer: /buffer close - バッファ番号 5 から 7 を閉じる: + close buffers 5 to 7: /buffer close 5-7 - #weechat バッファに移動: + jump to #weechat: /buffer #weechat - 次のバッファに移動: + jump to next buffer: /buffer +1 - 最後のバッファ番号に移動: + jump to last buffer number: /buffer + ---- diff --git a/doc/pl/autogen/user/weechat_commands.adoc b/doc/pl/autogen/user/weechat_commands.adoc index 0d532db6a..0391e14fe 100644 --- a/doc/pl/autogen/user/weechat_commands.adoc +++ b/doc/pl/autogen/user/weechat_commands.adoc @@ -69,75 +69,77 @@ Przykłady: ---- /buffer list - clear [||-merged|-all [|...]] - move |-|+ - swap | [|] - cycle | [|...] - merge - unmerge [|-all] - hide [||-all [|...]] - unhide [||-all [|...]] - renumber [ [ []]] - close [[-]|] - notify + add [-free] [-switch] + clear [||-merged|-all [|...]] + move |-|+ + swap | [|] + cycle | [|...] + merge + unmerge [|-all] + hide [||-all [|...]] + unhide [||-all [|...]] + renumber [ [ []]] + close [[-]|] + notify localvar - set [] - get - |-|+| + set [] + get + |-|+| - list: wyświetla listę buforów (bez podania argumenty wyświetlana jest ta lista) - clear: czyści zawartość bufora (numer bufora, -merged dla połączonych buforów, -all dla wszystkich buforów, lub nic dla obecnego bufora) - move: przesuwa bufor na liście (może być względne, np -1); "-" = przesuwa na pierwszy numer, "+" = przesuwa na ostatni numer bufora +1 - swap: zamienia miejscami dwa bufory (zamienia z obecnym buforem, jeśli podano tylko jeden numer/nazwę) - cycle: przełącza w pętli między listą buforów - merge: łączy obecny bufor z innym (obszar rozmowy zostanie pomieszany między oba bufory) - (domyślnie ctrl-x przełącza pomiędzy połączonymi buforami) - unmerge: odłącza bufor od innych mających taki sam numer - hide: ukrywa bufor - unhide: przywraca ukryty bufor -renumber: zmienia numer bufora (działa tylko, jeśli opcja weechat.look.buffer_auto_renumber jest wyłączona) - close: zamyka bufor (numer/przedział są opcjonalne) - notify: ustawia poziom powiadomień dla obecnego bufora: ten poziom określa czy bufor zostanie dodany do hotlisty czy nie: - none: nigdy - highlight: tylko dla higlightów - message: wiadomości od użytkowników + highlighty - all: wszystkie wiadomości - reset: przywraca wartości domyślne (all) -localvar: wyświetla zmienne lokalne obecnego bufora - set: ustawia właściwość obecnego bufora - get: wyświetla właściwości obecnego bufora - numer: przechodzi do bufora o numerze, dostępne prefiksy: - '+': przejście względne, dodaje numer do obecnego - '-': przejście względne, odejmuje numer od obecnego - '*': przejście do numeru, używając opcji "weechat.look.jump_current_to_previous_buffer" - -: przejście do pierwszego bufora - +: przejście do ostatniego bufora - nazwa: przejście do bufora o (częściowej) nazwie + list: list buffers (without argument, this list is displayed) + add: add a new buffer (it can be closed with "/buffer close" or input "q") + 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); "-" = move to first buffer number, "+" = move to last buffer number + 1 + swap: swap two buffers (swap with current buffer if only one number/name given) + cycle: jump loop between a list of buffers + merge: merge current buffer to another buffer (chat area will be mix of both buffers) + (by default ctrl-x switches between merged buffers) + unmerge: unmerge buffer from other buffers which have same number + hide: hide the buffer + unhide: unhide the buffer +renumber: renumber buffers (works only if option weechat.look.buffer_auto_renumber is off) + close: close buffer (number/range or name is optional) + notify: set notify level for current buffer: this level determines whether buffer will be added to hotlist or not: + none: never + highlight: for highlights only + message: for messages from users + highlights + all: all messages + reset: reset to default value (all) +localvar: display local variables for current buffer + set: set a property for current buffer + get: display a property of current buffer + number: jump to buffer by number, possible prefix: + '+': relative jump, add number to current + '-': relative jump, sub number to current + '*': jump to number, using option "weechat.look.jump_current_to_previous_buffer" + -: jump to first buffer number + +: jump to last buffer number + name: jump to buffer by (partial) name -Przykłady: - czyści zawartość obecnego bufora: +Examples: + clear current buffer: /buffer clear - przenosi bufor na numer 5: + move buffer to number 5: /buffer move 5 - zamienia bufor 1 z 3: + swap buffer 1 with 3: /buffer swap 1 3 - zamienia bufor #weechat z obecnym buforem: + swap buffer #weechat with current buffer: /buffer swap #weechat - przełączajw pętli między #chan1, #chan2, #chan3: + jump on #chan1, #chan2, #chan3 and loop: /buffer cycle #chan1 #chan2 #chan3 - łączy z głównym buforem: + merge with core buffer: /buffer merge 1 - odłącza bufory: + unmerge buffer: /buffer unmerge - zamyka obecny bufor: + close current buffer: /buffer close - zamyka bufory od 5 do 7: + close buffers 5 to 7: /buffer close 5-7 - przechodzi do #weechat: + jump to #weechat: /buffer #weechat - przechodzi do następnego bufora: + jump to next buffer: /buffer +1 - przechodzi do ostatniego bufora: + jump to last buffer number: /buffer + ---- diff --git a/po/cs.po b/po/cs.po index 203136e60..0b2c316d5 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -350,6 +350,10 @@ msgstr "Seznam buferů:" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s %s%s.%s%s%s (notifikace: %s)%s%s" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "%sChyba: nekorektní číslo bufferu" @@ -1159,13 +1163,14 @@ msgstr "řídit buffery" #, fuzzy msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" "list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge " "[<číslo>] || close [[-]] || notify <úroveň> || localvar || set " @@ -1174,6 +1179,8 @@ msgstr "" #, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/de.po b/po/de.po index d6c11d73b..8ca90ffc0 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -364,6 +364,10 @@ msgstr "Liste der vorhandenen Buffer:" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s %s%s.%s%s%s (Benachrichtigung: %s)%s%s" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "%sFehler: unzulässige Nummer für Buffer" @@ -1182,14 +1186,16 @@ msgstr "" msgid "manage buffers" msgstr "Buffer verwalten" +#, fuzzy msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" "list || clear [||-merged|-all [|...]] || move " "|-|+ || swap | [|] || cycle |" @@ -1199,8 +1205,11 @@ msgstr "" "close [[-]|] || notify || localvar || set " "[] || get || |-|+|" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/es.po b/po/es.po index 636ce032a..58d45ee4c 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -342,6 +342,10 @@ msgstr "Lista de buffers:" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s (%s) %s%s%s (aviso: %s)" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "%sError: número del buffer incorrecto" @@ -1155,13 +1159,14 @@ msgstr "gestionar los buffers" #, fuzzy msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" "list || clear [||-merged|-all] || move|merge || " "swap| [|] || unmerge [|-all] || " @@ -1171,6 +1176,8 @@ msgstr "" #, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/fr.po b/po/fr.po index 4d253ef67..2cd91f10e 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: 2018-01-06 14:03+0100\n" -"PO-Revision-Date: 2018-01-06 14:05+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" +"PO-Revision-Date: 2018-01-06 14:17+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -352,6 +352,10 @@ msgstr "Liste des tampons :" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s %s%s.%s%s%s (notification : %s)%s%s" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "%sErreur : le nom \"%s\" est réservé pour WeeChat" + #, c-format msgid "%sError: incorrect buffer number" msgstr "%sErreur : numéro de tampon incorrect" @@ -1160,24 +1164,28 @@ msgid "manage buffers" msgstr "gestion des tampons" msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ []] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || renumber " +" [ []] || close [[-]|] || notify " +" || localvar || set [] || get || " +"|" msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " @@ -1241,6 +1249,8 @@ msgid "" msgstr "" " list : lister les tampons ouverts (sans paramètre, cette liste est " "affichée)\n" +" add : ajouter un nouveau tampon (il peut être fermé avec \"/buffer close" +"\" ou l'entrée \"q\")\n" " clear : effacer 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" diff --git a/po/hu.po b/po/hu.po index 102697457..8532cb14b 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -341,6 +341,10 @@ msgstr "" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr "%s%s %s(%s%s%s)%s kilépett" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, fuzzy, c-format msgid "%sError: incorrect buffer number" msgstr "%s helytelen pufferszám\n" @@ -1129,18 +1133,21 @@ msgid "manage buffers" msgstr "pufferek kezelése" msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" #, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/it.po b/po/it.po index a2c7e702e..a8aec8929 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -334,6 +334,10 @@ msgstr "Elenco buffer:" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s (%s) %s%s%s (notifica: %s)" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "%sErrore: nome buffer non corretto" @@ -1133,13 +1137,14 @@ msgstr "gestione dei buffer" #, fuzzy msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" "list || clear [||-merged|-all] || move|merge || swap " "| [|] || unmerge [|-all] || close " @@ -1149,6 +1154,8 @@ msgstr "" #, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/ja.po b/po/ja.po index df7af9864..8c9ec5010 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese ||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" "list || clear [||-merged|-all [|...]] || move " "|-|+ || swap | [|] || cycle |" @@ -1154,8 +1160,11 @@ msgstr "" "close [[-]|] || notify || localvar || set " "[] || get || |-|+|" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/pl.po b/po/pl.po index 0a10b4006..a0b6a4b7b 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -351,6 +351,10 @@ msgstr "Lista buforów:" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s %s%s.%s%s%s (powiadomienie: %s)%s%s" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "%sBłąd: nieprawidłowy numer buforu" @@ -1165,14 +1169,16 @@ msgstr "" msgid "manage buffers" msgstr "zarządzaj buforami" +#, fuzzy msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" "list || clear [||-merged|-all [|...]] || move " "|-|+ || swap | [|] || cycle |" @@ -1182,8 +1188,11 @@ msgstr "" "close [[-]|] || notify || localvar || set " "[] || get || |-|+|" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/pt.po b/po/pt.po index 626a1e0d2..ed3d93b9c 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Vasco Almeida \n" "Language-Team: Portuguese <>\n" @@ -352,6 +352,10 @@ msgstr "Lista de buffers:" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s %s%s.%s%s%s (notificação: %s)%s%s" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "%sErro: número de buffer incorreto" @@ -1156,14 +1160,16 @@ msgstr "" msgid "manage buffers" msgstr "gerir buffers" +#, fuzzy msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" "list || clear [||-merged|-all [|...]] || move " "|-|+ || swap | [|] || cycle |" @@ -1173,8 +1179,11 @@ msgstr "" "close [[-]|] || notify || localvar || set " " [] || get || |-|+|" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/pt_BR.po b/po/pt_BR.po index b4c4b191e..6eea225d4 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -366,6 +366,10 @@ msgstr "Lista de buffers:" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s (%s) %s%s%s (notificar: %s)" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "%sErro: número do buffer incorreto" @@ -1176,13 +1180,14 @@ msgstr "gerenciar buffers" #, fuzzy msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" "list || clear [||-merged|-all] || move|merge || swap " "| [|] || unmerge [|-all] || close " @@ -1193,6 +1198,8 @@ msgstr "" #, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/ru.po b/po/ru.po index d8ab05897..eae0002e3 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2018-01-06 13:50+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -350,6 +350,10 @@ msgstr "Список буферов:" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr "%s%s %s(%s%s%s)%s вышел" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, fuzzy, c-format msgid "%sError: incorrect buffer number" msgstr "%s неправильный номер буфера\n" @@ -1150,18 +1154,21 @@ msgid "manage buffers" msgstr "управление буферами" msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" #, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/tr.po b/po/tr.po index cac1ebb6d..e18b5fa86 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2017-06-26 23:33+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -303,6 +303,10 @@ msgstr "" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr " %s[%s%d%s]%s (%s) %s%s%s (notify: %s)" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "" @@ -1020,17 +1024,20 @@ msgid "manage buffers" msgstr "" msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/po/weechat.pot b/po/weechat.pot index 53f3d29fe..1f5eb76d3 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: 2018-01-06 14:03+0100\n" +"POT-Creation-Date: 2018-01-06 14:16+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -301,6 +301,10 @@ msgstr "" msgid " %s[%s%d%s]%s %s%s.%s%s%s (notify: %s)%s%s" msgstr "" +#, c-format +msgid "%sError: name \"%s\" is reserved for WeeChat" +msgstr "" + #, c-format msgid "%sError: incorrect buffer number" msgstr "" @@ -1024,17 +1028,20 @@ msgid "manage buffers" msgstr "" msgid "" -"list || clear [||-merged|-all [|...]] || move " -"|-|+ || swap | [|] || cycle |" -" [|...] || merge || unmerge [|-all] || " -"hide [||-all [|...]] || unhide [||-" -"all [|...]] || renumber [ [ []]] || " -"close [[-]|] || notify || localvar || set " -"[] || get || |-|+|" +"list || add [-free] [-switch] || clear [||-merged|-all " +"[|...]] || move |-|+ || swap | " +"[|] || cycle | [|...] || merge " +" || unmerge [|-all] || hide [||-all [|" +"...]] || unhide [||-all [|...]] || " +"renumber [ [ []]] || close [[-]|] || " +"notify || localvar || set [] || get || " +"|-|+|" msgstr "" msgid "" " list: list buffers (without argument, this list is displayed)\n" +" add: add a new buffer (it can be closed with \"/buffer close\" or input " +"\"q\")\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); \"-\" = " diff --git a/src/core/wee-command.c b/src/core/wee-command.c index c44607914..1f38a1051 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -536,6 +536,28 @@ command_buffer_display_localvar (void *data, } } +/* + * Input callback for custom buffers. + */ + +int +command_buffer_input_cb (const void *pointer, + void *data, + struct t_gui_buffer *buffer, + const char *input_data) +{ + /* make C compiler happy */ + (void) pointer; + (void) data; + + if (string_strcasecmp (input_data, "q") == 0) + { + gui_buffer_close (buffer); + } + + return WEECHAT_RC_OK; +} + /* * Callback for command "/buffer": manages buffers. */ @@ -547,7 +569,7 @@ COMMAND_CALLBACK(buffer) long number, number1, number2, numbers[3]; char *error, *value, *pos, *str_number1, *pos_number2; int i, error_main_buffer, num_buffers, count, prev_number, clear_number; - int buffer_found; + int buffer_found, arg_name, type_free, switch_to_buffer; /* make C compiler happy */ (void) pointer; @@ -584,6 +606,49 @@ COMMAND_CALLBACK(buffer) return WEECHAT_RC_OK; } + /* create a new buffer */ + if (string_strcasecmp (argv[1], "add") == 0) + { + COMMAND_MIN_ARGS(3, "add"); + arg_name = 2; + type_free = 0; + switch_to_buffer = 0; + for (i = 2; i < argc; i++) + { + if (string_strcasecmp (argv[i], "-free") == 0) + type_free = 1; + else if (string_strcasecmp (argv[i], "-switch") == 0) + switch_to_buffer = 1; + else + arg_name = i; + } + for (i = 0; gui_buffer_reserved_names[i]; i++) + { + if (strcmp (argv[arg_name], gui_buffer_reserved_names[i]) == 0) + break; + } + if (gui_buffer_reserved_names[i]) + { + gui_chat_printf (NULL, + _("%sError: name \"%s\" is reserved for WeeChat"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR], + argv[arg_name]); + return WEECHAT_RC_OK; + } + ptr_buffer = gui_buffer_search_by_name (PLUGIN_CORE, argv[arg_name]); + if (!ptr_buffer) + { + ptr_buffer = gui_buffer_new (NULL, argv[arg_name], + &command_buffer_input_cb, NULL, NULL, + NULL, NULL, NULL); + if (ptr_buffer && type_free) + gui_buffer_set (ptr_buffer, "type", "free"); + } + if (ptr_buffer && switch_to_buffer) + gui_window_switch_to_buffer (gui_current_window, ptr_buffer, 1); + return WEECHAT_RC_OK; + } + /* clear content of buffer(s) */ if (string_strcasecmp (argv[1], "clear") == 0) { @@ -6988,6 +7053,7 @@ command_init () NULL, "buffer", N_("manage buffers"), N_("list" + " || add [-free] [-switch] " " || clear [||-merged|-all [|...]]" " || move |-|+" " || swap | [|]" @@ -7004,6 +7070,8 @@ command_init () " || get " " || |-|+|"), N_(" list: list buffers (without argument, this list is displayed)\n" + " add: add a new buffer (it can be closed with \"/buffer close\" " + "or input \"q\")\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); " @@ -7065,7 +7133,8 @@ command_init () " /buffer +1\n" " jump to last buffer number:\n" " /buffer +"), - "clear -merged|-all|%(buffers_numbers)|%(buffers_plugins_names) " + "add -free|-switch" + " || clear -merged|-all|%(buffers_numbers)|%(buffers_plugins_names) " "%(buffers_numbers)|%(buffers_plugins_names)|%*" " || move %(buffers_numbers)" " || swap %(buffers_numbers)|%(buffers_plugins_names) " diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 629db6087..a2db73974 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -42,6 +42,7 @@ #include "../core/wee-infolist.h" #include "../core/wee-list.h" #include "../core/wee-log.h" +#include "../core/wee-secure.h" #include "../core/wee-string.h" #include "../core/wee-utf8.h" #include "../plugins/plugin.h" @@ -73,6 +74,11 @@ int gui_buffers_visited_count = 0; /* number of visited buffers*/ int gui_buffers_visited_frozen = 0; /* 1 to forbid list updates */ struct t_gui_buffer *gui_buffer_last_displayed = NULL; /* last b. displayed */ +char *gui_buffer_reserved_names[] = +{ GUI_BUFFER_MAIN, SECURE_BUFFER_NAME, GUI_COLOR_BUFFER_NAME, + NULL +}; + char *gui_buffer_notify_string[GUI_BUFFER_NUM_NOTIFY] = { "none", "highlight", "message", "all" }; diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h index 7f7b2258d..99fd2ec90 100644 --- a/src/gui/gui-buffer.h +++ b/src/gui/gui-buffer.h @@ -235,6 +235,7 @@ extern int gui_buffers_visited_index; extern int gui_buffers_visited_count; extern int gui_buffers_visited_frozen; extern struct t_gui_buffer *gui_buffer_last_displayed; +extern char *gui_buffer_reserved_names[]; extern char *gui_buffer_notify_string[]; extern char *gui_buffer_properties_get_integer[]; extern char *gui_buffer_properties_get_string[];