diff options
73 files changed, 1049 insertions, 858 deletions
diff --git a/AUTHORS.asciidoc b/AUTHORS.asciidoc index e32b3dfa2..f838a93dc 100644 --- a/AUTHORS.asciidoc +++ b/AUTHORS.asciidoc @@ -64,6 +64,7 @@ Alphabetically: * Nils Görs (nils_2) * nyuszika7h * Odin +* Ondřej Súkup * Patrick Steinhardt * Paul Komkoff * Pavel Shevchuk (Stalwart) diff --git a/CMakeLists.txt b/CMakeLists.txt index 622690140..3e20b4594 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -32,7 +32,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-de # version set(VERSION_MAJOR "1") -set(VERSION_MINOR "3-dev") +set(VERSION_MINOR "3-rc1") set(VERSION_PATCH "") if(VERSION_PATCH STREQUAL "") set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}) diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 85318f717..b28668f0e 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -19,11 +19,13 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] === 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 @@ -31,19 +33,26 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * api: add function string_eval_path_home() * alias: add options "add", "addcompletion" and "del" in command /alias, remove command /unalias (issue #458) +* irc: add option irc.color.topic_current (issue #475) * 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 @@ -53,6 +62,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * api: fix type of value returned by function strcasestr * fifo: fix send error on Cygwin when something is received in the pipe (issue #436) +* irc: fix update of lag item when the server lag changes * irc: do not allow command /query with a channel name (issue #459) * irc: decode/encode only text in IRC messages and not the headers (bug #29886, issue #218, issue #451) @@ -64,6 +74,8 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * 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 @@ -619,7 +631,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * 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 --git a/ReleaseNotes.asciidoc b/ReleaseNotes.asciidoc index 7cbb18d38..1aedb393a 100644 --- a/ReleaseNotes.asciidoc +++ b/ReleaseNotes.asciidoc @@ -19,6 +19,24 @@ https://weechat.org/files/changelog/ChangeLog-devel.html[ChangeLog] == 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 --git a/configure.ac b/configure.ac index 8e0f2423e..b07a17b44 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.56) -AC_INIT(WeeChat, 1.3-dev, flashcode@flashtux.org) +AC_INIT(WeeChat, 1.3-rc1, flashcode@flashtux.org) AC_CONFIG_SRCDIR([configure.ac]) AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE([foreign]) diff --git a/doc/de/autogen/plugin_api/hdata.asciidoc b/doc/de/autogen/plugin_api/hdata.asciidoc index 88baeb611..a35fa315f 100644 --- a/doc/de/autogen/plugin_api/hdata.asciidoc +++ b/doc/de/autogen/plugin_api/hdata.asciidoc @@ -200,6 +200,7 @@ *** 'away_message' (string) *** 'away_time' (time) *** 'lag' (integer) +*** 'lag_displayed' (integer) *** 'lag_check_time' (other) *** 'lag_next_check' (time) *** 'lag_last_refresh' (time) @@ -942,6 +943,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 --git a/doc/de/autogen/user/alias_commands.asciidoc b/doc/de/autogen/user/alias_commands.asciidoc index 5cc68e3c2..db53666ba 100644 --- a/doc/de/autogen/user/alias_commands.asciidoc +++ b/doc/de/autogen/user/alias_commands.asciidoc @@ -3,7 +3,7 @@ // DO NOT EDIT BY HAND! // [[command_alias_alias]] -[command]*`alias`* list, add or remove command aliases:: +[command]*`alias`* auflisten, hinzufügen oder entfernen von Alternativnamen:: ---- /alias list [<alias>] @@ -11,31 +11,31 @@ addcompletion <completion> <alias> [<command>[;<command>...]] del <alias> [<alias>...] - 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) + 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) -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 +Anmerkung: Im Befehl können Variablen genutzt werden, die dann durch den entsprechenden Wert ersetzt werden: + $n: Argument 'n' (zwischen 1 und 9) + $-m: Argumente von 1 bis 'm' + $n-: Argumente von 'n' bis zum letzten Argument + $n-m: Argumente von 'n' bis 'm' + $*: alle Argumente + $~: letztes Argument + $var: "var" ist eine lokale Variable für den jeweiligen Buffer (siehe /buffer localvar) + Beispiel: $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 +Beispiele: + Alternativbefehl "/split" wird anlegt um ein Fenster horizontal zu teilen: + /alias split /window splith + Alternativbefehl "/hallo" wird angelegt um in allen Channels, außer im #weechat Channel, den Text "Hallo" auszugeben: + /alias hallo /allchan -exclude=#weechat msg * Hallo + Alternativbefehl "/forcejoin" wird angelegt um den IRC Befehl "forcejoin" mit einer Vervollständigung von /sajoin auszuführen: + /alias -completion %%sajoin forcejoin /quote forcejoin ---- diff --git a/doc/de/autogen/user/irc_commands.asciidoc b/doc/de/autogen/user/irc_commands.asciidoc index 41f693f7c..c133eff1f 100644 --- a/doc/de/autogen/user/irc_commands.asciidoc +++ b/doc/de/autogen/user/irc_commands.asciidoc @@ -104,7 +104,7 @@ Ohne Angabe von Argumenten wird die Ban-Liste für den aktuellen Channel angezei -nojoin: Channel(s) werden nicht betreten (auch falls die Funktion "autojoin" aktiviert sein sollte) -switch: wechselt zur nächsten Server-Adresse -Um eine Verbindung zum Server zu beenden bzw. um Verbindungsversuche zu stoppen, wird der Befehl /disconnect verwendet. +Um eine Verbindung zum Server, oder Verbindungsversuche, zu beenden wird der Befehl /disconnect verwendet. Beispiele: /connect freenode diff --git a/doc/de/autogen/user/irc_options.asciidoc b/doc/de/autogen/user/irc_options.asciidoc index 11f6c638b..3eb879948 100644 --- a/doc/de/autogen/user/irc_options.asciidoc +++ b/doc/de/autogen/user/irc_options.asciidoc @@ -62,6 +62,11 @@ ** Typ: Farbe ** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `default`) +* [[option_irc.color.topic_current]] *irc.color.topic_current* +** Beschreibung: `Farbe in dem das aktuelle Thema des Channels dargestellt werden soll (wenn ein Channel betreten oder der Befehl /topic genutzt wird)` +** Typ: Farbe +** Werte: ein Farbname für WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), eine Terminal-Farbnummer oder ein Alias; Attribute können vor eine Farbe gesetzt werden (gilt ausschließlich für die Textfarbe und nicht für den Hintergrund): "*" für fett, "!" für invertiert, "/" für kursiv, "_" für unterstrichen (Standardwert: `default`) + * [[option_irc.color.topic_new]] *irc.color.topic_new* ** Beschreibung: `Farbe in dem das neue Thema des Channels dargestellt werden soll, falls das Thema des Channels geändert wurde` ** Typ: Farbe diff --git a/doc/de/autogen/user/weechat_commands.asciidoc b/doc/de/autogen/user/weechat_commands.asciidoc index e8dda258e..c842631c5 100644 --- a/doc/de/autogen/user/weechat_commands.asciidoc +++ b/doc/de/autogen/user/weechat_commands.asciidoc @@ -151,7 +151,7 @@ Beispiele: 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,13 +418,15 @@ Auflistung der möglichen Aktionen: return: simuliert die "enter" Taste complete_next: vervollständigt Wort mit nächster Komplettierung complete_previous: vervollständigt Word mit vorheriger Komplettierung - search_text: sucht nach Text im Buffer + search_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: suche stoppen + search_stop_here: beendet Suche ab aktueller Position + search_stop: suche beenden delete_previous_char: entfernt vorheriges Zeichen delete_next_char: entfernt nächstes Zeichen delete_previous_word: entfernt vorheriges Wort @@ -621,7 +623,7 @@ Ohne Angabe eines Arguments werden alle installierten Erweiterungen angezeigt. -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: @@ -762,12 +764,10 @@ Wird eine Passphrase verwendet (Daten liegen verschlüsselt vor), fragt WeeChat Es ist möglich eine Umgebungsvariable "WEECHAT_PASSPHRASE" zu setzen um die Eingabeaufforderung beim Programmstart zu vermeiden (diese Variable wird auch von WeeChat beim /upgrade verwendet). schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt werden: + - Befehl /eval. - Argument in der Befehlszeile für "--run-command" - Einstellung weechat.startup.command_{before|after}_plugins - - Proxy-Optionen: username, password - - IRC Server Optionen: autojoin, command, password, sasl_{username|password}, Username, Realname - - Einstellung relay.network.password - - Befehl /eval. + - weitere Optionen die Passwörter oder sensible Daten beinhalten (zum Beispiel: proxy, irc server und relay); nutze /help mit der entsprechenden Option um zu überprüfen ob die Daten evaluiert werden. Beispiele: festlegen eine Passphrase: @@ -778,7 +778,7 @@ Beispiele: 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} ---- @@ -888,7 +888,7 @@ Es ist möglich die WeeChat-Sitzung auf einem anderen Rechner wiederherzustellen -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 +933,7 @@ Beispiele: scroll_horiz [-window <number>] [+/-]<value>[%] scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>] swap [-window <number>] [up|down|left|right] - zoom[-window <number>] + zoom [-window <number>] bare [<delay>] list: listet die geöffneten Fenster (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben) diff --git a/doc/de/autogen/user/weechat_options.asciidoc b/doc/de/autogen/user/weechat_options.asciidoc index 5c1120cb0..ace4a0072 100644 --- a/doc/de/autogen/user/weechat_options.asciidoc +++ b/doc/de/autogen/user/weechat_options.asciidoc @@ -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 --git a/doc/de/weechat_user.de.asciidoc b/doc/de/weechat_user.de.asciidoc index a09fddc8d..ebe2c6ab2 100644 --- a/doc/de/weechat_user.de.asciidoc +++ b/doc/de/weechat_user.de.asciidoc @@ -1121,7 +1121,7 @@ Befehl festgelegt werden: | key[Backsp.] .2+| entfernt in der Befehlszeile das vorherige Zeichen .2+| `/input delete_previous_char` | key[ctrl-h] | key[ctrl-k] | entfernt alle Zeichen vom Cursor bis zum Ende der Zeile (Zeichenkette wird in Zwischenablage kopiert) | `/input delete_end_of_line` -| key[ctrl-r] | Textsuche im Verlaufsspeicher des Buffers (siehe <<key_bindings_search_context,Tasten für Such-Kontext>>) | `/input search_text` +| key[ctrl-r] | Textsuche im Verlaufsspeicher des Buffers (siehe <<key_bindings_search_context,Tasten für Such-Kontext>>) | `/input search_text_here` | key[ctrl-t] | Zeichen austauschen | `/input transpose_chars` | key[ctrl-u] | entfernt alle Zeichen vom Cursor bis zum Anfang der Zeile (Zeichenkette wird in Zwischenablage kopiert) | `/input delete_beginning_of_line` | key[ctrl-w] | entfernt das Wort links vom Cursor (entferntes Wort wird in Zwischenablage kopiert) | `/input delete_previous_word` @@ -1182,7 +1182,7 @@ Befehl festgelegt werden: | 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` @@ -1216,9 +1216,10 @@ in einem Buffer nach einem Text zu suchen). | key[Tab] | wechselt Suche in: Nachricht (Standard), im Präfix, Präfix + Nachricht | `/input search_switch_where` | key[↑] | sucht vorheriger Zeile | `/input search_previous` | key[↓] | sucht nächste Zeile | `/input search_next` -| key[Enter] .3+| Suche abbrechen .3+| `/input search_stop` +| key[Enter] .3+| beendet Suche ab aktueller Position .3+| `/input search_stop_here` | key[ctrl-j] | key[ctrl-m] +| key[ctrl-q] | beendet Suche und blättert zum Ende des Buffers | `/input search_stop` |=== [[key_bindings_cursor_context]] diff --git a/doc/en/autogen/plugin_api/hdata.asciidoc b/doc/en/autogen/plugin_api/hdata.asciidoc index f02e4b913..d33d0ecf4 100644 --- a/doc/en/autogen/plugin_api/hdata.asciidoc +++ b/doc/en/autogen/plugin_api/hdata.asciidoc @@ -200,6 +200,7 @@ *** 'away_message' (string) *** 'away_time' (time) *** 'lag' (integer) +*** 'lag_displayed' (integer) *** 'lag_check_time' (other) *** 'lag_next_check' (time) *** 'lag_last_refresh' (time) @@ -942,6 +943,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 --git a/doc/en/autogen/user/irc_options.asciidoc b/doc/en/autogen/user/irc_options.asciidoc index 94893a3f0..b175c8bc7 100644 --- a/doc/en/autogen/user/irc_options.asciidoc +++ b/doc/en/autogen/user/irc_options.asciidoc @@ -62,6 +62,11 @@ ** type: color ** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline (default value: `default`) +* [[option_irc.color.topic_current]] *irc.color.topic_current* +** description: `color for current channel topic (when joining a channel or using /topic)` +** type: color +** values: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline (default value: `default`) + * [[option_irc.color.topic_new]] *irc.color.topic_new* ** description: `color for new channel topic (when topic is changed)` ** type: color diff --git a/doc/en/autogen/user/weechat_commands.asciidoc b/doc/en/autogen/user/weechat_commands.asciidoc index 90df54cf2..ff48499dc 100644 --- a/doc/en/autogen/user/weechat_commands.asciidoc +++ b/doc/en/autogen/user/weechat_commands.asciidoc @@ -418,12 +418,14 @@ 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 @@ -762,12 +764,10 @@ When a passphrase is used (data encrypted), it is asked by WeeChat on startup. It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade). Secured data with format ${sec.data.xxx} can be used in: + - command /eval - command line argument "--run-command" - options weechat.startup.command_{before|after}_plugins - - proxy options: username, password - - irc server options: autojoin, command, password, sasl_{username|password}, username, realname - - option relay.network.password - - command /eval. + - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated. Examples: set a passphrase: @@ -933,7 +933,7 @@ Examples: scroll_horiz [-window <number>] [+/-]<value>[%] scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>] swap [-window <number>] [up|down|left|right] - zoom[-window <number>] + zoom [-window <number>] bare [<delay>] list: list opened windows (without argument, this list is displayed) diff --git a/doc/en/autogen/user/weechat_options.asciidoc b/doc/en/autogen/user/weechat_options.asciidoc index d889cd0cc..0a9abdbad 100644 --- a/doc/en/autogen/user/weechat_options.asciidoc +++ b/doc/en/autogen/user/weechat_options.asciidoc @@ -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 --git a/doc/en/weechat_user.en.asciidoc b/doc/en/weechat_user.en.asciidoc index 0a2a1709e..d2fc9f32d 100644 --- a/doc/en/weechat_user.en.asciidoc +++ b/doc/en/weechat_user.en.asciidoc @@ -1097,7 +1097,7 @@ The notify level for a buffer can be set with command `/buffer`: | key[Backsp.] .2+| Delete previous char in command line .2+| `/input delete_previous_char` | key[ctrl-h] | key[ctrl-k] | Delete from cursor until end of command line (deleted string is copied to clipboard) | `/input delete_end_of_line` -| key[ctrl-r] | Search for text in buffer history (see <<key_bindings_search_context,keys for search context>>) | `/input search_text` +| key[ctrl-r] | Search for text in buffer history (see <<key_bindings_search_context,keys for search context>>) | `/input search_text_here` | key[ctrl-t] | Transpose chars | `/input transpose_chars` | key[ctrl-u] | Delete from cursor until beginning of command line (deleted string is copied to clipboard) | `/input delete_beginning_of_line` | key[ctrl-w] | Delete previous word of command line (deleted string is copied to clipboard) | `/input delete_previous_word` @@ -1158,7 +1158,7 @@ The notify level for a buffer can be set with command `/buffer`: | key[alt-j,alt-r] | Switch to IRC raw buffer | `/server raw` | key[alt-j,alt-s] | Switch to IRC server buffer | `/server jump` | key[alt-0...9] | Switch to buffer by number (0 = 10) | `/buffer *N` -| 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` @@ -1192,9 +1192,10 @@ text in buffer). | key[Tab] | Switch search in: messages (default), prefixes, prefixes + messages | `/input search_switch_where` | key[↑] | Search previous line | `/input search_previous` | key[↓] | Search next line | `/input search_next` -| key[Enter] .3+| Stop search .3+| `/input search_stop` +| key[Enter] .3+| Stop search at current position .3+| `/input search_stop_here` | key[ctrl-j] | key[ctrl-m] +| key[ctrl-q] | Stop search and scroll to bottom of buffer | `/input search_stop` |=== [[key_bindings_cursor_context]] diff --git a/doc/fr/autogen/plugin_api/hdata.asciidoc b/doc/fr/autogen/plugin_api/hdata.asciidoc index 751b48545..4a079f0d4 100644 --- a/doc/fr/autogen/plugin_api/hdata.asciidoc +++ b/doc/fr/autogen/plugin_api/hdata.asciidoc @@ -200,6 +200,7 @@ *** 'away_message' (string) *** 'away_time' (time) *** 'lag' (integer) +*** 'lag_displayed' (integer) *** 'lag_check_time' (other) *** 'lag_next_check' (time) *** 'lag_last_refresh' (time) @@ -942,6 +943,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 --git a/doc/fr/autogen/user/irc_options.asciidoc b/doc/fr/autogen/user/irc_options.asciidoc index f357b574a..a7e0f4d5b 100644 --- a/doc/fr/autogen/user/irc_options.asciidoc +++ b/doc/fr/autogen/user/irc_options.asciidoc @@ -62,6 +62,11 @@ ** type: couleur ** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné (valeur par défaut: `default`) +* [[option_irc.color.topic_current]] *irc.color.topic_current* +** description: `couleur pour le titre du canal actuel (en rejoignant un canal ou sur /topic)` +** type: couleur +** valeurs: un nom de couleur WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), un numéro de couleur du terminal ou un alias ; des attributs sont autorisés avant la couleur (seulement pour la couleur du texte, pas le fond) : "*" pour le gras, "!" pour la vidéo inverse, "/" pour l'italique, "_" pour le souligné (valeur par défaut: `default`) + * [[option_irc.color.topic_new]] *irc.color.topic_new* ** description: `couleur pour le nouveau titre du canal (lorsque le titre est changé)` ** type: couleur diff --git a/doc/fr/autogen/user/weechat_commands.asciidoc b/doc/fr/autogen/user/weechat_commands.asciidoc index 65132837b..268c50b25 100644 --- a/doc/fr/autogen/user/weechat_commands.asciidoc +++ b/doc/fr/autogen/user/weechat_commands.asciidoc @@ -418,12 +418,14 @@ liste des actions : 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 @@ -762,12 +764,10 @@ Lorsqu'une phrase de chiffrement est utilisée (données chiffrées), elle est d Il est possible de définir la variable d'environnement WEECHAT_PASSPHRASE pour éviter la demande (cette même variable est utilisée par WeeChat sur le /upgrade). Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisées dans : + - la commande /eval - le paramètre de ligne de commande "--run-command" - les options weechat.startup.command_{before|after}_plugins - - les options de proxy : username, password - - les options de serveur irc : autojoin, command, password, sasl_{username|password}, username, realname - - l'option relay.network.password - - la commande /eval. + - d'autres options qui peuvent contenir un mot de passe ou des données sensibles (par exemple proxy, serveur irc et relay) ; voir /help sur les options pour vérifier si elles sont évaluées. Exemples : définir une phrase de chiffrement : diff --git a/doc/fr/autogen/user/weechat_options.asciidoc b/doc/fr/autogen/user/weechat_options.asciidoc index f29fb039f..e876a9041 100644 --- a/doc/fr/autogen/user/weechat_options.asciidoc +++ b/doc/fr/autogen/user/weechat_options.asciidoc @@ -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 --git a/doc/fr/weechat_user.fr.asciidoc b/doc/fr/weechat_user.fr.asciidoc index fa5067a2d..0b902589a 100644 --- a/doc/fr/weechat_user.fr.asciidoc +++ b/doc/fr/weechat_user.fr.asciidoc @@ -1127,7 +1127,7 @@ commande `/buffer` : | key[Backsp.] .2+| Effacer le caractère précédent sur la ligne de commande .2+| `/input delete_previous_char` | key[ctrl-h] | key[ctrl-k] | Effacer du curseur jusqu'à la fin de la ligne de commande (la chaîne supprimée est copiée dans le presse-papiers) | `/input delete_end_of_line` -| key[ctrl-r] | Chercher du texte dans l'historique du tampon (voir <<key_bindings_search_context,les touches pour le contexte de recherche>>) | `/input search_text` +| key[ctrl-r] | Chercher du texte dans l'historique du tampon (voir <<key_bindings_search_context,les touches pour le contexte de recherche>>) | `/input search_text_here` | key[ctrl-t] | Inverser deux caractères | `/input transpose_chars` | key[ctrl-u] | Effacer du curseur jusqu'au début de la ligne de commande (la chaîne supprimée est copiée dans le presse-papiers) | `/input delete_beginning_of_line` | key[ctrl-w] | Effacer le mot précédent sur la ligne de commande (la chaîne supprimée est copiée dans le presse-papiers) | `/input delete_previous_word` @@ -1188,7 +1188,7 @@ commande `/buffer` : | key[alt-j,alt-r] | Sauter au tampon IRC de données brutes | `/server raw` | key[alt-j,alt-s] | Sauter au tampon IRC du serveur | `/server jump` | key[alt-0...9] | Sauter au tampon qui porte ce numéro (0 = 10) | `/buffer *N` -| 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` @@ -1222,9 +1222,10 @@ pressé pour chercher du texte dans le tampon). | key[Tab] | Basculer la recherche dans : les messages (par défaut), les préfixes, les préfixes + messages | `/input search_switch_where` | key[↑] | Chercher la ligne précédente | `/input search_previous` | key[↓] | Chercher la ligne suivante | `/input search_next` -| key[Enter] .3+| Arrêter la recherche .3+| `/input search_stop` +| key[Enter] .3+| Arrêter la recherche à la position courante .3+| `/input search_stop_here` | key[ctrl-j] | key[ctrl-m] +| key[ctrl-q] | Arrêter la recherche et aller à la fin du tampon | `/input search_stop` |=== [[key_bindings_cursor_context]] diff --git a/doc/it/autogen/plugin_api/hdata.asciidoc b/doc/it/autogen/plugin_api/hdata.asciidoc index 351c4a94e..ece27dfad 100644 --- a/doc/it/autogen/plugin_api/hdata.asciidoc +++ b/doc/it/autogen/plugin_api/hdata.asciidoc @@ -200,6 +200,7 @@ *** 'away_message' (string) *** 'away_time' (time) *** 'lag' (integer) +*** 'lag_displayed' (integer) *** 'lag_check_time' (other) *** 'lag_next_check' (time) *** 'lag_last_refresh' (time) @@ -942,6 +943,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 --git a/doc/it/autogen/user/irc_options.asciidoc b/doc/it/autogen/user/irc_options.asciidoc index c772add5b..af2d8a9a5 100644 --- a/doc/it/autogen/user/irc_options.asciidoc +++ b/doc/it/autogen/user/irc_options.asciidoc @@ -62,6 +62,11 @@ ** tipo: colore ** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline (valore predefinito: `default`) +* [[option_irc.color.topic_current]] *irc.color.topic_current* +** descrizione: `color for current channel topic (when joining a channel or using /topic)` +** tipo: colore +** valori: a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal color number or an alias; attributes are allowed before color (for text color only, not background): "*" for bold, "!" for reverse, "/" for italic, "_" for underline (valore predefinito: `default`) + * [[option_irc.color.topic_new]] *irc.color.topic_new* ** descrizione: `colore del nuovo argomento del canale (quando viene cambiato)` ** tipo: colore diff --git a/doc/it/autogen/user/weechat_commands.asciidoc b/doc/it/autogen/user/weechat_commands.asciidoc index 7a91d9ad2..6f233801f 100644 --- a/doc/it/autogen/user/weechat_commands.asciidoc +++ b/doc/it/autogen/user/weechat_commands.asciidoc @@ -418,12 +418,14 @@ 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 @@ -762,12 +764,10 @@ When a passphrase is used (data encrypted), it is asked by WeeChat on startup. It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade). Secured data with format ${sec.data.xxx} can be used in: + - command /eval - command line argument "--run-command" - options weechat.startup.command_{before|after}_plugins - - proxy options: username, password - - irc server options: autojoin, command, password, sasl_{username|password}, username, realname - - option relay.network.password - - command /eval. + - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated. Examples: set a passphrase: @@ -933,7 +933,7 @@ Esempi: scroll_horiz [-window <number>] [+/-]<value>[%] scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>] swap [-window <number>] [up|down|left|right] - zoom[-window <number>] + zoom [-window <number>] bare [<delay>] list: list opened windows (without argument, this list is displayed) diff --git a/doc/it/autogen/user/weechat_options.asciidoc b/doc/it/autogen/user/weechat_options.asciidoc index 52d86902d..1d73f627b 100644 --- a/doc/it/autogen/user/weechat_options.asciidoc +++ b/doc/it/autogen/user/weechat_options.asciidoc @@ -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 --git a/doc/it/weechat_user.it.asciidoc b/doc/it/weechat_user.it.asciidoc index b1f2ce91e..78e95c8f4 100644 --- a/doc/it/weechat_user.it.asciidoc +++ b/doc/it/weechat_user.it.asciidoc @@ -1151,7 +1151,7 @@ Il livello di notifica per un buffer può essere impostato con il comando `/buff | key[Backsp.] .2+| Elimina il carattere precedente nella riga di comando .2+| `/input delete_previous_char` | key[ctrl-h] | key[ctrl-k] | Elimina dal cursore fino alla fine della riga di comando (la stringa eliminata viene copiata negli appunti) | `/input delete_end_of_line` -| key[ctrl-r] | Cerca del testo nella cronologia del buffer (consultare <<key_bindings_search_context,tasti per il contesto search>>) | `/input search_text` +| key[ctrl-r] | Cerca del testo nella cronologia del buffer (consultare <<key_bindings_search_context,tasti per il contesto search>>) | `/input search_text_here` | key[ctrl-t] | Inverti caratteri | `/input transpose_chars` | key[ctrl-u] | Elimina dal cursore fino all'inizio della riga di comando (la stringa eliminata viene copiata negli appunti) | `/input delete_beginning_of_line` | key[ctrl-w] | Elimina la parola precedente nella riga di comando (la stringa eliminata viene copiata negli appunti) | `/input delete_previous_word` @@ -1214,7 +1214,7 @@ Il livello di notifica per un buffer può essere impostato con il comando `/buff | 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` @@ -1252,9 +1252,12 @@ key[ctrl-r] per cercare del testo nel buffer). | key[Tab] | Switch search in: messages (default), prefixes, prefixes + messages | `/input search_switch_where` | key[↑] | Cerca riga precedente | `/input search_previous` | key[↓] | Cerca riga successiva | `/input search_next` -| key[Invio] .3+| Ferma ricerca .3+| `/input search_stop` +// TRANSLATION MISSING +| key[Enter] .3+| Stop search at current position .3+| `/input search_stop_here` | key[ctrl-j] | key[ctrl-m] +// TRANSLATION MISSING +| key[ctrl-q] | Stop search and scroll to bottom of buffer | `/input search_stop` |=== [[key_bindings_cursor_context]] diff --git a/doc/ja/autogen/plugin_api/hdata.asciidoc b/doc/ja/autogen/plugin_api/hdata.asciidoc index 2148bb9f3..ba5d1e309 100644 --- a/doc/ja/autogen/plugin_api/hdata.asciidoc +++ b/doc/ja/autogen/plugin_api/hdata.asciidoc @@ -200,6 +200,7 @@ *** 'away_message' (string) *** 'away_time' (time) *** 'lag' (integer) +*** 'lag_displayed' (integer) *** 'lag_check_time' (other) *** 'lag_next_check' (time) *** 'lag_last_refresh' (time) @@ -942,6 +943,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 --git a/doc/ja/autogen/user/alias_commands.asciidoc b/doc/ja/autogen/user/alias_commands.asciidoc index 5cc68e3c2..670aac860 100644 --- a/doc/ja/autogen/user/alias_commands.asciidoc +++ b/doc/ja/autogen/user/alias_commands.asciidoc @@ -3,7 +3,7 @@ // DO NOT EDIT BY HAND! // [[command_alias_alias]] -[command]*`alias`* list, add or remove command aliases:: +[command]*`alias`* 別名コマンドのリストアップ、追加、削除:: ---- /alias list [<alias>] @@ -11,31 +11,31 @@ addcompletion <completion> <alias> [<command>[;<command>...]] del <alias> [<alias>...] - 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) + list: 別名をリストアップ (引数を与えなかった場合、このリストが表示されます) + add: 別名を追加 +addcompletion: カスタム補完を指定して別名を追加 + del: 別名を削除 + completion: 別名の補完: デフォルトでは対象のコマンドに対する補完が行われます + 注意: %%command で既存のコマンドに対する補完を利用可能です + alias: 別名の名前 + command: 引数を含めたコマンド名 (セミコロンで分割すれば複数のコマンドを指定できます) -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 +注意: command の中に含まれる特殊変数は置換されます: + $n: 'n' 番目の引数 (1 から 9) + $-m: 1 から 'm' 番目の引数 + $n-: 'n' 番目から最後の引数 + $n-m: 'n' から 'm' 番目の引数 + $*: 全ての引数 + $~: 最後の引数 + $var: ここで "var" とはバッファの局所変数 (/buffer localvar を参照) + 例: $nick、$channel、$server、$plugin、$name -Examples: - alias /split to split window horizontally: +例: + /split をウィンドウを水平方向に分割する別名と定義: /alias add split /window splith - alias /hello to say "hello" on all channels but not on #weechat: + /hello を #weechat を除く全てのチャンネルで "hello" と発言する別名と定義: /alias add hello /allchan -exclude=#weechat msg * hello - alias /forcejoin to send IRC command "forcejoin" with completion of /sajoin: + /forcejoin を /sajoin の補完候補を使い IRC コマンド "forcejoin" を送信する別名と定義: /alias addcompletion %%sajoin forcejoin /quote forcejoin ---- diff --git a/doc/ja/autogen/user/irc_options.asciidoc b/doc/ja/autogen/user/irc_options.asciidoc index 8f596f14e..936e0b46f 100644 --- a/doc/ja/autogen/user/irc_options.asciidoc +++ b/doc/ja/autogen/user/irc_options.asciidoc @@ -62,6 +62,11 @@ ** タイプ: 色 ** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" (デフォルト値: `default`) +* [[option_irc.color.topic_current]] *irc.color.topic_current* +** 説明: `color for current channel topic (when joining a channel or using /topic)` +** タイプ: 色 +** 値: WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号またはその別名; 色の前に属性を置くことができます (テキスト前景色のみ、背景色は出来ません): 太字は "*"、反転は "!"、イタリックは "/"、下線は "_" (デフォルト値: `default`) + * [[option_irc.color.topic_new]] *irc.color.topic_new* ** 説明: `新しいチャンネルトピックの色 (トピックが変更されたとき)` ** タイプ: 色 diff --git a/doc/ja/autogen/user/weechat_commands.asciidoc b/doc/ja/autogen/user/weechat_commands.asciidoc index 15cb4e350..d6aded45c 100644 --- a/doc/ja/autogen/user/weechat_commands.asciidoc +++ b/doc/ja/autogen/user/weechat_commands.asciidoc @@ -414,58 +414,60 @@ value: 表示する履歴エントリの数 ---- /input <action> [<arguments>] -アクションリスト: - return: "enter" キーをシミュレート - complete_next: 次の補完候補で単語を補完 - complete_previous: 一つ前の補完候補で単語を補完 - search_text: バッファ内のテキストを検索 - search_switch_case: 完全一致検索に変更 - search_switch_regex: 検索タイプの切り替え: 文字列/正規表現 - search_switch_where: 検索範囲の切り替え: メッセージ/プレフィックス - search_previous: 一つ前の行を検索 - search_next: 次の行を検索 - search_stop: 検索を終了 - delete_previous_char: 一つ前の文字を削除 - delete_next_char: 次の文字を削除 - delete_previous_word: 一つ前の単語を削除 - delete_next_word: 次の単語を削除 - delete_beginning_of_line: 行の最初からカーソル位置までを削除 - delete_end_of_line: カーソルから行の最後までを削除 - delete_line: 行を削除 - clipboard_paste: クリップボードから貼り付け - transpose_chars: 2 つの文字を入れ替え - undo: 最新のコマンドラインアクションまで元に戻す - redo: 最新のコマンドラインアクションまでやり直す - move_beginning_of_line: カーソルを行頭に移動 - move_end_of_line: カーソルを行末まで移動 - move_previous_char: カーソルを一つ前の文字に移動 - move_next_char: カーソルを次の文字に移動 - move_previous_word: カーソルを一つ前の単語に移動 - move_next_word: カーソルを次の単語に移動 - history_previous: 現在のバッファ履歴のひとつ前のコマンドを再呼び出し - history_next: 現在のバッファ履歴の次のコマンドを再呼び出し - history_global_previous: グローバル履歴の一つ前のコマンドを再呼び出し - history_global_next: グローバル履歴の次のコマンドを再呼び出し - jump_smart: 次のアクティブバッファに飛ぶ - jump_last_buffer_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]] @@ -749,36 +751,34 @@ file: 保存する設定ファイル (拡張子 ".conf" は不要) set <name> <value> del <name> -passphrase: パスフレーズを変更 (パスフレーズがない場合、sec.conf ファイルに平文でデータを保存します) - -delete: パスフレーズを削除 - decrypt: 暗号化されているデータを復号化 (起動時にパスフレーズが設定されていない場合に起きます) - -discard: 全ての暗号化データを破棄 - set: 保護データを追加または変更 - del: 保護データを削除 +passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf) + -delete: delete passphrase + decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup) + -discard: discard all data still encrypted + set: add or change secured data + del: delete secured data -引数がない場合、新しいバッファに保護データを表示します。 +Without argument, this command displays secured data in a new buffer. -パスフレーズを利用する場合 (データが暗号化されている場合)、WeeChat は起動時にパスフレーズを尋ねます。 -環境変数 "WEECHAT_PASSPHRASE" を利用すれば入力を回避できます (WeeChat は /upgrade の時に同じ変数を利用します)。 +When a passphrase is used (data encrypted), it is asked by WeeChat on startup. +It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade). -${sec.data.xxx} の形でフォーマットされた保護データは以下の様に利用できます: - - コマンドライン引数 "--run-command" - - weechat.startup.command_{before|after}_plugins オプション - - プロキシオプション: username、password - - irc サーバオプション: autojoin、command、password、sasl_{username|password}、username、realname - - relay.network.password オプション - - /eval コマンド。 +Secured data with format ${sec.data.xxx} can be used in: + - command /eval + - command line argument "--run-command" + - options weechat.startup.command_{before|after}_plugins + - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated. -例: - パスフレーズを設定: +Examples: + set a passphrase: /secure passphrase this is my passphrase - freenode の SASL パスワードを暗号化: + encrypt freenode SASL password: /secure set freenode mypassword /set irc.server.freenode.sasl_password "${sec.data.freenode}" - oftc の nickserv 用パスワードを暗号化: + encrypt oftc password for nickserv: /secure set oftc mypassword /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}" - ニックネーム "mynick" を取り戻すためのエイリアス ghost を設定 + alias to ghost the nick "mynick": /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode} ---- @@ -843,30 +843,30 @@ option: オプションの名前 ---- /upgrade [-yes] [<path_to_binary>|-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) + -yes: weechat.look.confirm_upgrade オプションが有効化されていた場合、このオプションは必須です。 +path_to_binary: WeeChat バイナリへのパス (デフォルトは現在のバイナリ) + -dummy: 何もしない (補完された "-quit" オプションを不用意に使わないためのオプション) + -quit: *すべての*接続を閉じ、セッションを保存して WeeChat を終了。遅延復帰 (詳しくは後述) が可能になります。 -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. +このコマンドは起動中の WeeChat セッションのアップグレードと再読み込みを行います。このコマンドを実行する前に、新しい WeeChat バイナリをコンパイルするか、パッケージマネージャでインストールしなければいけません。 -Note: SSL connections are lost during upgrade, because reload of SSL sessions is currently not possible with GnuTLS. There is automatic reconnection after upgrade. +注意: SSL 接続はアップグレード中に破棄されます、これは今のところ GnuTLS では SSL セッションのリロードができないからです。アップグレードの後に自動的に再接続されます。 -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. +アップグレードは 4 つの手順を踏みます: + 1. コアとプラグイン (バッファ、履歴、...) のセッションをファイルに保存 + 2. 全てのプラグインをアンロード (設定ファイル (*.conf) はディスクに書き込まれます) + 3. WeeChat 設定を保存 (weechat.conf) + 4. 新しい WeeChat バイナリを実行してセッションをリロード。< -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". +オプション "-quit" を使うと、上の挙動が少し変わります: + 1. *すべての*接続を閉じる (irc、xfer、relay、...) + 2. すべてのセッションをファイルに保存 (*.upgrade) + 3. すべてのプラグインをアンロード + 4. WeeChat 設定を保存 + 5. WeeChat を終了 +この後、セッションを回復させるには weechat --upgrade を使ってください。 +重要: 完全に同一の設定で (*.conf ファイルで) セッションを回復させてください。 +"~/.weechat" ディレクトリの内容をコピーすれば異なるマシンで WeeChat のセッションを回復することも可能です。 ---- [[command_weechat_uptime]] @@ -933,7 +933,7 @@ command: 実行するコマンド (コマンドが '/' で始まらない場合 scroll_horiz [-window <number>] [+/-]<value>[%] scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>] swap [-window <number>] [up|down|left|right] - zoom[-window <number>] + zoom [-window <number>] bare [<delay>] list: 開けられたウィンドウのリストアップ (引数無しの場合、このリストが表示されます) diff --git a/doc/ja/autogen/user/weechat_options.asciidoc b/doc/ja/autogen/user/weechat_options.asciidoc index bf592c19d..62afbc156 100644 --- a/doc/ja/autogen/user/weechat_options.asciidoc +++ b/doc/ja/autogen/user/weechat_options.asciidoc @@ -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 --git a/doc/ja/weechat_plugin_api.ja.asciidoc b/doc/ja/weechat_plugin_api.ja.asciidoc index df591c665..c6b6a011e 100644 --- a/doc/ja/weechat_plugin_api.ja.asciidoc +++ b/doc/ja/weechat_plugin_api.ja.asciidoc @@ -7249,9 +7249,8 @@ struct t_hook *weechat_hook_fd (int fd, * '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 --git a/doc/ja/weechat_user.ja.asciidoc b/doc/ja/weechat_user.ja.asciidoc index 602102aa7..ee732270d 100644 --- a/doc/ja/weechat_user.ja.asciidoc +++ b/doc/ja/weechat_user.ja.asciidoc @@ -1100,7 +1100,7 @@ irc サーバ "freenode" に含まれる全てのバッファに対して設定 | key[Backsp.] .2+| コマンドラインで前の文字を削除 .2+| `/input delete_previous_char` | key[ctrl-h] | key[ctrl-k] | コマンドラインでカーソルより後の文字列を削除 (削除された文字列はクリップボードに保存) | `/input delete_end_of_line` -| key[ctrl-r] | バッファ中の履歴からテキスト検索 (<<key_bindings_search_context,検索モード用のキー>>を参照) | `/input search_text` +| key[ctrl-r] | バッファ中の履歴からテキスト検索 (<<key_bindings_search_context,検索モード用のキー>>を参照) | `/input search_text_here` | key[ctrl-t] | 文字の入れ替え | `/input transpose_chars` | key[ctrl-u] | コマンドラインでカーソルより前の文字列を削除 (削除された文字列はクリップボードに保存) | `/input delete_beginning_of_line` | key[ctrl-w] | コマンドラインで前の単語を削除 (削除された文字列はクリップボードに保存) | `/input delete_previous_word` @@ -1161,7 +1161,7 @@ irc サーバ "freenode" に含まれる全てのバッファに対して設定 | 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` @@ -1195,9 +1195,12 @@ key[ctrl-r] が押された状態) でのみ有効です。 | key[Tab] | 検索範囲: メッセージ (デフォルト)、プレフィックス、プレフィックスとメッセージ | `/input search_switch_where` | key[↑] | 前のキーワードで検索 | `/input search_previous` | key[↓] | 次のキーワードで検索 | `/input search_next` -| key[Enter] .3+| 検索を終了 .3+| `/input search_stop` +// TRANSLATION MISSING +| key[Enter] .3+| Stop search at current position .3+| `/input search_stop_here` | key[ctrl-j] | key[ctrl-m] +// TRANSLATION MISSING +| key[ctrl-q] | Stop search and scroll to bottom of buffer | `/input search_stop` |=== [[key_bindings_cursor_context]] diff --git a/doc/pl/autogen/plugin_api/hdata.asciidoc b/doc/pl/autogen/plugin_api/hdata.asciidoc index cdabbadb8..0723bb4b1 100644 --- a/doc/pl/autogen/plugin_api/hdata.asciidoc +++ b/doc/pl/autogen/plugin_api/hdata.asciidoc @@ -200,6 +200,7 @@ *** 'away_message' (string) *** 'away_time' (time) *** 'lag' (integer) +*** 'lag_displayed' (integer) *** 'lag_check_time' (other) *** 'lag_next_check' (time) *** 'lag_last_refresh' (time) @@ -942,6 +943,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 --git a/doc/pl/autogen/user/irc_options.asciidoc b/doc/pl/autogen/user/irc_options.asciidoc index 111e71480..f79bf39a4 100644 --- a/doc/pl/autogen/user/irc_options.asciidoc +++ b/doc/pl/autogen/user/irc_options.asciidoc @@ -62,6 +62,11 @@ ** typ: kolor ** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie (domyślna wartość: `default`) +* [[option_irc.color.topic_current]] *irc.color.topic_current* +** opis: `color for current channel topic (when joining a channel or using /topic)` +** typ: kolor +** wartości: nazwa koloru WeeChat (default, black, (dark)gray, white, (light)red, (light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), numer koloru terminala albo alias; atrybuty dozwolone przed kolorem (tylko dla kolorów testu, nie tła): "*" pogrubienie, "!" odwrócenie, "/" pochylenie, "_" podkreślenie (domyślna wartość: `default`) + * [[option_irc.color.topic_new]] *irc.color.topic_new* ** opis: `kolor nowego tematu kanału (kiedy temat został zmieniony)` ** typ: kolor diff --git a/doc/pl/autogen/user/weechat_commands.asciidoc b/doc/pl/autogen/user/weechat_commands.asciidoc index 16de1562a..b12cbd464 100644 --- a/doc/pl/autogen/user/weechat_commands.asciidoc +++ b/doc/pl/autogen/user/weechat_commands.asciidoc @@ -414,58 +414,60 @@ Wartość: ilość elementów historii do pokazania ---- /input <akcja> [<argumenty>] -lista akcji: - return: symuluje klawisz "enter" - complete_next: dopełnia słowo następnym dopełnieniem - complete_previous: dopełnia słowo poprzednim dopełnieniem - search_text: szuka tekstu w buforze - search_switch_case: przełącza na dokładne dopasowanie przy szukaniu - search_switch_regex: przełącza typy wyszukiwania ciąg/wyrażenie regularne - search_switch_where: zmienia miejsce przeszukiwania na wiadomości/przedrostki - search_previous: szuka poprzednich linii - search_next: szuka następnych linii - search_stop: zatrzymuje wyszukiwanie - delete_previous_char: usuwa poprzedni znak - delete_next_char: usuwa następny znak - delete_previous_word: usuwa poprzednie słowo - delete_next_word: usuwa następne słowo - delete_beginning_of_line: usuwa od początku linii do kursora - delete_end_of_line: usuwa od kursora do końca linii - delete_line: usuwa cała linię - clipboard_paste: wkleja ze schowka - transpose_chars: zamienia dwa znaki - undo: cofa ostatnia akcję w linii poleceń - redo: ponownie wykonuje cofniętą akcję w linii poleceń - move_beginning_of_line: przesuwa kursor na początek linii - move_end_of_line: przesuwa kursor na koniec linii - move_previous_char: przesuwa kursor do poprzedniego znaku - move_next_char: przesuwa kursor do następnego znaku - move_previous_word: przesuwa kursor do poprzedniego słowa - move_next_word: przesuwa kursor do następnego słowa - history_previous: przywołuje poprzednia komendę z historii obecnego bufora - history_next: przywołuje następną komendę z historii obecnego bufora - history_global_previous: przywołuje poprzednią komendę z globalnej historii - history_global_next: przywołuje następną komendę z globalnej historii - jump_smart: przechodzi do następnego bufora z aktywnością - jump_last_buffer_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) - -Ta komenda jest używana do przypisywania klawiszy lub przez wtyczki. +list of actions: + return: simulate key "enter" + complete_next: complete word with next completion + complete_previous: complete word with previous completion + search_text_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]] @@ -749,37 +751,35 @@ Bez podania argumentu wszystkie pliki (WeeChat oraz wtyczki) zostaną przeładow set <nazwa> <wartość> del <nazwa> -passphrase: zmienia hasło (bez hasła dane są przechowywane w postaci tekstu w pliku sec.conf) - -delete: kasuje hasło - decrypt: rozszyfrowuje dane będące ciągle zaszyfrowane (zdarza się to tylko jeśli hasło nie zostało podane przy uruchomieniu) - -discard: odrzuca wszystkie nadal zaszyfrowane dane - set: dodaje lub zmienia zaszyfrowane dane - del: kasuje zaszyfrowane dane +passphrase: change the passphrase (without passphrase, data is stored as plain text in file sec.conf) + -delete: delete passphrase + decrypt: decrypt data still encrypted (it happens only if passphrase was not given on startup) + -discard: discard all data still encrypted + set: add or change secured data + del: delete secured data -Bez argumentu, komenda wyświetli zabezpieczone dane w nowym buforze. +Without argument, this command displays secured data in a new buffer. -Jeśli używane jest hasło (dane zaszyfrowane), należy je podać podczas startu WeeChat. -Jest możliwe ustawienie zmiennej środowiskowej "WEECHAT_PASSPHRASE", aby nie podawać hasła przy uruchomieniu (ta sama zmienna jest używana przez WeeChat podczas wykonywania /upgrade). +When a passphrase is used (data encrypted), it is asked by WeeChat on startup. +It is possible to set environment variable "WEECHAT_PASSPHRASE" to prevent the prompt (this same variable is used by WeeChat on /upgrade). -Zabezpieczone dane w formacie ${sec.data.xxx} można użyć w: - - argumencie w linii poleceń "--run-command" - - opcjach weechat.startup.command_{before|after}_plugins - - opcjach proxy: username, password - - opcji serwera autojoin, command, password, sasl_{username|password}, username, realname - - opcji relay.network.password - - komendzie /eval. +Secured data with format ${sec.data.xxx} can be used in: + - command /eval + - command line argument "--run-command" + - options weechat.startup.command_{before|after}_plugins + - other options that may contain a password or sensitive data (for example proxy, irc server and relay); see /help on the options to check if they are evaluated. -Przykłady: - ustawienie hasła: - /secure passphrase to jest moje hasło - zaszyfrowanie hasła dla freenode SASL: - /secure set freenode mojehasło +Examples: + set a passphrase: + /secure passphrase this is my passphrase + encrypt freenode SASL password: + /secure set freenode mypassword /set irc.server.freenode.sasl_password "${sec.data.freenode}" - zaszyfrowanie hasła dla nickserva na serwerze oftc: - /secure set oftc mojehasło + encrypt oftc password for nickserv: + /secure set oftc mypassword /set irc.server.oftc.command "/msg nickserv identify ${sec.data.oftc}" - alias dla polecenia ghost dla nicka "mójnick": - /alias ghost /eval /msg -server freenode nickserv ghost mójnick ${sec.data.freenode} + alias to ghost the nick "mynick": + /alias ghost /eval /msg -server freenode nickserv ghost mynick ${sec.data.freenode} ---- [[command_weechat_set]] @@ -921,20 +921,20 @@ Przykłady: ---- /window list - -1|+1|b#|up|down|left|right [-window <numer>] - <numer> - splith|splitv [-window <numer>] [<pct>] - resize [-window <numer>] [+/-]<pct> + -1|+1|b#|up|down|left|right [-window <number>] + <number> + splith|splitv [-window <number>] [<pct>] + resize [-window <number>] [+/-]<pct> balance - merge [-window <numer>] [all] - page_up|page_down [-window <numer>] + merge [-window <number>] [all] + page_up|page_down [-window <number>] refresh - scroll [-window <numer>] [+/-]<wartość>[s|m|h|d|M|y] - scroll_horiz [-window <numer>] [+/-]<wartość>[%] - scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <numer>] - swap [-window <numer>] [up|down|left|right] - zoom[-window <numer>] - bare [<opóźnienie>] + scroll [-window <number>] [+/-]<value>[s|m|h|d|M|y] + scroll_horiz [-window <number>] [+/-]<value>[%] + scroll_up|scroll_down|scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|scroll_unread [-window <number>] + swap [-window <number>] [up|down|left|right] + zoom [-window <number>] + bare [<delay>] list: lista otwartych okien (bez argumentu wyświetlana jest ta lista) -1: skok do poprzedniego okna diff --git a/doc/pl/autogen/user/weechat_options.asciidoc b/doc/pl/autogen/user/weechat_options.asciidoc index 68a21d2af..ac6aed789 100644 --- a/doc/pl/autogen/user/weechat_options.asciidoc +++ b/doc/pl/autogen/user/weechat_options.asciidoc @@ -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 --git a/doc/pl/weechat_user.pl.asciidoc b/doc/pl/weechat_user.pl.asciidoc index 7ae55d5a8..7901e1064 100644 --- a/doc/pl/weechat_user.pl.asciidoc +++ b/doc/pl/weechat_user.pl.asciidoc @@ -1112,7 +1112,7 @@ Poziom powiadomień dla bufora może zostać ustawiony za pomocą komendy `/buff | key[Backsp.] .2+| Usuń poprzedni znak w linii poleceń .2+| `/input delete_previous_char` | key[ctrl-h] | key[ctrl-k] | Usuń od znacznika kursora do końca linii poleceń (usuwany ciąg jest kopiowany do schowka) | `/input delete_end_of_line` -| key[ctrl-r] | Wyszukaj tekst w historii bufora (zobacz <<key_bindings_search_context,skróty dla kontekstu wyszukiwania>>) | `/input search_text` +| key[ctrl-r] | Wyszukaj tekst w historii bufora (zobacz <<key_bindings_search_context,skróty dla kontekstu wyszukiwania>>) | `/input search_text_here` | key[ctrl-t] | Przestaw znaki | `/input transpose_chars` | key[ctrl-u] | Usuń od znaku kursora do początku linii poleceń (usuwany ciąg jest kopiowany do schowka) | `/input delete_beginning_of_line` | key[ctrl-w] | Usuń poprzednie słowo w linii poleceń (usuwany ciąg jest kopiowany do schowka) | `/input delete_previous_word` @@ -1173,7 +1173,7 @@ Poziom powiadomień dla bufora może zostać ustawiony za pomocą komendy `/buff | 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` @@ -1207,9 +1207,12 @@ zostanie wciśnięta w buforze tekstowym). | key[Tab] | Przełącz miejsce wyszukiwania: wiadomości (domyślne), prefiksy, prefiksy + wiadmości | `/input search_switch_where` | key[↑] | Poprzednie wystąpienie | `/input search_previous` | key[↓] | Następne wystąpienie | `/input search_next` -| key[Enter] .3+| Zakończ wyszukiwanie .3+| `/input search_stop` +// TRANSLATION MISSING +| key[Enter] .3+| Stop search at current position .3+| `/input search_stop_here` | key[ctrl-j] | key[ctrl-m] +// TRANSLATION MISSING +| key[ctrl-q] | Stop search and scroll to bottom of buffer | `/input search_stop` |=== [[key_bindings_cursor_context]] @@ -20,15 +20,16 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" -"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-08-01 10:23+0200\n" +"Last-Translator: Ondřej Súkup <mimi.vx@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Poedit 1.8.3\n" msgid "any string" msgstr "jakýkoliv řetězec" @@ -98,13 +99,11 @@ msgstr "Hash tabulka (výstup)" msgid "Pointer" msgstr "Ukazatel" -#, fuzzy msgid "plugin" -msgstr "Plugin" +msgstr "plugin" -#, fuzzy msgid "variables" -msgstr "čtení - proměnná" +msgstr "proměnná" msgid "update allowed" msgstr "" @@ -112,9 +111,8 @@ msgstr "" msgid "lists" msgstr "" -#, fuzzy msgid "Option" -msgstr "<volba>" +msgstr "volba" msgid "Type" msgstr "" @@ -182,7 +180,7 @@ msgid "Error: not enough memory for home directory\n" msgstr "Chyba: nedostatek paměti pro domácí adresář\n" msgid "Error: WEECHAT_HOME is undefined, check build options\n" -msgstr "" +msgstr "Chyba: není definována WEECHAT_HOME, zkontroluj build promněné\n" #, c-format msgid "Error: home (%s) is not a directory\n" @@ -208,6 +206,20 @@ msgid "" "You can add and connect to an IRC server with /server and /connect commands " "(see /help server)." msgstr "" +"Vítejte v WeeChatu!\n" +"\n" +"Pokud objevujete WeeChat je doporučeno si prečíst alespoň \"quickstart\" " +"průvodce, a pokud máte trochu času tak uživatelskou příručku, oboje vám " +"vyvětlí hlavní koncepty WeeChatu.\n" +"Veškerá dokumentace WeeChatu je dostupná na adrese: https://weechat.org/doc\n" +"\n" +"Navíc je zde dostupná integrovaná nápověda /help fungující na všech " +"příkazech a nastaveních ( použijte Tab klávesu pro doplňování názvů).\n" +"Příkaz /iset (script iset.pl) může pomoci upravit Weechat\" /script install " +"iset.pl\n" +"\n" +"Můžete přidat IRC server a připojit se k němu pomocí príkazů /server a /" +"connect ( podívejte se na /help server)." #. TRANSLATORS: the "under %s" can be "under screen" or "under tmux" #, c-format @@ -215,16 +227,21 @@ msgid "" "%sWarning: WeeChat is running under %s and $TERM is \"%s\", which can cause " "display bugs; $TERM should be set to \"screen-256color\" or \"screen\"" msgstr "" +"%sVarování: WeeChat běží jako %s a $TERM je \"%s\", což může způsobovat " +"chyby zobrazení; $TERM by měl být nastaven na \"screen-256color\" nebo " +"\"screen\"" #, c-format msgid "%sYou should add this line in the file %s: %s" -msgstr "" +msgstr "%sMůžete přidat tuto linku do souboru %s: %s" #, c-format msgid "" "%sWarning: cannot set the locale; make sure $LANG and $LC_* variables are " "correct" msgstr "" +"%sVarování: nemohu nastavit lokalizaci; zkontrolujte že $LANG a $LC_* " +"promněné jsou nastaveny správně" #, c-format msgid "Signal %s received, exiting WeeChat..." @@ -383,7 +400,7 @@ msgid "Debug disabled for \"%s\"" msgstr "Ladění vypnuto pro \"%s\"" msgid "error" -msgstr "" +msgstr "chyba" #, c-format msgid "%sError in expression to evaluate" @@ -513,9 +530,9 @@ msgstr "%sChyba: nemohu odpojit klávesu \"%s\"" msgid "%sKey \"%s\" not found" msgstr "%sKlávesa \"%s\" nenalezena" -#, fuzzy, c-format +#, c-format msgid "No key binding defined for context \"%s\"" -msgstr "Žádné klávesové zkratky nejsou definovány" +msgstr "Žádné klávesové zkratky nejsou definovány pro prostředí \"%s\"" #. TRANSLATORS: first "%d" is number of keys #, fuzzy, c-format @@ -558,12 +575,12 @@ msgstr "" "%sChyba: \"-yes\" argument je požadován pro reset kaláves (bezpečnostní " "opatření)" -#, fuzzy, c-format +#, c-format msgid "%d new key added" msgid_plural "%d new keys added (context: \"%s\")" msgstr[0] "přidána %d nová klávesa" -msgstr[1] "přidány %d nové klávesy" -msgstr[2] "přidáno %d nových kláves" +msgstr[1] "přidány %d nové klávesy (kontext: \"%s\")" +msgstr[2] "přidáno %d nových kláves (kontext: \"%s\")" #, fuzzy msgid "Stored layouts:" @@ -614,13 +631,11 @@ msgstr "%s%s: server \"%s\" pro příkaz \"%s\" již existuje" msgid "Layout \"%s\" has been renamed to \"%s\"" msgstr "Filtr \"%s\" přejmenován na \"%s\"" -#, fuzzy msgid "Mouse enabled" -msgstr "1 pokud jsou filtry povoleny" +msgstr "Myš povolena" -#, fuzzy msgid "Mouse disabled" -msgstr "Filtrování zpráv zakázáno" +msgstr "Myš vypnuta" msgid "Plugins loaded:" msgstr "Načtené pluginy:" @@ -741,7 +756,7 @@ msgstr "Žádné proxy nejsou definovány" msgid "%sError: wrong type \"%s\" for proxy \"%s\"" msgstr "%sChyba: špatný typ \"%s\" proxy \"%s\"" -#, fuzzy, c-format +#, c-format msgid "Proxy \"%s\" added" msgstr "Proxy \"%s\" vytvořena" @@ -842,9 +857,8 @@ msgstr "Pole bylo smazáno" msgid "%sSecured data \"%s\" not found" msgstr "%s%s: skript \"%s\" nenalezen" -#, fuzzy msgid "default: " -msgstr "výchozí hodnota" +msgstr "výchozí: " msgid "(unknown)" msgstr "(neznámý)" @@ -857,9 +871,8 @@ msgstr "" "%sVolba \"%s\" nenalezena (tip: můžete použít \"*\" na začátku a/nebo konci " "volby pro zobrazení podlistu)" -#, fuzzy msgid "No option found" -msgstr "Nebyl nalezen žádný plugin" +msgstr "Volba nenalezena" #, fuzzy, c-format msgid "%s%d%s option with value changed (matching with \"%s\")" @@ -875,16 +888,16 @@ msgstr[0] "%s%d%s volba nastavení nalezena s \"%s\"" msgstr[1] "%s%d%s volby nastavení nalezeny s \"%s\"" msgstr[2] "%s%d%s voleb nastavení nalezeno s \"%s\"" -#, fuzzy, c-format +#, c-format msgid "%s%d%s option" msgid_plural "%s%d%s options" -msgstr[0] "%s%d%s volba nastavení nalezena" -msgstr[1] "%s%d%s volby nastavení nalezeny" -msgstr[2] "%s%d%s voleb nastavení nalezeno" +msgstr[0] "%s%d%s volba" +msgstr[1] "%s%d%s volby" +msgstr[2] "%s%d%s voleb" -#, fuzzy, c-format +#, c-format msgid "Environment variable \"%s\" is not defined" -msgstr "čtení - proměnná" +msgstr "Proměnná prostředí \"%s\" není definována" #, fuzzy, c-format msgid "%sError: failed to set variable \"%s\": %s" @@ -1020,9 +1033,8 @@ msgstr "" "%sChyba: nemohu spojit okna, není zde další okno se stejnou velikostí poblíž " "aktuálního okna" -#, fuzzy msgid "set or remove away status" -msgstr "přepnout status nepřítomnosti" +msgstr "nastavit nebo smazat \"away\" status" msgid "[-all] [<message>]" msgstr "[-all] [<zpráva>]" @@ -1698,12 +1710,14 @@ msgid "" " 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" @@ -2239,13 +2253,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2494,7 +2507,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "list || -1|+1|b#|up|down|left|right || splith|splitv [<pct>] || resize " "[+/-]<pct> || balance || merge [all] || page_up|page_down || refresh || " @@ -2685,9 +2698,8 @@ msgid "options for bars" msgstr "volby pro pole" #. TRANSLATORS: "key" means "key on the keyboard" -#, fuzzy msgid "key contexts" -msgstr "klávesové kódy" +msgstr "klávesové kontexty" #. TRANSLATORS: "key" means "key on the keyboard" msgid "key codes" @@ -2709,9 +2721,8 @@ msgstr "jména polí" msgid "names of secured data (file sec.conf, section data)" msgstr "" -#, fuzzy msgid "environment variables" -msgstr "čtení - proměnná" +msgstr "proměnná prostředí" #, fuzzy msgid "value of an environment variable" @@ -2721,6 +2732,8 @@ msgid "" "Warning: option weechat.look.save_config_on_exit is disabled, so the option " "weechat.look.save_layout_on_exit is ignored" msgstr "" +"Varování: volba weechat.look.save_config_on_exit je vypnuta, takže volba " +"weechat.look.save_layout_on_exit je ignorována" #, fuzzy msgid "" @@ -2734,11 +2747,13 @@ msgid "" "WARNING: this option can cause serious display bugs, if you have such " "problems, you must turn off this option." msgstr "" +"Varování: tato volba může způsobit vážné potíže se zobrazením. Pokud máte " +"tento typ problémů musíte vypnout tuto volbu." #, c-format msgid "" "%sWarning: proxy \"%s\" does not exist (you can add it with command /proxy)" -msgstr "" +msgstr "%sVarování: proxy \"%s\" neexistuje (můžete ji přidat příkazem /proxy)" msgid "debug level for plugin (\"core\" for WeeChat core)" msgstr "úroveň ladění pro plugin (\"core\" pro jádro WeeChat)" @@ -3185,13 +3200,20 @@ msgid "" "allow only binding of \"safe\" keys (beginning with a ctrl or meta code)" msgstr "" -msgid "enable mouse support" +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 "zapni podporu myši" + msgid "" "delay (in milliseconds) to grab a mouse event: WeeChat will wait this delay " "before processing event" msgstr "" +"zpoždění (v milisekundách) k převzetí události od myši: Weechat počká tuto " +"dobu před zpracovánim události" #, fuzzy msgid "text to display before nick in prefix of message, example: \"<\"" @@ -3389,10 +3411,10 @@ msgid "" msgstr "" msgid "display an horizontal separator between windows" -msgstr "" +msgstr "zobraz vodorovný oddělovač mezi okny" msgid "display a vertical separator between windows" -msgstr "" +msgstr "zobraz svislý oddělovač mezi okny" #, fuzzy msgid "" @@ -3872,9 +3894,8 @@ msgid "Memory usage not available (function \"mallinfo\" not found)" msgstr "Využití pamětí není dostupné (funkce \"mallinfo\" nenalezena)" msgid "Directories:" -msgstr "" +msgstr "Složky:" -#, fuzzy msgid "default" msgstr "výchozí hodnota" @@ -3999,9 +4020,11 @@ msgid "" "cipher used to crypt data (the number after algorithm is the size of the key " "in bits)" msgstr "" +"šifra použitá k šifrování dat (číslo za algoritmem je velikost klíče v " +"bitech)" msgid "hash algorithm used to check the decrypted data" -msgstr "" +msgstr "hash algoritmus použitý ke kontrole dešifrovaných dat" msgid "" "path to a file containing the passphrase to encrypt/decrypt secured data; " @@ -4056,14 +4079,13 @@ msgstr "GB" #. TRANSLATORS: file size unit "terabyte" msgid "TB" -msgstr "" +msgstr "TB" -#, fuzzy msgid "byte" msgid_plural "bytes" msgstr[0] "bajt" -msgstr[1] "bajt" -msgstr[2] "bajt" +msgstr[1] "bajty" +msgstr[2] "bajtů" #, c-format msgid "debug: removing file: %s" @@ -4222,13 +4244,11 @@ msgstr "Barvy Weechat (použité: %d, zbývá: %d):" msgid "Terminal lost, exiting WeeChat..." msgstr "Terminál ztracen, ukončuji WeeChat..." -#, fuzzy msgid "Mouse is enabled" -msgstr "1 pokud jsou filtry povoleny" +msgstr "Myš je zapnuta" -#, fuzzy msgid "Mouse is disabled" -msgstr "Filtrování zpráv zakázáno" +msgstr "Myš je vypnuta" #, c-format msgid " TERM='%s', size: %dx%d" @@ -4315,7 +4335,7 @@ msgstr[1] "%sVložit %d řádků ? [ctrl-Y] Ano [ctrl-N] Ne" msgstr[2] "%sVložit %d řádků ? [ctrl-Y] Ano [ctrl-N] Ne" msgid "Search" -msgstr "" +msgstr "Hledej" #, c-format msgid "%s-MORE(%d)-" @@ -4572,7 +4592,7 @@ msgid "Default dictionary: %s" msgstr "Výchozí barvy:" msgid "(not set)" -msgstr "" +msgstr "(nenastaveno)" msgid "Specific dictionaries on buffers:" msgstr "" @@ -4775,7 +4795,7 @@ msgstr "" " reset: resetovat znakové sady aktuálního bufferu" msgid "Execution of external commands in WeeChat" -msgstr "" +msgstr "Spouštění externích příkazů v WeeChatu" #, c-format msgid "%s: end of command %d (\"%s\"), return code: %d" @@ -4785,31 +4805,29 @@ msgstr "" msgid "%s: unexpected end of command %d (\"%s\")" msgstr "" -#, fuzzy msgid "Executed commands" -msgstr "příkazy weechat" +msgstr "Vykonané příkazy" msgid "No command is running" msgstr "" -#, fuzzy msgid "Commands:" -msgstr "příkazy weechat" +msgstr "Příkazy:" #. TRANSLATORS: format: hours + minutes, for example: 3h59 #, c-format msgid "%dh%02d" -msgstr "" +msgstr "%dh%02d" #. TRANSLATORS: format: minutes + seconds, for example: 3m59 #, c-format msgid "%dm%02d" -msgstr "" +msgstr "%dm%02d" #. TRANSLATORS: format: seconds, for example: 59s #, c-format msgid "%ds" -msgstr "" +msgstr "%ds" #. TRANSLATORS: %s before "ago" is elapsed time, for example: "3m59" #, fuzzy, c-format @@ -5016,7 +5034,7 @@ msgid "%s: registered script \"%s\", version %s (%s)" msgstr "%s: zaregistrován skript \"%s\", verze %s (%s)" msgid "Support of scheme scripts (with Guile)" -msgstr "" +msgstr "Podpora scriptů v Sheme (pomocí Guile)" #, c-format msgid "%s: stdout/stderr: %s%s" @@ -5064,7 +5082,7 @@ msgid "Lag" msgstr "Lag" msgid "IRC (Internet Relay Chat) protocol" -msgstr "" +msgstr "IRC (Internet Relay Chat) protokol" #, c-format msgid "" @@ -6670,9 +6688,8 @@ msgstr "kanály na všech IRC serverech" msgid "privates on all IRC servers" msgstr "soukromé rozhovory na všech IRC serverech" -#, fuzzy msgid "default kick message" -msgstr "výchozí příkaz:" +msgstr "výchozí \"kick\" zpráva" msgid "default part message for IRC channel" msgstr "výchozí odchozí zpráva pro IRC kanál" @@ -7319,9 +7336,8 @@ msgid "" msgstr "" #. TRANSLATORS: please do not translate "nick" -#, fuzzy msgid "enable smart filter for \"nick\" messages (nick changes)" -msgstr "povolit chytrý filter pro \"nick\" zprávy" +msgstr "povolit chytrý filtr pro \"nick\" zprávy (změny přezdívek)" #. TRANSLATORS: please do not translate "part" and "quit" msgid "enable smart filter for \"part\" and \"quit\" messages" @@ -7397,6 +7413,11 @@ msgstr "barva textu \"Notice\" v upozorněních" msgid "color for reason in part/quit messages" msgstr "barva textu důvodu ve zprávách odchodu/ukončení" +#, fuzzy +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "barva pro nové téma rozhovoru kanálu (když se téma změní)" + msgid "color for new channel topic (when topic is changed)" msgstr "barva pro nové téma rozhovoru kanálu (když se téma změní)" @@ -7645,13 +7666,11 @@ msgstr "ukazatel notifikace (volitelné)" msgid "mapping between IRC color codes and WeeChat color names" msgstr "" -#, fuzzy msgid "irc nick" -msgstr "přezdívka: přezdívka" +msgstr "irc přezdívka" -#, fuzzy msgid "irc channel" -msgstr "kanál" +msgstr "irc kanál" msgid "irc channel_speaking" msgstr "" @@ -7659,9 +7678,8 @@ msgstr "" msgid "irc ignore" msgstr "" -#, fuzzy msgid "irc notify" -msgstr "seznam notifikací" +msgstr "irc notifikace" msgid "pattern for irc redirect" msgstr "" @@ -7669,9 +7687,8 @@ msgstr "" msgid "irc redirect" msgstr "" -#, fuzzy msgid "irc server" -msgstr "server" +msgstr "irc server" #, c-format msgid "%s%s: you are not connected to server" @@ -7682,9 +7699,8 @@ msgid "%s%s: this buffer is not a channel!" msgstr "%s%s: tenhle buffer není kanál!" #. TRANSLATORS: "unknown" is the status for /notify when ison answer has not been received (check pending) -#, fuzzy msgid "unknown" -msgstr "(neznámý)" +msgstr "neznámý" msgid "offline" msgstr "offline" @@ -7911,24 +7927,24 @@ msgstr "%sKanál %s%s%s vytvořen v %s" msgid "%sNo topic set for channel %s%s" msgstr "%sNení nastaveno téma pro kanál %s%s" -#, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "%sTéma pro %s%s%s v \"%s%s\"" #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%sTopic set by %s%s%s%s%s%s%s%s%s on %s" -msgstr "%sTéma nastevil %s%s%s%s%s%s%s%s%s v %s" +msgstr "%sTéma nastavil %s%s%s%s%s%s%s%s%s v %s" #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%sTopic set on %s" -msgstr "%sTéma nasteveno %s" +msgstr "%sTéma nastaveno %s" #. TRANSLATORS: "%s" after "on" is a date #, c-format msgid "%sTopic for %s%s%s set by %s%s%s%s%s%s%s%s%s on %s" -msgstr "%sTéma pro %s%s%s nastevil %s%s%s%s%s%s%s%s%s v %s" +msgstr "%sTéma pro %s%s%s nastavil %s%s%s%s%s%s%s%s%s v %s" #. TRANSLATORS: "%s" after "on" is a date #, c-format @@ -8992,7 +9008,7 @@ msgid "nick in nicklist" msgstr "přezdívky v seznamu notifikací" msgid "proxy" -msgstr "" +msgstr "proxy" #, fuzzy msgid "window" @@ -9270,9 +9286,9 @@ msgstr "" msgid "client" msgid_plural "clients" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" +msgstr[0] "klient" +msgstr[1] "klienti" +msgstr[2] "klientu" msgid "connecting" msgstr "připojuji" @@ -9841,23 +9857,23 @@ msgid "Script" msgstr "" msgid "Version" -msgstr "" +msgstr "Verze" #, fuzzy msgid "Version loaded" msgstr "Načtené pluginy:" msgid "Author" -msgstr "" +msgstr "Autor" msgid "License" -msgstr "" +msgstr "Licence" msgid "Tags" msgstr "" msgid "Status" -msgstr "" +msgstr "Stav" msgid "Date added" msgstr "" @@ -9867,13 +9883,13 @@ msgid "Date updated" msgstr "Pole \"%s\" zaktualizováno" msgid "URL" -msgstr "" +msgstr "URL" msgid "MD5" -msgstr "" +msgstr "MDř" msgid "Requires" -msgstr "" +msgstr "Vyžaduje" #, fuzzy msgid "Min WeeChat" @@ -10194,7 +10210,7 @@ msgstr "seznam skriptů" #. TRANSLATORS: translation must be one short word without spaces (replace spaces by underscores if needed) msgid "popular" -msgstr "" +msgstr "populární" #. TRANSLATORS: translation must be one short word without spaces (replace spaces by underscores if needed) msgid "installed" @@ -10210,7 +10226,7 @@ msgstr "" #. TRANSLATORS: translation must be one short word without spaces (replace spaces by underscores if needed) msgid "running" -msgstr "" +msgstr "běžící" #. TRANSLATORS: translation must be one short word without spaces (replace spaces by underscores if needed) msgid "obsolete" @@ -10238,9 +10254,8 @@ msgstr "%s%s: chyba při zasílání dat na klienta: %s" msgid "%s: downloading list of scripts..." msgstr "%s: odebírám skript \"%s\"" -#, fuzzy msgid "Support of tcl scripts" -msgstr "seznam skriptů" +msgstr "Podpora skriptů v TCL" #, c-format msgid "%s%s: unable to run function \"%s\": %s" @@ -10270,13 +10285,11 @@ msgstr "%s%s: chyba při zpracování regulárního výrazu \"%s\"" msgid "Trigger monitor (filter: %s) | Input: q=close, words=filter" msgstr "" -#, fuzzy msgid "no variable" -msgstr "čtení - proměnná" +msgstr "není proměnná" -#, fuzzy msgid "empty variable" -msgstr "čtení - proměnná" +msgstr "prázdná proměnná" #, fuzzy, c-format msgid "%s running command %s\"%s%s%s\"%s on buffer %s%s%s" @@ -10336,9 +10349,8 @@ msgstr "Filtr \"%s\" přejmenován na \"%s\"" msgid "%s%s: failed to rename trigger \"%s\"" msgstr "%sChyba: selhalo vytvoření pole \"%s\"" -#, fuzzy msgid "List of triggers:" -msgstr "Seznam proxy:" +msgstr "Seznam trigerů:" #, fuzzy, c-format msgid "%s%s: invalid hook type \"%s\"" @@ -10695,13 +10707,13 @@ msgid "CRC in progress" msgstr "" msgid "CRC OK" -msgstr "" +msgstr "CRC OK" msgid "wrong CRC" -msgstr "" +msgstr "španté CRC" msgid "CRC error" -msgstr "" +msgstr "CRC chyba" #, fuzzy, c-format msgid "%s%s: file %s %s %s (%s): %s" @@ -11053,9 +11065,9 @@ msgstr "%s%s: nemohu zapisovat do lokálního souboru" msgid "%s%s: unable to send ACK to sender" msgstr "%s%s: nemohu se připojit k odesílateli" -#, fuzzy, c-format +#, c-format msgid "%s%s: wrong CRC32 for file %s" -msgstr "%s%s: špatné parametry pro funkci \"%s\" (skript: %s)" +msgstr "%s%s: špatný kontrolní součet CRC32 souboru %s" #, fuzzy, c-format msgid "%s%s: CRC32 error while resuming" @@ -11077,33 +11089,14 @@ msgstr "" msgid "%s%s: unable to create socket for sending file: error %d %s" msgstr "%s%s: nemohu vytvořit soket pro odesílání souboru" -#, fuzzy, c-format +#, c-format msgid "%s%s: unable to set option \"nonblock\" for socket: error %d %s" -msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket" +msgstr "%s%s: nemohu nastavit \"nonblock\" volbu pro soket: chyba %d %s" #, c-format msgid "%s%s: timeout for \"%s\" with %s" msgstr "%s%s: vypršel časový limit \"%s\" pro %s" -#, fuzzy, c-format +#, c-format msgid "%s%s: unable to connect: unexpected error (%d)" -msgstr "%s%s: nemohu se připojit k odesílateli" - -#~ msgid "List of aliases:" -#~ msgstr "Seznam aliasů:" - -#~ msgid "create an alias for a command" -#~ msgstr "vytvoří alias pro příkaz" - -#, fuzzy -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[-completion <doplňování>] <jméno_aliasu> [<příkaz> [<argumenty>]]" - -#~ msgid "remove aliases" -#~ msgstr "odebere aliasy" - -#~ msgid "<alias> [<alias>...]" -#~ msgstr "<jméno_aliasu> [<jméno_aliasu>...]" - -#~ msgid "alias: name of alias to remove" -#~ msgstr "jméno_aliasu: jméno aliasu pro odebrání" +msgstr "%s%s: nemohu se připojit\" neočekávaná chyba (%d)" @@ -24,8 +24,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-14 14:19+0100\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-08-08 10:26+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <>\n" "Language: de_DE\n" @@ -1372,7 +1372,7 @@ msgstr "" "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 @@ msgid "" " 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,14 +1970,16 @@ msgstr "" " 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: suche stoppen\n" +" search_stop_here: beendet Suche ab aktueller Position\n" +" search_stop: suche beenden\n" " delete_previous_char: entfernt vorheriges Zeichen\n" " delete_next_char: entfernt nächstes Zeichen\n" " delete_previous_word: entfernt vorheriges Wort\n" @@ -2395,7 +2399,7 @@ msgid "" 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" @@ -2607,13 +2611,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2650,13 +2653,12 @@ msgstr "" "\n" "schutzwürdige Daten mit dem Format ${sec.data.xxx} können wie folgt genutzt " "werden:\n" +" - Befehl /eval.\n" " - Argument in der Befehlszeile für \"--run-command\"\n" " - Einstellung weechat.startup.command_{before|after}_plugins\n" -" - Proxy-Optionen: username, password\n" -" - IRC Server Optionen: autojoin, command, password, sasl_{username|" -"password}, Username, Realname\n" -" - Einstellung relay.network.password\n" -" - Befehl /eval.\n" +" - weitere Optionen die Passwörter oder sensible Daten beinhalten (zum " +"Beispiel: proxy, irc server und relay); nutze /help mit der entsprechenden " +"Option um zu überprüfen ob die Daten evaluiert werden.\n" "\n" "Beispiele:\n" " festlegen eine Passphrase:\n" @@ -2668,7 +2670,7 @@ msgstr "" " /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 +2894,8 @@ msgstr "" "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 +2959,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" "splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " @@ -2966,7 +2968,7 @@ msgstr "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgid "" " list: list opened windows (without argument, this list is " @@ -3231,7 +3233,7 @@ msgid "debug level for plugin (\"core\" for WeeChat core)" 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 +3792,14 @@ msgstr "" "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 +5004,7 @@ msgid "Nick colors:" 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):" @@ -5197,13 +5207,12 @@ msgstr "%s%s: Fehler beim Erstellen von Alias \"%s\" => \"%s\"" msgid "Alias \"%s\" => \"%s\" created" msgstr "Alias \"%s\" => \"%s\" angelegt" -#, fuzzy, c-format +#, c-format msgid "Aliases with \"%s\":" -msgstr "Server mit \"%s\":" +msgstr "Alternativnamen mit \"%s\":" -#, fuzzy msgid "All aliases:" -msgstr "Farbalias:" +msgstr "Alle Alternativnamen:" #, c-format msgid "No alias found matching \"%s\"" @@ -5220,16 +5229,17 @@ msgstr "%sAlias \"%s\" nicht gefunden" msgid "Alias \"%s\" removed" msgstr "Alias \"%s\" entfernt" -#, fuzzy msgid "list, add or remove command aliases" -msgstr "auflisten, hinzufügen oder entfernen von IRC-Servern" +msgstr "auflisten, hinzufügen oder entfernen von Alternativnamen" msgid "" "list [<alias>] || add <alias> [<command>[;<command>...]] || addcompletion " "<completion> <alias> [<command>[;<command>...]] || del <alias> [<alias>...]" msgstr "" +"list [<alias>] || add <alias> [<command>[;<command>...]] || addcompletion " +"<completion> <alias> [<command>[;<command>...]] || del <alias> [<alias>...]" -#, fuzzy, c-format +#, c-format msgid "" " list: list aliases (without argument, this list is displayed)\n" " add: add an alias\n" @@ -5263,15 +5273,19 @@ msgid "" "sajoin:\n" " /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" @@ -5285,17 +5299,16 @@ msgstr "" "(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" -" /alias split /window splith\n" -" Alias \"/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" -" /alias -completion %%sajoin forcejoin /quote forcejoin" +" Alternativbefehl \"/split\" wird anlegt um ein Fenster horizontal zu " +"teilen:\n" +" /alias add split /window splith\n" +" Alternativbefehl \"/hallo\" wird angelegt um in allen Channels, außer im " +"#weechat Channel, den Text \"Hallo\" auszugeben:\n" +" /alias add hallo /allchan -exclude=#weechat msg * hallo\n" +" Alternativbefehl \"/forcejoin\" wird angelegt um den IRC Befehl \"forcejoin" +"\" mit einer Vervollständigung von /sajoin auszuführen:\n" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgid "list of aliases" msgstr "Liste der Alias" @@ -5306,8 +5319,8 @@ msgstr "Wert von Alias" #, 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)" @@ -6569,8 +6582,8 @@ msgstr "" "\"autojoin\" aktiviert sein sollte)\n" " -switch: wechselt zur nächsten Server-Adresse\n" "\n" -"Um eine Verbindung zum Server zu beenden bzw. um Verbindungsversuche zu " -"stoppen, wird der Befehl /disconnect verwendet.\n" +"Um eine Verbindung zum Server, oder Verbindungsversuche, zu beenden wird der " +"Befehl /disconnect verwendet.\n" "\n" "Beispiele:\n" " /connect freenode\n" @@ -8581,6 +8594,12 @@ msgstr "" "Textfarbe in der die Begründung einer part/quit Nachricht angezeigt werden " "soll" +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "" +"Farbe in dem das aktuelle Thema des Channels dargestellt werden soll (wenn " +"ein Channel betreten oder der Befehl /topic genutzt wird)" + msgid "color for new channel topic (when topic is changed)" msgstr "" "Farbe in dem das neue Thema des Channels dargestellt werden soll, falls das " @@ -9124,8 +9143,8 @@ msgid "%sNo topic set for channel %s%s" msgstr "%sKein Thema für %s%s gesetzt" #, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" -msgstr "%sDas Thema von %s%s%s lautet: \"%s%s\"" +msgid "%sTopic for %s%s%s is \"%s%s%s\"" +msgstr "%sDas Thema von %s%s%s lautet: \"%s%s%s\"" #. TRANSLATORS: "%s" after "on" is a date #, c-format @@ -12606,21 +12625,3 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "" "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)" - -#~ msgid "List of aliases:" -#~ msgstr "Liste der Alias:" - -#~ msgid "create an alias for a command" -#~ msgstr "Einem Befehl wird ein Alias zugewiesen" - -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[-completion <completion>] <alias> [<command> [;<command>...]]" - -#~ msgid "remove aliases" -#~ msgstr "entferne Alias" - -#~ msgid "<alias> [<alias>...]" -#~ msgstr "<alias> [<alias>...]" - -#~ msgid "alias: name of alias to remove" -#~ msgstr "alias: Name des zu löschenden Alias" @@ -22,8 +22,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-07-26 09:41+0200\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: es\n" @@ -1738,12 +1738,14 @@ msgid "" " 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" @@ -2353,13 +2355,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2620,7 +2621,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "list || -1|+1|b#|up|down|left|right [-window <número>] || <número> || splith|" "splitv [-window <número>] [<pct>] || resize [-window <número>] [+/-]<pct> || " @@ -3362,6 +3363,11 @@ msgid "" "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" @@ -7693,6 +7699,11 @@ msgstr "color para el texto \"Aviso\" en los mensajes de aviso" msgid "color for reason in part/quit messages" msgstr "color para el mensaje de salida/abandono" +#, fuzzy +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "color para el nuevo tema del canal (cuando se cambia el tema)" + msgid "color for new channel topic (when topic is changed)" msgstr "color para el nuevo tema del canal (cuando se cambia el tema)" @@ -8209,8 +8220,8 @@ msgstr "%sCanal %s%s%s creado en %s" msgid "%sNo topic set for channel %s%s" msgstr "%sNo hay tema establecido para el canal %s%s" -#, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "%sEl tema para %s%s%s es \"%s%s\"" #. TRANSLATORS: "%s" after "on" is a date @@ -11382,21 +11393,3 @@ msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: no es posible conectarse al transmisor" - -#~ msgid "List of aliases:" -#~ msgstr "Lista de alias:" - -#~ msgid "create an alias for a command" -#~ msgstr "crear un alias para un comando" - -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[-completion <completador>] <alias> [<comando> [;<comando>...]]" - -#~ msgid "remove aliases" -#~ msgstr "eliminar alias" - -#~ msgid "<alias> [<alias>...]" -#~ msgstr "<alias> [<alias>...]" - -#~ msgid "alias: name of alias to remove" -#~ msgstr "alias: nombre del alias a suprimir" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-19 10:18+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-08-07 07:39+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -1879,12 +1879,14 @@ msgid "" " 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 @@ msgstr "" " 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 @@ msgstr "" " 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" @@ -2548,13 +2553,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2589,13 +2593,12 @@ msgstr "" "\n" "Les données sécurisées avec le format ${sec.data.xxx} peuvent être utilisées " "dans :\n" +" - la commande /eval\n" " - le paramètre de ligne de commande \"--run-command\"\n" " - les options weechat.startup.command_{before|after}_plugins\n" -" - les options de proxy : username, password\n" -" - les options de serveur irc : autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - l'option relay.network.password\n" -" - la commande /eval.\n" +" - d'autres options qui peuvent contenir un mot de passe ou des données " +"sensibles (par exemple proxy, serveur irc et relay) ; voir /help sur les " +"options pour vérifier si elles sont évaluées.\n" "\n" "Exemples :\n" " définir une phrase de chiffrement :\n" @@ -2883,7 +2886,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "list || -1|+1|b#|up|down|left|right [-window <numéro>] || <numéro> || splith|" "splitv [-window <numéro>] [<pct>] || resize [-window <numéro>] [+/-]<pct> || " @@ -3686,6 +3689,14 @@ msgstr "" "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" @@ -8372,6 +8383,11 @@ msgstr "couleur pour le texte \"Notice\" dans les notices" msgid "color for reason in part/quit messages" msgstr "couleur pour la raison dans les messages part/quit" +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "" +"couleur pour le titre du canal actuel (en rejoignant un canal ou sur /topic)" + msgid "color for new channel topic (when topic is changed)" msgstr "couleur pour le nouveau titre du canal (lorsque le titre est changé)" @@ -8900,8 +8916,8 @@ msgid "%sNo topic set for channel %s%s" msgstr "%sPas de titre défini pour le canal %s%s" #, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" -msgstr "%sLe titre pour %s%s%s est \"%s%s\"" +msgid "%sTopic for %s%s%s is \"%s%s%s\"" +msgstr "%sLe titre pour %s%s%s est \"%s%s%s\"" #. TRANSLATORS: "%s" after "on" is a date #, c-format @@ -12345,21 +12361,3 @@ msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s : impossible de se connecter : erreur inattendue (%d)" - -#~ msgid "List of aliases:" -#~ msgstr "Liste des alias :" - -#~ msgid "create an alias for a command" -#~ msgstr "créer un alias pour une commande" - -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[-completion <complétion>] alias [<commande> [;<commande>...]]" - -#~ msgid "remove aliases" -#~ msgstr "supprimer des alias" - -#~ msgid "<alias> [<alias>...]" -#~ msgstr "<alias> [<alias>...]" - -#~ msgid "alias: name of alias to remove" -#~ msgstr "alias : nom de l'alias à supprimer" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: hu\n" @@ -1567,12 +1567,14 @@ msgid "" " 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" @@ -1984,13 +1986,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2178,7 +2179,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv " "[pct] | resize pct | merge [all]]" @@ -2793,6 +2794,11 @@ msgid "" "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 "" @@ -6822,6 +6828,10 @@ msgstr "új üzenetet tartalmazó ablak színe" msgid "color for reason in part/quit messages" msgstr "alapértelmezett kilépő üzenet" +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "" + msgid "color for new channel topic (when topic is changed)" msgstr "" @@ -7339,7 +7349,7 @@ msgid "%sNo topic set for channel %s%s" msgstr "Nincs téma beállítva a %s%s szobában\n" #, fuzzy, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "A %s%s%s szoba témája: " #. TRANSLATORS: "%s" after "on" is a date @@ -10439,26 +10449,3 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: nem sikerült kapcsolódni a küldőhöz\n" - -#, fuzzy -#~ msgid "List of aliases:" -#~ msgstr "Aliaszok listája:\n" - -#~ msgid "create an alias for a command" -#~ msgstr "alias készítése egy parancshoz" - -#, fuzzy -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[alias_név [parancs [paraméterek]]]" - -#, fuzzy -#~ msgid "remove aliases" -#~ msgstr "alias eltávolítása" - -#, fuzzy -#~ msgid "<alias> [<alias>...]" -#~ msgstr "név [név...]" - -#, fuzzy -#~ msgid "alias: name of alias to remove" -#~ msgstr "alias_név: az eltávolítandó alias neve" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: it\n" @@ -1780,12 +1780,14 @@ msgid "" " 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" @@ -2399,13 +2401,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2707,7 +2708,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "list || -1|+1|b#|up|down|left|right [-window <numero>] || <numero> || splith|" "splitv [-window <numero>] [<pct>] || resize [-window <numero>] [+/-]<pct> || " @@ -3458,6 +3459,11 @@ msgstr "" "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" @@ -7859,6 +7865,11 @@ msgstr "colore per il testo \"Notifica\" nelle notifiche" msgid "color for reason in part/quit messages" msgstr "colore per il motivo nei messaggi di uscita/abbandono" +#, fuzzy +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "colore del nuovo argomento del canale (quando viene cambiato)" + msgid "color for new channel topic (when topic is changed)" msgstr "colore del nuovo argomento del canale (quando viene cambiato)" @@ -8376,8 +8387,8 @@ msgstr "%sCanale %s%s%s creato il %s" msgid "%sNo topic set for channel %s%s" msgstr "%sNessun argomento impostato per il canale %s%s" -#, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "%sL'argomento per %s%s%s è \"%s%s\"" #. TRANSLATORS: "%s" after "on" is a date @@ -11565,21 +11576,3 @@ msgstr "%s%s: timeout per \"%s\" con %s" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: impossibile connettersi al mittente" - -#~ msgid "List of aliases:" -#~ msgstr "Elenco degli alias:" - -#~ msgid "create an alias for a command" -#~ msgstr "crea un alias per un comando" - -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[-completion <completamento>] <alias> [<comando> [;<comando>...]]" - -#~ msgid "remove aliases" -#~ msgstr "elimina alias" - -#~ msgid "<alias> [<alias>...]" -#~ msgstr "<alias> [<alias>...]" - -#~ msgid "alias: name of alias to remove" -#~ msgstr "alias: nome di un alias da eliminare" @@ -20,8 +20,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-13 22:27+0900\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" "Language: ja\n" @@ -780,12 +780,12 @@ msgid "%sError: unable to set option \"%s\" for proxy \"%s\"" 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 @@ msgstr "コマンドライン関数" msgid "<action> [<arguments>]" msgstr "<action> [<arguments>]" +#, 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" @@ -2460,6 +2463,7 @@ msgstr "" "passphrase <passphrase>|-delete || decrypt <passphrase>|-discard || set " "<name> <value> || del <name>" +#, fuzzy msgid "" "passphrase: change the passphrase (without passphrase, data is stored as " "plain text in file sec.conf)\n" @@ -2478,13 +2482,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2644,11 +2647,9 @@ msgstr "" msgid "upgrade WeeChat without disconnecting from servers" msgstr "サーバとの接続を維持して WeeChat をアップグレード" -#, fuzzy msgid "[-yes] [<path_to_binary>|-quit]" -msgstr "[<path_to_binary>|-quit]" +msgstr "[-yes] [<path_to_binary>|-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 @@ msgid "" "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 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" "splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " @@ -2812,7 +2815,7 @@ msgstr "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgid "" " list: list opened windows (without argument, this list is " @@ -3310,23 +3313,22 @@ msgid "" "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 @@ msgid "" 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,7 +4854,7 @@ msgid "Debug disabled for mouse" msgstr "マウスのデバッグを無効化" msgid "Alias commands" -msgstr "エイリアスコマンド" +msgstr "別名コマンド" #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" @@ -4861,13 +4868,12 @@ msgstr "%s%s: 別名 \"%s\" => \"%s\" 作成中にエラー" msgid "Alias \"%s\" => \"%s\" created" msgstr "別名 \"%s\" => \"%s\" を作成しました" -#, fuzzy, c-format +#, c-format msgid "Aliases with \"%s\":" -msgstr "\"%s\" にマッチするサーバ:" +msgstr "\"%s\" を含む別名:" -#, fuzzy msgid "All aliases:" -msgstr "色別名:" +msgstr "すべての別名:" #, c-format msgid "No alias found matching \"%s\"" @@ -4884,16 +4890,17 @@ msgstr "%s別名 \"%s\" が見つかりません" msgid "Alias \"%s\" removed" msgstr "別名 \"%s\" が削除されました" -#, fuzzy msgid "list, add or remove command aliases" -msgstr "IRC サーバのリストアップ、追加、削除" +msgstr "別名コマンドのリストアップ、追加、削除" msgid "" "list [<alias>] || add <alias> [<command>[;<command>...]] || addcompletion " "<completion> <alias> [<command>[;<command>...]] || del <alias> [<alias>...]" msgstr "" +"list [<alias>] || add <alias> [<command>[;<command>...]] || addcompletion " +"<completion> <alias> [<command>[;<command>...]] || del <alias> [<alias>...]" -#, fuzzy, c-format +#, c-format msgid "" " list: list aliases (without argument, this list is displayed)\n" " add: add an alias\n" @@ -4927,16 +4934,19 @@ msgid "" "sajoin:\n" " /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgstr "" -"completion: 別名の補完 (任意、デフォルトではターゲットコマンドを伴って補完さ" +" list: 別名をリストアップ (引数を与えなかった場合、このリストが表示さ" "れます)\n" -" 注意: %%command で存在するコマンドの補完を利用可能です\n" -" alias: 別名の名前 (ワイルドカード \"*\" を使うことができます)\n" -" command: 引数を含めたコマンド名 (セミコロンで分割すれば複数のコマンドを指" -"定できます)\n" -"\n" -"引数無しでは、定義済み別名をリストアップ。\n" -"\n" -"注意: command の中では、特殊変数の置換が行われる:\n" +" add: 別名を追加\n" +"addcompletion: カスタム補完を指定して別名を追加\n" +" del: 別名を削除\n" +" completion: 別名の補完: デフォルトでは対象のコマンドに対する補完が行われま" +"す\n" +" 注意: %%command で既存のコマンドに対する補完を利用可能です\n" +" alias: 別名の名前\n" +" command: 引数を含めたコマンド名 (セミコロンで分割すれば複数のコマンドを" +"指定できます)\n" +"\n" +"注意: command の中に含まれる特殊変数は置換されます:\n" " $n: 'n' 番目の引数 (1 から 9)\n" " $-m: 1 から 'm' 番目の引数\n" " $n-: 'n' 番目から最後の引数\n" @@ -4946,17 +4956,15 @@ msgstr "" " $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" +" /alias addcompletion %%sajoin forcejoin /quote forcejoin" msgid "list of aliases" msgstr "別名のリスト" @@ -8023,6 +8031,11 @@ msgstr "notices に含まれるテキスト \"Notice\" の色" msgid "color for reason in part/quit messages" msgstr "退出/終了メッセージに含まれる理由の色" +#, fuzzy +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "新しいチャンネルトピックの色 (トピックが変更されたとき)" + msgid "color for new channel topic (when topic is changed)" msgstr "新しいチャンネルトピックの色 (トピックが変更されたとき)" @@ -8539,8 +8552,8 @@ msgstr "%sチャンネル %s%s%s の作成日時 %s" msgid "%sNo topic set for channel %s%s" msgstr "%sチャンネル %s%s にはトピックが設定されていません" -#, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "%s%s%s%s のトピックは \"%s%s\" です" #. TRANSLATORS: "%s" after "on" is a date @@ -11866,21 +11879,3 @@ msgstr "%s%s: \"%s\" のタイムアウト %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: 接続できません: 未定義のエラー (%d)" - -#~ msgid "List of aliases:" -#~ msgstr "別名のリスト:" - -#~ msgid "create an alias for a command" -#~ msgstr "コマンドの別名を作成" - -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[-completion <completion>] <alias> [<command> [;<command>...]]" - -#~ msgid "remove aliases" -#~ msgstr "別名の削除" - -#~ msgid "<alias> [<alias>...]" -#~ msgstr "<alias> [<alias>...]" - -#~ msgid "alias: name of alias to remove" -#~ msgstr "alias: 削除する別名の名前" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: pl\n" @@ -1857,17 +1857,20 @@ msgstr "funkcje linii komend" msgid "<action> [<arguments>]" msgstr "<akcja> [<argumenty>]" +#, 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" @@ -2507,6 +2510,7 @@ msgstr "" "passphrase <hasło>|-delete || decrypt <hasło>|-discard || set <nazwa> " "<wartość> || del <nazwa>" +#, fuzzy msgid "" "passphrase: change the passphrase (without passphrase, data is stored as " "plain text in file sec.conf)\n" @@ -2525,13 +2529,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2845,6 +2848,7 @@ msgstr "" msgid "manage windows" msgstr "zarządza oknami" +#, fuzzy msgid "" "list || -1|+1|b#|up|down|left|right [-window <number>] || <number> || splith|" "splitv [-window <number>] [<pct>] || resize [-window <number>] [+/-]<pct> || " @@ -2853,7 +2857,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "list || -1|+1|b#|up|down|left|right [-window <numer>] || <numer> || splith|" "splitv [-window <numer>] [<pct>] || resize [-window <numer>] [+/-]<pct> || " @@ -3640,6 +3644,11 @@ msgstr "" "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" @@ -8193,6 +8202,11 @@ msgstr "kolor tekstu \"Notice\" w podświetleniach" msgid "color for reason in part/quit messages" msgstr "kolor tekstu powodu opuszczenia kanału/wyjścia z IRC" +#, fuzzy +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "kolor nowego tematu kanału (kiedy temat został zmieniony)" + msgid "color for new channel topic (when topic is changed)" msgstr "kolor nowego tematu kanału (kiedy temat został zmieniony)" @@ -8719,8 +8733,8 @@ msgstr "%sKanał %s%s%s utworzono %s" msgid "%sNo topic set for channel %s%s" msgstr "%sBrak tematu dla kanału %s%s" -#, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "%sTemat kanału %s%s%s to \"%s%s\"" #. TRANSLATORS: "%s" after "on" is a date @@ -12085,21 +12099,3 @@ msgstr "%s%s: przekroczono czas na \"%s\" z %s" #, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: nie można połączyć: niespodziewany błąd (%d)" - -#~ msgid "List of aliases:" -#~ msgstr "Lista aliasów:" - -#~ msgid "create an alias for a command" -#~ msgstr "tworzy alias do komendy" - -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[-completion <dopełnienie>] <alias> [<komenda> [;<komenda>...]]" - -#~ msgid "remove aliases" -#~ msgstr "usuwa aliasy" - -#~ msgid "<alias> [<alias>...]" -#~ msgstr "<alias> [<alias>...]" - -#~ msgid "alias: name of alias to remove" -#~ msgstr "alias: nazwa aliasu do usunięcia" diff --git a/po/pt_BR.po b/po/pt_BR.po index e29e192be..4cb7026c0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Eduardo Elias <camponez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: pt_BR\n" @@ -1791,12 +1791,14 @@ msgid "" " 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" @@ -2377,13 +2379,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2670,7 +2671,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "list || -1|+1|b#|up|down|left|right [-window <número>] || <número> || splith|" "splitv [-window <número>] [<pct>] || resize [-window <número>] [+/-]<pct> || " @@ -3382,6 +3383,11 @@ msgid "" "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" @@ -7232,6 +7238,11 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "" +#, fuzzy +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "cor para o novo tópico do canal (quando o tópico é alterado)" + msgid "color for new channel topic (when topic is changed)" msgstr "cor para o novo tópico do canal (quando o tópico é alterado)" @@ -7741,8 +7752,8 @@ msgstr "%sCanal %s%s%s criado em %s" msgid "%sNo topic set for channel %s%s" msgstr "%sNenhum tópico definido para o canal %s%s" -#, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "%sTópico para o canal %s%s%s é \"%s%s\"" #. TRANSLATORS: "%s" after "on" is a date @@ -10868,21 +10879,3 @@ msgstr "%s%s: tempo esgotado para \"%s\" com %s" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s%s: não foi possível conectar ao remetente" - -#~ msgid "List of aliases:" -#~ msgstr "Lista de atalhos:" - -#~ msgid "create an alias for a command" -#~ msgstr "cria um atalho para um comando" - -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[-completion <completion>] <atalho> [<comando> [;<comando>...]]" - -#~ msgid "remove aliases" -#~ msgstr "remover atalhos" - -#~ msgid "<alias> [<alias>...]" -#~ msgstr "<atalho> [<atalho>...]" - -#~ msgid "alias: name of alias to remove" -#~ msgstr "atalho: nome de um atalho para remover" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" -"PO-Revision-Date: 2015-07-11 21:42+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" +"PO-Revision-Date: 2015-07-26 09:42+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: ru\n" @@ -1589,12 +1589,14 @@ msgid "" " 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" @@ -2007,13 +2009,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -2201,7 +2202,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" "[list | -1 | +1 | b# | up | down | left | right | splith [pct] | splitv " "[pct] | resize pct | merge [all]]" @@ -2825,6 +2826,11 @@ msgid "" "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 "" @@ -6849,6 +6855,10 @@ msgstr "цвет текущего окна с сообщениями" msgid "color for reason in part/quit messages" msgstr "сообщение о выходе по-умолчанию" +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "" + msgid "color for new channel topic (when topic is changed)" msgstr "" @@ -7372,7 +7382,7 @@ msgid "%sNo topic set for channel %s%s" msgstr "Не установлена тема канала для %s%s\n" #, fuzzy, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "Тема канала %s%s%s: " #. TRANSLATORS: "%s" after "on" is a date @@ -10465,26 +10475,3 @@ msgstr "%s нет аргумента для параметра \"%s\"\n" #, fuzzy, c-format msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "%s DCC: не могу соединиться с отправителем\n" - -#, fuzzy -#~ msgid "List of aliases:" -#~ msgstr "Список сокращений:\n" - -#~ msgid "create an alias for a command" -#~ msgstr "создать ярлык на команду" - -#, fuzzy -#~ msgid "[-completion <completion>] <alias> [<command> [;<command>...]]" -#~ msgstr "[сокращение [команда [аргументы]]]" - -#, fuzzy -#~ msgid "remove aliases" -#~ msgstr "удалить ярлык" - -#, fuzzy -#~ msgid "<alias> [<alias>...]" -#~ msgstr "ник [ник ...]" - -#, fuzzy -#~ msgid "alias: name of alias to remove" -#~ msgstr "сокращение: удаляемое сокращение" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" "PO-Revision-Date: 2015-03-10 21:33+0100\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1418,12 +1418,14 @@ msgid "" " 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" @@ -1803,13 +1805,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -1987,7 +1988,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" msgid "" @@ -2536,6 +2537,11 @@ msgid "" "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" @@ -6128,6 +6134,10 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "ayrılma/çıkış iletisindeki sebep için renk" +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "" + msgid "color for new channel topic (when topic is changed)" msgstr "" @@ -6606,8 +6616,8 @@ msgstr "" msgid "%sNo topic set for channel %s%s" msgstr "%s %s%s kanalı için ayarlı konu yok" -#, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +#, fuzzy, c-format +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "%s %s%s%s kanalının konusu \"%s%s\"" #. TRANSLATORS: "%s" after "on" is a date diff --git a/po/weechat.pot b/po/weechat.pot index b818c6b8f..784954618 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-07-19 10:17+0200\n" +"POT-Creation-Date: 2015-08-07 07:38+0200\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -1420,12 +1420,14 @@ msgid "" " 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" @@ -1802,13 +1804,12 @@ msgid "" "the prompt (this same variable is used by WeeChat on /upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" +" - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" -" - proxy options: username, password\n" -" - irc server options: autojoin, command, password, sasl_{username|" -"password}, username, realname\n" -" - option relay.network.password\n" -" - command /eval.\n" +" - other options that may contain a password or sensitive data (for example " +"proxy, irc server and relay); see /help on the options to check if they are " +"evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -1985,7 +1986,7 @@ msgid "" "|| scroll_horiz [-window <number>] [+/-]<value>[%] || scroll_up|scroll_down|" "scroll_top|scroll_bottom|scroll_beyond_end|scroll_previous_highlight|" "scroll_next_highlight|scroll_unread [-window <number>] || swap [-window " -"<number>] [up|down|left|right] || zoom[-window <number>] || bare [<delay>]" +"<number>] [up|down|left|right] || zoom [-window <number>] || bare [<delay>]" msgstr "" msgid "" @@ -2533,6 +2534,11 @@ msgid "" "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 "" @@ -6058,6 +6064,10 @@ msgstr "" msgid "color for reason in part/quit messages" msgstr "" +msgid "" +"color for current channel topic (when joining a channel or using /topic)" +msgstr "" + msgid "color for new channel topic (when topic is changed)" msgstr "" @@ -6537,7 +6547,7 @@ msgid "%sNo topic set for channel %s%s" msgstr "" #, c-format -msgid "%sTopic for %s%s%s is \"%s%s\"" +msgid "%sTopic for %s%s%s is \"%s%s%s\"" msgstr "" #. TRANSLATORS: "%s" after "on" is a date diff --git a/src/core/wee-command.c b/src/core/wee-command.c index 28e49b3db..87bf62fc7 100644 --- a/src/core/wee-command.c +++ b/src/core/wee-command.c @@ -2933,6 +2933,8 @@ COMMAND_CALLBACK(input) 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 @@ COMMAND_CALLBACK(input) 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 @@ COMMAND_CALLBACK(print) 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 @@ COMMAND_CALLBACK(print) if (text) { fprintf ((to_stdout) ? stdout : stderr, "%s", text); + fflush ((to_stdout) ? stdout : stderr); free (text); } } @@ -7383,12 +7389,14 @@ command_init () " 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 @@ command_init () " 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|" @@ -7789,13 +7797,12 @@ command_init () "/upgrade).\n" "\n" "Secured data with format ${sec.data.xxx} can be used in:\n" + " - command /eval\n" " - command line argument \"--run-command\"\n" " - options weechat.startup.command_{before|after}_plugins\n" - " - proxy options: username, password\n" - " - irc server options: autojoin, command, password, " - "sasl_{username|password}, username, realname\n" - " - option relay.network.password\n" - " - command /eval.\n" + " - other options that may contain a password or sensitive data " + "(for example proxy, irc server and relay); see /help on the " + "options to check if they are evaluated.\n" "\n" "Examples:\n" " set a passphrase:\n" @@ -7980,7 +7987,7 @@ command_init () "scroll_beyond_end|scroll_previous_highlight|scroll_next_highlight|" "scroll_unread [-window <number>]" " || swap [-window <number>] [up|down|left|right]" - " || zoom[-window <number>]" + " || zoom [-window <number>]" " || bare [<delay>]"), N_(" list: list opened windows (without argument, this list is " "displayed)\n" diff --git a/src/core/wee-config.c b/src/core/wee-config.c index 36b781de4..78a570d0f 100644 --- a/src/core/wee-config.c +++ b/src/core/wee-config.c @@ -143,6 +143,7 @@ struct t_config_option *config_look_jump_current_to_previous_buffer; 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 @@ config_weechat_init_options () 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 --git a/src/core/wee-config.h b/src/core/wee-config.h index 7a8651281..9ce97a4f9 100644 --- a/src/core/wee-config.h +++ b/src/core/wee-config.h @@ -189,6 +189,7 @@ extern struct t_config_option *config_look_jump_current_to_previous_buffer; 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 --git a/src/core/wee-url.c b/src/core/wee-url.c index 251fa5c93..8994233e9 100644 --- a/src/core/wee-url.c +++ b/src/core/wee-url.c @@ -917,8 +917,6 @@ weeurl_option_map_cb (void *data, break; } } - - return; } /* diff --git a/src/gui/curses/gui-curses-key.c b/src/gui/curses/gui-curses-key.c index 47356fa27..b1205b400 100644 --- a/src/gui/curses/gui-curses-key.c +++ b/src/gui/curses/gui-curses-key.c @@ -85,7 +85,7 @@ gui_key_default_bindings (int context) BIND(/* <enter> */ "ctrl-J", "/input return"); BIND(/* <tab> */ "ctrl-I", "/input complete_next"); BIND(/* s-<tab> */ "meta2-Z", "/input complete_previous"); - BIND(/* ^R */ "ctrl-R", "/input search_text"); + BIND(/* ^R */ "ctrl-R", "/input search_text_here"); BIND(/* <backspace> */ "ctrl-H", "/input delete_previous_char"); BIND(/* <backspace> */ "ctrl-?", "/input delete_previous_char"); BIND(/* ^_ */ "ctrl-_", "/input undo"); @@ -222,14 +222,15 @@ gui_key_default_bindings (int context) 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(/* <enter> */ "ctrl-M", "/input search_stop"); - BIND(/* <enter> */ "ctrl-J", "/input search_stop"); + BIND(/* <enter> */ "ctrl-M", "/input search_stop_here"); + BIND(/* <enter> */ "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(/* <tab> */ "ctrl-I", "/input search_switch_where"); @@ -465,7 +466,10 @@ gui_key_flush (int paste) * found */ if (CONFIG_BOOLEAN(config_look_search_text_not_found_alert)) - printf ("\a"); + { + fprintf (stderr, "\a"); + fflush (stderr); + } } else { diff --git a/src/gui/curses/gui-curses-mouse.c b/src/gui/curses/gui-curses-mouse.c index a1a186bfc..16330a76e 100644 --- a/src/gui/curses/gui-curses-mouse.c +++ b/src/gui/curses/gui-curses-mouse.c @@ -89,6 +89,7 @@ gui_mouse_enable () { 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_disable () { 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 --git a/src/gui/curses/gui-curses-window.c b/src/gui/curses/gui-curses-window.c index a758383c9..af0a69c91 100644 --- a/src/gui/curses/gui-curses-window.c +++ b/src/gui/curses/gui-curses-window.c @@ -2521,6 +2521,7 @@ gui_window_send_clipboard (const char *storage_unit, const char *text) fprintf (stderr, "\033]52;%s;%s\a", (storage_unit) ? storage_unit : "", text_base64); + fflush (stderr); free (text_base64); } } @@ -2545,6 +2546,7 @@ gui_window_set_bracketed_paste_mode (int enable) (screen) ? "\033P" : "", (enable) ? "h" : "l", (screen) ? "\033\\" : ""); + fflush (stderr); } /* diff --git a/src/gui/gui-completion.c b/src/gui/gui-completion.c index c371c39ca..0e07b96da 100644 --- a/src/gui/gui-completion.c +++ b/src/gui/gui-completion.c @@ -1157,7 +1157,10 @@ gui_completion_complete (struct t_gui_completion *completion) /* 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 --git a/src/gui/gui-input.c b/src/gui/gui-input.c index a913c3642..a635c021f 100644 --- a/src/gui/gui-input.c +++ b/src/gui/gui-input.c @@ -406,7 +406,6 @@ gui_input_clipboard_paste (struct t_gui_buffer *buffer) 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_input_return (struct t_gui_buffer *buffer) 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 @@ gui_input_complete_previous (struct t_gui_buffer *buffer) } /* - * 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 @@ gui_input_search_text (struct t_gui_buffer *buffer) 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 @@ gui_input_search_next (struct t_gui_buffer *buffer) } /* - * 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 --git a/src/gui/gui-input.h b/src/gui/gui-input.h index b46a9e0a0..832c80671 100644 --- a/src/gui/gui-input.h +++ b/src/gui/gui-input.h @@ -43,6 +43,7 @@ extern void gui_input_clipboard_paste (struct t_gui_buffer *buffer); 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_regex (struct t_gui_buffer *buffer); 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 --git a/src/gui/gui-key.c b/src/gui/gui-key.c index a9d6e4053..209ce061e 100644 --- a/src/gui/gui-key.c +++ b/src/gui/gui-key.c @@ -177,7 +177,7 @@ gui_key_grab_init (int grab_command, const char *delay) 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 --git a/src/gui/gui-key.h b/src/gui/gui-key.h index 8b7aa3e0b..e6af2d88a 100644 --- a/src/gui/gui-key.h +++ b/src/gui/gui-key.h @@ -24,8 +24,6 @@ struct t_hashtable; #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 --git a/src/gui/gui-line.c b/src/gui/gui-line.c index 73a8a28b9..9b3ad32fe 100644 --- a/src/gui/gui-line.c +++ b/src/gui/gui-line.c @@ -990,6 +990,9 @@ gui_line_remove_from_list (struct t_gui_buffer *buffer, 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 --git a/src/gui/gui-window.c b/src/gui/gui-window.c index 32ad5fe9c..825fd47ba 100644 --- a/src/gui/gui-window.c +++ b/src/gui/gui-window.c @@ -384,6 +384,7 @@ gui_window_scroll_init (struct t_gui_window_scroll *window_scroll, 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 @@ gui_window_scroll_remove_not_scrolled (struct t_gui_window *window) && (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 @@ gui_window_search_text (struct t_gui_window *window) } /* - * 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 @@ gui_window_search_start (struct t_gui_window *window) 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 @@ gui_window_search_restart (struct t_gui_window *window) 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 @@ gui_window_search_stop (struct t_gui_window *window) 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 @@ gui_window_hdata_window_scroll_cb (void *data, const char *hdata_name) 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 @@ gui_window_print_log () { 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 --git a/src/gui/gui-window.h b/src/gui/gui-window.h index f3439142a..f0f9387ec 100644 --- a/src/gui/gui-window.h +++ b/src/gui/gui-window.h @@ -96,6 +96,8 @@ struct t_gui_window_scroll /* (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_horiz (struct t_gui_window *window, char *scroll); 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 --git a/src/plugins/irc/irc-color.h b/src/plugins/irc/irc-color.h index 027f93802..cc8f58bf6 100644 --- a/src/plugins/irc/irc-color.h +++ b/src/plugins/irc/irc-color.h @@ -86,6 +86,7 @@ #define IRC_COLOR_MESSAGE_JOIN weechat_color(weechat_config_string(irc_config_color_message_join)) #define IRC_COLOR_MESSAGE_QUIT weechat_color(weechat_config_string(irc_config_color_message_quit)) #define IRC_COLOR_REASON_QUIT weechat_color(weechat_config_string(irc_config_color_reason_quit)) +#define IRC_COLOR_TOPIC_CURRENT weechat_color(weechat_config_string(irc_config_color_topic_current)) #define IRC_COLOR_TOPIC_OLD weechat_color(weechat_config_string(irc_config_color_topic_old)) #define IRC_COLOR_TOPIC_NEW weechat_color(weechat_config_string(irc_config_color_topic_new)) #define IRC_COLOR_INPUT_NICK weechat_color(weechat_config_string(irc_config_color_input_nick)) diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 85539eb96..5f9dfc451 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -125,6 +125,7 @@ struct t_config_option *irc_config_color_mirc_remap; struct t_config_option *irc_config_color_nick_prefixes; struct t_config_option *irc_config_color_notice; struct t_config_option *irc_config_color_reason_quit; +struct t_config_option *irc_config_color_topic_current; struct t_config_option *irc_config_color_topic_new; struct t_config_option *irc_config_color_topic_old; @@ -2907,6 +2908,13 @@ irc_config_init () N_("color for reason in part/quit messages"), NULL, -1, 0, "default", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); + irc_config_color_topic_current = weechat_config_new_option ( + irc_config_file, ptr_section, + "topic_current", "color", + N_("color for current channel topic (when joining a channel or " + "using /topic)"), + NULL, -1, 0, "default", NULL, 0, NULL, NULL, + NULL, NULL, NULL, NULL); irc_config_color_topic_new = weechat_config_new_option ( irc_config_file, ptr_section, "topic_new", "color", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index 4e7843703..4193ed1d8 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -168,6 +168,7 @@ extern struct t_config_option *irc_config_color_mirc_remap; extern struct t_config_option *irc_config_color_nick_prefixes; extern struct t_config_option *irc_config_color_notice; extern struct t_config_option *irc_config_color_reason_quit; +extern struct t_config_option *irc_config_color_topic_current; extern struct t_config_option *irc_config_color_topic_new; extern struct t_config_option *irc_config_color_topic_old; diff --git a/src/plugins/irc/irc-protocol.c b/src/plugins/irc/irc-protocol.c index 65feed475..f3d7bff92 100644 --- a/src/plugins/irc/irc-protocol.c +++ b/src/plugins/irc/irc-protocol.c @@ -1709,19 +1709,20 @@ IRC_PROTOCOL_CALLBACK(ping) IRC_PROTOCOL_CALLBACK(pong) { struct timeval tv; - int old_lag; IRC_PROTOCOL_MIN_ARGS(0); if (server->lag_check_time.tv_sec != 0) { /* calculate lag (time diff with lag check) */ - old_lag = server->lag; gettimeofday (&tv, NULL); server->lag = (int)(weechat_util_timeval_diff (&(server->lag_check_time), &tv) / 1000); - if (old_lag != server->lag) + if (server->lag != server->lag_displayed) + { + server->lag_displayed = server->lag; weechat_bar_item_update ("lag"); + } /* schedule next lag check */ server->lag_check_time.tv_sec = 0; @@ -3475,11 +3476,12 @@ IRC_PROTOCOL_CALLBACK(332) server, NULL, command, NULL, ptr_buffer), date, irc_protocol_tags (command, "irc_numeric", NULL, NULL), - _("%sTopic for %s%s%s is \"%s%s\""), + _("%sTopic for %s%s%s is \"%s%s%s\""), weechat_prefix ("network"), IRC_COLOR_CHAT_CHANNEL, argv[3], IRC_COLOR_RESET, + IRC_COLOR_TOPIC_CURRENT, (topic_color) ? topic_color : ((pos_topic) ? pos_topic : ""), IRC_COLOR_RESET); } diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index ad2e8e38f..16fa9e104 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -1029,6 +1029,7 @@ irc_server_alloc (const char *name) new_server->away_message = NULL; new_server->away_time = 0; new_server->lag = 0; + new_server->lag_displayed = -1; new_server->lag_check_time.tv_sec = 0; new_server->lag_check_time.tv_usec = 0; new_server->lag_next_check = time (NULL) + @@ -3059,7 +3060,11 @@ irc_server_timer_cb (void *data, int remaining_calls) && (ptr_server->lag >= weechat_config_integer (irc_config_network_lag_min_show))) { ptr_server->lag_last_refresh = current_time; - weechat_bar_item_update ("lag"); + if (ptr_server->lag != ptr_server->lag_displayed) + { + ptr_server->lag_displayed = ptr_server->lag; + weechat_bar_item_update ("lag"); + } } /* lag timeout? => disconnect */ if ((weechat_config_integer (irc_config_network_lag_reconnect) > 0) @@ -3083,7 +3088,11 @@ irc_server_timer_cb (void *data, int remaining_calls) { /* refresh lag item */ ptr_server->lag_last_refresh = current_time; - weechat_bar_item_update ("lag"); + if (ptr_server->lag != ptr_server->lag_displayed) + { + ptr_server->lag_displayed = ptr_server->lag; + weechat_bar_item_update ("lag"); + } /* schedule next lag check in 5 seconds */ ptr_server->lag_check_time.tv_sec = 0; @@ -4659,6 +4668,7 @@ irc_server_disconnect (struct t_irc_server *server, int switch_address, server->is_away = 0; server->away_time = 0; server->lag = 0; + server->lag_displayed = -1; server->lag_check_time.tv_sec = 0; server->lag_check_time.tv_usec = 0; server->lag_next_check = time (NULL) + @@ -5256,6 +5266,7 @@ irc_server_hdata_server_cb (void *data, const char *hdata_name) WEECHAT_HDATA_VAR(struct t_irc_server, away_message, STRING, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, away_time, TIME, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, lag, INTEGER, 0, NULL, NULL); + WEECHAT_HDATA_VAR(struct t_irc_server, lag_displayed, INTEGER, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, lag_check_time, OTHER, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, lag_next_check, TIME, 0, NULL, NULL); WEECHAT_HDATA_VAR(struct t_irc_server, lag_last_refresh, TIME, 0, NULL, NULL); @@ -5494,6 +5505,8 @@ irc_server_add_to_infolist (struct t_infolist *infolist, return 0; if (!weechat_infolist_new_var_integer (ptr_item, "lag", server->lag)) return 0; + if (!weechat_infolist_new_var_integer (ptr_item, "lag_displayed", server->lag_displayed)) + return 0; if (!weechat_infolist_new_var_buffer (ptr_item, "lag_check_time", &(server->lag_check_time), sizeof (struct timeval))) return 0; if (!weechat_infolist_new_var_time (ptr_item, "lag_next_check", server->lag_next_check)) @@ -5837,6 +5850,7 @@ irc_server_print_log () weechat_log_printf (" away_message . . . . : '%s'", ptr_server->away_message); weechat_log_printf (" away_time. . . . . . : %ld", ptr_server->away_time); weechat_log_printf (" lag. . . . . . . . . : %d", ptr_server->lag); + weechat_log_printf (" lag_displayed. . . . : %d", ptr_server->lag_displayed); weechat_log_printf (" lag_check_time . . . : tv_sec:%d, tv_usec:%d", ptr_server->lag_check_time.tv_sec, ptr_server->lag_check_time.tv_usec); diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index 7897bd883..dd650c325 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -206,6 +206,7 @@ struct t_irc_server char *away_message; /* away message, NULL if not away */ time_t away_time; /* time() when user marking as away */ int lag; /* lag (in milliseconds) */ + int lag_displayed; /* last value displayed for lag */ struct timeval lag_check_time; /* last time lag was checked (ping sent) */ time_t lag_next_check; /* time for next check */ time_t lag_last_refresh; /* last refresh of lag item */ diff --git a/src/plugins/irc/irc-upgrade.c b/src/plugins/irc/irc-upgrade.c index d62147520..2169df3bd 100644 --- a/src/plugins/irc/irc-upgrade.c +++ b/src/plugins/irc/irc-upgrade.c @@ -444,6 +444,7 @@ irc_upgrade_read_cb (void *data, irc_upgrade_current_server->away_message = strdup (str); irc_upgrade_current_server->away_time = weechat_infolist_time (infolist, "away_time"); irc_upgrade_current_server->lag = weechat_infolist_integer (infolist, "lag"); + irc_upgrade_current_server->lag_displayed = weechat_infolist_integer (infolist, "lag_displayed"); buf = weechat_infolist_buffer (infolist, "lag_check_time", &size); if (buf) memcpy (&(irc_upgrade_current_server->lag_check_time), buf, size); |