diff options
| -rw-r--r-- | ReleaseNotes.asciidoc | 20 | ||||
| -rw-r--r-- | doc/de/autogen/user/weechat_commands.txt | 184 | ||||
| -rw-r--r-- | doc/de/weechat_user.de.txt | 4 | ||||
| -rw-r--r-- | doc/en/autogen/user/weechat_commands.txt | 12 | ||||
| -rw-r--r-- | doc/en/weechat_user.en.txt | 3 | ||||
| -rw-r--r-- | doc/fr/autogen/user/weechat_commands.txt | 10 | ||||
| -rw-r--r-- | doc/fr/weechat_user.fr.txt | 3 | ||||
| -rw-r--r-- | doc/it/autogen/user/weechat_commands.txt | 12 | ||||
| -rw-r--r-- | doc/it/weechat_user.it.txt | 4 | ||||
| -rw-r--r-- | doc/ja/autogen/user/weechat_commands.txt | 184 | ||||
| -rw-r--r-- | doc/ja/weechat_user.ja.txt | 4 | ||||
| -rw-r--r-- | doc/pl/autogen/user/weechat_commands.txt | 198 | ||||
| -rw-r--r-- | doc/pl/weechat_user.pl.txt | 4 | ||||
| -rw-r--r-- | po/cs.po | 22 | ||||
| -rw-r--r-- | po/de.po | 25 | ||||
| -rw-r--r-- | po/es.po | 22 | ||||
| -rw-r--r-- | po/fr.po | 44 | ||||
| -rw-r--r-- | po/hu.po | 22 | ||||
| -rw-r--r-- | po/it.po | 22 | ||||
| -rw-r--r-- | po/ja.po | 47 | ||||
| -rw-r--r-- | po/pl.po | 25 | ||||
| -rw-r--r-- | po/pt_BR.po | 22 | ||||
| -rw-r--r-- | po/ru.po | 22 | ||||
| -rw-r--r-- | po/tr.po | 22 | ||||
| -rw-r--r-- | po/weechat.pot | 22 | ||||
| -rw-r--r-- | src/core/wee-command.c | 178 | ||||
| -rw-r--r-- | src/gui/curses/gui-curses-key.c | 3 | ||||
| -rw-r--r-- | src/gui/gui-input.c | 18 | ||||
| -rw-r--r-- | src/gui/gui-input.h | 1 |
29 files changed, 637 insertions, 522 deletions
diff --git a/ReleaseNotes.asciidoc b/ReleaseNotes.asciidoc index a5b327a95..d535a207c 100644 --- a/ReleaseNotes.asciidoc +++ b/ReleaseNotes.asciidoc @@ -17,6 +17,26 @@ http://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] == Version 0.4.4 (under dev) +=== Jump to first/last buffer + +The command `/input jump_last_buffer` has been replaced by `/buffer +`. +You can rebind the key key[alt-j,alt-l]: + +---- +/key bind meta-jmeta-l /buffer + +---- + +[NOTE] +The command `/input jump_last_buffer` still works for compatibility reasons, +but it should not be used any more. + +Similarly, a new key has been added to jump to first buffer: key[alt-j,alt-f]. +You can add it with following command: + +---- +/key missing +---- + === Hotlist conditions A new option 'weechat.look.hotlist_add_conditions' has been added. This option diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt index 4acc591f5..c35aa1056 100644 --- a/doc/de/autogen/user/weechat_commands.txt +++ b/doc/de/autogen/user/weechat_commands.txt @@ -66,7 +66,8 @@ Beispiele: ---- /buffer list clear [<number>|<name>|-merged|-all] - move|merge <number> + move <number>|-|+ + merge <number> swap <number1>|<name1> [<number2>|<name2>] unmerge [<number>|-all] renumber [<number1> [<number2> [<start>]]] @@ -75,53 +76,57 @@ Beispiele: localvar set <property> <value> get <property> - <number>|<name> - - 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) - swap: tauscht zwei Buffer miteinander aus (bei Angabe von nur einem Buffer (Buffernummer/-name), wird der aktuelle Buffer mit dem angegebenen Buffer getauscht) - 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 -renumber: Buffer werden um nummeriert (Option 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 Option "weechat.look.jump_current_to_previous_buffer" - name: wechselt zum Buffer mit dem angegebenen Namen - -Beispiele: - leert den aktuellen Buffer: + <number>|-|+|<name> + + list: list buffers (without argument, this list is displayed) + 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) + 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 +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 - 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 - 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 + jump to last buffer number: + /buffer + ---- [[command_weechat_color]] @@ -374,58 +379,57 @@ value: Anzahl der gewünschten Einträgen im Befehlsverlauf anzeigen ---- /input <action> [<arguments>] -Auflistung der möglichen Aktionen: - return: simuliert die "enter" Taste - complete_next: vervollständigt Wort mit nächster Komplettierung - complete_previous: vervollständigt Word mit vorheriger Komplettierung - search_text: sucht nach Text im Buffer - search_switch_case: schaltet Groß-/Kleinschreibung ein und aus - search_switch_regex: Wechsel des Suchmodus: einfache Textsuche/reguläre Ausdrücke - search_switch_where: wechselt Suche in Nachricht/Präfix - search_previous: sucht vorheriger Zeile - search_next: sucht nächste Zeile - search_stop: suche stoppen - delete_previous_char: entfernt vorheriges Zeichen - delete_next_char: entfernt nächstes Zeichen - delete_previous_word: entfernt vorheriges Wort - delete_next_word: entfernt nächstes Wort - delete_beginning_of_line: entfernt alle Zeichen ab Zeilenanfang bis zum Cursor - delete_end_of_line: entfernt alle Zeichen ab Cursor bis zum Ende der Zeile - delete_line: löscht die komplette Eingabezeile - clipboard_paste: fügt Zeichenkette aus der Zwischenablage ein - transpose_chars: Zeichen austauschen - undo: letzten Befehl in der Eingabezeile rückgängig machen - redo: letzten Befehl in der Eingabezeile wiederherstellen - move_beginning_of_line: springt an den Anfang der Eingabezeile - move_end_of_line: springt ans Ende der Eingabezeile - move_previous_char: setzt den Cursor eine Position nach links - move_next_char: setzt den Cursor eine Position nach rechts - move_previous_word: springt zum Anfang des vorherigen Wortes, in der Eingabezeile - move_next_word: springt zum Anfang des nächsten Wortes, in der Eingabezeile - history_previous: ruft vorherigen Befehl oder Nachricht aus dem Befehlsspeicher auf (im Such-Modus: rückwärts suchen) - history_next: ruft nächsten Befehl oder Nachricht aus dem Befehlsspeicher auf (im Such-Modus: vorwärts suchen) - history_global_previous: ruft vorherigen Befehl/Nachricht aus dem globalen Befehlsspeicher auf (für alle Buffer) - history_global_next: ruft nächsten Befehl/Nachricht aus dem globalen Befehlsspeicher auf (für alle Buffer) - jump_smart: wechselt zum nächsten Buffer mit Aktivität (nach Priorität: highlight, Nachricht, …) - jump_last_buffer: springt zum letzten Buffer, in der Bufferliste - jump_last_buffer_displayed: wechselt zum jeweils zuletzt angezeigten Buffer - jump_previously_visited_buffer: springt zum letzten besuchten Buffer - jump_next_visited_buffer: springt zum nächsten besuchten Buffer - hotlist_clear: löscht Hotliste (Aktivitätsanzeige für die Buffer) - grab_key: fängt eine Taste (optionales Argument: Verzögerung um eine Taste einzufangen. Standard sind 500 Millisekunden) - grab_key_command: zeigt den Tastencode (inklusive des eingebundenen Befehls) einer Tastenkombination an und fügt ihn in die Befehlszeile ein (optionales Argument: Verzögerung um eine Taste einzufangen. Standard sind 500 Millisekunden) - grab_mouse: fängt den Code einer Maus Aktivität - grab_mouse_area: fängt den Code einer Maus Aktivität mit entsprechendem Bereich - set_unread: setzt für alle Buffer die Markierung der ungelesen Nachrichten - set_unread_current_buffer: setzt nur für den aktuellen Buffer eine Markierung der ungelesen Nachrichten - switch_active_buffer: springt zum nächsten zusammengefügten Buffer - switch_active_buffer_previous: springt zum vorherigen zusammengefügten Buffer - zoom_merged_buffer: zoomt in zusammengefügte Buffer - insert: fügt einen Text in die Eingabezeile ein (Escapesequenzen sind möglich, siehe /help print) - paste_start: Einfügen wird gestartet (bracketed paste mode) - paste_stop: Einfügen wird beendet (bracketed paste mode) - -Dieser Befehl wird sinnvollerweise mittels Tastenbelegungen oder Erweiterungen genutzt. +list of actions: + return: simulate key "enter" + complete_next: complete word with next completion + complete_previous: complete word with previous completion + search_text: search text in buffer + search_switch_case: switch exact case for search + search_switch_regex: switch search type: string/regular expression + search_switch_where: switch search in messages/prefixes + search_previous: search previous line + search_next: search next line + search_stop: stop search + delete_previous_char: delete previous char + delete_next_char: delete next char + delete_previous_word: delete previous word + delete_next_word: delete next word + delete_beginning_of_line: delete from beginning of line until cursor + delete_end_of_line: delete from cursor until end of line + delete_line: delete entire line + clipboard_paste: paste from clipboard + transpose_chars: transpose two chars + undo: undo last command line action + redo: redo last command line action + move_beginning_of_line: move cursor to beginning of line + move_end_of_line: move cursor to end of line + move_previous_char: move cursor to previous char + move_next_char: move cursor to next char + move_previous_word: move cursor to previous word + move_next_word: move cursor to next word + history_previous: recall previous command in current buffer history + history_next: recall next command in current buffer history + history_global_previous: recall previous command in global history + history_global_next: recall next command in global history + jump_smart: jump to next buffer with activity + jump_last_buffer_displayed: jump to last buffer displayed (before last jump to a buffer) + jump_previously_visited_buffer: jump to previously visited buffer + jump_next_visited_buffer: jump to next visited buffer + hotlist_clear: clear hotlist + grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) + grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) + grab_mouse: grab mouse event code + grab_mouse_area: grab mouse event code with area + set_unread: set unread marker for all buffers + set_unread_current_buffer: set unread marker for current buffer + switch_active_buffer: switch to next merged buffer + switch_active_buffer_previous: switch to previous merged buffer + zoom_merged_buffer: zoom on merged buffer + insert: insert text in command line (escaped chars are allowed, see /help print) + paste_start: start paste (bracketed paste mode) + paste_stop: stop paste (bracketed paste mode) + +This command is used by key bindings or plugins. ---- [[command_weechat_key]] diff --git a/doc/de/weechat_user.de.txt b/doc/de/weechat_user.de.txt index 274f6760e..30f211d50 100644 --- a/doc/de/weechat_user.de.txt +++ b/doc/de/weechat_user.de.txt @@ -1086,7 +1086,9 @@ Befehl festgelegt werden: | key[alt-F12] | springt zum Ende der Nickliste | `/bar scroll nicklist * e` | key[alt-a] | wechselt zum nächsten Buffer mit Aktivität (nach Priorität: highlight, Nachricht, ...) | `/input jump_smart` | key[alt-h] | löscht Hotliste (Aktivitätsanzeige für die Buffer) | `/input hotlist_clear` -| key[alt-j,alt-l] | wechselt zum letzten Buffer | `/input jump_last_buffer` +// TRANSLATION MISSING +| key[alt-j,alt-f] | Switch to first buffer | `/buffer -` +| key[alt-j,alt-l] | wechselt zum letzten Buffer | `/buffer +` | key[alt-j,alt-r] | wechselt zum IRC RAW Buffer | `/server raw` | key[alt-j,alt-s] | wechselt zum IRC Server Buffer | `/server jump` | key[alt-0...9] | wechselt zum Buffer mit der Nummer (0 = 10) | `/buffer *N` diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt index ddacf906a..b41c4cb83 100644 --- a/doc/en/autogen/user/weechat_commands.txt +++ b/doc/en/autogen/user/weechat_commands.txt @@ -66,7 +66,8 @@ Examples: ---- /buffer list clear [<number>|<name>|-merged|-all] - move|merge <number> + move <number>|-|+ + merge <number> swap <number1>|<name1> [<number2>|<name2>] unmerge [<number>|-all] renumber [<number1> [<number2> [<start>]]] @@ -75,11 +76,11 @@ Examples: localvar set <property> <value> get <property> - <number>|<name> + <number>|-|+|<name> list: list buffers (without argument, this list is displayed) 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: 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) merge: merge current buffer to another buffer (chat area will be mix of both buffers) (by default ctrl-x switches between merged buffers) @@ -99,6 +100,8 @@ localvar: display local variables for current buffer '+': 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: @@ -122,6 +125,8 @@ Examples: /buffer #weechat jump to next buffer: /buffer +1 + jump to last buffer number: + /buffer + ---- [[command_weechat_color]] @@ -407,7 +412,6 @@ list of actions: history_global_previous: recall previous command in global history history_global_next: recall next command in global history jump_smart: jump to next buffer with activity - jump_last_buffer: jump to last buffer jump_last_buffer_displayed: jump to last buffer displayed (before last jump to a buffer) jump_previously_visited_buffer: jump to previously visited buffer jump_next_visited_buffer: jump to next visited buffer diff --git a/doc/en/weechat_user.en.txt b/doc/en/weechat_user.en.txt index b910e1846..cd141ce86 100644 --- a/doc/en/weechat_user.en.txt +++ b/doc/en/weechat_user.en.txt @@ -1072,7 +1072,8 @@ The notify level for a buffer can be set with command `/buffer`: | key[alt-F12] | Go to the end of nicklist | `/bar scroll nicklist * e` | key[alt-a] | Switch to next buffer with activity (with priority: highlight, message, other) | `/input jump_smart` | key[alt-h] | Clear hotlist (activity notification on other buffers) | `/input hotlist_clear` -| key[alt-j,alt-l] | Switch to last buffer | `/input jump_last_buffer` +| key[alt-j,alt-f] | Switch to first buffer | `/buffer -` +| key[alt-j,alt-l] | Switch to last buffer | `/buffer +` | key[alt-j,alt-r] | Switch to IRC raw buffer | `/server raw` | key[alt-j,alt-s] | Switch to IRC server buffer | `/server jump` | key[alt-0...9] | Switch to buffer by number (0 = 10) | `/buffer *N` diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt index fe48a7340..26752292a 100644 --- a/doc/fr/autogen/user/weechat_commands.txt +++ b/doc/fr/autogen/user/weechat_commands.txt @@ -66,7 +66,8 @@ Exemples: ---- /buffer list clear [<nombre>|<nom>|-merged|-all] - move|merge <nombre> + move <nombre>|-|+ + merge <nombre> swap <nombre1>|<nom1> [<nombre2>|<nom2>] unmerge [<nombre>|-all] renumber <nombre1> [<nombre2> [<départ>]] @@ -79,7 +80,7 @@ Exemples: list: lister les tampons ouverts (sans paramètre, cette liste est affichée) 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) + 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é) merge: mélanger 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) @@ -99,6 +100,8 @@ localvar: afficher la liste des variables locales pour le tampon courant '+': saut relatif, ajoute le numéro au courant, '-': saut relatif, soustrait le numéro au courant, '*': saut au numéro en utilisant l'option "jump_current_to_previous_buffer" + -: sauter au premier numéro de tampon + +: sauter au dernier numéro de tampon nom: sauter au tampon par nom (partiel) Exemples: @@ -122,6 +125,8 @@ Exemples: /buffer #weechat aller au tampon suivant: /buffer +1 + aller au dernier numéro de tampon: + /buffer + ---- [[command_weechat_color]] @@ -407,7 +412,6 @@ liste des actions: history_global_previous: rappeler la commande précédente dans l'historique global history_global_next: rappeler la commande suivante dans l'historique global jump_smart: sauter au prochain tampon avec de l'activité - jump_last_buffer: sauter au dernier tampon jump_last_buffer_displayed: sauter au dernier tampon affiché (avant le dernier saut vers un tampon) jump_previously_visited_buffer: sauter au tampon visité précédemment jump_next_visited_buffer: sauter au tampon visité après diff --git a/doc/fr/weechat_user.fr.txt b/doc/fr/weechat_user.fr.txt index c23af1ea6..9a7c827b0 100644 --- a/doc/fr/weechat_user.fr.txt +++ b/doc/fr/weechat_user.fr.txt @@ -1101,7 +1101,8 @@ commande `/buffer` : | key[alt-F12] | Aller à la fin de la liste des pseudos | `/bar scroll nicklist * e` | key[alt-a] | Sauter au prochain tampon avec activité (avec priorité : highlight, message, autre) | `/input jump_smart` | key[alt-h] | Vider la hotlist (notification d'activité sur les autres tampons) | `/input hotlist_clear` -| key[alt-j,alt-l] | Sauter au dernier tampon | `/input jump_last_buffer` +| key[alt-j,alt-f] | Sauter au premier tampon | `/buffer -` +| key[alt-j,alt-l] | Sauter au dernier tampon | `/buffer +` | key[alt-j,alt-r] | Sauter au tampon IRC de données brutes | `/server raw` | key[alt-j,alt-s] | Sauter au tampon IRC du serveur | `/server jump` | key[alt-0...9] | Sauter au tampon qui porte ce numéro (0 = 10) | `/buffer *N` diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt index 397520081..5ebf953eb 100644 --- a/doc/it/autogen/user/weechat_commands.txt +++ b/doc/it/autogen/user/weechat_commands.txt @@ -66,7 +66,8 @@ Examples: ---- /buffer list clear [<number>|<name>|-merged|-all] - move|merge <number> + move <number>|-|+ + merge <number> swap <number1>|<name1> [<number2>|<name2>] unmerge [<number>|-all] renumber [<number1> [<number2> [<start>]]] @@ -75,11 +76,11 @@ Examples: localvar set <property> <value> get <property> - <number>|<name> + <number>|-|+|<name> list: list buffers (without argument, this list is displayed) 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: 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) merge: merge current buffer to another buffer (chat area will be mix of both buffers) (by default ctrl-x switches between merged buffers) @@ -99,6 +100,8 @@ localvar: display local variables for current buffer '+': 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: @@ -122,6 +125,8 @@ Examples: /buffer #weechat jump to next buffer: /buffer +1 + jump to last buffer number: + /buffer + ---- [[command_weechat_color]] @@ -407,7 +412,6 @@ list of actions: history_global_previous: recall previous command in global history history_global_next: recall next command in global history jump_smart: jump to next buffer with activity - jump_last_buffer: jump to last buffer jump_last_buffer_displayed: jump to last buffer displayed (before last jump to a buffer) jump_previously_visited_buffer: jump to previously visited buffer jump_next_visited_buffer: jump to next visited buffer diff --git a/doc/it/weechat_user.it.txt b/doc/it/weechat_user.it.txt index 8d2b7ffe9..b381655f0 100644 --- a/doc/it/weechat_user.it.txt +++ b/doc/it/weechat_user.it.txt @@ -1109,7 +1109,9 @@ Il livello di notifica per un buffer può essere impostato con il comando `/buff | key[alt-F12] | Sposta alla fine della lista nick | `/bar scroll nicklist * e` | key[alt-a] | Passa al buffer successivo con attività (con priorità: highligh, messagge, altro) | `/input jump_smart` | key[alt-h] | Pulisce hotlist (notifica di attività su altri buffer) | `/input hotlist_clear` -| key[alt-j,alt-l] | Passa all'ultimo buffer | `/input jump_last_buffer` +// TRANSLATION MISSING +| key[alt-j,alt-f] | Switch to first buffer | `/buffer -` +| key[alt-j,alt-l] | Passa all'ultimo buffer | `/buffer +` | key[alt-j,alt-r] | Passa al buffer raw IRC | `/server raw` | key[alt-j,alt-s] | Passa al buffer server IRC | `/server jump` | key[alt-0...9] | Passa al buffer numero (0 = 10) | `/buffer *N` diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt index 4dee61e55..1ab554e0a 100644 --- a/doc/ja/autogen/user/weechat_commands.txt +++ b/doc/ja/autogen/user/weechat_commands.txt @@ -66,7 +66,8 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態 ---- /buffer list clear [<number>|<name>|-merged|-all] - move|merge <number> + move <number>|-|+ + merge <number> swap <number1>|<name1> [<number2>|<name2>] unmerge [<number>|-all] renumber [<number1> [<number2> [<start>]]] @@ -75,53 +76,57 @@ message: 離席メッセージ (メッセージが無い場合は、離席状態 localvar set <property> <value> get <property> - <number>|<name> - - list: バッファをリストアップ (引数無しの場合、このリストが表示されます) - clear: バッファの内容を削除 (number はバッファ番号、マージバッファに対しては -merged、全てのバッファに対しては -all、何も無ければ現在のバッファ) - move: リストにバッファを移動 (相対指定も可能、例えば -1) - swap: 2 つのバッファを入れ替え (現在のバッファと引数で与えた番号/名称で指定されるバッファを入れ替える) - merge: 現在のバッファを他のバッファにマージ (2 つのバッファのチャットエリアが一緒になります) - (デフォルトでは ctrl-x でマージバッファの切り替え) - unmerge: 同じ番号を持つ他のバッファとのマージを解除 -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: バッファ名 (一部) でバッファに移動 - -例: - 現在のバッファの内容を消去: + <number>|-|+|<name> + + list: list buffers (without argument, this list is displayed) + 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) + 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 +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 - コアバッファとマージ: + 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 + ---- [[command_weechat_color]] @@ -374,58 +379,57 @@ value: 表示する履歴エントリの数 ---- /input <action> [<arguments>] -アクションリスト: - return: "enter" キーをシミュレート - complete_next: 次の補完候補で単語を補完 - complete_previous: 一つ前の補完候補で単語を補完 - search_text: バッファ内のテキストを検索 - search_switch_case: 完全一致検索に変更 - search_switch_regex: 検索タイプの切り替え: 文字列/正規表現 - search_switch_where: 検索範囲の切り替え: メッセージ/プレフィックス - search_previous: 一つ前の行を検索 - search_next: 次の行を検索 - search_stop: 検索を終了 - delete_previous_char: 一つ前の文字を削除 - delete_next_char: 次の文字を削除 - delete_previous_word: 一つ前の単語を削除 - delete_next_word: 次の単語を削除 - delete_beginning_of_line: 行の最初からカーソル位置までを削除 - delete_end_of_line: カーソルから行の最後までを削除 - delete_line: 行を削除 - clipboard_paste: クリップボードから貼り付け - transpose_chars: 2 つの文字を入れ替え - undo: 最新のコマンドラインアクションまで元に戻す - redo: 最新のコマンドラインアクションまでやり直す - move_beginning_of_line: カーソルを行頭に移動 - move_end_of_line: カーソルを行末まで移動 - move_previous_char: カーソルを一つ前の文字に移動 - move_next_char: カーソルを次の文字に移動 - move_previous_word: カーソルを一つ前の単語に移動 - move_next_word: カーソルを次の単語に移動 - history_previous: 現在のバッファ履歴のひとつ前のコマンドを再呼び出し - history_next: 現在のバッファ履歴の次のコマンドを再呼び出し - history_global_previous: グローバル履歴の一つ前のコマンドを再呼び出し - history_global_next: グローバル履歴の次のコマンドを再呼び出し - jump_smart: 次のアクティブバッファに飛ぶ - jump_last_buffer: 最後のバッファに移動 - jump_last_buffer_displayed: 表示されている最後のバッファに移動 (最新のバッファ移動の一つ前に表示されていたバッファ) - jump_previously_visited_buffer: 一つ前に訪れたバッファに移動 - jump_next_visited_buffer: 次に訪れたバッファに移動 - hotlist_clear: ホットリストを消去 - grab_key: キーを横取り (任意引数: 最後の横取りからの遅延時間、デフォルトは 500 ミリ秒) - grab_key_command: あるコマンドに関連してキーを横取り (任意引数: 最後の横取りからの遅延時間、デフォルトは 500 ミリ秒) - grab_mouse: grab マウスイベントコードを横取り - grab_mouse_area: 範囲指定のマウスイベントコードを横取り - set_unread: 全てのバッファに対して未読マーカーを設定 - set_unread_current_buffer: 現在のバッファに対して未読マーカーを設定 - switch_active_buffer: 次のマージされたバッファに移動 - switch_active_buffer_previous: 一つ前のマージされたバッファに移動 - zoom_merged_buffer: マージされたバッファにズーム - insert: コマンドラインにテキストを挿入 (エスケープ文字も可、/help print を参照) - paste_start: ペーストの開始 (括弧付きペーストモード) - paste_stop: ペーストの終了 (括弧付きペーストモード) - -これらのコマンドはキーバインドかプラグインで利用できます。 +list of actions: + return: simulate key "enter" + complete_next: complete word with next completion + complete_previous: complete word with previous completion + search_text: search text in buffer + search_switch_case: switch exact case for search + search_switch_regex: switch search type: string/regular expression + search_switch_where: switch search in messages/prefixes + search_previous: search previous line + search_next: search next line + search_stop: stop search + delete_previous_char: delete previous char + delete_next_char: delete next char + delete_previous_word: delete previous word + delete_next_word: delete next word + delete_beginning_of_line: delete from beginning of line until cursor + delete_end_of_line: delete from cursor until end of line + delete_line: delete entire line + clipboard_paste: paste from clipboard + transpose_chars: transpose two chars + undo: undo last command line action + redo: redo last command line action + move_beginning_of_line: move cursor to beginning of line + move_end_of_line: move cursor to end of line + move_previous_char: move cursor to previous char + move_next_char: move cursor to next char + move_previous_word: move cursor to previous word + move_next_word: move cursor to next word + history_previous: recall previous command in current buffer history + history_next: recall next command in current buffer history + history_global_previous: recall previous command in global history + history_global_next: recall next command in global history + jump_smart: jump to next buffer with activity + jump_last_buffer_displayed: jump to last buffer displayed (before last jump to a buffer) + jump_previously_visited_buffer: jump to previously visited buffer + jump_next_visited_buffer: jump to next visited buffer + hotlist_clear: clear hotlist + grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) + grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) + grab_mouse: grab mouse event code + grab_mouse_area: grab mouse event code with area + set_unread: set unread marker for all buffers + set_unread_current_buffer: set unread marker for current buffer + switch_active_buffer: switch to next merged buffer + switch_active_buffer_previous: switch to previous merged buffer + zoom_merged_buffer: zoom on merged buffer + insert: insert text in command line (escaped chars are allowed, see /help print) + paste_start: start paste (bracketed paste mode) + paste_stop: stop paste (bracketed paste mode) + +This command is used by key bindings or plugins. ---- [[command_weechat_key]] diff --git a/doc/ja/weechat_user.ja.txt b/doc/ja/weechat_user.ja.txt index 530a631c2..cf91e29e9 100644 --- a/doc/ja/weechat_user.ja.txt +++ b/doc/ja/weechat_user.ja.txt @@ -1071,7 +1071,9 @@ irc サーバ "freenode" に含まれる全てのバッファに対して設定 | key[alt-F12] | ニックネームリストを一番下にスクロール | `/bar scroll nicklist * e` | key[alt-a] | 変更のあった次のバッファに移動 (優先順位: ハイライト、新規メッセージ、その他) | `/input jump_smart` | key[alt-h] | ホットリスト (他のバッファにあった変更通知リスト) を消去 | `/input hotlist_clear` -| key[alt-j,alt-l] | 最後のバッファに移動 | `/input jump_last_buffer` +// TRANSLATION MISSING +| key[alt-j,alt-f] | Switch to first buffer | `/buffer -` +| key[alt-j,alt-l] | 最後のバッファに移動 | `/buffer +` | key[alt-j,alt-r] | IRC 生バッファに移動 | `/server raw` | key[alt-j,alt-s] | IRC サーババッファに移動 | `/server jump` | key[alt-0...9] | 番号のバッファに移動 (0 = 10) | `/buffer *N` diff --git a/doc/pl/autogen/user/weechat_commands.txt b/doc/pl/autogen/user/weechat_commands.txt index 480b18666..d09ecced1 100644 --- a/doc/pl/autogen/user/weechat_commands.txt +++ b/doc/pl/autogen/user/weechat_commands.txt @@ -65,63 +65,68 @@ Przykłady: ---- /buffer list - clear [<numer>|<nazwa>|-merged|-all] - move|merge <numer> - swap <numer1>|<nazwa1> [<numer2>|<nazwa2>] - unmerge [<numer>|-all] - renumber [<numer1> [<numer2> [<start>]]] - close [<n1>[-<n2>]|<nazwa>] - notify <poziom> + clear [<number>|<name>|-merged|-all] + move <number>|-|+ + merge <number> + swap <number1>|<name1> [<number2>|<name2>] + unmerge [<number>|-all] + renumber [<number1> [<number2> [<start>]]] + close [<n1>[-<n2>]|<name>] + notify <level> localvar - set <właściwość> <wartość> - get <właściwość> - <numer>|<nazwa> - - 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) - swap: zamienia miejscami dwa bufory (zamienia z obecnym buforem, jeśli podano tylko jeden numer/nazwę) - 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 -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" - nazwa: przejście do bufora o (częściowej) nazwie + set <property> <value> + get <property> + <number>|-|+|<name> + + list: list buffers (without argument, this list is displayed) + 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) + 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 +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 - łą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 + jump to last buffer number: + /buffer + ---- [[command_weechat_color]] @@ -374,58 +379,57 @@ Wartość: ilość elementów historii do pokazania ---- /input <akcja> [<argumenty>] -lista akcji: - return: symuluje klawisz "enter" - complete_next: dopełnia słowo następnym dopełnieniem - complete_previous: dopełnia słowo poprzednim dopełnieniem - search_text: szuka tekstu w buforze - search_switch_case: przełącza na dokładne dopasowanie przy szukaniu - search_switch_regex: przełącza typy wyszukiwania ciąg/wyrażenie regularne - search_switch_where: zmienia miejsce przeszukiwania na wiadomości/przedrostki - search_previous: szuka poprzednich linii - search_next: szuka następnych linii - search_stop: zatrzymuje wyszukiwanie - delete_previous_char: usuwa poprzedni znak - delete_next_char: usuwa następny znak - delete_previous_word: usuwa poprzednie słowo - delete_next_word: usuwa następne słowo - delete_beginning_of_line: usuwa od początku linii do kursora - delete_end_of_line: usuwa od kursora do końca linii - delete_line: usuwa cała linię - clipboard_paste: wkleja ze schowka - transpose_chars: zamienia dwa znaki - undo: cofa ostatnia akcję w linii poleceń - redo: ponownie wykonuje cofniętą akcję w linii poleceń - move_beginning_of_line: przesuwa kursor na początek linii - move_end_of_line: przesuwa kursor na koniec linii - move_previous_char: przesuwa kursor do poprzedniego znaku - move_next_char: przesuwa kursor do następnego znaku - move_previous_word: przesuwa kursor do poprzedniego słowa - move_next_word: przesuwa kursor do następnego słowa - history_previous: przywołuje poprzednia komendę z historii obecnego bufora - history_next: przywołuje następną komendę z historii obecnego bufora - history_global_previous: przywołuje poprzednią komendę z globalnej historii - history_global_next: przywołuje następną komendę z globalnej historii - jump_smart: przechodzi do następnego bufora z aktywnością - jump_last_buffer: przechodzi do ostatniego bufora - jump_last_buffer_displayed: przechodzi do ostatnio wyświetlanego bufora (przed ostatnim przeskoczeniem do bufora) - jump_previously_visited_buffer: przeskakuje do poprzedniego bufora - jump_next_visited_buffer: przeskakuje to następnego bufora - hotlist_clear: czyści hotlistę - grab_key: przechwytuje klawisz (opcjonalny argument: opóźnienie końca przechwycenia, domyślnie jest to 500 milisekund) - grab_key_command: przechwytuje klawisz z przypisaną komendą(opcjonalny argument: opóźnienie końca przechwycenia, domyślnie jest to 500 milisekund) - grab_mouse: przechwytuje kod zdarzenia myszy - grab_mouse_area: przechwytuje kod zdarzenia myszy z obszarem - set_unread: ustawia znacznik nie przeczytania dla wszystkich buforów - set_unread_current_buffer: ustawia znacznik nie przeczytania dla obecnego bufora - switch_active_buffer: przełącza do następnego połączonego buforu - switch_active_buffer_previous: przełącza do poprzedniego połączonego buforu - zoom_merged_buffer: zoom na połączony bufor - insert: wkleja tekst do linii poleceń - paste_start: zaczyna wklejanie (tryb z rozpoznawaniem wklejanego tekstu) - paste_stop: kończy wklejanie (tryb z rozpoznawaniem wklejanego tekstu) - -Ta komenda jest używana do przypisywania klawiszy lub przez wtyczki. +list of actions: + return: simulate key "enter" + complete_next: complete word with next completion + complete_previous: complete word with previous completion + search_text: search text in buffer + search_switch_case: switch exact case for search + search_switch_regex: switch search type: string/regular expression + search_switch_where: switch search in messages/prefixes + search_previous: search previous line + search_next: search next line + search_stop: stop search + delete_previous_char: delete previous char + delete_next_char: delete next char + delete_previous_word: delete previous word + delete_next_word: delete next word + delete_beginning_of_line: delete from beginning of line until cursor + delete_end_of_line: delete from cursor until end of line + delete_line: delete entire line + clipboard_paste: paste from clipboard + transpose_chars: transpose two chars + undo: undo last command line action + redo: redo last command line action + move_beginning_of_line: move cursor to beginning of line + move_end_of_line: move cursor to end of line + move_previous_char: move cursor to previous char + move_next_char: move cursor to next char + move_previous_word: move cursor to previous word + move_next_word: move cursor to next word + history_previous: recall previous command in current buffer history + history_next: recall next command in current buffer history + history_global_previous: recall previous command in global history + history_global_next: recall next command in global history + jump_smart: jump to next buffer with activity + jump_last_buffer_displayed: jump to last buffer displayed (before last jump to a buffer) + jump_previously_visited_buffer: jump to previously visited buffer + jump_next_visited_buffer: jump to next visited buffer + hotlist_clear: clear hotlist + grab_key: grab a key (optional argument: delay for end of grab, default is 500 milliseconds) + grab_key_command: grab a key with its associated command (optional argument: delay for end of grab, default is 500 milliseconds) + grab_mouse: grab mouse event code + grab_mouse_area: grab mouse event code with area + set_unread: set unread marker for all buffers + set_unread_current_buffer: set unread marker for current buffer + switch_active_buffer: switch to next merged buffer + switch_active_buffer_previous: switch to previous merged buffer + zoom_merged_buffer: zoom on merged buffer + insert: insert text in command line (escaped chars are allowed, see /help print) + paste_start: start paste (bracketed paste mode) + paste_stop: stop paste (bracketed paste mode) + +This command is used by key bindings or plugins. ---- [[command_weechat_key]] diff --git a/doc/pl/weechat_user.pl.txt b/doc/pl/weechat_user.pl.txt index 1675a08cd..99d28b9a4 100644 --- a/doc/pl/weechat_user.pl.txt +++ b/doc/pl/weechat_user.pl.txt @@ -1080,7 +1080,9 @@ Poziom powiadomień dla bufora może zostać ustawiony za pomocą komendy `/buff | key[alt-F12] | Idź na koniec listy nicków | `/bar scroll nicklist * e` | key[alt-a] | Przełącz na następny bufor z aktywnością (z priorytetem: powiadomienie, wiadomość, inne) | `/input jump_smart` | key[alt-h] | Wyczyść hotlistę (powiadomienia o aktywności w innych buforach) | `/input hotlist_clear` -| key[alt-j,alt-l] | Przełącz na ostatni bufor | `/input jump_last_buffer` +// TRANSLATION MISSING +| key[alt-j,alt-f] | Switch to first buffer | `/buffer -` +| key[alt-j,alt-l] | Przełącz na ostatni bufor | `/buffer +` | key[alt-j,alt-r] | Przełącz na bufor IRC raw | `/server raw` | key[alt-j,alt-s] | Przełącz na bufor serwera IRC | `/server jump` | key[alt-0...9] | Przełącz na bufor za pomocą liczb (0 = 10) | `/buffer *N` @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-18 09:20+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1085,11 +1085,11 @@ msgstr "řídit buffery" #, fuzzy msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" "list || clear [<číslo>|-merged|-all] || move|merge <číslo> || unmerge " "[<číslo>] || close [<n1>[-<n2>]] || notify <úroveň> || localvar || set " @@ -1100,7 +1100,8 @@ msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1125,6 +1126,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1147,7 +1150,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" " list: vypsat seznam bufferů (pokud nejsou uvedeny argumenty bude vypsán " "tento seznam)\n" @@ -1612,7 +1617,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-18 09:20+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -1095,12 +1095,13 @@ msgstr "" msgid "manage buffers" msgstr "Buffer verwalten" +#, fuzzy msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" "list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " "<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " @@ -1108,11 +1109,13 @@ msgstr "" "<level> || localvar || set <property> <value> || get <property> || <number>|" "<name>" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1137,6 +1140,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1159,7 +1164,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" " list: alle geöffneten Buffer werden aufgelistet (ohne Angabe von " "Argumente wird diese Liste standardmäßig ausgegeben)\n" @@ -1721,6 +1728,7 @@ msgstr "Funktionen für die Befehlszeile" msgid "<action> [<arguments>]" msgstr "<action> [<arguments>]" +#, fuzzy msgid "" "list of actions:\n" " return: simulate key \"enter\"\n" @@ -1755,7 +1763,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-18 09:20+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1089,11 +1089,11 @@ msgstr "gestionar los buffers" #, fuzzy msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" "list || clear [<número>|<nombre>|-merged|-all] || move|merge <número> || " "swap<número1>|<nombre1> [<número2>|<nombre2>] || unmerge [<número>|-all] || " @@ -1105,7 +1105,8 @@ msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1130,6 +1131,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1152,7 +1155,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" " list: lista de buffers (si no hay parámetros se muestra esta lista)\n" " clear: limpia el contenido del buffer (número para un buffer, -merged " @@ -1652,7 +1657,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" -"PO-Revision-Date: 2014-03-18 09:21+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" +"PO-Revision-Date: 2014-03-19 09:30+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -1079,23 +1079,24 @@ msgid "manage buffers" msgstr "gestion des tampons" msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" -"list || clear [<nombre>|<nom>|-merged|-all] || move|merge <nombre> || swap " -"<nombre1>|<nom1> [<nombre2>|<nom2>] || unmerge [<nombre>|-all] || renumber " -"<nombre1> [<nombre2> [<départ>]] || close [<n1>[-<n2>]|<nom>] || notify " -"<niveau> || localvar || set <propriété> <valeur> || get <propriété> || " -"<nombre>|<nom>" +"list || clear [<nombre>|<nom>|-merged|-all] || move <nombre>|-|+ || merge " +"<nombre> || swap <nombre1>|<nom1> [<nombre2>|<nom2>] || unmerge [<nombre>|-" +"all] || renumber <nombre1> [<nombre2> [<départ>]] || close [<n1>[-<n2>]|" +"<nom>] || notify <niveau> || localvar || set <propriété> <valeur> || get " +"<propriété> || <nombre>|<nom>" msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1120,6 +1121,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1142,7 +1145,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" " list: lister les tampons ouverts (sans paramètre, cette liste est " "affichée)\n" @@ -1150,7 +1155,8 @@ msgstr "" "pour les tampons mélangés, -all pour tous les tampons, ou rien pour le " "tampon courant)\n" " move: déplacer le tampon dans la liste (peut être relatif, par exemple " -"-1)\n" +"-1); \"-\" = déplacer vers le premier numéro de tampon, \"+\" = déplacer " +"vers le dernier numéro de tampon + 1\n" " swap: échanger deux tampons (échanger avec le tampon courant si un seul " "numéro/nom donné)\n" " merge: mélanger le tampon courant avec un autre tampon (la zone de " @@ -1176,6 +1182,8 @@ msgstr "" " '-': saut relatif, soustrait le numéro au courant,\n" " '*': saut au numéro en utilisant l'option " "\"jump_current_to_previous_buffer\"\n" +" -: sauter au premier numéro de tampon\n" +" +: sauter au dernier numéro de tampon\n" " nom: sauter au tampon par nom (partiel)\n" "\n" "Exemples:\n" @@ -1198,7 +1206,9 @@ msgstr "" " aller sur #weechat:\n" " /buffer #weechat\n" " aller au tampon suivant:\n" -" /buffer +1" +" /buffer +1\n" +" aller au dernier numéro de tampon:\n" +" /buffer +" msgid "define color aliases and display palette of colors" msgstr "définir des alias de couleurs et afficher la palette des couleurs" @@ -1729,7 +1739,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -1791,7 +1800,6 @@ msgstr "" " history_global_next: rappeler la commande suivante dans l'historique " "global\n" " jump_smart: sauter au prochain tampon avec de l'activité\n" -" jump_last_buffer: sauter au dernier tampon\n" " jump_last_buffer_displayed: sauter au dernier tampon affiché (avant le " "dernier saut vers un tampon)\n" " jump_previously_visited_buffer: sauter au tampon visité précédemment\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-10 21:07+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1064,11 +1064,11 @@ msgid "manage buffers" msgstr "pufferek kezelése" msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" #, fuzzy @@ -1076,7 +1076,8 @@ msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1101,6 +1102,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1123,7 +1126,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" "utasítás: végrehajtandó utasítás:\n" " move: puffer mozgatása a listában (lehet relatív is, például -1)\n" @@ -1483,7 +1488,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-18 09:21+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1065,11 +1065,11 @@ msgstr "gestione dei buffer" #, fuzzy msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" "list || clear [<numero>|<nome>|-merged|-all] || move|merge <numero> || swap " "<numero1>|<nome1> [<numero2>|<nome2>] || unmerge [<numero>|-all] || close " @@ -1081,7 +1081,8 @@ msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1106,6 +1107,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1128,7 +1131,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" " list: elenca i buffer (senza argomento viene mostrata questa lista)\n" " clear: pulisce il contenuto del buffer (numero per un buffer, -merged per " @@ -1690,7 +1695,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-19 01:42+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/WeeChat>\n" @@ -40,11 +40,11 @@ msgid "max chars" msgstr "最大文字数" msgid "" -"a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)" -"green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal " -"color number or an alias; attributes are allowed before color (for text " -"color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" for " -"italic, \"_\" for underline" +"a WeeChat color name (default, black, (dark)gray, white, (light)red, " +"(light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a " +"terminal color number or an alias; attributes are allowed before color (for " +"text color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" " +"for italic, \"_\" for underline" msgstr "" "WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、" "brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号ま" @@ -1054,12 +1054,13 @@ msgstr "" msgid "manage buffers" msgstr "バッファの管理" +#, fuzzy msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" "list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " "<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " @@ -1067,11 +1068,13 @@ msgstr "" "<level> || localvar || set <property> <value> || get <property> || <number>|" "<name>" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1096,6 +1099,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1118,7 +1123,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" " list: バッファをリストアップ (引数無しの場合、このリストが表示されます)\n" " clear: バッファの内容を削除 (number はバッファ番号、マージバッファに対して" @@ -1649,6 +1656,7 @@ msgstr "コマンドライン関数" msgid "<action> [<arguments>]" msgstr "<action> [<arguments>]" +#, fuzzy msgid "" "list of actions:\n" " return: simulate key \"enter\"\n" @@ -1683,7 +1691,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -5718,8 +5725,8 @@ msgstr "" " - 内部サーバ名 (/server add で作成されたもの、利用推奨)\n" " - ホスト名/ポート番号、又は IP アドレス/ポート番号 (これは一時的" "サーバを作る)、デフォルトのポート番号は 6667\n" -" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:password]@]" -"irc.example.org[:port][/#channel1][,#channel2[...]]\n" +" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:" +"password]@]irc.example.org[:port][/#channel1][,#channel2[...]]\n" " option: サーバに関するオプション (ブール型オプションでは、value は無視さ" "れる)\n" " nooption: ブール型オプションを 'off' にする (例: -nossl)\n" @@ -10586,8 +10593,8 @@ msgid "" "Examples (you can also look at default triggers with /trigger listdefault):\n" " add text attributes *bold*, _underline_ and /italic/ (only in user " "messages):\n" -" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*" -"(\\S+)\\*==*${color:bold}$1${color:-bold}*== ==_(\\S+)_==_${color:" +" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==" +"\\*(\\S+)\\*==*${color:bold}$1${color:-bold}*== ==_(\\S+)_==_${color:" "underline}$1${color:-underline}_== ==/(\\S+)/==/${color:italic}$1${color:-" "italic}/\"\n" " hide nicklist bar on small terminals:\n" @@ -10654,8 +10661,8 @@ msgstr "" "\n" "例 (/trigger listdefault でデフォルトトリガを見ることができます):\n" " テキスト属性 *太字*、_下線_、/イタリック/ を追加 (ユーザメッセージのみ):\n" -" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*" -"(\\S+)\\*==*${color:bold}$1${color:-bold}*== ==_(\\S+)_==_${color:" +" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==" +"\\*(\\S+)\\*==*${color:bold}$1${color:-bold}*== ==_(\\S+)_==_${color:" "underline}$1${color:-underline}_== ==/(\\S+)/==/${color:italic}$1${color:-" "italic}/\"\n" " 狭い端末ではニックネームリストバーを隠す:\n" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-18 10:47+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1082,12 +1082,13 @@ msgstr "" msgid "manage buffers" msgstr "zarządzaj buforami" +#, fuzzy msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" "list || clear [<numer>|<nazwa>|-merged|-all] || move|merge <numer> || swap " "<numer1>|<nazwa1> [<numer2>|<nazwa2>] || unmerge [<numer>|-all] || renumber " @@ -1095,11 +1096,13 @@ msgstr "" "<poziom> || localvar || set <właściwość> <wartość> || get <właściwość> || " "<numer>|<nazwa>" +#, fuzzy msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1124,6 +1127,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1146,7 +1151,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" " list: wyświetla listę buforów (bez podania argumenty wyświetlana jest ta " "lista)\n" @@ -1684,6 +1691,7 @@ msgstr "funkcje linii komend" msgid "<action> [<arguments>]" msgstr "<akcja> [<argumenty>]" +#, fuzzy msgid "" "list of actions:\n" " return: simulate key \"enter\"\n" @@ -1718,7 +1726,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 60fba560e..af4d66b7b 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: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-18 09:22+0100\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1107,11 +1107,11 @@ msgstr "gerenciar buffers" #, fuzzy msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" "list || clear [<número>|<nome>|-merged|-all] || move|merge <número> || swap " "<número1>|<nome1> [<número2>|<nome2>] || unmerge [<número>|-all] || close " @@ -1124,7 +1124,8 @@ msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1149,6 +1150,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1171,7 +1174,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" " clear: limpa o conteúdo do buffer (número de um buffer, -merged para " "buffers mesclados, -all para todos os buffers, ou nada para o buffer atual)\n" @@ -1665,7 +1670,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-10 21:07+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1085,11 +1085,11 @@ msgid "manage buffers" msgstr "управление буферами" msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" #, fuzzy @@ -1097,7 +1097,8 @@ msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1122,6 +1123,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1144,7 +1147,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" "действие: выполняемое действие:\n" " move: передвинуть буфер в списке (может быть относительным, например " @@ -1505,7 +1510,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2014-03-18 09:23+0100\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -957,18 +957,19 @@ msgid "manage buffers" msgstr "" msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -993,6 +994,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1015,7 +1018,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" msgid "define color aliases and display palette of colors" @@ -1333,7 +1338,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" diff --git a/po/weechat.pot b/po/weechat.pot index 5d5466b1c..9e552b250 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-03-18 09:19+0100\n" +"POT-Creation-Date: 2014-03-19 09:28+0100\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -964,18 +964,19 @@ msgid "manage buffers" msgstr "" msgid "" -"list || clear [<number>|<name>|-merged|-all] || move|merge <number> || swap " -"<number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-all] || renumber " -"[<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|<name>] || notify " -"<level> || localvar || set <property> <value> || get <property> || <number>|" -"<name>" +"list || clear [<number>|<name>|-merged|-all] || move <number>|-|+ || merge " +"<number> || swap <number1>|<name1> [<number2>|<name2>] || unmerge [<number>|-" +"all] || renumber [<number1> [<number2> [<start>]]] || close [<n1>[-<n2>]|" +"<name>] || notify <level> || localvar || set <property> <value> || get " +"<property> || <number>|-|+|<name>" msgstr "" msgid "" " list: list buffers (without argument, this list is displayed)\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" +" move: move buffer in the list (may be relative, for example -1); \"-\" = " +"move to first buffer number, \"+\" = move to last buffer number + 1\n" " swap: swap two buffers (swap with current buffer if only one number/name " "given)\n" " merge: merge current buffer to another buffer (chat area will be mix of " @@ -1000,6 +1001,8 @@ msgid "" " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" +" -: jump to first buffer number\n" +" +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -1022,7 +1025,9 @@ msgid "" " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" -" /buffer +1" +" /buffer +1\n" +" jump to last buffer number:\n" +" /buffer +" msgstr "" msgid "define color aliases and display palette of colors" @@ -1339,7 +1344,6 @@ msgid "" " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" -" jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before last " "jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 5c7ce293f..bc30cc1fe 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -623,7 +623,7 @@ COMMAND_CALLBACK(buffer) return WEECHAT_RC_ERROR; if (strcmp (argv[2], "-") == 0) { - gui_buffer_move_to_number (buffer, 1); + gui_buffer_move_to_number (buffer, gui_buffers->number); } else if (strcmp (argv[2], "+") == 0) { @@ -997,47 +997,53 @@ COMMAND_CALLBACK(buffer) /* relative jump '-' */ if (argv[1][0] == '-') { - error = NULL; - number = strtol (argv[1] + 1, &error, 10); - if (error && !error[0]) + if (strcmp (argv[1], "-") == 0) { - if (number <= 0) - return WEECHAT_RC_OK; - count = 0; - prev_number = gui_current_window->buffer->number; - ptr_buffer = gui_current_window->buffer; - while (1) + gui_buffer_switch_by_number (gui_current_window, + gui_buffers->number); + } + else + { + error = NULL; + number = strtol (argv[1] + 1, &error, 10); + if (error && !error[0] && (number > 0)) { - ptr_buffer = ptr_buffer->prev_buffer; - if (!ptr_buffer) - ptr_buffer = last_gui_buffer; + count = 0; + prev_number = gui_current_window->buffer->number; + ptr_buffer = gui_current_window->buffer; + while (1) + { + ptr_buffer = ptr_buffer->prev_buffer; + if (!ptr_buffer) + ptr_buffer = last_gui_buffer; - /* if we have looped on all buffers, exit the loop */ - if (ptr_buffer == gui_current_window->buffer) - break; + /* if we have looped on all buffers, exit the loop */ + if (ptr_buffer == gui_current_window->buffer) + break; - if ((ptr_buffer->number != gui_current_window->buffer->number) - && (ptr_buffer->number != prev_number)) - { - /* increase count each time we discover a different number */ - count++; - if (count == number) + if ((ptr_buffer->number != gui_current_window->buffer->number) + && (ptr_buffer->number != prev_number)) { - gui_buffer_switch_by_number (gui_current_window, - ptr_buffer->number); - break; + /* increase count each time we discover a different number */ + count++; + if (count == number) + { + gui_buffer_switch_by_number (gui_current_window, + ptr_buffer->number); + break; + } } + prev_number = ptr_buffer->number; } - prev_number = ptr_buffer->number; } - } - else - { - /* invalid number */ - gui_chat_printf (NULL, - _("%sError: incorrect buffer number"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + else + { + /* invalid number */ + gui_chat_printf (NULL, + _("%sError: incorrect buffer number"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + return WEECHAT_RC_OK; + } } return WEECHAT_RC_OK; } @@ -1045,47 +1051,53 @@ COMMAND_CALLBACK(buffer) /* relative jump '+' */ if (argv[1][0] == '+') { - error = NULL; - number = strtol (argv[1] + 1, &error, 10); - if (error && !error[0]) + if (strcmp (argv[1], "+") == 0) { - if (number <= 0) - return WEECHAT_RC_OK; - count = 0; - prev_number = gui_current_window->buffer->number; - ptr_buffer = gui_current_window->buffer; - while (1) + gui_buffer_switch_by_number (gui_current_window, + last_gui_buffer->number); + } + else + { + error = NULL; + number = strtol (argv[1] + 1, &error, 10); + if (error && !error[0] && (number > 0)) { - ptr_buffer = ptr_buffer->next_buffer; - if (!ptr_buffer) - ptr_buffer = gui_buffers; + count = 0; + prev_number = gui_current_window->buffer->number; + ptr_buffer = gui_current_window->buffer; + while (1) + { + ptr_buffer = ptr_buffer->next_buffer; + if (!ptr_buffer) + ptr_buffer = gui_buffers; - /* if we have looped on all buffers, exit the loop */ - if (ptr_buffer == gui_current_window->buffer) - break; + /* if we have looped on all buffers, exit the loop */ + if (ptr_buffer == gui_current_window->buffer) + break; - if ((ptr_buffer->number != gui_current_window->buffer->number) - && (ptr_buffer->number != prev_number)) - { - /* increase count each time we discover a different number */ - count++; - if (count == number) + if ((ptr_buffer->number != gui_current_window->buffer->number) + && (ptr_buffer->number != prev_number)) { - gui_buffer_switch_by_number (gui_current_window, - ptr_buffer->number); - break; + /* increase count each time we discover a different number */ + count++; + if (count == number) + { + gui_buffer_switch_by_number (gui_current_window, + ptr_buffer->number); + break; + } } + prev_number = ptr_buffer->number; } - prev_number = ptr_buffer->number; } - } - else - { - /* invalid number */ - gui_chat_printf (NULL, - _("%sError: incorrect buffer number"), - gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); - return WEECHAT_RC_OK; + else + { + /* invalid number */ + gui_chat_printf (NULL, + _("%sError: incorrect buffer number"), + gui_chat_prefix[GUI_CHAT_PREFIX_ERROR]); + return WEECHAT_RC_OK; + } } return WEECHAT_RC_OK; } @@ -2763,8 +2775,9 @@ COMMAND_CALLBACK(input) gui_input_history_global_next (buffer); else if (string_strcasecmp (argv[1], "jump_smart") == 0) gui_input_jump_smart (buffer); + /* not used any more in WeeChat >= 0.4.4 (replaced by "/buffer ++") */ else if (string_strcasecmp (argv[1], "jump_last_buffer") == 0) - gui_input_jump_last_buffer (buffer); + input_data (buffer, "/buffer +"); else if (string_strcasecmp (argv[1], "jump_last_buffer_displayed") == 0) gui_input_jump_last_buffer_displayed (buffer); else if (string_strcasecmp (argv[1], "jump_previously_visited_buffer") == 0) @@ -6574,7 +6587,8 @@ command_init () N_("manage buffers"), N_("list" " || clear [<number>|<name>|-merged|-all]" - " || move|merge <number>" + " || move <number>|-|+" + " || merge <number>" " || swap <number1>|<name1> [<number2>|<name2>]" " || unmerge [<number>|-all]" " || renumber [<number1> [<number2> [<start>]]]" @@ -6583,11 +6597,13 @@ command_init () " || localvar" " || set <property> <value>" " || get <property>" - " || <number>|<name>"), + " || <number>|-|+|<name>"), N_(" list: list buffers (without argument, this list is displayed)\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" + " move: move buffer in the list (may be relative, for example -1); " + "\"-\" = move to first buffer number, \"+\" = move to last buffer " + "number + 1\n" " swap: swap two buffers (swap with current buffer if only one " "number/name given)\n" " merge: merge current buffer to another buffer (chat area will " @@ -6612,6 +6628,8 @@ command_init () " '-': relative jump, sub number to current\n" " '*': jump to number, using option \"weechat.look." "jump_current_to_previous_buffer\"\n" + " -: jump to first buffer number\n" + " +: jump to last buffer number\n" " name: jump to buffer by (partial) name\n" "\n" "Examples:\n" @@ -6634,7 +6652,9 @@ command_init () " jump to #weechat:\n" " /buffer #weechat\n" " jump to next buffer:\n" - " /buffer +1"), + " /buffer +1\n" + " jump to last buffer number:\n" + " /buffer +"), "clear -merged|-all|%(buffers_numbers)|%(buffers_plugins_names)" " || move %(buffers_numbers)" " || swap %(buffers_numbers)" @@ -6648,7 +6668,7 @@ command_init () " || set %(buffer_properties_set)" " || get %(buffer_properties_get)" " || %(buffers_plugins_names)|%(buffers_names)|%(irc_channels)|" - "%(irc_privates)|%(buffers_numbers)", + "%(irc_privates)|%(buffers_numbers)|-|-1|+|+1", &command_buffer, NULL); hook_command ( NULL, "color", @@ -6988,7 +7008,6 @@ command_init () " history_global_previous: recall previous command in global history\n" " history_global_next: recall next command in global history\n" " jump_smart: jump to next buffer with activity\n" - " jump_last_buffer: jump to last buffer\n" " jump_last_buffer_displayed: jump to last buffer displayed (before " "last jump to a buffer)\n" " jump_previously_visited_buffer: jump to previously visited buffer\n" @@ -7018,12 +7037,11 @@ command_init () "clipboard_paste|transpose_chars|undo|redo|move_beginning_of_line|" "move_end_of_line|move_previous_char|move_next_char|move_previous_word|" "move_next_word|history_previous|history_next|history_global_previous|" - "history_global_next|jump_smart|jump_last_buffer|" - "jump_previously_visited_buffer|jump_next_visited_buffer|hotlist_clear|" - "grab_key|grab_key_command|grab_mouse|grab_mouse_area|set_unread|" - "set_unread_current_buffer|switch_active_buffer|" - "switch_active_buffer_previous|zoom_merged_buffer|insert|paste_start|" - "paste_stop", + "history_global_next|jump_smart|jump_previously_visited_buffer|" + "jump_next_visited_buffer|hotlist_clear|grab_key|grab_key_command|" + "grab_mouse|grab_mouse_area|set_unread|set_unread_current_buffer|" + "switch_active_buffer|switch_active_buffer_previous|zoom_merged_buffer|" + "insert|paste_start|paste_stop", &command_input, NULL); hook_command ( NULL, "key", diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index c28ae8f8c..167c821a6 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -132,7 +132,8 @@ gui_key_default_bindings (int context) BIND(/* ^down */ "meta-OB", "/input history_global_next"); BIND(/* ^down */ "meta2-1;5B", "/input history_global_next"); BIND(/* m-a */ "meta-a", "/input jump_smart"); - BIND(/* m-j,m-l */ "meta-jmeta-l", "/input jump_last_buffer"); + BIND(/* m-j,m-f */ "meta-jmeta-f", "/buffer -"); + BIND(/* m-j,m-l */ "meta-jmeta-l", "/buffer +"); BIND(/* m-j,m-r */ "meta-jmeta-r", "/server raw"); BIND(/* m-j,m-s */ "meta-jmeta-s", "/server jump"); BIND(/* m-h */ "meta-h", "/input hotlist_clear"); diff --git a/src/gui/gui-input.c b/src/gui/gui-input.c index 47412201d..d34886be5 100644 --- a/src/gui/gui-input.c +++ b/src/gui/gui-input.c @@ -1422,24 +1422,6 @@ gui_input_jump_smart (struct t_gui_buffer *buffer) } /* - * Jumps to last buffer (default key: meta-j, meta-l). - */ - -void -gui_input_jump_last_buffer (struct t_gui_buffer *buffer) -{ - struct t_gui_window *window; - - window = gui_window_search_with_buffer (buffer); - if (window - && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED) - && last_gui_buffer) - { - gui_buffer_switch_by_number (window, last_gui_buffer->number); - } -} - -/* * Jumps to last buffer displayed (before last jump to a buffer) (default key: * meta-/). */ diff --git a/src/gui/gui-input.h b/src/gui/gui-input.h index 38ba0ae7e..4ecd429f6 100644 --- a/src/gui/gui-input.h +++ b/src/gui/gui-input.h @@ -70,7 +70,6 @@ extern void gui_input_history_local_next (struct t_gui_buffer *buffer); extern void gui_input_history_global_previous (struct t_gui_buffer *buffer); extern void gui_input_history_global_next (struct t_gui_buffer *buffer); extern void gui_input_jump_smart (struct t_gui_buffer *buffer); -extern void gui_input_jump_last_buffer (struct t_gui_buffer *buffer); extern void gui_input_jump_last_buffer_displayed (struct t_gui_buffer *buffer); extern void gui_input_jump_previously_visited_buffer (struct t_gui_buffer *buffer); extern void gui_input_jump_next_visited_buffer (struct t_gui_buffer *buffer); |