diff -Nru weechat-1.3~dev+20150718~wily1/ChangeLog.asciidoc weechat-1.3~dev+20150727~wily1/ChangeLog.asciidoc --- weechat-1.3~dev+20150718~wily1/ChangeLog.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/ChangeLog.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -19,29 +19,39 @@ === New features -* core: fix crash if a file descriptor used in hook_fd() is too high - (> 1024 on Linux/BSD) (issue #465) +* core: start/stop search in buffer at current scroll position by default, + add key key[ctrl-q] to stop search and reset scroll (issue #76, issue #393) +* core: add option weechat.look.key_grab_delay to set the default delay when + grabbing a key with key[alt-k] * core: add option weechat.look.confirm_upgrade (issue #463) -* core: allow ctrl-C to exit WeeChat when the passphrase is asked on startup - (issue #452) +* core: allow key[ctrl-c] to exit WeeChat when the passphrase is asked on + startup (issue #452) * core: allow pointer as list name in evaluation of hdata (issue #450) * core: add signal "signal_sighup" * api: add support of evaluated sub-strings and current date/time in function string_eval_expression() and command /eval * api: add function string_eval_path_home() +* alias: add options "add", "addcompletion" and "del" in command /alias, remove + command /unalias (issue #458) * irc: evaluate content of server option "nicks" * logger: evaluate content of option logger.file.path (issue #388) * relay: display value of HTTP header "X-Real-IP" for websocket connections (issue #440) * script: rename option script.scripts.dir to script.scripts.path, evaluate content of option (issue #388) -* xfer: fix crash if the DCC file socket number is too high - (> 1024 on Linux/BSD) (issue #465) * xfer: evaluate content of options xfer.file.download_path and xfer.file.upload_path (issue #388) === Bugs fixed +* core: flush stdout/stderr after sending text directly on them + (fix corrupted data sent to hook_process() callback) (issue #442) +* core: allow execution of command "/input return" on a buffer which is not + displayed in a window +* core: allow jump from current to previous buffer with default keys + key[alt-j,NN] (issue #466) +* core: fix crash if a file descriptor used in hook_fd() is too high + (> 1024 on Linux/BSD) (issue #465) * core: fix display of invalid UTF-8 chars in bars * core: fix bar item "scroll" after /buffer clear (issue #448) * core: fix display of time in bare display when option @@ -62,6 +72,8 @@ * irc: fix errors displayed on WHOX messages received (issue #376) * lua: add detection of Lua 5.3 * ruby: add detection of Ruby 2.2 +* xfer: fix crash if the DCC file socket number is too high + (> 1024 on Linux/BSD) (issue #465) * xfer: fix parsing of DCC chat messages (handle "\r\n" at the end of messages) (issue #425, issue #426) * doc: replace PREFIX with CMAKE_INSTALL_PREFIX in cmake instructions @@ -617,7 +629,7 @@ * irc: fix ignore on a host without nick * irc: use color code 0x1F (`ctrl-_`) for underlined text in input line (same code as messages) (bug #40756) -* irc: use color code 0x16 (`ctrl-V`) for reverse video in messages +* irc: use color code 0x16 (`ctrl-v`) for reverse video in messages * irc: use option irc.network.colors_send instead of irc.network.colors_receive when displaying messages sent by commands /away, /me, /msg, /notice, /query * irc: fix memory leak when checking the value of ssl_priorities option in diff -Nru weechat-1.3~dev+20150718~wily1/debian/changelog weechat-1.3~dev+20150727~wily1/debian/changelog --- weechat-1.3~dev+20150718~wily1/debian/changelog 2015-07-18 18:21:19.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/debian/changelog 2015-07-27 18:36:59.000000000 +0000 @@ -1,22 +1,38 @@ -weechat (1.3~dev+20150718~wily1) wily; urgency=medium +weechat (1.3~dev+20150727~wily1) wily; urgency=medium - * core: replace "closes #" by "issue #" in ChangeLog - * core: fix crash if a file descriptor used in hook_fd() is too high - (> 1024 on Linux/BSD) (closes #465) - * xfer: fix crash if the DCC file socket number is too high (issue - #465) - * irc: fix format of comment - * core: fix format of comment - * core: fix comment in function hook_find_pos - * core: add variables with count of hooks + * core: fix key names in ChangeLog + * doc: update German auto-generated files * core: update German translations - * core: reset pointers, file descriptors and child PIDs in unhook() - * core: add option weechat.look.confirm_upgrade (closes #463) + * core: fix typo in ChangeLog + * core: fix typo in /help weechat.look.key_grab_delay + * core: update ChangeLog (closes #76, closes #393) + * core: update translations + * core: factorize functions to search text in window + * Merge remote-tracking branch 'origin/pr/393' + * core: add option weechat.look.key_grab_delay to set the default + delay when grabbing a key with alt-k + * core: remove obsolete translations * doc: update Japanese auto-generated files - * Merge pull request #464 from l/translation_ja + * Merge pull request #467 from l/translation_ja + * core: flush stdout/stderr after sending text directly on them (fix + corrupted data sent to hook_process() callback) (closes #442) + * core: allow execution of command "/input return" on a buffer which + is not displayed in a window + * core: move bugs into proper section in ChangeLog * core: update Japanese translations - * doc: update German documentation - * doc: add Cygwin packages in user's guide - * core: remove obsolete translations + * core: update ChangeLog + * doc: update default keybinds for "alt-j NN" + * core: allow jump from current to previous buffer with default keys + "alt-j NN" + * core: remove useless "return" + * core: fix typo in /help window + * core: add command /alias in release notes + * doc: update German auto-generated files + * core: update German translations + * alias: add options "add", "addcompletion" and "del" in command + /alias, remove command /unalias (closes #458) + * xfer: fix typo in a comment + * aspell: fix typo in a comment + * core: add more intuitive buffer searching (closes #76) - -- nesthib Sat, 18 Jul 2015 20:21:15 +0200 + -- nesthib Mon, 27 Jul 2015 20:36:52 +0200 diff -Nru weechat-1.3~dev+20150718~wily1/doc/de/autogen/plugin_api/hdata.asciidoc weechat-1.3~dev+20150727~wily1/doc/de/autogen/plugin_api/hdata.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/de/autogen/plugin_api/hdata.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/de/autogen/plugin_api/hdata.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -942,6 +942,7 @@ *** 'scrolling' (integer) *** 'start_col' (integer) *** 'lines_after' (integer) +*** 'text_search_start_line' (pointer, hdata: "line") *** 'prev_scroll' (pointer, hdata: "window_scroll") *** 'next_scroll' (pointer, hdata: "window_scroll") * 'window_tree': Baumstruktur der Fenster diff -Nru weechat-1.3~dev+20150718~wily1/doc/de/autogen/user/alias_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/de/autogen/user/alias_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/de/autogen/user/alias_commands.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/de/autogen/user/alias_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -3,17 +3,22 @@ // DO NOT EDIT BY HAND! // [[command_alias_alias]] -[command]*`alias`* Einem Befehl wird ein Alias zugewiesen:: +[command]*`alias`* auflisten, hinzufügen oder entfernen von Alternativnamen:: ---- -/alias [-completion ] [ [;...]] - -completion: optionale Vervollständigung für einen Alias-Befehl (Standardverhalten: Vervollständigung wird auf den Zielbefehl angewendet) - Hinweis: Mit der Variablen "%%command" kann eine Vervollständigung eines vorhandenen Befehls durchgeführt werden - alias: Name des Alias (Platzhalter "*" kann verwendet werden) - command: Name des zuzuordnenden Befehls (WeeChat- oder IRC-Befehl ohne führenden '/', mehrere Befehle müssen durch Semikolon getrennt werden) - -Ohne Angabe von Argumenten werden alle definierten Aliase angezeigt. +/alias list [] + add [[;...]] + addcompletion [[;...]] + del [...] + + list: listet Alternativbefehle auf (ohne Angabe von Argumenten wird diese Liste dargestellt) + add: fügt einen Alternativbefehl hinzu +addcompletion: fügt einen Alternativbefehl, mit einer benutzerdefinierten Vervollständigung, hinzu + del: entfernt einen Alternativbefehl + completion: Vervollständigung für Alternativbefehl: standardmäßig wird die Vervollständigung auf den Zielbefehl angewendet + Hinweis: Mit der Variablen "%%command" kann eine Vervollständigung eines vorhandenen Befehls durchgeführt werden + alias: Name des Alternativbefehls + command: Name des zuzuordnenden Befehls, inklusive Argumenten (mehrere Befehle können durch Semikolon getrennt werden) Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entsprechenden Wert ersetzt werden: $n: Argument 'n' (zwischen 1 und 9) @@ -25,14 +30,12 @@ $var: "var" ist eine lokale Variable für den jeweiligen Buffer (siehe /buffer localvar) Beispiel: $nick, $channel, $server, $plugin, $name -Um ein Alias zu löschen wird der Befehl "/unalias" genutzt. - Beispiele: - Alias "/split" wird anlegt um damit ein Fenster horizontal zu teilen: + Alternativbefehl "/split" wird anlegt um ein Fenster horizontal zu teilen: /alias split /window splith - Alias "/hallo" wird angelegt um in allen Channels, außer im #weechat Channel, den Text "Hallo" auszugeben: + Alternativbefehl "/hallo" wird angelegt um in allen Channels, außer im #weechat Channel, den Text "Hallo" auszugeben: /alias hallo /allchan -exclude=#weechat msg * Hallo - Alias "/forcejoin" wird angelegt um den IRC Befehl "forcejoin" mit einer Vervollständigung von /sajoin auszuführen: + Alternativbefehl "/forcejoin" wird angelegt um den IRC Befehl "forcejoin" mit einer Vervollständigung von /sajoin auszuführen: /alias -completion %%sajoin forcejoin /quote forcejoin ---- diff -Nru weechat-1.3~dev+20150718~wily1/doc/de/autogen/user/weechat_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/de/autogen/user/weechat_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/de/autogen/user/weechat_commands.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/de/autogen/user/weechat_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -151,7 +151,7 @@ alias: weist einer Farbzahl einen Namen zu unalias: entfernt einen Namen color: Farbnummer (>= 0, maximale Anzahl ist abhängig vom Terminal, üblicherweise 63 oder 255 Farben) - name: Aliasname für eine Farbe (zum Beispiel: "orange") + name: Alternativname für eine Farbe (zum Beispiel: "orange") reset: setzt alle Farbpaarungen zurück (nützlich falls keine Farbpaarung mehr verfügbar sein sollte und die automatische Reset-Option deaktiviert ist, siehe Einstellung: weechat.look.color_pairs_auto_reset) term2rgb: konvertiert eine Terminalfarbe (0-255) in eine RGB Farbe rgb2term: konvertiert eine RGB Farbe in eine Terminalfarbe (0-255) @@ -418,12 +418,14 @@ 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_text_here: Textsuche ab aktueller Position + search_text: Textsuche 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_here: stopped Suche ab aktueller Position search_stop: suche stoppen delete_previous_char: entfernt vorheriges Zeichen delete_next_char: entfernt nächstes Zeichen @@ -621,7 +623,7 @@ -beep -buffer: Buffer in welchem der Text ausgegeben werden soll (standardmäßig: aktueller Buffer) - -core: Alias für "-buffer core.weechat" + -core: Alternativname für "-buffer core.weechat" -current: Text wird im aktuell genutzten Buffer ausgegeben -escape: Escapesequenzen werden umgewandelt (zum Beispiel \a, \07, \x07) -date: Datum der Nachricht, mögliche Formatierung: @@ -778,7 +780,7 @@ verschlüsselt oftc Passwort für nickserv: /secure set oftc meinPasswort /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}" - alias um den eigenen Nick zu ghosten: + Alternativbefehl um den eigenen Nick zu ghosten: /alias ghost /eval /msg -server freenode nickserv ghost meinNick ${sec.data.freenode} ---- @@ -843,30 +845,30 @@ ---- /upgrade [-yes] [|-quit] - -yes: required if option weechat.look.confirm_upgrade is enabled -path_to_binary: path to WeeChat binary (default is current binary) - -dummy: do nothing (option used to prevent accidental completion with "-quit") - -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below) - -This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command. - -Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade. - -Upgrade process has 4 steps: - 1. save session into files for core and plugins (buffers, history, ..) - 2. unload all plugins (configuration files (*.conf) are written on disk) - 3. save WeeChat configuration (weechat.conf) - 4. execute new WeeChat binary and reload session. - -With option "-quit", the process is slightly different: - 1. close *ALL* connections (irc, xfer, relay, ...) - 2. save session into files (*.upgrade) - 3. unload all plugins - 4. save WeeChat configuration - 5. quit WeeChat -Then later you can restore session with command: weechat --upgrade -IMPORTANT: you must restore the session with exactly same configuration (files *.conf). -It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat". + -yes: wird benötigt, sobald Option weechat.look.confirm_upgrade aktiviert ist +path_to_binary: Pfad zu einer ausführbaren WeeChat Binärdatei (Standardeinstellung ist die aktuell ausführbare Datei) + -dummy: ohne Funktion (dient lediglich dazu, um nicht versehentlich die "-quit" Funktion auszuführen) + -quit: trennt *ALLE* Verbindungen, speichert die aktuelle Sitzung und beendet WeeChat, um den aktuellen Zustand später wiederherstellen (siehe unten) + +Dieser Befehl führt ein Upgrade von WeeChat durch und startet die laufende Sitzung neu. Bevor dieser Befehl ausgeführt wird, sollte eine neue Version von WeeChat entweder vorab kompiliert, oder mit einem Paketmanager installiert worden sein. + +Hinweis: SSL Verbindungen werden während eines Upgrades unterbrochen, da diese Verbindungen zur Zeit nicht mit GnuTLS gehalten werden können. Nach einem erfolgten Upgrade findet eine automatische Verbindung zu diesen Servern statt. + +Der Upgrade Vorgang besteht aus vier Schritten: + 1. Sicherung der Sitzung, in Dateien für Core und Erweiterungen (buffers, history, ..) + 2. alle Erweiterungen werden ausgeschaltet (Konfigurationen *.conf werden gesichert) + 3. Sicherung der WeeChat Konfiguration (weechat.conf) + 4. ausführen der neuen Version von WeeChat und wiederherstellen der Sitzung. + +Nutzt man die "-quit" Funktion ist die Abfolge geringfügig anders: + 1. es werden *ALLE* Verbindungen getrennt (irc,xfer,relay, ...) + 2. die Sitzung wird in Dateien gesichert (*.upgrade) + 3. alle Erweiterungen werden ausgeschaltet + 4. die WeeChat Konfiguration wird gesichert + 5. WeeChat wird beendet +Die Sitzung kann zu einem späteren Zeitpunkt wiederhergestellt werden: weechat --upgrade +WICHTIG: Die Sitzung muss mit exakt den selben Konfigurationsdateien wiederhergestellt werden (*.conf) +Es ist möglich die WeeChat-Sitzung auf einem anderen Rechner wiederherzustellen, sofern man den Inhalt des "~/.weechat" Verzeichnisses dorthin kopiert. ---- [[command_weechat_uptime]] @@ -888,7 +890,7 @@ -o: die Version von WeeChat wird in den aktuellen Buffer ausgegeben (in englischer Sprache) -ol: die Version von WeeChat wird in den aktuellen Buffer ausgegeben (in der voreingestellten Landessprache) -Um diesen Befehl in jedem Buffer ausführen zu können, kann der Standardalias /v genutzt werden (andernfalls wird der IRC Befehl /version in einem IRC Buffer ausgeführt). +Um diesen Befehl in jedem Buffer ausführen zu können, kann der Standardkurzbefehl /v genutzt werden (andernfalls wird der IRC Befehl /version in einem IRC Buffer ausgeführt). ---- [[command_weechat_wait]] @@ -933,7 +935,7 @@ scroll_horiz [-window ] [+/-][%] scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window ] swap [-window ] [up|down|left|right] - zoom[-window ] + zoom [-window ] bare [] list: listet die geöffneten Fenster (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben) diff -Nru weechat-1.3~dev+20150718~wily1/doc/de/autogen/user/weechat_options.asciidoc weechat-1.3~dev+20150727~wily1/doc/de/autogen/user/weechat_options.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/de/autogen/user/weechat_options.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/de/autogen/user/weechat_options.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -543,7 +543,7 @@ ** Werte: on, off (Standardwert: `off`) * [[option_weechat.look.confirm_upgrade]] *weechat.look.confirm_upgrade* -** Beschreibung: `if set, /upgrade command must be confirmed with extra argument "-yes" (see /help upgrade)` +** Beschreibung: `ist diese Einstellung aktiviert, muss der "/upgrade" Befehl mit dem Argument "-yes" ausgeführt werden (siehe /help upgrade)` ** Typ: boolesch ** Werte: on, off (Standardwert: `off`) @@ -717,6 +717,11 @@ ** Typ: boolesch ** Werte: on, off (Standardwert: `on`) +* [[option_weechat.look.key_grab_delay]] *weechat.look.key_grab_delay* +** Beschreibung: `Standardverzögerung (in Millisekunden) um eine Tasteneingabe zu greifen (Standardtastenbelegung: alt-k); die Verzögerung kann mit dem /input Befehl angepasst werden (siehe /help input)` +** Typ: integer +** Werte: 1 .. 10000 (Standardwert: `800`) + * [[option_weechat.look.mouse]] *weechat.look.mouse* ** Beschreibung: `Mausunterstützung einschalten` ** Typ: boolesch diff -Nru weechat-1.3~dev+20150718~wily1/doc/de/weechat_user.de.asciidoc weechat-1.3~dev+20150727~wily1/doc/de/weechat_user.de.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/de/weechat_user.de.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/de/weechat_user.de.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -1182,7 +1182,7 @@ | 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` -| key[alt-j,01...99] | wechselt zum Buffer mit der angegeben Nummer | `/buffer NN` +| key[alt-j,01...99] | wechselt zum Buffer mit der angegeben Nummer | `/buffer *NN` | key[alt-l] | schaltet einfachen Anzeigemodus an/aus | `/window bare` | key[alt-m] | schaltet Mausfunktion ein/aus | `/mouse toggle` | key[alt-n] | springt zur nächsten Highlight Nachricht | `/window scroll_next_highlight` diff -Nru weechat-1.3~dev+20150718~wily1/doc/en/autogen/plugin_api/hdata.asciidoc weechat-1.3~dev+20150727~wily1/doc/en/autogen/plugin_api/hdata.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/en/autogen/plugin_api/hdata.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/en/autogen/plugin_api/hdata.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -942,6 +942,7 @@ *** 'scrolling' (integer) *** 'start_col' (integer) *** 'lines_after' (integer) +*** 'text_search_start_line' (pointer, hdata: "line") *** 'prev_scroll' (pointer, hdata: "window_scroll") *** 'next_scroll' (pointer, hdata: "window_scroll") * 'window_tree': tree of windows diff -Nru weechat-1.3~dev+20150718~wily1/doc/en/autogen/user/alias_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/en/autogen/user/alias_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/en/autogen/user/alias_commands.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/en/autogen/user/alias_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -3,17 +3,22 @@ // DO NOT EDIT BY HAND! // [[command_alias_alias]] -[command]*`alias`* create an alias for a command:: +[command]*`alias`* list, add or remove command aliases:: ---- -/alias [-completion ] [ [;...]] - -completion: completion for alias (optional, by default completion is done with target command) - note: you can use %%command to use completion of an existing command - alias: name of alias (wildcard "*" is allowed) - command: command name with arguments (many commands can be separated by semicolons) - -Without argument, this command lists all defined alias. +/alias list [] + add [[;...]] + addcompletion [[;...]] + del [...] + + list: list aliases (without argument, this list is displayed) + add: add an alias +addcompletion: add an alias with a custom completion + del: delete an alias + completion: completion for alias: by default completion is done with target command + note: you can use %%command to use completion of an existing command + alias: name of alias + command: command name with arguments (many commands can be separated by semicolons) Note: in command, special variables are replaced: $n: argument 'n' (between 1 and 9) @@ -25,14 +30,12 @@ $var: where "var" is a local variable of buffer (see /buffer localvar) examples: $nick, $channel, $server, $plugin, $name -To remove an alias, use command /unalias. - Examples: alias /split to split window horizontally: - /alias split /window splith + /alias add split /window splith alias /hello to say "hello" on all channels but not on #weechat: - /alias hello /allchan -exclude=#weechat msg * hello + /alias add hello /allchan -exclude=#weechat msg * hello alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin: - /alias -completion %%sajoin forcejoin /quote forcejoin + /alias addcompletion %%sajoin forcejoin /quote forcejoin ---- diff -Nru weechat-1.3~dev+20150718~wily1/doc/en/autogen/user/weechat_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/en/autogen/user/weechat_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/en/autogen/user/weechat_commands.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/en/autogen/user/weechat_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -418,12 +418,14 @@ return: simulate key "enter" complete_next: complete word with next completion complete_previous: complete word with previous completion + search_text_here: search text in buffer at current position 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_here: stop search at current position search_stop: stop search delete_previous_char: delete previous char delete_next_char: delete next char @@ -933,7 +935,7 @@ scroll_horiz [-window ] [+/-][%] scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window ] swap [-window ] [up|down|left|right] - zoom[-window ] + zoom [-window ] bare [] list: list opened windows (without argument, this list is displayed) diff -Nru weechat-1.3~dev+20150718~wily1/doc/en/autogen/user/weechat_options.asciidoc weechat-1.3~dev+20150727~wily1/doc/en/autogen/user/weechat_options.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/en/autogen/user/weechat_options.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/en/autogen/user/weechat_options.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -717,6 +717,11 @@ ** type: boolean ** values: on, off (default value: `on`) +* [[option_weechat.look.key_grab_delay]] *weechat.look.key_grab_delay* +** description: `default delay (in milliseconds) to grab a key (using default key alt-k); this delay can be overridden in the /input command (see /help input)` +** type: integer +** values: 1 .. 10000 (default value: `800`) + * [[option_weechat.look.mouse]] *weechat.look.mouse* ** description: `enable mouse support` ** type: boolean diff -Nru weechat-1.3~dev+20150718~wily1/doc/en/weechat_dev.en.asciidoc weechat-1.3~dev+20150727~wily1/doc/en/weechat_dev.en.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/en/weechat_dev.en.asciidoc 2015-05-17 12:13:16.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/en/weechat_dev.en.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -180,6 +180,8 @@ | weechat-plugin.h | Header designed to be distributed with WeeChat plugins, in order to compile them | alias/ | Alias plugin | alias.c | Main alias functions +| alias-command.c | Alias commands +| alias-completion.c | Alias completions | alias-config.c | Alias config options (file alias.conf) | alias-info.c | Alias info/infolists/hdata | aspell/ | Aspell plugin diff -Nru weechat-1.3~dev+20150718~wily1/doc/en/weechat_user.en.asciidoc weechat-1.3~dev+20150727~wily1/doc/en/weechat_user.en.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/en/weechat_user.en.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/en/weechat_user.en.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -1158,7 +1158,7 @@ | 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` -| key[alt-j,01...99] | Switch to buffer by number | `/buffer NN` +| key[alt-j,01...99] | Switch to buffer by number | `/buffer *NN` | key[alt-l] | Toggle bare display on/off | `/window bare` | key[alt-m] | Toggle mouse | `/mouse toggle` | key[alt-n] | Scroll to next highlight | `/window scroll_next_highlight` diff -Nru weechat-1.3~dev+20150718~wily1/doc/fr/autogen/plugin_api/hdata.asciidoc weechat-1.3~dev+20150727~wily1/doc/fr/autogen/plugin_api/hdata.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/fr/autogen/plugin_api/hdata.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/fr/autogen/plugin_api/hdata.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -942,6 +942,7 @@ *** 'scrolling' (integer) *** 'start_col' (integer) *** 'lines_after' (integer) +*** 'text_search_start_line' (pointer, hdata: "line") *** 'prev_scroll' (pointer, hdata: "window_scroll") *** 'next_scroll' (pointer, hdata: "window_scroll") * 'window_tree': arbre des fenêtres diff -Nru weechat-1.3~dev+20150718~wily1/doc/fr/autogen/user/alias_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/fr/autogen/user/alias_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/fr/autogen/user/alias_commands.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/fr/autogen/user/alias_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -3,17 +3,22 @@ // DO NOT EDIT BY HAND! // [[command_alias_alias]] -[command]*`alias`* créer un alias pour une commande:: +[command]*`alias`* lister, ajouter ou retirer des alias de commande:: ---- -/alias [-completion ] alias [ [;...]] - -complétion : complétion pour l'alias (optionnel, par défaut la complétion se fait avec la commande cible) - note : vous pouvez utiliser %%commande pour utiliser la complétion d'une commande existante - alias : nom de l'alias (le caractère joker "*" est autorisé) - commande : nom de la commande avec les paramètres (plusieurs commandes peuvent être séparées par des points-virgules) - -Sans paramètre, cette commande liste tous les alias définis. +/alias list [] + add [[;...]] + addcompletion [[;...]] + del [...] + + list : afficher les alias (sans paramètre, cette liste est affichée) + add : ajouter un alias +addcompletion : ajouter un alias avec une complétion personnalisée + del : supprimer un alias + complétion : complétion pour l'alias : par défaut la complétion se fait avec la commande cible + note : vous pouvez utiliser %%commande pour utiliser la complétion d'une commande existante + alias : nom de l'alias + commande : nom de la commande avec les paramètres (plusieurs commandes peuvent être séparées par des points-virgules) Note : dans la commande, les variables spéciales sont remplacées : $n : paramètre 'n' (entre 1 et 9) @@ -25,14 +30,12 @@ $var : où "var" est une variable locale du tampon (voir /buffer localvar) exemples : $nick, $channel, $server, $plugin, $name -Pour supprimer un alias, utilisez la commande /unalias. - Exemples : alias /split pour diviser la fenêtre horizontalement : - /alias split /window splith + /alias add split /window splith alias /hello pour dire "hello" sur tous les canaux mais pas sur #weechat : - /alias hello /allchan -exclude=#weechat msg * hello + /alias add hello /allchan -exclude=#weechat msg * hello alias /forcejoin pour envoyer la commande IRC "forcejoin" avec la complétion de /sajoin : - /alias -completion %%sajoin forcejoin /quote forcejoin + /alias addcompletion %%sajoin forcejoin /quote forcejoin ---- diff -Nru weechat-1.3~dev+20150718~wily1/doc/fr/autogen/user/weechat_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/fr/autogen/user/weechat_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/fr/autogen/user/weechat_commands.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/fr/autogen/user/weechat_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -418,12 +418,14 @@ return : simuler la touche "entrée" complete_next : compléter le mot avec la complétion suivante complete_previous : compléter le mot avec la complétion précédente + search_text_here : chercher du texte dans le tampon à la position courante search_text : chercher du texte dans le tampon search_switch_case : basculer la casse exacte pour la recherche search_switch_regex : basculer le type de recherche : chaîne/expression régulière search_switch_where : basculer la recherche dans les messages/préfixes search_previous : chercher la ligne précédente search_next : chercher la ligne suivante + search_stop_here : arrêter la recherche à la position courante search_stop : arrêter la recherche delete_previous_char : effacer le caractère précédent delete_next_char : effacer le caractère suivant diff -Nru weechat-1.3~dev+20150718~wily1/doc/fr/autogen/user/weechat_options.asciidoc weechat-1.3~dev+20150727~wily1/doc/fr/autogen/user/weechat_options.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/fr/autogen/user/weechat_options.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/fr/autogen/user/weechat_options.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -717,6 +717,11 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: `on`) +* [[option_weechat.look.key_grab_delay]] *weechat.look.key_grab_delay* +** description: `délai par défaut (en millisecondes) pour capturer une touche (en utilisant la touche par défaut alt-k) ; ce délai peut être remplacé dans la commande /input (voir /help input)` +** type: entier +** valeurs: 1 .. 10000 (valeur par défaut: `800`) + * [[option_weechat.look.mouse]] *weechat.look.mouse* ** description: `activer le support de la souris` ** type: booléen diff -Nru weechat-1.3~dev+20150718~wily1/doc/fr/weechat_dev.fr.asciidoc weechat-1.3~dev+20150727~wily1/doc/fr/weechat_dev.fr.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/fr/weechat_dev.fr.asciidoc 2015-05-17 12:13:16.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/fr/weechat_dev.fr.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -181,6 +181,8 @@ | weechat-plugin.h | En-tête destiné à être distribué avec les extensions WeeChat, pour les compiler | alias/ | Extension Alias | alias.c | Fonctions principales pour les alias +| alias-command.c | Commandes Alias +| alias-completion.c | Complétions pour Alias | alias-config.c | Options de configuration des alias (fichier alias.conf) | alias-info.c | Info/infolists/hdata pour les alias | aspell/ | Extension Aspell diff -Nru weechat-1.3~dev+20150718~wily1/doc/fr/weechat_user.fr.asciidoc weechat-1.3~dev+20150727~wily1/doc/fr/weechat_user.fr.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/fr/weechat_user.fr.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/fr/weechat_user.fr.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -1188,7 +1188,7 @@ | 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` -| key[alt-j,01...99] | Sauter au tampon qui porte ce numéro | `/buffer NN` +| key[alt-j,01...99] | Sauter au tampon qui porte ce numéro | `/buffer *NN` | key[alt-l] | Activer/désactiver le mode d'affichage dépouillé | `/window bare` | key[alt-m] | Activer/désactiver la souris | `/mouse toggle` | key[alt-n] | Se positionner sur le highlight suivant | `/window scroll_next_highlight` diff -Nru weechat-1.3~dev+20150718~wily1/doc/it/autogen/plugin_api/hdata.asciidoc weechat-1.3~dev+20150727~wily1/doc/it/autogen/plugin_api/hdata.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/it/autogen/plugin_api/hdata.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/it/autogen/plugin_api/hdata.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -942,6 +942,7 @@ *** 'scrolling' (integer) *** 'start_col' (integer) *** 'lines_after' (integer) +*** 'text_search_start_line' (pointer, hdata: "line") *** 'prev_scroll' (pointer, hdata: "window_scroll") *** 'next_scroll' (pointer, hdata: "window_scroll") * 'window_tree': albero delle finestre diff -Nru weechat-1.3~dev+20150718~wily1/doc/it/autogen/user/alias_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/it/autogen/user/alias_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/it/autogen/user/alias_commands.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/it/autogen/user/alias_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -3,17 +3,22 @@ // DO NOT EDIT BY HAND! // [[command_alias_alias]] -[command]*`alias`* crea un alias per un comando:: +[command]*`alias`* list, add or remove command aliases:: ---- -/alias [-completion ] [ [;...]] - -completion: completion for alias (optional, by default completion is done with target command) - note: you can use %%command to use completion of an existing command - alias: name of alias (wildcard "*" is allowed) - command: command name with arguments (many commands can be separated by semicolons) - -Without argument, this command lists all defined alias. +/alias list [] + add [[;...]] + addcompletion [[;...]] + del [...] + + list: list aliases (without argument, this list is displayed) + add: add an alias +addcompletion: add an alias with a custom completion + del: delete an alias + completion: completion for alias: by default completion is done with target command + note: you can use %%command to use completion of an existing command + alias: name of alias + command: command name with arguments (many commands can be separated by semicolons) Note: in command, special variables are replaced: $n: argument 'n' (between 1 and 9) @@ -25,14 +30,12 @@ $var: where "var" is a local variable of buffer (see /buffer localvar) examples: $nick, $channel, $server, $plugin, $name -To remove an alias, use command /unalias. - Examples: alias /split to split window horizontally: - /alias split /window splith + /alias add split /window splith alias /hello to say "hello" on all channels but not on #weechat: - /alias hello /allchan -exclude=#weechat msg * hello + /alias add hello /allchan -exclude=#weechat msg * hello alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin: - /alias -completion %%sajoin forcejoin /quote forcejoin + /alias addcompletion %%sajoin forcejoin /quote forcejoin ---- diff -Nru weechat-1.3~dev+20150718~wily1/doc/it/autogen/user/weechat_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/it/autogen/user/weechat_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/it/autogen/user/weechat_commands.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/it/autogen/user/weechat_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -418,12 +418,14 @@ return: simulate key "enter" complete_next: complete word with next completion complete_previous: complete word with previous completion + search_text_here: search text in buffer at current position 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_here: stop search at current position search_stop: stop search delete_previous_char: delete previous char delete_next_char: delete next char @@ -933,7 +935,7 @@ scroll_horiz [-window ] [+/-][%] scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window ] swap [-window ] [up|down|left|right] - zoom[-window ] + zoom [-window ] bare [] list: list opened windows (without argument, this list is displayed) diff -Nru weechat-1.3~dev+20150718~wily1/doc/it/autogen/user/weechat_options.asciidoc weechat-1.3~dev+20150727~wily1/doc/it/autogen/user/weechat_options.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/it/autogen/user/weechat_options.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/it/autogen/user/weechat_options.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -717,6 +717,11 @@ ** tipo: bool ** valori: on, off (valore predefinito: `on`) +* [[option_weechat.look.key_grab_delay]] *weechat.look.key_grab_delay* +** descrizione: `default delay (in milliseconds) to grab a key (using default key alt-k); this delay can be overridden in the /input command (see /help input)` +** tipo: intero +** valori: 1 .. 10000 (valore predefinito: `800`) + * [[option_weechat.look.mouse]] *weechat.look.mouse* ** descrizione: `abilita il supporto del mouse` ** tipo: bool diff -Nru weechat-1.3~dev+20150718~wily1/doc/it/weechat_user.it.asciidoc weechat-1.3~dev+20150727~wily1/doc/it/weechat_user.it.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/it/weechat_user.it.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/it/weechat_user.it.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -1214,7 +1214,7 @@ | 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` -| key[alt-j,01...99] | Passa al buffer numero | `/buffer NN` +| key[alt-j,01...99] | Passa al buffer numero | `/buffer *NN` // TRANSLATION MISSING | key[alt-l] | Toggle bare display on/off | `/window bare` | key[alt-m] | Abilita/disabilita | `/mouse toggle` diff -Nru weechat-1.3~dev+20150718~wily1/doc/ja/autogen/plugin_api/hdata.asciidoc weechat-1.3~dev+20150727~wily1/doc/ja/autogen/plugin_api/hdata.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/ja/autogen/plugin_api/hdata.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/ja/autogen/plugin_api/hdata.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -942,6 +942,7 @@ *** 'scrolling' (integer) *** 'start_col' (integer) *** 'lines_after' (integer) +*** 'text_search_start_line' (pointer, hdata: "line") *** 'prev_scroll' (pointer, hdata: "window_scroll") *** 'next_scroll' (pointer, hdata: "window_scroll") * 'window_tree': ウィンドウツリー diff -Nru weechat-1.3~dev+20150718~wily1/doc/ja/autogen/user/alias_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/ja/autogen/user/alias_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/ja/autogen/user/alias_commands.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/ja/autogen/user/alias_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -3,19 +3,24 @@ // DO NOT EDIT BY HAND! // [[command_alias_alias]] -[command]*`alias`* コマンドの別名を作成:: +[command]*`alias`* 別名コマンドのリストアップ、追加、削除:: ---- -/alias [-completion ] [ [;...]] +/alias list [] + add [[;...]] + addcompletion [[;...]] + del [...] + + list: 別名をリストアップ (引数を与えなかった場合、このリストが表示されます) + add: 別名を追加 +addcompletion: カスタム補完を指定して別名を追加 + del: 別名を削除 + completion: 別名の補完: デフォルトでは対象のコマンドに対する補完が行われます + 注意: %%command で既存のコマンドに対する補完を利用可能です + alias: 別名の名前 + command: 引数を含めたコマンド名 (セミコロンで分割すれば複数のコマンドを指定できます) -completion: 別名の補完 (任意、デフォルトではターゲットコマンドを伴って補完されます) - 注意: %%command で存在するコマンドの補完を利用可能です - alias: 別名の名前 (ワイルドカード "*" を使うことができます) - command: 引数を含めたコマンド名 (セミコロンで分割すれば複数のコマンドを指定できます) - -引数無しでは、定義済み別名をリストアップ。 - -注意: command の中では、特殊変数の置換が行われる: +注意: command の中に含まれる特殊変数は置換されます: $n: 'n' 番目の引数 (1 から 9) $-m: 1 から 'm' 番目の引数 $n-: 'n' 番目から最後の引数 @@ -25,14 +30,12 @@ $var: ここで "var" とはバッファの局所変数 (/buffer localvar を参照) 例: $nick、$channel、$server、$plugin、$name -別名を削除するには /unalias コマンドを使ってください: - 例: /split をウィンドウを水平方向に分割する別名と定義: - /alias split /window splith + /alias add split /window splith /hello を #weechat を除く全てのチャンネルで "hello" と発言する別名と定義: - /alias hello /allchan -exclude=#weechat msg * hello + /alias add hello /allchan -exclude=#weechat msg * hello /forcejoin を /sajoin の補完候補を使い IRC コマンド "forcejoin" を送信する別名と定義: - /alias -completion %%sajoin forcejoin /quote forcejoin + /alias addcompletion %%sajoin forcejoin /quote forcejoin ---- diff -Nru weechat-1.3~dev+20150718~wily1/doc/ja/autogen/user/weechat_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/ja/autogen/user/weechat_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/ja/autogen/user/weechat_commands.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/ja/autogen/user/weechat_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -414,58 +414,60 @@ ---- /input [] -アクションリスト: - 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_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 を参照) - send: バッファにテキストを送信 - 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_here: search text in buffer at current position + 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_here: stop search at current position + 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) + send: send text to the buffer + 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]] @@ -843,30 +845,30 @@ ---- /upgrade [-yes] [|-quit] - -yes: required if option weechat.look.confirm_upgrade is enabled -path_to_binary: path to WeeChat binary (default is current binary) - -dummy: do nothing (option used to prevent accidental completion with "-quit") - -quit: close *ALL* connections, save session and quit WeeChat, which makes possible a delayed restoration (see below) - -This command upgrades and reloads a running WeeChat session. The new WeeChat binary must have been compiled or installed with a package manager before running this command. - -Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade. - -Upgrade process has 4 steps: - 1. save session into files for core and plugins (buffers, history, ..) - 2. unload all plugins (configuration files (*.conf) are written on disk) - 3. save WeeChat configuration (weechat.conf) - 4. execute new WeeChat binary and reload session. - -With option "-quit", the process is slightly different: - 1. close *ALL* connections (irc, xfer, relay, ...) - 2. save session into files (*.upgrade) - 3. unload all plugins - 4. save WeeChat configuration - 5. quit WeeChat -Then later you can restore session with command: weechat --upgrade -IMPORTANT: you must restore the session with exactly same configuration (files *.conf). -It is possible to restore WeeChat session on another machine if you copy the content of directory "~/.weechat". + -yes: weechat.look.confirm_upgrade オプションが有効化されていた場合、このオプションは必須です。 +path_to_binary: WeeChat バイナリへのパス (デフォルトは現在のバイナリ) + -dummy: 何もしない (補完された "-quit" オプションを不用意に使わないためのオプション) + -quit: *すべての*接続を閉じ、セッションを保存して WeeChat を終了。遅延復帰 (詳しくは後述) が可能になります。 + +このコマンドは起動中の WeeChat セッションのアップグレードと再読み込みを行います。このコマンドを実行する前に、新しい WeeChat バイナリをコンパイルするか、パッケージマネージャでインストールしなければいけません。 + +注意: SSL 接続はアップグレード中に破棄されます、これは今のところ GnuTLS では SSL セッションのリロードができないからです。アップグレードの後に自動的に再接続されます。 + +アップグレードは 4 つの手順を踏みます: + 1. コアとプラグイン (バッファ、履歴、...) のセッションをファイルに保存 + 2. 全てのプラグインをアンロード (設定ファイル (*.conf) はディスクに書き込まれます) + 3. WeeChat 設定を保存 (weechat.conf) + 4. 新しい WeeChat バイナリを実行してセッションをリロード。< + +オプション "-quit" を使うと、上の挙動が少し変わります: + 1. *すべての*接続を閉じる (irc、xfer、relay、...) + 2. すべてのセッションをファイルに保存 (*.upgrade) + 3. すべてのプラグインをアンロード + 4. WeeChat 設定を保存 + 5. WeeChat を終了 +この後、セッションを回復させるには weechat --upgrade を使ってください。 +重要: 完全に同一の設定で (*.conf ファイルで) セッションを回復させてください。 +"~/.weechat" ディレクトリの内容をコピーすれば異なるマシンで WeeChat のセッションを回復することも可能です。 ---- [[command_weechat_uptime]] @@ -933,7 +935,7 @@ scroll_horiz [-window ] [+/-][%] scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window ] swap [-window ] [up|down|left|right] - zoom[-window ] + zoom [-window ] bare [] list: 開けられたウィンドウのリストアップ (引数無しの場合、このリストが表示されます) diff -Nru weechat-1.3~dev+20150718~wily1/doc/ja/autogen/user/weechat_options.asciidoc weechat-1.3~dev+20150727~wily1/doc/ja/autogen/user/weechat_options.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/ja/autogen/user/weechat_options.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/ja/autogen/user/weechat_options.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -533,17 +533,17 @@ ** 値: 未制約文字列 (デフォルト値: `""`) * [[option_weechat.look.command_incomplete]] *weechat.look.command_incomplete* -** 説明: `セットされた場合、不完全なコマンドと完全なコマンドを両方使えるようになります、例えば /he は /help の意味で使うことができます` +** 説明: `これを設定した場合、不完全なコマンドと完全なコマンドを両方使えるようになります、例えば /he は /help の意味で使うことができます` ** タイプ: ブール ** 値: on, off (デフォルト値: `off`) * [[option_weechat.look.confirm_quit]] *weechat.look.confirm_quit* -** 説明: `セットされた場合、/quit コマンドは "-yes" 引数と共に使われなければいけない (help quit を参照)` +** 説明: `これを設定した場合、/quit コマンド使う際には必ず "-yes" 引数と共に使う必要があります (help quit 参照)` ** タイプ: ブール ** 値: on, off (デフォルト値: `off`) * [[option_weechat.look.confirm_upgrade]] *weechat.look.confirm_upgrade* -** 説明: `if set, /upgrade command must be confirmed with extra argument "-yes" (see /help upgrade)` +** 説明: `これを設定した場合、/upgrade コマンド使う際には必ず "-yes" 引数と共に使う必要があります (help upgrade 参照)` ** タイプ: ブール ** 値: on, off (デフォルト値: `off`) @@ -717,6 +717,11 @@ ** タイプ: ブール ** 値: on, off (デフォルト値: `on`) +* [[option_weechat.look.key_grab_delay]] *weechat.look.key_grab_delay* +** 説明: `default delay (in milliseconds) to grab a key (using default key alt-k); this delay can be overridden in the /input command (see /help input)` +** タイプ: 整数 +** 値: 1 .. 10000 (デフォルト値: `800`) + * [[option_weechat.look.mouse]] *weechat.look.mouse* ** 説明: `マウスサポートの有効化` ** タイプ: ブール diff -Nru weechat-1.3~dev+20150718~wily1/doc/ja/weechat_dev.ja.asciidoc weechat-1.3~dev+20150727~wily1/doc/ja/weechat_dev.ja.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/ja/weechat_dev.ja.asciidoc 2015-05-30 17:56:50.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/ja/weechat_dev.ja.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -185,6 +185,8 @@ | weechat-plugin.h | WeeChat プラグインと一緒に配布されるヘッダファイル、プラグインのコンパイルに必要 | alias/ | alias プラグイン | alias.c | alias の主要関数 +| alias-command.c | alias コマンド +| alias-completion.c | alias 補完 | alias-config.c | alias 設定オプション (alias.conf ファイル) | alias-info.c | alias の情報/インフォリスト/hdata | aspell/ | aspell プラグイン diff -Nru weechat-1.3~dev+20150718~wily1/doc/ja/weechat_plugin_api.ja.asciidoc weechat-1.3~dev+20150727~wily1/doc/ja/weechat_plugin_api.ja.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/ja/weechat_plugin_api.ja.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/ja/weechat_plugin_api.ja.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -7249,9 +7249,8 @@ * 'fd': ファイルディスクリプタ * 'flag_read': 1 = 読み込みイベントをキャッチ、0 = 無視 * 'flag_write': 1 = 書き込みイベントをキャッチ、0 = 無視 -// TRANSLATION MISSING * 'flag_exception': 1 = 例外イベントをキャッチ、0 = 無視 - (_WeeChat ≥ 1.3_: this argument is ignored and not used any more) + (_WeeChat バージョン 1.3 以上の場合_: この引数は無視され、使われません) * 'callback': ファイル (またはソケット) に対してキャッチしたいイベントが発生した場合に実行する関数、 引数と戻り値: ** 'void *data': ポインタ diff -Nru weechat-1.3~dev+20150718~wily1/doc/ja/weechat_user.ja.asciidoc weechat-1.3~dev+20150727~wily1/doc/ja/weechat_user.ja.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/ja/weechat_user.ja.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/ja/weechat_user.ja.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -1161,7 +1161,7 @@ | key[alt-j,alt-r] | IRC 生バッファに移動 | `/server raw` | key[alt-j,alt-s] | IRC サーババッファに移動 | `/server jump` | key[alt-0...9] | 番号のバッファに移動 (0 = 10) | `/buffer *N` -| key[alt-j,01...99] | 番号のバッファに移動 | `/buffer NN` +| key[alt-j,01...99] | 番号のバッファに移動 | `/buffer *NN` | key[alt-l] | 最小限表示の有効無効を切り替え | `/window bare` | key[alt-m] | マウスの有効無効を切り替え | `/mouse toggle` | key[alt-n] | 次のハイライトまでスクロール | `/window scroll_next_highlight` diff -Nru weechat-1.3~dev+20150718~wily1/doc/pl/autogen/plugin_api/hdata.asciidoc weechat-1.3~dev+20150727~wily1/doc/pl/autogen/plugin_api/hdata.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/pl/autogen/plugin_api/hdata.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/pl/autogen/plugin_api/hdata.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -942,6 +942,7 @@ *** 'scrolling' (integer) *** 'start_col' (integer) *** 'lines_after' (integer) +*** 'text_search_start_line' (pointer, hdata: "line") *** 'prev_scroll' (pointer, hdata: "window_scroll") *** 'next_scroll' (pointer, hdata: "window_scroll") * 'window_tree': drzewo okien diff -Nru weechat-1.3~dev+20150718~wily1/doc/pl/autogen/user/alias_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/pl/autogen/user/alias_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/pl/autogen/user/alias_commands.asciidoc 2015-03-14 04:08:33.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/pl/autogen/user/alias_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -3,36 +3,39 @@ // DO NOT EDIT BY HAND! // [[command_alias_alias]] -[command]*`alias`* tworzy alias do komendy:: +[command]*`alias`* list, add or remove command aliases:: ---- -/alias [-completion ] [ [;...]] - -completion: dopełnienie dla aliasu (opcjonalne, domyślnie dopełnienie wykonuje się z docelową komendą) - uwaga: można użyć %%komenda w celu użycia dopełnień dla istniejących komend - alias: nazwa aliasu (wildcard "*" jest dozwolony) - komenda: nazwa komendy (wiele komend można oddzielić za pomocą średnika) - -Bez podania argumentu komenda wyświetla listę wszystkich zdefiniowanych aliasów. - -Ważne: dla komend specjalne zmienne są zastępowane odpowiednimi wartościami: - $n: argument 'n' (pomiędzy 1 i 9) - $-m: argumenty od 1 do 'm' - $n-: argumenty od 'n' do ostatniego - $n-m: argumenty od 'n' od 'm' - $*: wszystkie argumenty - $~: ostatni argument - $var: gdzie "var" to zmienna lokalna buforu (zobacz /buffer localvar) - przykłady: $nick, $channel, $server, $plugin, $name - -Do usunięcia aliasu służy komenda /unalias. - -Przykłady: - alias /split do poziomego podziału: - /alias split /window splith - alias /hello pisze "hello" na wszystkich kanałach poza #weechat: - /alias hello /allchan -exclude=#weechat msg * hello - alias /forcejoin wysyłający komende IRC "forcejoin" z dopełnieniem dla /sajoin: - /alias -completion %%sajoin forcejoin /quote forcejoin +/alias list [] + add [[;...]] + addcompletion [[;...]] + del [...] + + list: list aliases (without argument, this list is displayed) + add: add an alias +addcompletion: add an alias with a custom completion + del: delete an alias + completion: completion for alias: by default completion is done with target command + note: you can use %%command to use completion of an existing command + alias: name of alias + command: command name with arguments (many commands can be separated by semicolons) + +Note: in command, special variables are replaced: + $n: argument 'n' (between 1 and 9) + $-m: arguments from 1 to 'm' + $n-: arguments from 'n' to last + $n-m: arguments from 'n' to 'm' + $*: all arguments + $~: last argument + $var: where "var" is a local variable of buffer (see /buffer localvar) + examples: $nick, $channel, $server, $plugin, $name + +Examples: + alias /split to split window horizontally: + /alias add split /window splith + alias /hello to say "hello" on all channels but not on #weechat: + /alias add hello /allchan -exclude=#weechat msg * hello + alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin: + /alias addcompletion %%sajoin forcejoin /quote forcejoin ---- diff -Nru weechat-1.3~dev+20150718~wily1/doc/pl/autogen/user/weechat_commands.asciidoc weechat-1.3~dev+20150727~wily1/doc/pl/autogen/user/weechat_commands.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/pl/autogen/user/weechat_commands.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/pl/autogen/user/weechat_commands.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -414,58 +414,60 @@ ---- /input [] -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_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ń (dozwolone są wyescapowane znaki, zobacz /help print) - send: wysyła tekst do bufora - paste_start: zaczyna wklejanie (tryb z rozpoznawaniem wklejanego tekstu) - paste_stop: kończy wklejanie (tryb z rozpoznawaniem wklejanego tekstu) +list of actions: + return: simulate key "enter" + complete_next: complete word with next completion + complete_previous: complete word with previous completion + search_text_here: search text in buffer at current position + 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_here: stop search at current position + 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) + send: send text to the buffer + paste_start: start paste (bracketed paste mode) + paste_stop: stop paste (bracketed paste mode) -Ta komenda jest używana do przypisywania klawiszy lub przez wtyczki. +This command is used by key bindings or plugins. ---- [[command_weechat_key]] @@ -921,20 +923,20 @@ ---- /window list - -1|+1|b#|up|down|left|right [-window ] - - splith|splitv [-window ] [] - resize [-window ] [+/-] + -1|+1|b#|up|down|left|right [-window ] + + splith|splitv [-window ] [] + resize [-window ] [+/-] balance - merge [-window ] [all] - page_up|page_down [-window ] + merge [-window ] [all] + page_up|page_down [-window ] refresh - scroll [-window ] [+/-][s|m|h|d|M|y] - scroll_horiz [-window ] [+/-][%] - scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window ] - swap [-window ] [up|down|left|right] - zoom[-window ] - bare [] + scroll [-window ] [+/-][s|m|h|d|M|y] + scroll_horiz [-window ] [+/-][%] + scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window ] + swap [-window ] [up|down|left|right] + zoom [-window ] + bare [] list: lista otwartych okien (bez argumentu wyświetlana jest ta lista) -1: skok do poprzedniego okna diff -Nru weechat-1.3~dev+20150718~wily1/doc/pl/autogen/user/weechat_options.asciidoc weechat-1.3~dev+20150727~wily1/doc/pl/autogen/user/weechat_options.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/pl/autogen/user/weechat_options.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/pl/autogen/user/weechat_options.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -717,6 +717,11 @@ ** typ: bool ** wartości: on, off (domyślna wartość: `on`) +* [[option_weechat.look.key_grab_delay]] *weechat.look.key_grab_delay* +** opis: `default delay (in milliseconds) to grab a key (using default key alt-k); this delay can be overridden in the /input command (see /help input)` +** typ: liczba +** wartości: 1 .. 10000 (domyślna wartość: `800`) + * [[option_weechat.look.mouse]] *weechat.look.mouse* ** opis: `włącza wsparcie dla myszy` ** typ: bool diff -Nru weechat-1.3~dev+20150718~wily1/doc/pl/weechat_user.pl.asciidoc weechat-1.3~dev+20150727~wily1/doc/pl/weechat_user.pl.asciidoc --- weechat-1.3~dev+20150718~wily1/doc/pl/weechat_user.pl.asciidoc 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/doc/pl/weechat_user.pl.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -1173,7 +1173,7 @@ | 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` -| key[alt-j,01...99] | Przełącz na bufor za pomocą liczb | `/buffer NN` +| key[alt-j,01...99] | Przełącz na bufor za pomocą liczb | `/buffer *NN` | key[alt-l] | Przełącz tryb niesformatowanego wyświetlania | `/window bare` | key[alt-m] | Przełącz obsługę myszy | `/mouse toggle` | key[alt-n] | Przewiń do następnego powiadomienia | `/window scroll_next_highlight` diff -Nru weechat-1.3~dev+20150718~wily1/po/cs.po weechat-1.3~dev+20150727~wily1/po/cs.po --- weechat-1.3~dev+20150718~wily1/po/cs.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/cs.po 2015-07-27 18:36:23.000000000 +0000 @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 09:41+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" "Language: cs\n" @@ -1698,12 +1698,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -2494,7 +2496,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "list || -1|+1|b#|up|down|left|right || splith|splitv [] || resize " "[+/-] || balance || merge [all] || page_up|page_down || refresh || " @@ -3185,6 +3187,11 @@ "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)" msgstr "" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "" @@ -4397,12 +4404,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: chyba, cyklický odkaz při volání aliasu \"%s\"" -msgid "List of aliases:" -msgstr "Seznam aliasů:" - -msgid "No alias defined" -msgstr "Žádné aliasy nejsou definovány" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s%s: chyba vytváření aliasu \"%s\" => \"%s\"" @@ -4411,10 +4412,21 @@ msgid "Alias \"%s\" => \"%s\" created" msgstr "Alias \"%s\" => \"%s\" vytvořen" +#, fuzzy, c-format +msgid "Aliases with \"%s\":" +msgstr "Servery s \"%s\":" + +#, fuzzy +msgid "All aliases:" +msgstr "Aliasy barev:" + #, c-format msgid "No alias found matching \"%s\"" msgstr "Žádný alias odpovídající \"%s\" nenalezen" +msgid "No alias defined" +msgstr "Žádné aliasy nejsou definovány" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "%sAlias \"%s\" nenalezen" @@ -4423,24 +4435,28 @@ msgid "Alias \"%s\" removed" msgstr "Alias \"%s\" odebrán" -msgid "create an alias for a command" -msgstr "vytvoří alias pro příkaz" - #, fuzzy -msgid "[-completion ] [ [;...]]" -msgstr "[-completion ] [ []]" +msgid "list, add or remove command aliases" +msgstr "vypíše, přídá nebo odebere IRC servery" + +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" #, fuzzy, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -4453,16 +4469,14 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" " doplňování: doplňování pro alias (nepovinné, jako výchozí doplňování je " "použito doplňování příkazu)\n" @@ -4494,15 +4508,6 @@ "sajoin:\n" " /alias -completion %%sajoin forcejoin /quote forcejoin" -msgid "remove aliases" -msgstr "odebere aliasy" - -msgid " [...]" -msgstr " [...]" - -msgid "alias: name of alias to remove" -msgstr "jméno_aliasu: jméno aliasu pro odebrání" - msgid "list of aliases" msgstr "seznam aliasů" diff -Nru weechat-1.3~dev+20150718~wily1/po/de.po weechat-1.3~dev+20150727~wily1/po/de.po --- weechat-1.3~dev+20150718~wily1/po/de.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/de.po 2015-07-27 18:36:23.000000000 +0000 @@ -24,8 +24,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-14 14:19+0100\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 20:29+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German <>\n" "Language: de_DE\n" @@ -1372,7 +1372,7 @@ "unalias: entfernt einen Namen\n" " color: Farbnummer (>= 0, maximale Anzahl ist abhängig vom Terminal, " "üblicherweise 63 oder 255 Farben)\n" -" name: Aliasname für eine Farbe (zum Beispiel: \"orange\")\n" +" name: Alternativname für eine Farbe (zum Beispiel: \"orange\")\n" " reset: setzt alle Farbpaarungen zurück (nützlich falls keine Farbpaarung " "mehr verfügbar sein sollte und die automatische Reset-Option deaktiviert " "ist, siehe Einstellung: weechat.look.color_pairs_auto_reset)\n" @@ -1911,12 +1911,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -1968,13 +1970,15 @@ " return: simuliert die \"enter\" Taste\n" " complete_next: vervollständigt Wort mit nächster Komplettierung\n" " complete_previous: vervollständigt Word mit vorheriger Komplettierung\n" -" search_text: sucht nach Text im Buffer\n" +" search_text_here: Textsuche ab aktueller Position\n" +" search_text: Textsuche im Buffer\n" " search_switch_case: schaltet Groß-/Kleinschreibung ein und aus\n" " search_switch_regex: Wechsel des Suchmodus: einfache Textsuche/reguläre " "Ausdrücke\n" " search_switch_where: wechselt Suche in Nachricht/Präfix\n" " search_previous: sucht vorheriger Zeile\n" " search_next: sucht nächste Zeile\n" +" search_stop_here: stopped Suche ab aktueller Position\n" " search_stop: suche stoppen\n" " delete_previous_char: entfernt vorheriges Zeichen\n" " delete_next_char: entfernt nächstes Zeichen\n" @@ -2395,7 +2399,7 @@ msgstr "" "-buffer: Buffer in welchem der Text ausgegeben werden soll (standardmäßig: " "aktueller Buffer)\n" -" -core: Alias für \"-buffer core.weechat\"\n" +" -core: Alternativname für \"-buffer core.weechat\"\n" "-current: Text wird im aktuell genutzten Buffer ausgegeben\n" "-escape: Escapesequenzen werden umgewandelt (zum Beispiel \\a, \\07, \\x07)\n" " -date: Datum der Nachricht, mögliche Formatierung:\n" @@ -2668,7 +2672,7 @@ " /secure set oftc meinPasswort\n" " /set irc.server.oftc.command \"/msg nickserv identify ${sec.data." "oftc}\"\n" -" alias um den eigenen Nick zu ghosten:\n" +" Alternativbefehl um den eigenen Nick zu ghosten:\n" " /alias ghost /eval /msg -server freenode nickserv ghost meinNick ${sec." "data.freenode}" @@ -2892,8 +2896,8 @@ "voreingestellten Landessprache)\n" "\n" "Um diesen Befehl in jedem Buffer ausführen zu können, kann der " -"Standardalias /v genutzt werden (andernfalls wird der IRC Befehl /version in " -"einem IRC Buffer ausgeführt)." +"Standardkurzbefehl /v genutzt werden (andernfalls wird der IRC Befehl /" +"version in einem IRC Buffer ausgeführt)." msgid "schedule a command execution in future" msgstr "Terminiere einen Befehl der ausgeführt werden soll" @@ -2957,7 +2961,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "list || -1|+1|b#|up|down|left|right [-window ] || || splith|" "splitv [-window ] [] || resize [-window ] [+/-] || " @@ -2966,7 +2970,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgid "" " list: list opened windows (without argument, this list is " @@ -3231,7 +3235,7 @@ msgstr "Debug-Level für Erweiterung (\"core\" für den WeeChat Core)" msgid "alias for color" -msgstr "Alias für Farbe" +msgstr "Alternativname für Farbe" #, c-format msgid "%sError: palette option must be numeric" @@ -3790,6 +3794,14 @@ "Es dürfen nur \"geschützte\" Tasten zugeordnet werden (Tasten, die mittels " "ctrl oder meta verwendet werden)" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" +"Standardverzögerung (in Millisekunden) um eine Tasteneingabe zu greifen " +"(Standardtastenbelegung: alt-k); die Verzögerung kann mit dem /input Befehl " +"angepasst werden (siehe /help input)" + msgid "enable mouse support" msgstr "Mausunterstützung einschalten" @@ -4994,7 +5006,7 @@ msgstr "Farben für Nicks:" msgid "Color aliases:" -msgstr "Farbalias:" +msgstr "Farbnamen:" msgid "Content of colors (r/g/b):" msgstr "Inhalt der Farben (r/g/b):" @@ -5189,12 +5201,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: Fehler, Zirkelbezug beim Aufruf des Alias \"%s\"" -msgid "List of aliases:" -msgstr "Liste der Alias:" - -msgid "No alias defined" -msgstr "Keine Alias definiert" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s%s: Fehler beim Erstellen von Alias \"%s\" => \"%s\"" @@ -5204,9 +5210,19 @@ msgstr "Alias \"%s\" => \"%s\" angelegt" #, c-format +msgid "Aliases with \"%s\":" +msgstr "Alternativnamen mit \"%s\":" + +msgid "All aliases:" +msgstr "Alle Alternativnamen:" + +#, c-format msgid "No alias found matching \"%s\"" msgstr "keinen passenden Alias zu \"%s\" gefunden" +msgid "No alias defined" +msgstr "Keine Alias definiert" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "%sAlias \"%s\" nicht gefunden" @@ -5215,23 +5231,29 @@ msgid "Alias \"%s\" removed" msgstr "Alias \"%s\" entfernt" -msgid "create an alias for a command" -msgstr "Einem Befehl wird ein Alias zugewiesen" +msgid "list, add or remove command aliases" +msgstr "auflisten, hinzufügen oder entfernen von Alternativnamen" -msgid "[-completion ] [ [;...]]" -msgstr "[-completion ] [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" #, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -5244,26 +5266,28 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" -"completion: optionale Vervollständigung für einen Alias-Befehl " -"(Standardverhalten: Vervollständigung wird auf den Zielbefehl angewendet)\n" -" Hinweis: Mit der Variablen \"%%command\" kann eine " +" list: listet Alternativbefehle auf (ohne Angabe von Argumenten wird " +"diese Liste dargestellt)\n" +" add: fügt einen Alternativbefehl hinzu\n" +"addcompletion: fügt einen Alternativbefehl, mit einer benutzerdefinierten " +"Vervollständigung, hinzu\n" +" del: entfernt einen Alternativbefehl\n" +" completion: Vervollständigung für Alternativbefehl: standardmäßig wird " +"die Vervollständigung auf den Zielbefehl angewendet\n" +" Hinweis: Mit der Variablen \"%%command\" kann eine " "Vervollständigung eines vorhandenen Befehls durchgeführt werden\n" -" alias: Name des Alias (Platzhalter \"*\" kann verwendet werden)\n" -" command: Name des zuzuordnenden Befehls (WeeChat- oder IRC-Befehl ohne " -"führenden '/', mehrere Befehle müssen durch Semikolon getrennt werden)\n" -"\n" -"Ohne Angabe von Argumenten werden alle definierten Aliase angezeigt.\n" +" alias: Name des Alternativbefehls\n" +" command: Name des zuzuordnenden Befehls, inklusive Argumenten (mehrere " +"Befehle können durch Semikolon getrennt werden)\n" "\n" "Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den " "entsprechenden Wert ersetzt werden:\n" @@ -5277,27 +5301,17 @@ "(siehe /buffer localvar)\n" " Beispiel: $nick, $channel, $server, $plugin, $name\n" "\n" -"Um ein Alias zu löschen wird der Befehl \"/unalias\" genutzt.\n" -"\n" "Beispiele:\n" -" Alias \"/split\" wird anlegt um damit ein Fenster horizontal zu teilen:\n" +" Alternativbefehl \"/split\" wird anlegt um ein Fenster horizontal zu " +"teilen:\n" " /alias split /window splith\n" -" Alias \"/hallo\" wird angelegt um in allen Channels, außer im #weechat " -"Channel, den Text \"Hallo\" auszugeben:\n" +" Alternativbefehl \"/hallo\" wird angelegt um in allen Channels, außer im " +"#weechat Channel, den Text \"Hallo\" auszugeben:\n" " /alias hallo /allchan -exclude=#weechat msg * Hallo\n" -" Alias \"/forcejoin\" wird angelegt um den IRC Befehl \"forcejoin\" mit " -"einer Vervollständigung von /sajoin auszuführen:\n" +" Alternativbefehl \"/forcejoin\" wird angelegt um den IRC Befehl \"forcejoin" +"\" mit einer Vervollständigung von /sajoin auszuführen:\n" " /alias -completion %%sajoin forcejoin /quote forcejoin" -msgid "remove aliases" -msgstr "entferne Alias" - -msgid " [...]" -msgstr " [...]" - -msgid "alias: name of alias to remove" -msgstr "alias: Name des zu löschenden Alias" - msgid "list of aliases" msgstr "Liste der Alias" @@ -5307,8 +5321,8 @@ #, c-format msgid "%s%s: error creating completion for alias \"%s\": alias not found" msgstr "" -"%s%s: Fehler bei der Erstellung der Vervollständigung für den Alias-Befehl " -"\"%s\": Alias wurde nicht gefunden" +"%s%s: Fehler bei der Erstellung der Vervollständigung für den " +"Alternativbefehl \"%s\": Alternativbefehl wurde nicht gefunden" msgid "alias pointer (optional)" msgstr "Alias Pointer (optional)" diff -Nru weechat-1.3~dev+20150718~wily1/po/es.po weechat-1.3~dev+20150727~wily1/po/es.po --- weechat-1.3~dev+20150718~wily1/po/es.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/es.po 2015-07-27 18:36:23.000000000 +0000 @@ -22,8 +22,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 09:41+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" "Language: es\n" @@ -1738,12 +1738,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -2620,7 +2622,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "list || -1|+1|b#|up|down|left|right [-window ] || || splith|" "splitv [-window ] [] || resize [-window ] [+/-] || " @@ -3362,6 +3364,11 @@ "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)" msgstr "" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "habilitar soporte para ratón" @@ -4614,12 +4621,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: error, referencia circular al ejecutar el alias \"%s\"" -msgid "List of aliases:" -msgstr "Lista de alias:" - -msgid "No alias defined" -msgstr "Ningún alias definido" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s%s: error al crear el alias \"%s\" => \"%s\"" @@ -4628,10 +4629,21 @@ msgid "Alias \"%s\" => \"%s\" created" msgstr "Alias \"%s\" => \"%s\" creado" +#, fuzzy, c-format +msgid "Aliases with \"%s\":" +msgstr "Servidores con \"%s\":" + +#, fuzzy +msgid "All aliases:" +msgstr "Alias de colores:" + #, c-format msgid "No alias found matching \"%s\"" msgstr "Ningún alias encontrado con \"%s\"" +msgid "No alias defined" +msgstr "Ningún alias definido" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "%sAlias \"%s\" no encontrado" @@ -4640,23 +4652,28 @@ msgid "Alias \"%s\" removed" msgstr "Alias \"%s\" eliminado" -msgid "create an alias for a command" -msgstr "crear un alias para un comando" +#, fuzzy +msgid "list, add or remove command aliases" +msgstr "lista, añade o elimina servidores IRC" -msgid "[-completion ] [ [;...]]" -msgstr "[-completion ] [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" #, fuzzy, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -4669,16 +4686,14 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" "completador: completador para el alias (opcional, por defecto se usa el " "completador el mismo del comando)\n" @@ -4713,15 +4728,6 @@ "completador de /sajoin:\n" " /alias -completion %%sajoin forcejoin /quote forcejoin" -msgid "remove aliases" -msgstr "eliminar alias" - -msgid " [...]" -msgstr " [...]" - -msgid "alias: name of alias to remove" -msgstr "alias: nombre del alias a suprimir" - msgid "list of aliases" msgstr "lista de alias" diff -Nru weechat-1.3~dev+20150718~wily1/po/fr.po weechat-1.3~dev+20150727~wily1/po/fr.po --- weechat-1.3~dev+20150718~wily1/po/fr.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/fr.po 2015-07-27 18:36:23.000000000 +0000 @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-14 07:46+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 19:58+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -1879,12 +1879,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -1936,6 +1938,8 @@ " return : simuler la touche \"entrée\"\n" " complete_next : compléter le mot avec la complétion suivante\n" " complete_previous : compléter le mot avec la complétion précédente\n" +" search_text_here : chercher du texte dans le tampon à la position " +"courante\n" " search_text : chercher du texte dans le tampon\n" " search_switch_case : basculer la casse exacte pour la recherche\n" " search_switch_regex : basculer le type de recherche : chaîne/expression " @@ -1943,6 +1947,7 @@ " search_switch_where : basculer la recherche dans les messages/préfixes\n" " search_previous : chercher la ligne précédente\n" " search_next : chercher la ligne suivante\n" +" search_stop_here : arrêter la recherche à la position courante\n" " search_stop : arrêter la recherche\n" " delete_previous_char : effacer le caractère précédent\n" " delete_next_char : effacer le caractère suivant\n" @@ -2883,7 +2888,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "list || -1|+1|b#|up|down|left|right [-window ] || || splith|" "splitv [-window ] [] || resize [-window ] [+/-] || " @@ -3686,6 +3691,14 @@ "autoriser seulement l'association de touches \"sûres\" (commençant par un " "code ctrl ou meta)" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" +"délai par défaut (en millisecondes) pour capturer une touche (en utilisant " +"la touche par défaut alt-k) ; ce délai peut être remplacé dans la commande /" +"input (voir /help input)" + msgid "enable mouse support" msgstr "activer le support de la souris" @@ -5076,12 +5089,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s : erreur, référence circulaire lors de l'appel à l'alias \"%s\"" -msgid "List of aliases:" -msgstr "Liste des alias :" - -msgid "No alias defined" -msgstr "Aucun alias défini" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s%s : erreur en création de l'alias \"%s\" => \"%s\"" @@ -5091,9 +5098,19 @@ msgstr "Alias \"%s\" => \"%s\" créé" #, c-format +msgid "Aliases with \"%s\":" +msgstr "Alias avec \"%s\" :" + +msgid "All aliases:" +msgstr "Tous les alias :" + +#, c-format msgid "No alias found matching \"%s\"" msgstr "Pas d'alias trouvé correspondant à \"%s\"" +msgid "No alias defined" +msgstr "Aucun alias défini" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "%sAlias \"%s\" non trouvé" @@ -5102,23 +5119,29 @@ msgid "Alias \"%s\" removed" msgstr "Alias \"%s\" supprimé" -msgid "create an alias for a command" -msgstr "créer un alias pour une commande" +msgid "list, add or remove command aliases" +msgstr "lister, ajouter ou retirer des alias de commande" -msgid "[-completion ] [ [;...]]" -msgstr "[-completion ] alias [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" #, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -5131,27 +5154,28 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" -"complétion : complétion pour l'alias (optionnel, par défaut la complétion se " -"fait avec la commande cible)\n" -" note : vous pouvez utiliser %%commande pour utiliser la " +" list : afficher les alias (sans paramètre, cette liste est " +"affichée)\n" +" add : ajouter un alias\n" +"addcompletion : ajouter un alias avec une complétion personnalisée\n" +" del : supprimer un alias\n" +" complétion : complétion pour l'alias : par défaut la complétion se fait " +"avec la commande cible\n" +" note : vous pouvez utiliser %%commande pour utiliser la " "complétion d'une commande existante\n" -" alias : nom de l'alias (le caractère joker \"*\" est autorisé)\n" -" commande : nom de la commande avec les paramètres (plusieurs commandes " +" alias : nom de l'alias\n" +" commande : nom de la commande avec les paramètres (plusieurs commandes " "peuvent être séparées par des points-virgules)\n" "\n" -"Sans paramètre, cette commande liste tous les alias définis.\n" -"\n" "Note : dans la commande, les variables spéciales sont remplacées :\n" " $n : paramètre 'n' (entre 1 et 9)\n" " $-m : paramètres de 1 à 'm'\n" @@ -5163,26 +5187,15 @@ "localvar)\n" " exemples : $nick, $channel, $server, $plugin, $name\n" "\n" -"Pour supprimer un alias, utilisez la commande /unalias.\n" -"\n" "Exemples :\n" " alias /split pour diviser la fenêtre horizontalement :\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello pour dire \"hello\" sur tous les canaux mais pas sur " "#weechat :\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin pour envoyer la commande IRC \"forcejoin\" avec la " "complétion de /sajoin :\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" - -msgid "remove aliases" -msgstr "supprimer des alias" - -msgid " [...]" -msgstr " [...]" - -msgid "alias: name of alias to remove" -msgstr "alias : nom de l'alias à supprimer" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgid "list of aliases" msgstr "liste des alias" diff -Nru weechat-1.3~dev+20150718~wily1/po/hu.po weechat-1.3~dev+20150727~wily1/po/hu.po --- weechat-1.3~dev+20150718~wily1/po/hu.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/hu.po 2015-07-27 18:36:23.000000000 +0000 @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" "Language: hu\n" @@ -1567,12 +1567,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -2178,7 +2180,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv " "[pct] | resize pct | merge [all]]" @@ -2793,6 +2795,11 @@ "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)" msgstr "" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "" @@ -4009,14 +4016,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s körreferencia a \"/%s\" aliasz hívásakor\n" -#, fuzzy -msgid "List of aliases:" -msgstr "Aliaszok listája:\n" - -#, fuzzy -msgid "No alias defined" -msgstr "Nincs aliasz definiálva.\n" - #, fuzzy, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s nincs elég memória az információs pult üzenethez\n" @@ -4026,9 +4025,21 @@ msgstr "A \"%s\" => \"%s\" aliasz elkészült\n" #, fuzzy, c-format +msgid "Aliases with \"%s\":" +msgstr "A(z) '%s' szerverek listája:\n" + +#, fuzzy +msgid "All aliases:" +msgstr "Aliaszok listája:\n" + +#, fuzzy, c-format msgid "No alias found matching \"%s\"" msgstr "Nem található '%s' szerver.\n" +#, fuzzy +msgid "No alias defined" +msgstr "Nincs aliasz definiálva.\n" + #, fuzzy, c-format msgid "%sAlias \"%s\" not found" msgstr "%s cím \"%s\" nem található\n" @@ -4037,24 +4048,28 @@ msgid "Alias \"%s\" removed" msgstr "A \"%s\" aliasz eltávolítva\n" -msgid "create an alias for a command" -msgstr "alias készítése egy parancshoz" - #, fuzzy -msgid "[-completion ] [ [;...]]" -msgstr "[alias_név [parancs [paraméterek]]]" +msgid "list, add or remove command aliases" +msgstr "szerverek listázása, hozzáadása vagy eltávolítása" + +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" #, fuzzy, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -4067,16 +4082,14 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" " alias_név: az alias neve\n" " parancs: parancs neve (WeeChat vagy IRC parancs, több parancs " @@ -4090,18 +4103,6 @@ "lesznek kicserélve." #, fuzzy -msgid "remove aliases" -msgstr "alias eltávolítása" - -#, fuzzy -msgid " [...]" -msgstr "név [név...]" - -#, fuzzy -msgid "alias: name of alias to remove" -msgstr "alias_név: az eltávolítandó alias neve" - -#, fuzzy msgid "list of aliases" msgstr "Aliaszok listája:\n" diff -Nru weechat-1.3~dev+20150718~wily1/po/it.po weechat-1.3~dev+20150727~wily1/po/it.po --- weechat-1.3~dev+20150718~wily1/po/it.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/it.po 2015-07-27 18:36:23.000000000 +0000 @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" "Language: it\n" @@ -1780,12 +1780,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -2707,7 +2709,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "list || -1|+1|b#|up|down|left|right [-window ] || || splith|" "splitv [-window ] [] || resize [-window ] [+/-] || " @@ -3458,6 +3460,11 @@ "consente solo l'associazione di tasti \"sicuri\" (che iniziano con ctrl o " "alt)" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "abilita il supporto del mouse" @@ -4747,12 +4754,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: errore, riferimento circolare alla chiamata dell'alias \"%s\"" -msgid "List of aliases:" -msgstr "Elenco degli alias:" - -msgid "No alias defined" -msgstr "Nessun alias definito" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s%s: errore nella creazione dell'alias \"%s\" => \"%s\"" @@ -4761,10 +4762,21 @@ msgid "Alias \"%s\" => \"%s\" created" msgstr "Alias \"%s\" => \"%s\" creato" +#, fuzzy, c-format +msgid "Aliases with \"%s\":" +msgstr "Server con \"%s\":" + +#, fuzzy +msgid "All aliases:" +msgstr "Alias colore:" + #, c-format msgid "No alias found matching \"%s\"" msgstr "Nessun alias corrispondente a \"%s\" trovato" +msgid "No alias defined" +msgstr "Nessun alias definito" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "%sAlias \"%s\" non trovato" @@ -4773,23 +4785,28 @@ msgid "Alias \"%s\" removed" msgstr "Alias \"%s\" eliminato" -msgid "create an alias for a command" -msgstr "crea un alias per un comando" +#, fuzzy +msgid "list, add or remove command aliases" +msgstr "elenca, aggiunge o rimuove server IRC" -msgid "[-completion ] [ [;...]]" -msgstr "[-completion ] [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" #, fuzzy, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -4802,16 +4819,14 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" "completamento: completamento per l'alias (opzionale, per default il " "completamento viene eseguito con il comando di destinazione)\n" @@ -4846,15 +4861,6 @@ "completamento di /sajoin:\n" " /alias -completion %%sajoin forcejoin /quote forcejoin" -msgid "remove aliases" -msgstr "elimina alias" - -msgid " [...]" -msgstr " [...]" - -msgid "alias: name of alias to remove" -msgstr "alias: nome di un alias da eliminare" - msgid "list of aliases" msgstr "elenco di alias" diff -Nru weechat-1.3~dev+20150718~wily1/po/ja.po weechat-1.3~dev+20150727~wily1/po/ja.po --- weechat-1.3~dev+20150718~wily1/po/ja.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/ja.po 2015-07-27 18:36:23.000000000 +0000 @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-13 22:27+0900\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" "Language: ja\n" @@ -780,12 +780,12 @@ msgstr "" "%1$sエラー: プロキシ \"%3$s\" に対するオプション \"%2$s\" を設定できません" -#, fuzzy, c-format +#, c-format msgid "" "%sYou must confirm /%s command with extra argument \"-yes\" (see /help %s)" msgstr "" -"%s引数 \"-yes\" を追加しないと quit コマンドの確認が出来なくなります (/help " -"quit を読んでください)" +"%s引数 \"-yes\" を追加して、必ず /%s コマンドの確認を行ってください (/help " +"%s を読んでください)" #, c-format msgid "Options reloaded from %s" @@ -1822,17 +1822,20 @@ msgid " []" msgstr " []" +#, fuzzy msgid "" "list of actions:\n" " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -2644,11 +2647,9 @@ msgid "upgrade WeeChat without disconnecting from servers" msgstr "サーバとの接続を維持して WeeChat をアップグレード" -#, fuzzy msgid "[-yes] [|-quit]" -msgstr "[|-quit]" +msgstr "[-yes] [|-quit]" -#, fuzzy msgid "" " -yes: required if option weechat.look.confirm_upgrade is enabled\n" "path_to_binary: path to WeeChat binary (default is current binary)\n" @@ -2683,6 +2684,8 @@ "It is possible to restore WeeChat session on another machine if you copy the " "content of directory \"~/.weechat\"." msgstr "" +" -yes: weechat.look.confirm_upgrade オプションが有効化されていた場" +"合、このオプションは必須です。\n" "path_to_binary: WeeChat バイナリへのパス (デフォルトは現在のバイナリ)\n" " -dummy: 何もしない (補完された \"-quit\" オプションを不用意に使わない" "ためのオプション)\n" @@ -2803,7 +2806,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "list || -1|+1|b#|up|down|left|right [-window ] || || splith|" "splitv [-window ] [] || resize [-window ] [+/-] || " @@ -2812,7 +2815,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgid "" " list: list opened windows (without argument, this list is " @@ -3310,23 +3313,22 @@ "if set, incomplete and unambiguous commands are allowed, for example /he " "for /help" msgstr "" -"セットされた場合、不完全なコマンドと完全なコマンドを両方使えるようになりま" +"これを設定した場合、不完全なコマンドと完全なコマンドを両方使えるようになりま" "す、例えば /he は /help の意味で使うことができます" msgid "" "if set, /quit command must be confirmed with extra argument \"-yes\" (see /" "help quit)" msgstr "" -"セットされた場合、/quit コマンドは \"-yes\" 引数と共に使われなければいけない " -"(help quit を参照)" +"これを設定した場合、/quit コマンド使う際には必ず \"-yes\" 引数と共に使う必要" +"があります (help quit 参照)" -#, fuzzy msgid "" "if set, /upgrade command must be confirmed with extra argument \"-yes" "\" (see /help upgrade)" msgstr "" -"セットされた場合、/quit コマンドは \"-yes\" 引数と共に使われなければいけない " -"(help quit を参照)" +"これを設定した場合、/upgrade コマンド使う際には必ず \"-yes\" 引数と共に使う必" +"要があります (help upgrade 参照)" msgid "display special message when day changes" msgstr "日付が変わった際に特殊メッセージを表示" @@ -3566,6 +3568,11 @@ msgstr "" "\"危険な\" キー (ctrl または meta コードで始まらないキー) の割り当てを禁止" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "マウスサポートの有効化" @@ -4847,18 +4854,12 @@ msgstr "マウスのデバッグを無効化" msgid "Alias commands" -msgstr "エイリアスコマンド" +msgstr "別名コマンド" #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: エラー、別名 \"%s\" の呼び出し中に循環参照を検知" -msgid "List of aliases:" -msgstr "別名のリスト:" - -msgid "No alias defined" -msgstr "別名が定義されていません" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s%s: 別名 \"%s\" => \"%s\" 作成中にエラー" @@ -4868,9 +4869,19 @@ msgstr "別名 \"%s\" => \"%s\" を作成しました" #, c-format +msgid "Aliases with \"%s\":" +msgstr "\"%s\" を含む別名:" + +msgid "All aliases:" +msgstr "すべての別名:" + +#, c-format msgid "No alias found matching \"%s\"" msgstr "\"%s\" にマッチする別名が見つかりません" +msgid "No alias defined" +msgstr "別名が定義されていません" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "%s別名 \"%s\" が見つかりません" @@ -4879,23 +4890,29 @@ msgid "Alias \"%s\" removed" msgstr "別名 \"%s\" が削除されました" -msgid "create an alias for a command" -msgstr "コマンドの別名を作成" +msgid "list, add or remove command aliases" +msgstr "別名コマンドのリストアップ、追加、削除" -msgid "[-completion ] [ [;...]]" -msgstr "[-completion ] [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" #, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -4908,27 +4925,28 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" -"completion: 別名の補完 (任意、デフォルトではターゲットコマンドを伴って補完さ" +" list: 別名をリストアップ (引数を与えなかった場合、このリストが表示さ" "れます)\n" -" 注意: %%command で存在するコマンドの補完を利用可能です\n" -" alias: 別名の名前 (ワイルドカード \"*\" を使うことができます)\n" -" command: 引数を含めたコマンド名 (セミコロンで分割すれば複数のコマンドを指" -"定できます)\n" -"\n" -"引数無しでは、定義済み別名をリストアップ。\n" +" add: 別名を追加\n" +"addcompletion: カスタム補完を指定して別名を追加\n" +" del: 別名を削除\n" +" completion: 別名の補完: デフォルトでは対象のコマンドに対する補完が行われま" +"す\n" +" 注意: %%command で既存のコマンドに対する補完を利用可能です\n" +" alias: 別名の名前\n" +" command: 引数を含めたコマンド名 (セミコロンで分割すれば複数のコマンドを" +"指定できます)\n" "\n" -"注意: command の中では、特殊変数の置換が行われる:\n" +"注意: command の中に含まれる特殊変数は置換されます:\n" " $n: 'n' 番目の引数 (1 から 9)\n" " $-m: 1 から 'm' 番目の引数\n" " $n-: 'n' 番目から最後の引数\n" @@ -4938,26 +4956,15 @@ " $var: ここで \"var\" とはバッファの局所変数 (/buffer localvar を参照)\n" " 例: $nick、$channel、$server、$plugin、$name\n" "\n" -"別名を削除するには /unalias コマンドを使ってください:\n" -"\n" "例:\n" " /split をウィンドウを水平方向に分割する別名と定義:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " /hello を #weechat を除く全てのチャンネルで \"hello\" と発言する別名と定" "義:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " /forcejoin を /sajoin の補完候補を使い IRC コマンド \"forcejoin\" を送信す" "る別名と定義:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" - -msgid "remove aliases" -msgstr "別名の削除" - -msgid " [...]" -msgstr " [...]" - -msgid "alias: name of alias to remove" -msgstr "alias: 削除する別名の名前" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgid "list of aliases" msgstr "別名のリスト" diff -Nru weechat-1.3~dev+20150718~wily1/po/pl.po weechat-1.3~dev+20150727~wily1/po/pl.po --- weechat-1.3~dev+20150718~wily1/po/pl.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/pl.po 2015-07-27 18:36:23.000000000 +0000 @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" "Language: pl\n" @@ -1857,17 +1857,20 @@ msgid " []" msgstr " []" +#, fuzzy msgid "" "list of actions:\n" " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -2845,6 +2848,7 @@ msgid "manage windows" msgstr "zarządza oknami" +#, fuzzy msgid "" "list || -1|+1|b#|up|down|left|right [-window ] || || splith|" "splitv [-window ] [] || resize [-window ] [+/-] || " @@ -2853,7 +2857,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "list || -1|+1|b#|up|down|left|right [-window ] || || splith|" "splitv [-window ] [] || resize [-window ] [+/-] || " @@ -3640,6 +3644,11 @@ "pozwala przypisać tylko \"bezpieczne\" skróty (zaczynające się od kodu ctrl " "albo meta)" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "włącza wsparcie dla myszy" @@ -4964,12 +4973,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: błąd, cykliczna referencja przy wywoływaniu aliasu \"%s\"" -msgid "List of aliases:" -msgstr "Lista aliasów:" - -msgid "No alias defined" -msgstr "Nie zdefiniowano aliasu" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s%s: błąd podczas tworzenia aliasu \"%s\" => \"%s\"" @@ -4978,10 +4981,21 @@ msgid "Alias \"%s\" => \"%s\" created" msgstr "Utworzono alias \"%s\" => \"%s\"" +#, fuzzy, c-format +msgid "Aliases with \"%s\":" +msgstr "Serwery z \"%s\":" + +#, fuzzy +msgid "All aliases:" +msgstr "Aliasy kolorów:" + #, c-format msgid "No alias found matching \"%s\"" msgstr "Nie znaleziono aliasu pasującego do \"%s\"" +msgid "No alias defined" +msgstr "Nie zdefiniowano aliasu" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "%sAlias \"%s\" nie został znaleziony" @@ -4990,23 +5004,28 @@ msgid "Alias \"%s\" removed" msgstr "Alias \"%s\" został usunięty" -msgid "create an alias for a command" -msgstr "tworzy alias do komendy" +#, fuzzy +msgid "list, add or remove command aliases" +msgstr "wyświetla, dodaje lub usuwa serwery IRC" -msgid "[-completion ] [ [;...]]" -msgstr "[-completion ] [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" -#, c-format +#, fuzzy, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -5019,16 +5038,14 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" "completion: dopełnienie dla aliasu (opcjonalne, domyślnie dopełnienie " "wykonuje się z docelową komendą)\n" @@ -5063,15 +5080,6 @@ "sajoin:\n" " /alias -completion %%sajoin forcejoin /quote forcejoin" -msgid "remove aliases" -msgstr "usuwa aliasy" - -msgid " [...]" -msgstr " [...]" - -msgid "alias: name of alias to remove" -msgstr "alias: nazwa aliasu do usunięcia" - msgid "list of aliases" msgstr "lista aliasów" diff -Nru weechat-1.3~dev+20150718~wily1/po/POTFILES.in weechat-1.3~dev+20150727~wily1/po/POTFILES.in --- weechat-1.3~dev+20150718~wily1/po/POTFILES.in 2015-03-08 16:18:17.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/POTFILES.in 2015-07-27 18:36:23.000000000 +0000 @@ -96,6 +96,10 @@ ./src/gui/gui-window.c ./src/gui/gui-window.h ./src/plugins/alias/alias.c +./src/plugins/alias/alias-command.c +./src/plugins/alias/alias-command.h +./src/plugins/alias/alias-completion.c +./src/plugins/alias/alias-completion.h ./src/plugins/alias/alias-config.c ./src/plugins/alias/alias-config.h ./src/plugins/alias/alias.h diff -Nru weechat-1.3~dev+20150718~wily1/po/pt_BR.po weechat-1.3~dev+20150727~wily1/po/pt_BR.po --- weechat-1.3~dev+20150718~wily1/po/pt_BR.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/pt_BR.po 2015-07-27 18:36:23.000000000 +0000 @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" "Language: pt_BR\n" @@ -1791,12 +1791,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -2670,7 +2672,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "list || -1|+1|b#|up|down|left|right [-window ] || || splith|" "splitv [-window ] [] || resize [-window ] [+/-] || " @@ -3382,6 +3384,11 @@ "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)" msgstr "" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "habilita suporte à mouse" @@ -4601,12 +4608,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: erro, referência circular ao chamar atalho \"%s\"" -msgid "List of aliases:" -msgstr "Lista de atalhos:" - -msgid "No alias defined" -msgstr "Nenhum atalho definido" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s%s: erro ao criar atalho \"%s\" => \"%s\"" @@ -4616,9 +4617,20 @@ msgstr "Atalho \"%s\" => \"%s\" criado" #, c-format +msgid "Aliases with \"%s\":" +msgstr "" + +#, fuzzy +msgid "All aliases:" +msgstr "Atalhos de Cor:" + +#, c-format msgid "No alias found matching \"%s\"" msgstr "Nenhum atalho semelhante a \"%s\" foi encontrado" +msgid "No alias defined" +msgstr "Nenhum atalho definido" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "%sAtalho \"%s\" não encontrado" @@ -4627,23 +4639,27 @@ msgid "Alias \"%s\" removed" msgstr "Atalho \"%s\" removido" -msgid "create an alias for a command" -msgstr "cria um atalho para um comando" +msgid "list, add or remove command aliases" +msgstr "" -msgid "[-completion ] [ [;...]]" -msgstr "[-completion ] [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" #, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -4656,27 +4672,16 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" -msgid "remove aliases" -msgstr "remover atalhos" - -msgid " [...]" -msgstr " [...]" - -msgid "alias: name of alias to remove" -msgstr "atalho: nome de um atalho para remover" - msgid "list of aliases" msgstr "lista de atalhos" diff -Nru weechat-1.3~dev+20150718~wily1/po/ru.po weechat-1.3~dev+20150727~wily1/po/ru.po --- weechat-1.3~dev+20150718~wily1/po/ru.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/ru.po 2015-07-27 18:36:23.000000000 +0000 @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" "Language: ru\n" @@ -1589,12 +1589,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -2201,7 +2203,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv " "[pct] | resize pct | merge [all]]" @@ -2825,6 +2827,11 @@ "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)" msgstr "" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "" @@ -4047,14 +4054,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s рекурсия при вызове сокращения \"/%s\"\n" -#, fuzzy -msgid "List of aliases:" -msgstr "Список сокращений:\n" - -#, fuzzy -msgid "No alias defined" -msgstr "Сокращения не заданы.\n" - #, fuzzy, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "%s недостаточно памяти для сообщения в строке информации\n" @@ -4064,9 +4063,21 @@ msgstr "Сокращение \"%s\" => \"%s\" создано\n" #, fuzzy, c-format +msgid "Aliases with \"%s\":" +msgstr "Серверы с '%s':\n" + +#, fuzzy +msgid "All aliases:" +msgstr "Список сокращений:\n" + +#, fuzzy, c-format msgid "No alias found matching \"%s\"" msgstr "Серверы с '%s' не найдены.\n" +#, fuzzy +msgid "No alias defined" +msgstr "Сокращения не заданы.\n" + #, fuzzy, c-format msgid "%sAlias \"%s\" not found" msgstr "%s адрес \"%s\" не найден\n" @@ -4075,24 +4086,28 @@ msgid "Alias \"%s\" removed" msgstr "Сокращение \"%s\" удалено\n" -msgid "create an alias for a command" -msgstr "создать ярлык на команду" - #, fuzzy -msgid "[-completion ] [ [;...]]" -msgstr "[сокращение [команда [аргументы]]]" +msgid "list, add or remove command aliases" +msgstr "перечислить, добавить или удалить серверы" + +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" +msgstr "" #, fuzzy, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -4105,16 +4120,14 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" "сокращение: название сокращения\n" " команда: название команды (команда WeeChat или IRC, несколько команд " @@ -4127,18 +4140,6 @@ "соответственно." #, fuzzy -msgid "remove aliases" -msgstr "удалить ярлык" - -#, fuzzy -msgid " [...]" -msgstr "ник [ник ...]" - -#, fuzzy -msgid "alias: name of alias to remove" -msgstr "сокращение: удаляемое сокращение" - -#, fuzzy msgid "list of aliases" msgstr "Список сокращений:\n" diff -Nru weechat-1.3~dev+20150718~wily1/po/srcfiles.cmake weechat-1.3~dev+20150727~wily1/po/srcfiles.cmake --- weechat-1.3~dev+20150718~wily1/po/srcfiles.cmake 2015-03-08 16:18:17.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/srcfiles.cmake 2015-07-27 18:36:23.000000000 +0000 @@ -97,6 +97,10 @@ ./src/gui/gui-window.c ./src/gui/gui-window.h ./src/plugins/alias/alias.c +./src/plugins/alias/alias-command.c +./src/plugins/alias/alias-command.h +./src/plugins/alias/alias-completion.c +./src/plugins/alias/alias-completion.h ./src/plugins/alias/alias-config.c ./src/plugins/alias/alias-config.h ./src/plugins/alias/alias.h diff -Nru weechat-1.3~dev+20150718~wily1/po/tr.po weechat-1.3~dev+20150727~wily1/po/tr.po --- weechat-1.3~dev+20150718~wily1/po/tr.po 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/tr.po 2015-07-27 18:36:23.000000000 +0000 @@ -20,7 +20,7 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" "PO-Revision-Date: 2015-03-10 21:33+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -1418,12 +1418,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -1987,7 +1989,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" msgid "" @@ -2536,6 +2538,11 @@ "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)" msgstr "" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "fare desteğini etkinleştir" @@ -3629,12 +3636,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "" -msgid "List of aliases:" -msgstr "" - -msgid "No alias defined" -msgstr "" - #, c-format msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "" @@ -3644,9 +3645,20 @@ msgstr "" #, c-format +msgid "Aliases with \"%s\":" +msgstr "" + +#, fuzzy +msgid "All aliases:" +msgstr "Tüm sunucular:" + +#, c-format msgid "No alias found matching \"%s\"" msgstr "" +msgid "No alias defined" +msgstr "" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "" @@ -3655,23 +3667,28 @@ msgid "Alias \"%s\" removed" msgstr "" -msgid "create an alias for a command" -msgstr "" +#, fuzzy +msgid "list, add or remove command aliases" +msgstr "İRC sunucularını listele, ekle veya kaldır" -msgid "[-completion ] [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" msgstr "" #, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -3684,25 +3701,14 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" -msgstr "" - -msgid "remove aliases" -msgstr "" - -msgid " [...]" -msgstr "" - -msgid "alias: name of alias to remove" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" msgid "list of aliases" diff -Nru weechat-1.3~dev+20150718~wily1/po/weechat.pot weechat-1.3~dev+20150727~wily1/po/weechat.pot --- weechat-1.3~dev+20150718~wily1/po/weechat.pot 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/po/weechat.pot 2015-07-27 18:36:23.000000000 +0000 @@ -21,7 +21,7 @@ msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-14 07:44+0200\n" +"POT-Creation-Date: 2015-07-26 19:58+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -1420,12 +1420,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" +" search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" +" search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -1985,7 +1987,7 @@ "|| scroll_horiz [-window ] [+/-][%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window ] || swap [-window " -"] [up|down|left|right] || zoom[-window ] || bare []" +"] [up|down|left|right] || zoom [-window ] || bare []" msgstr "" msgid "" @@ -2533,6 +2535,11 @@ "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)" msgstr "" +msgid "" +"default delay (in milliseconds) to grab a key (using default key alt-k); " +"this delay can be overridden in the /input command (see /help input)" +msgstr "" + msgid "enable mouse support" msgstr "" @@ -3626,24 +3633,28 @@ msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "" -msgid "List of aliases:" +#, c-format +msgid "%s%s: error creating alias \"%s\" => \"%s\"" msgstr "" -msgid "No alias defined" +#, c-format +msgid "Alias \"%s\" => \"%s\" created" msgstr "" #, c-format -msgid "%s%s: error creating alias \"%s\" => \"%s\"" +msgid "Aliases with \"%s\":" msgstr "" -#, c-format -msgid "Alias \"%s\" => \"%s\" created" +msgid "All aliases:" msgstr "" #, c-format msgid "No alias found matching \"%s\"" msgstr "" +msgid "No alias defined" +msgstr "" + #, c-format msgid "%sAlias \"%s\" not found" msgstr "" @@ -3652,23 +3663,27 @@ msgid "Alias \"%s\" removed" msgstr "" -msgid "create an alias for a command" +msgid "list, add or remove command aliases" msgstr "" -msgid "[-completion ] [ [;...]]" +msgid "" +"list [] || add [[;...]] || addcompletion " +" [[;...]] || del [...]" msgstr "" #, c-format msgid "" -"completion: completion for alias (optional, by default completion is done " -"with target command)\n" -" note: you can use %%command to use completion of an existing " +" list: list aliases (without argument, this list is displayed)\n" +" add: add an alias\n" +"addcompletion: add an alias with a custom completion\n" +" del: delete an alias\n" +" completion: completion for alias: by default completion is done with " +"target command\n" +" note: you can use %%command to use completion of an existing " "command\n" -" alias: name of alias (wildcard \"*\" is allowed)\n" -" command: command name with arguments (many commands can be separated by " -"semicolons)\n" -"\n" -"Without argument, this command lists all defined alias.\n" +" alias: name of alias\n" +" command: command name with arguments (many commands can be separated " +"by semicolons)\n" "\n" "Note: in command, special variables are replaced:\n" " $n: argument 'n' (between 1 and 9)\n" @@ -3681,25 +3696,14 @@ "localvar)\n" " examples: $nick, $channel, $server, $plugin, $name\n" "\n" -"To remove an alias, use command /unalias.\n" -"\n" "Examples:\n" " alias /split to split window horizontally:\n" -" /alias split /window splith\n" +" /alias add split /window splith\n" " alias /hello to say \"hello\" on all channels but not on #weechat:\n" -" /alias hello /allchan -exclude=#weechat msg * hello\n" +" /alias add hello /allchan -exclude=#weechat msg * hello\n" " alias /forcejoin to send IRC command \"forcejoin\" with completion of /" "sajoin:\n" -" /alias -completion %%sajoin forcejoin /quote forcejoin" -msgstr "" - -msgid "remove aliases" -msgstr "" - -msgid " [...]" -msgstr "" - -msgid "alias: name of alias to remove" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" msgid "list of aliases" diff -Nru weechat-1.3~dev+20150718~wily1/ReleaseNotes.asciidoc weechat-1.3~dev+20150727~wily1/ReleaseNotes.asciidoc --- weechat-1.3~dev+20150718~wily1/ReleaseNotes.asciidoc 2015-06-26 19:44:54.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/ReleaseNotes.asciidoc 2015-07-27 18:36:23.000000000 +0000 @@ -19,6 +19,24 @@ == Version 1.3 (under dev) +=== Alias command + +The command `/alias` has been updated to list, add and remove aliases. +Therefore the command `/unalias` has been removed. + +To add an alias, the argument `add` must be used in command `/alias` before the +name, for example: + +---- +/alias add split /window splith +---- + +And the alias is removed with this command: + +---- +/alias del split +---- + === Script path The option 'script.scripts.dir' has been renamed to 'script.scripts.path' diff -Nru weechat-1.3~dev+20150718~wily1/src/core/wee-command.c weechat-1.3~dev+20150727~wily1/src/core/wee-command.c --- weechat-1.3~dev+20150718~wily1/src/core/wee-command.c 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/core/wee-command.c 2015-07-27 18:36:23.000000000 +0000 @@ -2933,6 +2933,8 @@ gui_input_complete_next (buffer); else if (string_strcasecmp (argv[1], "complete_previous") == 0) gui_input_complete_previous (buffer); + else if (string_strcasecmp (argv[1], "search_text_here") == 0) + gui_input_search_text_here (buffer); else if (string_strcasecmp (argv[1], "search_text") == 0) gui_input_search_text (buffer); else if (string_strcasecmp (argv[1], "search_previous") == 0) @@ -2945,6 +2947,8 @@ gui_input_search_switch_regex (buffer); else if (string_strcasecmp (argv[1], "search_switch_where") == 0) gui_input_search_switch_where (buffer); + else if (string_strcasecmp (argv[1], "search_stop_here") == 0) + gui_input_search_stop_here (buffer); else if (string_strcasecmp (argv[1], "search_stop") == 0) gui_input_search_stop (buffer); else if (string_strcasecmp (argv[1], "delete_previous_char") == 0) @@ -4607,6 +4611,7 @@ else if (string_strcasecmp (argv[i], "-beep") == 0) { fprintf (stderr, "\a"); + fflush (stderr); return WEECHAT_RC_OK; } else if (argv[i][0] == '-') @@ -4632,6 +4637,7 @@ if (text) { fprintf ((to_stdout) ? stdout : stderr, "%s", text); + fflush ((to_stdout) ? stdout : stderr); free (text); } } @@ -7383,12 +7389,14 @@ " return: simulate key \"enter\"\n" " complete_next: complete word with next completion\n" " complete_previous: complete word with previous completion\n" + " search_text_here: search text in buffer at current position\n" " search_text: search text in buffer\n" " search_switch_case: switch exact case for search\n" " search_switch_regex: switch search type: string/regular expression\n" " search_switch_where: switch search in messages/prefixes\n" " search_previous: search previous line\n" " search_next: search next line\n" + " search_stop_here: stop search at current position\n" " search_stop: stop search\n" " delete_previous_char: delete previous char\n" " delete_next_char: delete next char\n" @@ -7437,15 +7445,15 @@ " paste_stop: stop paste (bracketed paste mode)\n" "\n" "This command is used by key bindings or plugins."), - "return|complete_next|complete_previous|search_text|" + "return|complete_next|complete_previous|search_text_here|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|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|" + "search_previous|search_next|search_stop_here|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|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_displayed|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|" @@ -7980,7 +7988,7 @@ "scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|" "scroll_unread [-window ]" " || swap [-window ] [up|down|left|right]" - " || zoom[-window ]" + " || zoom [-window ]" " || bare []"), N_(" list: list opened windows (without argument, this list is " "displayed)\n" diff -Nru weechat-1.3~dev+20150718~wily1/src/core/wee-config.c weechat-1.3~dev+20150727~wily1/src/core/wee-config.c --- weechat-1.3~dev+20150718~wily1/src/core/wee-config.c 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/core/wee-config.c 2015-07-27 18:36:23.000000000 +0000 @@ -143,6 +143,7 @@ struct t_config_option *config_look_jump_previous_buffer_when_closing; struct t_config_option *config_look_jump_smart_back_to_buffer; struct t_config_option *config_look_key_bind_safe; +struct t_config_option *config_look_key_grab_delay; struct t_config_option *config_look_mouse; struct t_config_option *config_look_mouse_timer_delay; struct t_config_option *config_look_nick_prefix; @@ -2622,6 +2623,13 @@ N_("allow only binding of \"safe\" keys (beginning with a ctrl or meta " "code)"), NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + config_look_key_grab_delay = config_file_new_option ( + weechat_config_file, ptr_section, + "key_grab_delay", "integer", + N_("default delay (in milliseconds) to grab a key (using default key " + "alt-k); this delay can be overridden in the /input command (see " + "/help input)"), + NULL, 1, 10000, "800", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); config_look_mouse = config_file_new_option ( weechat_config_file, ptr_section, "mouse", "boolean", diff -Nru weechat-1.3~dev+20150718~wily1/src/core/wee-config.h weechat-1.3~dev+20150727~wily1/src/core/wee-config.h --- weechat-1.3~dev+20150718~wily1/src/core/wee-config.h 2015-07-18 18:20:37.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/core/wee-config.h 2015-07-27 18:36:23.000000000 +0000 @@ -189,6 +189,7 @@ extern struct t_config_option *config_look_jump_previous_buffer_when_closing; extern struct t_config_option *config_look_jump_smart_back_to_buffer; extern struct t_config_option *config_look_key_bind_safe; +extern struct t_config_option *config_look_key_grab_delay; extern struct t_config_option *config_look_mouse; extern struct t_config_option *config_look_mouse_timer_delay; extern struct t_config_option *config_look_nick_prefix; diff -Nru weechat-1.3~dev+20150718~wily1/src/core/wee-url.c weechat-1.3~dev+20150727~wily1/src/core/wee-url.c --- weechat-1.3~dev+20150718~wily1/src/core/wee-url.c 2015-05-03 17:48:28.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/core/wee-url.c 2015-07-27 18:36:23.000000000 +0000 @@ -917,8 +917,6 @@ break; } } - - return; } /* diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/curses/gui-curses-key.c weechat-1.3~dev+20150727~wily1/src/gui/curses/gui-curses-key.c --- weechat-1.3~dev+20150718~wily1/src/gui/curses/gui-curses-key.c 2015-07-11 10:10:35.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/curses/gui-curses-key.c 2015-07-27 18:36:23.000000000 +0000 @@ -85,7 +85,7 @@ BIND(/* */ "ctrl-J", "/input return"); BIND(/* */ "ctrl-I", "/input complete_next"); BIND(/* s- */ "meta2-Z", "/input complete_previous"); - BIND(/* ^R */ "ctrl-R", "/input search_text"); + BIND(/* ^R */ "ctrl-R", "/input search_text_here"); BIND(/* */ "ctrl-H", "/input delete_previous_char"); BIND(/* */ "ctrl-?", "/input delete_previous_char"); BIND(/* ^_ */ "ctrl-_", "/input undo"); @@ -222,14 +222,15 @@ for (i = 1; i < 100; i++) { snprintf (key_str, sizeof (key_str), "meta-j%02d", i); - snprintf (command, sizeof (command), "/buffer %d", i); + snprintf (command, sizeof (command), "/buffer *%d", i); BIND(key_str, command); } } else if (context == GUI_KEY_CONTEXT_SEARCH) { - BIND(/* */ "ctrl-M", "/input search_stop"); - BIND(/* */ "ctrl-J", "/input search_stop"); + BIND(/* */ "ctrl-M", "/input search_stop_here"); + BIND(/* */ "ctrl-J", "/input search_stop_here"); + BIND(/* ^Q */ "ctrl-Q", "/input search_stop"); BIND(/* m-c */ "meta-c", "/input search_switch_case"); BIND(/* ^R */ "ctrl-R", "/input search_switch_regex"); BIND(/* */ "ctrl-I", "/input search_switch_where"); @@ -465,7 +466,10 @@ * found */ if (CONFIG_BOOLEAN(config_look_search_text_not_found_alert)) - printf ("\a"); + { + fprintf (stderr, "\a"); + fflush (stderr); + } } else { diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/curses/gui-curses-mouse.c weechat-1.3~dev+20150727~wily1/src/gui/curses/gui-curses-mouse.c --- weechat-1.3~dev+20150718~wily1/src/gui/curses/gui-curses-mouse.c 2015-07-11 10:10:35.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/curses/gui-curses-mouse.c 2015-07-27 18:36:23.000000000 +0000 @@ -89,6 +89,7 @@ { gui_mouse_enabled = 1; fprintf (stderr, "\033[?1005h\033[?1000h\033[?1002h"); + fflush (stderr); (void) hook_signal_send ("mouse_enabled", WEECHAT_HOOK_SIGNAL_STRING, NULL); @@ -103,6 +104,7 @@ { gui_mouse_enabled = 0; fprintf (stderr, "\033[?1002l\033[?1000l\033[?1005l"); + fflush (stderr); (void) hook_signal_send ("mouse_disabled", WEECHAT_HOOK_SIGNAL_STRING, NULL); diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/curses/gui-curses-window.c weechat-1.3~dev+20150727~wily1/src/gui/curses/gui-curses-window.c --- weechat-1.3~dev+20150718~wily1/src/gui/curses/gui-curses-window.c 2015-01-01 13:47:14.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/curses/gui-curses-window.c 2015-07-27 18:36:23.000000000 +0000 @@ -2521,6 +2521,7 @@ fprintf (stderr, "\033]52;%s;%s\a", (storage_unit) ? storage_unit : "", text_base64); + fflush (stderr); free (text_base64); } } @@ -2545,6 +2546,7 @@ (screen) ? "\033P" : "", (enable) ? "h" : "l", (screen) ? "\033\\" : ""); + fflush (stderr); } /* diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/gui-completion.c weechat-1.3~dev+20150727~wily1/src/gui/gui-completion.c --- weechat-1.3~dev+20150718~wily1/src/gui/gui-completion.c 2015-07-11 10:10:35.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/gui-completion.c 2015-07-27 18:36:23.000000000 +0000 @@ -1157,7 +1157,10 @@ /* alert user of partial completion */ if (CONFIG_BOOLEAN(config_completion_partial_completion_alert)) - printf ("\a"); + { + fprintf (stderr, "\a"); + fflush (stderr); + } /* * send "partial_completion" signal, to display possible diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/gui-input.c weechat-1.3~dev+20150727~wily1/src/gui/gui-input.c --- weechat-1.3~dev+20150718~wily1/src/gui/gui-input.c 2015-07-11 10:10:35.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/gui-input.c 2015-07-27 18:36:23.000000000 +0000 @@ -406,7 +406,6 @@ void gui_input_return (struct t_gui_buffer *buffer) { - struct t_gui_window *window; char *command; if (CONFIG_BOOLEAN(config_look_bare_display_exit_on_input) @@ -415,29 +414,26 @@ gui_window_bare_display_toggle (NULL); } - window = gui_window_search_with_buffer (buffer); - if (window && window->buffer->input - && (window->buffer->input_buffer_size > 0)) + if (buffer->input && (buffer->input_buffer_size > 0)) { - window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; - command = strdup (window->buffer->input_buffer); + buffer->input_buffer[buffer->input_buffer_size] = '\0'; + command = strdup (buffer->input_buffer); if (command) { - gui_history_add (window->buffer, - window->buffer->input_buffer); - window->buffer->input_buffer[0] = '\0'; - window->buffer->input_buffer_size = 0; - window->buffer->input_buffer_length = 0; - window->buffer->input_buffer_pos = 0; - window->buffer->input_buffer_1st_display = 0; - gui_buffer_undo_free_all (window->buffer); - window->buffer->ptr_history = NULL; + gui_history_add (buffer, buffer->input_buffer); + buffer->input_buffer[0] = '\0'; + buffer->input_buffer_size = 0; + buffer->input_buffer_length = 0; + buffer->input_buffer_pos = 0; + buffer->input_buffer_1st_display = 0; + gui_buffer_undo_free_all (buffer); + buffer->ptr_history = NULL; gui_history_ptr = NULL; - gui_input_optimize_size (window->buffer); - gui_input_text_changed_modifier_and_signal (window->buffer, + gui_input_optimize_size (buffer); + gui_input_text_changed_modifier_and_signal (buffer, 0, /* save undo */ 1); /* stop completion */ - (void) input_data (window->buffer, command); + (void) input_data (buffer, command); free (command); } } @@ -571,7 +567,24 @@ } /* - * Searches for text in buffer (default key: ctrl-R). + * Searches for text in buffer at current position (default key: ctrl-R). + */ + +void +gui_input_search_text_here (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)) + { + gui_window_search_start (window, window->scroll->start_line); + gui_input_search_signal (buffer); + } +} + +/* + * Searches for text in buffer. */ void @@ -582,7 +595,7 @@ window = gui_window_search_with_buffer (buffer); if (window && (window->buffer->text_search == GUI_TEXT_SEARCH_DISABLED)) { - gui_window_search_start (window); + gui_window_search_start (window, NULL); gui_input_search_signal (buffer); } } @@ -722,7 +735,24 @@ } /* - * Stops text search (default key: return during search). + * Stops text search at current position (default key: return during search). + */ + +void +gui_input_search_stop_here (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)) + { + gui_window_search_stop_here (window); + gui_input_search_signal (buffer); + } +} + +/* + * Stops text search (default key: ctrl-Q during search). */ void diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/gui-input.h weechat-1.3~dev+20150727~wily1/src/gui/gui-input.h --- weechat-1.3~dev+20150718~wily1/src/gui/gui-input.h 2015-01-01 13:47:14.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/gui-input.h 2015-07-27 18:36:23.000000000 +0000 @@ -43,6 +43,7 @@ extern void gui_input_return (struct t_gui_buffer *buffer); extern void gui_input_complete_next (struct t_gui_buffer *buffer); extern void gui_input_complete_previous (struct t_gui_buffer *buffer); +extern void gui_input_search_text_here (struct t_gui_buffer *buffer); extern void gui_input_search_text (struct t_gui_buffer *buffer); extern void gui_input_search_compile_regex (struct t_gui_buffer *buffer); extern void gui_input_search_switch_case (struct t_gui_buffer *buffer); @@ -50,6 +51,7 @@ extern void gui_input_search_switch_where (struct t_gui_buffer *buffer); extern void gui_input_search_previous (struct t_gui_buffer *buffer); extern void gui_input_search_next (struct t_gui_buffer *buffer); +extern void gui_input_search_stop_here (struct t_gui_buffer *buffer); extern void gui_input_search_stop (struct t_gui_buffer *buffer); extern void gui_input_delete_previous_char (struct t_gui_buffer *buffer); extern void gui_input_delete_next_char (struct t_gui_buffer *buffer); diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/gui-key.c weechat-1.3~dev+20150727~wily1/src/gui/gui-key.c --- weechat-1.3~dev+20150718~wily1/src/gui/gui-key.c 2015-01-01 13:47:14.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/gui-key.c 2015-07-27 18:36:23.000000000 +0000 @@ -177,7 +177,7 @@ gui_key_grab_count = 0; gui_key_grab_command = grab_command; - gui_key_grab_delay = GUI_KEY_GRAB_DELAY_DEFAULT; + gui_key_grab_delay = CONFIG_INTEGER(config_look_key_grab_delay); if (delay != NULL) { error = NULL; diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/gui-key.h weechat-1.3~dev+20150727~wily1/src/gui/gui-key.h --- weechat-1.3~dev+20150718~wily1/src/gui/gui-key.h 2015-01-01 13:47:14.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/gui-key.h 2015-07-27 18:36:23.000000000 +0000 @@ -24,8 +24,6 @@ #define GUI_KEY_BUFFER_BLOCK_SIZE 256 -#define GUI_KEY_GRAB_DELAY_DEFAULT 500 - #define GUI_KEY_BRACKETED_PASTE_START "\x1B[200~" #define GUI_KEY_BRACKETED_PASTE_END "\x1B[201~" #define GUI_KEY_BRACKETED_PASTE_LENGTH 6 diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/gui-line.c weechat-1.3~dev+20150727~wily1/src/gui/gui-line.c --- weechat-1.3~dev+20150718~wily1/src/gui/gui-line.c 2015-06-26 19:44:54.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/gui-line.c 2015-07-27 18:36:23.000000000 +0000 @@ -990,6 +990,9 @@ gui_window_ask_refresh (1); } } + + if (ptr_scroll->text_search_start_line == line) + ptr_scroll->text_search_start_line = NULL; } /* remove line from coords */ gui_window_coords_remove_line (ptr_win, line); diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/gui-window.c weechat-1.3~dev+20150727~wily1/src/gui/gui-window.c --- weechat-1.3~dev+20150718~wily1/src/gui/gui-window.c 2015-07-11 10:10:35.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/gui-window.c 2015-07-27 18:36:23.000000000 +0000 @@ -384,6 +384,7 @@ window_scroll->scrolling = 0; window_scroll->start_col = 0; window_scroll->lines_after = 0; + window_scroll->text_search_start_line = NULL; window_scroll->prev_scroll = NULL; window_scroll->next_scroll = NULL; } @@ -443,7 +444,8 @@ && (ptr_scroll->start_line_pos == 0) && (ptr_scroll->scrolling == 0) && (ptr_scroll->start_col == 0) - && (ptr_scroll->lines_after == 0)) + && (ptr_scroll->lines_after == 0) + && (ptr_scroll->text_search_start_line == NULL)) { gui_window_scroll_free (window, ptr_scroll); } @@ -1567,12 +1569,15 @@ } /* - * Starts search in a buffer. + * Starts search in a buffer at a given position + * (or in whole buffer if text_search_start_line is NULL). */ void -gui_window_search_start (struct t_gui_window *window) +gui_window_search_start (struct t_gui_window *window, + struct t_gui_line *text_search_start_line) { + window->scroll->text_search_start_line = text_search_start_line; window->buffer->text_search = (window->buffer->type == GUI_BUFFER_TYPE_FORMATTED) ? GUI_TEXT_SEARCH_BACKWARD : GUI_TEXT_SEARCH_FORWARD; @@ -1625,7 +1630,7 @@ void gui_window_search_restart (struct t_gui_window *window) { - window->scroll->start_line = NULL; + window->scroll->start_line = window->scroll->text_search_start_line; window->scroll->start_line_pos = 0; window->buffer->text_search = (window->buffer->type == GUI_BUFFER_TYPE_FORMATTED) ? @@ -1639,18 +1644,19 @@ if (CONFIG_BOOLEAN(config_look_search_text_not_found_alert) && window->buffer->input_buffer && window->buffer->input_buffer[0]) { - printf ("\a"); + fprintf (stderr, "\a"); + fflush (stderr); } gui_buffer_ask_chat_refresh (window->buffer, 2); } } /* - * Stops search in a buffer. + * Ends search mode in a buffer (helper function). */ void -gui_window_search_stop (struct t_gui_window *window) +gui_window_search_end (struct t_gui_window *window) { window->buffer->text_search = GUI_TEXT_SEARCH_DISABLED; window->buffer->text_search = 0; @@ -1671,8 +1677,31 @@ free (window->buffer->text_search_input); window->buffer->text_search_input = NULL; } - window->scroll->start_line = NULL; +} + +/* + * Stops search in a buffer at current position. + */ + +void +gui_window_search_stop_here (struct t_gui_window *window) +{ + gui_window_search_end (window); + window->scroll->text_search_start_line = NULL; + gui_buffer_ask_chat_refresh (window->buffer, 2); +} + +/* + * Stops search in a buffer. + */ + +void +gui_window_search_stop (struct t_gui_window *window) +{ + gui_window_search_end (window); + window->scroll->start_line = window->scroll->text_search_start_line; window->scroll->start_line_pos = 0; + window->scroll->text_search_start_line = NULL; gui_hotlist_remove_buffer (window->buffer, 0); gui_buffer_ask_chat_refresh (window->buffer, 2); } @@ -1792,6 +1821,7 @@ HDATA_VAR(struct t_gui_window_scroll, scrolling, INTEGER, 0, NULL, NULL); HDATA_VAR(struct t_gui_window_scroll, start_col, INTEGER, 0, NULL, NULL); HDATA_VAR(struct t_gui_window_scroll, lines_after, INTEGER, 0, NULL, NULL); + HDATA_VAR(struct t_gui_window_scroll, text_search_start_line, POINTER, 0, NULL, "line"); HDATA_VAR(struct t_gui_window_scroll, prev_scroll, POINTER, 0, NULL, hdata_name); HDATA_VAR(struct t_gui_window_scroll, next_scroll, POINTER, 0, NULL, hdata_name); } @@ -1936,15 +1966,16 @@ { log_printf (""); log_printf (" [scroll (addr:0x%lx)]", ptr_scroll); - log_printf (" buffer. . . . . . . : 0x%lx", ptr_scroll->buffer); - log_printf (" first_line_displayed: %d", ptr_scroll->first_line_displayed); - log_printf (" start_line. . . . . : 0x%lx", ptr_scroll->start_line); - log_printf (" start_line_pos. . . : %d", ptr_scroll->start_line_pos); - log_printf (" scrolling . . . . . : %d", ptr_scroll->scrolling); - log_printf (" start_col . . . . . : %d", ptr_scroll->start_col); - log_printf (" lines_after . . . . : %d", ptr_scroll->lines_after); - log_printf (" prev_scroll . . . . : 0x%lx", ptr_scroll->prev_scroll); - log_printf (" next_scroll . . . . : 0x%lx", ptr_scroll->next_scroll); + log_printf (" buffer. . . . . . . . : 0x%lx", ptr_scroll->buffer); + log_printf (" first_line_displayed. : %d", ptr_scroll->first_line_displayed); + log_printf (" start_line. . . . . . : 0x%lx", ptr_scroll->start_line); + log_printf (" start_line_pos. . . . : %d", ptr_scroll->start_line_pos); + log_printf (" scrolling . . . . . . : %d", ptr_scroll->scrolling); + log_printf (" start_col . . . . . . : %d", ptr_scroll->start_col); + log_printf (" lines_after . . . . . : %d", ptr_scroll->lines_after); + log_printf (" text_search_start_line: 0x%lx", ptr_scroll->text_search_start_line); + log_printf (" prev_scroll . . . . . : 0x%lx", ptr_scroll->prev_scroll); + log_printf (" next_scroll . . . . . : 0x%lx", ptr_scroll->next_scroll); } for (ptr_bar_win = ptr_window->bar_windows; ptr_bar_win; diff -Nru weechat-1.3~dev+20150718~wily1/src/gui/gui-window.h weechat-1.3~dev+20150727~wily1/src/gui/gui-window.h --- weechat-1.3~dev+20150718~wily1/src/gui/gui-window.h 2015-01-01 13:47:14.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/gui/gui-window.h 2015-07-27 18:36:23.000000000 +0000 @@ -96,6 +96,8 @@ /* (for horizontal scrolling) */ int lines_after; /* number of lines after last line */ /* displayed (with scrolling) */ + struct t_gui_line *text_search_start_line; /* starting line for search */ + struct t_gui_window_scroll *prev_scroll; /* link to prev. buf. scrolled */ struct t_gui_window_scroll *next_scroll; /* link to next buf. scrolled */ }; @@ -181,8 +183,10 @@ extern void gui_window_scroll_previous_highlight (struct t_gui_window *window); extern void gui_window_scroll_next_highlight (struct t_gui_window *window); extern void gui_window_scroll_unread (struct t_gui_window *window); -extern void gui_window_search_start (struct t_gui_window *window); +extern void gui_window_search_start (struct t_gui_window *window, + struct t_gui_line *text_search_start_line); extern void gui_window_search_restart (struct t_gui_window *window); +extern void gui_window_search_stop_here (struct t_gui_window *window); extern void gui_window_search_stop (struct t_gui_window *window); extern int gui_window_search_text (struct t_gui_window *window); extern void gui_window_zoom (struct t_gui_window *window); diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias.c weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias.c --- weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias.c 2015-07-11 10:10:35.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias.c 2015-07-27 18:36:23.000000000 +0000 @@ -25,6 +25,8 @@ #include "../weechat-plugin.h" #include "alias.h" +#include "alias-command.h" +#include "alias-completion.h" #include "alias-config.h" #include "alias-info.h" @@ -639,268 +641,6 @@ } /* - * Callback for command "/alias": displays or creates alias. - */ - -int -alias_command_cb (void *data, struct t_gui_buffer *buffer, int argc, - char **argv, char **argv_eol) -{ - char *ptr_completion, *ptr_alias_name, *ptr_command; - struct t_alias *ptr_alias; - struct t_config_option *ptr_option; - int alias_found; - - /* make C compiler happy */ - (void) data; - (void) buffer; - - /* List all aliases */ - if (argc == 1) - { - if (alias_list) - { - weechat_printf (NULL, ""); - weechat_printf (NULL, _("List of aliases:")); - for (ptr_alias = alias_list; ptr_alias; - ptr_alias = ptr_alias->next_alias) - { - weechat_printf (NULL, - " %s %s=>%s %s", - ptr_alias->name, - weechat_color ("chat_delimiters"), - weechat_color ("chat"), - ptr_alias->command); - } - } - else - weechat_printf (NULL, _("No alias defined")); - return WEECHAT_RC_OK; - } - - if (argc > 2) - { - /* get pointers to completion, alias name and command (+ args) */ - ptr_completion = NULL; - ptr_alias_name = NULL; - ptr_command = NULL; - if ((argc > 4) && (weechat_strcasecmp (argv[1], "-completion") == 0)) - { - ptr_completion = argv[2]; - ptr_alias_name = (weechat_string_is_command_char (argv[3])) ? - (char *)weechat_utf8_next_char (argv[3]) : argv[3]; - ptr_command = argv_eol[4]; - } - else - { - ptr_alias_name = (weechat_string_is_command_char (argv[1])) ? - (char *)weechat_utf8_next_char (argv[1]) : argv[1]; - ptr_command = argv_eol[2]; - } - - /* define new alias */ - if (!alias_new (ptr_alias_name, ptr_command, ptr_completion)) - { - weechat_printf (NULL, - _("%s%s: error creating alias \"%s\" " - "=> \"%s\""), - weechat_prefix ("error"), ALIAS_PLUGIN_NAME, - ptr_alias_name, ptr_command); - return WEECHAT_RC_OK; - } - - /* create configuration option for command */ - ptr_option = weechat_config_search_option (alias_config_file, - alias_config_section_cmd, - ptr_alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); - alias_config_cmd_new_option (ptr_alias_name, ptr_command); - - /* create configuration option for completion */ - ptr_option = weechat_config_search_option (alias_config_file, - alias_config_section_completion, - ptr_alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); - if (ptr_completion) - alias_config_completion_new_option (ptr_alias_name, ptr_completion); - - /* display message */ - weechat_printf (NULL, - _("Alias \"%s\" => \"%s\" created"), - ptr_alias_name, ptr_command); - } - else - { - /* get pointer to alias name */ - ptr_alias_name = (weechat_string_is_command_char (argv[1])) ? - (char *)weechat_utf8_next_char (argv[1]) : argv[1]; - - /* display list of aliases */ - alias_found = 0; - for (ptr_alias = alias_list; ptr_alias; - ptr_alias = ptr_alias->next_alias) - { - if (weechat_string_match (ptr_alias->name, ptr_alias_name, 0)) - { - if (!alias_found) - { - weechat_printf (NULL, ""); - weechat_printf (NULL, _("List of aliases:")); - } - weechat_printf (NULL, " %s %s=>%s %s", - ptr_alias->name, - weechat_color ("chat_delimiters"), - weechat_color ("chat"), - ptr_alias->command); - alias_found = 1; - } - } - if (!alias_found) - { - weechat_printf (NULL, _("No alias found matching \"%s\""), - ptr_alias_name); - } - } - - return WEECHAT_RC_OK; -} - -/* - * Callback for command "/unalias": removes an alias. - */ - -int -unalias_command_cb (void *data, struct t_gui_buffer *buffer, int argc, - char **argv, char **argv_eol) -{ - int i; - char *alias_name; - struct t_alias *ptr_alias; - struct t_config_option *ptr_option; - - /* make C compiler happy */ - (void) data; - (void) buffer; - (void) argv_eol; - - WEECHAT_COMMAND_MIN_ARGS(2, ""); - - for (i = 1; i < argc; i++) - { - alias_name = (weechat_string_is_command_char (argv[i])) ? - (char *)weechat_utf8_next_char (argv[i]) : argv[i]; - ptr_alias = alias_search (alias_name); - if (!ptr_alias) - { - weechat_printf (NULL, - _("%sAlias \"%s\" not found"), - weechat_prefix ("error"), - alias_name); - } - else - { - /* remove alias */ - alias_free (ptr_alias); - - /* remove options */ - ptr_option = weechat_config_search_option (alias_config_file, - alias_config_section_cmd, - alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); - ptr_option = weechat_config_search_option (alias_config_file, - alias_config_section_completion, - alias_name); - if (ptr_option) - weechat_config_option_free (ptr_option); - - weechat_printf (NULL, - _("Alias \"%s\" removed"), - alias_name); - } - } - - return WEECHAT_RC_OK; -} - -/* - * Adds list of aliases to completion list. - */ - -int -alias_completion_cb (void *data, const char *completion_item, - struct t_gui_buffer *buffer, - struct t_gui_completion *completion) -{ - struct t_alias *ptr_alias; - - /* make C compiler happy */ - (void) data; - (void) completion_item; - (void) buffer; - - for (ptr_alias = alias_list; ptr_alias; - ptr_alias = ptr_alias->next_alias) - { - weechat_hook_completion_list_add (completion, ptr_alias->name, - 0, WEECHAT_LIST_POS_SORT); - } - - return WEECHAT_RC_OK; -} - -/* - * Adds value of an alias to completion list. - */ - -int -alias_value_completion_cb (void *data, const char *completion_item, - struct t_gui_buffer *buffer, - struct t_gui_completion *completion) -{ - const char *args; - char **argv, *alias_name; - int argc; - struct t_alias *ptr_alias; - - /* make C compiler happy */ - (void) data; - (void) completion_item; - (void) buffer; - - args = weechat_hook_completion_get_string (completion, "args"); - if (args) - { - argv = weechat_string_split (args, " ", 0, 0, &argc); - if (argv) - { - if (argc > 0) - alias_name = strdup (argv[argc - 1]); - else - alias_name = strdup (args); - - if (alias_name) - { - ptr_alias = alias_search (alias_name); - if (ptr_alias) - { - weechat_hook_completion_list_add (completion, - ptr_alias->command, - 0, - WEECHAT_LIST_POS_BEGINNING); - } - free (alias_name); - } - weechat_string_free_split (argv); - } - } - - return WEECHAT_RC_OK; -} - -/* * Adds an alias in an infolist. * * Returns: @@ -952,56 +692,9 @@ alias_config_read (); - weechat_hook_command ( - "alias", - N_("create an alias for a command"), - N_("[-completion ] [ [;...]]"), - N_("completion: completion for alias (optional, by default completion " - "is done with target command)\n" - " note: you can use %%command to use completion of an " - "existing command\n" - " alias: name of alias (wildcard \"*\" is allowed)\n" - " command: command name with arguments (many commands can be " - "separated by semicolons)\n" - "\n" - "Without argument, this command lists all defined alias.\n" - "\n" - "Note: in command, special variables are replaced:\n" - " $n: argument 'n' (between 1 and 9)\n" - " $-m: arguments from 1 to 'm'\n" - " $n-: arguments from 'n' to last\n" - " $n-m: arguments from 'n' to 'm'\n" - " $*: all arguments\n" - " $~: last argument\n" - " $var: where \"var\" is a local variable of buffer (see " - "/buffer localvar)\n" - " examples: $nick, $channel, $server, $plugin, $name\n" - "\n" - "To remove an alias, use command /unalias.\n" - "\n" - "Examples:\n" - " alias /split to split window horizontally:\n" - " /alias split /window splith\n" - " alias /hello to say \"hello\" on all channels but not on " - "#weechat:\n" - " /alias hello /allchan -exclude=#weechat msg * hello\n" - " alias /forcejoin to send IRC command \"forcejoin\" with " - "completion of /sajoin:\n" - " /alias -completion %%sajoin forcejoin /quote forcejoin"), - "-completion %- %(alias) %(commands)|%(alias_value)" - " || %(alias) %(commands)|%(alias_value)", - &alias_command_cb, NULL); - weechat_hook_command ( - "unalias", N_("remove aliases"), - N_(" [...]"), - N_("alias: name of alias to remove"), - "%(alias)|%*", - &unalias_command_cb, NULL); - - weechat_hook_completion ("alias", N_("list of aliases"), - &alias_completion_cb, NULL); - weechat_hook_completion ("alias_value", N_("value of alias"), - &alias_value_completion_cb, NULL); + alias_command_init (); + + alias_completion_init (); alias_info_init (); diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias-command.c weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias-command.c --- weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias-command.c 1970-01-01 00:00:00.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias-command.c 2015-07-27 18:36:23.000000000 +0000 @@ -0,0 +1,266 @@ +/* + * alias-command.c - alias commands + * + * Copyright (C) 2003-2015 Sébastien Helleu + * + * This file is part of WeeChat, the extensible chat client. + * + * WeeChat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * WeeChat is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WeeChat. If not, see . + */ + +#include +#include +#include + +#include "../weechat-plugin.h" +#include "alias.h" +#include "alias-config.h" + +/* + * Adds a new alias. + */ + +void +alias_command_add (const char *alias_name, const char *command, + const char *completion) +{ + struct t_config_option *ptr_option; + + /* define new alias */ + if (!alias_new (alias_name, command, completion)) + { + weechat_printf (NULL, + _("%s%s: error creating alias \"%s\" " + "=> \"%s\""), + weechat_prefix ("error"), ALIAS_PLUGIN_NAME, + alias_name, command); + return; + } + + /* create configuration option for command */ + ptr_option = weechat_config_search_option (alias_config_file, + alias_config_section_cmd, + alias_name); + if (ptr_option) + weechat_config_option_free (ptr_option); + alias_config_cmd_new_option (alias_name, command); + + /* create configuration option for completion */ + ptr_option = weechat_config_search_option (alias_config_file, + alias_config_section_completion, + alias_name); + if (ptr_option) + weechat_config_option_free (ptr_option); + if (completion) + alias_config_completion_new_option (alias_name, completion); + + /* display message */ + weechat_printf (NULL, + _("Alias \"%s\" => \"%s\" created"), + alias_name, command); +} + +/* + * Callback for command "/alias": displays or creates alias. + */ + +int +alias_command_cb (void *data, struct t_gui_buffer *buffer, int argc, + char **argv, char **argv_eol) +{ + char *ptr_alias_name; + struct t_alias *ptr_alias; + struct t_config_option *ptr_option; + int alias_found, i; + + /* make C compiler happy */ + (void) data; + (void) buffer; + + /* List all aliases */ + if ((argc == 1) || (weechat_strcasecmp (argv[1], "list") == 0)) + { + if (alias_list) + { + /* get pointer to alias name */ + ptr_alias_name = NULL; + if (argc > 1) + { + ptr_alias_name = (weechat_string_is_command_char (argv[2])) ? + (char *)weechat_utf8_next_char (argv[2]) : argv[2]; + } + + /* display list of aliases */ + alias_found = 0; + for (ptr_alias = alias_list; ptr_alias; + ptr_alias = ptr_alias->next_alias) + { + if (!ptr_alias_name + || weechat_strcasestr (ptr_alias->name, ptr_alias_name)) + { + if (!alias_found) + { + weechat_printf (NULL, ""); + if (ptr_alias_name) + { + weechat_printf (NULL, + _("Aliases with \"%s\":"), + ptr_alias_name); + } + else + { + weechat_printf (NULL, _("All aliases:")); + } + } + weechat_printf (NULL, " %s %s=>%s %s", + ptr_alias->name, + weechat_color ("chat_delimiters"), + weechat_color ("chat"), + ptr_alias->command); + alias_found = 1; + } + } + if (!alias_found) + { + weechat_printf (NULL, _("No alias found matching \"%s\""), + (ptr_alias_name) ? ptr_alias_name : ""); + } + } + else + { + weechat_printf (NULL, _("No alias defined")); + } + return WEECHAT_RC_OK; + } + + if (weechat_strcasecmp (argv[1], "add") == 0) + { + WEECHAT_COMMAND_MIN_ARGS(4, "add"); + alias_command_add ( + (weechat_string_is_command_char (argv[2])) ? + (char *)weechat_utf8_next_char (argv[2]) : argv[2], + argv_eol[3], + NULL); + return WEECHAT_RC_OK; + } + + if (weechat_strcasecmp (argv[1], "addcompletion") == 0) + { + WEECHAT_COMMAND_MIN_ARGS(5, "add"); + alias_command_add ( + (weechat_string_is_command_char (argv[3])) ? + (char *)weechat_utf8_next_char (argv[3]) : argv[3], + argv_eol[4], + argv[2]); + return WEECHAT_RC_OK; + } + + if (weechat_strcasecmp (argv[1], "del") == 0) + { + WEECHAT_COMMAND_MIN_ARGS(3, "del"); + for (i = 2; i < argc; i++) + { + ptr_alias_name = (weechat_string_is_command_char (argv[i])) ? + (char *)weechat_utf8_next_char (argv[i]) : argv[i]; + ptr_alias = alias_search (ptr_alias_name); + if (!ptr_alias) + { + weechat_printf (NULL, + _("%sAlias \"%s\" not found"), + weechat_prefix ("error"), + ptr_alias_name); + } + else + { + /* remove alias */ + alias_free (ptr_alias); + + /* remove options */ + ptr_option = weechat_config_search_option ( + alias_config_file, + alias_config_section_cmd, + ptr_alias_name); + if (ptr_option) + weechat_config_option_free (ptr_option); + ptr_option = weechat_config_search_option ( + alias_config_file, + alias_config_section_completion, + ptr_alias_name); + if (ptr_option) + weechat_config_option_free (ptr_option); + + weechat_printf (NULL, + _("Alias \"%s\" removed"), + ptr_alias_name); + } + } + return WEECHAT_RC_OK; + } + + WEECHAT_COMMAND_ERROR; +} + +/* + * Hooks alias command. + */ + +void +alias_command_init () +{ + weechat_hook_command ( + "alias", + N_("list, add or remove command aliases"), + N_("list []" + " || add [[;...]]" + " || addcompletion [[;...]]" + " || del [...]"), + N_(" list: list aliases (without argument, this list is " + "displayed)\n" + " add: add an alias\n" + "addcompletion: add an alias with a custom completion\n" + " del: delete an alias\n" + " completion: completion for alias: by default completion is " + "done with target command\n" + " note: you can use %%command to use completion of " + "an existing command\n" + " alias: name of alias\n" + " command: command name with arguments (many commands can be " + "separated by semicolons)\n" + "\n" + "Note: in command, special variables are replaced:\n" + " $n: argument 'n' (between 1 and 9)\n" + " $-m: arguments from 1 to 'm'\n" + " $n-: arguments from 'n' to last\n" + " $n-m: arguments from 'n' to 'm'\n" + " $*: all arguments\n" + " $~: last argument\n" + " $var: where \"var\" is a local variable of buffer (see " + "/buffer localvar)\n" + " examples: $nick, $channel, $server, $plugin, $name\n" + "\n" + "Examples:\n" + " alias /split to split window horizontally:\n" + " /alias add split /window splith\n" + " alias /hello to say \"hello\" on all channels but not on " + "#weechat:\n" + " /alias add hello /allchan -exclude=#weechat msg * hello\n" + " alias /forcejoin to send IRC command \"forcejoin\" with " + "completion of /sajoin:\n" + " /alias addcompletion %%sajoin forcejoin /quote forcejoin"), + "list %(alias)" + " || add %(alias) %(commands)|%(alias_value)" + " || addcompletion %- %(alias) %(commands)|%(alias_value)" + " || del %(alias)|%*", + &alias_command_cb, NULL); +} diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias-command.h weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias-command.h --- weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias-command.h 1970-01-01 00:00:00.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias-command.h 2015-07-27 18:36:23.000000000 +0000 @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2013-2015 Sébastien Helleu + * + * This file is part of WeeChat, the extensible chat client. + * + * WeeChat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * WeeChat is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WeeChat. If not, see . + */ + +#ifndef WEECHAT_ALIAS_COMMAND_H +#define WEECHAT_ALIAS_COMMAND_H 1 + +extern void alias_command_init (); + +#endif /* WEECHAT_ALIAS_COMMAND_H */ diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias-completion.c weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias-completion.c --- weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias-completion.c 1970-01-01 00:00:00.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias-completion.c 2015-07-27 18:36:23.000000000 +0000 @@ -0,0 +1,116 @@ +/* + * alias-completion.c - completion for alias commands + * + * Copyright (C) 2003-2015 Sébastien Helleu + * + * This file is part of WeeChat, the extensible chat client. + * + * WeeChat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * WeeChat is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WeeChat. If not, see . + */ + +#include +#include +#include + +#include "../weechat-plugin.h" +#include "alias.h" + + +/* + * Adds list of aliases to completion list. + */ + +int +alias_completion_alias_cb (void *data, const char *completion_item, + struct t_gui_buffer *buffer, + struct t_gui_completion *completion) +{ + struct t_alias *ptr_alias; + + /* make C compiler happy */ + (void) data; + (void) completion_item; + (void) buffer; + + for (ptr_alias = alias_list; ptr_alias; + ptr_alias = ptr_alias->next_alias) + { + weechat_hook_completion_list_add (completion, ptr_alias->name, + 0, WEECHAT_LIST_POS_SORT); + } + + return WEECHAT_RC_OK; +} + +/* + * Adds value of an alias to completion list. + */ + +int +alias_completion_alias_value_cb (void *data, const char *completion_item, + struct t_gui_buffer *buffer, + struct t_gui_completion *completion) +{ + const char *args; + char **argv, *alias_name; + int argc; + struct t_alias *ptr_alias; + + /* make C compiler happy */ + (void) data; + (void) completion_item; + (void) buffer; + + args = weechat_hook_completion_get_string (completion, "args"); + if (args) + { + argv = weechat_string_split (args, " ", 0, 0, &argc); + if (argv) + { + if (argc > 0) + alias_name = strdup (argv[argc - 1]); + else + alias_name = strdup (args); + + if (alias_name) + { + ptr_alias = alias_search (alias_name); + if (ptr_alias) + { + weechat_hook_completion_list_add (completion, + ptr_alias->command, + 0, + WEECHAT_LIST_POS_BEGINNING); + } + free (alias_name); + } + weechat_string_free_split (argv); + } + } + + return WEECHAT_RC_OK; +} + +/* + * Hooks completions. + */ + +void +alias_completion_init () +{ + weechat_hook_completion ("alias", N_("list of aliases"), + &alias_completion_alias_cb, NULL); + weechat_hook_completion ("alias_value", N_("value of alias"), + &alias_completion_alias_value_cb, NULL); +} diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias-completion.h weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias-completion.h --- weechat-1.3~dev+20150718~wily1/src/plugins/alias/alias-completion.h 1970-01-01 00:00:00.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/alias/alias-completion.h 2015-07-27 18:36:23.000000000 +0000 @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2013-2015 Sébastien Helleu + * + * This file is part of WeeChat, the extensible chat client. + * + * WeeChat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * WeeChat is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with WeeChat. If not, see . + */ + +#ifndef WEECHAT_ALIAS_COMPLETION_H +#define WEECHAT_ALIAS_COMPLETION_H 1 + +extern void alias_completion_init (); + +#endif /* WEECHAT_ALIAS_COMPLETION_H */ diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/alias/CMakeLists.txt weechat-1.3~dev+20150727~wily1/src/plugins/alias/CMakeLists.txt --- weechat-1.3~dev+20150718~wily1/src/plugins/alias/CMakeLists.txt 2015-01-01 13:47:14.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/alias/CMakeLists.txt 2015-07-27 18:36:23.000000000 +0000 @@ -19,6 +19,8 @@ add_library(alias MODULE alias.c alias.h +alias-command.c alias-command.h +alias-completion.c alias-completion.h alias-config.c alias-config.h alias-info.c alias-info.h) set_target_properties(alias PROPERTIES PREFIX "") diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/alias/Makefile.am weechat-1.3~dev+20150727~wily1/src/plugins/alias/Makefile.am --- weechat-1.3~dev+20150718~wily1/src/plugins/alias/Makefile.am 2015-01-01 13:47:14.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/alias/Makefile.am 2015-07-27 18:36:23.000000000 +0000 @@ -25,6 +25,10 @@ alias_la_SOURCES = alias.c \ alias.h \ + alias-command.c \ + alias-command.h \ + alias-completion.c \ + alias-completion.h \ alias-config.c \ alias-config.h \ alias-info.c \ diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/aspell/weechat-aspell-completion.c weechat-1.3~dev+20150727~wily1/src/plugins/aspell/weechat-aspell-completion.c --- weechat-1.3~dev+20150718~wily1/src/plugins/aspell/weechat-aspell-completion.c 2015-05-03 17:48:28.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/aspell/weechat-aspell-completion.c 2015-07-27 18:36:23.000000000 +0000 @@ -121,7 +121,7 @@ } /* - * Hooks completion. + * Hooks completions. */ void diff -Nru weechat-1.3~dev+20150718~wily1/src/plugins/xfer/xfer-completion.c weechat-1.3~dev+20150727~wily1/src/plugins/xfer/xfer-completion.c --- weechat-1.3~dev+20150718~wily1/src/plugins/xfer/xfer-completion.c 2015-01-01 13:47:14.000000000 +0000 +++ weechat-1.3~dev+20150727~wily1/src/plugins/xfer/xfer-completion.c 2015-07-27 18:36:23.000000000 +0000 @@ -62,7 +62,7 @@ } /* - * Hooks completion. + * Hooks completions. */ void