diff --git a/ChangeLog b/ChangeLog index 9b0f046e1..e4793ea7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,8 @@ ChangeLog - 2007-03-16 Version 0.2.4 (under dev!): + * added new key (ctrl-S) for interactive and incremental search in buffer + history (task #6628) * fixed /topic completion when no topic set on current channel (bug #19322) * improved password hiding, code cleanup (bug #19229) * added new return code in plugin API to force highlight (for message diff --git a/doc/de/key_functions.xml b/doc/de/key_functions.xml index af42e3525..5e3ffdf6d 100644 --- a/doc/de/key_functions.xml +++ b/doc/de/key_functions.xml @@ -201,3 +201,7 @@ insert insert a string in command line + + search_text + search text in buffer history + diff --git a/doc/de/weechat.de.xml b/doc/de/weechat.de.xml index 45f79f9d0..22151a067 100644 --- a/doc/de/weechat.de.xml +++ b/doc/de/weechat.de.xml @@ -512,6 +512,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Fenster neu aufbauen + + Strg + S + + + Search for text in buffer history + + Strg + T @@ -571,6 +578,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Hoch / Runter Rufe das letzte Kommando/die letzte Nachricht wieder auf + + (in search mode: search up/down) diff --git a/doc/de/weechat_commands.xml b/doc/de/weechat_commands.xml index f32dd9aad..40faa583a 100644 --- a/doc/de/weechat_commands.xml +++ b/doc/de/weechat_commands.xml @@ -11,7 +11,7 @@ einen Alias f alias_name: name of alias command: command name (WeeChat or IRC command, many commands can be separated by semicolons) -arguments: arguments for command + arguments: arguments for command is replaced by all arguments. diff --git a/doc/en/key_functions.xml b/doc/en/key_functions.xml index 1680aeb29..5785eec3d 100644 --- a/doc/en/key_functions.xml +++ b/doc/en/key_functions.xml @@ -201,3 +201,7 @@ insert insert a string in command line + + search_text + search text in buffer history + diff --git a/doc/en/weechat.en.xml b/doc/en/weechat.en.xml index c0f279dda..1f8b3f143 100644 --- a/doc/en/weechat.en.xml +++ b/doc/en/weechat.en.xml @@ -508,6 +508,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Redraw whole window + + Ctrl + S + + Search for text in buffer history + + Ctrl + T @@ -566,7 +572,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Up arrow / Down arrow - Call again last commands/messages + Call again last commands/messages (in search mode: search + up/down) diff --git a/doc/en/weechat_commands.xml b/doc/en/weechat_commands.xml index 607a51c8e..19baf023a 100644 --- a/doc/en/weechat_commands.xml +++ b/doc/en/weechat_commands.xml @@ -11,7 +11,7 @@ create an alias for a command alias_name: name of alias command: command name (WeeChat or IRC command, many commands can be separated by semicolons) -arguments: arguments for command + arguments: arguments for command is replaced by all arguments. diff --git a/doc/fr/key_functions.xml b/doc/fr/key_functions.xml index bf756c49a..99d68e155 100644 --- a/doc/fr/key_functions.xml +++ b/doc/fr/key_functions.xml @@ -201,3 +201,7 @@ insert insrer une chane dans la ligne de commande + + search_text + recherche de texte dans l'historique du tampon + diff --git a/doc/fr/weechat.fr.xml b/doc/fr/weechat.fr.xml index 8cc7414f7..9dee88cdc 100644 --- a/doc/fr/weechat.fr.xml +++ b/doc/fr/weechat.fr.xml @@ -517,6 +517,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Rafficher toute la fentre + + Ctrl + S + + Chercher du texte dans l'historique du tampon + + Ctrl + T @@ -577,6 +583,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Flche haut / flche bas Rappeler les dernires commandes ou messages + (en mode recherche: chercher en haut/bas) diff --git a/po/cs.po b/po/cs.po index 9d32f8b16..d852a5265 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1339,99 +1339,99 @@ msgstr "nemůžu změnit mód přo ostatní uživatele" msgid "whois (secure connection)" msgstr "whois (zabezpečená část)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServer: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "připojen" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "nepřipojen" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "na" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "off" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (dočasný server, nebude uložen)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "sekund" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(skrytý)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: používám jméno hosta \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s nemohu najít přezdívku pro poslání zprávy\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" příkaz nemůže být spuštěn v bufferu serveru\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s špatné parametry pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" není validní regulární výraz (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nedostatek paměti pro regulární výraz\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu nebo soukromého " "rozhovoru\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1439,12 +1439,12 @@ msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nemohu vytvořít nové soukromý buffer\"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompilováno na %s %s\n" @@ -1654,11 +1654,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s byl %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s nečinný: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "dní" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "den" @@ -2200,7 +2200,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" odebrán.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" nenalezen\n" @@ -2260,31 +2260,35 @@ msgstr "GB" msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Akceptovat" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Storno" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Odebrat" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Pročistit staré DCC" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] Zavřít DCC pohled" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Vyčistit buffer" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Zavřít čistý pohled na data" @@ -2303,31 +2307,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(pryč)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[nepřipojen] " -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr "<ČISTÉ_IRC> " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Aktivní: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "ČISTÉ_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Zpoždění: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-VÍCE-" @@ -2335,7 +2340,7 @@ msgstr "-VÍCE-" msgid "server" msgstr "server" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Nedostatek paměti pro nový řádek\n" @@ -2540,17 +2545,22 @@ msgstr "zachytit klávesu" msgid "insert a string in command line" msgstr "vložit řetězec na řádku" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "sezení: načítám historii bufferu\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s nemohu napojit kalávesu \"%s\"\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "%s nemohu napojit kalávesu \"%s\" (nevalidní jméno funkce: \"%s\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s nedostatek paměti pro klávesovou zkratku\n" @@ -3250,8 +3260,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s buffer nenalezen pro příkaz \"%s\"\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s neznámá volba pro příkaz \"%s\"\n" @@ -3465,7 +3475,7 @@ msgstr "Nebyl nalezen žádný plugin\n" msgid " (no plugin)\n" msgstr " (není plugin)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3568,151 +3578,151 @@ msgstr "%s nemohu vytvořit server\n" msgid "(unknown)" msgstr "(neznámý)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(heslo schováno) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s server \"%s\" nenalezen\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s volba nastavení \"%s\" nenalezena\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s nekorektní hodnota pro volbu \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s volba \"%s\" nemůže být změněna dokud WeeChat běží\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Nebyla nalezena žádná volba nastavení s \"%s\"\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Nebyla nalezena žádná volba nastavení\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sDetail:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . typ boolean (hodnota: 'on' nebo 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . výchozí hodnota: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . typ celočíselný (hodnoty: mezi %d a %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . výchozí hodnota: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . typ řetězec (hodnoty: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "prázdný" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . typ barva (Curses nebo Gtk barva, viz WeeChat dokumentace)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . typ řetězec (jakýkoliv řetězec)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . popis: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "volba/volby nastavení nalezeny s \"%s\"\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "volba/volby nastavení nalezeny\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s nekorektní hodnota pro možnost pluginu \"%s\"\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Nebyla nalezena žádná možnost pluginu s \"%s\"\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Nebyla nalezena žádná možnost pluginu\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "možnost(i) pluginu nalezeny s \"%s\"\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "možnost(i) pluginu nalezeny\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias nebo příkaz \"%s\" nenalezen\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" odebrán\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "ignorování bylo odebráno.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "ignorování bylo odebrán\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s žádné ignorování nenaleyeno\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "%s nemůžu aktualizovat: existují nevyřešená spojení na server\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3721,7 +3731,7 @@ msgstr "" "%s nemohu aktualiyovat: je aktuvní jedno nebo více připojení na SSL server " "(mělo by být opraveno v budoucnosti)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3730,35 +3740,35 @@ msgstr "" "%s nemůžu aktualizovat: anti-flood je aktivní na alespoň jednom serveru " "(posílání mnoha řádků)\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Aktualizuji WeeChat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s nemohu uložit sezení do souboru\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s exec selhal (program: \"%s\"), ukončuji WeeChat\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "Čas běhu WeeChat: %d %s %02d:%02d:%02d, spuštěn %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "Čas běhu WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, spuštěn %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Otevřené okna:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/po/de.po b/po/de.po index 87f65d9b8..3585f455c 100644 --- a/po/de.po +++ b/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: \n" @@ -1339,100 +1339,100 @@ msgstr "Modes anderer User können nicht geändert werden" msgid "whois (secure connection)" msgstr "whois (sichere Verbindung)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServer: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "verbunden" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "nicht verbunden" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "an" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "aus" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (temporärer Server, wird nicht gespeichert)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "Sekunden" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(versteckt)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: benutze lokalen Hostnamen \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" "%s kann keinen Nickname finden, an den die Nachricht gesendet werden soll\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s der Befehl \"%s\" benötigt eine Serververbindung!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s der \"%s\"-Befehl kann nur in Channelfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s der \"%s\"-Befehl kann nicht in Serverfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" ist kein korrekter regulärer Ausdruck (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nicht genügend Speicher für regulären Ausdruck vorhanden\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s der \"%s\"-Befehl kann nur in Channelfenstern oder in privaten Fenstern " "ausgeführt werden\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1440,12 +1440,12 @@ msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s fehlerhafte Anzahl von Argumenten für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompiliert auf %s %s\n" @@ -1655,11 +1655,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s war %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s idlet: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "Tage" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "Tag" @@ -2208,7 +2208,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" entladen.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s Plugin \"%s\" nicht gefunden\n" @@ -2268,31 +2268,35 @@ msgstr "GB" msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] annehmen" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] abbrechen" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] entfernen" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] alte DCCs entfernen" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] DCC-Ansicht schließen" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Puffer löschen" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Rohdatenansicht schließen" @@ -2311,31 +2315,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(abwesend)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[nicht verbunden]" -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr " " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Aktiv: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "RAW_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-MEHR-" @@ -2343,7 +2348,7 @@ msgstr "-MEHR-" msgid "server" msgstr "Server" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Nicht genügend Speicher für neue Zeile\n" @@ -2549,18 +2554,23 @@ msgstr "Tastencode ermitteln und einfügen" msgid "insert a string in command line" msgstr "" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "Sitzung: lade Puffer-Verlauf\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s kann die Taste \"%s\" nicht zuordnen\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s kann die Taste \"%s\" nicht zuornen (ungültiger Funktionsname: \"%s\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s nicht genügend Speicher für Tastenzuordnung\n" @@ -3265,8 +3275,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s Nickname nicht gefunden für den \"%s\"-Befehl\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s unbekannte Option für den \"%s\"-Befehl\n" @@ -3481,7 +3491,7 @@ msgstr "Kein Plugin gefunden.\n" msgid " (no plugin)\n" msgstr " (kein Plugin)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3587,153 +3597,153 @@ msgstr "%s kann den Server nicht anlegen\n" msgid "(unknown)" msgstr "(unbekannt)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(Passwort versteckt) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s Server \"%s\" nicht gefunden\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s Konfigurationsoption \"%s\" nicht gefunden\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s ungültiger Wert für die Option \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s Option \"%s\" kann nicht zur Laufzeit geändert werden\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Keine Konfigurationsoptionen mit \"%s\" gefunden\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Keine Konfigurationsoption gefunden\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sDetail:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . boolesche Werte ('on' or 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . Standardwert: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . Ganzzahl (Werte zwischen %d und %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . Standardwert: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . Zeichenfolge (Werte: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "leer" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . Farbe (Curses- or Gtk-color, siehe WeeChat-Dokumentation)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . Zeichenfolge (beliebig)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . Beschreibung: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "Konfigurationsoption(en) gefunden mit \"%s\"\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "Konfigurationsoption(en) gefunden\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s ungültiger Wert für die Plugin-Option \"%s\"\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Keine Plugin-Optionen mit \"%s\" gefunden\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Keine Plugin-Option gefunden\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "Plugin-Option(en) gefunden mit \"%s\"\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "Plugin-Option(en) gefunden\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s Alias oder Befehl \"%s\" nicht gefunden\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" entfernt\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "/ignore-Regeln entfernt.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "/ignore-Regel entfernt.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s Keine /ignore-Regel gefunden.\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "" "%s Aktualisierung nicht möglich: es wird noch auf eine Verbindung zu " "mindestens einem Server gewartet\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3743,7 +3753,7 @@ msgstr "" "mindestens einem Server (sollte in einer zukünftigen Version bereinigt " "sein)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, fuzzy, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3752,36 +3762,36 @@ msgstr "" "%s Aktualisierung nicht möglich: es wird noch auf eine Verbindung zu " "mindestens einem Server gewartet\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Aktualisiere WeeChat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s kann die Sitzung nicht in eine Datei speichern\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s Ausführung schlug fehl (Programm: \"%s\"), WeeChat wird beendet\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "WeeChat Uptime: %d %s %02d:%02d:%02d, gestartet am %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "" "WeeChat Uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, gestartet am %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Geöffnete Fenster:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/po/es.po b/po/es.po index c73ea62b4..d2ce1b7da 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" @@ -1357,99 +1357,99 @@ msgstr "no es posible cambiar el modo para el resto de usuarios" msgid "whois (secure connection)" msgstr "quin es (conexin segura)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServidor:%s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "conectado" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "no conectado" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "activo" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "inactivo" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (servidor temporal, no ser guardado)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "segundos" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: utilizando nombre de mquina local \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s el comando \"%s\" requiere una conexin a servidor!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrectos para el comando \"%s\"\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" no es una expresin regular vlida (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s no hay suficiente memoria para la expresin regular\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1457,12 +1457,12 @@ msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" @@ -1672,11 +1672,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactividad: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "das" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "da" @@ -2237,7 +2237,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" descargado.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" no encontrado\n" @@ -2298,32 +2298,36 @@ msgstr "" msgid "ETA" msgstr "Tiempo estimado de llegada" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Aceptar" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Cancelar" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Eliminar" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Purgar los viejos DCC" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] Cerrar la vista DCC" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 #, fuzzy msgid " [C] Clear buffer" msgstr "saltar al bfer DCC" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Cerrar vista de datos basura" @@ -2342,31 +2346,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(ausente)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[no conectado] " -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr " " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "RAW_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-MS-" @@ -2374,7 +2379,7 @@ msgstr "-M msgid "server" msgstr "servidor" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "No hay suficiente memoria para una nueva lnea\n" @@ -2580,19 +2585,24 @@ msgstr "capturar una clave" msgid "insert a string in command line" msgstr "" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "sesin: cargando historial del bfer\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s No ha sido posible atar la clave \"%s\"\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s No ha sido posible atar la clave \"%s\" (nombre de funcin invlido: \"%s" "\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s no hay suficiente memoria para atar la clave\n" @@ -3286,8 +3296,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s nombre de usuario no encontrado para el comando \"%s\"\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opcin desconocida para el comando \"%s\"\n" @@ -3510,7 +3520,7 @@ msgstr "Ninguna opci msgid " (no plugin)\n" msgstr " (sin plugins)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3616,153 +3626,153 @@ msgstr "%s no es posible crear el servidor\n" msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(contrasea oculta) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s opcin de configuracin \"%s\" no encontrada\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opcin \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" "%s la opcin \"%s\" no puede ser modificada mientras WeeChat est en " "ejecucin\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Ninguna opcin de configuracin encontrada con \"%s\"\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Ninguna opcin de configuracin encontrada\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sDetalle:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . tipo booleano (valores: 'on' u 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . valor por defecto: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . tipo entero (valores: entre %d y %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . valor por defecto: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . tipo cadena (valores: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "vaco" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . tipo color (color Curses o Gtk, ver la documentacin de WeeChat)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . tipo cadena (cualquier cadena)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . descripcin: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "opcin/opciones de configuracin encontrada(s) con \"%s\"\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "opcin/opciones de configuracin encontrada(s)\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s valor incorrecto para la opcin de plugin \"%s\"\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Ninguna opcin de plugin encontrada con \"%s\"\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Ninguna opcin de plugin encontrada\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "opcin/opciones de plugin encontrada(s) con \"%s\"\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "opcin/opciones de plugin encontrada(s)\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "los ignores fueron eliminados.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "el ignore fue eliminado.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s no se encontraron ignores\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "%s no se puede actualizar: conexin pendiente a un servidor al menos\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3771,45 +3781,45 @@ msgstr "" "%s no se puede actualizar: conexin activa a un servidor SSL por lo menos " "(debera ser corregido en una futura versin)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, fuzzy, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " "lines)\n" msgstr "%s no se puede actualizar: conexin pendiente a un servidor al menos\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Actualizando Weechat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s no ha sido posible guardar la sesin en el archivo\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s exec ha fallado (programa: \"%s\"), saliendo de Weechat\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "Tiempo de uso de WeeChat: %d %s %02d:%02d:%02d, empez en %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "" "Tiempo de uso de WeeChat: %s%d %s%s %s%02d%s: %s%02d%s:%s%02d%s, empez en %s" "%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 #, fuzzy msgid "Open windows:\n" msgstr "Ventanas abiertas:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/po/fr.po b/po/fr.po index de024cf81..1921b7121 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" -"PO-Revision-Date: 2007-03-07 09:31+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" +"PO-Revision-Date: 2007-03-16 14:36+0100\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1345,101 +1345,101 @@ msgstr "impossible de changer le mode pour les autres utilisateurs" msgid "whois (secure connection)" msgstr "whois (connexion scurise)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServeur: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "connect" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "non connect" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "activ" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "dsactiv" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauv)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "secondes" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(cach)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s la commande \"%s\" ncessite une connexion au serveur !\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s la commande \"%s\" peut seulement tre excute dans un tampon canal\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" "%s la commande \"%s\" ne peut pas tre excute dans un tampon serveur\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramtres invalides pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" n'est pas une expression rgulire valide (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s pas assez de mmoire pour l'expression rgulire\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s la commande \"%s\" peut seulement tre excute dans un tampon canal ou " "priv\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s pseudo \"%s\" non trouv pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1447,12 +1447,12 @@ msgstr "%s pseudo \"%s\" non trouv msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramtres erron pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s impossible de crer le tampon priv \"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compil le %s %s\n" @@ -1662,11 +1662,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactivit: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "jour" @@ -2225,7 +2225,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Extension \"%s\" dcharge.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s extension \"%s\" non trouve\n" @@ -2287,31 +2287,35 @@ msgstr "Go" msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "Recherche texte: " + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Accepter" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Annuler" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Retirer" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Purger anciens DCC" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] Fermer la vue DCC" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Effacer le tampon" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Fermer la vue IRC brut" @@ -2330,31 +2334,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(absent)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[non connect] " -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr " " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "IRC_BRUT" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-PLUS-" @@ -2362,7 +2367,7 @@ msgstr "-PLUS-" msgid "server" msgstr "serveur" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Pas assez de mmoire pour une nouvelle ligne !\n" @@ -2567,18 +2572,22 @@ msgstr "capturer une touche" msgid "insert a string in command line" msgstr "insrer une chane dans la ligne de commande" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +msgid "search text in buffer history" +msgstr "recherche de texte dans l'historique du tampon" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s impossible de crer la touche \"%s\"\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s impossible de crer la touche \"%s\" (nom fonction incorrect: \"%s\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s pas assez de mmoire pour la touche\n" @@ -3297,8 +3306,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s tampon non trouv pour la commande \"%s\"\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" @@ -3513,7 +3522,7 @@ msgstr "Aucune extension trouv msgid " (no plugin)\n" msgstr " (aucune extension)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3617,153 +3626,153 @@ msgstr "%s impossible de cr msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(mot de passe cach) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouv\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouve\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s l'option \"%s\" ne peut pas tre change lorsque WeeChat tourne\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouve avec \"%s\"\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Aucune option de configuration trouve\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sDtail :\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . type boolen (valeurs: 'on' ou 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . valeur par dfaut: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . type entier (valeurs: entre %d et %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . valeur par dfaut: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . type chane (valeurs: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "vide" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . type chane (toute chane)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . description: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "option(s) de configuration trouve(s) avec \"%s\"\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "option(s) de configuration trouve(s)\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option d'extension \"%s\"\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Aucune option de configuration d'extension trouve avec \"%s\"\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Aucune option de configuration d'extension trouve\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "option(s) de configuration d'extension trouve(s) avec \"%s\"\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "option(s) de configuration d'extension trouve(s)\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouv\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprim\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "ignore ont t supprims.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "ignore a t supprim.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s aucun ignore trouv\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "" "%s impossible de mettre jour: une connexion au moins un serveur est en " "cours\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3772,7 +3781,7 @@ msgstr "" "%s impossible de mettre jour: une connexion au moins un serveur SSL est " "active (devrait tre corrig dans une future version)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3781,35 +3790,35 @@ msgstr "" "%s impossible de mettre jour: l'anti-flood est actif sur au moins un " "serveur (envoi de plusieurs lignes)\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Mise jour de WeeChat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s impossible de sauver la session dans le fichier\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s l'excution a chou (programme: \"%s\"), sortie de WeeChat\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "Uptime WeeChat: %d %s %02d:%02d:%02d, dmarr le %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "Uptime WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, dmarr le %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Fentres ouvertes:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/po/hu.po b/po/hu.po index 7d6d2603e..5a4987b79 100644 --- a/po/hu.po +++ b/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1351,97 +1351,97 @@ msgstr "más felhasználók üzemmódját nem módosíthatja" msgid "whois (secure connection)" msgstr "kicsoda (titkosított kapcsolat)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%s Szerver: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "csatlakozva" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "nincs csatlakozva" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "be" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "ki" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (átmeneti szerver, nem lesz mentve)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "másodperc" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(rejtett)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: felhasznált hosztnév \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s nem található név az üzenet küldéséhez\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s a \"%s\" parancs futtatásához csatlakozni kell a szerverhez!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s rossz argumentum a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s a(z) \"%s\" érvénytelen reguláris kifejezés (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nincs elég memória a reguláris kifejezéshez\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1449,12 +1449,12 @@ msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, lefordítva: %s %s\n" @@ -1664,11 +1664,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s neve %s volt\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s tétlen: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "nap" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "nap" @@ -2209,7 +2209,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "A \"%s\" modul eltávolítva.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s a \"%s\" modul nem található\n" @@ -2268,31 +2268,35 @@ msgstr "GB" msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Elfogadás" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Mégsem" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Eltávolítás" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Régi DCC törlése" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] DCC nézet bezárása" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Puffer törlése" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Nyers adat nézet bezárása" @@ -2311,31 +2315,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(távol)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[nincs csatlakozva]" -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr " " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Akt: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "NYERS_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-TOVÁBB-" @@ -2343,7 +2348,7 @@ msgstr "-TOVÁBB-" msgid "server" msgstr "szerver" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Nincs elég memória az új sorhoz\n" @@ -2548,19 +2553,24 @@ msgstr "vállasszon billentyűt" msgid "insert a string in command line" msgstr "" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "folyamat: puffertörténet betöltése\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni (érvénytelen " "funkciónév: \"%s\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s nincs elég memória a billentyűhozzárendeléshez\n" @@ -3252,8 +3262,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s nem található név a \"%s\" parancshoz\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s ismeretlen opció a \"%s\" parancsnak\n" @@ -3470,7 +3480,7 @@ msgstr "Nem található modul.\n" msgid " (no plugin)\n" msgstr " (nem található bővítőmodul)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3574,153 +3584,153 @@ msgstr "%s nem sikerült a szervert létrehozni\n" msgid "(unknown)" msgstr "(ismeretlen)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(jelszó rejtve) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s a \"%s\" szerver nem található\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s a \"%s\" opció nem található\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s helytelen érték a \"%s\" paraméternek\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s a \"%s\" opció nem módosítható a WeeChat futása közben\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Nem találtam beállítási lehetőséget a \"%s\" szóhoz\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Nem található az opció\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sRészletek:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . típus logikai (értékek: 'on' vagy 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . alapérték: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . típus szám (értékek: %d és %d között)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . alapérték: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . típus szöveg (értékek: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "üres" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . típus szín (Curses vagy Gtk szín, lásd WeeChat dokumentáció)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . típus szöveg (bármilyen szöveg)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . leírás : %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "a \"%s\" kifejezéshez tartozó opciót találtam\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "megtalált opciók\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s helytelen érték a(z) \"%s\" modul paraméternek\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "A(z) \"%s\" kifejezéshez nem található modul opció\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Nem található modul opció\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "a(z) \"%s\" kifejezéshez tartozó modul opciók\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "megtalált modul opciók\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s a \"%s\" aliasz vagy parancs nem található\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "A \"%s\" aliasz eltávolítva\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "mellőzés eltávolítva.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "mellőzés eltávolítva.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s nem található ilyen mellőzés\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "" "%s nem sikerült frissíteni: a kapcsolat egy vagy több szerverrel még " "folyamatban van\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3729,7 +3739,7 @@ msgstr "" "%s nem sikerült frissíteni: a kapcsolat legalább egy SSL szerverrel aktív (a " "következő verziókban javítva lesz)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3738,36 +3748,36 @@ msgstr "" "%s nem sikerült frissíteni: az anti-flood (több sor küldése) legalább egy " "szerveren aktív\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "WeeChat frissítése...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s nem sikerült a folyamatot menteni\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s futtatási hiba (program: \"%s\"), a WeeChat kilép\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "WeeChat futásidő: %d %s %02d:%02d:%02d, elindítva: %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "" "WeeChat futásidő: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, elindítva: %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Nyitott ablakok:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/po/ru.po b/po/ru.po index 61e805039..c0f007270 100644 --- a/po/ru.po +++ b/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1338,98 +1338,98 @@ msgstr "вы не можете менять режимы других польз msgid "whois (secure connection)" msgstr "whois (защищённое соединение)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sСервер: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "подключен" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "отключен" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "вкл." -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "выкл." -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (временный сервер, не будет сохранён)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "секунды" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(скрытый)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: используется хост \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s не могу найти адресата сообщения\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s команде \"%s\" необходимо соединение с сервером!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере канала\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s некорректные аргументы команды \"%s\"\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" не является регулярным выражением (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s недостаточно памяти для регулярного выражения\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" команда может быть выполнена только в буфере канала или привата\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1437,12 +1437,12 @@ msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s некорректное количество аргументов команды \"%s\"\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s невозможно создать новый буфер привата \"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, собран %s %s\n" @@ -1652,11 +1652,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s был %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s бездействует: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "дней" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "день" @@ -2190,7 +2190,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" выгружен.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" не найден\n" @@ -2250,31 +2250,35 @@ msgstr "ГБ" msgid "ETA" msgstr "осталось" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Принять" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Отменить" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Удалить" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Очистить список" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] Закрыть окно" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Очистить буфер" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Закрыть окно сырых данных" @@ -2293,31 +2297,32 @@ msgid "" msgstr "<серверы>" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(отсутствует)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[не соединён] " -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr "" -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Активны: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "RAW_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Задержка: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-ДАЛЬШЕ-" @@ -2325,7 +2330,7 @@ msgstr "-ДАЛЬШЕ-" msgid "server" msgstr "сервер" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Недостаточно памяти для новой строчки\n" @@ -2530,19 +2535,24 @@ msgstr "захватить клавишу" msgid "insert a string in command line" msgstr "вставить строку в поле ввода" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "сессия: загрузка истории буфера\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s не могу установить клавишу \"%s\"\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s не могу установить клавишу \"%s\" (некорректное название функции: \"%s" "\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s недостаточно памяти для установки клавиши\n" @@ -3245,8 +3255,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s буфер не найден для команды \"%s\"\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s неизвестный параметр для команды \"%s\"\n" @@ -3460,7 +3470,7 @@ msgstr "Plugin не найден\n" msgid " (no plugin)\n" msgstr " (нет pluginа)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3562,151 +3572,151 @@ msgstr "%s не могу создать сервер\n" msgid "(unknown)" msgstr "(неизвестен)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(пароль скрыт) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s сервер \"%s\" не найден\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s параметр конфигурации \"%s\" не найден\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s некорректное значение параметра \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s параметр \"%s\" не может быть изменена при запущеном WeeChat\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Не найден параметр с \"%s\"\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Не найден параметр\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sПодробности:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . булевый тип (значения: 'on' или 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . значение по умолчанию: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . целочисленное значение (значения: от %d до %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . значение по умолчанию: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . строковой тип (значения: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "пусто" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . цветовой тип (цвет Curses или Gtk, см. документацию WeeChat)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . строковой тип (любая строка)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . описание: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "параметров с \"%s\" найдено\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "параметров найдено\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s некорректное значение параметра \"%s\" pluginа\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Не найден параметр pluginа с \"%s\"\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Не найден параметр pluginа\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "параметров pluginов с \"%s\" найдено\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "параметров pluginов найдено\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s сокращение или команда \"%s\" не найдены\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Сокращение \"%s\" удалено\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "игнорирование добавлено.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "игнорирование удалено.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s игнорирования не найдены\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "%s не могу обновиться: подключение к серверам в процессе\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3715,7 +3725,7 @@ msgstr "" "%s не могу обновиться: подключен к серверам по SSL (будет исправлено в " "будущем)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3724,35 +3734,35 @@ msgstr "" "%s не могу обновиться: анти-флуд не завершил работу (отсылаются несколько " "строк)\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Обновляю WeeChat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s не могу сохранить сессию в файл\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s запуск не удался (программа: \"%s\"), выхожу из WeeChat\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "WeeChat работает: %d %s %02d:%02d:%02d, запущен %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "WeeChat работает: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, запущен %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Открытые окна:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/po/weechat.pot b/po/weechat.pot index bfd9d3f61..605ff7a1d 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1235,97 +1235,97 @@ msgstr "" msgid "whois (secure connection)" msgstr "" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr "" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1333,12 +1333,12 @@ msgstr "" msgid "%s wrong argument count for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" @@ -1548,11 +1548,11 @@ msgstr "" msgid "%s[%s%s%s]%s idle: " msgstr "" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "" @@ -2065,7 +2065,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "" @@ -2120,31 +2120,35 @@ msgstr "" msgid "ETA" msgstr "" -#: src/gui/curses/gui-curses-input.c:406 -msgid " [A] Accept" -msgstr "" - -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 -msgid " [C] Cancel" +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " msgstr "" #: src/gui/curses/gui-curses-input.c:419 +msgid " [A] Accept" +msgstr "" + +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 +msgid " [C] Cancel" +msgstr "" + +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr "" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr "" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr "" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr "" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr "" @@ -2163,31 +2167,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr "" -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "" -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "" @@ -2195,7 +2200,7 @@ msgstr "" msgid "server" msgstr "" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "" @@ -2400,17 +2405,21 @@ msgstr "" msgid "insert a string in command line" msgstr "" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +msgid "search text in buffer history" +msgstr "" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "" @@ -2983,8 +2992,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" @@ -3197,7 +3206,7 @@ msgstr "" msgid " (no plugin)\n" msgstr "" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3297,193 +3306,193 @@ msgstr "" msgid "(unknown)" msgstr "" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "" -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr "" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr "" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr "" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr "" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr "" -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr "" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr "" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr "" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " "fixed in a future version)\n" msgstr "" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " "lines)\n" msgstr "" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/src/gui/curses/gui-curses-input.c b/src/gui/curses/gui-curses-input.c index 0e1c1349e..fb715cf47 100644 --- a/src/gui/curses/gui-curses-input.c +++ b/src/gui/curses/gui-curses-input.c @@ -78,6 +78,9 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick) char *pos, saved_char; int char_size, length; + if (window->buffer->text_search != TEXT_SEARCH_DISABLED) + return utf8_width_screen (_("Text search: ")); + length = 0; pos = cfg_look_input_format; while (pos && pos[0]) @@ -152,6 +155,16 @@ gui_input_draw_prompt (t_gui_window *window, char *nick) int char_size; wmove (GUI_CURSES(window)->win_input, 0, 0); + + if (window->buffer->text_search != TEXT_SEARCH_DISABLED) + { + gui_window_set_weechat_color (GUI_CURSES(window)->win_input, + COLOR_WIN_INPUT); + wprintw (GUI_CURSES(window)->win_input, "%s", + _("Text search: ")); + return; + } + pos = cfg_look_input_format; while (pos && pos[0]) { diff --git a/src/gui/curses/gui-curses-keyboard.c b/src/gui/curses/gui-curses-keyboard.c index 891941b9e..e6e322297 100644 --- a/src/gui/curses/gui-curses-keyboard.c +++ b/src/gui/curses/gui-curses-keyboard.c @@ -49,8 +49,8 @@ gui_keyboard_default_bindings () gui_keyboard_bind ( /* RC */ "ctrl-J", "return"); gui_keyboard_bind ( /* tab */ "ctrl-I", "tab"); gui_keyboard_bind ( /* s-tab */ "meta2-Z", "tab_previous"); - gui_keyboard_bind ( /* basckp */ "ctrl-H", "backspace"); - gui_keyboard_bind ( /* basckp */ "ctrl-?", "backspace"); + gui_keyboard_bind ( /* basckpace */ "ctrl-H", "backspace"); + gui_keyboard_bind ( /* basckpace */ "ctrl-?", "backspace"); gui_keyboard_bind ( /* del */ "meta2-3~", "delete"); gui_keyboard_bind ( /* ^K */ "ctrl-K", "delete_end_line"); gui_keyboard_bind ( /* ^U */ "ctrl-U", "delete_beginning_line"); @@ -105,6 +105,7 @@ gui_keyboard_default_bindings () gui_keyboard_bind ( /* m-r */ "meta-r", "delete_line"); gui_keyboard_bind ( /* m-s */ "meta-s", "switch_server"); gui_keyboard_bind ( /* m-u */ "meta-u", "scroll_unread"); + gui_keyboard_bind ( /* ^S */ "ctrl-S", "search_text"); /* keys bound with commands */ gui_keyboard_bind ( /* m-left */ "meta-meta2-D", "/buffer -1"); @@ -174,7 +175,7 @@ void gui_keyboard_read () { int key, i, insert_ok; - char key_str[32], *key_utf; + char key_str[32], *key_utf, *input_old; i = 0; /* do not loop too much here (for example when big paste was made), @@ -272,6 +273,12 @@ gui_keyboard_read () /*gui_printf (gui_current_window->buffer, "gui_input_read: key = %s (%d)\n", key_str, key);*/ + if (gui_current_window->buffer->text_search != TEXT_SEARCH_DISABLED) + input_old = (gui_current_window->buffer->input_buffer) ? + strdup (gui_current_window->buffer->input_buffer) : strdup (""); + else + input_old = NULL; + if ((gui_keyboard_pressed (key_str) != 0) && (insert_ok)) { if (strcmp (key_str, "^^") == 0) @@ -292,6 +299,25 @@ gui_keyboard_read () break; } } + + /* incremental text search in buffer */ + if ((gui_current_window->buffer->text_search != TEXT_SEARCH_DISABLED) + && ((input_old == NULL) || (gui_current_window->buffer->input_buffer == NULL) + || (strcmp (input_old, gui_current_window->buffer->input_buffer) != 0))) + { + gui_current_window->start_line = NULL; + gui_current_window->start_line_pos = 0; + gui_current_window->buffer->text_search = TEXT_SEARCH_BACKWARD; + if (!gui_buffer_search_text (gui_current_window)) + { + gui_chat_draw (gui_current_window->buffer, 1); + gui_status_draw (gui_current_window->buffer, 1); + } + } + + if (input_old) + free (input_old); + i++; } } diff --git a/src/gui/gui-action.c b/src/gui/gui-action.c index 2d008cb71..1b24b54eb 100644 --- a/src/gui/gui-action.c +++ b/src/gui/gui-action.c @@ -91,13 +91,15 @@ void gui_action_return (t_gui_window *window, char *args) { char *command; - + /* make C compiler happy */ (void) args; if (window->buffer->has_input) { - if (window->buffer->input_buffer_size > 0) + if (window->buffer->text_search != TEXT_SEARCH_DISABLED) + gui_buffer_search_stop (window); + else if (window->buffer->input_buffer_size > 0) { window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; @@ -133,7 +135,8 @@ gui_action_tab (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->has_input) + if (window->buffer->has_input + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { completion_search (&(window->buffer->completion), 1, window->buffer->input_buffer, @@ -154,7 +157,8 @@ gui_action_tab_previous (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->has_input) + if (window->buffer->has_input + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { completion_search (&(window->buffer->completion), -1, window->buffer->input_buffer, @@ -201,7 +205,7 @@ gui_action_backspace (t_gui_window *window, char *args) } /* - * gui_action_delete: delete key + * gui_action_delete: delete next char */ void @@ -685,53 +689,62 @@ gui_action_up (t_gui_window *window, char *args) } else if (window->buffer->has_input) { - if (window->buffer->ptr_history) + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - window->buffer->ptr_history = - window->buffer->ptr_history->next_history; - if (!window->buffer->ptr_history) - window->buffer->ptr_history = - window->buffer->history; - } - else - window->buffer->ptr_history = - window->buffer->history; - if (window->buffer->ptr_history) - { - /* bash/readline like use of history */ - if (window->buffer->ptr_history->prev_history == NULL) + if (window->buffer->ptr_history) { - if (window->buffer->input_buffer_size > 0) - { - window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; - window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; - history_buffer_add (window->buffer, window->buffer->input_buffer); - history_global_add (window->buffer->input_buffer); - } + window->buffer->ptr_history = + window->buffer->ptr_history->next_history; + if (!window->buffer->ptr_history) + window->buffer->ptr_history = + window->buffer->history; } else + window->buffer->ptr_history = + window->buffer->history; + if (window->buffer->ptr_history) { - if (window->buffer->input_buffer_size > 0) + /* bash/readline like use of history */ + if (window->buffer->ptr_history->prev_history == NULL) { - window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; - window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; - if (window->buffer->ptr_history->prev_history->text) - free(window->buffer->ptr_history->prev_history->text); - window->buffer->ptr_history->prev_history->text = strdup (window->buffer->input_buffer); + if (window->buffer->input_buffer_size > 0) + { + window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; + window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; + history_buffer_add (window->buffer, window->buffer->input_buffer); + history_global_add (window->buffer->input_buffer); + } } + else + { + if (window->buffer->input_buffer_size > 0) + { + window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; + window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; + if (window->buffer->ptr_history->prev_history->text) + free(window->buffer->ptr_history->prev_history->text); + window->buffer->ptr_history->prev_history->text = strdup (window->buffer->input_buffer); + } + } + window->buffer->input_buffer_size = + strlen (window->buffer->ptr_history->text); + window->buffer->input_buffer_length = + utf8_strlen (window->buffer->ptr_history->text); + gui_input_optimize_size (window->buffer); + window->buffer->input_buffer_pos = + window->buffer->input_buffer_length; + window->buffer->input_buffer_1st_display = 0; + strcpy (window->buffer->input_buffer, + window->buffer->ptr_history->text); + gui_input_init_color_mask (window->buffer); + gui_input_draw (window->buffer, 0); } - window->buffer->input_buffer_size = - strlen (window->buffer->ptr_history->text); - window->buffer->input_buffer_length = - utf8_strlen (window->buffer->ptr_history->text); - gui_input_optimize_size (window->buffer); - window->buffer->input_buffer_pos = - window->buffer->input_buffer_length; - window->buffer->input_buffer_1st_display = 0; - strcpy (window->buffer->input_buffer, - window->buffer->ptr_history->text); - gui_input_init_color_mask (window->buffer); - gui_input_draw (window->buffer, 0); + } + else + { + /* search backward in buffer history */ + window->buffer->text_search = TEXT_SEARCH_BACKWARD; + (void) gui_buffer_search_text (window); } } } @@ -746,7 +759,8 @@ gui_action_up_global (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->has_input) + if (window->buffer->has_input + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { if (history_global_ptr) { @@ -815,33 +829,42 @@ gui_action_down (t_gui_window *window, char *args) } else if (window->buffer->has_input) { - if (window->buffer->ptr_history) + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - window->buffer->ptr_history = - window->buffer->ptr_history->prev_history; if (window->buffer->ptr_history) { - window->buffer->input_buffer_size = - strlen (window->buffer->ptr_history->text); - window->buffer->input_buffer_length = - utf8_strlen (window->buffer->ptr_history->text); + window->buffer->ptr_history = + window->buffer->ptr_history->prev_history; + if (window->buffer->ptr_history) + { + window->buffer->input_buffer_size = + strlen (window->buffer->ptr_history->text); + window->buffer->input_buffer_length = + utf8_strlen (window->buffer->ptr_history->text); + } + else + { + window->buffer->input_buffer_size = 0; + window->buffer->input_buffer_length = 0; + } + gui_input_optimize_size (window->buffer); + window->buffer->input_buffer_pos = + window->buffer->input_buffer_length; + window->buffer->input_buffer_1st_display = 0; + if (window->buffer->ptr_history) + { + strcpy (window->buffer->input_buffer, + window->buffer->ptr_history->text); + gui_input_init_color_mask (window->buffer); + } + gui_input_draw (window->buffer, 0); } - else - { - window->buffer->input_buffer_size = 0; - window->buffer->input_buffer_length = 0; - } - gui_input_optimize_size (window->buffer); - window->buffer->input_buffer_pos = - window->buffer->input_buffer_length; - window->buffer->input_buffer_1st_display = 0; - if (window->buffer->ptr_history) - { - strcpy (window->buffer->input_buffer, - window->buffer->ptr_history->text); - gui_input_init_color_mask (window->buffer); - } - gui_input_draw (window->buffer, 0); + } + else + { + /* search forward in buffer history */ + window->buffer->text_search = TEXT_SEARCH_FORWARD; + (void) gui_buffer_search_text (window); } } } @@ -856,7 +879,8 @@ gui_action_down_global (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->has_input) + if (window->buffer->has_input + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { if (history_global_ptr) { @@ -1053,21 +1077,24 @@ gui_action_jump_smart (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (hotlist) + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - if (!hotlist_initial_buffer) - hotlist_initial_buffer = window->buffer; - gui_window_switch_to_buffer (window, hotlist->buffer); - gui_window_redraw_buffer (window->buffer); - } - else - { - if (hotlist_initial_buffer) + if (hotlist) { - gui_window_switch_to_buffer (window, hotlist_initial_buffer); + if (!hotlist_initial_buffer) + hotlist_initial_buffer = window->buffer; + gui_window_switch_to_buffer (window, hotlist->buffer); gui_window_redraw_buffer (window->buffer); - hotlist_initial_buffer = NULL; + } + else + { + if (hotlist_initial_buffer) + { + gui_window_switch_to_buffer (window, hotlist_initial_buffer); + gui_window_redraw_buffer (window->buffer); + hotlist_initial_buffer = NULL; + } } } } @@ -1081,20 +1108,23 @@ gui_action_jump_dcc (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (window->buffer->type == BUFFER_TYPE_DCC) + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - if (gui_buffer_before_dcc) + if (window->buffer->type == BUFFER_TYPE_DCC) { - gui_window_switch_to_buffer (window, - gui_buffer_before_dcc); - gui_window_redraw_buffer (window->buffer); + if (gui_buffer_before_dcc) + { + gui_window_switch_to_buffer (window, + gui_buffer_before_dcc); + gui_window_redraw_buffer (window->buffer); + } + } + else + { + gui_buffer_before_dcc = window->buffer; + gui_buffer_switch_dcc (window); } - } - else - { - gui_buffer_before_dcc = window->buffer; - gui_buffer_switch_dcc (window); } } @@ -1107,20 +1137,23 @@ gui_action_jump_raw_data (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (window->buffer->type == BUFFER_TYPE_RAW_DATA) + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - if (gui_buffer_before_raw_data) + if (window->buffer->type == BUFFER_TYPE_RAW_DATA) { - gui_window_switch_to_buffer (window, - gui_buffer_before_raw_data); - gui_window_redraw_buffer (window->buffer); + if (gui_buffer_before_raw_data) + { + gui_window_switch_to_buffer (window, + gui_buffer_before_raw_data); + gui_window_redraw_buffer (window->buffer); + } + } + else + { + gui_buffer_before_raw_data = window->buffer; + gui_buffer_switch_raw_data (window); } - } - else - { - gui_buffer_before_raw_data = window->buffer; - gui_buffer_switch_raw_data (window); } } @@ -1133,9 +1166,12 @@ gui_action_jump_last_buffer (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (last_gui_buffer) - gui_buffer_switch_by_number (window, last_gui_buffer->number); + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) + { + if (last_gui_buffer) + gui_buffer_switch_by_number (window, last_gui_buffer->number); + } } /* @@ -1148,14 +1184,17 @@ gui_action_jump_server (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (SERVER(window->buffer)) + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - if (SERVER(window->buffer)->buffer != - window->buffer) + if (SERVER(window->buffer)) { - gui_window_switch_to_buffer (window, - SERVER(window->buffer)->buffer); - gui_window_redraw_buffer (window->buffer); + if (SERVER(window->buffer)->buffer != + window->buffer) + { + gui_window_switch_to_buffer (window, + SERVER(window->buffer)->buffer); + gui_window_redraw_buffer (window->buffer); + } } } } @@ -1173,34 +1212,37 @@ gui_action_jump_next_server (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (SERVER(window->buffer)) + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - ptr_server = SERVER(window->buffer)->next_server; - if (!ptr_server) - ptr_server = irc_servers; - while (ptr_server != SERVER(window->buffer)) + if (SERVER(window->buffer)) { - if (ptr_server->buffer) - break; - ptr_server = (ptr_server->next_server) ? - ptr_server->next_server : irc_servers; - } - if (ptr_server != SERVER(window->buffer)) - { - /* save current buffer */ - SERVER(window->buffer)->saved_buffer = window->buffer; - - /* come back to memorized chan if found */ - if (ptr_server->saved_buffer) - ptr_buffer = ptr_server->saved_buffer; - else - ptr_buffer = (ptr_server->channels) ? - ptr_server->channels->buffer : ptr_server->buffer; - if ((ptr_server->buffer == ptr_buffer) - && (ptr_buffer->all_servers)) - ptr_buffer->server = ptr_server; - gui_window_switch_to_buffer (window, ptr_buffer); - gui_window_redraw_buffer (window->buffer); + ptr_server = SERVER(window->buffer)->next_server; + if (!ptr_server) + ptr_server = irc_servers; + while (ptr_server != SERVER(window->buffer)) + { + if (ptr_server->buffer) + break; + ptr_server = (ptr_server->next_server) ? + ptr_server->next_server : irc_servers; + } + if (ptr_server != SERVER(window->buffer)) + { + /* save current buffer */ + SERVER(window->buffer)->saved_buffer = window->buffer; + + /* come back to memorized chan if found */ + if (ptr_server->saved_buffer) + ptr_buffer = ptr_server->saved_buffer; + else + ptr_buffer = (ptr_server->channels) ? + ptr_server->channels->buffer : ptr_server->buffer; + if ((ptr_server->buffer == ptr_buffer) + && (ptr_buffer->all_servers)) + ptr_buffer->server = ptr_server; + gui_window_switch_to_buffer (window, ptr_buffer); + gui_window_redraw_buffer (window->buffer); + } } } } @@ -1231,12 +1273,13 @@ gui_action_scroll_previous_highlight (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->type == BUFFER_TYPE_STANDARD) + if ((window->buffer->type == BUFFER_TYPE_STANDARD) + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { if (window->buffer->lines) { ptr_line = (window->start_line) ? - window->start_line->prev_line : window->buffer->last_line->prev_line; + window->start_line->prev_line : window->buffer->last_line; while (ptr_line) { if (ptr_line->line_with_highlight) @@ -1267,7 +1310,8 @@ gui_action_scroll_next_highlight (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->type == BUFFER_TYPE_STANDARD) + if ((window->buffer->type == BUFFER_TYPE_STANDARD) + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { if (window->buffer->lines) { @@ -1300,19 +1344,22 @@ gui_action_scroll_unread (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (cfg_look_read_marker && - cfg_look_read_marker[0] && - (window->buffer->type == BUFFER_TYPE_STANDARD) && - window->buffer->last_read_line && - window->buffer->last_read_line != window->buffer->last_line) + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - window->start_line = window->buffer->last_read_line->next_line; - window->start_line_pos = 0; - window->first_line_displayed = - (window->start_line == window->buffer->lines); - gui_chat_draw (window->buffer, 1); - gui_status_draw (window->buffer, 0); + if (cfg_look_read_marker && + cfg_look_read_marker[0] && + (window->buffer->type == BUFFER_TYPE_STANDARD) && + window->buffer->last_read_line && + window->buffer->last_read_line != window->buffer->last_line) + { + window->start_line = window->buffer->last_read_line->next_line; + window->start_line_pos = 0; + window->first_line_displayed = + (window->start_line == window->buffer->lines); + gui_chat_draw (window->buffer, 1); + gui_status_draw (window->buffer, 0); + } } } @@ -1389,3 +1436,23 @@ gui_action_insert_string (t_gui_window *window, char *args) gui_input_draw (window->buffer, 0); } } + +/* + * gui_action_search_text: search text in buffer history + */ + +void +gui_action_search_text (t_gui_window *window, char *args) +{ + /* make C compiler happy */ + (void) args; + + if (window->buffer->type == BUFFER_TYPE_STANDARD) + { + /* toggle search */ + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) + gui_buffer_search_start (window); + else + gui_buffer_search_stop (window); + } +} diff --git a/src/gui/gui-buffer.c b/src/gui/gui-buffer.c index 423a70f3a..631287a19 100644 --- a/src/gui/gui-buffer.c +++ b/src/gui/gui-buffer.c @@ -207,6 +207,10 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type, new_buffer->ptr_history = NULL; new_buffer->num_history = 0; + /* text search */ + new_buffer->text_search = TEXT_SEARCH_DISABLED; + new_buffer->text_search_input = NULL; + /* add buffer to buffers queue */ new_buffer->prev_buffer = last_gui_buffer; if (gui_buffers) @@ -550,6 +554,9 @@ gui_buffer_free (t_gui_buffer *buffer, int switch_to_another) history_buffer_free (buffer); + if (buffer->text_search_input) + free (buffer->text_search_input); + /* remove buffer from buffers list */ if (buffer->prev_buffer) buffer->prev_buffer->next_buffer = buffer->next_buffer; @@ -630,6 +637,31 @@ gui_buffer_line_new (t_gui_buffer *buffer, time_t date) return new_line; } +/* + * gui_buffer_line_search: search for text in a line + */ + +int +gui_buffer_line_search (t_gui_line *line, char *text, int case_sensitive) +{ + char *data; + int rc; + + if (!text) + return 0; + + rc = 0; + data = (char *)gui_color_decode ((unsigned char *)line->data, 0); + if (data) + { + if ((case_sensitive && (strstr (data, text))) + || (!case_sensitive && (strcasestr (data, text)))) + rc = 1; + free (data); + } + return rc; +} + /* * gui_buffer_merge_servers: merge server buffers in one buffer */ @@ -945,6 +977,107 @@ gui_buffer_move_to_number (t_gui_buffer *buffer, int number) gui_window_redraw_buffer (buffer); } +/* + * gui_buffer_search_start: start search in a buffer + */ + +void +gui_buffer_search_start (t_gui_window *window) +{ + window->buffer->text_search = TEXT_SEARCH_BACKWARD; + if (window->buffer->text_search_input) + { + free (window->buffer->text_search_input); + window->buffer->text_search_input = NULL; + } + if (window->buffer->input_buffer && window->buffer->input_buffer[0]) + window->buffer->text_search_input = + strdup (window->buffer->input_buffer); + gui_action_delete_line (window, NULL); + gui_status_draw (window->buffer, 1); + gui_input_draw (window->buffer, 1); +} + +/* + * gui_buffer_search_stop: stop search in a buffer + */ + +void +gui_buffer_search_stop (t_gui_window *window) +{ + window->buffer->text_search = TEXT_SEARCH_DISABLED; + gui_action_delete_line (window, NULL); + if (window->buffer->text_search_input) + { + gui_insert_string_input (window, window->buffer->text_search_input, -1); + free (window->buffer->text_search_input); + window->buffer->text_search_input = NULL; + } + window->start_line = NULL; + window->start_line_pos = 0; + gui_chat_draw (window->buffer, 0); + gui_status_draw (window->buffer, 1); + gui_input_draw (window->buffer, 1); +} + +/* + * gui_buffer_search_text: search text in a buffer + */ + +int +gui_buffer_search_text (t_gui_window *window) +{ + t_gui_line *ptr_line; + + if (window->buffer->text_search == TEXT_SEARCH_BACKWARD) + { + if (window->buffer->lines + && window->buffer->input_buffer && window->buffer->input_buffer[0]) + { + ptr_line = (window->start_line) ? + window->start_line->prev_line : window->buffer->last_line; + while (ptr_line) + { + if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer, 0)) + { + window->start_line = ptr_line; + window->start_line_pos = 0; + window->first_line_displayed = + (window->start_line == window->buffer->lines); + gui_chat_draw (window->buffer, 1); + gui_status_draw (window->buffer, 1); + return 1; + } + ptr_line = ptr_line->prev_line; + } + } + } + else if (window->buffer->text_search == TEXT_SEARCH_FORWARD) + { + if (window->buffer->lines + && window->buffer->input_buffer && window->buffer->input_buffer[0]) + { + ptr_line = (window->start_line) ? + window->start_line->next_line : window->buffer->lines->next_line; + while (ptr_line) + { + if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer, 0)) + { + window->start_line = ptr_line; + window->start_line_pos = 0; + window->first_line_displayed = + (window->start_line == window->buffer->lines); + gui_chat_draw (window->buffer, 1); + gui_status_draw (window->buffer, 1); + return 1; + } + ptr_line = ptr_line->next_line; + } + } + } + return 0; +} + /* * gui_buffer_print_log: print buffer infos in log (usually for crash dump) */ @@ -982,6 +1115,9 @@ gui_buffer_print_log (t_gui_buffer *buffer) weechat_log_printf (" history. . . . . . . . : 0x%X\n", buffer->history); weechat_log_printf (" last_history . . . . . : 0x%X\n", buffer->last_history); weechat_log_printf (" ptr_history. . . . . . : 0x%X\n", buffer->ptr_history); + weechat_log_printf (" num_history. . . . . . : %d\n", buffer->num_history); + weechat_log_printf (" text_search. . . . . . : %d\n", buffer->text_search); + weechat_log_printf (" text_search_input. . . : '%s'\n", buffer->text_search_input); weechat_log_printf (" prev_buffer. . . . . . : 0x%X\n", buffer->prev_buffer); weechat_log_printf (" next_buffer. . . . . . : 0x%X\n", buffer->next_buffer); weechat_log_printf ("\n"); diff --git a/src/gui/gui-buffer.h b/src/gui/gui-buffer.h index 75e364898..679e6c92c 100644 --- a/src/gui/gui-buffer.h +++ b/src/gui/gui-buffer.h @@ -51,6 +51,10 @@ #define NOTIFY_LEVEL_MAX 3 #define NOTIFY_LEVEL_DEFAULT NOTIFY_LEVEL_MAX +#define TEXT_SEARCH_DISABLED 0 +#define TEXT_SEARCH_BACKWARD 1 +#define TEXT_SEARCH_FORWARD 2 + /* buffer structures */ typedef struct t_gui_line t_gui_line; @@ -122,6 +126,10 @@ struct t_gui_buffer t_history *ptr_history; /* current command in history */ int num_history; /* number of commands in history */ + /* text search */ + int text_search; /* text search type */ + char *text_search_input; /* input saved before text search */ + /* link to previous/next buffer */ t_gui_buffer *prev_buffer; /* link to previous buffer */ t_gui_buffer *next_buffer; /* link to next buffer */ diff --git a/src/gui/gui-keyboard.c b/src/gui/gui-keyboard.c index db6f238ac..bf617011c 100644 --- a/src/gui/gui-keyboard.c +++ b/src/gui/gui-keyboard.c @@ -145,6 +145,8 @@ t_gui_key_function gui_key_functions[] = N_("grab a key") }, { "insert", gui_action_insert_string, N_("insert a string in command line") }, + { "search_text", gui_action_search_text, + N_("search text in buffer history") }, { NULL, NULL, NULL } }; @@ -580,11 +582,14 @@ gui_keyboard_pressed (char *key_str) else (void)(ptr_key->function)(gui_current_window, ptr_key->args); #ifdef PLUGINS - (void) plugin_keyboard_handler_exec ( - (ptr_key->command) ? - ptr_key->command : gui_keyboard_function_search_by_ptr (ptr_key->function), - buffer_before_key, - gui_current_window->buffer->input_buffer); + if (gui_current_window->buffer->text_search == TEXT_SEARCH_DISABLED) + { + (void) plugin_keyboard_handler_exec ( + (ptr_key->command) ? + ptr_key->command : gui_keyboard_function_search_by_ptr (ptr_key->function), + buffer_before_key, + gui_current_window->buffer->input_buffer); + } #endif if (buffer_before_key) free (buffer_before_key); diff --git a/src/gui/gui.h b/src/gui/gui.h index dacc950bd..3b24a1bb0 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -90,6 +90,7 @@ extern void gui_buffer_clear (t_gui_buffer *); extern void gui_buffer_clear_all (); extern void gui_buffer_free (t_gui_buffer *, int); extern t_gui_line *gui_buffer_line_new (t_gui_buffer *, time_t); +extern int gui_buffer_line_search (t_gui_line *, char *, int); extern void gui_buffer_merge_servers (t_gui_window *); extern void gui_buffer_split_server (t_gui_window *); extern void gui_buffer_switch_previous (t_gui_window *); @@ -98,6 +99,9 @@ extern void gui_buffer_switch_dcc (t_gui_window *); extern void gui_buffer_switch_raw_data (t_gui_window *); extern t_gui_buffer *gui_buffer_switch_by_number (t_gui_window *, int); extern void gui_buffer_move_to_number (t_gui_buffer *, int); +extern void gui_buffer_search_start (t_gui_window *); +extern void gui_buffer_search_stop (t_gui_window *); +extern int gui_buffer_search_text (t_gui_window *); extern void gui_buffer_print_log (t_gui_buffer *); /* panel */ @@ -157,6 +161,7 @@ extern void gui_action_infobar_clear (t_gui_window *, char *); extern void gui_action_refresh_screen (t_gui_window *, char *); extern void gui_action_grab_key (t_gui_window *, char *); extern void gui_action_insert_string (t_gui_window *, char *); +extern void gui_action_search_text (t_gui_window *, char *); /* key */ extern void gui_keyboard_init (); diff --git a/weechat/ChangeLog b/weechat/ChangeLog index 9b0f046e1..e4793ea7c 100644 --- a/weechat/ChangeLog +++ b/weechat/ChangeLog @@ -5,6 +5,8 @@ ChangeLog - 2007-03-16 Version 0.2.4 (under dev!): + * added new key (ctrl-S) for interactive and incremental search in buffer + history (task #6628) * fixed /topic completion when no topic set on current channel (bug #19322) * improved password hiding, code cleanup (bug #19229) * added new return code in plugin API to force highlight (for message diff --git a/weechat/doc/de/key_functions.xml b/weechat/doc/de/key_functions.xml index af42e3525..5e3ffdf6d 100644 --- a/weechat/doc/de/key_functions.xml +++ b/weechat/doc/de/key_functions.xml @@ -201,3 +201,7 @@ insert insert a string in command line + + search_text + search text in buffer history + diff --git a/weechat/doc/de/weechat.de.xml b/weechat/doc/de/weechat.de.xml index 45f79f9d0..22151a067 100644 --- a/weechat/doc/de/weechat.de.xml +++ b/weechat/doc/de/weechat.de.xml @@ -512,6 +512,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Fenster neu aufbauen + + Strg + S + + + Search for text in buffer history + + Strg + T @@ -571,6 +578,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Hoch / Runter Rufe das letzte Kommando/die letzte Nachricht wieder auf + + (in search mode: search up/down) diff --git a/weechat/doc/de/weechat_commands.xml b/weechat/doc/de/weechat_commands.xml index f32dd9aad..40faa583a 100644 --- a/weechat/doc/de/weechat_commands.xml +++ b/weechat/doc/de/weechat_commands.xml @@ -11,7 +11,7 @@ einen Alias f alias_name: name of alias command: command name (WeeChat or IRC command, many commands can be separated by semicolons) -arguments: arguments for command + arguments: arguments for command is replaced by all arguments. diff --git a/weechat/doc/en/key_functions.xml b/weechat/doc/en/key_functions.xml index 1680aeb29..5785eec3d 100644 --- a/weechat/doc/en/key_functions.xml +++ b/weechat/doc/en/key_functions.xml @@ -201,3 +201,7 @@ insert insert a string in command line + + search_text + search text in buffer history + diff --git a/weechat/doc/en/weechat.en.xml b/weechat/doc/en/weechat.en.xml index c0f279dda..1f8b3f143 100644 --- a/weechat/doc/en/weechat.en.xml +++ b/weechat/doc/en/weechat.en.xml @@ -508,6 +508,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Redraw whole window + + Ctrl + S + + Search for text in buffer history + + Ctrl + T @@ -566,7 +572,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Up arrow / Down arrow - Call again last commands/messages + Call again last commands/messages (in search mode: search + up/down) diff --git a/weechat/doc/en/weechat_commands.xml b/weechat/doc/en/weechat_commands.xml index 607a51c8e..19baf023a 100644 --- a/weechat/doc/en/weechat_commands.xml +++ b/weechat/doc/en/weechat_commands.xml @@ -11,7 +11,7 @@ create an alias for a command alias_name: name of alias command: command name (WeeChat or IRC command, many commands can be separated by semicolons) -arguments: arguments for command + arguments: arguments for command is replaced by all arguments. diff --git a/weechat/doc/fr/key_functions.xml b/weechat/doc/fr/key_functions.xml index bf756c49a..99d68e155 100644 --- a/weechat/doc/fr/key_functions.xml +++ b/weechat/doc/fr/key_functions.xml @@ -201,3 +201,7 @@ insert insrer une chane dans la ligne de commande + + search_text + recherche de texte dans l'historique du tampon + diff --git a/weechat/doc/fr/weechat.fr.xml b/weechat/doc/fr/weechat.fr.xml index 8cc7414f7..9dee88cdc 100644 --- a/weechat/doc/fr/weechat.fr.xml +++ b/weechat/doc/fr/weechat.fr.xml @@ -517,6 +517,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Rafficher toute la fentre + + Ctrl + S + + Chercher du texte dans l'historique du tampon + + Ctrl + T @@ -577,6 +583,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Flche haut / flche bas Rappeler les dernires commandes ou messages + (en mode recherche: chercher en haut/bas) diff --git a/weechat/po/cs.po b/weechat/po/cs.po index 9d32f8b16..d852a5265 100644 --- a/weechat/po/cs.po +++ b/weechat/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -1339,99 +1339,99 @@ msgstr "nemůžu změnit mód přo ostatní uživatele" msgid "whois (secure connection)" msgstr "whois (zabezpečená část)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServer: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "připojen" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "nepřipojen" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "na" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "off" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (dočasný server, nebude uložen)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "sekund" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(skrytý)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: používám jméno hosta \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s nemohu najít přezdívku pro poslání zprávy\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" příkaz nemůže být spuštěn v bufferu serveru\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s špatné parametry pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" není validní regulární výraz (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nedostatek paměti pro regulární výraz\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" příkaz může být spuštěn pouze v bufferu kanálu nebo soukromého " "rozhovoru\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1439,12 +1439,12 @@ msgstr "%s přezdívka \"%s\" nebyla nalezena pro příkaz \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nemohu vytvořít nové soukromý buffer\"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompilováno na %s %s\n" @@ -1654,11 +1654,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s byl %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s nečinný: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "dní" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "den" @@ -2200,7 +2200,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" odebrán.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" nenalezen\n" @@ -2260,31 +2260,35 @@ msgstr "GB" msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Akceptovat" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Storno" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Odebrat" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Pročistit staré DCC" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] Zavřít DCC pohled" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Vyčistit buffer" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Zavřít čistý pohled na data" @@ -2303,31 +2307,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(pryč)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[nepřipojen] " -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr "<ČISTÉ_IRC> " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Aktivní: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "ČISTÉ_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Zpoždění: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-VÍCE-" @@ -2335,7 +2340,7 @@ msgstr "-VÍCE-" msgid "server" msgstr "server" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Nedostatek paměti pro nový řádek\n" @@ -2540,17 +2545,22 @@ msgstr "zachytit klávesu" msgid "insert a string in command line" msgstr "vložit řetězec na řádku" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "sezení: načítám historii bufferu\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s nemohu napojit kalávesu \"%s\"\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "%s nemohu napojit kalávesu \"%s\" (nevalidní jméno funkce: \"%s\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s nedostatek paměti pro klávesovou zkratku\n" @@ -3250,8 +3260,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s buffer nenalezen pro příkaz \"%s\"\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s neznámá volba pro příkaz \"%s\"\n" @@ -3465,7 +3475,7 @@ msgstr "Nebyl nalezen žádný plugin\n" msgid " (no plugin)\n" msgstr " (není plugin)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3568,151 +3578,151 @@ msgstr "%s nemohu vytvořit server\n" msgid "(unknown)" msgstr "(neznámý)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(heslo schováno) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s server \"%s\" nenalezen\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s volba nastavení \"%s\" nenalezena\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s nekorektní hodnota pro volbu \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s volba \"%s\" nemůže být změněna dokud WeeChat běží\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Nebyla nalezena žádná volba nastavení s \"%s\"\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Nebyla nalezena žádná volba nastavení\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sDetail:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . typ boolean (hodnota: 'on' nebo 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . výchozí hodnota: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . typ celočíselný (hodnoty: mezi %d a %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . výchozí hodnota: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . typ řetězec (hodnoty: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "prázdný" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . typ barva (Curses nebo Gtk barva, viz WeeChat dokumentace)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . typ řetězec (jakýkoliv řetězec)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . popis: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "volba/volby nastavení nalezeny s \"%s\"\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "volba/volby nastavení nalezeny\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s nekorektní hodnota pro možnost pluginu \"%s\"\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Nebyla nalezena žádná možnost pluginu s \"%s\"\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Nebyla nalezena žádná možnost pluginu\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "možnost(i) pluginu nalezeny s \"%s\"\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "možnost(i) pluginu nalezeny\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias nebo příkaz \"%s\" nenalezen\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" odebrán\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "ignorování bylo odebráno.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "ignorování bylo odebrán\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s žádné ignorování nenaleyeno\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "%s nemůžu aktualizovat: existují nevyřešená spojení na server\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3721,7 +3731,7 @@ msgstr "" "%s nemohu aktualiyovat: je aktuvní jedno nebo více připojení na SSL server " "(mělo by být opraveno v budoucnosti)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3730,35 +3740,35 @@ msgstr "" "%s nemůžu aktualizovat: anti-flood je aktivní na alespoň jednom serveru " "(posílání mnoha řádků)\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Aktualizuji WeeChat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s nemohu uložit sezení do souboru\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s exec selhal (program: \"%s\"), ukončuji WeeChat\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "Čas běhu WeeChat: %d %s %02d:%02d:%02d, spuštěn %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "Čas běhu WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, spuštěn %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Otevřené okna:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/weechat/po/de.po b/weechat/po/de.po index 87f65d9b8..3585f455c 100644 --- a/weechat/po/de.po +++ b/weechat/po/de.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Thomas Schuetz \n" "Language-Team: \n" @@ -1339,100 +1339,100 @@ msgstr "Modes anderer User können nicht geändert werden" msgid "whois (secure connection)" msgstr "whois (sichere Verbindung)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServer: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "verbunden" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "nicht verbunden" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "an" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "aus" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (temporärer Server, wird nicht gespeichert)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "Sekunden" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(versteckt)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: benutze lokalen Hostnamen \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" "%s kann keinen Nickname finden, an den die Nachricht gesendet werden soll\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s der Befehl \"%s\" benötigt eine Serververbindung!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s der \"%s\"-Befehl kann nur in Channelfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s der \"%s\"-Befehl kann nicht in Serverfenstern ausgeführt werden\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" ist kein korrekter regulärer Ausdruck (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nicht genügend Speicher für regulären Ausdruck vorhanden\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s der \"%s\"-Befehl kann nur in Channelfenstern oder in privaten Fenstern " "ausgeführt werden\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1440,12 +1440,12 @@ msgstr "%s Nickname \"%s\" für den \"%s\"-Befehl nicht gefunden\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s fehlerhafte Anzahl von Argumenten für der \"%s\"-Befehl\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s kann kein neues privates Fenster \"%s\" erzeugen\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, kompiliert auf %s %s\n" @@ -1655,11 +1655,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s war %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s idlet: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "Tage" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "Tag" @@ -2208,7 +2208,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" entladen.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s Plugin \"%s\" nicht gefunden\n" @@ -2268,31 +2268,35 @@ msgstr "GB" msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] annehmen" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] abbrechen" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] entfernen" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] alte DCCs entfernen" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] DCC-Ansicht schließen" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Puffer löschen" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Rohdatenansicht schließen" @@ -2311,31 +2315,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(abwesend)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[nicht verbunden]" -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr " " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Aktiv: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "RAW_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-MEHR-" @@ -2343,7 +2348,7 @@ msgstr "-MEHR-" msgid "server" msgstr "Server" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Nicht genügend Speicher für neue Zeile\n" @@ -2549,18 +2554,23 @@ msgstr "Tastencode ermitteln und einfügen" msgid "insert a string in command line" msgstr "" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "Sitzung: lade Puffer-Verlauf\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s kann die Taste \"%s\" nicht zuordnen\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s kann die Taste \"%s\" nicht zuornen (ungültiger Funktionsname: \"%s\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s nicht genügend Speicher für Tastenzuordnung\n" @@ -3265,8 +3275,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s Nickname nicht gefunden für den \"%s\"-Befehl\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s unbekannte Option für den \"%s\"-Befehl\n" @@ -3481,7 +3491,7 @@ msgstr "Kein Plugin gefunden.\n" msgid " (no plugin)\n" msgstr " (kein Plugin)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3587,153 +3597,153 @@ msgstr "%s kann den Server nicht anlegen\n" msgid "(unknown)" msgstr "(unbekannt)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(Passwort versteckt) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s Server \"%s\" nicht gefunden\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s Konfigurationsoption \"%s\" nicht gefunden\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s ungültiger Wert für die Option \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s Option \"%s\" kann nicht zur Laufzeit geändert werden\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Keine Konfigurationsoptionen mit \"%s\" gefunden\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Keine Konfigurationsoption gefunden\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sDetail:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . boolesche Werte ('on' or 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . Standardwert: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . Ganzzahl (Werte zwischen %d und %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . Standardwert: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . Zeichenfolge (Werte: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "leer" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . Farbe (Curses- or Gtk-color, siehe WeeChat-Dokumentation)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . Zeichenfolge (beliebig)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . Beschreibung: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "Konfigurationsoption(en) gefunden mit \"%s\"\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "Konfigurationsoption(en) gefunden\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s ungültiger Wert für die Plugin-Option \"%s\"\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Keine Plugin-Optionen mit \"%s\" gefunden\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Keine Plugin-Option gefunden\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "Plugin-Option(en) gefunden mit \"%s\"\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "Plugin-Option(en) gefunden\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s Alias oder Befehl \"%s\" nicht gefunden\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" entfernt\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "/ignore-Regeln entfernt.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "/ignore-Regel entfernt.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s Keine /ignore-Regel gefunden.\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "" "%s Aktualisierung nicht möglich: es wird noch auf eine Verbindung zu " "mindestens einem Server gewartet\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3743,7 +3753,7 @@ msgstr "" "mindestens einem Server (sollte in einer zukünftigen Version bereinigt " "sein)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, fuzzy, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3752,36 +3762,36 @@ msgstr "" "%s Aktualisierung nicht möglich: es wird noch auf eine Verbindung zu " "mindestens einem Server gewartet\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Aktualisiere WeeChat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s kann die Sitzung nicht in eine Datei speichern\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s Ausführung schlug fehl (Programm: \"%s\"), WeeChat wird beendet\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "WeeChat Uptime: %d %s %02d:%02d:%02d, gestartet am %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "" "WeeChat Uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, gestartet am %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Geöffnete Fenster:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/weechat/po/es.po b/weechat/po/es.po index c73ea62b4..d2ce1b7da 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: Weechat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Roberto Gonzlez Cardenete \n" "Language-Team: weechat-dev \n" @@ -1357,99 +1357,99 @@ msgstr "no es posible cambiar el modo para el resto de usuarios" msgid "whois (secure connection)" msgstr "quin es (conexin segura)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServidor:%s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "conectado" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "no conectado" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "activo" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "inactivo" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (servidor temporal, no ser guardado)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "segundos" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(oculto)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: utilizando nombre de mquina local \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s el comando \"%s\" requiere una conexin a servidor!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s el comando \"%s\" no puede ejecutarse en una ventana de servidor\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s argumentos incorrectos para el comando \"%s\"\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" no es una expresin regular vlida (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s no hay suficiente memoria para la expresin regular\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s el comando \"%s\" slo puede ser ejecutado en una ventana de canal\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1457,12 +1457,12 @@ msgstr "%s usuario \"%s\" no encontrado para el comando \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s no es posible crear una nueva ventana privada \"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" @@ -1672,11 +1672,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s estaba %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactividad: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "das" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "da" @@ -2237,7 +2237,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" descargado.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" no encontrado\n" @@ -2298,32 +2298,36 @@ msgstr "" msgid "ETA" msgstr "Tiempo estimado de llegada" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Aceptar" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Cancelar" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Eliminar" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Purgar los viejos DCC" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] Cerrar la vista DCC" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 #, fuzzy msgid " [C] Clear buffer" msgstr "saltar al bfer DCC" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Cerrar vista de datos basura" @@ -2342,31 +2346,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(ausente)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[no conectado] " -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr " " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "RAW_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-MS-" @@ -2374,7 +2379,7 @@ msgstr "-M msgid "server" msgstr "servidor" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "No hay suficiente memoria para una nueva lnea\n" @@ -2580,19 +2585,24 @@ msgstr "capturar una clave" msgid "insert a string in command line" msgstr "" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "sesin: cargando historial del bfer\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s No ha sido posible atar la clave \"%s\"\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s No ha sido posible atar la clave \"%s\" (nombre de funcin invlido: \"%s" "\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s no hay suficiente memoria para atar la clave\n" @@ -3286,8 +3296,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s nombre de usuario no encontrado para el comando \"%s\"\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opcin desconocida para el comando \"%s\"\n" @@ -3510,7 +3520,7 @@ msgstr "Ninguna opci msgid " (no plugin)\n" msgstr " (sin plugins)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3616,153 +3626,153 @@ msgstr "%s no es posible crear el servidor\n" msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(contrasea oculta) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s opcin de configuracin \"%s\" no encontrada\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opcin \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" "%s la opcin \"%s\" no puede ser modificada mientras WeeChat est en " "ejecucin\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Ninguna opcin de configuracin encontrada con \"%s\"\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Ninguna opcin de configuracin encontrada\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sDetalle:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . tipo booleano (valores: 'on' u 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . valor por defecto: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . tipo entero (valores: entre %d y %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . valor por defecto: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . tipo cadena (valores: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "vaco" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . tipo color (color Curses o Gtk, ver la documentacin de WeeChat)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . tipo cadena (cualquier cadena)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . descripcin: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "opcin/opciones de configuracin encontrada(s) con \"%s\"\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "opcin/opciones de configuracin encontrada(s)\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s valor incorrecto para la opcin de plugin \"%s\"\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Ninguna opcin de plugin encontrada con \"%s\"\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Ninguna opcin de plugin encontrada\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "opcin/opciones de plugin encontrada(s) con \"%s\"\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "opcin/opciones de plugin encontrada(s)\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "los ignores fueron eliminados.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "el ignore fue eliminado.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s no se encontraron ignores\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "%s no se puede actualizar: conexin pendiente a un servidor al menos\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3771,45 +3781,45 @@ msgstr "" "%s no se puede actualizar: conexin activa a un servidor SSL por lo menos " "(debera ser corregido en una futura versin)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, fuzzy, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " "lines)\n" msgstr "%s no se puede actualizar: conexin pendiente a un servidor al menos\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Actualizando Weechat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s no ha sido posible guardar la sesin en el archivo\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s exec ha fallado (programa: \"%s\"), saliendo de Weechat\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "Tiempo de uso de WeeChat: %d %s %02d:%02d:%02d, empez en %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "" "Tiempo de uso de WeeChat: %s%d %s%s %s%02d%s: %s%02d%s:%s%02d%s, empez en %s" "%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 #, fuzzy msgid "Open windows:\n" msgstr "Ventanas abiertas:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/weechat/po/fr.po b/weechat/po/fr.po index de024cf81..1921b7121 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" -"PO-Revision-Date: 2007-03-07 09:31+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" +"PO-Revision-Date: 2007-03-16 14:36+0100\n" "Last-Translator: FlashCode \n" "Language-Team: weechat-dev \n" "MIME-Version: 1.0\n" @@ -1345,101 +1345,101 @@ msgstr "impossible de changer le mode pour les autres utilisateurs" msgid "whois (secure connection)" msgstr "whois (connexion scurise)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sServeur: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "connect" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "non connect" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "activ" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "dsactiv" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (serveur temporaire, ne sera pas sauv)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "secondes" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(cach)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s la commande \"%s\" ncessite une connexion au serveur !\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" "%s la commande \"%s\" peut seulement tre excute dans un tampon canal\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" "%s la commande \"%s\" ne peut pas tre excute dans un tampon serveur\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s paramtres invalides pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" n'est pas une expression rgulire valide (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s pas assez de mmoire pour l'expression rgulire\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s la commande \"%s\" peut seulement tre excute dans un tampon canal ou " "priv\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s pseudo \"%s\" non trouv pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1447,12 +1447,12 @@ msgstr "%s pseudo \"%s\" non trouv msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramtres erron pour la commande \"%s\"\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s impossible de crer le tampon priv \"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, compil le %s %s\n" @@ -1662,11 +1662,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactivit: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "jour" @@ -2225,7 +2225,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Extension \"%s\" dcharge.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s extension \"%s\" non trouve\n" @@ -2287,31 +2287,35 @@ msgstr "Go" msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "Recherche texte: " + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Accepter" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Annuler" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Retirer" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Purger anciens DCC" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] Fermer la vue DCC" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Effacer le tampon" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Fermer la vue IRC brut" @@ -2330,31 +2334,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(absent)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[non connect] " -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr " " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "IRC_BRUT" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-PLUS-" @@ -2362,7 +2367,7 @@ msgstr "-PLUS-" msgid "server" msgstr "serveur" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Pas assez de mmoire pour une nouvelle ligne !\n" @@ -2567,18 +2572,22 @@ msgstr "capturer une touche" msgid "insert a string in command line" msgstr "insrer une chane dans la ligne de commande" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +msgid "search text in buffer history" +msgstr "recherche de texte dans l'historique du tampon" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s impossible de crer la touche \"%s\"\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s impossible de crer la touche \"%s\" (nom fonction incorrect: \"%s\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s pas assez de mmoire pour la touche\n" @@ -3297,8 +3306,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s tampon non trouv pour la commande \"%s\"\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" @@ -3513,7 +3522,7 @@ msgstr "Aucune extension trouv msgid " (no plugin)\n" msgstr " (aucune extension)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3617,153 +3626,153 @@ msgstr "%s impossible de cr msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(mot de passe cach) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouv\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouve\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s l'option \"%s\" ne peut pas tre change lorsque WeeChat tourne\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouve avec \"%s\"\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Aucune option de configuration trouve\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sDtail :\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . type boolen (valeurs: 'on' ou 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . valeur par dfaut: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . type entier (valeurs: entre %d et %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . valeur par dfaut: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . type chane (valeurs: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "vide" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . type couleur (couleur Curses ou Gtk, voir la doc WeeChat)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . type chane (toute chane)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . description: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "option(s) de configuration trouve(s) avec \"%s\"\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "option(s) de configuration trouve(s)\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option d'extension \"%s\"\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Aucune option de configuration d'extension trouve avec \"%s\"\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Aucune option de configuration d'extension trouve\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "option(s) de configuration d'extension trouve(s) avec \"%s\"\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "option(s) de configuration d'extension trouve(s)\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouv\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprim\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "ignore ont t supprims.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "ignore a t supprim.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s aucun ignore trouv\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "" "%s impossible de mettre jour: une connexion au moins un serveur est en " "cours\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3772,7 +3781,7 @@ msgstr "" "%s impossible de mettre jour: une connexion au moins un serveur SSL est " "active (devrait tre corrig dans une future version)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3781,35 +3790,35 @@ msgstr "" "%s impossible de mettre jour: l'anti-flood est actif sur au moins un " "serveur (envoi de plusieurs lignes)\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Mise jour de WeeChat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s impossible de sauver la session dans le fichier\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s l'excution a chou (programme: \"%s\"), sortie de WeeChat\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "Uptime WeeChat: %d %s %02d:%02d:%02d, dmarr le %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "Uptime WeeChat: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, dmarr le %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Fentres ouvertes:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/weechat/po/hu.po b/weechat/po/hu.po index 7d6d2603e..5a4987b79 100644 --- a/weechat/po/hu.po +++ b/weechat/po/hu.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -1351,97 +1351,97 @@ msgstr "más felhasználók üzemmódját nem módosíthatja" msgid "whois (secure connection)" msgstr "kicsoda (titkosított kapcsolat)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%s Szerver: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "csatlakozva" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "nincs csatlakozva" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "be" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "ki" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (átmeneti szerver, nem lesz mentve)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "másodperc" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(rejtett)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: felhasznált hosztnév \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s nem található név az üzenet küldéséhez\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s a \"%s\" parancs futtatásához csatlakozni kell a szerverhez!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" parancs nem futtatható a szerverablakban\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s rossz argumentum a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s a(z) \"%s\" érvénytelen reguláris kifejezés (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s nincs elég memória a reguláris kifejezéshez\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "%s \"%s\" parancs csak a szobaablakban futtatható\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1449,12 +1449,12 @@ msgstr "%s név \"%s\" nem található a \"%s\" parancshoz\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s nem sikerült új privát ablakot nyitni \"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, lefordítva: %s %s\n" @@ -1664,11 +1664,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s neve %s volt\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s tétlen: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "nap" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "nap" @@ -2209,7 +2209,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "A \"%s\" modul eltávolítva.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s a \"%s\" modul nem található\n" @@ -2268,31 +2268,35 @@ msgstr "GB" msgid "ETA" msgstr "ETA" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Elfogadás" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Mégsem" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Eltávolítás" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Régi DCC törlése" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] DCC nézet bezárása" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Puffer törlése" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Nyers adat nézet bezárása" @@ -2311,31 +2315,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(távol)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[nincs csatlakozva]" -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr " " -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Akt: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "NYERS_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-TOVÁBB-" @@ -2343,7 +2348,7 @@ msgstr "-TOVÁBB-" msgid "server" msgstr "szerver" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Nincs elég memória az új sorhoz\n" @@ -2548,19 +2553,24 @@ msgstr "vállasszon billentyűt" msgid "insert a string in command line" msgstr "" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "folyamat: puffertörténet betöltése\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni (érvénytelen " "funkciónév: \"%s\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s nincs elég memória a billentyűhozzárendeléshez\n" @@ -3252,8 +3262,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s nem található név a \"%s\" parancshoz\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s ismeretlen opció a \"%s\" parancsnak\n" @@ -3470,7 +3480,7 @@ msgstr "Nem található modul.\n" msgid " (no plugin)\n" msgstr " (nem található bővítőmodul)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3574,153 +3584,153 @@ msgstr "%s nem sikerült a szervert létrehozni\n" msgid "(unknown)" msgstr "(ismeretlen)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(jelszó rejtve) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s a \"%s\" szerver nem található\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s a \"%s\" opció nem található\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s helytelen érték a \"%s\" paraméternek\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s a \"%s\" opció nem módosítható a WeeChat futása közben\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Nem találtam beállítási lehetőséget a \"%s\" szóhoz\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Nem található az opció\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sRészletek:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . típus logikai (értékek: 'on' vagy 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . alapérték: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . típus szám (értékek: %d és %d között)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . alapérték: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . típus szöveg (értékek: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "üres" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . típus szín (Curses vagy Gtk szín, lásd WeeChat dokumentáció)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . típus szöveg (bármilyen szöveg)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . leírás : %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "a \"%s\" kifejezéshez tartozó opciót találtam\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "megtalált opciók\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s helytelen érték a(z) \"%s\" modul paraméternek\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "A(z) \"%s\" kifejezéshez nem található modul opció\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Nem található modul opció\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "a(z) \"%s\" kifejezéshez tartozó modul opciók\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "megtalált modul opciók\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s a \"%s\" aliasz vagy parancs nem található\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "A \"%s\" aliasz eltávolítva\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "mellőzés eltávolítva.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "mellőzés eltávolítva.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s nem található ilyen mellőzés\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "" "%s nem sikerült frissíteni: a kapcsolat egy vagy több szerverrel még " "folyamatban van\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3729,7 +3739,7 @@ msgstr "" "%s nem sikerült frissíteni: a kapcsolat legalább egy SSL szerverrel aktív (a " "következő verziókban javítva lesz)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3738,36 +3748,36 @@ msgstr "" "%s nem sikerült frissíteni: az anti-flood (több sor küldése) legalább egy " "szerveren aktív\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "WeeChat frissítése...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s nem sikerült a folyamatot menteni\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s futtatási hiba (program: \"%s\"), a WeeChat kilép\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "WeeChat futásidő: %d %s %02d:%02d:%02d, elindítva: %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "" "WeeChat futásidő: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, elindítva: %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Nyitott ablakok:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/weechat/po/ru.po b/weechat/po/ru.po index 61e805039..c0f007270 100644 --- a/weechat/po/ru.po +++ b/weechat/po/ru.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.2.4-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: 2007-03-07 09:31+0100\n" "Last-Translator: Pavel Shevchuk \n" "Language-Team: weechat-dev \n" @@ -1338,98 +1338,98 @@ msgstr "вы не можете менять режимы других польз msgid "whois (secure connection)" msgstr "whois (защищённое соединение)" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "%sСервер: %s%s %s[%s%s%s]\n" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "подключен" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "отключен" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "вкл." -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "выкл." -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr " (временный сервер, не будет сохранён)" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "секунды" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "(скрытый)" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "%s: используется хост \"%s\"\n" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s не могу найти адресата сообщения\n" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s команде \"%s\" необходимо соединение с сервером!\n" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере канала\n" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "%s \"%s\" команда может быть выполнена только в буфере сервера\n" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "%s некорректные аргументы команды \"%s\"\n" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "%s \"%s\" не является регулярным выражением (%s)\n" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "%s недостаточно памяти для регулярного выражения\n" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" "%s \"%s\" команда может быть выполнена только в буфере канала или привата\n" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1437,12 +1437,12 @@ msgstr "%s ник \"%s\" не найден для команды \"%s\"\n" msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s некорректное количество аргументов команды \"%s\"\n" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "%s невозможно создать новый буфер привата \"%s\"\n" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "%s, собран %s %s\n" @@ -1652,11 +1652,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s был %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s бездействует: " -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "дней" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "день" @@ -2190,7 +2190,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "Plugin \"%s\" выгружен.\n" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "%s plugin \"%s\" не найден\n" @@ -2250,31 +2250,35 @@ msgstr "ГБ" msgid "ETA" msgstr "осталось" -#: src/gui/curses/gui-curses-input.c:406 +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " +msgstr "" + +#: src/gui/curses/gui-curses-input.c:419 msgid " [A] Accept" msgstr " [A] Принять" -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 msgid " [C] Cancel" msgstr " [C] Отменить" -#: src/gui/curses/gui-curses-input.c:419 +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr " [R] Удалить" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr " [P] Очистить список" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr " [Q] Закрыть окно" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr " [C] Очистить буфер" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr " [Q] Закрыть окно сырых данных" @@ -2293,31 +2297,32 @@ msgid "" msgstr "<серверы>" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "(отсутствует)" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "[не соединён] " -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr "" -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "Активны: " -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "RAW_IRC" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "Задержка: %.1f" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "-ДАЛЬШЕ-" @@ -2325,7 +2330,7 @@ msgstr "-ДАЛЬШЕ-" msgid "server" msgstr "сервер" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "Недостаточно памяти для новой строчки\n" @@ -2530,19 +2535,24 @@ msgstr "захватить клавишу" msgid "insert a string in command line" msgstr "вставить строку в поле ввода" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +#, fuzzy +msgid "search text in buffer history" +msgstr "сессия: загрузка истории буфера\n" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s не могу установить клавишу \"%s\"\n" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" "%s не могу установить клавишу \"%s\" (некорректное название функции: \"%s" "\")\n" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "%s недостаточно памяти для установки клавиши\n" @@ -3245,8 +3255,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "%s буфер не найден для команды \"%s\"\n" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s неизвестный параметр для команды \"%s\"\n" @@ -3460,7 +3470,7 @@ msgstr "Plugin не найден\n" msgid " (no plugin)\n" msgstr " (нет pluginа)\n" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3562,151 +3572,151 @@ msgstr "%s не могу создать сервер\n" msgid "(unknown)" msgstr "(неизвестен)" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "%s(пароль скрыт) " -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s сервер \"%s\" не найден\n" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s параметр конфигурации \"%s\" не найден\n" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s некорректное значение параметра \"%s\"\n" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "%s параметр \"%s\" не может быть изменена при запущеном WeeChat\n" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Не найден параметр с \"%s\"\n" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "Не найден параметр\n" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "%sПодробности:\n" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . булевый тип (значения: 'on' или 'off')\n" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr " . значение по умолчанию: '%s'\n" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . целочисленное значение (значения: от %d до %d)\n" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr " . значение по умолчанию: %d\n" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr " . строковой тип (значения: " -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "пусто" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . цветовой тип (цвет Curses или Gtk, см. документацию WeeChat)\n" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr " . строковой тип (любая строка)\n" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr " . описание: %s\n" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "параметров с \"%s\" найдено\n" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "параметров найдено\n" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "%s некорректное значение параметра \"%s\" pluginа\n" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "Не найден параметр pluginа с \"%s\"\n" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "Не найден параметр pluginа\n" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "параметров pluginов с \"%s\" найдено\n" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "параметров pluginов найдено\n" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s сокращение или команда \"%s\" не найдены\n" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Сокращение \"%s\" удалено\n" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "игнорирование добавлено.\n" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "игнорирование удалено.\n" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "%s игнорирования не найдены\n" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "%s не могу обновиться: подключение к серверам в процессе\n" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " @@ -3715,7 +3725,7 @@ msgstr "" "%s не могу обновиться: подключен к серверам по SSL (будет исправлено в " "будущем)\n" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " @@ -3724,35 +3734,35 @@ msgstr "" "%s не могу обновиться: анти-флуд не завершил работу (отсылаются несколько " "строк)\n" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "Обновляю WeeChat...\n" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "%s не могу сохранить сессию в файл\n" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "%s запуск не удался (программа: \"%s\"), выхожу из WeeChat\n" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "WeeChat работает: %d %s %02d:%02d:%02d, запущен %s" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "WeeChat работает: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, запущен %s%s" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "Открытые окна:\n" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index bfd9d3f61..605ff7a1d 100644 --- a/weechat/po/weechat.pot +++ b/weechat/po/weechat.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2007-03-07 09:27+0100\n" +"POT-Creation-Date: 2007-03-16 14:35+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1235,97 +1235,97 @@ msgstr "" msgid "whois (secure connection)" msgstr "" -#: src/irc/irc-display.c:376 +#: src/irc/irc-display.c:378 #, c-format msgid "%sServer: %s%s %s[%s%s%s]\n" msgstr "" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "connected" msgstr "" -#: src/irc/irc-display.c:383 +#: src/irc/irc-display.c:385 msgid "not connected" msgstr "" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "on" msgstr "" -#: src/irc/irc-display.c:387 src/irc/irc-display.c:391 -#: src/irc/irc-display.c:400 src/irc/irc-display.c:402 +#: src/irc/irc-display.c:389 src/irc/irc-display.c:393 +#: src/irc/irc-display.c:402 src/irc/irc-display.c:404 msgid "off" msgstr "" -#: src/irc/irc-display.c:389 +#: src/irc/irc-display.c:391 msgid " (temporary server, will not be saved)" msgstr "" -#: src/irc/irc-display.c:394 src/irc/irc-display.c:425 src/irc/irc-recv.c:3155 +#: src/irc/irc-display.c:396 src/irc/irc-display.c:440 src/irc/irc-recv.c:3155 msgid "seconds" msgstr "" -#: src/irc/irc-display.c:405 +#: src/irc/irc-display.c:407 msgid "(hidden)" msgstr "" -#: src/irc/irc-send.c:66 +#: src/irc/irc-send.c:118 #, c-format msgid "%s: using hostname \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:219 src/common/command.c:734 +#: src/irc/irc-send.c:271 src/common/command.c:734 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" -#: src/irc/irc-send.c:358 src/common/command.c:610 +#: src/irc/irc-send.c:410 src/common/command.c:610 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/irc/irc-send.c:413 src/irc/irc-send.c:441 src/irc/irc-send.c:657 -#: src/irc/irc-send.c:689 src/irc/irc-send.c:721 src/irc/irc-send.c:770 -#: src/irc/irc-send.c:815 src/irc/irc-send.c:894 src/irc/irc-send.c:955 -#: src/irc/irc-send.c:1372 src/irc/irc-send.c:1516 src/irc/irc-send.c:2077 -#: src/irc/irc-send.c:2202 +#: src/irc/irc-send.c:465 src/irc/irc-send.c:493 src/irc/irc-send.c:709 +#: src/irc/irc-send.c:741 src/irc/irc-send.c:773 src/irc/irc-send.c:822 +#: src/irc/irc-send.c:867 src/irc/irc-send.c:946 src/irc/irc-send.c:1007 +#: src/irc/irc-send.c:1411 src/irc/irc-send.c:1555 src/irc/irc-send.c:2116 +#: src/irc/irc-send.c:2241 #, c-format msgid "%s \"%s\" command can only be executed in a channel buffer\n" msgstr "" -#: src/irc/irc-send.c:579 src/irc/irc-send.c:599 src/irc/irc-send.c:1109 -#: src/irc/irc-send.c:1995 +#: src/irc/irc-send.c:631 src/irc/irc-send.c:651 src/irc/irc-send.c:1161 +#: src/irc/irc-send.c:2034 #, c-format msgid "%s \"%s\" command can not be executed on a server buffer\n" msgstr "" -#: src/irc/irc-send.c:879 src/irc/irc-send.c:940 src/common/command.c:1645 +#: src/irc/irc-send.c:931 src/irc/irc-send.c:992 src/common/command.c:1645 #, c-format msgid "%s wrong arguments for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1056 +#: src/irc/irc-send.c:1108 #, c-format msgid "%s \"%s\" is not a valid regular expression (%s)\n" msgstr "" -#: src/irc/irc-send.c:1065 +#: src/irc/irc-send.c:1117 #, c-format msgid "%s not enough memory for regular expression\n" msgstr "" -#: src/irc/irc-send.c:1222 src/irc/irc-send.c:1572 src/irc/irc-send.c:1586 +#: src/irc/irc-send.c:1274 src/irc/irc-send.c:1611 src/irc/irc-send.c:1625 #, c-format msgid "%s \"%s\" command can only be executed in a channel or private buffer\n" msgstr "" -#: src/irc/irc-send.c:1264 src/irc/irc-recv.c:576 +#: src/irc/irc-send.c:1316 src/irc/irc-recv.c:576 #, c-format msgid "%s nick \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1345 src/irc/irc-send.c:1483 src/irc/irc-send.c:2103 +#: src/irc/irc-send.c:1384 src/irc/irc-send.c:1522 src/irc/irc-send.c:2142 #: src/common/command.c:1590 src/common/command.c:1602 #: src/common/command.c:1621 src/common/command.c:1710 #: src/common/command.c:2626 @@ -1333,12 +1333,12 @@ msgstr "" msgid "%s wrong argument count for \"%s\" command\n" msgstr "" -#: src/irc/irc-send.c:1687 +#: src/irc/irc-send.c:1726 #, c-format msgid "%s cannot create new private buffer \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:2168 +#: src/irc/irc-send.c:2207 #, c-format msgid "%s, compiled on %s %s\n" msgstr "" @@ -1548,11 +1548,11 @@ msgstr "" msgid "%s[%s%s%s]%s idle: " msgstr "" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "days" msgstr "" -#: src/irc/irc-recv.c:3139 src/common/command.c:3777 src/common/command.c:3795 +#: src/irc/irc-recv.c:3139 src/common/command.c:3767 src/common/command.c:3785 msgid "day" msgstr "" @@ -2065,7 +2065,7 @@ msgid "Plugin \"%s\" unloaded.\n" msgstr "" #: src/plugins/plugins.c:1426 src/plugins/plugins.c:1469 -#: src/common/command.c:3447 +#: src/common/command.c:3437 #, c-format msgid "%s plugin \"%s\" not found\n" msgstr "" @@ -2120,31 +2120,35 @@ msgstr "" msgid "ETA" msgstr "" -#: src/gui/curses/gui-curses-input.c:406 -msgid " [A] Accept" -msgstr "" - -#: src/gui/curses/gui-curses-input.c:408 src/gui/curses/gui-curses-input.c:413 -msgid " [C] Cancel" +#: src/gui/curses/gui-curses-input.c:82 src/gui/curses/gui-curses-input.c:164 +msgid "Text search: " msgstr "" #: src/gui/curses/gui-curses-input.c:419 +msgid " [A] Accept" +msgstr "" + +#: src/gui/curses/gui-curses-input.c:421 src/gui/curses/gui-curses-input.c:426 +msgid " [C] Cancel" +msgstr "" + +#: src/gui/curses/gui-curses-input.c:432 msgid " [R] Remove" msgstr "" -#: src/gui/curses/gui-curses-input.c:424 +#: src/gui/curses/gui-curses-input.c:437 msgid " [P] Purge old DCC" msgstr "" -#: src/gui/curses/gui-curses-input.c:426 +#: src/gui/curses/gui-curses-input.c:439 msgid " [Q] Close DCC view" msgstr "" -#: src/gui/curses/gui-curses-input.c:435 +#: src/gui/curses/gui-curses-input.c:448 msgid " [C] Clear buffer" msgstr "" -#: src/gui/curses/gui-curses-input.c:437 +#: src/gui/curses/gui-curses-input.c:450 msgid " [Q] Close raw data view" msgstr "" @@ -2163,31 +2167,32 @@ msgid "" msgstr "" #: src/gui/curses/gui-curses-status.c:94 +#: src/gui/curses/gui-curses-status.c:118 msgid "(away)" msgstr "" -#: src/gui/curses/gui-curses-status.c:215 +#: src/gui/curses/gui-curses-status.c:225 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-curses-status.c:223 +#: src/gui/curses/gui-curses-status.c:233 msgid " " msgstr "" -#: src/gui/curses/gui-curses-status.c:235 +#: src/gui/curses/gui-curses-status.c:245 msgid "Act: " msgstr "" -#: src/gui/curses/gui-curses-status.c:318 +#: src/gui/curses/gui-curses-status.c:328 msgid "RAW_IRC" msgstr "" -#: src/gui/curses/gui-curses-status.c:340 +#: src/gui/curses/gui-curses-status.c:350 #, c-format msgid "Lag: %.1f" msgstr "" -#: src/gui/curses/gui-curses-status.c:356 +#: src/gui/curses/gui-curses-status.c:366 msgid "-MORE-" msgstr "" @@ -2195,7 +2200,7 @@ msgstr "" msgid "server" msgstr "" -#: src/gui/gui-buffer.c:612 +#: src/gui/gui-buffer.c:619 msgid "Not enough memory for new line\n" msgstr "" @@ -2400,17 +2405,21 @@ msgstr "" msgid "insert a string in command line" msgstr "" -#: src/gui/gui-keyboard.c:475 src/common/command.c:2310 +#: src/gui/gui-keyboard.c:149 +msgid "search text in buffer history" +msgstr "" + +#: src/gui/gui-keyboard.c:477 src/common/command.c:2310 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "" -#: src/gui/gui-keyboard.c:497 +#: src/gui/gui-keyboard.c:499 #, c-format msgid "%s unable to bind key \"%s\" (invalid function name: \"%s\")\n" msgstr "" -#: src/gui/gui-keyboard.c:511 +#: src/gui/gui-keyboard.c:513 #, c-format msgid "%s not enough memory for key binding\n" msgstr "" @@ -2983,8 +2992,8 @@ msgid "%s buffer not found for \"%s\" command\n" msgstr "" #: src/common/command.c:1495 src/common/command.c:1739 -#: src/common/command.c:2619 src/common/command.c:3909 -#: src/common/command.c:3952 +#: src/common/command.c:2619 src/common/command.c:3899 +#: src/common/command.c:3942 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" @@ -3197,7 +3206,7 @@ msgstr "" msgid " (no plugin)\n" msgstr "" -#: src/common/command.c:2632 src/common/command.c:3525 +#: src/common/command.c:2632 src/common/command.c:3515 #, c-format msgid "" "Command \"%s\" is not available, WeeChat was built without plugins support.\n" @@ -3297,193 +3306,193 @@ msgstr "" msgid "(unknown)" msgstr "" -#: src/common/command.c:3029 +#: src/common/command.c:3018 #, c-format msgid "%s(password hidden) " msgstr "" -#: src/common/command.c:3127 +#: src/common/command.c:3117 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:3160 src/common/command.c:3208 +#: src/common/command.c:3150 src/common/command.c:3198 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:3165 src/common/command.c:3200 +#: src/common/command.c:3155 src/common/command.c:3190 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:3181 +#: src/common/command.c:3171 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:3291 +#: src/common/command.c:3281 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:3294 +#: src/common/command.c:3284 msgid "No config option found\n" msgstr "" -#: src/common/command.c:3301 +#: src/common/command.c:3291 #, c-format msgid "%sDetail:\n" msgstr "" -#: src/common/command.c:3306 +#: src/common/command.c:3296 msgid " . type boolean (values: 'on' or 'off')\n" msgstr "" -#: src/common/command.c:3307 src/common/command.c:3330 -#: src/common/command.c:3336 src/common/command.c:3342 +#: src/common/command.c:3297 src/common/command.c:3320 +#: src/common/command.c:3326 src/common/command.c:3332 #: src/common/weechat.c:153 src/common/weechat.c:178 src/common/weechat.c:185 #: src/common/weechat.c:192 #, c-format msgid " . default value: '%s'\n" msgstr "" -#: src/common/command.c:3312 +#: src/common/command.c:3302 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr "" -#: src/common/command.c:3315 src/common/weechat.c:162 +#: src/common/command.c:3305 src/common/weechat.c:162 #, c-format msgid " . default value: %d\n" msgstr "" -#: src/common/command.c:3319 +#: src/common/command.c:3309 msgid " . type string (values: " msgstr "" -#: src/common/command.c:3332 src/common/command.c:3338 -#: src/common/command.c:3344 src/common/weechat.c:180 src/common/weechat.c:187 +#: src/common/command.c:3322 src/common/command.c:3328 +#: src/common/command.c:3334 src/common/weechat.c:180 src/common/weechat.c:187 #: src/common/weechat.c:194 msgid "empty" msgstr "" -#: src/common/command.c:3335 +#: src/common/command.c:3325 msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr "" -#: src/common/command.c:3341 +#: src/common/command.c:3331 msgid " . type string (any string)\n" msgstr "" -#: src/common/command.c:3347 src/common/weechat.c:197 +#: src/common/command.c:3337 src/common/weechat.c:197 #, c-format msgid " . description: %s\n" msgstr "" -#: src/common/command.c:3358 +#: src/common/command.c:3348 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:3361 +#: src/common/command.c:3351 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:3469 +#: src/common/command.c:3459 #, c-format msgid "%s incorrect value for plugin option \"%s\"\n" msgstr "" -#: src/common/command.c:3498 +#: src/common/command.c:3488 #, c-format msgid "No plugin option found with \"%s\"\n" msgstr "" -#: src/common/command.c:3501 +#: src/common/command.c:3491 msgid "No plugin option found\n" msgstr "" -#: src/common/command.c:3511 +#: src/common/command.c:3501 #, c-format msgid "plugin option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:3514 +#: src/common/command.c:3504 msgid "plugin option(s) found\n" msgstr "" -#: src/common/command.c:3555 +#: src/common/command.c:3545 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:3565 +#: src/common/command.c:3555 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:3625 +#: src/common/command.c:3615 msgid "ignore were removed.\n" msgstr "" -#: src/common/command.c:3627 +#: src/common/command.c:3617 msgid "ignore was removed.\n" msgstr "" -#: src/common/command.c:3632 +#: src/common/command.c:3622 #, c-format msgid "%s no ignore found\n" msgstr "" -#: src/common/command.c:3666 +#: src/common/command.c:3656 #, c-format msgid "%s can't upgrade: connection to at least one server is pending\n" msgstr "" -#: src/common/command.c:3676 +#: src/common/command.c:3666 #, c-format msgid "" "%s can't upgrade: connection to at least one SSL server is active (should be " "fixed in a future version)\n" msgstr "" -#: src/common/command.c:3686 +#: src/common/command.c:3676 #, c-format msgid "" "%s can't upgrade: anti-flood is active on at least one server (sending many " "lines)\n" msgstr "" -#: src/common/command.c:3701 +#: src/common/command.c:3691 msgid "Upgrading WeeChat...\n" msgstr "" -#: src/common/command.c:3708 +#: src/common/command.c:3698 #, c-format msgid "%s unable to save session in file\n" msgstr "" -#: src/common/command.c:3735 +#: src/common/command.c:3725 #, c-format msgid "%s exec failed (program: \"%s\"), exiting WeeChat\n" msgstr "" -#: src/common/command.c:3775 +#: src/common/command.c:3765 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "" -#: src/common/command.c:3789 +#: src/common/command.c:3779 #, c-format msgid "WeeChat uptime: %s%d %s%s %s%02d%s:%s%02d%s:%s%02d%s, started on %s%s" msgstr "" -#: src/common/command.c:3833 +#: src/common/command.c:3823 msgid "Open windows:\n" msgstr "" -#: src/common/command.c:3920 +#: src/common/command.c:3910 #, c-format msgid "" "%s can not merge windows, there's no other window with same size near " diff --git a/weechat/src/gui/curses/gui-curses-input.c b/weechat/src/gui/curses/gui-curses-input.c index 0e1c1349e..fb715cf47 100644 --- a/weechat/src/gui/curses/gui-curses-input.c +++ b/weechat/src/gui/curses/gui-curses-input.c @@ -78,6 +78,9 @@ gui_input_get_prompt_length (t_gui_window *window, char *nick) char *pos, saved_char; int char_size, length; + if (window->buffer->text_search != TEXT_SEARCH_DISABLED) + return utf8_width_screen (_("Text search: ")); + length = 0; pos = cfg_look_input_format; while (pos && pos[0]) @@ -152,6 +155,16 @@ gui_input_draw_prompt (t_gui_window *window, char *nick) int char_size; wmove (GUI_CURSES(window)->win_input, 0, 0); + + if (window->buffer->text_search != TEXT_SEARCH_DISABLED) + { + gui_window_set_weechat_color (GUI_CURSES(window)->win_input, + COLOR_WIN_INPUT); + wprintw (GUI_CURSES(window)->win_input, "%s", + _("Text search: ")); + return; + } + pos = cfg_look_input_format; while (pos && pos[0]) { diff --git a/weechat/src/gui/curses/gui-curses-keyboard.c b/weechat/src/gui/curses/gui-curses-keyboard.c index 891941b9e..e6e322297 100644 --- a/weechat/src/gui/curses/gui-curses-keyboard.c +++ b/weechat/src/gui/curses/gui-curses-keyboard.c @@ -49,8 +49,8 @@ gui_keyboard_default_bindings () gui_keyboard_bind ( /* RC */ "ctrl-J", "return"); gui_keyboard_bind ( /* tab */ "ctrl-I", "tab"); gui_keyboard_bind ( /* s-tab */ "meta2-Z", "tab_previous"); - gui_keyboard_bind ( /* basckp */ "ctrl-H", "backspace"); - gui_keyboard_bind ( /* basckp */ "ctrl-?", "backspace"); + gui_keyboard_bind ( /* basckpace */ "ctrl-H", "backspace"); + gui_keyboard_bind ( /* basckpace */ "ctrl-?", "backspace"); gui_keyboard_bind ( /* del */ "meta2-3~", "delete"); gui_keyboard_bind ( /* ^K */ "ctrl-K", "delete_end_line"); gui_keyboard_bind ( /* ^U */ "ctrl-U", "delete_beginning_line"); @@ -105,6 +105,7 @@ gui_keyboard_default_bindings () gui_keyboard_bind ( /* m-r */ "meta-r", "delete_line"); gui_keyboard_bind ( /* m-s */ "meta-s", "switch_server"); gui_keyboard_bind ( /* m-u */ "meta-u", "scroll_unread"); + gui_keyboard_bind ( /* ^S */ "ctrl-S", "search_text"); /* keys bound with commands */ gui_keyboard_bind ( /* m-left */ "meta-meta2-D", "/buffer -1"); @@ -174,7 +175,7 @@ void gui_keyboard_read () { int key, i, insert_ok; - char key_str[32], *key_utf; + char key_str[32], *key_utf, *input_old; i = 0; /* do not loop too much here (for example when big paste was made), @@ -272,6 +273,12 @@ gui_keyboard_read () /*gui_printf (gui_current_window->buffer, "gui_input_read: key = %s (%d)\n", key_str, key);*/ + if (gui_current_window->buffer->text_search != TEXT_SEARCH_DISABLED) + input_old = (gui_current_window->buffer->input_buffer) ? + strdup (gui_current_window->buffer->input_buffer) : strdup (""); + else + input_old = NULL; + if ((gui_keyboard_pressed (key_str) != 0) && (insert_ok)) { if (strcmp (key_str, "^^") == 0) @@ -292,6 +299,25 @@ gui_keyboard_read () break; } } + + /* incremental text search in buffer */ + if ((gui_current_window->buffer->text_search != TEXT_SEARCH_DISABLED) + && ((input_old == NULL) || (gui_current_window->buffer->input_buffer == NULL) + || (strcmp (input_old, gui_current_window->buffer->input_buffer) != 0))) + { + gui_current_window->start_line = NULL; + gui_current_window->start_line_pos = 0; + gui_current_window->buffer->text_search = TEXT_SEARCH_BACKWARD; + if (!gui_buffer_search_text (gui_current_window)) + { + gui_chat_draw (gui_current_window->buffer, 1); + gui_status_draw (gui_current_window->buffer, 1); + } + } + + if (input_old) + free (input_old); + i++; } } diff --git a/weechat/src/gui/gui-action.c b/weechat/src/gui/gui-action.c index 2d008cb71..1b24b54eb 100644 --- a/weechat/src/gui/gui-action.c +++ b/weechat/src/gui/gui-action.c @@ -91,13 +91,15 @@ void gui_action_return (t_gui_window *window, char *args) { char *command; - + /* make C compiler happy */ (void) args; if (window->buffer->has_input) { - if (window->buffer->input_buffer_size > 0) + if (window->buffer->text_search != TEXT_SEARCH_DISABLED) + gui_buffer_search_stop (window); + else if (window->buffer->input_buffer_size > 0) { window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; @@ -133,7 +135,8 @@ gui_action_tab (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->has_input) + if (window->buffer->has_input + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { completion_search (&(window->buffer->completion), 1, window->buffer->input_buffer, @@ -154,7 +157,8 @@ gui_action_tab_previous (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->has_input) + if (window->buffer->has_input + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { completion_search (&(window->buffer->completion), -1, window->buffer->input_buffer, @@ -201,7 +205,7 @@ gui_action_backspace (t_gui_window *window, char *args) } /* - * gui_action_delete: delete key + * gui_action_delete: delete next char */ void @@ -685,53 +689,62 @@ gui_action_up (t_gui_window *window, char *args) } else if (window->buffer->has_input) { - if (window->buffer->ptr_history) + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - window->buffer->ptr_history = - window->buffer->ptr_history->next_history; - if (!window->buffer->ptr_history) - window->buffer->ptr_history = - window->buffer->history; - } - else - window->buffer->ptr_history = - window->buffer->history; - if (window->buffer->ptr_history) - { - /* bash/readline like use of history */ - if (window->buffer->ptr_history->prev_history == NULL) + if (window->buffer->ptr_history) { - if (window->buffer->input_buffer_size > 0) - { - window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; - window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; - history_buffer_add (window->buffer, window->buffer->input_buffer); - history_global_add (window->buffer->input_buffer); - } + window->buffer->ptr_history = + window->buffer->ptr_history->next_history; + if (!window->buffer->ptr_history) + window->buffer->ptr_history = + window->buffer->history; } else + window->buffer->ptr_history = + window->buffer->history; + if (window->buffer->ptr_history) { - if (window->buffer->input_buffer_size > 0) + /* bash/readline like use of history */ + if (window->buffer->ptr_history->prev_history == NULL) { - window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; - window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; - if (window->buffer->ptr_history->prev_history->text) - free(window->buffer->ptr_history->prev_history->text); - window->buffer->ptr_history->prev_history->text = strdup (window->buffer->input_buffer); + if (window->buffer->input_buffer_size > 0) + { + window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; + window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; + history_buffer_add (window->buffer, window->buffer->input_buffer); + history_global_add (window->buffer->input_buffer); + } } + else + { + if (window->buffer->input_buffer_size > 0) + { + window->buffer->input_buffer[window->buffer->input_buffer_size] = '\0'; + window->buffer->input_buffer_color_mask[window->buffer->input_buffer_size] = '\0'; + if (window->buffer->ptr_history->prev_history->text) + free(window->buffer->ptr_history->prev_history->text); + window->buffer->ptr_history->prev_history->text = strdup (window->buffer->input_buffer); + } + } + window->buffer->input_buffer_size = + strlen (window->buffer->ptr_history->text); + window->buffer->input_buffer_length = + utf8_strlen (window->buffer->ptr_history->text); + gui_input_optimize_size (window->buffer); + window->buffer->input_buffer_pos = + window->buffer->input_buffer_length; + window->buffer->input_buffer_1st_display = 0; + strcpy (window->buffer->input_buffer, + window->buffer->ptr_history->text); + gui_input_init_color_mask (window->buffer); + gui_input_draw (window->buffer, 0); } - window->buffer->input_buffer_size = - strlen (window->buffer->ptr_history->text); - window->buffer->input_buffer_length = - utf8_strlen (window->buffer->ptr_history->text); - gui_input_optimize_size (window->buffer); - window->buffer->input_buffer_pos = - window->buffer->input_buffer_length; - window->buffer->input_buffer_1st_display = 0; - strcpy (window->buffer->input_buffer, - window->buffer->ptr_history->text); - gui_input_init_color_mask (window->buffer); - gui_input_draw (window->buffer, 0); + } + else + { + /* search backward in buffer history */ + window->buffer->text_search = TEXT_SEARCH_BACKWARD; + (void) gui_buffer_search_text (window); } } } @@ -746,7 +759,8 @@ gui_action_up_global (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->has_input) + if (window->buffer->has_input + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { if (history_global_ptr) { @@ -815,33 +829,42 @@ gui_action_down (t_gui_window *window, char *args) } else if (window->buffer->has_input) { - if (window->buffer->ptr_history) + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - window->buffer->ptr_history = - window->buffer->ptr_history->prev_history; if (window->buffer->ptr_history) { - window->buffer->input_buffer_size = - strlen (window->buffer->ptr_history->text); - window->buffer->input_buffer_length = - utf8_strlen (window->buffer->ptr_history->text); + window->buffer->ptr_history = + window->buffer->ptr_history->prev_history; + if (window->buffer->ptr_history) + { + window->buffer->input_buffer_size = + strlen (window->buffer->ptr_history->text); + window->buffer->input_buffer_length = + utf8_strlen (window->buffer->ptr_history->text); + } + else + { + window->buffer->input_buffer_size = 0; + window->buffer->input_buffer_length = 0; + } + gui_input_optimize_size (window->buffer); + window->buffer->input_buffer_pos = + window->buffer->input_buffer_length; + window->buffer->input_buffer_1st_display = 0; + if (window->buffer->ptr_history) + { + strcpy (window->buffer->input_buffer, + window->buffer->ptr_history->text); + gui_input_init_color_mask (window->buffer); + } + gui_input_draw (window->buffer, 0); } - else - { - window->buffer->input_buffer_size = 0; - window->buffer->input_buffer_length = 0; - } - gui_input_optimize_size (window->buffer); - window->buffer->input_buffer_pos = - window->buffer->input_buffer_length; - window->buffer->input_buffer_1st_display = 0; - if (window->buffer->ptr_history) - { - strcpy (window->buffer->input_buffer, - window->buffer->ptr_history->text); - gui_input_init_color_mask (window->buffer); - } - gui_input_draw (window->buffer, 0); + } + else + { + /* search forward in buffer history */ + window->buffer->text_search = TEXT_SEARCH_FORWARD; + (void) gui_buffer_search_text (window); } } } @@ -856,7 +879,8 @@ gui_action_down_global (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->has_input) + if (window->buffer->has_input + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { if (history_global_ptr) { @@ -1053,21 +1077,24 @@ gui_action_jump_smart (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (hotlist) + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - if (!hotlist_initial_buffer) - hotlist_initial_buffer = window->buffer; - gui_window_switch_to_buffer (window, hotlist->buffer); - gui_window_redraw_buffer (window->buffer); - } - else - { - if (hotlist_initial_buffer) + if (hotlist) { - gui_window_switch_to_buffer (window, hotlist_initial_buffer); + if (!hotlist_initial_buffer) + hotlist_initial_buffer = window->buffer; + gui_window_switch_to_buffer (window, hotlist->buffer); gui_window_redraw_buffer (window->buffer); - hotlist_initial_buffer = NULL; + } + else + { + if (hotlist_initial_buffer) + { + gui_window_switch_to_buffer (window, hotlist_initial_buffer); + gui_window_redraw_buffer (window->buffer); + hotlist_initial_buffer = NULL; + } } } } @@ -1081,20 +1108,23 @@ gui_action_jump_dcc (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (window->buffer->type == BUFFER_TYPE_DCC) + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - if (gui_buffer_before_dcc) + if (window->buffer->type == BUFFER_TYPE_DCC) { - gui_window_switch_to_buffer (window, - gui_buffer_before_dcc); - gui_window_redraw_buffer (window->buffer); + if (gui_buffer_before_dcc) + { + gui_window_switch_to_buffer (window, + gui_buffer_before_dcc); + gui_window_redraw_buffer (window->buffer); + } + } + else + { + gui_buffer_before_dcc = window->buffer; + gui_buffer_switch_dcc (window); } - } - else - { - gui_buffer_before_dcc = window->buffer; - gui_buffer_switch_dcc (window); } } @@ -1107,20 +1137,23 @@ gui_action_jump_raw_data (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (window->buffer->type == BUFFER_TYPE_RAW_DATA) + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - if (gui_buffer_before_raw_data) + if (window->buffer->type == BUFFER_TYPE_RAW_DATA) { - gui_window_switch_to_buffer (window, - gui_buffer_before_raw_data); - gui_window_redraw_buffer (window->buffer); + if (gui_buffer_before_raw_data) + { + gui_window_switch_to_buffer (window, + gui_buffer_before_raw_data); + gui_window_redraw_buffer (window->buffer); + } + } + else + { + gui_buffer_before_raw_data = window->buffer; + gui_buffer_switch_raw_data (window); } - } - else - { - gui_buffer_before_raw_data = window->buffer; - gui_buffer_switch_raw_data (window); } } @@ -1133,9 +1166,12 @@ gui_action_jump_last_buffer (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (last_gui_buffer) - gui_buffer_switch_by_number (window, last_gui_buffer->number); + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) + { + if (last_gui_buffer) + gui_buffer_switch_by_number (window, last_gui_buffer->number); + } } /* @@ -1148,14 +1184,17 @@ gui_action_jump_server (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (SERVER(window->buffer)) + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - if (SERVER(window->buffer)->buffer != - window->buffer) + if (SERVER(window->buffer)) { - gui_window_switch_to_buffer (window, - SERVER(window->buffer)->buffer); - gui_window_redraw_buffer (window->buffer); + if (SERVER(window->buffer)->buffer != + window->buffer) + { + gui_window_switch_to_buffer (window, + SERVER(window->buffer)->buffer); + gui_window_redraw_buffer (window->buffer); + } } } } @@ -1173,34 +1212,37 @@ gui_action_jump_next_server (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (SERVER(window->buffer)) + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - ptr_server = SERVER(window->buffer)->next_server; - if (!ptr_server) - ptr_server = irc_servers; - while (ptr_server != SERVER(window->buffer)) + if (SERVER(window->buffer)) { - if (ptr_server->buffer) - break; - ptr_server = (ptr_server->next_server) ? - ptr_server->next_server : irc_servers; - } - if (ptr_server != SERVER(window->buffer)) - { - /* save current buffer */ - SERVER(window->buffer)->saved_buffer = window->buffer; - - /* come back to memorized chan if found */ - if (ptr_server->saved_buffer) - ptr_buffer = ptr_server->saved_buffer; - else - ptr_buffer = (ptr_server->channels) ? - ptr_server->channels->buffer : ptr_server->buffer; - if ((ptr_server->buffer == ptr_buffer) - && (ptr_buffer->all_servers)) - ptr_buffer->server = ptr_server; - gui_window_switch_to_buffer (window, ptr_buffer); - gui_window_redraw_buffer (window->buffer); + ptr_server = SERVER(window->buffer)->next_server; + if (!ptr_server) + ptr_server = irc_servers; + while (ptr_server != SERVER(window->buffer)) + { + if (ptr_server->buffer) + break; + ptr_server = (ptr_server->next_server) ? + ptr_server->next_server : irc_servers; + } + if (ptr_server != SERVER(window->buffer)) + { + /* save current buffer */ + SERVER(window->buffer)->saved_buffer = window->buffer; + + /* come back to memorized chan if found */ + if (ptr_server->saved_buffer) + ptr_buffer = ptr_server->saved_buffer; + else + ptr_buffer = (ptr_server->channels) ? + ptr_server->channels->buffer : ptr_server->buffer; + if ((ptr_server->buffer == ptr_buffer) + && (ptr_buffer->all_servers)) + ptr_buffer->server = ptr_server; + gui_window_switch_to_buffer (window, ptr_buffer); + gui_window_redraw_buffer (window->buffer); + } } } } @@ -1231,12 +1273,13 @@ gui_action_scroll_previous_highlight (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->type == BUFFER_TYPE_STANDARD) + if ((window->buffer->type == BUFFER_TYPE_STANDARD) + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { if (window->buffer->lines) { ptr_line = (window->start_line) ? - window->start_line->prev_line : window->buffer->last_line->prev_line; + window->start_line->prev_line : window->buffer->last_line; while (ptr_line) { if (ptr_line->line_with_highlight) @@ -1267,7 +1310,8 @@ gui_action_scroll_next_highlight (t_gui_window *window, char *args) /* make C compiler happy */ (void) args; - if (window->buffer->type == BUFFER_TYPE_STANDARD) + if ((window->buffer->type == BUFFER_TYPE_STANDARD) + && (window->buffer->text_search == TEXT_SEARCH_DISABLED)) { if (window->buffer->lines) { @@ -1300,19 +1344,22 @@ gui_action_scroll_unread (t_gui_window *window, char *args) { /* make C compiler happy */ (void) args; - - if (cfg_look_read_marker && - cfg_look_read_marker[0] && - (window->buffer->type == BUFFER_TYPE_STANDARD) && - window->buffer->last_read_line && - window->buffer->last_read_line != window->buffer->last_line) + + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) { - window->start_line = window->buffer->last_read_line->next_line; - window->start_line_pos = 0; - window->first_line_displayed = - (window->start_line == window->buffer->lines); - gui_chat_draw (window->buffer, 1); - gui_status_draw (window->buffer, 0); + if (cfg_look_read_marker && + cfg_look_read_marker[0] && + (window->buffer->type == BUFFER_TYPE_STANDARD) && + window->buffer->last_read_line && + window->buffer->last_read_line != window->buffer->last_line) + { + window->start_line = window->buffer->last_read_line->next_line; + window->start_line_pos = 0; + window->first_line_displayed = + (window->start_line == window->buffer->lines); + gui_chat_draw (window->buffer, 1); + gui_status_draw (window->buffer, 0); + } } } @@ -1389,3 +1436,23 @@ gui_action_insert_string (t_gui_window *window, char *args) gui_input_draw (window->buffer, 0); } } + +/* + * gui_action_search_text: search text in buffer history + */ + +void +gui_action_search_text (t_gui_window *window, char *args) +{ + /* make C compiler happy */ + (void) args; + + if (window->buffer->type == BUFFER_TYPE_STANDARD) + { + /* toggle search */ + if (window->buffer->text_search == TEXT_SEARCH_DISABLED) + gui_buffer_search_start (window); + else + gui_buffer_search_stop (window); + } +} diff --git a/weechat/src/gui/gui-buffer.c b/weechat/src/gui/gui-buffer.c index 423a70f3a..631287a19 100644 --- a/weechat/src/gui/gui-buffer.c +++ b/weechat/src/gui/gui-buffer.c @@ -207,6 +207,10 @@ gui_buffer_new (t_gui_window *window, void *server, void *channel, int type, new_buffer->ptr_history = NULL; new_buffer->num_history = 0; + /* text search */ + new_buffer->text_search = TEXT_SEARCH_DISABLED; + new_buffer->text_search_input = NULL; + /* add buffer to buffers queue */ new_buffer->prev_buffer = last_gui_buffer; if (gui_buffers) @@ -550,6 +554,9 @@ gui_buffer_free (t_gui_buffer *buffer, int switch_to_another) history_buffer_free (buffer); + if (buffer->text_search_input) + free (buffer->text_search_input); + /* remove buffer from buffers list */ if (buffer->prev_buffer) buffer->prev_buffer->next_buffer = buffer->next_buffer; @@ -630,6 +637,31 @@ gui_buffer_line_new (t_gui_buffer *buffer, time_t date) return new_line; } +/* + * gui_buffer_line_search: search for text in a line + */ + +int +gui_buffer_line_search (t_gui_line *line, char *text, int case_sensitive) +{ + char *data; + int rc; + + if (!text) + return 0; + + rc = 0; + data = (char *)gui_color_decode ((unsigned char *)line->data, 0); + if (data) + { + if ((case_sensitive && (strstr (data, text))) + || (!case_sensitive && (strcasestr (data, text)))) + rc = 1; + free (data); + } + return rc; +} + /* * gui_buffer_merge_servers: merge server buffers in one buffer */ @@ -945,6 +977,107 @@ gui_buffer_move_to_number (t_gui_buffer *buffer, int number) gui_window_redraw_buffer (buffer); } +/* + * gui_buffer_search_start: start search in a buffer + */ + +void +gui_buffer_search_start (t_gui_window *window) +{ + window->buffer->text_search = TEXT_SEARCH_BACKWARD; + if (window->buffer->text_search_input) + { + free (window->buffer->text_search_input); + window->buffer->text_search_input = NULL; + } + if (window->buffer->input_buffer && window->buffer->input_buffer[0]) + window->buffer->text_search_input = + strdup (window->buffer->input_buffer); + gui_action_delete_line (window, NULL); + gui_status_draw (window->buffer, 1); + gui_input_draw (window->buffer, 1); +} + +/* + * gui_buffer_search_stop: stop search in a buffer + */ + +void +gui_buffer_search_stop (t_gui_window *window) +{ + window->buffer->text_search = TEXT_SEARCH_DISABLED; + gui_action_delete_line (window, NULL); + if (window->buffer->text_search_input) + { + gui_insert_string_input (window, window->buffer->text_search_input, -1); + free (window->buffer->text_search_input); + window->buffer->text_search_input = NULL; + } + window->start_line = NULL; + window->start_line_pos = 0; + gui_chat_draw (window->buffer, 0); + gui_status_draw (window->buffer, 1); + gui_input_draw (window->buffer, 1); +} + +/* + * gui_buffer_search_text: search text in a buffer + */ + +int +gui_buffer_search_text (t_gui_window *window) +{ + t_gui_line *ptr_line; + + if (window->buffer->text_search == TEXT_SEARCH_BACKWARD) + { + if (window->buffer->lines + && window->buffer->input_buffer && window->buffer->input_buffer[0]) + { + ptr_line = (window->start_line) ? + window->start_line->prev_line : window->buffer->last_line; + while (ptr_line) + { + if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer, 0)) + { + window->start_line = ptr_line; + window->start_line_pos = 0; + window->first_line_displayed = + (window->start_line == window->buffer->lines); + gui_chat_draw (window->buffer, 1); + gui_status_draw (window->buffer, 1); + return 1; + } + ptr_line = ptr_line->prev_line; + } + } + } + else if (window->buffer->text_search == TEXT_SEARCH_FORWARD) + { + if (window->buffer->lines + && window->buffer->input_buffer && window->buffer->input_buffer[0]) + { + ptr_line = (window->start_line) ? + window->start_line->next_line : window->buffer->lines->next_line; + while (ptr_line) + { + if (gui_buffer_line_search (ptr_line, window->buffer->input_buffer, 0)) + { + window->start_line = ptr_line; + window->start_line_pos = 0; + window->first_line_displayed = + (window->start_line == window->buffer->lines); + gui_chat_draw (window->buffer, 1); + gui_status_draw (window->buffer, 1); + return 1; + } + ptr_line = ptr_line->next_line; + } + } + } + return 0; +} + /* * gui_buffer_print_log: print buffer infos in log (usually for crash dump) */ @@ -982,6 +1115,9 @@ gui_buffer_print_log (t_gui_buffer *buffer) weechat_log_printf (" history. . . . . . . . : 0x%X\n", buffer->history); weechat_log_printf (" last_history . . . . . : 0x%X\n", buffer->last_history); weechat_log_printf (" ptr_history. . . . . . : 0x%X\n", buffer->ptr_history); + weechat_log_printf (" num_history. . . . . . : %d\n", buffer->num_history); + weechat_log_printf (" text_search. . . . . . : %d\n", buffer->text_search); + weechat_log_printf (" text_search_input. . . : '%s'\n", buffer->text_search_input); weechat_log_printf (" prev_buffer. . . . . . : 0x%X\n", buffer->prev_buffer); weechat_log_printf (" next_buffer. . . . . . : 0x%X\n", buffer->next_buffer); weechat_log_printf ("\n"); diff --git a/weechat/src/gui/gui-buffer.h b/weechat/src/gui/gui-buffer.h index 75e364898..679e6c92c 100644 --- a/weechat/src/gui/gui-buffer.h +++ b/weechat/src/gui/gui-buffer.h @@ -51,6 +51,10 @@ #define NOTIFY_LEVEL_MAX 3 #define NOTIFY_LEVEL_DEFAULT NOTIFY_LEVEL_MAX +#define TEXT_SEARCH_DISABLED 0 +#define TEXT_SEARCH_BACKWARD 1 +#define TEXT_SEARCH_FORWARD 2 + /* buffer structures */ typedef struct t_gui_line t_gui_line; @@ -122,6 +126,10 @@ struct t_gui_buffer t_history *ptr_history; /* current command in history */ int num_history; /* number of commands in history */ + /* text search */ + int text_search; /* text search type */ + char *text_search_input; /* input saved before text search */ + /* link to previous/next buffer */ t_gui_buffer *prev_buffer; /* link to previous buffer */ t_gui_buffer *next_buffer; /* link to next buffer */ diff --git a/weechat/src/gui/gui-keyboard.c b/weechat/src/gui/gui-keyboard.c index db6f238ac..bf617011c 100644 --- a/weechat/src/gui/gui-keyboard.c +++ b/weechat/src/gui/gui-keyboard.c @@ -145,6 +145,8 @@ t_gui_key_function gui_key_functions[] = N_("grab a key") }, { "insert", gui_action_insert_string, N_("insert a string in command line") }, + { "search_text", gui_action_search_text, + N_("search text in buffer history") }, { NULL, NULL, NULL } }; @@ -580,11 +582,14 @@ gui_keyboard_pressed (char *key_str) else (void)(ptr_key->function)(gui_current_window, ptr_key->args); #ifdef PLUGINS - (void) plugin_keyboard_handler_exec ( - (ptr_key->command) ? - ptr_key->command : gui_keyboard_function_search_by_ptr (ptr_key->function), - buffer_before_key, - gui_current_window->buffer->input_buffer); + if (gui_current_window->buffer->text_search == TEXT_SEARCH_DISABLED) + { + (void) plugin_keyboard_handler_exec ( + (ptr_key->command) ? + ptr_key->command : gui_keyboard_function_search_by_ptr (ptr_key->function), + buffer_before_key, + gui_current_window->buffer->input_buffer); + } #endif if (buffer_before_key) free (buffer_before_key); diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h index dacc950bd..3b24a1bb0 100644 --- a/weechat/src/gui/gui.h +++ b/weechat/src/gui/gui.h @@ -90,6 +90,7 @@ extern void gui_buffer_clear (t_gui_buffer *); extern void gui_buffer_clear_all (); extern void gui_buffer_free (t_gui_buffer *, int); extern t_gui_line *gui_buffer_line_new (t_gui_buffer *, time_t); +extern int gui_buffer_line_search (t_gui_line *, char *, int); extern void gui_buffer_merge_servers (t_gui_window *); extern void gui_buffer_split_server (t_gui_window *); extern void gui_buffer_switch_previous (t_gui_window *); @@ -98,6 +99,9 @@ extern void gui_buffer_switch_dcc (t_gui_window *); extern void gui_buffer_switch_raw_data (t_gui_window *); extern t_gui_buffer *gui_buffer_switch_by_number (t_gui_window *, int); extern void gui_buffer_move_to_number (t_gui_buffer *, int); +extern void gui_buffer_search_start (t_gui_window *); +extern void gui_buffer_search_stop (t_gui_window *); +extern int gui_buffer_search_text (t_gui_window *); extern void gui_buffer_print_log (t_gui_buffer *); /* panel */ @@ -157,6 +161,7 @@ extern void gui_action_infobar_clear (t_gui_window *, char *); extern void gui_action_refresh_screen (t_gui_window *, char *); extern void gui_action_grab_key (t_gui_window *, char *); extern void gui_action_insert_string (t_gui_window *, char *); +extern void gui_action_search_text (t_gui_window *, char *); /* key */ extern void gui_keyboard_init ();