diff options
| author | Sebastien Helleu <flashcode@flashtux.org> | 2005-11-13 15:51:00 +0000 |
|---|---|---|
| committer | Sebastien Helleu <flashcode@flashtux.org> | 2005-11-13 15:51:00 +0000 |
| commit | e63da66644b46b8fe3d99718d30960846e52ee90 (patch) | |
| tree | 6d78c1f46ea7232d58679f33d84ebf45736bfdc2 | |
| parent | 3a2fdde999d35a5958ed529717d5890b65f91da2 (diff) | |
| download | weechat-e63da66644b46b8fe3d99718d30960846e52ee90.zip | |
Improved window management: new window may have different size (% of current
window size), window sizes are automatically recomputed when term window is
resized
| -rw-r--r-- | BUGS | 3 | ||||
| -rw-r--r-- | po/cs.po | 367 | ||||
| -rw-r--r-- | po/es.po | 473 | ||||
| -rw-r--r-- | po/fr.po | 377 | ||||
| -rw-r--r-- | po/weechat.pot | 354 | ||||
| -rw-r--r-- | src/common/command.c | 109 | ||||
| -rw-r--r-- | src/common/completion.c | 5 | ||||
| -rw-r--r-- | src/gui/curses/gui-display.c | 340 | ||||
| -rw-r--r-- | src/gui/gui-common.c | 132 | ||||
| -rw-r--r-- | src/gui/gui.h | 41 | ||||
| -rw-r--r-- | weechat/BUGS | 3 | ||||
| -rw-r--r-- | weechat/po/cs.po | 367 | ||||
| -rw-r--r-- | weechat/po/es.po | 473 | ||||
| -rw-r--r-- | weechat/po/fr.po | 377 | ||||
| -rw-r--r-- | weechat/po/weechat.pot | 354 | ||||
| -rw-r--r-- | weechat/src/common/command.c | 109 | ||||
| -rw-r--r-- | weechat/src/common/completion.c | 5 | ||||
| -rw-r--r-- | weechat/src/gui/curses/gui-display.c | 340 | ||||
| -rw-r--r-- | weechat/src/gui/gui-common.c | 132 | ||||
| -rw-r--r-- | weechat/src/gui/gui.h | 41 |
20 files changed, 2448 insertions, 1954 deletions
@@ -1,7 +1,7 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -WeeChat known bugs, 2005-11-11 +WeeChat known bugs, 2005-11-13 - some refresh bugs with splited windows - ./configure does not check that Ruby libraries are installed @@ -11,3 +11,4 @@ WeeChat known bugs, 2005-11-11 - when many WeeChat are launched, log file is not properly written (cleared by each WeeChat at startup) - WeeChat may crash if too much nicks in nicklist when position is top or bottom +- crash when using non colored term @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-11 10:15+0100\n" -"PO-Revision-Date: 2005-11-11 17:03+0100\n" +"POT-Creation-Date: 2005-11-13 16:40+0100\n" +"PO-Revision-Date: 2005-11-13 16:44+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1394,7 +1394,7 @@ msgstr "neznámý" msgid "%s: using local hostname \"%s\"\n" msgstr "%s: používám lokální jméno hosta \"%s\"\n" -#: src/irc/irc-send.c:175 src/common/command.c:783 +#: src/irc/irc-send.c:175 src/common/command.c:787 #, 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" @@ -1410,8 +1410,8 @@ msgstr "%s \"%s\" příkaz může být spuštěn pouze v okně kanálu\n" #: src/irc/irc-send.c:472 src/irc/irc-send.c:484 src/irc/irc-send.c:502 #: src/irc/irc-send.c:1166 src/irc/irc-send.c:1264 src/irc/irc-send.c:1796 -#: src/common/command.c:1310 src/common/command.c:1749 -#: src/common/command.c:1885 +#: src/common/command.c:1353 src/common/command.c:1798 +#: src/common/command.c:1934 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n" @@ -1749,11 +1749,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:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "days" msgstr "dní" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "day" msgstr "den" @@ -2257,64 +2257,64 @@ msgstr "Změnil se den na %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "bytes" msgstr "bajtů" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Kb" msgstr "Kb" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Mb" msgstr "Mb" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Gb" msgstr "Gb" -#: src/gui/curses/gui-display.c:1921 +#: src/gui/curses/gui-display.c:1926 msgid "<servers>" msgstr "<serverů>" -#: src/gui/curses/gui-display.c:1933 +#: src/gui/curses/gui-display.c:1938 msgid "(away)" msgstr "(pryč)" -#: src/gui/curses/gui-display.c:2067 +#: src/gui/curses/gui-display.c:2072 msgid "[not connected] " msgstr "[nepřipojen] " -#: src/gui/curses/gui-display.c:2077 +#: src/gui/curses/gui-display.c:2082 msgid "Act: " msgstr "Aktivní: " -#: src/gui/curses/gui-display.c:2165 +#: src/gui/curses/gui-display.c:2170 #, c-format msgid "Lag: %.1f" msgstr "Zpoždění: %.1f" -#: src/gui/curses/gui-display.c:2181 +#: src/gui/curses/gui-display.c:2186 msgid "-MORE-" msgstr "-VÍCE-" -#: src/gui/curses/gui-display.c:2359 +#: src/gui/curses/gui-display.c:2364 msgid " [A] Accept" msgstr " [A] Akceptovat" -#: src/gui/curses/gui-display.c:2360 src/gui/curses/gui-display.c:2364 +#: src/gui/curses/gui-display.c:2365 src/gui/curses/gui-display.c:2369 msgid " [C] Cancel" msgstr " [C] Storno" -#: src/gui/curses/gui-display.c:2369 +#: src/gui/curses/gui-display.c:2374 msgid " [R] Remove" msgstr " [R] Odebrat" -#: src/gui/curses/gui-display.c:2373 +#: src/gui/curses/gui-display.c:2378 msgid " [P] Purge old DCC" msgstr " [P] Pročistit staré DCC" -#: src/gui/curses/gui-display.c:2374 +#: src/gui/curses/gui-display.c:2379 msgid " [Q] Close DCC view" msgstr " [Q] Zavřít DCC pohled" @@ -2322,11 +2322,11 @@ msgstr " [Q] Zavřít DCC pohled" msgid "server" msgstr "server" -#: src/gui/gui-common.c:509 +#: src/gui/gui-common.c:637 msgid "Not enough memory for new line\n" msgstr "Nedostatek paměti pro nový řádek\n" -#: src/gui/gui-common.c:854 +#: src/gui/gui-common.c:982 msgid "Not enough memory for infobar message\n" msgstr "Nedostatek paměti pro infobar zprávu\n" @@ -2478,7 +2478,7 @@ msgstr "obnov obrazovku" msgid "grab a key" msgstr "zachytit klávesu" -#: src/gui/gui-keyboard.c:428 src/common/command.c:1764 +#: src/gui/gui-keyboard.c:428 src/common/command.c:1813 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s nemohu napojit kalávesu \"%s\"\n" @@ -2576,38 +2576,40 @@ msgid "print debug messages" msgstr "vypsat debug zprávy" #: src/common/command.c:69 -msgid "dump" -msgstr "dump" +msgid "dump | windows" +msgstr "dump | windows" #: src/common/command.c:70 +#, fuzzy msgid "" "dump: save memory dump in WeeChat log file (same dump is written when " -"WeeChat crashes)" +"WeeChat crashes)\n" +"windows: display windows tree" msgstr "" "dump: uloží dump paměti ve WeeChat log souboru (stejný dump jako když " "Weechat havaruje)" -#: src/common/command.c:72 +#: src/common/command.c:73 msgid "display help about commands" msgstr "zobrazí nápovědu k příkazům" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "[command]" msgstr "[příkaz]" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "command: name of a WeeChat or IRC command" msgstr "příkaz: jméno WeeChat nebo IRC příkazu" -#: src/common/command.c:75 +#: src/common/command.c:76 msgid "ignore IRC messages and/or hosts" msgstr "ignoruje IRC příkaz a/nebo hosta" -#: src/common/command.c:76 +#: src/common/command.c:77 msgid "[mask [[type | command] [channel [server]]]]" msgstr "[maska [[typ | příkaz] [kanál [server]]]]" -#: src/common/command.c:77 +#: src/common/command.c:78 msgid "" " mask: nick or host mask to ignore\n" " type: type of message to ignore (action, ctcp, dcc, pv)\n" @@ -2627,15 +2629,15 @@ msgstr "" "Pro každý argument, znamená '*' vše.\n" "Bez arumentů vypíše příkaz /ignore seznam všech definovaných ignorování." -#: src/common/command.c:85 +#: src/common/command.c:86 msgid "bind/unbind keys" msgstr "napojit/odpojit klávesy" -#: src/common/command.c:86 +#: src/common/command.c:87 msgid "[key function/command] [unbind key] [functions] [reset -yes]" msgstr "[klávesa funkce/příkaz] [unbind klávesa] [functions] [reset -yes]" -#: src/common/command.c:87 +#: src/common/command.c:88 msgid "" "key: bind this key to an internal function or a command (beginning by \"/" "\")\n" @@ -2650,15 +2652,15 @@ msgstr "" "reset: obnoví klávesy na výchozí hodnoty a smaže uživatlské zkratky " "(používejte opatrně)" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "list/load/unload plugins" msgstr "seznam/načíst/odebrat pluginy" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "[load jméno_souboru] | [autoload] | [reload] | [unload]" -#: src/common/command.c:94 +#: src/common/command.c:95 msgid "" "filename: WeeChat plugin (file) to load\n" "\n" @@ -2668,11 +2670,11 @@ msgstr "" "\n" "Příkaz /plugin bez argumentů vypíše seznam všech načtených pluginů." -#: src/common/command.c:97 +#: src/common/command.c:98 msgid "list, add or remove servers" msgstr "vypíše, přídá nebo odebere servery" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "" "[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname " @@ -2684,7 +2686,7 @@ msgstr "" "uživatelské_jméno] [-realname pravé_jméno] [-command příkaz] [-autojoin kanál" "[,kanál]] ] | [del jméno_serveru]" -#: src/common/command.c:103 +#: src/common/command.c:104 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -2710,27 +2712,27 @@ msgstr "" "uživatelské_jméno: uživatelské jméno\n" "pravé_jméno: pravé jméno uživatele" -#: src/common/command.c:115 +#: src/common/command.c:116 msgid "save config to disk" msgstr "uloží nastavení na disk" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "[file]" msgstr "[soubor]" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "file: filename for writing config" msgstr "soubor: jméno souboru pro zapsání" -#: src/common/command.c:118 +#: src/common/command.c:119 msgid "set config parameters" msgstr "nastaví konfigurační parametry" -#: src/common/command.c:119 +#: src/common/command.c:120 msgid "[option [ = value]]" msgstr "[volba [ = hodnota]]" -#: src/common/command.c:120 +#: src/common/command.c:121 msgid "" "option: name of an option (if name is full and no value is given, then help " "is displayed on option)\n" @@ -2740,27 +2742,27 @@ msgstr "" "zobrazena nápověda pro volby)\n" "hodnota: hodnota volby" -#: src/common/command.c:124 +#: src/common/command.c:125 msgid "remove an alias" msgstr "odebere alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name" msgstr "jméno_aliasu" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name: name of alias to remove" msgstr "jméno_aliasu: jméno aliasu pro odebrání" -#: src/common/command.c:127 +#: src/common/command.c:128 msgid "unignore IRC messages and/or hosts" msgstr "zruší ignorování IRC zprávy a/nebo hosta" -#: src/common/command.c:128 +#: src/common/command.c:129 msgid "[number | [mask [[type | command] [channel [server]]]]]" msgstr "[číslo | [maska [[typ | příkaz] [kanál [server]]]]]" -#: src/common/command.c:129 +#: src/common/command.c:130 msgid "" " number: # of ignore to unignore (number is displayed by list of ignore)\n" " mask: nick or host mask to unignore\n" @@ -2783,31 +2785,28 @@ msgstr "" "Pro každý argument znamená '*' všechno.\n" "Bez argunetů, vypíše příkaz /unignore seznam definovaných ignorací." -#: src/common/command.c:138 +#: src/common/command.c:139 msgid "show WeeChat uptime" msgstr "" -#: src/common/command.c:139 +#: src/common/command.c:140 msgid "-o" msgstr "" -#: src/common/command.c:140 +#: src/common/command.c:141 msgid "-o: send uptime on current channel as an IRC message" msgstr "" -#: src/common/command.c:142 +#: src/common/command.c:143 msgid "manage windows" msgstr "spravuje okna" -#: src/common/command.c:143 -msgid "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" -msgstr "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" - #: src/common/command.c:144 +msgid "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" +msgstr "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" + +#: src/common/command.c:145 +#, fuzzy msgid "" "list: list opened windows (no parameter implies this list)\n" "-1: jump to previous window\n" @@ -2815,7 +2814,11 @@ msgid "" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" -"merge: merge window with another" +"merge: merge window with another (all = keep only one window)\n" +"\n" +"For splith and splitv, pct is a pourcentage which represents size of new " +"window, computed with current window as size reference. For example 25 means " +"create a new window with size = current_size / 4" msgstr "" "list: vypíše otevřené okna (bez paramatru implikuje tenhle list)\n" "-1: přepne na přechozí okno\n" @@ -2825,28 +2828,28 @@ msgstr "" "splitv: rozdělí aktuální okno vertikálně\n" "merge: spojí okno s jiným" -#: src/common/command.c:293 +#: src/common/command.c:297 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s alias nebo příkaz \"%s\" již existuje!\n" -#: src/common/command.c:303 +#: src/common/command.c:307 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s alias nemůže pouštět jiný ailas!\n" -#: src/common/command.c:310 +#: src/common/command.c:314 #, c-format msgid "%s target command \"/%s\" does not exist!\n" msgstr "%s cílový příkaz \"/%s\" neexistuje!\n" -#: src/common/command.c:548 +#: src/common/command.c:552 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s špatný počet argumentů pro %s příkaz \"%s\" (očekáváno: %d argumentů%s)\n" -#: src/common/command.c:560 +#: src/common/command.c:564 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2855,18 +2858,18 @@ msgstr "" "%s špatyný počet argumentů pro %s příkaz \"%s\" (očekáváno: mezi %d a %d " "argumenty%s)\n" -#: src/common/command.c:582 src/common/command.c:651 +#: src/common/command.c:586 src/common/command.c:655 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s příkaz \"%s\" selhal\n" -#: src/common/command.c:607 +#: src/common/command.c:611 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s chybný počet argumentů pro IRC příkaz \"%s\" (očekáváno: %d argumentů%s)\n" -#: src/common/command.c:619 +#: src/common/command.c:623 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2875,287 +2878,287 @@ msgstr "" "%s špatný počet argumentů pro IRC příkaz \"%s\" (očekáváno: mezi %d a %d " "argumenty%s)\n" -#: src/common/command.c:634 +#: src/common/command.c:638 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n" -#: src/common/command.c:694 +#: src/common/command.c:698 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s neznámý příkaz \"%s\" (zadejte /help pro nápovědu)\n" -#: src/common/command.c:828 +#: src/common/command.c:832 msgid "This window is not a channel!\n" msgstr "Tohe není okno kanálu!\n" -#: src/common/command.c:856 src/common/command.c:887 src/common/command.c:995 +#: src/common/command.c:860 src/common/command.c:891 src/common/command.c:999 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s chybí argumenty pro příkaz \"%s\"\n" -#: src/common/command.c:863 +#: src/common/command.c:867 #, c-format msgid "%s alias can not start with \"/\"\n" msgstr "%s alias nemůže žačínat \"/\"!\n" -#: src/common/command.c:872 +#: src/common/command.c:876 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" vytvořen\n" -#: src/common/command.c:878 +#: src/common/command.c:882 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "Selhalo vytvoření aliasu \"%s\" => \"%s\" (nedostatek paměti)\n" -#: src/common/command.c:898 +#: src/common/command.c:902 msgid "List of aliases:\n" msgstr "Seznam pro aliasy:\n" -#: src/common/command.c:912 +#: src/common/command.c:916 msgid "No alias defined.\n" msgstr "Žádné aliasy nejsou definovány.\n" -#: src/common/command.c:929 +#: src/common/command.c:933 #, c-format msgid "%sServer: %s%s\n" msgstr "%sServer: %s%s\n" -#: src/common/command.c:934 +#: src/common/command.c:938 #, c-format msgid "%sChannel: %s%s %s(server: %s%s%s)\n" msgstr "%sKanál: %s%s %s(server: %s%s%s)\n" -#: src/common/command.c:943 +#: src/common/command.c:947 #, c-format msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n" msgstr "%sSoukromý s: %s%s %s(server: %s%s%s)\n" -#: src/common/command.c:952 +#: src/common/command.c:956 msgid "not connected\n" msgstr "nepřipojen\n" -#: src/common/command.c:974 +#: src/common/command.c:978 msgid "Opened buffers:\n" msgstr "Otevřené buffery:\n" -#: src/common/command.c:1018 +#: src/common/command.c:1022 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s nekorektní číslo bufferu\n" -#: src/common/command.c:1034 +#: src/common/command.c:1038 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s nemohu zavřít jediný buffer\n" -#: src/common/command.c:1044 +#: src/common/command.c:1048 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "%s nemohu zavřít buffer serveru dokud jsou otevřeny kanály\n" -#: src/common/command.c:1093 +#: src/common/command.c:1097 msgid "Notify levels: " msgstr "Level upozornění: " -#: src/common/command.c:1122 src/common/command.c:1170 +#: src/common/command.c:1126 src/common/command.c:1174 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s nekorektní level upozornění (musí být mezi %d a %d)\n" -#: src/common/command.c:1131 +#: src/common/command.c:1135 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "%s nekorektní buffer pro upozornění (musí být kanál nebo soukromý)\n" -#: src/common/command.c:1140 +#: src/common/command.c:1144 #, c-format msgid "New notify level for %s%s%s: %s%d %s" msgstr "Nový level upozornění %s%s%s: %s%d %s" -#: src/common/command.c:1150 +#: src/common/command.c:1154 msgid "(hotlist: never)\n" msgstr "(hotlist: nikdy)\n" -#: src/common/command.c:1153 +#: src/common/command.c:1157 msgid "(hotlist: highlights)\n" msgstr "(hotlist: zvýraznění)\n" -#: src/common/command.c:1156 +#: src/common/command.c:1160 msgid "(hotlist: highlights + messages)\n" msgstr "(hotlist: zvýraznění + zprávy)\n" -#: src/common/command.c:1159 +#: src/common/command.c:1163 msgid "(hotlist: highlights + messages + join/part (all))\n" msgstr "(hotlist: zvýrazění + zprávy + připojení/odpojení (vše))\n" -#: src/common/command.c:1237 +#: src/common/command.c:1241 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "neznámý parametr \"%s\" pro příkaz \"%s\"\n" -#: src/common/command.c:1267 +#: src/common/command.c:1271 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s již vytvořený server \"%s\"!\n" -#: src/common/command.c:1275 +#: src/common/command.c:1279 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s zrovna připojuji k serveru \"%s\"!\n" -#: src/common/command.c:1293 src/common/command.c:1368 +#: src/common/command.c:1297 src/common/command.c:1417 #, c-format msgid "%s server not found\n" msgstr "%s server nenalezen\n" -#: src/common/command.c:1323 src/common/command.c:1878 -#: src/common/command.c:2786 src/common/command.c:2810 +#: src/common/command.c:1372 src/common/command.c:1927 +#: src/common/command.c:2850 src/common/command.c:2885 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s neznámá volba pro příkaz \"%s\"\n" -#: src/common/command.c:1352 +#: src/common/command.c:1401 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s nepřipojen k serveru \"%s\"!\n" -#: src/common/command.c:1360 +#: src/common/command.c:1409 msgid "Auto-reconnection is cancelled\n" msgstr "Automatické znovupřipojené je zrušeno\n" -#: src/common/command.c:1391 src/common/weechat.c:365 +#: src/common/command.c:1440 src/common/weechat.c:365 #, c-format msgid "%s internal commands:\n" msgstr "%s vnitřní příkazy:\n" -#: src/common/command.c:1401 src/common/weechat.c:385 +#: src/common/command.c:1450 src/common/weechat.c:385 #, c-format msgid "IRC commands:\n" msgstr "IRC příkazy:\n" -#: src/common/command.c:1415 +#: src/common/command.c:1464 msgid "Plugin commands:\n" msgstr "Příkazy pluginu:\n" -#: src/common/command.c:1531 +#: src/common/command.c:1580 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "Není dostupná žádná nápověda, \"%s\" je neznámý příkaz\n" -#: src/common/command.c:1550 +#: src/common/command.c:1599 #, c-format msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n" msgstr "%sna %s%s%s/%s%s%s:%s ignoruji %s%s%s od %s%s\n" -#: src/common/command.c:1584 +#: src/common/command.c:1633 msgid "List of ignore:\n" msgstr "Seznam ignorování:\n" -#: src/common/command.c:1601 +#: src/common/command.c:1650 msgid "No ignore defined.\n" msgstr "Žádné ignorování není definováno.\n" -#: src/common/command.c:1627 +#: src/common/command.c:1676 msgid "New ignore:" msgstr "Nové ignorování:" -#: src/common/command.c:1647 +#: src/common/command.c:1696 #, c-format msgid "New key binding: %s" msgstr "Nová klávesová zkratka: %s" -#: src/common/command.c:1681 +#: src/common/command.c:1730 msgid "Key bindings:\n" msgstr "Klávesové zkratky:\n" -#: src/common/command.c:1695 +#: src/common/command.c:1744 #, c-format msgid "Key \"%s\" unbinded\n" msgstr "Klávesa \"%s\" odpojena\n" -#: src/common/command.c:1701 +#: src/common/command.c:1750 #, c-format msgid "%s unable to unbind key \"%s\"\n" msgstr "%s nemohu odpojit klávesu \"%s\"\n" -#: src/common/command.c:1709 src/common/weechat.c:416 +#: src/common/command.c:1758 src/common/weechat.c:416 #, c-format msgid "Internal key functions:\n" msgstr "Vnitřní klávesové funkce:\n" -#: src/common/command.c:1729 +#: src/common/command.c:1778 msgid "Default key bindings restored\n" msgstr "Výchozí klávesové zkratky obnoveny\n" -#: src/common/command.c:1735 +#: src/common/command.c:1784 #, c-format msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" "%s \"-yes\" argument je požadován pro reset kaláves (bezpečnostní opatření)\n" -#: src/common/command.c:1791 +#: src/common/command.c:1840 msgid "Plugins loaded:\n" msgstr "Načtené pluginy:\n" -#: src/common/command.c:1807 +#: src/common/command.c:1856 msgid " message handlers:\n" msgstr " obsluhovače zpráv:\n" -#: src/common/command.c:1816 +#: src/common/command.c:1865 #, c-format msgid " IRC(%s)\n" msgstr " IRC(%s)\n" -#: src/common/command.c:1823 +#: src/common/command.c:1872 msgid " (no message handler)\n" msgstr " (není obsluhovač zprávy)\n" -#: src/common/command.c:1828 +#: src/common/command.c:1877 msgid " command handlers:\n" msgstr " obsluhovače příkazu:\n" -#: src/common/command.c:1849 +#: src/common/command.c:1898 msgid " (no command handler)\n" msgstr " (není obsluhovač příkazu)\n" -#: src/common/command.c:1855 +#: src/common/command.c:1904 msgid " (no plugin)\n" msgstr " (není plugin)\n" -#: src/common/command.c:1891 +#: src/common/command.c:1940 msgid "" "Command \"plugin\" is not available, WeeChat was built without plugins " "support.\n" msgstr "" "Příkaz \"plugin\" není dostupný, WeeChat byl přeložen bez podpory pluginů.\n" -#: src/common/command.c:1938 +#: src/common/command.c:1988 msgid "No server.\n" msgstr "žádný server.\n" -#: src/common/command.c:1949 +#: src/common/command.c:1999 #, c-format msgid "Server '%s' not found.\n" msgstr "Server '%s' nenalezen.\n" -#: src/common/command.c:1961 +#: src/common/command.c:2011 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s chybí jméno serveru pro příkaz \"%s\"\n" -#: src/common/command.c:1969 +#: src/common/command.c:2019 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "%s příliž mnoho argumentů pro příkaz \"%s\", ignoruji argumety\n" -#: src/common/command.c:1988 +#: src/common/command.c:2038 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s server \"%s\" nenalezen pro příkaz \"%s\"\n" -#: src/common/command.c:1996 +#: src/common/command.c:2046 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -3164,185 +3167,192 @@ msgstr "" "%s nemůžete odebrat server \"%s\", protože jste k němu připojent. Skuste " "nejprve /dissconnect %s.\n" -#: src/common/command.c:2014 +#: src/common/command.c:2066 #, c-format msgid "Server %s%s%s has been deleted\n" msgstr "Server %s%s%s byl odebrán\n" -#: src/common/command.c:2031 +#: src/common/command.c:2085 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s chybí parametry pro příkaz \"%s\"\n" -#: src/common/command.c:2041 +#: src/common/command.c:2095 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s server \"%s\" již existuje, nemohu jej vytvořít!\n" -#: src/common/command.c:2070 src/common/command.c:2098 -#: src/common/command.c:2111 src/common/command.c:2137 +#: src/common/command.c:2124 src/common/command.c:2152 +#: src/common/command.c:2165 src/common/command.c:2191 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s chybí heslo pro parametr \"%s\"\n" -#: src/common/command.c:2083 +#: src/common/command.c:2137 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s chybí přezdívka/přezdívky pro parametr \"%s\"\n" -#: src/common/command.c:2124 +#: src/common/command.c:2178 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s chybí příkaz pro parametr \"%s\"\n" -#: src/common/command.c:2159 +#: src/common/command.c:2213 #, c-format msgid "Server %s%s%s created\n" msgstr "Server %s%s%s vytvořen\n" -#: src/common/command.c:2168 +#: src/common/command.c:2222 #, c-format msgid "%s unable to create server\n" msgstr "%s nemohu vytvořit server\n" -#: src/common/command.c:2227 +#: src/common/command.c:2281 msgid "(unknown)" msgstr "(neznámý)" -#: src/common/command.c:2250 +#: src/common/command.c:2304 #, c-format msgid "%s(password hidden) " msgstr "%s(heslo schováno) " -#: src/common/command.c:2317 +#: src/common/command.c:2371 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s server \"%s\" nenalezen\n" -#: src/common/command.c:2350 src/common/command.c:2398 +#: src/common/command.c:2404 src/common/command.c:2452 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s volba nastavení \"%s\" nenalezena\n" -#: src/common/command.c:2355 src/common/command.c:2390 +#: src/common/command.c:2409 src/common/command.c:2444 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s nekorektní hodnota pro volbu \"%s\"\n" -#: src/common/command.c:2371 +#: src/common/command.c:2425 #, 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:2481 +#: src/common/command.c:2535 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Nebyla nalezena žádná volba nastavení s \"%s\"\n" -#: src/common/command.c:2484 +#: src/common/command.c:2538 msgid "No config option found\n" msgstr "Nebyla nalezena žádná volba nastavení\n" -#: src/common/command.c:2491 +#: src/common/command.c:2545 #, c-format msgid "%sDetail:\n" msgstr "%sDetail:\n" -#: src/common/command.c:2496 src/common/weechat.c:302 +#: src/common/command.c:2550 src/common/weechat.c:302 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . typ boolean (hodnota: 'on' nebo 'off')\n" -#: src/common/command.c:2497 src/common/command.c:2520 -#: src/common/command.c:2526 src/common/command.c:2532 +#: src/common/command.c:2551 src/common/command.c:2574 +#: src/common/command.c:2580 src/common/command.c:2586 #: src/common/weechat.c:303 src/common/weechat.c:326 src/common/weechat.c:332 #: src/common/weechat.c:338 #, c-format msgid " . default value: '%s'\n" msgstr " . výchozí hodnota: '%s'\n" -#: src/common/command.c:2502 src/common/weechat.c:308 +#: src/common/command.c:2556 src/common/weechat.c:308 #, 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:2505 src/common/weechat.c:311 +#: src/common/command.c:2559 src/common/weechat.c:311 #, c-format msgid " . default value: %d\n" msgstr " . výchozí hodnota: %d\n" -#: src/common/command.c:2509 src/common/weechat.c:315 +#: src/common/command.c:2563 src/common/weechat.c:315 #, c-format msgid " . type string (values: " msgstr " . typ řetězec (hodnoty: " -#: src/common/command.c:2522 src/common/command.c:2528 -#: src/common/command.c:2534 src/common/weechat.c:328 src/common/weechat.c:334 +#: src/common/command.c:2576 src/common/command.c:2582 +#: src/common/command.c:2588 src/common/weechat.c:328 src/common/weechat.c:334 #: src/common/weechat.c:340 msgid "empty" msgstr "prázdný" -#: src/common/command.c:2525 src/common/weechat.c:331 +#: src/common/command.c:2579 src/common/weechat.c:331 #, c-format 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:2531 src/common/weechat.c:337 +#: src/common/command.c:2585 src/common/weechat.c:337 #, c-format msgid " . type string (any string)\n" msgstr " . typ řetězec (jakýkoliv řetězec)\n" -#: src/common/command.c:2537 src/common/weechat.c:343 +#: src/common/command.c:2591 src/common/weechat.c:343 #, c-format msgid " . description: %s\n" msgstr " . popis: %s\n" -#: src/common/command.c:2548 +#: src/common/command.c:2602 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "volba/volby nastavení nalezeny s \"%s\"\n" -#: src/common/command.c:2551 +#: src/common/command.c:2605 msgid "config option(s) found\n" msgstr "volba/volby nastavení nalezeny\n" -#: src/common/command.c:2572 +#: src/common/command.c:2626 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias nebo příkaz \"%s\" nenalezen\n" -#: src/common/command.c:2582 +#: src/common/command.c:2636 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" odebrán\n" -#: src/common/command.c:2638 +#: src/common/command.c:2692 msgid "ignore were removed.\n" msgstr "ignorování bylo odebráno.\n" -#: src/common/command.c:2640 +#: src/common/command.c:2694 msgid "ignore was removed.\n" msgstr "ignorování bylo odebrán\n" -#: src/common/command.c:2645 +#: src/common/command.c:2699 #, c-format msgid "%s no ignore found\n" msgstr "%s žádné ignorování nenaleyeno\n" -#: src/common/command.c:2675 +#: src/common/command.c:2729 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "" -#: src/common/command.c:2692 +#: src/common/command.c:2746 #, 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:2732 +#: src/common/command.c:2786 msgid "Opened windows:\n" msgstr "Otevřené okna:\n" +#: src/common/command.c:2861 +#, c-format +msgid "" +"%s can not merge windows, there's no other window with same size near " +"current one.\n" +msgstr "" + #: src/common/fifo.c:71 src/common/fifo.c:73 #, c-format msgid "%s unable to create FIFO pipe for remote control (%s)\n" @@ -4629,5 +4639,8 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Ukládám konfiguraci na disk\n" +#~ msgid "dump" +#~ msgstr "dump" + #~ msgid "%s unable to call handler for message (not enough memory)\n" #~ msgstr "%s nemohu zavolat handler pro zprávu (neodstatek paměti)\n" @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-11 10:15+0100\n" -"PO-Revision-Date: 2005-11-11 17:02+0100\n" +"POT-Creation-Date: 2005-11-13 16:40+0100\n" +"PO-Revision-Date: 2005-11-13 16:43+0100\n" "Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -41,9 +41,9 @@ msgid "%s not enough memory for received IRC message\n" msgstr "%s memoria insuficiente para un mensaje IRC recibido\n" #: src/irc/irc-server.c:675 -#, fuzzy, c-format +#, c-format msgid "%s Command \"%s\" failed!\n" -msgstr "%s el comando \"%s\" ha fallado\n" +msgstr "" #: src/irc/irc-server.c:681 #, c-format @@ -1400,7 +1400,7 @@ msgstr "desconocido" msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilizacin del nombre de mquina local \"%s\"\n" -#: src/irc/irc-send.c:175 src/common/command.c:783 +#: src/irc/irc-send.c:175 src/common/command.c:787 #, 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" @@ -1417,8 +1417,8 @@ msgstr "" #: src/irc/irc-send.c:472 src/irc/irc-send.c:484 src/irc/irc-send.c:502 #: src/irc/irc-send.c:1166 src/irc/irc-send.c:1264 src/irc/irc-send.c:1796 -#: src/common/command.c:1310 src/common/command.c:1749 -#: src/common/command.c:1885 +#: src/common/command.c:1353 src/common/command.c:1798 +#: src/common/command.c:1934 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n" @@ -1452,9 +1452,9 @@ msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" #: src/irc/irc-recv.c:362 -#, fuzzy, c-format +#, c-format msgid "You have been invited to %s%s%s by %s%s\n" -msgstr "Has sido invitado a " +msgstr "" #: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008 #: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3522 @@ -1474,9 +1474,9 @@ msgid "%s%s %s(%s%s%s)%s has joined %s%s\n" msgstr "" #: src/irc/irc-recv.c:477 -#, fuzzy, c-format +#, c-format msgid "%s%s%s has kicked %s%s%s from %s%s" -msgstr "ha cambiado el tema por " +msgstr "" #: src/irc/irc-recv.c:562 #, c-format @@ -1625,14 +1625,14 @@ msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n" msgstr "" #: src/irc/irc-recv.c:1088 -#, fuzzy, c-format +#, c-format msgid "You are now known as %s%s\n" -msgstr "ahora conocido como" +msgstr "" #: src/irc/irc-recv.c:1092 -#, fuzzy, c-format +#, c-format msgid "%s%s%s is now known as %s%s\n" -msgstr "ahora conocido como" +msgstr "" #: src/irc/irc-recv.c:1159 #, c-format @@ -1670,19 +1670,19 @@ msgid "On %s: * %s %s" msgstr "En %s: * %s %s" #: src/irc/irc-recv.c:1538 -#, fuzzy, c-format +#, c-format msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n" -msgstr "Recibido un sonido CTCP \\\"%s\\\" de " +msgstr "" #: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739 -#, fuzzy, c-format +#, c-format msgid "CTCP %sPING%s received from %s%s\n" -msgstr " recibido de " +msgstr "" #: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104 -#, fuzzy, c-format +#, c-format msgid "Unknown CTCP %s%s%s received from %s%s" -msgstr "%s tipo DCC CHAT desconocido recibido de " +msgstr "" #: src/irc/irc-recv.c:1629 #, c-format @@ -1690,9 +1690,9 @@ msgid "On %s: %s> %s" msgstr "En %s: %s> %s" #: src/irc/irc-recv.c:1700 -#, fuzzy, c-format +#, c-format msgid "CTCP %sVERSION%s received from %s%s" -msgstr " recibido de " +msgstr "" #: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794 #: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857 @@ -1724,14 +1724,14 @@ msgid "%s \"%s\" command received without channel\n" msgstr "%s comando \"%s\" recibido sin canal\n" #: src/irc/irc-recv.c:2383 -#, fuzzy, c-format +#, c-format msgid "%s%s%s has changed topic for %s%s%s to:" -msgstr "ha cambiado el tema por " +msgstr "" #: src/irc/irc-recv.c:2394 -#, fuzzy, c-format +#, c-format msgid "%s%s%s has unset topic for %s%s\n" -msgstr " ha quitado el tema por " +msgstr "" #: src/irc/irc-recv.c:2504 #, c-format @@ -1739,9 +1739,9 @@ msgid "User mode %s[%s%s%s/%s%s%s]\n" msgstr "" #: src/irc/irc-recv.c:2559 -#, fuzzy, c-format +#, c-format msgid "%s%s%s is away: %s\n" -msgstr " est ausente: %s\n" +msgstr "" #: src/irc/irc-recv.c:2644 msgid "Users online: " @@ -1757,11 +1757,11 @@ msgstr "" msgid "%s[%s%s%s]%s idle: " msgstr "" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "days" msgstr "das" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "day" msgstr "da" @@ -1795,9 +1795,9 @@ msgid "second" msgstr "segundo" #: src/irc/irc-recv.c:3534 -#, fuzzy, c-format +#, c-format msgid "No topic set for %s%s\n" -msgstr "No hay tema definido para " +msgstr "" #: src/irc/irc-recv.c:3590 #, c-format @@ -1810,9 +1810,9 @@ msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s no es posible identificar el canal para el comando \"%s\"\n" #: src/irc/irc-recv.c:3663 -#, fuzzy, c-format +#, c-format msgid "Topic set by %s%s%s, %s" -msgstr "Tema definido por " +msgstr "" #: src/irc/irc-recv.c:3683 #, c-format @@ -1826,9 +1826,9 @@ msgstr "" "%s no es posible determinar el nombre de usuario para el comando \"%s\"\n" #: src/irc/irc-recv.c:3741 -#, fuzzy, c-format +#, c-format msgid "%s%s%s has invited %s%s%s on %s%s\n" -msgstr "ha cambiado el tema por " +msgstr "" #: src/irc/irc-recv.c:3801 #, c-format @@ -2030,14 +2030,14 @@ msgid "" msgstr "" #: src/irc/irc-dcc.c:716 -#, fuzzy, c-format +#, c-format msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n" -msgstr "Recibir DCC chat de " +msgstr "" #: src/irc/irc-dcc.c:733 -#, fuzzy, c-format +#, c-format msgid "Sending DCC chat request to %s%s\n" -msgstr "Enviar DCC chat a " +msgstr "" #: src/irc/irc-dcc.c:751 #, c-format @@ -2243,64 +2243,64 @@ msgstr "" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "bytes" msgstr "bytes" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Kb" msgstr "KB" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Mb" msgstr "MB" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Gb" msgstr "GB" -#: src/gui/curses/gui-display.c:1921 +#: src/gui/curses/gui-display.c:1926 msgid "<servers>" msgstr "<servidores>" -#: src/gui/curses/gui-display.c:1933 +#: src/gui/curses/gui-display.c:1938 msgid "(away)" msgstr "(ausente)" -#: src/gui/curses/gui-display.c:2067 +#: src/gui/curses/gui-display.c:2072 msgid "[not connected] " msgstr "[no conectado] " -#: src/gui/curses/gui-display.c:2077 +#: src/gui/curses/gui-display.c:2082 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2165 +#: src/gui/curses/gui-display.c:2170 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2181 +#: src/gui/curses/gui-display.c:2186 msgid "-MORE-" msgstr "-MS-" -#: src/gui/curses/gui-display.c:2359 +#: src/gui/curses/gui-display.c:2364 msgid " [A] Accept" msgstr " [A] Aceptar" -#: src/gui/curses/gui-display.c:2360 src/gui/curses/gui-display.c:2364 +#: src/gui/curses/gui-display.c:2365 src/gui/curses/gui-display.c:2369 msgid " [C] Cancel" msgstr " [C] Cancelar" -#: src/gui/curses/gui-display.c:2369 +#: src/gui/curses/gui-display.c:2374 msgid " [R] Remove" msgstr " [R] Eliminar" -#: src/gui/curses/gui-display.c:2373 +#: src/gui/curses/gui-display.c:2378 msgid " [P] Purge old DCC" msgstr " [P] Purgar los viejos DCC" -#: src/gui/curses/gui-display.c:2374 +#: src/gui/curses/gui-display.c:2379 msgid " [Q] Close DCC view" msgstr " [Q] Cerrar la vista DCC" @@ -2308,11 +2308,11 @@ msgstr " [Q] Cerrar la vista DCC" msgid "server" msgstr "servidor" -#: src/gui/gui-common.c:509 +#: src/gui/gui-common.c:637 msgid "Not enough memory for new line\n" msgstr "No hay suficiente memoria para una nueva lnea\n" -#: src/gui/gui-common.c:854 +#: src/gui/gui-common.c:982 msgid "Not enough memory for infobar message\n" msgstr "No hay suficiente memoria para el mensaje de la barra de informacin\n" @@ -2464,7 +2464,7 @@ msgstr "recargar la pantalla" msgid "grab a key" msgstr "" -#: src/gui/gui-keyboard.c:428 src/common/command.c:1764 +#: src/gui/gui-keyboard.c:428 src/common/command.c:1813 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s No ha sido posible atar la clave \"%s\"\n" @@ -2564,38 +2564,37 @@ msgid "print debug messages" msgstr "imprime mensajes de depuracin" #: src/common/command.c:69 -msgid "dump" -msgstr "dump" +msgid "dump | windows" +msgstr "dump | windows" #: src/common/command.c:70 msgid "" "dump: save memory dump in WeeChat log file (same dump is written when " -"WeeChat crashes)" +"WeeChat crashes)\n" +"windows: display windows tree" msgstr "" -"volcado: almacena un volcado de memoria en el archivo de registro de Weechat " -"(se escribe el mismo volcado cuando Weechat se cuelga)" -#: src/common/command.c:72 +#: src/common/command.c:73 msgid "display help about commands" msgstr "mostrar ayuda sobre los comandos" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "[command]" msgstr "[comando]" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "command: name of a WeeChat or IRC command" msgstr "comando: nombre de un comando de Weechat de IRC" -#: src/common/command.c:75 +#: src/common/command.c:76 msgid "ignore IRC messages and/or hosts" msgstr "" -#: src/common/command.c:76 +#: src/common/command.c:77 msgid "[mask [[type | command] [channel [server]]]]" msgstr "" -#: src/common/command.c:77 +#: src/common/command.c:78 msgid "" " mask: nick or host mask to ignore\n" " type: type of message to ignore (action, ctcp, dcc, pv)\n" @@ -2607,15 +2606,15 @@ msgid "" "Without argument, /ignore command lists all defined ignore." msgstr "" -#: src/common/command.c:85 +#: src/common/command.c:86 msgid "bind/unbind keys" msgstr "atar/desatar claves" -#: src/common/command.c:86 +#: src/common/command.c:87 msgid "[key function/command] [unbind key] [functions] [reset -yes]" msgstr "[clave funcin/comando] [desatar clave] [funciones] [reset -yes]" -#: src/common/command.c:87 +#: src/common/command.c:88 msgid "" "key: bind this key to an internal function or a command (beginning by \"/" "\")\n" @@ -2632,26 +2631,26 @@ msgstr "" "reset: restaura anclajes a los valores por defecto y elimina todos los " "anclajes personales (usar cuidadosamente)" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "list/load/unload plugins" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "[load fichero] | [autoload] | [reload] | [unload]" -#: src/common/command.c:94 +#: src/common/command.c:95 msgid "" "filename: WeeChat plugin (file) to load\n" "\n" "Without argument, /plugin command lists all loaded plugins." msgstr "" -#: src/common/command.c:97 +#: src/common/command.c:98 msgid "list, add or remove servers" msgstr "lista, aade o elimina servidores" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "" "[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname " @@ -2663,7 +2662,7 @@ msgstr "" "username nombre de usuario] [-realname nombre_real] [-command comando] [-" "autojoin canal[,canal]] ] | [del nombre_de_servidor]" -#: src/common/command.c:103 +#: src/common/command.c:104 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -2689,54 +2688,54 @@ msgstr "" "nombre_de_usuario: nombre de usuario\n" "nombre_real: nombre real del usuario" -#: src/common/command.c:115 +#: src/common/command.c:116 msgid "save config to disk" msgstr "guardar configuracin a disco" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "[file]" msgstr "[archivo]" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "file: filename for writing config" msgstr "archivo: fichero en el que guardar la configuracin" -#: src/common/command.c:118 +#: src/common/command.c:119 msgid "set config parameters" msgstr "modificar parmetros de configuracin" -#: src/common/command.c:119 +#: src/common/command.c:120 msgid "[option [ = value]]" msgstr "[opcin [ = valor]]" -#: src/common/command.c:120 +#: src/common/command.c:121 msgid "" "option: name of an option (if name is full and no value is given, then help " "is displayed on option)\n" "value: value for option" msgstr "" -#: src/common/command.c:124 +#: src/common/command.c:125 msgid "remove an alias" msgstr "eliminar un alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name" msgstr "alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name: name of alias to remove" msgstr "alias: nombre del alias a suprimir" -#: src/common/command.c:127 +#: src/common/command.c:128 msgid "unignore IRC messages and/or hosts" msgstr "" -#: src/common/command.c:128 +#: src/common/command.c:129 msgid "[number | [mask [[type | command] [channel [server]]]]]" msgstr "" -#: src/common/command.c:129 +#: src/common/command.c:130 msgid "" " number: # of ignore to unignore (number is displayed by list of ignore)\n" " mask: nick or host mask to unignore\n" @@ -2749,31 +2748,27 @@ msgid "" "Without argument, /unignore command lists all defined ignore." msgstr "" -#: src/common/command.c:138 +#: src/common/command.c:139 msgid "show WeeChat uptime" msgstr "" -#: src/common/command.c:139 +#: src/common/command.c:140 msgid "-o" msgstr "" -#: src/common/command.c:140 +#: src/common/command.c:141 msgid "-o: send uptime on current channel as an IRC message" msgstr "" -#: src/common/command.c:142 +#: src/common/command.c:143 msgid "manage windows" msgstr "gestin de ventanas" -#: src/common/command.c:143 -msgid "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" -msgstr "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" - #: src/common/command.c:144 +msgid "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" +msgstr "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" + +#: src/common/command.c:145 #, fuzzy msgid "" "list: list opened windows (no parameter implies this list)\n" @@ -2782,7 +2777,11 @@ msgid "" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" -"merge: merge window with another" +"merge: merge window with another (all = keep only one window)\n" +"\n" +"For splith and splitv, pct is a pourcentage which represents size of new " +"window, computed with current window as size reference. For example 25 means " +"create a new window with size = current_size / 4" msgstr "" "list: lista las ventanas abiertas (si no hay parmetros, significa esta " "lista)\n" @@ -2793,29 +2792,29 @@ msgstr "" "splitv: dividir la ventana actual verticalmente\n" "merge: fusionar una ventana con otra" -#: src/common/command.c:293 +#: src/common/command.c:297 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s el alias o el comando \"%s\" ya existe!\n" -#: src/common/command.c:303 +#: src/common/command.c:307 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s el alias no puede ejecutar otro alias!\n" -#: src/common/command.c:310 -#, fuzzy, c-format +#: src/common/command.c:314 +#, c-format msgid "%s target command \"/%s\" does not exist!\n" -msgstr "%s el comando objetivo \"%s\" no existe!\n" +msgstr "" -#: src/common/command.c:548 +#: src/common/command.c:552 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nmero de argumentos incorrecto para el comando %s \"%s\" (esperado: %d " "parmetro%s)\n" -#: src/common/command.c:560 +#: src/common/command.c:564 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2824,19 +2823,19 @@ msgstr "" "%s nmero de argumentos incorrecto para el comando %s \"%s\" (esperado: " "entre %d y %d parmetro%s)\n" -#: src/common/command.c:582 src/common/command.c:651 +#: src/common/command.c:586 src/common/command.c:655 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s el comando \"%s\" ha fallado\n" -#: src/common/command.c:607 +#: src/common/command.c:611 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nmero de argumentos incorrecto para el comando IRC \"%s\" (esperado: %d " "parmetro%s)\n" -#: src/common/command.c:619 +#: src/common/command.c:623 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2845,292 +2844,291 @@ msgstr "" "%s nmero de argumentos incorrecto para el comando IRC \"%s\" (esperado: " "entre %d y %d parmetro%s)\n" -#: src/common/command.c:634 +#: src/common/command.c:638 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s el comando \"%s\" requiere una conexin a servidor!\n" -#: src/common/command.c:694 +#: src/common/command.c:698 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n" -#: src/common/command.c:828 +#: src/common/command.c:832 msgid "This window is not a channel!\n" msgstr "Esta ventana no es un canal!\n" -#: src/common/command.c:856 src/common/command.c:887 src/common/command.c:995 +#: src/common/command.c:860 src/common/command.c:891 src/common/command.c:999 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s faltan argumentos para el comando \"%s\"\n" -#: src/common/command.c:863 -#, fuzzy, c-format +#: src/common/command.c:867 +#, c-format msgid "%s alias can not start with \"/\"\n" -msgstr "%s el alias no puede ejecutar otro alias!\n" +msgstr "" -#: src/common/command.c:872 +#: src/common/command.c:876 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" creado\n" -#: src/common/command.c:878 +#: src/common/command.c:882 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "" "No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente " "memoria)\n" -#: src/common/command.c:898 +#: src/common/command.c:902 msgid "List of aliases:\n" msgstr "Lista de alias:\n" -#: src/common/command.c:912 +#: src/common/command.c:916 msgid "No alias defined.\n" msgstr "Ningn alias definido.\n" -#: src/common/command.c:929 +#: src/common/command.c:933 #, c-format msgid "%sServer: %s%s\n" msgstr "%sServidor: %s%s\n" -#: src/common/command.c:934 +#: src/common/command.c:938 #, c-format msgid "%sChannel: %s%s %s(server: %s%s%s)\n" msgstr "" -#: src/common/command.c:943 +#: src/common/command.c:947 #, c-format msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n" msgstr "" -#: src/common/command.c:952 +#: src/common/command.c:956 msgid "not connected\n" msgstr "no conectado\n" -#: src/common/command.c:974 +#: src/common/command.c:978 msgid "Opened buffers:\n" msgstr "Bfers abiertos:\n" -#: src/common/command.c:1018 +#: src/common/command.c:1022 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s nmero de bfer incorrecto\n" -#: src/common/command.c:1034 +#: src/common/command.c:1038 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s no es posible cerrar el nico bfer\n" -#: src/common/command.c:1044 +#: src/common/command.c:1048 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" "%s no se puede cerrar el bfer de servidor mientras haya canales abiertos\n" -#: src/common/command.c:1093 +#: src/common/command.c:1097 msgid "Notify levels: " msgstr "Niveles de notificacin: " -#: src/common/command.c:1122 src/common/command.c:1170 +#: src/common/command.c:1126 src/common/command.c:1174 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s nivel de notificacin incorrecto (debe estar entre %d y %d)\n" -#: src/common/command.c:1131 +#: src/common/command.c:1135 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "%s bfer incorrecto para notificar (debe ser canal o privado)\n" -#: src/common/command.c:1140 -#, fuzzy, c-format +#: src/common/command.c:1144 +#, c-format msgid "New notify level for %s%s%s: %s%d %s" -msgstr "Niveles de notificacin: " +msgstr "" -#: src/common/command.c:1150 -#, fuzzy +#: src/common/command.c:1154 msgid "(hotlist: never)\n" -msgstr "quin es (servidor)" +msgstr "" -#: src/common/command.c:1153 +#: src/common/command.c:1157 msgid "(hotlist: highlights)\n" msgstr "" -#: src/common/command.c:1156 +#: src/common/command.c:1160 msgid "(hotlist: highlights + messages)\n" msgstr "" -#: src/common/command.c:1159 +#: src/common/command.c:1163 msgid "(hotlist: highlights + messages + join/part (all))\n" msgstr "" -#: src/common/command.c:1237 +#: src/common/command.c:1241 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "parmetro desconocido \"%s\" para el comando \"%s\"\n" -#: src/common/command.c:1267 +#: src/common/command.c:1271 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s ya conectado al servidor \"%s\"!\n" -#: src/common/command.c:1275 +#: src/common/command.c:1279 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s actualmente conectando al servidor \"%s\"!\n" -#: src/common/command.c:1293 src/common/command.c:1368 +#: src/common/command.c:1297 src/common/command.c:1417 #, c-format msgid "%s server not found\n" msgstr "%s servidor no encontrado\n" -#: src/common/command.c:1323 src/common/command.c:1878 -#: src/common/command.c:2786 src/common/command.c:2810 +#: src/common/command.c:1372 src/common/command.c:1927 +#: src/common/command.c:2850 src/common/command.c:2885 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opcin desconocida para el comando \"%s\"\n" -#: src/common/command.c:1352 +#: src/common/command.c:1401 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s no conectado al servidor \"%s\"!\n" -#: src/common/command.c:1360 +#: src/common/command.c:1409 msgid "Auto-reconnection is cancelled\n" msgstr "La reconexin automtica est anulada\n" -#: src/common/command.c:1391 src/common/weechat.c:365 +#: src/common/command.c:1440 src/common/weechat.c:365 #, c-format msgid "%s internal commands:\n" msgstr "Comandos internos %s :\n" -#: src/common/command.c:1401 src/common/weechat.c:385 +#: src/common/command.c:1450 src/common/weechat.c:385 #, c-format msgid "IRC commands:\n" msgstr "Comandos IRC :\n" -#: src/common/command.c:1415 +#: src/common/command.c:1464 msgid "Plugin commands:\n" msgstr "" -#: src/common/command.c:1531 +#: src/common/command.c:1580 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n" -#: src/common/command.c:1550 -#, fuzzy, c-format +#: src/common/command.c:1599 +#, c-format msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n" -msgstr "ha cambiado el tema por " +msgstr "" -#: src/common/command.c:1584 +#: src/common/command.c:1633 msgid "List of ignore:\n" msgstr "" -#: src/common/command.c:1601 +#: src/common/command.c:1650 msgid "No ignore defined.\n" msgstr "" -#: src/common/command.c:1627 +#: src/common/command.c:1676 msgid "New ignore:" msgstr "" -#: src/common/command.c:1647 -#, fuzzy, c-format +#: src/common/command.c:1696 +#, c-format msgid "New key binding: %s" -msgstr "Nuevo anclaje de clave:\n" +msgstr "" -#: src/common/command.c:1681 +#: src/common/command.c:1730 msgid "Key bindings:\n" msgstr "Anclajes de clave:\n" -#: src/common/command.c:1695 +#: src/common/command.c:1744 #, c-format msgid "Key \"%s\" unbinded\n" msgstr "Clave \"%s\" desatada\n" -#: src/common/command.c:1701 +#: src/common/command.c:1750 #, c-format msgid "%s unable to unbind key \"%s\"\n" msgstr "%s No ha sido posible desatar la clave \"%s\"\n" -#: src/common/command.c:1709 src/common/weechat.c:416 +#: src/common/command.c:1758 src/common/weechat.c:416 #, c-format msgid "Internal key functions:\n" msgstr "Funciones de clave internas:\n" -#: src/common/command.c:1729 +#: src/common/command.c:1778 msgid "Default key bindings restored\n" msgstr "Anclajes de clave por defecto restaurados\n" -#: src/common/command.c:1735 +#: src/common/command.c:1784 #, c-format msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" "%s \"-yes\" se requiere argumento para resetear las claves (por razones de " "seguridad)\n" -#: src/common/command.c:1791 +#: src/common/command.c:1840 msgid "Plugins loaded:\n" msgstr "" -#: src/common/command.c:1807 +#: src/common/command.c:1856 msgid " message handlers:\n" msgstr "" -#: src/common/command.c:1816 +#: src/common/command.c:1865 #, c-format msgid " IRC(%s)\n" msgstr "" -#: src/common/command.c:1823 +#: src/common/command.c:1872 msgid " (no message handler)\n" msgstr "" -#: src/common/command.c:1828 +#: src/common/command.c:1877 msgid " command handlers:\n" msgstr "" -#: src/common/command.c:1849 +#: src/common/command.c:1898 msgid " (no command handler)\n" msgstr "" -#: src/common/command.c:1855 +#: src/common/command.c:1904 msgid " (no plugin)\n" msgstr "" -#: src/common/command.c:1891 +#: src/common/command.c:1940 msgid "" "Command \"plugin\" is not available, WeeChat was built without plugins " "support.\n" msgstr "" -#: src/common/command.c:1938 +#: src/common/command.c:1988 msgid "No server.\n" msgstr "Ningn servidor.\n" -#: src/common/command.c:1949 +#: src/common/command.c:1999 #, c-format msgid "Server '%s' not found.\n" msgstr "Servidor '%s' no encontrado.\n" -#: src/common/command.c:1961 +#: src/common/command.c:2011 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s falta el nombre de servidor para el comando \"%s\"\n" -#: src/common/command.c:1969 +#: src/common/command.c:2019 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" "%s demasiados argumentos para el comando \"%s\", ignorando parmetros\n" -#: src/common/command.c:1988 +#: src/common/command.c:2038 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1996 +#: src/common/command.c:2046 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -3139,187 +3137,194 @@ msgstr "" "%s usted no puede eliminar el servidor \"%s\" ya que est usted conectado a " "l. Pruebe /disconnect %s antes.\n" -#: src/common/command.c:2014 -#, fuzzy, c-format +#: src/common/command.c:2066 +#, c-format msgid "Server %s%s%s has been deleted\n" -msgstr "ha sido eliminado\n" +msgstr "" -#: src/common/command.c:2031 +#: src/common/command.c:2085 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s faltan parmetros para el comando \"%s\"\n" -#: src/common/command.c:2041 +#: src/common/command.c:2095 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s el servidor \"%s\" ya existe, no se puede crear!\n" -#: src/common/command.c:2070 src/common/command.c:2098 -#: src/common/command.c:2111 src/common/command.c:2137 +#: src/common/command.c:2124 src/common/command.c:2152 +#: src/common/command.c:2165 src/common/command.c:2191 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s falta contrasea para el comando \"%s\"\n" -#: src/common/command.c:2083 +#: src/common/command.c:2137 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s falta(n) usuario(s) para el parmetro \"%s\"\n" -#: src/common/command.c:2124 +#: src/common/command.c:2178 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s falta comando para el parmetro \"%s\"\n" -#: src/common/command.c:2159 -#, fuzzy, c-format +#: src/common/command.c:2213 +#, c-format msgid "Server %s%s%s created\n" -msgstr "Servidor '%s' no encontrado.\n" +msgstr "" -#: src/common/command.c:2168 +#: src/common/command.c:2222 #, c-format msgid "%s unable to create server\n" msgstr "%s no es posible crear el servidor\n" -#: src/common/command.c:2227 +#: src/common/command.c:2281 msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:2250 -#, fuzzy, c-format +#: src/common/command.c:2304 +#, c-format msgid "%s(password hidden) " -msgstr "(contrasea oculta) " +msgstr "" -#: src/common/command.c:2317 +#: src/common/command.c:2371 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:2350 src/common/command.c:2398 +#: src/common/command.c:2404 src/common/command.c:2452 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s opcin de configuracin \"%s\" no encontrada\n" -#: src/common/command.c:2355 src/common/command.c:2390 +#: src/common/command.c:2409 src/common/command.c:2444 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opcin \"%s\"\n" -#: src/common/command.c:2371 +#: src/common/command.c:2425 #, 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:2481 +#: src/common/command.c:2535 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Ninguna opcin de configuracin encontrada con \"%s\"\n" -#: src/common/command.c:2484 +#: src/common/command.c:2538 msgid "No config option found\n" msgstr "Ninguna opcin de configuracin encontrada\n" -#: src/common/command.c:2491 +#: src/common/command.c:2545 #, c-format msgid "%sDetail:\n" msgstr "" -#: src/common/command.c:2496 src/common/weechat.c:302 +#: src/common/command.c:2550 src/common/weechat.c:302 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . tipo booleano (valores: 'on' u 'off')\n" -#: src/common/command.c:2497 src/common/command.c:2520 -#: src/common/command.c:2526 src/common/command.c:2532 +#: src/common/command.c:2551 src/common/command.c:2574 +#: src/common/command.c:2580 src/common/command.c:2586 #: src/common/weechat.c:303 src/common/weechat.c:326 src/common/weechat.c:332 #: src/common/weechat.c:338 #, c-format msgid " . default value: '%s'\n" msgstr " . valor por defecto: '%s'\n" -#: src/common/command.c:2502 src/common/weechat.c:308 +#: src/common/command.c:2556 src/common/weechat.c:308 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . tipo entero (valores: entre %d y %d)\n" -#: src/common/command.c:2505 src/common/weechat.c:311 +#: src/common/command.c:2559 src/common/weechat.c:311 #, c-format msgid " . default value: %d\n" msgstr " . valor por defecto: %d\n" -#: src/common/command.c:2509 src/common/weechat.c:315 +#: src/common/command.c:2563 src/common/weechat.c:315 #, c-format msgid " . type string (values: " msgstr " . tipo cadena (valores: " -#: src/common/command.c:2522 src/common/command.c:2528 -#: src/common/command.c:2534 src/common/weechat.c:328 src/common/weechat.c:334 +#: src/common/command.c:2576 src/common/command.c:2582 +#: src/common/command.c:2588 src/common/weechat.c:328 src/common/weechat.c:334 #: src/common/weechat.c:340 msgid "empty" msgstr "vaco" -#: src/common/command.c:2525 src/common/weechat.c:331 +#: src/common/command.c:2579 src/common/weechat.c:331 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . tipo color (color Curses Gtk, ver la documentacin de WeeChat)\n" -#: src/common/command.c:2531 src/common/weechat.c:337 +#: src/common/command.c:2585 src/common/weechat.c:337 #, c-format msgid " . type string (any string)\n" msgstr " . tipo cadena (cualquier cadena)\n" -#: src/common/command.c:2537 src/common/weechat.c:343 +#: src/common/command.c:2591 src/common/weechat.c:343 #, c-format msgid " . description: %s\n" msgstr " . descripcin: %s\n" -#: src/common/command.c:2548 +#: src/common/command.c:2602 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "opcin/opciones de configuracin encontrada(s) con \"%s\"\n" -#: src/common/command.c:2551 +#: src/common/command.c:2605 msgid "config option(s) found\n" msgstr "opcin/opciones de configuracin encontrada(s)\n" -#: src/common/command.c:2572 +#: src/common/command.c:2626 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:2582 +#: src/common/command.c:2636 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:2638 +#: src/common/command.c:2692 msgid "ignore were removed.\n" msgstr "" -#: src/common/command.c:2640 +#: src/common/command.c:2694 msgid "ignore was removed.\n" msgstr "" -#: src/common/command.c:2645 +#: src/common/command.c:2699 #, c-format msgid "%s no ignore found\n" msgstr "" -#: src/common/command.c:2675 +#: src/common/command.c:2729 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "" -#: src/common/command.c:2692 +#: src/common/command.c:2746 #, 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:2732 +#: src/common/command.c:2786 msgid "Opened windows:\n" msgstr "Ventanas abiertas:\n" +#: src/common/command.c:2861 +#, c-format +msgid "" +"%s can not merge windows, there's no other window with same size near " +"current one.\n" +msgstr "" + #: src/common/fifo.c:71 src/common/fifo.c:73 #, c-format msgid "%s unable to create FIFO pipe for remote control (%s)\n" @@ -4127,9 +4132,8 @@ msgid "" msgstr "" #: src/common/weeconfig.c:692 src/common/weeconfig.c:694 -#, fuzzy msgid "when off, colors codes are ignored in incoming messages" -msgstr "quitar colores en los mensajes entrantes" +msgstr "" #: src/common/weeconfig.c:697 msgid "allow user to send colors" @@ -4594,6 +4598,9 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Guardar configuracin a disco\n" +#~ msgid "dump" +#~ msgstr "dump" + #~ msgid "%s unable to call handler for message (not enough memory)\n" #~ msgstr "" #~ "%s No ha sido posible llamar al manejador para el mensaje (no hay " @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-11 10:15+0100\n" -"PO-Revision-Date: 2005-11-11 17:02+0100\n" +"POT-Creation-Date: 2005-11-13 16:40+0100\n" +"PO-Revision-Date: 2005-11-13 16:41+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1402,7 +1402,7 @@ msgstr "inconnu" msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine local \"%s\"\n" -#: src/irc/irc-send.c:175 src/common/command.c:783 +#: src/irc/irc-send.c:175 src/common/command.c:787 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" @@ -1420,8 +1420,8 @@ msgstr "" #: src/irc/irc-send.c:472 src/irc/irc-send.c:484 src/irc/irc-send.c:502 #: src/irc/irc-send.c:1166 src/irc/irc-send.c:1264 src/irc/irc-send.c:1796 -#: src/common/command.c:1310 src/common/command.c:1749 -#: src/common/command.c:1885 +#: src/common/command.c:1353 src/common/command.c:1798 +#: src/common/command.c:1934 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramtres erron pour la commande \"%s\"\n" @@ -1760,11 +1760,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s tait %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactivit: " -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "day" msgstr "jour" @@ -2277,64 +2277,64 @@ msgstr "Jour chang: %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s le lag est lev, dconnexion du serveur...\n" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "bytes" msgstr "octets" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Kb" msgstr "Ko" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Mb" msgstr "Mo" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Gb" msgstr "Go" -#: src/gui/curses/gui-display.c:1921 +#: src/gui/curses/gui-display.c:1926 msgid "<servers>" msgstr "<serveurs>" -#: src/gui/curses/gui-display.c:1933 +#: src/gui/curses/gui-display.c:1938 msgid "(away)" msgstr "(absent)" -#: src/gui/curses/gui-display.c:2067 +#: src/gui/curses/gui-display.c:2072 msgid "[not connected] " msgstr "[non connect] " -#: src/gui/curses/gui-display.c:2077 +#: src/gui/curses/gui-display.c:2082 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2165 +#: src/gui/curses/gui-display.c:2170 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2181 +#: src/gui/curses/gui-display.c:2186 msgid "-MORE-" msgstr "-PLUS-" -#: src/gui/curses/gui-display.c:2359 +#: src/gui/curses/gui-display.c:2364 msgid " [A] Accept" msgstr " [A] Accepter" -#: src/gui/curses/gui-display.c:2360 src/gui/curses/gui-display.c:2364 +#: src/gui/curses/gui-display.c:2365 src/gui/curses/gui-display.c:2369 msgid " [C] Cancel" msgstr " [C] Annuler" -#: src/gui/curses/gui-display.c:2369 +#: src/gui/curses/gui-display.c:2374 msgid " [R] Remove" msgstr " [R] Retirer" -#: src/gui/curses/gui-display.c:2373 +#: src/gui/curses/gui-display.c:2378 msgid " [P] Purge old DCC" msgstr " [P] Purger anciens DCC" -#: src/gui/curses/gui-display.c:2374 +#: src/gui/curses/gui-display.c:2379 msgid " [Q] Close DCC view" msgstr " [Q] Fermer la vue DCC" @@ -2342,11 +2342,11 @@ msgstr " [Q] Fermer la vue DCC" msgid "server" msgstr "serveur" -#: src/gui/gui-common.c:509 +#: src/gui/gui-common.c:637 msgid "Not enough memory for new line\n" msgstr "Pas assez de mmoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:854 +#: src/gui/gui-common.c:982 msgid "Not enough memory for infobar message\n" msgstr "Pas assez de mmoire pour un message de la barre d'infos\n" @@ -2498,7 +2498,7 @@ msgstr "rafraichir l'cran" msgid "grab a key" msgstr "capturer une touche" -#: src/gui/gui-keyboard.c:428 src/common/command.c:1764 +#: src/gui/gui-keyboard.c:428 src/common/command.c:1813 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s impossible de crer la touche \"%s\"\n" @@ -2597,38 +2597,40 @@ msgid "print debug messages" msgstr "affiche des messages de debuggage" #: src/common/command.c:69 -msgid "dump" -msgstr "dump" +msgid "dump | windows" +msgstr "dump | windows" #: src/common/command.c:70 msgid "" "dump: save memory dump in WeeChat log file (same dump is written when " -"WeeChat crashes)" +"WeeChat crashes)\n" +"windows: display windows tree" msgstr "" "dump: affiche les variables mmoire WeeChat dans le fichier log (les mmes " -"messages sont affichs lorsque WeeChat plante)" +"messages sont affichs lorsque WeeChat plante)\n" +"windows: affiche l'arbre des fentres" -#: src/common/command.c:72 +#: src/common/command.c:73 msgid "display help about commands" msgstr "afficher l'aide sur les commandes" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "[command]" msgstr "[commande]" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "command: name of a WeeChat or IRC command" msgstr "commande: nom d'une commande WeeChat ou IRC" -#: src/common/command.c:75 +#: src/common/command.c:76 msgid "ignore IRC messages and/or hosts" msgstr "ignorer des messages IRC et/ou des masques" -#: src/common/command.c:76 +#: src/common/command.c:77 msgid "[mask [[type | command] [channel [server]]]]" msgstr "[masque [[type | commande] [canal [serveur]]]]" -#: src/common/command.c:77 +#: src/common/command.c:78 msgid "" " mask: nick or host mask to ignore\n" " type: type of message to ignore (action, ctcp, dcc, pv)\n" @@ -2648,15 +2650,15 @@ msgstr "" "Pour chaque paramtre, '*' signifie tou(te)s.\n" "Sans paramtre, la commande /ignore liste les ignore dfinis." -#: src/common/command.c:85 +#: src/common/command.c:86 msgid "bind/unbind keys" msgstr "associer/librer des touches" -#: src/common/command.c:86 +#: src/common/command.c:87 msgid "[key function/command] [unbind key] [functions] [reset -yes]" msgstr "[touche fonction/commande] [unbind touche] [functions] [reset -yes]" -#: src/common/command.c:87 +#: src/common/command.c:88 msgid "" "key: bind this key to an internal function or a command (beginning by \"/" "\")\n" @@ -2674,15 +2676,15 @@ msgstr "" "reset: restaur les touches aux valeurs par dfaut et supprime TOUTES les " "touches personnelles (utiliser avec prcaution !)" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "list/load/unload plugins" msgstr "liste/charge/dcharge des extensions" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "[load fichier] | [autoload] | [reload] | [unload]" -#: src/common/command.c:94 +#: src/common/command.c:95 msgid "" "filename: WeeChat plugin (file) to load\n" "\n" @@ -2692,11 +2694,11 @@ msgstr "" "\n" "Sans paramtre, la commande /plugin liste toutes les extensions charges." -#: src/common/command.c:97 +#: src/common/command.c:98 msgid "list, add or remove servers" msgstr "liste, ajoute ou retire des serveurs" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "" "[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname " @@ -2708,7 +2710,7 @@ msgstr "" "nom_utilisateur] [-realname nom_rel] [-command commande] [-autojoin canal[," "canal]] ] | [del nom_serveur]" -#: src/common/command.c:103 +#: src/common/command.c:104 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -2734,27 +2736,27 @@ msgstr "" "nom_utilisateur: nom d'utilisateur\n" "nom_rel: nom rel de l'utilisateur" -#: src/common/command.c:115 +#: src/common/command.c:116 msgid "save config to disk" msgstr "sauvegarder la configuration sur disque" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "[file]" msgstr "[fichier]" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "file: filename for writing config" msgstr "fichier: fichier pour sauvegarder la configuration" -#: src/common/command.c:118 +#: src/common/command.c:119 msgid "set config parameters" msgstr "modifier des paramtres de configuration" -#: src/common/command.c:119 +#: src/common/command.c:120 msgid "[option [ = value]]" msgstr "[option [ = valeur]]" -#: src/common/command.c:120 +#: src/common/command.c:121 msgid "" "option: name of an option (if name is full and no value is given, then help " "is displayed on option)\n" @@ -2764,27 +2766,27 @@ msgstr "" "donne, alors l'aide sur l'option est affiche)\n" "valeur: valeur pour l'option" -#: src/common/command.c:124 +#: src/common/command.c:125 msgid "remove an alias" msgstr "supprimer un alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name" msgstr "nom_alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias supprimer" -#: src/common/command.c:127 +#: src/common/command.c:128 msgid "unignore IRC messages and/or hosts" msgstr "supprimer le ignore des messages IRC et/ou des masques" -#: src/common/command.c:128 +#: src/common/command.c:129 msgid "[number | [mask [[type | command] [channel [server]]]]]" msgstr "[nombre | [masque [[type | commande] [canal [serveur]]]]]" -#: src/common/command.c:129 +#: src/common/command.c:130 msgid "" " number: # of ignore to unignore (number is displayed by list of ignore)\n" " mask: nick or host mask to unignore\n" @@ -2807,31 +2809,27 @@ msgstr "" "Pour chaque paramtre, '*' signifie tou(te)s.\n" "Sans paramtre, /ignore liste les ignore dfinis." -#: src/common/command.c:138 +#: src/common/command.c:139 msgid "show WeeChat uptime" msgstr "montrer l'uptime de WeeChat" -#: src/common/command.c:139 +#: src/common/command.c:140 msgid "-o" msgstr "-o" -#: src/common/command.c:140 +#: src/common/command.c:141 msgid "-o: send uptime on current channel as an IRC message" msgstr "-o: envoyer l'uptime sur le canal courant en tant que message IRC" -#: src/common/command.c:142 +#: src/common/command.c:143 msgid "manage windows" msgstr "gestion des fentres" -#: src/common/command.c:143 -msgid "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" -msgstr "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" - #: src/common/command.c:144 +msgid "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" +msgstr "[list | -1 | +1 | b# | splith [pct] | splitv [ptc] | [merge [all]]]" + +#: src/common/command.c:145 msgid "" "list: list opened windows (no parameter implies this list)\n" "-1: jump to previous window\n" @@ -2839,7 +2837,11 @@ msgid "" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" -"merge: merge window with another" +"merge: merge window with another (all = keep only one window)\n" +"\n" +"For splith and splitv, pct is a pourcentage which represents size of new " +"window, computed with current window as size reference. For example 25 means " +"create a new window with size = current_size / 4" msgstr "" "list: liste les fentres ouvertes (pas de paramtre affiche cette liste)\n" "-1: saute la fentre prcdente\n" @@ -2847,31 +2849,36 @@ msgstr "" "b#: saute la fentre affichant le tampon n#\n" "splith: clate la fentre en deux horizontalement\n" "splitv: clate la fentre en deux verticalement\n" -"merge: fusionne la fentre avec une autre" +"merge: fusionne la fentre avec une autre\n" +"\n" +"Pour splith et splitv, pct est un pourcentage qui reprsente la taille de la " +"nouvelle fentre, calcule par rapport la taille de la fentre courante. " +"Par exemple 25 signifie crer une fentre qui a pour taille: " +"taille_courante / 4" -#: src/common/command.c:293 +#: src/common/command.c:297 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s l'alias ou la commande \"%s\" existe dj !\n" -#: src/common/command.c:303 +#: src/common/command.c:307 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s l'alias ne peut pas lancer un autre alias !\n" -#: src/common/command.c:310 +#: src/common/command.c:314 #, c-format msgid "%s target command \"/%s\" does not exist!\n" msgstr "%s la commande cible \"/%s\" n'existe pas !\n" -#: src/common/command.c:548 +#: src/common/command.c:552 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nombre de paramtres incorrect pour la commande %s \"%s\" (attendu: %d " "paramtre%s)\n" -#: src/common/command.c:560 +#: src/common/command.c:564 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2880,19 +2887,19 @@ msgstr "" "%s nombre de paramtres incorrect pour la commande %s \"%s\" (attendu: entre " "%d et %d paramtre%s)\n" -#: src/common/command.c:582 src/common/command.c:651 +#: src/common/command.c:586 src/common/command.c:655 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s la commande \"%s\" a chou\n" -#: src/common/command.c:607 +#: src/common/command.c:611 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nombre de paramtres incorrect pour la commande IRC \"%s\" (attendu: %d " "paramtre%s)\n" -#: src/common/command.c:619 +#: src/common/command.c:623 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2901,260 +2908,260 @@ msgstr "" "%s nombre de paramtres incorrect pour la commande IRC \"%s\" (attendu: " "entre %d et %d paramtre%s)\n" -#: src/common/command.c:634 +#: src/common/command.c:638 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s la commande \"%s\" ncessite une connexion au serveur !\n" -#: src/common/command.c:694 +#: src/common/command.c:698 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n" -#: src/common/command.c:828 +#: src/common/command.c:832 msgid "This window is not a channel!\n" msgstr "Cette fentre n'est pas un canal !\n" -#: src/common/command.c:856 src/common/command.c:887 src/common/command.c:995 +#: src/common/command.c:860 src/common/command.c:891 src/common/command.c:999 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s paramtres manquants pour la commande \"%s\"\n" -#: src/common/command.c:863 +#: src/common/command.c:867 #, c-format msgid "%s alias can not start with \"/\"\n" msgstr "%s l'alias ne peut pas commencer par \"/\"\n" -#: src/common/command.c:872 +#: src/common/command.c:876 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" cr\n" -#: src/common/command.c:878 +#: src/common/command.c:882 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "Impossible de crer l'alias \"%s\" => \"%s\" (pas assez de mmoire)\n" -#: src/common/command.c:898 +#: src/common/command.c:902 msgid "List of aliases:\n" msgstr "Liste des alias:\n" -#: src/common/command.c:912 +#: src/common/command.c:916 msgid "No alias defined.\n" msgstr "Aucun alias dfini.\n" -#: src/common/command.c:929 +#: src/common/command.c:933 #, c-format msgid "%sServer: %s%s\n" msgstr "%sServeur: %s%s\n" -#: src/common/command.c:934 +#: src/common/command.c:938 #, c-format msgid "%sChannel: %s%s %s(server: %s%s%s)\n" msgstr "%sCanal: %s%s %s(serveur: %s%s%s)\n" -#: src/common/command.c:943 +#: src/common/command.c:947 #, c-format msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n" msgstr "%sPriv avec: %s%s %s(serveur: %s%s%s)\n" -#: src/common/command.c:952 +#: src/common/command.c:956 msgid "not connected\n" msgstr "non connect\n" -#: src/common/command.c:974 +#: src/common/command.c:978 msgid "Opened buffers:\n" msgstr "Tampons ouverts:\n" -#: src/common/command.c:1018 +#: src/common/command.c:1022 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s numro de buffer incorrect\n" -#: src/common/command.c:1034 +#: src/common/command.c:1038 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s impossible de fermer le tampon unique\n" -#: src/common/command.c:1044 +#: src/common/command.c:1048 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" "%s impossible de fermer le tampon du serveur tant que des canaux sont " "ouverts\n" -#: src/common/command.c:1093 +#: src/common/command.c:1097 msgid "Notify levels: " msgstr "Niveaux de notification: " -#: src/common/command.c:1122 src/common/command.c:1170 +#: src/common/command.c:1126 src/common/command.c:1174 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s niveau de notification incorrect (doit tre entre %d et %d)\n" -#: src/common/command.c:1131 +#: src/common/command.c:1135 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" "%s tampon incorrect pour la notification (doit tre un canal ou un priv)\n" -#: src/common/command.c:1140 +#: src/common/command.c:1144 #, c-format msgid "New notify level for %s%s%s: %s%d %s" msgstr "Nouveau niveau de notification pour %s%s%s: %s%d %s" -#: src/common/command.c:1150 +#: src/common/command.c:1154 msgid "(hotlist: never)\n" msgstr "(hotlist: jamais)\n" -#: src/common/command.c:1153 +#: src/common/command.c:1157 msgid "(hotlist: highlights)\n" msgstr "(hotlist: highlights)\n" -#: src/common/command.c:1156 +#: src/common/command.c:1160 msgid "(hotlist: highlights + messages)\n" msgstr "(hotlist: highlights + messages)\n" -#: src/common/command.c:1159 +#: src/common/command.c:1163 msgid "(hotlist: highlights + messages + join/part (all))\n" msgstr "(hotlist: highlights + messages + join/part (tous))\n" -#: src/common/command.c:1237 +#: src/common/command.c:1241 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramtre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:1267 +#: src/common/command.c:1271 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s dj connect au serveur \"%s\" !\n" -#: src/common/command.c:1275 +#: src/common/command.c:1279 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n" -#: src/common/command.c:1293 src/common/command.c:1368 +#: src/common/command.c:1297 src/common/command.c:1417 #, c-format msgid "%s server not found\n" msgstr "%s serveur non trouv\n" -#: src/common/command.c:1323 src/common/command.c:1878 -#: src/common/command.c:2786 src/common/command.c:2810 +#: src/common/command.c:1372 src/common/command.c:1927 +#: src/common/command.c:2850 src/common/command.c:2885 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1352 +#: src/common/command.c:1401 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connect au serveur \"%s\" !\n" -#: src/common/command.c:1360 +#: src/common/command.c:1409 msgid "Auto-reconnection is cancelled\n" msgstr "La reconnexion automatique est annule\n" -#: src/common/command.c:1391 src/common/weechat.c:365 +#: src/common/command.c:1440 src/common/weechat.c:365 #, c-format msgid "%s internal commands:\n" msgstr "Commandes internes %s :\n" -#: src/common/command.c:1401 src/common/weechat.c:385 +#: src/common/command.c:1450 src/common/weechat.c:385 #, c-format msgid "IRC commands:\n" msgstr "Commandes IRC :\n" -#: src/common/command.c:1415 +#: src/common/command.c:1464 msgid "Plugin commands:\n" msgstr "Commandes d'extension :\n" -#: src/common/command.c:1531 +#: src/common/command.c:1580 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n" -#: src/common/command.c:1550 +#: src/common/command.c:1599 #, c-format msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n" msgstr "%ssur %s%s%s/%s%s%s:%s ignore %s%s%s de %s%s\n" -#: src/common/command.c:1584 +#: src/common/command.c:1633 msgid "List of ignore:\n" msgstr "Liste des ignore:\n" -#: src/common/command.c:1601 +#: src/common/command.c:1650 msgid "No ignore defined.\n" msgstr "Aucun ignore dfini.\n" -#: src/common/command.c:1627 +#: src/common/command.c:1676 msgid "New ignore:" msgstr "Nouveau ignore:" -#: src/common/command.c:1647 +#: src/common/command.c:1696 #, c-format msgid "New key binding: %s" msgstr "Nouvelle touche: %s" -#: src/common/command.c:1681 +#: src/common/command.c:1730 msgid "Key bindings:\n" msgstr "Associations de touches:\n" -#: src/common/command.c:1695 +#: src/common/command.c:1744 #, c-format msgid "Key \"%s\" unbinded\n" msgstr "Touche \"%s\" supprime\n" -#: src/common/command.c:1701 +#: src/common/command.c:1750 #, c-format msgid "%s unable to unbind key \"%s\"\n" msgstr "%s impossible de supprimer la touche \"%s\"\n" -#: src/common/command.c:1709 src/common/weechat.c:416 +#: src/common/command.c:1758 src/common/weechat.c:416 #, c-format msgid "Internal key functions:\n" msgstr "Fonctions internes pour les touches:\n" -#: src/common/command.c:1729 +#: src/common/command.c:1778 msgid "Default key bindings restored\n" msgstr "Touches par dfaut restaures\n" -#: src/common/command.c:1735 +#: src/common/command.c:1784 #, c-format msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" "%s le paramtre \"-yes\" est requis pour la rinitialisation des touches " "(raison de scurit)\n" -#: src/common/command.c:1791 +#: src/common/command.c:1840 msgid "Plugins loaded:\n" msgstr "Extensions charges :\n" -#: src/common/command.c:1807 +#: src/common/command.c:1856 msgid " message handlers:\n" msgstr " fonctions de message :\n" -#: src/common/command.c:1816 +#: src/common/command.c:1865 #, c-format msgid " IRC(%s)\n" msgstr " IRC(%s)\n" -#: src/common/command.c:1823 +#: src/common/command.c:1872 msgid " (no message handler)\n" msgstr " (aucunne fonction de message)\n" -#: src/common/command.c:1828 +#: src/common/command.c:1877 msgid " command handlers:\n" msgstr " commandes :\n" -#: src/common/command.c:1849 +#: src/common/command.c:1898 msgid " (no command handler)\n" msgstr " (aucune commande)\n" -#: src/common/command.c:1855 +#: src/common/command.c:1904 msgid " (no plugin)\n" msgstr " (aucune extension)\n" -#: src/common/command.c:1891 +#: src/common/command.c:1940 msgid "" "Command \"plugin\" is not available, WeeChat was built without plugins " "support.\n" @@ -3162,31 +3169,31 @@ msgstr "" "La commande \"plugin\" n'est pas disponible, WeeChat a t compil sans le " "support des extensions.\n" -#: src/common/command.c:1938 +#: src/common/command.c:1988 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1949 +#: src/common/command.c:1999 #, c-format msgid "Server '%s' not found.\n" msgstr "Serveur '%s' non trouv.\n" -#: src/common/command.c:1961 +#: src/common/command.c:2011 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n" -#: src/common/command.c:1969 +#: src/common/command.c:2019 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "%s trop de paramtres pour la commande \"%s\", paramtres ignors\n" -#: src/common/command.c:1988 +#: src/common/command.c:2038 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n" -#: src/common/command.c:1996 +#: src/common/command.c:2046 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -3195,185 +3202,194 @@ msgstr "" "%s vous ne pouvez pas supprimer le server \"%s\" car vous tes connect " "dessus. Essayez /disconnect %s avant.\n" -#: src/common/command.c:2014 +#: src/common/command.c:2066 #, c-format msgid "Server %s%s%s has been deleted\n" msgstr "Le serveur %s%s%s a t supprim\n" -#: src/common/command.c:2031 +#: src/common/command.c:2085 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramtres manquants pour la commande \"%s\"\n" -#: src/common/command.c:2041 +#: src/common/command.c:2095 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s le serveur \"%s\" existe dj, impossible de le crer !\n" -#: src/common/command.c:2070 src/common/command.c:2098 -#: src/common/command.c:2111 src/common/command.c:2137 +#: src/common/command.c:2124 src/common/command.c:2152 +#: src/common/command.c:2165 src/common/command.c:2191 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s mot de passe manquant pour le paramtre \"%s\"\n" -#: src/common/command.c:2083 +#: src/common/command.c:2137 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s pseudo(s) manquant(s) pour le paramtre \"%s\"\n" -#: src/common/command.c:2124 +#: src/common/command.c:2178 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramtre \"%s\"\n" -#: src/common/command.c:2159 +#: src/common/command.c:2213 #, c-format msgid "Server %s%s%s created\n" msgstr "Serveur %s%s%s cr\n" -#: src/common/command.c:2168 +#: src/common/command.c:2222 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de crer le serveur\n" -#: src/common/command.c:2227 +#: src/common/command.c:2281 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:2250 +#: src/common/command.c:2304 #, c-format msgid "%s(password hidden) " msgstr "%s(mot de passe cach) " -#: src/common/command.c:2317 +#: src/common/command.c:2371 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouv\n" -#: src/common/command.c:2350 src/common/command.c:2398 +#: src/common/command.c:2404 src/common/command.c:2452 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouve\n" -#: src/common/command.c:2355 src/common/command.c:2390 +#: src/common/command.c:2409 src/common/command.c:2444 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:2371 +#: src/common/command.c:2425 #, 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:2481 +#: src/common/command.c:2535 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouve avec \"%s\"\n" -#: src/common/command.c:2484 +#: src/common/command.c:2538 msgid "No config option found\n" msgstr "Aucune option de configuration trouve\n" -#: src/common/command.c:2491 +#: src/common/command.c:2545 #, c-format msgid "%sDetail:\n" msgstr "%sDtail :\n" -#: src/common/command.c:2496 src/common/weechat.c:302 +#: src/common/command.c:2550 src/common/weechat.c:302 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . type boolen (valeurs: 'on' ou 'off')\n" -#: src/common/command.c:2497 src/common/command.c:2520 -#: src/common/command.c:2526 src/common/command.c:2532 +#: src/common/command.c:2551 src/common/command.c:2574 +#: src/common/command.c:2580 src/common/command.c:2586 #: src/common/weechat.c:303 src/common/weechat.c:326 src/common/weechat.c:332 #: src/common/weechat.c:338 #, c-format msgid " . default value: '%s'\n" msgstr " . valeur par dfaut: '%s'\n" -#: src/common/command.c:2502 src/common/weechat.c:308 +#: src/common/command.c:2556 src/common/weechat.c:308 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . type entier (valeurs: entre %d et %d)\n" -#: src/common/command.c:2505 src/common/weechat.c:311 +#: src/common/command.c:2559 src/common/weechat.c:311 #, c-format msgid " . default value: %d\n" msgstr " . valeur par dfaut: %d\n" -#: src/common/command.c:2509 src/common/weechat.c:315 +#: src/common/command.c:2563 src/common/weechat.c:315 #, c-format msgid " . type string (values: " msgstr " . type chane (valeurs: " -#: src/common/command.c:2522 src/common/command.c:2528 -#: src/common/command.c:2534 src/common/weechat.c:328 src/common/weechat.c:334 +#: src/common/command.c:2576 src/common/command.c:2582 +#: src/common/command.c:2588 src/common/weechat.c:328 src/common/weechat.c:334 #: src/common/weechat.c:340 msgid "empty" msgstr "vide" -#: src/common/command.c:2525 src/common/weechat.c:331 +#: src/common/command.c:2579 src/common/weechat.c:331 #, c-format 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:2531 src/common/weechat.c:337 +#: src/common/command.c:2585 src/common/weechat.c:337 #, c-format msgid " . type string (any string)\n" msgstr " . type chane (toute chane)\n" -#: src/common/command.c:2537 src/common/weechat.c:343 +#: src/common/command.c:2591 src/common/weechat.c:343 #, c-format msgid " . description: %s\n" msgstr " . description: %s\n" -#: src/common/command.c:2548 +#: src/common/command.c:2602 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "option(s) de configuration trouve(s) avec \"%s\"\n" -#: src/common/command.c:2551 +#: src/common/command.c:2605 msgid "config option(s) found\n" msgstr "option(s) de configuration trouve(s)\n" -#: src/common/command.c:2572 +#: src/common/command.c:2626 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouv\n" -#: src/common/command.c:2582 +#: src/common/command.c:2636 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprim\n" -#: src/common/command.c:2638 +#: src/common/command.c:2692 msgid "ignore were removed.\n" msgstr "ignore ont t supprims.\n" -#: src/common/command.c:2640 +#: src/common/command.c:2694 msgid "ignore was removed.\n" msgstr "ignore a t supprim.\n" -#: src/common/command.c:2645 +#: src/common/command.c:2699 #, c-format msgid "%s no ignore found\n" msgstr "%s aucun ignore trouv\n" -#: src/common/command.c:2675 +#: src/common/command.c:2729 #, 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:2692 +#: src/common/command.c:2746 #, 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:2732 +#: src/common/command.c:2786 msgid "Opened windows:\n" msgstr "Fentres ouvertes:\n" +#: src/common/command.c:2861 +#, c-format +msgid "" +"%s can not merge windows, there's no other window with same size near " +"current one.\n" +msgstr "" +"%s impossible de fusionner les fentres, aucun autre fentre avec la mme " +"taille cot de la fentre actuelle.\n" + #: src/common/fifo.c:71 src/common/fifo.c:73 #, c-format msgid "%s unable to create FIFO pipe for remote control (%s)\n" @@ -4691,6 +4707,9 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Sauvegarde de la configuration sur disque\n" +#~ msgid "dump" +#~ msgstr "dump" + #~ msgid "%s unable to call handler for message (not enough memory)\n" #~ msgstr "" #~ "%s impossible d'appeler la fonction pour le message (mmoire " diff --git a/po/weechat.pot b/po/weechat.pot index dc3b8271c..4a343588f 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: 2005-11-11 10:15+0100\n" +"POT-Creation-Date: 2005-11-13 16:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1289,7 +1289,7 @@ msgstr "" msgid "%s: using local hostname \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:175 src/common/command.c:783 +#: src/irc/irc-send.c:175 src/common/command.c:787 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" @@ -1305,8 +1305,8 @@ msgstr "" #: src/irc/irc-send.c:472 src/irc/irc-send.c:484 src/irc/irc-send.c:502 #: src/irc/irc-send.c:1166 src/irc/irc-send.c:1264 src/irc/irc-send.c:1796 -#: src/common/command.c:1310 src/common/command.c:1749 -#: src/common/command.c:1885 +#: src/common/command.c:1353 src/common/command.c:1798 +#: src/common/command.c:1934 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1644,11 +1644,11 @@ msgstr "" msgid "%s[%s%s%s]%s idle: " msgstr "" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "days" msgstr "" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "day" msgstr "" @@ -2117,64 +2117,64 @@ msgstr "" msgid "%s lag is high, disconnecting from server...\n" msgstr "" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "bytes" msgstr "" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Kb" msgstr "" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Mb" msgstr "" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Gb" msgstr "" -#: src/gui/curses/gui-display.c:1921 +#: src/gui/curses/gui-display.c:1926 msgid "<servers>" msgstr "" -#: src/gui/curses/gui-display.c:1933 +#: src/gui/curses/gui-display.c:1938 msgid "(away)" msgstr "" -#: src/gui/curses/gui-display.c:2067 +#: src/gui/curses/gui-display.c:2072 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:2077 +#: src/gui/curses/gui-display.c:2082 msgid "Act: " msgstr "" -#: src/gui/curses/gui-display.c:2165 +#: src/gui/curses/gui-display.c:2170 #, c-format msgid "Lag: %.1f" msgstr "" -#: src/gui/curses/gui-display.c:2181 +#: src/gui/curses/gui-display.c:2186 msgid "-MORE-" msgstr "" -#: src/gui/curses/gui-display.c:2359 +#: src/gui/curses/gui-display.c:2364 msgid " [A] Accept" msgstr "" -#: src/gui/curses/gui-display.c:2360 src/gui/curses/gui-display.c:2364 +#: src/gui/curses/gui-display.c:2365 src/gui/curses/gui-display.c:2369 msgid " [C] Cancel" msgstr "" -#: src/gui/curses/gui-display.c:2369 +#: src/gui/curses/gui-display.c:2374 msgid " [R] Remove" msgstr "" -#: src/gui/curses/gui-display.c:2373 +#: src/gui/curses/gui-display.c:2378 msgid " [P] Purge old DCC" msgstr "" -#: src/gui/curses/gui-display.c:2374 +#: src/gui/curses/gui-display.c:2379 msgid " [Q] Close DCC view" msgstr "" @@ -2182,11 +2182,11 @@ msgstr "" msgid "server" msgstr "" -#: src/gui/gui-common.c:509 +#: src/gui/gui-common.c:637 msgid "Not enough memory for new line\n" msgstr "" -#: src/gui/gui-common.c:854 +#: src/gui/gui-common.c:982 msgid "Not enough memory for infobar message\n" msgstr "" @@ -2338,7 +2338,7 @@ msgstr "" msgid "grab a key" msgstr "" -#: src/gui/gui-keyboard.c:428 src/common/command.c:1764 +#: src/gui/gui-keyboard.c:428 src/common/command.c:1813 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "" @@ -2424,36 +2424,37 @@ msgid "print debug messages" msgstr "" #: src/common/command.c:69 -msgid "dump" +msgid "dump | windows" msgstr "" #: src/common/command.c:70 msgid "" "dump: save memory dump in WeeChat log file (same dump is written when " -"WeeChat crashes)" +"WeeChat crashes)\n" +"windows: display windows tree" msgstr "" -#: src/common/command.c:72 +#: src/common/command.c:73 msgid "display help about commands" msgstr "" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "[command]" msgstr "" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "command: name of a WeeChat or IRC command" msgstr "" -#: src/common/command.c:75 +#: src/common/command.c:76 msgid "ignore IRC messages and/or hosts" msgstr "" -#: src/common/command.c:76 +#: src/common/command.c:77 msgid "[mask [[type | command] [channel [server]]]]" msgstr "" -#: src/common/command.c:77 +#: src/common/command.c:78 msgid "" " mask: nick or host mask to ignore\n" " type: type of message to ignore (action, ctcp, dcc, pv)\n" @@ -2465,15 +2466,15 @@ msgid "" "Without argument, /ignore command lists all defined ignore." msgstr "" -#: src/common/command.c:85 +#: src/common/command.c:86 msgid "bind/unbind keys" msgstr "" -#: src/common/command.c:86 +#: src/common/command.c:87 msgid "[key function/command] [unbind key] [functions] [reset -yes]" msgstr "" -#: src/common/command.c:87 +#: src/common/command.c:88 msgid "" "key: bind this key to an internal function or a command (beginning by \"/" "\")\n" @@ -2483,26 +2484,26 @@ msgid "" "binding (use carefully!)" msgstr "" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "list/load/unload plugins" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "" -#: src/common/command.c:94 +#: src/common/command.c:95 msgid "" "filename: WeeChat plugin (file) to load\n" "\n" "Without argument, /plugin command lists all loaded plugins." msgstr "" -#: src/common/command.c:97 +#: src/common/command.c:98 msgid "list, add or remove servers" msgstr "" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "" "[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname " @@ -2510,7 +2511,7 @@ msgid "" "servername]" msgstr "" -#: src/common/command.c:103 +#: src/common/command.c:104 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -2525,54 +2526,54 @@ msgid "" "realname: real name of user" msgstr "" -#: src/common/command.c:115 +#: src/common/command.c:116 msgid "save config to disk" msgstr "" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "[file]" msgstr "" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "file: filename for writing config" msgstr "" -#: src/common/command.c:118 +#: src/common/command.c:119 msgid "set config parameters" msgstr "" -#: src/common/command.c:119 +#: src/common/command.c:120 msgid "[option [ = value]]" msgstr "" -#: src/common/command.c:120 +#: src/common/command.c:121 msgid "" "option: name of an option (if name is full and no value is given, then help " "is displayed on option)\n" "value: value for option" msgstr "" -#: src/common/command.c:124 +#: src/common/command.c:125 msgid "remove an alias" msgstr "" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name" msgstr "" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name: name of alias to remove" msgstr "" -#: src/common/command.c:127 +#: src/common/command.c:128 msgid "unignore IRC messages and/or hosts" msgstr "" -#: src/common/command.c:128 +#: src/common/command.c:129 msgid "[number | [mask [[type | command] [channel [server]]]]]" msgstr "" -#: src/common/command.c:129 +#: src/common/command.c:130 msgid "" " number: # of ignore to unignore (number is displayed by list of ignore)\n" " mask: nick or host mask to unignore\n" @@ -2585,29 +2586,27 @@ msgid "" "Without argument, /unignore command lists all defined ignore." msgstr "" -#: src/common/command.c:138 +#: src/common/command.c:139 msgid "show WeeChat uptime" msgstr "" -#: src/common/command.c:139 +#: src/common/command.c:140 msgid "-o" msgstr "" -#: src/common/command.c:140 +#: src/common/command.c:141 msgid "-o: send uptime on current channel as an IRC message" msgstr "" -#: src/common/command.c:142 +#: src/common/command.c:143 msgid "manage windows" msgstr "" -#: src/common/command.c:143 -msgid "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" +#: src/common/command.c:144 +msgid "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" msgstr "" -#: src/common/command.c:144 +#: src/common/command.c:145 msgid "" "list: list opened windows (no parameter implies this list)\n" "-1: jump to previous window\n" @@ -2615,517 +2614,528 @@ msgid "" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" -"merge: merge window with another" +"merge: merge window with another (all = keep only one window)\n" +"\n" +"For splith and splitv, pct is a pourcentage which represents size of new " +"window, computed with current window as size reference. For example 25 means " +"create a new window with size = current_size / 4" msgstr "" -#: src/common/command.c:293 +#: src/common/command.c:297 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "" -#: src/common/command.c:303 +#: src/common/command.c:307 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "" -#: src/common/command.c:310 +#: src/common/command.c:314 #, c-format msgid "%s target command \"/%s\" does not exist!\n" msgstr "" -#: src/common/command.c:548 +#: src/common/command.c:552 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:560 +#: src/common/command.c:564 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:582 src/common/command.c:651 +#: src/common/command.c:586 src/common/command.c:655 #, c-format msgid "%s command \"%s\" failed\n" msgstr "" -#: src/common/command.c:607 +#: src/common/command.c:611 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:619 +#: src/common/command.c:623 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:634 +#: src/common/command.c:638 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/common/command.c:694 +#: src/common/command.c:698 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "" -#: src/common/command.c:828 +#: src/common/command.c:832 msgid "This window is not a channel!\n" msgstr "" -#: src/common/command.c:856 src/common/command.c:887 src/common/command.c:995 +#: src/common/command.c:860 src/common/command.c:891 src/common/command.c:999 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "" -#: src/common/command.c:863 +#: src/common/command.c:867 #, c-format msgid "%s alias can not start with \"/\"\n" msgstr "" -#: src/common/command.c:872 +#: src/common/command.c:876 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "" -#: src/common/command.c:878 +#: src/common/command.c:882 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "" -#: src/common/command.c:898 +#: src/common/command.c:902 msgid "List of aliases:\n" msgstr "" -#: src/common/command.c:912 +#: src/common/command.c:916 msgid "No alias defined.\n" msgstr "" -#: src/common/command.c:929 +#: src/common/command.c:933 #, c-format msgid "%sServer: %s%s\n" msgstr "" -#: src/common/command.c:934 +#: src/common/command.c:938 #, c-format msgid "%sChannel: %s%s %s(server: %s%s%s)\n" msgstr "" -#: src/common/command.c:943 +#: src/common/command.c:947 #, c-format msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n" msgstr "" -#: src/common/command.c:952 +#: src/common/command.c:956 msgid "not connected\n" msgstr "" -#: src/common/command.c:974 +#: src/common/command.c:978 msgid "Opened buffers:\n" msgstr "" -#: src/common/command.c:1018 +#: src/common/command.c:1022 #, c-format msgid "%s incorrect buffer number\n" msgstr "" -#: src/common/command.c:1034 +#: src/common/command.c:1038 #, c-format msgid "%s can not close the single buffer\n" msgstr "" -#: src/common/command.c:1044 +#: src/common/command.c:1048 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" -#: src/common/command.c:1093 +#: src/common/command.c:1097 msgid "Notify levels: " msgstr "" -#: src/common/command.c:1122 src/common/command.c:1170 +#: src/common/command.c:1126 src/common/command.c:1174 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "" -#: src/common/command.c:1131 +#: src/common/command.c:1135 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" -#: src/common/command.c:1140 +#: src/common/command.c:1144 #, c-format msgid "New notify level for %s%s%s: %s%d %s" msgstr "" -#: src/common/command.c:1150 +#: src/common/command.c:1154 msgid "(hotlist: never)\n" msgstr "" -#: src/common/command.c:1153 +#: src/common/command.c:1157 msgid "(hotlist: highlights)\n" msgstr "" -#: src/common/command.c:1156 +#: src/common/command.c:1160 msgid "(hotlist: highlights + messages)\n" msgstr "" -#: src/common/command.c:1159 +#: src/common/command.c:1163 msgid "(hotlist: highlights + messages + join/part (all))\n" msgstr "" -#: src/common/command.c:1237 +#: src/common/command.c:1241 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:1267 +#: src/common/command.c:1271 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1275 +#: src/common/command.c:1279 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1293 src/common/command.c:1368 +#: src/common/command.c:1297 src/common/command.c:1417 #, c-format msgid "%s server not found\n" msgstr "" -#: src/common/command.c:1323 src/common/command.c:1878 -#: src/common/command.c:2786 src/common/command.c:2810 +#: src/common/command.c:1372 src/common/command.c:1927 +#: src/common/command.c:2850 src/common/command.c:2885 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1352 +#: src/common/command.c:1401 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1360 +#: src/common/command.c:1409 msgid "Auto-reconnection is cancelled\n" msgstr "" -#: src/common/command.c:1391 src/common/weechat.c:365 +#: src/common/command.c:1440 src/common/weechat.c:365 #, c-format msgid "%s internal commands:\n" msgstr "" -#: src/common/command.c:1401 src/common/weechat.c:385 +#: src/common/command.c:1450 src/common/weechat.c:385 #, c-format msgid "IRC commands:\n" msgstr "" -#: src/common/command.c:1415 +#: src/common/command.c:1464 msgid "Plugin commands:\n" msgstr "" -#: src/common/command.c:1531 +#: src/common/command.c:1580 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1550 +#: src/common/command.c:1599 #, c-format msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n" msgstr "" -#: src/common/command.c:1584 +#: src/common/command.c:1633 msgid "List of ignore:\n" msgstr "" -#: src/common/command.c:1601 +#: src/common/command.c:1650 msgid "No ignore defined.\n" msgstr "" -#: src/common/command.c:1627 +#: src/common/command.c:1676 msgid "New ignore:" msgstr "" -#: src/common/command.c:1647 +#: src/common/command.c:1696 #, c-format msgid "New key binding: %s" msgstr "" -#: src/common/command.c:1681 +#: src/common/command.c:1730 msgid "Key bindings:\n" msgstr "" -#: src/common/command.c:1695 +#: src/common/command.c:1744 #, c-format msgid "Key \"%s\" unbinded\n" msgstr "" -#: src/common/command.c:1701 +#: src/common/command.c:1750 #, c-format msgid "%s unable to unbind key \"%s\"\n" msgstr "" -#: src/common/command.c:1709 src/common/weechat.c:416 +#: src/common/command.c:1758 src/common/weechat.c:416 #, c-format msgid "Internal key functions:\n" msgstr "" -#: src/common/command.c:1729 +#: src/common/command.c:1778 msgid "Default key bindings restored\n" msgstr "" -#: src/common/command.c:1735 +#: src/common/command.c:1784 #, c-format msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" -#: src/common/command.c:1791 +#: src/common/command.c:1840 msgid "Plugins loaded:\n" msgstr "" -#: src/common/command.c:1807 +#: src/common/command.c:1856 msgid " message handlers:\n" msgstr "" -#: src/common/command.c:1816 +#: src/common/command.c:1865 #, c-format msgid " IRC(%s)\n" msgstr "" -#: src/common/command.c:1823 +#: src/common/command.c:1872 msgid " (no message handler)\n" msgstr "" -#: src/common/command.c:1828 +#: src/common/command.c:1877 msgid " command handlers:\n" msgstr "" -#: src/common/command.c:1849 +#: src/common/command.c:1898 msgid " (no command handler)\n" msgstr "" -#: src/common/command.c:1855 +#: src/common/command.c:1904 msgid " (no plugin)\n" msgstr "" -#: src/common/command.c:1891 +#: src/common/command.c:1940 msgid "" "Command \"plugin\" is not available, WeeChat was built without plugins " "support.\n" msgstr "" -#: src/common/command.c:1938 +#: src/common/command.c:1988 msgid "No server.\n" msgstr "" -#: src/common/command.c:1949 +#: src/common/command.c:1999 #, c-format msgid "Server '%s' not found.\n" msgstr "" -#: src/common/command.c:1961 +#: src/common/command.c:2011 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1969 +#: src/common/command.c:2019 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1988 +#: src/common/command.c:2038 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1996 +#: src/common/command.c:2046 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" "disconnect %s before.\n" msgstr "" -#: src/common/command.c:2014 +#: src/common/command.c:2066 #, c-format msgid "Server %s%s%s has been deleted\n" msgstr "" -#: src/common/command.c:2031 +#: src/common/command.c:2085 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:2041 +#: src/common/command.c:2095 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:2070 src/common/command.c:2098 -#: src/common/command.c:2111 src/common/command.c:2137 +#: src/common/command.c:2124 src/common/command.c:2152 +#: src/common/command.c:2165 src/common/command.c:2191 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:2083 +#: src/common/command.c:2137 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:2124 +#: src/common/command.c:2178 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:2159 +#: src/common/command.c:2213 #, c-format msgid "Server %s%s%s created\n" msgstr "" -#: src/common/command.c:2168 +#: src/common/command.c:2222 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:2227 +#: src/common/command.c:2281 msgid "(unknown)" msgstr "" -#: src/common/command.c:2250 +#: src/common/command.c:2304 #, c-format msgid "%s(password hidden) " msgstr "" -#: src/common/command.c:2317 +#: src/common/command.c:2371 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:2350 src/common/command.c:2398 +#: src/common/command.c:2404 src/common/command.c:2452 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:2355 src/common/command.c:2390 +#: src/common/command.c:2409 src/common/command.c:2444 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:2371 +#: src/common/command.c:2425 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:2481 +#: src/common/command.c:2535 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:2484 +#: src/common/command.c:2538 msgid "No config option found\n" msgstr "" -#: src/common/command.c:2491 +#: src/common/command.c:2545 #, c-format msgid "%sDetail:\n" msgstr "" -#: src/common/command.c:2496 src/common/weechat.c:302 +#: src/common/command.c:2550 src/common/weechat.c:302 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr "" -#: src/common/command.c:2497 src/common/command.c:2520 -#: src/common/command.c:2526 src/common/command.c:2532 +#: src/common/command.c:2551 src/common/command.c:2574 +#: src/common/command.c:2580 src/common/command.c:2586 #: src/common/weechat.c:303 src/common/weechat.c:326 src/common/weechat.c:332 #: src/common/weechat.c:338 #, c-format msgid " . default value: '%s'\n" msgstr "" -#: src/common/command.c:2502 src/common/weechat.c:308 +#: src/common/command.c:2556 src/common/weechat.c:308 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr "" -#: src/common/command.c:2505 src/common/weechat.c:311 +#: src/common/command.c:2559 src/common/weechat.c:311 #, c-format msgid " . default value: %d\n" msgstr "" -#: src/common/command.c:2509 src/common/weechat.c:315 +#: src/common/command.c:2563 src/common/weechat.c:315 #, c-format msgid " . type string (values: " msgstr "" -#: src/common/command.c:2522 src/common/command.c:2528 -#: src/common/command.c:2534 src/common/weechat.c:328 src/common/weechat.c:334 +#: src/common/command.c:2576 src/common/command.c:2582 +#: src/common/command.c:2588 src/common/weechat.c:328 src/common/weechat.c:334 #: src/common/weechat.c:340 msgid "empty" msgstr "" -#: src/common/command.c:2525 src/common/weechat.c:331 +#: src/common/command.c:2579 src/common/weechat.c:331 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr "" -#: src/common/command.c:2531 src/common/weechat.c:337 +#: src/common/command.c:2585 src/common/weechat.c:337 #, c-format msgid " . type string (any string)\n" msgstr "" -#: src/common/command.c:2537 src/common/weechat.c:343 +#: src/common/command.c:2591 src/common/weechat.c:343 #, c-format msgid " . description: %s\n" msgstr "" -#: src/common/command.c:2548 +#: src/common/command.c:2602 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:2551 +#: src/common/command.c:2605 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:2572 +#: src/common/command.c:2626 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:2582 +#: src/common/command.c:2636 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:2638 +#: src/common/command.c:2692 msgid "ignore were removed.\n" msgstr "" -#: src/common/command.c:2640 +#: src/common/command.c:2694 msgid "ignore was removed.\n" msgstr "" -#: src/common/command.c:2645 +#: src/common/command.c:2699 #, c-format msgid "%s no ignore found\n" msgstr "" -#: src/common/command.c:2675 +#: src/common/command.c:2729 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "" -#: src/common/command.c:2692 +#: src/common/command.c:2746 #, 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:2732 +#: src/common/command.c:2786 msgid "Opened windows:\n" msgstr "" +#: src/common/command.c:2861 +#, c-format +msgid "" +"%s can not merge windows, there's no other window with same size near " +"current one.\n" +msgstr "" + #: src/common/fifo.c:71 src/common/fifo.c:73 #, c-format msgid "%s unable to create FIFO pipe for remote control (%s)\n" diff --git a/src/common/command.c b/src/common/command.c index 93319291d..57b8f47a9 100644 --- a/src/common/command.c +++ b/src/common/command.c @@ -66,8 +66,9 @@ t_weechat_command weechat_commands[] = N_("servername: server name to disconnect"), 0, 1, weechat_cmd_disconnect, NULL }, { "debug", N_("print debug messages"), - N_("dump"), - N_("dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)"), + N_("dump | windows"), + N_("dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)\n" + "windows: display windows tree"), 1, 1, weechat_cmd_debug, NULL }, { "help", N_("display help about commands"), N_("[command]"), N_("command: name of a WeeChat or IRC command"), @@ -140,14 +141,17 @@ t_weechat_command weechat_commands[] = N_("-o: send uptime on current channel as an IRC message"), 0, 1, weechat_cmd_uptime, NULL }, { "window", N_("manage windows"), - N_("[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | all]]]"), + N_("[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]"), N_("list: list opened windows (no parameter implies this list)\n" "-1: jump to previous window\n" "+1: jump to next window\n" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" - "merge: merge window with another"), + "merge: merge window with another (all = keep only one window)\n\n" + "For splith and splitv, pct is a pourcentage which represents " + "size of new window, computed with current window as size reference. " + "For example 25 means create a new window with size = current_size / 4"), 0, 2, weechat_cmd_window, NULL }, { NULL, NULL, NULL, NULL, 0, 0, NULL, NULL } }; @@ -1297,6 +1301,45 @@ weechat_cmd_connect (int argc, char **argv) } /* + * weechat_cmd_debug_display_windows: display tree of windows + */ + +void +weechat_cmd_debug_display_windows (t_gui_window_tree *tree, int indent) +{ + int i; + + if (tree) + { + for (i = 0; i < indent; i++) + gui_printf_nolog (NULL, " "); + + if (tree->window) + { + /* leaf */ + gui_printf_nolog (NULL, "leaf: %X (parent:%X), win=%X, child1=%X, child2=%X, %d,%d %dx%d, %d%%x%d%%\n", + tree, tree->parent_node, tree->window, + tree->child1, tree->child2, + tree->window->win_x, tree->window->win_y, + tree->window->win_width, tree->window->win_height, + tree->window->win_width_pct, tree->window->win_height_pct); + } + else + { + /* node */ + gui_printf_nolog (NULL, "node: %X (parent:%X), win=%X, child1=%X, child2=%X)\n", + tree, tree->parent_node, tree->window, + tree->child1, tree->child2); + } + + if (tree->child1) + weechat_cmd_debug_display_windows (tree->child1, indent + 1); + if (tree->child2) + weechat_cmd_debug_display_windows (tree->child2, indent + 1); + } +} + +/* * weechat_cmd_debug: print debug messages */ @@ -1316,6 +1359,12 @@ weechat_cmd_debug (int argc, char **argv) { wee_dump (0); } + else if (ascii_strcasecmp (argv[0], "windows") == 0) + { + gui_printf_nolog (NULL, "\n"); + gui_printf_nolog (NULL, "DEBUG: windows tree:\n"); + weechat_cmd_debug_display_windows (gui_windows_tree, 1); + } else { irc_display_prefix (NULL, NULL, PREFIX_ERROR); @@ -1918,6 +1967,7 @@ weechat_cmd_server (int argc, char **argv) int i; t_irc_server server, *ptr_server, *server_found, *new_server; t_gui_buffer *ptr_buffer; + char *server_name; if ((argc == 0) || (argc == 1)) { @@ -2008,13 +2058,17 @@ weechat_cmd_server (int argc, char **argv) } } + server_name = strdup (server_found->name); + server_free (server_found); irc_display_prefix (NULL, NULL, PREFIX_INFO); gui_printf (NULL, _("Server %s%s%s has been deleted\n"), GUI_COLOR(COLOR_WIN_CHAT_SERVER), - server_found->name, + server_name, GUI_COLOR(COLOR_WIN_CHAT)); + if (server_name) + free (server_name); gui_redraw_buffer (gui_current_window->buffer); @@ -2758,26 +2812,36 @@ weechat_cmd_window (int argc, char **argv) if (ascii_strcasecmp (argv[0], "splith") == 0) { /* split window horizontally */ - gui_window_split_horiz (gui_current_window); + if (argc > 1) + { + error = NULL; + number = strtol (argv[1], &error, 10); + if ((error) && (error[0] == '\0') + && (number > 0) && (number < 100)) + gui_window_split_horiz (gui_current_window, number); + } + else + gui_window_split_horiz (gui_current_window, 50); } else if (ascii_strcasecmp (argv[0], "splitv") == 0) { /* split window vertically */ - gui_window_split_vertic (gui_current_window); + if (argc > 1) + { + error = NULL; + number = strtol (argv[1], &error, 10); + if ((error) && (error[0] == '\0') + && (number > 0) && (number < 100)) + gui_window_split_vertic (gui_current_window, number); + } + else + gui_window_split_vertic (gui_current_window, 50); } else if (ascii_strcasecmp (argv[0], "merge") == 0) { if (argc >= 2) { - if (ascii_strcasecmp (argv[1], "down") == 0) - gui_window_merge_down (gui_current_window); - else if (ascii_strcasecmp (argv[1], "up") == 0) - gui_window_merge_up (gui_current_window); - else if (ascii_strcasecmp (argv[1], "left") == 0) - gui_window_merge_left (gui_current_window); - else if (ascii_strcasecmp (argv[1], "right") == 0) - gui_window_merge_right (gui_current_window); - else if (ascii_strcasecmp (argv[1], "all") == 0) + if (ascii_strcasecmp (argv[1], "all") == 0) gui_window_merge_all (gui_current_window); else { @@ -2789,7 +2853,18 @@ weechat_cmd_window (int argc, char **argv) } } else - gui_window_merge_auto (gui_current_window); + { + if (!gui_window_merge (gui_current_window)) + { + irc_display_prefix (NULL, NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s can not merge windows, " + "there's no other window with same size " + "near current one.\n"), + WEECHAT_ERROR); + return -1; + } + } } else if (ascii_strncasecmp (argv[0], "b", 1) == 0) { diff --git a/src/common/completion.c b/src/common/completion.c index 44f6a4913..f4fa2a286 100644 --- a/src/common/completion.c +++ b/src/common/completion.c @@ -186,9 +186,14 @@ completion_build_list (t_completion *completion, void *channel) if (ascii_strcasecmp (completion->base_command, "debug") == 0) { if (completion->base_command_arg == 1) + { weelist_add (&completion->completion_list, &completion->last_completion, "dump"); + weelist_add (&completion->completion_list, + &completion->last_completion, + "windows"); + } else completion_stop (completion); return; diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 7699d6b2b..d7e7db2f5 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -2800,7 +2800,7 @@ gui_window_init_subwindows (t_gui_window *window) */ void -gui_window_split_horiz (t_gui_window *window) +gui_window_split_horiz (t_gui_window *window, int pourcentage) { t_gui_window *new_window; int height1, height2; @@ -2808,24 +2808,32 @@ gui_window_split_horiz (t_gui_window *window) if (!gui_ok) return; - height1 = window->win_height / 2; + height1 = (window->win_height * pourcentage) / 100; height2 = window->win_height - height1; - if ((new_window = gui_window_new (window->win_x, window->win_y, - window->win_width, height1))) + + if ((height1 >= WINDOW_MIN_HEIGHT) && (height2 >= WINDOW_MIN_HEIGHT) + && (pourcentage > 0) && (pourcentage <= 100)) { - /* reduce old window height (bottom window) */ - window->win_y = new_window->win_y + new_window->win_height; - window->win_height = height2; - - /* assign same buffer for new window (top window) */ - new_window->buffer = window->buffer; - new_window->buffer->num_displayed++; - - gui_switch_to_buffer (window, window->buffer); - - gui_current_window = new_window; - gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); - gui_redraw_buffer (gui_current_window->buffer); + if ((new_window = gui_window_new (window, + window->win_x, window->win_y, + window->win_width, height1, + 100, pourcentage))) + { + /* reduce old window height (bottom window) */ + window->win_y = new_window->win_y + new_window->win_height; + window->win_height = height2; + window->win_height_pct = 100 - pourcentage; + + /* assign same buffer for new window (top window) */ + new_window->buffer = window->buffer; + new_window->buffer->num_displayed++; + + gui_switch_to_buffer (window, window->buffer); + + gui_current_window = new_window; + gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); + gui_redraw_buffer (gui_current_window->buffer); + } } } @@ -2834,7 +2842,7 @@ gui_window_split_horiz (t_gui_window *window) */ void -gui_window_split_vertic (t_gui_window *window) +gui_window_split_vertic (t_gui_window *window, int pourcentage) { t_gui_window *new_window; int width1, width2; @@ -2842,185 +2850,146 @@ gui_window_split_vertic (t_gui_window *window) if (!gui_ok) return; - width1 = window->win_width / 2; + width1 = (window->win_width * pourcentage) / 100; width2 = window->win_width - width1 - 1; - if ((new_window = gui_window_new (window->win_x + width1 + 1, window->win_y, - width2, window->win_height))) - { - /* reduce old window height (left window) */ - window->win_width = width1; - - /* assign same buffer for new window (right window) */ - new_window->buffer = window->buffer; - new_window->buffer->num_displayed++; - - gui_switch_to_buffer (window, window->buffer); - - gui_current_window = new_window; - gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); - gui_redraw_buffer (gui_current_window->buffer); - - /* create & draw separator */ - gui_draw_window_separator (gui_current_window); - } -} - -/* - * gui_window_merge_down: merge window, direction down - */ - -int -gui_window_merge_down (t_gui_window *window) -{ - t_gui_window *ptr_win; - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + if ((width1 >= WINDOW_MIN_WIDTH) && (width2 >= WINDOW_MIN_WIDTH) + && (pourcentage > 0) && (pourcentage <= 100)) { - if (ptr_win != window) + if ((new_window = gui_window_new (window, + window->win_x + width1 + 1, window->win_y, + width2, window->win_height, + pourcentage, 100))) { - if ((ptr_win->win_y == window->win_y + window->win_height) - && (ptr_win->win_x == window->win_x) - && (ptr_win->win_width == window->win_width)) - { - window->win_height += ptr_win->win_height; - gui_window_free (ptr_win); - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); - return 0; - } + /* reduce old window height (left window) */ + window->win_width = width1; + window->win_width_pct = 100 - pourcentage; + + /* assign same buffer for new window (right window) */ + new_window->buffer = window->buffer; + new_window->buffer->num_displayed++; + + gui_switch_to_buffer (window, window->buffer); + + gui_current_window = new_window; + gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); + gui_redraw_buffer (gui_current_window->buffer); + + /* create & draw separator */ + gui_draw_window_separator (gui_current_window); } } - - /* no window found below current window */ - return -1; } /* - * gui_window_merge_up: merge window, direction up + * gui_window_merge: merge window with its sister */ int -gui_window_merge_up (t_gui_window *window) +gui_window_merge (t_gui_window *window) { - t_gui_window *ptr_win; + t_gui_window_tree *parent, *sister; - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + parent = window->ptr_tree->parent_node; + if (parent) { - if (ptr_win != window) + sister = (parent->child1->window == window) ? + parent->child2 : parent->child1; + + if (!(sister->window)) + return 0; + + if (window->win_y == sister->window->win_y) { - if ((ptr_win->win_y + ptr_win->win_height == window->win_y) - && (ptr_win->win_x == window->win_x) - && (ptr_win->win_width == window->win_width)) - { - window->win_height += ptr_win->win_height; - window->win_y -= ptr_win->win_height; - gui_window_free (ptr_win); - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); - return 0; - } + /* horizontal merge */ + window->win_width += sister->window->win_width + 1; + window->win_width_pct += sister->window->win_width_pct; + } + else + { + /* vertical merge */ + window->win_height += sister->window->win_height; + window->win_height_pct += sister->window->win_height_pct; } + if (sister->window->win_x < window->win_x) + window->win_x = sister->window->win_x; + if (sister->window->win_y < window->win_y) + window->win_y = sister->window->win_y; + + gui_window_free (sister->window); + gui_window_tree_node_to_leaf (parent, window); + + gui_switch_to_buffer (window, window->buffer); + gui_redraw_buffer (window->buffer); + return 1; } - - /* no window found above current window */ - return -1; + return 0; } /* - * gui_window_merge_left: merge window, direction left + * gui_window_merge_all: merge all windows into only one */ -int -gui_window_merge_left (t_gui_window *window) +void +gui_window_merge_all (t_gui_window *window) { - t_gui_window *ptr_win; - - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + while (gui_windows->next_window) { - if (ptr_win != window) - { - if ((ptr_win->win_x + ptr_win->win_width + 1 == window->win_x) - && (ptr_win->win_y == window->win_y) - && (ptr_win->win_height == window->win_height)) - { - window->win_width += ptr_win->win_width + 1; - window->win_x -= ptr_win->win_width + 1; - gui_window_free (ptr_win); - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); - return 0; - } - } + gui_window_free ((gui_windows == window) ? gui_windows->next_window : gui_windows); } - - /* no window found on the left of current window */ - return -1; + gui_window_tree_free (&gui_windows_tree); + gui_window_tree_init (window); + window->ptr_tree = gui_windows_tree; + window->win_x = 0; + window->win_y = 0; + window->win_width = COLS; + window->win_height = LINES; + window->win_width_pct = 100; + window->win_height_pct = 100; + gui_switch_to_buffer (window, window->buffer); + gui_redraw_buffer (window->buffer); } /* - * gui_window_merge_right: merge window, direction right + * gui_window_auto_resize: auto-resize all windows, according to % of global size + * This function is called after a terminal resize. + * Returns 0 if ok, -1 if all window should be merged + * (not enough space according to windows %) */ -int -gui_window_merge_right (t_gui_window *window) +void +gui_window_auto_resize (t_gui_window_tree *tree, + int x, int y, int width, int height) { - t_gui_window *ptr_win; + int size1, size2; - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + if (tree) { - if (ptr_win != window) + if (tree->window) + { + tree->window->win_x = x; + tree->window->win_y = y; + tree->window->win_width = width; + tree->window->win_height = height; + } + else { - if ((ptr_win->win_x == window->win_x + window->win_width + 1) - && (ptr_win->win_y == window->win_y) - && (ptr_win->win_height == window->win_height)) + if (tree->split_horiz) { - window->win_width += ptr_win->win_width + 1; - gui_window_free (ptr_win); - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); - return 0; + size1 = (height * tree->split_pct) / 100; + size2 = height - size1; + gui_window_auto_resize (tree->child1, x, y + size1, width, size2); + gui_window_auto_resize (tree->child2, x, y, width, size1); + } + else + { + size1 = (width * tree->split_pct) / 100; + size2 = width - size1 - 1; + gui_window_auto_resize (tree->child1, x, y, size1, height); + gui_window_auto_resize (tree->child2, x + size1 + 1, y, size2, height); } } } - - /* no window found on the right of current window */ - return -1; -} - -/* - * gui_window_merge: merge a window, direction auto - */ - -void -gui_window_merge_auto (t_gui_window *window) -{ - if (gui_window_merge_down (window) == 0) - return; - if (gui_window_merge_up (window) == 0) - return; - if (gui_window_merge_left (window) == 0) - return; - if (gui_window_merge_right (window) == 0) - return; -} - -/* - * gui_window_merge_all: merge all windows - */ - -void -gui_window_merge_all (t_gui_window *window) -{ - while (gui_windows->next_window) - { - gui_window_free ((gui_windows == window) ? gui_windows->next_window : gui_windows); - } - window->win_x = 0; - window->win_y = 0; - window->win_width = COLS; - window->win_height = LINES; - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); } /* @@ -3033,7 +3002,7 @@ gui_refresh_screen () t_gui_window *ptr_win, *old_current_window; int old_width, old_height; int new_width, new_height; - int merge_all_windows; + int merge_all; getmaxyx (stdscr, old_height, old_width); @@ -3044,44 +3013,36 @@ gui_refresh_screen () old_current_window = gui_current_window; - gui_ok = ((new_width > 5) && (new_height > 5)); + gui_ok = ((new_width > WINDOW_MIN_WIDTH) && (new_height > WINDOW_MIN_HEIGHT)); - merge_all_windows = 0; - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + if (gui_ok) { - ptr_win->dcc_first = NULL; - ptr_win->dcc_selected = NULL; + gui_window_auto_resize (gui_windows_tree, 0, 0, COLS, LINES); - if (!merge_all_windows) + merge_all = 0; + for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) { - if ((ptr_win->win_x > new_width - 5) - || (ptr_win->win_y > new_height - 5)) - merge_all_windows = 1; - else + if ((ptr_win->win_width < WINDOW_MIN_WIDTH) + || (ptr_win->win_height < WINDOW_MIN_HEIGHT)) { - if (ptr_win->win_x + ptr_win->win_width == old_width) - ptr_win->win_width = new_width - ptr_win->win_x; - if (ptr_win->win_y + ptr_win->win_height == old_height) - ptr_win->win_height = new_height - ptr_win->win_y; - if ((ptr_win->win_width < 5) || (ptr_win->win_height < 5)) - merge_all_windows = 1; + merge_all = 1; + break; } } - } + if (merge_all) + gui_window_merge_all (gui_current_window); - if (merge_all_windows) - gui_window_merge_all (gui_current_window); - - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) - { - gui_switch_to_buffer (ptr_win, ptr_win->buffer); - gui_redraw_buffer (ptr_win->buffer); - gui_draw_window_separator (ptr_win); + for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + { + gui_switch_to_buffer (ptr_win, ptr_win->buffer); + gui_redraw_buffer (ptr_win->buffer); + gui_draw_window_separator (ptr_win); + } + + gui_current_window = old_current_window; + gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); + gui_redraw_buffer (gui_current_window->buffer); } - - gui_current_window = old_current_window; - gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); - gui_redraw_buffer (gui_current_window->buffer); } /* @@ -3265,7 +3226,7 @@ gui_init () gui_input_clipboard = NULL; /* create new window/buffer */ - if (gui_window_new (0, 0, COLS, LINES)) + if (gui_window_new (NULL, 0, 0, COLS, LINES, 100, 100)) { gui_current_window = gui_windows; gui_buffer_new (gui_windows, NULL, NULL, 0, 1); @@ -3316,6 +3277,7 @@ gui_end () /* delete all windows */ while (gui_windows) gui_window_free (gui_windows); + gui_window_tree_free (&gui_windows_tree); /* delete global history */ history_global_free (); diff --git a/src/gui/gui-common.c b/src/gui/gui-common.c index 81d149499..c52cf4728 100644 --- a/src/gui/gui-common.c +++ b/src/gui/gui-common.c @@ -54,6 +54,8 @@ t_gui_window *gui_windows = NULL; /* pointer to first window */ t_gui_window *last_gui_window = NULL; /* pointer to last window */ t_gui_window *gui_current_window = NULL; /* pointer to current window */ +t_gui_window_tree *gui_windows_tree = NULL; /* pointer to windows tree */ + t_gui_buffer *gui_buffers = NULL; /* pointer to first buffer */ t_gui_buffer *last_gui_buffer = NULL; /* pointer to last buffer */ t_gui_buffer *buffer_before_dcc = NULL; /* buffer before dcc switch */ @@ -61,25 +63,148 @@ t_gui_infobar *gui_infobar; /* pointer to infobar content */ char *gui_input_clipboard = NULL; /* clipboard content */ + +/* + * gui_window_tree_init: create first entry in windows tree + */ + +int +gui_window_tree_init (t_gui_window *window) +{ + gui_windows_tree = (t_gui_window_tree *)malloc (sizeof (t_gui_window_tree)); + if (!gui_windows_tree) + return 0; + gui_windows_tree->parent_node = NULL; + gui_windows_tree->split_horiz = 0; + gui_windows_tree->split_pct = 0; + gui_windows_tree->child1 = NULL; + gui_windows_tree->child2 = NULL; + gui_windows_tree->window = window; + return 1; +} + +/* + * gui_window_tree_node_to_leaf: convert a node to a leaf (free any leafs) + * Called when 2 windows are merging into one + */ + +void +gui_window_tree_node_to_leaf (t_gui_window_tree *node, t_gui_window *window) +{ + node->split_horiz = 0; + node->split_pct = 0; + if (node->child1) + { + free (node->child1); + node->child1 = NULL; + } + if (node->child2) + { + free (node->child2); + node->child2 = NULL; + } + node->window = window; + window->ptr_tree = node; +} + +/* + * gui_window_tree_free: delete entire windows tree + */ + +void +gui_window_tree_free (t_gui_window_tree **tree) +{ + if (*tree) + { + if ((*tree)->child1) + gui_window_tree_free (&((*tree)->child1)); + if ((*tree)->child2) + gui_window_tree_free (&((*tree)->child2)); + free (*tree); + *tree = NULL; + } +} + /* * gui_window_new: create a new window */ t_gui_window * -gui_window_new (int x, int y, int width, int height) +gui_window_new (t_gui_window *parent, int x, int y, int width, int height, + int width_pct, int height_pct) { t_gui_window *new_window; + t_gui_window_tree *ptr_tree, *child1, *child2, *ptr_leaf; #ifdef DEBUG wee_log_printf ("Creating new window (x:%d, y:%d, width:%d, height:%d)\n", x, y, width, height); #endif + + if (parent) + { + child1 = (t_gui_window_tree *)malloc (sizeof (t_gui_window_tree)); + if (!child1) + return NULL; + child2 = (t_gui_window_tree *)malloc (sizeof (t_gui_window_tree)); + if (!child2) + { + free (child1); + return NULL; + } + ptr_tree = parent->ptr_tree; + + if (width_pct == 100) + { + ptr_tree->split_horiz = 1; + ptr_tree->split_pct = height_pct; + } + else + { + ptr_tree->split_horiz = 0; + ptr_tree->split_pct = width_pct; + } + + /* parent window leaf becomes node and we add 2 leafs below + (#1 is parent win, #2 is new win) */ + + parent->ptr_tree = child1; + child1->parent_node = ptr_tree; + child1->child1 = NULL; + child1->child2 = NULL; + child1->window = ptr_tree->window; + + child2->parent_node = ptr_tree; + child2->child1 = NULL; + child2->child2 = NULL; + child2->window = NULL; /* will be assigned by new window below */ + + ptr_tree->child1 = child1; + ptr_tree->child2 = child2; + ptr_tree->window = NULL; /* leaf becomes node */ + + ptr_leaf = child2; + } + else + { + if (!gui_window_tree_init (NULL)) + return NULL; + ptr_leaf = gui_windows_tree; + } + if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window))))) { new_window->win_x = x; new_window->win_y = y; new_window->win_width = width; new_window->win_height = height; + new_window->win_width_pct = width_pct; + new_window->win_height_pct = height_pct; + + new_window->new_x = -1; + new_window->new_y = -1; + new_window->new_width = -1; + new_window->new_height = -1; new_window->win_chat_x = 0; new_window->win_chat_y = 0; @@ -120,6 +245,9 @@ gui_window_new (int x, int y, int width, int height) new_window->start_line = NULL; new_window->start_line_pos = 0; + new_window->ptr_tree = ptr_leaf; + ptr_leaf->window = new_window; + /* add window to windows queue */ new_window->prev_window = last_gui_window; if (gui_windows) @@ -1427,6 +1555,8 @@ gui_window_print_log (t_gui_window *window) wee_log_printf (" win_y . . . . . . . : %d\n", window->win_y); wee_log_printf (" win_width . . . . . : %d\n", window->win_width); wee_log_printf (" win_height. . . . . : %d\n", window->win_height); + wee_log_printf (" win_width_pct . . . : %d\n", window->win_width_pct); + wee_log_printf (" win_height_pct. . . : %d\n", window->win_height_pct); wee_log_printf (" win_chat_x. . . . . : %d\n", window->win_chat_x); wee_log_printf (" win_chat_y. . . . . : %d\n", window->win_chat_y); wee_log_printf (" win_chat_width. . . : %d\n", window->win_chat_width); diff --git a/src/gui/gui.h b/src/gui/gui.h index 52103f204..bf2e09ac6 100644 --- a/src/gui/gui.h +++ b/src/gui/gui.h @@ -164,6 +164,9 @@ enum t_weechat_color #define gui_printf_nolog_notime(buffer, fmt, argz...) \ gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, fmt, ##argz) +#define WINDOW_MIN_WIDTH 10 +#define WINDOW_MIN_HEIGHT 5 + #define NOTIFY_LEVEL_MIN 0 #define NOTIFY_LEVEL_MAX 3 #define NOTIFY_LEVEL_DEFAULT NOTIFY_LEVEL_MAX @@ -261,6 +264,7 @@ struct t_gui_buffer t_gui_buffer *next_buffer; /* link to next buffer */ }; +typedef struct t_gui_window_tree t_gui_window_tree; typedef struct t_gui_window t_gui_window; struct t_gui_window @@ -268,6 +272,11 @@ struct t_gui_window /* global position & size */ int win_x, win_y; /* position of window */ int win_width, win_height; /* window geometry */ + int win_width_pct; /* % of width (compared to term size) */ + int win_height_pct; /* % of height (compared to term size) */ + + int new_x, new_y; /* used for computing new position */ + int new_width, new_height; /* used for computing new size */ /* chat window settings */ int win_chat_x, win_chat_y; /* chat window position */ @@ -320,10 +329,26 @@ struct t_gui_window t_gui_line *start_line; /* pointer to line if scrolling */ int start_line_pos; /* position in first line displayed */ + t_gui_window_tree *ptr_tree; /* pointer to leaf in windows tree */ + t_gui_window *prev_window; /* link to previous window */ t_gui_window *next_window; /* link to next window */ }; +struct t_gui_window_tree +{ + t_gui_window_tree *parent_node; /* pointer to parent node */ + + /* node info */ + int split_horiz; /* 1 if horizontal, 0 if vertical */ + int split_pct; /* % of split size (represents child1) */ + t_gui_window_tree *child1; /* first child, NULL if a leaf */ + t_gui_window_tree *child2; /* second child, NULL if a leaf */ + + /* leaf info */ + t_gui_window *window; /* pointer to window, NULL if a node */ +}; + typedef struct t_gui_key t_gui_key; struct t_gui_key @@ -353,6 +378,7 @@ extern int gui_add_hotlist; extern t_gui_window *gui_windows; extern t_gui_window *last_gui_window; extern t_gui_window *gui_current_window; +extern t_gui_window_tree *gui_windows_tree; extern t_gui_buffer *gui_buffers; extern t_gui_buffer *last_gui_buffer; extern t_gui_buffer *buffer_before_dcc; @@ -369,7 +395,10 @@ extern t_gui_color *gui_color[NUM_COLORS]; /* GUI independent functions: windows & buffers */ -extern t_gui_window *gui_window_new (int, int, int, int); +extern int gui_window_tree_init (t_gui_window *); +extern void gui_window_tree_node_to_leaf (t_gui_window_tree *, t_gui_window *); +extern void gui_window_tree_free (t_gui_window_tree **); +extern t_gui_window *gui_window_new (t_gui_window *, int, int, int, int, int, int); extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int); extern void gui_buffer_clear (t_gui_buffer *); extern void gui_buffer_clear_all (); @@ -480,13 +509,9 @@ extern void gui_window_nick_end (t_gui_window *); extern void gui_window_nick_page_up (t_gui_window *); extern void gui_window_nick_page_down (t_gui_window *); extern void gui_window_init_subwindows (t_gui_window *); -extern void gui_window_split_horiz (t_gui_window *); -extern void gui_window_split_vertic (t_gui_window *); -extern int gui_window_merge_up (t_gui_window *); -extern int gui_window_merge_down (t_gui_window *); -extern int gui_window_merge_left (t_gui_window *); -extern int gui_window_merge_right (t_gui_window *); -extern void gui_window_merge_auto (t_gui_window *); +extern void gui_window_split_horiz (t_gui_window *, int); +extern void gui_window_split_vertic (t_gui_window *, int); +extern int gui_window_merge (t_gui_window *); extern void gui_window_merge_all (t_gui_window *); extern void gui_refresh_screen (); extern void gui_pre_init (int *, char **[]); diff --git a/weechat/BUGS b/weechat/BUGS index 05a46dc45..08e79642c 100644 --- a/weechat/BUGS +++ b/weechat/BUGS @@ -1,7 +1,7 @@ WeeChat - Wee Enhanced Environment for Chat =========================================== -WeeChat known bugs, 2005-11-11 +WeeChat known bugs, 2005-11-13 - some refresh bugs with splited windows - ./configure does not check that Ruby libraries are installed @@ -11,3 +11,4 @@ WeeChat known bugs, 2005-11-11 - when many WeeChat are launched, log file is not properly written (cleared by each WeeChat at startup) - WeeChat may crash if too much nicks in nicklist when position is top or bottom +- crash when using non colored term diff --git a/weechat/po/cs.po b/weechat/po/cs.po index 1a16878be..2bc82a3b0 100644 --- a/weechat/po/cs.po +++ b/weechat/po/cs.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-11 10:15+0100\n" -"PO-Revision-Date: 2005-11-11 17:03+0100\n" +"POT-Creation-Date: 2005-11-13 16:40+0100\n" +"PO-Revision-Date: 2005-11-13 16:44+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1394,7 +1394,7 @@ msgstr "neznámý" msgid "%s: using local hostname \"%s\"\n" msgstr "%s: používám lokální jméno hosta \"%s\"\n" -#: src/irc/irc-send.c:175 src/common/command.c:783 +#: src/irc/irc-send.c:175 src/common/command.c:787 #, 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" @@ -1410,8 +1410,8 @@ msgstr "%s \"%s\" příkaz může být spuštěn pouze v okně kanálu\n" #: src/irc/irc-send.c:472 src/irc/irc-send.c:484 src/irc/irc-send.c:502 #: src/irc/irc-send.c:1166 src/irc/irc-send.c:1264 src/irc/irc-send.c:1796 -#: src/common/command.c:1310 src/common/command.c:1749 -#: src/common/command.c:1885 +#: src/common/command.c:1353 src/common/command.c:1798 +#: src/common/command.c:1934 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n" @@ -1749,11 +1749,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:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "days" msgstr "dní" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "day" msgstr "den" @@ -2257,64 +2257,64 @@ msgstr "Změnil se den na %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "bytes" msgstr "bajtů" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Kb" msgstr "Kb" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Mb" msgstr "Mb" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Gb" msgstr "Gb" -#: src/gui/curses/gui-display.c:1921 +#: src/gui/curses/gui-display.c:1926 msgid "<servers>" msgstr "<serverů>" -#: src/gui/curses/gui-display.c:1933 +#: src/gui/curses/gui-display.c:1938 msgid "(away)" msgstr "(pryč)" -#: src/gui/curses/gui-display.c:2067 +#: src/gui/curses/gui-display.c:2072 msgid "[not connected] " msgstr "[nepřipojen] " -#: src/gui/curses/gui-display.c:2077 +#: src/gui/curses/gui-display.c:2082 msgid "Act: " msgstr "Aktivní: " -#: src/gui/curses/gui-display.c:2165 +#: src/gui/curses/gui-display.c:2170 #, c-format msgid "Lag: %.1f" msgstr "Zpoždění: %.1f" -#: src/gui/curses/gui-display.c:2181 +#: src/gui/curses/gui-display.c:2186 msgid "-MORE-" msgstr "-VÍCE-" -#: src/gui/curses/gui-display.c:2359 +#: src/gui/curses/gui-display.c:2364 msgid " [A] Accept" msgstr " [A] Akceptovat" -#: src/gui/curses/gui-display.c:2360 src/gui/curses/gui-display.c:2364 +#: src/gui/curses/gui-display.c:2365 src/gui/curses/gui-display.c:2369 msgid " [C] Cancel" msgstr " [C] Storno" -#: src/gui/curses/gui-display.c:2369 +#: src/gui/curses/gui-display.c:2374 msgid " [R] Remove" msgstr " [R] Odebrat" -#: src/gui/curses/gui-display.c:2373 +#: src/gui/curses/gui-display.c:2378 msgid " [P] Purge old DCC" msgstr " [P] Pročistit staré DCC" -#: src/gui/curses/gui-display.c:2374 +#: src/gui/curses/gui-display.c:2379 msgid " [Q] Close DCC view" msgstr " [Q] Zavřít DCC pohled" @@ -2322,11 +2322,11 @@ msgstr " [Q] Zavřít DCC pohled" msgid "server" msgstr "server" -#: src/gui/gui-common.c:509 +#: src/gui/gui-common.c:637 msgid "Not enough memory for new line\n" msgstr "Nedostatek paměti pro nový řádek\n" -#: src/gui/gui-common.c:854 +#: src/gui/gui-common.c:982 msgid "Not enough memory for infobar message\n" msgstr "Nedostatek paměti pro infobar zprávu\n" @@ -2478,7 +2478,7 @@ msgstr "obnov obrazovku" msgid "grab a key" msgstr "zachytit klávesu" -#: src/gui/gui-keyboard.c:428 src/common/command.c:1764 +#: src/gui/gui-keyboard.c:428 src/common/command.c:1813 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s nemohu napojit kalávesu \"%s\"\n" @@ -2576,38 +2576,40 @@ msgid "print debug messages" msgstr "vypsat debug zprávy" #: src/common/command.c:69 -msgid "dump" -msgstr "dump" +msgid "dump | windows" +msgstr "dump | windows" #: src/common/command.c:70 +#, fuzzy msgid "" "dump: save memory dump in WeeChat log file (same dump is written when " -"WeeChat crashes)" +"WeeChat crashes)\n" +"windows: display windows tree" msgstr "" "dump: uloží dump paměti ve WeeChat log souboru (stejný dump jako když " "Weechat havaruje)" -#: src/common/command.c:72 +#: src/common/command.c:73 msgid "display help about commands" msgstr "zobrazí nápovědu k příkazům" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "[command]" msgstr "[příkaz]" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "command: name of a WeeChat or IRC command" msgstr "příkaz: jméno WeeChat nebo IRC příkazu" -#: src/common/command.c:75 +#: src/common/command.c:76 msgid "ignore IRC messages and/or hosts" msgstr "ignoruje IRC příkaz a/nebo hosta" -#: src/common/command.c:76 +#: src/common/command.c:77 msgid "[mask [[type | command] [channel [server]]]]" msgstr "[maska [[typ | příkaz] [kanál [server]]]]" -#: src/common/command.c:77 +#: src/common/command.c:78 msgid "" " mask: nick or host mask to ignore\n" " type: type of message to ignore (action, ctcp, dcc, pv)\n" @@ -2627,15 +2629,15 @@ msgstr "" "Pro každý argument, znamená '*' vše.\n" "Bez arumentů vypíše příkaz /ignore seznam všech definovaných ignorování." -#: src/common/command.c:85 +#: src/common/command.c:86 msgid "bind/unbind keys" msgstr "napojit/odpojit klávesy" -#: src/common/command.c:86 +#: src/common/command.c:87 msgid "[key function/command] [unbind key] [functions] [reset -yes]" msgstr "[klávesa funkce/příkaz] [unbind klávesa] [functions] [reset -yes]" -#: src/common/command.c:87 +#: src/common/command.c:88 msgid "" "key: bind this key to an internal function or a command (beginning by \"/" "\")\n" @@ -2650,15 +2652,15 @@ msgstr "" "reset: obnoví klávesy na výchozí hodnoty a smaže uživatlské zkratky " "(používejte opatrně)" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "list/load/unload plugins" msgstr "seznam/načíst/odebrat pluginy" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "[load jméno_souboru] | [autoload] | [reload] | [unload]" -#: src/common/command.c:94 +#: src/common/command.c:95 msgid "" "filename: WeeChat plugin (file) to load\n" "\n" @@ -2668,11 +2670,11 @@ msgstr "" "\n" "Příkaz /plugin bez argumentů vypíše seznam všech načtených pluginů." -#: src/common/command.c:97 +#: src/common/command.c:98 msgid "list, add or remove servers" msgstr "vypíše, přídá nebo odebere servery" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "" "[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname " @@ -2684,7 +2686,7 @@ msgstr "" "uživatelské_jméno] [-realname pravé_jméno] [-command příkaz] [-autojoin kanál" "[,kanál]] ] | [del jméno_serveru]" -#: src/common/command.c:103 +#: src/common/command.c:104 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -2710,27 +2712,27 @@ msgstr "" "uživatelské_jméno: uživatelské jméno\n" "pravé_jméno: pravé jméno uživatele" -#: src/common/command.c:115 +#: src/common/command.c:116 msgid "save config to disk" msgstr "uloží nastavení na disk" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "[file]" msgstr "[soubor]" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "file: filename for writing config" msgstr "soubor: jméno souboru pro zapsání" -#: src/common/command.c:118 +#: src/common/command.c:119 msgid "set config parameters" msgstr "nastaví konfigurační parametry" -#: src/common/command.c:119 +#: src/common/command.c:120 msgid "[option [ = value]]" msgstr "[volba [ = hodnota]]" -#: src/common/command.c:120 +#: src/common/command.c:121 msgid "" "option: name of an option (if name is full and no value is given, then help " "is displayed on option)\n" @@ -2740,27 +2742,27 @@ msgstr "" "zobrazena nápověda pro volby)\n" "hodnota: hodnota volby" -#: src/common/command.c:124 +#: src/common/command.c:125 msgid "remove an alias" msgstr "odebere alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name" msgstr "jméno_aliasu" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name: name of alias to remove" msgstr "jméno_aliasu: jméno aliasu pro odebrání" -#: src/common/command.c:127 +#: src/common/command.c:128 msgid "unignore IRC messages and/or hosts" msgstr "zruší ignorování IRC zprávy a/nebo hosta" -#: src/common/command.c:128 +#: src/common/command.c:129 msgid "[number | [mask [[type | command] [channel [server]]]]]" msgstr "[číslo | [maska [[typ | příkaz] [kanál [server]]]]]" -#: src/common/command.c:129 +#: src/common/command.c:130 msgid "" " number: # of ignore to unignore (number is displayed by list of ignore)\n" " mask: nick or host mask to unignore\n" @@ -2783,31 +2785,28 @@ msgstr "" "Pro každý argument znamená '*' všechno.\n" "Bez argunetů, vypíše příkaz /unignore seznam definovaných ignorací." -#: src/common/command.c:138 +#: src/common/command.c:139 msgid "show WeeChat uptime" msgstr "" -#: src/common/command.c:139 +#: src/common/command.c:140 msgid "-o" msgstr "" -#: src/common/command.c:140 +#: src/common/command.c:141 msgid "-o: send uptime on current channel as an IRC message" msgstr "" -#: src/common/command.c:142 +#: src/common/command.c:143 msgid "manage windows" msgstr "spravuje okna" -#: src/common/command.c:143 -msgid "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" -msgstr "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" - #: src/common/command.c:144 +msgid "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" +msgstr "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" + +#: src/common/command.c:145 +#, fuzzy msgid "" "list: list opened windows (no parameter implies this list)\n" "-1: jump to previous window\n" @@ -2815,7 +2814,11 @@ msgid "" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" -"merge: merge window with another" +"merge: merge window with another (all = keep only one window)\n" +"\n" +"For splith and splitv, pct is a pourcentage which represents size of new " +"window, computed with current window as size reference. For example 25 means " +"create a new window with size = current_size / 4" msgstr "" "list: vypíše otevřené okna (bez paramatru implikuje tenhle list)\n" "-1: přepne na přechozí okno\n" @@ -2825,28 +2828,28 @@ msgstr "" "splitv: rozdělí aktuální okno vertikálně\n" "merge: spojí okno s jiným" -#: src/common/command.c:293 +#: src/common/command.c:297 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s alias nebo příkaz \"%s\" již existuje!\n" -#: src/common/command.c:303 +#: src/common/command.c:307 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s alias nemůže pouštět jiný ailas!\n" -#: src/common/command.c:310 +#: src/common/command.c:314 #, c-format msgid "%s target command \"/%s\" does not exist!\n" msgstr "%s cílový příkaz \"/%s\" neexistuje!\n" -#: src/common/command.c:548 +#: src/common/command.c:552 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s špatný počet argumentů pro %s příkaz \"%s\" (očekáváno: %d argumentů%s)\n" -#: src/common/command.c:560 +#: src/common/command.c:564 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2855,18 +2858,18 @@ msgstr "" "%s špatyný počet argumentů pro %s příkaz \"%s\" (očekáváno: mezi %d a %d " "argumenty%s)\n" -#: src/common/command.c:582 src/common/command.c:651 +#: src/common/command.c:586 src/common/command.c:655 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s příkaz \"%s\" selhal\n" -#: src/common/command.c:607 +#: src/common/command.c:611 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s chybný počet argumentů pro IRC příkaz \"%s\" (očekáváno: %d argumentů%s)\n" -#: src/common/command.c:619 +#: src/common/command.c:623 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2875,287 +2878,287 @@ msgstr "" "%s špatný počet argumentů pro IRC příkaz \"%s\" (očekáváno: mezi %d a %d " "argumenty%s)\n" -#: src/common/command.c:634 +#: src/common/command.c:638 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s příkaz \"%s\" potřebuje připojení na server!\n" -#: src/common/command.c:694 +#: src/common/command.c:698 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s neznámý příkaz \"%s\" (zadejte /help pro nápovědu)\n" -#: src/common/command.c:828 +#: src/common/command.c:832 msgid "This window is not a channel!\n" msgstr "Tohe není okno kanálu!\n" -#: src/common/command.c:856 src/common/command.c:887 src/common/command.c:995 +#: src/common/command.c:860 src/common/command.c:891 src/common/command.c:999 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s chybí argumenty pro příkaz \"%s\"\n" -#: src/common/command.c:863 +#: src/common/command.c:867 #, c-format msgid "%s alias can not start with \"/\"\n" msgstr "%s alias nemůže žačínat \"/\"!\n" -#: src/common/command.c:872 +#: src/common/command.c:876 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" vytvořen\n" -#: src/common/command.c:878 +#: src/common/command.c:882 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "Selhalo vytvoření aliasu \"%s\" => \"%s\" (nedostatek paměti)\n" -#: src/common/command.c:898 +#: src/common/command.c:902 msgid "List of aliases:\n" msgstr "Seznam pro aliasy:\n" -#: src/common/command.c:912 +#: src/common/command.c:916 msgid "No alias defined.\n" msgstr "Žádné aliasy nejsou definovány.\n" -#: src/common/command.c:929 +#: src/common/command.c:933 #, c-format msgid "%sServer: %s%s\n" msgstr "%sServer: %s%s\n" -#: src/common/command.c:934 +#: src/common/command.c:938 #, c-format msgid "%sChannel: %s%s %s(server: %s%s%s)\n" msgstr "%sKanál: %s%s %s(server: %s%s%s)\n" -#: src/common/command.c:943 +#: src/common/command.c:947 #, c-format msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n" msgstr "%sSoukromý s: %s%s %s(server: %s%s%s)\n" -#: src/common/command.c:952 +#: src/common/command.c:956 msgid "not connected\n" msgstr "nepřipojen\n" -#: src/common/command.c:974 +#: src/common/command.c:978 msgid "Opened buffers:\n" msgstr "Otevřené buffery:\n" -#: src/common/command.c:1018 +#: src/common/command.c:1022 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s nekorektní číslo bufferu\n" -#: src/common/command.c:1034 +#: src/common/command.c:1038 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s nemohu zavřít jediný buffer\n" -#: src/common/command.c:1044 +#: src/common/command.c:1048 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "%s nemohu zavřít buffer serveru dokud jsou otevřeny kanály\n" -#: src/common/command.c:1093 +#: src/common/command.c:1097 msgid "Notify levels: " msgstr "Level upozornění: " -#: src/common/command.c:1122 src/common/command.c:1170 +#: src/common/command.c:1126 src/common/command.c:1174 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s nekorektní level upozornění (musí být mezi %d a %d)\n" -#: src/common/command.c:1131 +#: src/common/command.c:1135 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "%s nekorektní buffer pro upozornění (musí být kanál nebo soukromý)\n" -#: src/common/command.c:1140 +#: src/common/command.c:1144 #, c-format msgid "New notify level for %s%s%s: %s%d %s" msgstr "Nový level upozornění %s%s%s: %s%d %s" -#: src/common/command.c:1150 +#: src/common/command.c:1154 msgid "(hotlist: never)\n" msgstr "(hotlist: nikdy)\n" -#: src/common/command.c:1153 +#: src/common/command.c:1157 msgid "(hotlist: highlights)\n" msgstr "(hotlist: zvýraznění)\n" -#: src/common/command.c:1156 +#: src/common/command.c:1160 msgid "(hotlist: highlights + messages)\n" msgstr "(hotlist: zvýraznění + zprávy)\n" -#: src/common/command.c:1159 +#: src/common/command.c:1163 msgid "(hotlist: highlights + messages + join/part (all))\n" msgstr "(hotlist: zvýrazění + zprávy + připojení/odpojení (vše))\n" -#: src/common/command.c:1237 +#: src/common/command.c:1241 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "neznámý parametr \"%s\" pro příkaz \"%s\"\n" -#: src/common/command.c:1267 +#: src/common/command.c:1271 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s již vytvořený server \"%s\"!\n" -#: src/common/command.c:1275 +#: src/common/command.c:1279 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s zrovna připojuji k serveru \"%s\"!\n" -#: src/common/command.c:1293 src/common/command.c:1368 +#: src/common/command.c:1297 src/common/command.c:1417 #, c-format msgid "%s server not found\n" msgstr "%s server nenalezen\n" -#: src/common/command.c:1323 src/common/command.c:1878 -#: src/common/command.c:2786 src/common/command.c:2810 +#: src/common/command.c:1372 src/common/command.c:1927 +#: src/common/command.c:2850 src/common/command.c:2885 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s neznámá volba pro příkaz \"%s\"\n" -#: src/common/command.c:1352 +#: src/common/command.c:1401 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s nepřipojen k serveru \"%s\"!\n" -#: src/common/command.c:1360 +#: src/common/command.c:1409 msgid "Auto-reconnection is cancelled\n" msgstr "Automatické znovupřipojené je zrušeno\n" -#: src/common/command.c:1391 src/common/weechat.c:365 +#: src/common/command.c:1440 src/common/weechat.c:365 #, c-format msgid "%s internal commands:\n" msgstr "%s vnitřní příkazy:\n" -#: src/common/command.c:1401 src/common/weechat.c:385 +#: src/common/command.c:1450 src/common/weechat.c:385 #, c-format msgid "IRC commands:\n" msgstr "IRC příkazy:\n" -#: src/common/command.c:1415 +#: src/common/command.c:1464 msgid "Plugin commands:\n" msgstr "Příkazy pluginu:\n" -#: src/common/command.c:1531 +#: src/common/command.c:1580 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "Není dostupná žádná nápověda, \"%s\" je neznámý příkaz\n" -#: src/common/command.c:1550 +#: src/common/command.c:1599 #, c-format msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n" msgstr "%sna %s%s%s/%s%s%s:%s ignoruji %s%s%s od %s%s\n" -#: src/common/command.c:1584 +#: src/common/command.c:1633 msgid "List of ignore:\n" msgstr "Seznam ignorování:\n" -#: src/common/command.c:1601 +#: src/common/command.c:1650 msgid "No ignore defined.\n" msgstr "Žádné ignorování není definováno.\n" -#: src/common/command.c:1627 +#: src/common/command.c:1676 msgid "New ignore:" msgstr "Nové ignorování:" -#: src/common/command.c:1647 +#: src/common/command.c:1696 #, c-format msgid "New key binding: %s" msgstr "Nová klávesová zkratka: %s" -#: src/common/command.c:1681 +#: src/common/command.c:1730 msgid "Key bindings:\n" msgstr "Klávesové zkratky:\n" -#: src/common/command.c:1695 +#: src/common/command.c:1744 #, c-format msgid "Key \"%s\" unbinded\n" msgstr "Klávesa \"%s\" odpojena\n" -#: src/common/command.c:1701 +#: src/common/command.c:1750 #, c-format msgid "%s unable to unbind key \"%s\"\n" msgstr "%s nemohu odpojit klávesu \"%s\"\n" -#: src/common/command.c:1709 src/common/weechat.c:416 +#: src/common/command.c:1758 src/common/weechat.c:416 #, c-format msgid "Internal key functions:\n" msgstr "Vnitřní klávesové funkce:\n" -#: src/common/command.c:1729 +#: src/common/command.c:1778 msgid "Default key bindings restored\n" msgstr "Výchozí klávesové zkratky obnoveny\n" -#: src/common/command.c:1735 +#: src/common/command.c:1784 #, c-format msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" "%s \"-yes\" argument je požadován pro reset kaláves (bezpečnostní opatření)\n" -#: src/common/command.c:1791 +#: src/common/command.c:1840 msgid "Plugins loaded:\n" msgstr "Načtené pluginy:\n" -#: src/common/command.c:1807 +#: src/common/command.c:1856 msgid " message handlers:\n" msgstr " obsluhovače zpráv:\n" -#: src/common/command.c:1816 +#: src/common/command.c:1865 #, c-format msgid " IRC(%s)\n" msgstr " IRC(%s)\n" -#: src/common/command.c:1823 +#: src/common/command.c:1872 msgid " (no message handler)\n" msgstr " (není obsluhovač zprávy)\n" -#: src/common/command.c:1828 +#: src/common/command.c:1877 msgid " command handlers:\n" msgstr " obsluhovače příkazu:\n" -#: src/common/command.c:1849 +#: src/common/command.c:1898 msgid " (no command handler)\n" msgstr " (není obsluhovač příkazu)\n" -#: src/common/command.c:1855 +#: src/common/command.c:1904 msgid " (no plugin)\n" msgstr " (není plugin)\n" -#: src/common/command.c:1891 +#: src/common/command.c:1940 msgid "" "Command \"plugin\" is not available, WeeChat was built without plugins " "support.\n" msgstr "" "Příkaz \"plugin\" není dostupný, WeeChat byl přeložen bez podpory pluginů.\n" -#: src/common/command.c:1938 +#: src/common/command.c:1988 msgid "No server.\n" msgstr "žádný server.\n" -#: src/common/command.c:1949 +#: src/common/command.c:1999 #, c-format msgid "Server '%s' not found.\n" msgstr "Server '%s' nenalezen.\n" -#: src/common/command.c:1961 +#: src/common/command.c:2011 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s chybí jméno serveru pro příkaz \"%s\"\n" -#: src/common/command.c:1969 +#: src/common/command.c:2019 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "%s příliž mnoho argumentů pro příkaz \"%s\", ignoruji argumety\n" -#: src/common/command.c:1988 +#: src/common/command.c:2038 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s server \"%s\" nenalezen pro příkaz \"%s\"\n" -#: src/common/command.c:1996 +#: src/common/command.c:2046 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -3164,185 +3167,192 @@ msgstr "" "%s nemůžete odebrat server \"%s\", protože jste k němu připojent. Skuste " "nejprve /dissconnect %s.\n" -#: src/common/command.c:2014 +#: src/common/command.c:2066 #, c-format msgid "Server %s%s%s has been deleted\n" msgstr "Server %s%s%s byl odebrán\n" -#: src/common/command.c:2031 +#: src/common/command.c:2085 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s chybí parametry pro příkaz \"%s\"\n" -#: src/common/command.c:2041 +#: src/common/command.c:2095 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s server \"%s\" již existuje, nemohu jej vytvořít!\n" -#: src/common/command.c:2070 src/common/command.c:2098 -#: src/common/command.c:2111 src/common/command.c:2137 +#: src/common/command.c:2124 src/common/command.c:2152 +#: src/common/command.c:2165 src/common/command.c:2191 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s chybí heslo pro parametr \"%s\"\n" -#: src/common/command.c:2083 +#: src/common/command.c:2137 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s chybí přezdívka/přezdívky pro parametr \"%s\"\n" -#: src/common/command.c:2124 +#: src/common/command.c:2178 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s chybí příkaz pro parametr \"%s\"\n" -#: src/common/command.c:2159 +#: src/common/command.c:2213 #, c-format msgid "Server %s%s%s created\n" msgstr "Server %s%s%s vytvořen\n" -#: src/common/command.c:2168 +#: src/common/command.c:2222 #, c-format msgid "%s unable to create server\n" msgstr "%s nemohu vytvořit server\n" -#: src/common/command.c:2227 +#: src/common/command.c:2281 msgid "(unknown)" msgstr "(neznámý)" -#: src/common/command.c:2250 +#: src/common/command.c:2304 #, c-format msgid "%s(password hidden) " msgstr "%s(heslo schováno) " -#: src/common/command.c:2317 +#: src/common/command.c:2371 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s server \"%s\" nenalezen\n" -#: src/common/command.c:2350 src/common/command.c:2398 +#: src/common/command.c:2404 src/common/command.c:2452 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s volba nastavení \"%s\" nenalezena\n" -#: src/common/command.c:2355 src/common/command.c:2390 +#: src/common/command.c:2409 src/common/command.c:2444 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s nekorektní hodnota pro volbu \"%s\"\n" -#: src/common/command.c:2371 +#: src/common/command.c:2425 #, 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:2481 +#: src/common/command.c:2535 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Nebyla nalezena žádná volba nastavení s \"%s\"\n" -#: src/common/command.c:2484 +#: src/common/command.c:2538 msgid "No config option found\n" msgstr "Nebyla nalezena žádná volba nastavení\n" -#: src/common/command.c:2491 +#: src/common/command.c:2545 #, c-format msgid "%sDetail:\n" msgstr "%sDetail:\n" -#: src/common/command.c:2496 src/common/weechat.c:302 +#: src/common/command.c:2550 src/common/weechat.c:302 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . typ boolean (hodnota: 'on' nebo 'off')\n" -#: src/common/command.c:2497 src/common/command.c:2520 -#: src/common/command.c:2526 src/common/command.c:2532 +#: src/common/command.c:2551 src/common/command.c:2574 +#: src/common/command.c:2580 src/common/command.c:2586 #: src/common/weechat.c:303 src/common/weechat.c:326 src/common/weechat.c:332 #: src/common/weechat.c:338 #, c-format msgid " . default value: '%s'\n" msgstr " . výchozí hodnota: '%s'\n" -#: src/common/command.c:2502 src/common/weechat.c:308 +#: src/common/command.c:2556 src/common/weechat.c:308 #, 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:2505 src/common/weechat.c:311 +#: src/common/command.c:2559 src/common/weechat.c:311 #, c-format msgid " . default value: %d\n" msgstr " . výchozí hodnota: %d\n" -#: src/common/command.c:2509 src/common/weechat.c:315 +#: src/common/command.c:2563 src/common/weechat.c:315 #, c-format msgid " . type string (values: " msgstr " . typ řetězec (hodnoty: " -#: src/common/command.c:2522 src/common/command.c:2528 -#: src/common/command.c:2534 src/common/weechat.c:328 src/common/weechat.c:334 +#: src/common/command.c:2576 src/common/command.c:2582 +#: src/common/command.c:2588 src/common/weechat.c:328 src/common/weechat.c:334 #: src/common/weechat.c:340 msgid "empty" msgstr "prázdný" -#: src/common/command.c:2525 src/common/weechat.c:331 +#: src/common/command.c:2579 src/common/weechat.c:331 #, c-format 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:2531 src/common/weechat.c:337 +#: src/common/command.c:2585 src/common/weechat.c:337 #, c-format msgid " . type string (any string)\n" msgstr " . typ řetězec (jakýkoliv řetězec)\n" -#: src/common/command.c:2537 src/common/weechat.c:343 +#: src/common/command.c:2591 src/common/weechat.c:343 #, c-format msgid " . description: %s\n" msgstr " . popis: %s\n" -#: src/common/command.c:2548 +#: src/common/command.c:2602 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "volba/volby nastavení nalezeny s \"%s\"\n" -#: src/common/command.c:2551 +#: src/common/command.c:2605 msgid "config option(s) found\n" msgstr "volba/volby nastavení nalezeny\n" -#: src/common/command.c:2572 +#: src/common/command.c:2626 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias nebo příkaz \"%s\" nenalezen\n" -#: src/common/command.c:2582 +#: src/common/command.c:2636 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" odebrán\n" -#: src/common/command.c:2638 +#: src/common/command.c:2692 msgid "ignore were removed.\n" msgstr "ignorování bylo odebráno.\n" -#: src/common/command.c:2640 +#: src/common/command.c:2694 msgid "ignore was removed.\n" msgstr "ignorování bylo odebrán\n" -#: src/common/command.c:2645 +#: src/common/command.c:2699 #, c-format msgid "%s no ignore found\n" msgstr "%s žádné ignorování nenaleyeno\n" -#: src/common/command.c:2675 +#: src/common/command.c:2729 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "" -#: src/common/command.c:2692 +#: src/common/command.c:2746 #, 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:2732 +#: src/common/command.c:2786 msgid "Opened windows:\n" msgstr "Otevřené okna:\n" +#: src/common/command.c:2861 +#, c-format +msgid "" +"%s can not merge windows, there's no other window with same size near " +"current one.\n" +msgstr "" + #: src/common/fifo.c:71 src/common/fifo.c:73 #, c-format msgid "%s unable to create FIFO pipe for remote control (%s)\n" @@ -4629,5 +4639,8 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Ukládám konfiguraci na disk\n" +#~ msgid "dump" +#~ msgstr "dump" + #~ msgid "%s unable to call handler for message (not enough memory)\n" #~ msgstr "%s nemohu zavolat handler pro zprávu (neodstatek paměti)\n" diff --git a/weechat/po/es.po b/weechat/po/es.po index 1e4a150c1..8f0aff2f3 100644 --- a/weechat/po/es.po +++ b/weechat/po/es.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-11 10:15+0100\n" -"PO-Revision-Date: 2005-11-11 17:02+0100\n" +"POT-Creation-Date: 2005-11-13 16:40+0100\n" +"PO-Revision-Date: 2005-11-13 16:43+0100\n" "Last-Translator: Roberto Gonzlez Cardenete <robert.glez@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -41,9 +41,9 @@ msgid "%s not enough memory for received IRC message\n" msgstr "%s memoria insuficiente para un mensaje IRC recibido\n" #: src/irc/irc-server.c:675 -#, fuzzy, c-format +#, c-format msgid "%s Command \"%s\" failed!\n" -msgstr "%s el comando \"%s\" ha fallado\n" +msgstr "" #: src/irc/irc-server.c:681 #, c-format @@ -1400,7 +1400,7 @@ msgstr "desconocido" msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilizacin del nombre de mquina local \"%s\"\n" -#: src/irc/irc-send.c:175 src/common/command.c:783 +#: src/irc/irc-send.c:175 src/common/command.c:787 #, 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" @@ -1417,8 +1417,8 @@ msgstr "" #: src/irc/irc-send.c:472 src/irc/irc-send.c:484 src/irc/irc-send.c:502 #: src/irc/irc-send.c:1166 src/irc/irc-send.c:1264 src/irc/irc-send.c:1796 -#: src/common/command.c:1310 src/common/command.c:1749 -#: src/common/command.c:1885 +#: src/common/command.c:1353 src/common/command.c:1798 +#: src/common/command.c:1934 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nmero de argumentos incorrecto para el comando \"%s\"\n" @@ -1452,9 +1452,9 @@ msgid "%s, compiled on %s %s\n" msgstr "%s, compilado en %s %s\n" #: src/irc/irc-recv.c:362 -#, fuzzy, c-format +#, c-format msgid "You have been invited to %s%s%s by %s%s\n" -msgstr "Has sido invitado a " +msgstr "" #: src/irc/irc-recv.c:376 src/irc/irc-recv.c:469 src/irc/irc-recv.c:1008 #: src/irc/irc-recv.c:1386 src/irc/irc-recv.c:1645 src/irc/irc-recv.c:3522 @@ -1474,9 +1474,9 @@ msgid "%s%s %s(%s%s%s)%s has joined %s%s\n" msgstr "" #: src/irc/irc-recv.c:477 -#, fuzzy, c-format +#, c-format msgid "%s%s%s has kicked %s%s%s from %s%s" -msgstr "ha cambiado el tema por " +msgstr "" #: src/irc/irc-recv.c:562 #, c-format @@ -1625,14 +1625,14 @@ msgid "%s[%s%s%s/%s%s%s]%s mode changed by %s%s\n" msgstr "" #: src/irc/irc-recv.c:1088 -#, fuzzy, c-format +#, c-format msgid "You are now known as %s%s\n" -msgstr "ahora conocido como" +msgstr "" #: src/irc/irc-recv.c:1092 -#, fuzzy, c-format +#, c-format msgid "%s%s%s is now known as %s%s\n" -msgstr "ahora conocido como" +msgstr "" #: src/irc/irc-recv.c:1159 #, c-format @@ -1670,19 +1670,19 @@ msgid "On %s: * %s %s" msgstr "En %s: * %s %s" #: src/irc/irc-recv.c:1538 -#, fuzzy, c-format +#, c-format msgid "Received a CTCP %sSOUND%s \"%s\" from %s%s\n" -msgstr "Recibido un sonido CTCP \\\"%s\\\" de " +msgstr "" #: src/irc/irc-recv.c:1568 src/irc/irc-recv.c:1739 -#, fuzzy, c-format +#, c-format msgid "CTCP %sPING%s received from %s%s\n" -msgstr " recibido de " +msgstr "" #: src/irc/irc-recv.c:1597 src/irc/irc-recv.c:2104 -#, fuzzy, c-format +#, c-format msgid "Unknown CTCP %s%s%s received from %s%s" -msgstr "%s tipo DCC CHAT desconocido recibido de " +msgstr "" #: src/irc/irc-recv.c:1629 #, c-format @@ -1690,9 +1690,9 @@ msgid "On %s: %s> %s" msgstr "En %s: %s> %s" #: src/irc/irc-recv.c:1700 -#, fuzzy, c-format +#, c-format msgid "CTCP %sVERSION%s received from %s%s" -msgstr " recibido de " +msgstr "" #: src/irc/irc-recv.c:1757 src/irc/irc-recv.c:1778 src/irc/irc-recv.c:1794 #: src/irc/irc-recv.c:1810 src/irc/irc-recv.c:1836 src/irc/irc-recv.c:1857 @@ -1724,14 +1724,14 @@ msgid "%s \"%s\" command received without channel\n" msgstr "%s comando \"%s\" recibido sin canal\n" #: src/irc/irc-recv.c:2383 -#, fuzzy, c-format +#, c-format msgid "%s%s%s has changed topic for %s%s%s to:" -msgstr "ha cambiado el tema por " +msgstr "" #: src/irc/irc-recv.c:2394 -#, fuzzy, c-format +#, c-format msgid "%s%s%s has unset topic for %s%s\n" -msgstr " ha quitado el tema por " +msgstr "" #: src/irc/irc-recv.c:2504 #, c-format @@ -1739,9 +1739,9 @@ msgid "User mode %s[%s%s%s/%s%s%s]\n" msgstr "" #: src/irc/irc-recv.c:2559 -#, fuzzy, c-format +#, c-format msgid "%s%s%s is away: %s\n" -msgstr " est ausente: %s\n" +msgstr "" #: src/irc/irc-recv.c:2644 msgid "Users online: " @@ -1757,11 +1757,11 @@ msgstr "" msgid "%s[%s%s%s]%s idle: " msgstr "" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "days" msgstr "das" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "day" msgstr "da" @@ -1795,9 +1795,9 @@ msgid "second" msgstr "segundo" #: src/irc/irc-recv.c:3534 -#, fuzzy, c-format +#, c-format msgid "No topic set for %s%s\n" -msgstr "No hay tema definido para " +msgstr "" #: src/irc/irc-recv.c:3590 #, c-format @@ -1810,9 +1810,9 @@ msgid "%s cannot identify channel for \"%s\" command\n" msgstr "%s no es posible identificar el canal para el comando \"%s\"\n" #: src/irc/irc-recv.c:3663 -#, fuzzy, c-format +#, c-format msgid "Topic set by %s%s%s, %s" -msgstr "Tema definido por " +msgstr "" #: src/irc/irc-recv.c:3683 #, c-format @@ -1826,9 +1826,9 @@ msgstr "" "%s no es posible determinar el nombre de usuario para el comando \"%s\"\n" #: src/irc/irc-recv.c:3741 -#, fuzzy, c-format +#, c-format msgid "%s%s%s has invited %s%s%s on %s%s\n" -msgstr "ha cambiado el tema por " +msgstr "" #: src/irc/irc-recv.c:3801 #, c-format @@ -2030,14 +2030,14 @@ msgid "" msgstr "" #: src/irc/irc-dcc.c:716 -#, fuzzy, c-format +#, c-format msgid "Incoming DCC chat request from %s%s%s (%s%d.%d.%d.%d%s)\n" -msgstr "Recibir DCC chat de " +msgstr "" #: src/irc/irc-dcc.c:733 -#, fuzzy, c-format +#, c-format msgid "Sending DCC chat request to %s%s\n" -msgstr "Enviar DCC chat a " +msgstr "" #: src/irc/irc-dcc.c:751 #, c-format @@ -2243,64 +2243,64 @@ msgstr "" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "bytes" msgstr "bytes" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Kb" msgstr "KB" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Mb" msgstr "MB" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Gb" msgstr "GB" -#: src/gui/curses/gui-display.c:1921 +#: src/gui/curses/gui-display.c:1926 msgid "<servers>" msgstr "<servidores>" -#: src/gui/curses/gui-display.c:1933 +#: src/gui/curses/gui-display.c:1938 msgid "(away)" msgstr "(ausente)" -#: src/gui/curses/gui-display.c:2067 +#: src/gui/curses/gui-display.c:2072 msgid "[not connected] " msgstr "[no conectado] " -#: src/gui/curses/gui-display.c:2077 +#: src/gui/curses/gui-display.c:2082 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2165 +#: src/gui/curses/gui-display.c:2170 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2181 +#: src/gui/curses/gui-display.c:2186 msgid "-MORE-" msgstr "-MS-" -#: src/gui/curses/gui-display.c:2359 +#: src/gui/curses/gui-display.c:2364 msgid " [A] Accept" msgstr " [A] Aceptar" -#: src/gui/curses/gui-display.c:2360 src/gui/curses/gui-display.c:2364 +#: src/gui/curses/gui-display.c:2365 src/gui/curses/gui-display.c:2369 msgid " [C] Cancel" msgstr " [C] Cancelar" -#: src/gui/curses/gui-display.c:2369 +#: src/gui/curses/gui-display.c:2374 msgid " [R] Remove" msgstr " [R] Eliminar" -#: src/gui/curses/gui-display.c:2373 +#: src/gui/curses/gui-display.c:2378 msgid " [P] Purge old DCC" msgstr " [P] Purgar los viejos DCC" -#: src/gui/curses/gui-display.c:2374 +#: src/gui/curses/gui-display.c:2379 msgid " [Q] Close DCC view" msgstr " [Q] Cerrar la vista DCC" @@ -2308,11 +2308,11 @@ msgstr " [Q] Cerrar la vista DCC" msgid "server" msgstr "servidor" -#: src/gui/gui-common.c:509 +#: src/gui/gui-common.c:637 msgid "Not enough memory for new line\n" msgstr "No hay suficiente memoria para una nueva lnea\n" -#: src/gui/gui-common.c:854 +#: src/gui/gui-common.c:982 msgid "Not enough memory for infobar message\n" msgstr "No hay suficiente memoria para el mensaje de la barra de informacin\n" @@ -2464,7 +2464,7 @@ msgstr "recargar la pantalla" msgid "grab a key" msgstr "" -#: src/gui/gui-keyboard.c:428 src/common/command.c:1764 +#: src/gui/gui-keyboard.c:428 src/common/command.c:1813 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s No ha sido posible atar la clave \"%s\"\n" @@ -2564,38 +2564,37 @@ msgid "print debug messages" msgstr "imprime mensajes de depuracin" #: src/common/command.c:69 -msgid "dump" -msgstr "dump" +msgid "dump | windows" +msgstr "dump | windows" #: src/common/command.c:70 msgid "" "dump: save memory dump in WeeChat log file (same dump is written when " -"WeeChat crashes)" +"WeeChat crashes)\n" +"windows: display windows tree" msgstr "" -"volcado: almacena un volcado de memoria en el archivo de registro de Weechat " -"(se escribe el mismo volcado cuando Weechat se cuelga)" -#: src/common/command.c:72 +#: src/common/command.c:73 msgid "display help about commands" msgstr "mostrar ayuda sobre los comandos" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "[command]" msgstr "[comando]" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "command: name of a WeeChat or IRC command" msgstr "comando: nombre de un comando de Weechat de IRC" -#: src/common/command.c:75 +#: src/common/command.c:76 msgid "ignore IRC messages and/or hosts" msgstr "" -#: src/common/command.c:76 +#: src/common/command.c:77 msgid "[mask [[type | command] [channel [server]]]]" msgstr "" -#: src/common/command.c:77 +#: src/common/command.c:78 msgid "" " mask: nick or host mask to ignore\n" " type: type of message to ignore (action, ctcp, dcc, pv)\n" @@ -2607,15 +2606,15 @@ msgid "" "Without argument, /ignore command lists all defined ignore." msgstr "" -#: src/common/command.c:85 +#: src/common/command.c:86 msgid "bind/unbind keys" msgstr "atar/desatar claves" -#: src/common/command.c:86 +#: src/common/command.c:87 msgid "[key function/command] [unbind key] [functions] [reset -yes]" msgstr "[clave funcin/comando] [desatar clave] [funciones] [reset -yes]" -#: src/common/command.c:87 +#: src/common/command.c:88 msgid "" "key: bind this key to an internal function or a command (beginning by \"/" "\")\n" @@ -2632,26 +2631,26 @@ msgstr "" "reset: restaura anclajes a los valores por defecto y elimina todos los " "anclajes personales (usar cuidadosamente)" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "list/load/unload plugins" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "[load fichero] | [autoload] | [reload] | [unload]" -#: src/common/command.c:94 +#: src/common/command.c:95 msgid "" "filename: WeeChat plugin (file) to load\n" "\n" "Without argument, /plugin command lists all loaded plugins." msgstr "" -#: src/common/command.c:97 +#: src/common/command.c:98 msgid "list, add or remove servers" msgstr "lista, aade o elimina servidores" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "" "[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname " @@ -2663,7 +2662,7 @@ msgstr "" "username nombre de usuario] [-realname nombre_real] [-command comando] [-" "autojoin canal[,canal]] ] | [del nombre_de_servidor]" -#: src/common/command.c:103 +#: src/common/command.c:104 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -2689,54 +2688,54 @@ msgstr "" "nombre_de_usuario: nombre de usuario\n" "nombre_real: nombre real del usuario" -#: src/common/command.c:115 +#: src/common/command.c:116 msgid "save config to disk" msgstr "guardar configuracin a disco" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "[file]" msgstr "[archivo]" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "file: filename for writing config" msgstr "archivo: fichero en el que guardar la configuracin" -#: src/common/command.c:118 +#: src/common/command.c:119 msgid "set config parameters" msgstr "modificar parmetros de configuracin" -#: src/common/command.c:119 +#: src/common/command.c:120 msgid "[option [ = value]]" msgstr "[opcin [ = valor]]" -#: src/common/command.c:120 +#: src/common/command.c:121 msgid "" "option: name of an option (if name is full and no value is given, then help " "is displayed on option)\n" "value: value for option" msgstr "" -#: src/common/command.c:124 +#: src/common/command.c:125 msgid "remove an alias" msgstr "eliminar un alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name" msgstr "alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name: name of alias to remove" msgstr "alias: nombre del alias a suprimir" -#: src/common/command.c:127 +#: src/common/command.c:128 msgid "unignore IRC messages and/or hosts" msgstr "" -#: src/common/command.c:128 +#: src/common/command.c:129 msgid "[number | [mask [[type | command] [channel [server]]]]]" msgstr "" -#: src/common/command.c:129 +#: src/common/command.c:130 msgid "" " number: # of ignore to unignore (number is displayed by list of ignore)\n" " mask: nick or host mask to unignore\n" @@ -2749,31 +2748,27 @@ msgid "" "Without argument, /unignore command lists all defined ignore." msgstr "" -#: src/common/command.c:138 +#: src/common/command.c:139 msgid "show WeeChat uptime" msgstr "" -#: src/common/command.c:139 +#: src/common/command.c:140 msgid "-o" msgstr "" -#: src/common/command.c:140 +#: src/common/command.c:141 msgid "-o: send uptime on current channel as an IRC message" msgstr "" -#: src/common/command.c:142 +#: src/common/command.c:143 msgid "manage windows" msgstr "gestin de ventanas" -#: src/common/command.c:143 -msgid "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" -msgstr "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" - #: src/common/command.c:144 +msgid "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" +msgstr "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" + +#: src/common/command.c:145 #, fuzzy msgid "" "list: list opened windows (no parameter implies this list)\n" @@ -2782,7 +2777,11 @@ msgid "" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" -"merge: merge window with another" +"merge: merge window with another (all = keep only one window)\n" +"\n" +"For splith and splitv, pct is a pourcentage which represents size of new " +"window, computed with current window as size reference. For example 25 means " +"create a new window with size = current_size / 4" msgstr "" "list: lista las ventanas abiertas (si no hay parmetros, significa esta " "lista)\n" @@ -2793,29 +2792,29 @@ msgstr "" "splitv: dividir la ventana actual verticalmente\n" "merge: fusionar una ventana con otra" -#: src/common/command.c:293 +#: src/common/command.c:297 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s el alias o el comando \"%s\" ya existe!\n" -#: src/common/command.c:303 +#: src/common/command.c:307 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s el alias no puede ejecutar otro alias!\n" -#: src/common/command.c:310 -#, fuzzy, c-format +#: src/common/command.c:314 +#, c-format msgid "%s target command \"/%s\" does not exist!\n" -msgstr "%s el comando objetivo \"%s\" no existe!\n" +msgstr "" -#: src/common/command.c:548 +#: src/common/command.c:552 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nmero de argumentos incorrecto para el comando %s \"%s\" (esperado: %d " "parmetro%s)\n" -#: src/common/command.c:560 +#: src/common/command.c:564 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2824,19 +2823,19 @@ msgstr "" "%s nmero de argumentos incorrecto para el comando %s \"%s\" (esperado: " "entre %d y %d parmetro%s)\n" -#: src/common/command.c:582 src/common/command.c:651 +#: src/common/command.c:586 src/common/command.c:655 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s el comando \"%s\" ha fallado\n" -#: src/common/command.c:607 +#: src/common/command.c:611 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nmero de argumentos incorrecto para el comando IRC \"%s\" (esperado: %d " "parmetro%s)\n" -#: src/common/command.c:619 +#: src/common/command.c:623 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2845,292 +2844,291 @@ msgstr "" "%s nmero de argumentos incorrecto para el comando IRC \"%s\" (esperado: " "entre %d y %d parmetro%s)\n" -#: src/common/command.c:634 +#: src/common/command.c:638 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s el comando \"%s\" requiere una conexin a servidor!\n" -#: src/common/command.c:694 +#: src/common/command.c:698 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s comando \"%s\" desconocido (escriba /help para la ayuda)\n" -#: src/common/command.c:828 +#: src/common/command.c:832 msgid "This window is not a channel!\n" msgstr "Esta ventana no es un canal!\n" -#: src/common/command.c:856 src/common/command.c:887 src/common/command.c:995 +#: src/common/command.c:860 src/common/command.c:891 src/common/command.c:999 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s faltan argumentos para el comando \"%s\"\n" -#: src/common/command.c:863 -#, fuzzy, c-format +#: src/common/command.c:867 +#, c-format msgid "%s alias can not start with \"/\"\n" -msgstr "%s el alias no puede ejecutar otro alias!\n" +msgstr "" -#: src/common/command.c:872 +#: src/common/command.c:876 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" creado\n" -#: src/common/command.c:878 +#: src/common/command.c:882 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "" "No ha sido posible crear el alias \"%s\" => \"%s\" (no hay suficiente " "memoria)\n" -#: src/common/command.c:898 +#: src/common/command.c:902 msgid "List of aliases:\n" msgstr "Lista de alias:\n" -#: src/common/command.c:912 +#: src/common/command.c:916 msgid "No alias defined.\n" msgstr "Ningn alias definido.\n" -#: src/common/command.c:929 +#: src/common/command.c:933 #, c-format msgid "%sServer: %s%s\n" msgstr "%sServidor: %s%s\n" -#: src/common/command.c:934 +#: src/common/command.c:938 #, c-format msgid "%sChannel: %s%s %s(server: %s%s%s)\n" msgstr "" -#: src/common/command.c:943 +#: src/common/command.c:947 #, c-format msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n" msgstr "" -#: src/common/command.c:952 +#: src/common/command.c:956 msgid "not connected\n" msgstr "no conectado\n" -#: src/common/command.c:974 +#: src/common/command.c:978 msgid "Opened buffers:\n" msgstr "Bfers abiertos:\n" -#: src/common/command.c:1018 +#: src/common/command.c:1022 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s nmero de bfer incorrecto\n" -#: src/common/command.c:1034 +#: src/common/command.c:1038 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s no es posible cerrar el nico bfer\n" -#: src/common/command.c:1044 +#: src/common/command.c:1048 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" "%s no se puede cerrar el bfer de servidor mientras haya canales abiertos\n" -#: src/common/command.c:1093 +#: src/common/command.c:1097 msgid "Notify levels: " msgstr "Niveles de notificacin: " -#: src/common/command.c:1122 src/common/command.c:1170 +#: src/common/command.c:1126 src/common/command.c:1174 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s nivel de notificacin incorrecto (debe estar entre %d y %d)\n" -#: src/common/command.c:1131 +#: src/common/command.c:1135 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "%s bfer incorrecto para notificar (debe ser canal o privado)\n" -#: src/common/command.c:1140 -#, fuzzy, c-format +#: src/common/command.c:1144 +#, c-format msgid "New notify level for %s%s%s: %s%d %s" -msgstr "Niveles de notificacin: " +msgstr "" -#: src/common/command.c:1150 -#, fuzzy +#: src/common/command.c:1154 msgid "(hotlist: never)\n" -msgstr "quin es (servidor)" +msgstr "" -#: src/common/command.c:1153 +#: src/common/command.c:1157 msgid "(hotlist: highlights)\n" msgstr "" -#: src/common/command.c:1156 +#: src/common/command.c:1160 msgid "(hotlist: highlights + messages)\n" msgstr "" -#: src/common/command.c:1159 +#: src/common/command.c:1163 msgid "(hotlist: highlights + messages + join/part (all))\n" msgstr "" -#: src/common/command.c:1237 +#: src/common/command.c:1241 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "parmetro desconocido \"%s\" para el comando \"%s\"\n" -#: src/common/command.c:1267 +#: src/common/command.c:1271 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s ya conectado al servidor \"%s\"!\n" -#: src/common/command.c:1275 +#: src/common/command.c:1279 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s actualmente conectando al servidor \"%s\"!\n" -#: src/common/command.c:1293 src/common/command.c:1368 +#: src/common/command.c:1297 src/common/command.c:1417 #, c-format msgid "%s server not found\n" msgstr "%s servidor no encontrado\n" -#: src/common/command.c:1323 src/common/command.c:1878 -#: src/common/command.c:2786 src/common/command.c:2810 +#: src/common/command.c:1372 src/common/command.c:1927 +#: src/common/command.c:2850 src/common/command.c:2885 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s opcin desconocida para el comando \"%s\"\n" -#: src/common/command.c:1352 +#: src/common/command.c:1401 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s no conectado al servidor \"%s\"!\n" -#: src/common/command.c:1360 +#: src/common/command.c:1409 msgid "Auto-reconnection is cancelled\n" msgstr "La reconexin automtica est anulada\n" -#: src/common/command.c:1391 src/common/weechat.c:365 +#: src/common/command.c:1440 src/common/weechat.c:365 #, c-format msgid "%s internal commands:\n" msgstr "Comandos internos %s :\n" -#: src/common/command.c:1401 src/common/weechat.c:385 +#: src/common/command.c:1450 src/common/weechat.c:385 #, c-format msgid "IRC commands:\n" msgstr "Comandos IRC :\n" -#: src/common/command.c:1415 +#: src/common/command.c:1464 msgid "Plugin commands:\n" msgstr "" -#: src/common/command.c:1531 +#: src/common/command.c:1580 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "No hay ayuda disponible, el comando \"%s\" es desconocido\n" -#: src/common/command.c:1550 -#, fuzzy, c-format +#: src/common/command.c:1599 +#, c-format msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n" -msgstr "ha cambiado el tema por " +msgstr "" -#: src/common/command.c:1584 +#: src/common/command.c:1633 msgid "List of ignore:\n" msgstr "" -#: src/common/command.c:1601 +#: src/common/command.c:1650 msgid "No ignore defined.\n" msgstr "" -#: src/common/command.c:1627 +#: src/common/command.c:1676 msgid "New ignore:" msgstr "" -#: src/common/command.c:1647 -#, fuzzy, c-format +#: src/common/command.c:1696 +#, c-format msgid "New key binding: %s" -msgstr "Nuevo anclaje de clave:\n" +msgstr "" -#: src/common/command.c:1681 +#: src/common/command.c:1730 msgid "Key bindings:\n" msgstr "Anclajes de clave:\n" -#: src/common/command.c:1695 +#: src/common/command.c:1744 #, c-format msgid "Key \"%s\" unbinded\n" msgstr "Clave \"%s\" desatada\n" -#: src/common/command.c:1701 +#: src/common/command.c:1750 #, c-format msgid "%s unable to unbind key \"%s\"\n" msgstr "%s No ha sido posible desatar la clave \"%s\"\n" -#: src/common/command.c:1709 src/common/weechat.c:416 +#: src/common/command.c:1758 src/common/weechat.c:416 #, c-format msgid "Internal key functions:\n" msgstr "Funciones de clave internas:\n" -#: src/common/command.c:1729 +#: src/common/command.c:1778 msgid "Default key bindings restored\n" msgstr "Anclajes de clave por defecto restaurados\n" -#: src/common/command.c:1735 +#: src/common/command.c:1784 #, c-format msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" "%s \"-yes\" se requiere argumento para resetear las claves (por razones de " "seguridad)\n" -#: src/common/command.c:1791 +#: src/common/command.c:1840 msgid "Plugins loaded:\n" msgstr "" -#: src/common/command.c:1807 +#: src/common/command.c:1856 msgid " message handlers:\n" msgstr "" -#: src/common/command.c:1816 +#: src/common/command.c:1865 #, c-format msgid " IRC(%s)\n" msgstr "" -#: src/common/command.c:1823 +#: src/common/command.c:1872 msgid " (no message handler)\n" msgstr "" -#: src/common/command.c:1828 +#: src/common/command.c:1877 msgid " command handlers:\n" msgstr "" -#: src/common/command.c:1849 +#: src/common/command.c:1898 msgid " (no command handler)\n" msgstr "" -#: src/common/command.c:1855 +#: src/common/command.c:1904 msgid " (no plugin)\n" msgstr "" -#: src/common/command.c:1891 +#: src/common/command.c:1940 msgid "" "Command \"plugin\" is not available, WeeChat was built without plugins " "support.\n" msgstr "" -#: src/common/command.c:1938 +#: src/common/command.c:1988 msgid "No server.\n" msgstr "Ningn servidor.\n" -#: src/common/command.c:1949 +#: src/common/command.c:1999 #, c-format msgid "Server '%s' not found.\n" msgstr "Servidor '%s' no encontrado.\n" -#: src/common/command.c:1961 +#: src/common/command.c:2011 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s falta el nombre de servidor para el comando \"%s\"\n" -#: src/common/command.c:1969 +#: src/common/command.c:2019 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" "%s demasiados argumentos para el comando \"%s\", ignorando parmetros\n" -#: src/common/command.c:1988 +#: src/common/command.c:2038 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s servidor \"%s\" no encontrado para el comando \"%s\"\n" -#: src/common/command.c:1996 +#: src/common/command.c:2046 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -3139,187 +3137,194 @@ msgstr "" "%s usted no puede eliminar el servidor \"%s\" ya que est usted conectado a " "l. Pruebe /disconnect %s antes.\n" -#: src/common/command.c:2014 -#, fuzzy, c-format +#: src/common/command.c:2066 +#, c-format msgid "Server %s%s%s has been deleted\n" -msgstr "ha sido eliminado\n" +msgstr "" -#: src/common/command.c:2031 +#: src/common/command.c:2085 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s faltan parmetros para el comando \"%s\"\n" -#: src/common/command.c:2041 +#: src/common/command.c:2095 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s el servidor \"%s\" ya existe, no se puede crear!\n" -#: src/common/command.c:2070 src/common/command.c:2098 -#: src/common/command.c:2111 src/common/command.c:2137 +#: src/common/command.c:2124 src/common/command.c:2152 +#: src/common/command.c:2165 src/common/command.c:2191 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s falta contrasea para el comando \"%s\"\n" -#: src/common/command.c:2083 +#: src/common/command.c:2137 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s falta(n) usuario(s) para el parmetro \"%s\"\n" -#: src/common/command.c:2124 +#: src/common/command.c:2178 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s falta comando para el parmetro \"%s\"\n" -#: src/common/command.c:2159 -#, fuzzy, c-format +#: src/common/command.c:2213 +#, c-format msgid "Server %s%s%s created\n" -msgstr "Servidor '%s' no encontrado.\n" +msgstr "" -#: src/common/command.c:2168 +#: src/common/command.c:2222 #, c-format msgid "%s unable to create server\n" msgstr "%s no es posible crear el servidor\n" -#: src/common/command.c:2227 +#: src/common/command.c:2281 msgid "(unknown)" msgstr "(desconocido)" -#: src/common/command.c:2250 -#, fuzzy, c-format +#: src/common/command.c:2304 +#, c-format msgid "%s(password hidden) " -msgstr "(contrasea oculta) " +msgstr "" -#: src/common/command.c:2317 +#: src/common/command.c:2371 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s servidor \"%s\" no encontrado\n" -#: src/common/command.c:2350 src/common/command.c:2398 +#: src/common/command.c:2404 src/common/command.c:2452 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s opcin de configuracin \"%s\" no encontrada\n" -#: src/common/command.c:2355 src/common/command.c:2390 +#: src/common/command.c:2409 src/common/command.c:2444 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valor incorrecto para la opcin \"%s\"\n" -#: src/common/command.c:2371 +#: src/common/command.c:2425 #, 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:2481 +#: src/common/command.c:2535 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Ninguna opcin de configuracin encontrada con \"%s\"\n" -#: src/common/command.c:2484 +#: src/common/command.c:2538 msgid "No config option found\n" msgstr "Ninguna opcin de configuracin encontrada\n" -#: src/common/command.c:2491 +#: src/common/command.c:2545 #, c-format msgid "%sDetail:\n" msgstr "" -#: src/common/command.c:2496 src/common/weechat.c:302 +#: src/common/command.c:2550 src/common/weechat.c:302 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . tipo booleano (valores: 'on' u 'off')\n" -#: src/common/command.c:2497 src/common/command.c:2520 -#: src/common/command.c:2526 src/common/command.c:2532 +#: src/common/command.c:2551 src/common/command.c:2574 +#: src/common/command.c:2580 src/common/command.c:2586 #: src/common/weechat.c:303 src/common/weechat.c:326 src/common/weechat.c:332 #: src/common/weechat.c:338 #, c-format msgid " . default value: '%s'\n" msgstr " . valor por defecto: '%s'\n" -#: src/common/command.c:2502 src/common/weechat.c:308 +#: src/common/command.c:2556 src/common/weechat.c:308 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . tipo entero (valores: entre %d y %d)\n" -#: src/common/command.c:2505 src/common/weechat.c:311 +#: src/common/command.c:2559 src/common/weechat.c:311 #, c-format msgid " . default value: %d\n" msgstr " . valor por defecto: %d\n" -#: src/common/command.c:2509 src/common/weechat.c:315 +#: src/common/command.c:2563 src/common/weechat.c:315 #, c-format msgid " . type string (values: " msgstr " . tipo cadena (valores: " -#: src/common/command.c:2522 src/common/command.c:2528 -#: src/common/command.c:2534 src/common/weechat.c:328 src/common/weechat.c:334 +#: src/common/command.c:2576 src/common/command.c:2582 +#: src/common/command.c:2588 src/common/weechat.c:328 src/common/weechat.c:334 #: src/common/weechat.c:340 msgid "empty" msgstr "vaco" -#: src/common/command.c:2525 src/common/weechat.c:331 +#: src/common/command.c:2579 src/common/weechat.c:331 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr " . tipo color (color Curses Gtk, ver la documentacin de WeeChat)\n" -#: src/common/command.c:2531 src/common/weechat.c:337 +#: src/common/command.c:2585 src/common/weechat.c:337 #, c-format msgid " . type string (any string)\n" msgstr " . tipo cadena (cualquier cadena)\n" -#: src/common/command.c:2537 src/common/weechat.c:343 +#: src/common/command.c:2591 src/common/weechat.c:343 #, c-format msgid " . description: %s\n" msgstr " . descripcin: %s\n" -#: src/common/command.c:2548 +#: src/common/command.c:2602 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "opcin/opciones de configuracin encontrada(s) con \"%s\"\n" -#: src/common/command.c:2551 +#: src/common/command.c:2605 msgid "config option(s) found\n" msgstr "opcin/opciones de configuracin encontrada(s)\n" -#: src/common/command.c:2572 +#: src/common/command.c:2626 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias o comando \"%s\" no encontrado\n" -#: src/common/command.c:2582 +#: src/common/command.c:2636 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" eliminado\n" -#: src/common/command.c:2638 +#: src/common/command.c:2692 msgid "ignore were removed.\n" msgstr "" -#: src/common/command.c:2640 +#: src/common/command.c:2694 msgid "ignore was removed.\n" msgstr "" -#: src/common/command.c:2645 +#: src/common/command.c:2699 #, c-format msgid "%s no ignore found\n" msgstr "" -#: src/common/command.c:2675 +#: src/common/command.c:2729 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "" -#: src/common/command.c:2692 +#: src/common/command.c:2746 #, 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:2732 +#: src/common/command.c:2786 msgid "Opened windows:\n" msgstr "Ventanas abiertas:\n" +#: src/common/command.c:2861 +#, c-format +msgid "" +"%s can not merge windows, there's no other window with same size near " +"current one.\n" +msgstr "" + #: src/common/fifo.c:71 src/common/fifo.c:73 #, c-format msgid "%s unable to create FIFO pipe for remote control (%s)\n" @@ -4127,9 +4132,8 @@ msgid "" msgstr "" #: src/common/weeconfig.c:692 src/common/weeconfig.c:694 -#, fuzzy msgid "when off, colors codes are ignored in incoming messages" -msgstr "quitar colores en los mensajes entrantes" +msgstr "" #: src/common/weeconfig.c:697 msgid "allow user to send colors" @@ -4594,6 +4598,9 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Guardar configuracin a disco\n" +#~ msgid "dump" +#~ msgstr "dump" + #~ msgid "%s unable to call handler for message (not enough memory)\n" #~ msgstr "" #~ "%s No ha sido posible llamar al manejador para el mensaje (no hay " diff --git a/weechat/po/fr.po b/weechat/po/fr.po index d3e58fbc9..6f5e8781d 100644 --- a/weechat/po/fr.po +++ b/weechat/po/fr.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.1.7-cvs\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2005-11-11 10:15+0100\n" -"PO-Revision-Date: 2005-11-11 17:02+0100\n" +"POT-Creation-Date: 2005-11-13 16:40+0100\n" +"PO-Revision-Date: 2005-11-13 16:41+0100\n" "Last-Translator: FlashCode <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "MIME-Version: 1.0\n" @@ -1402,7 +1402,7 @@ msgstr "inconnu" msgid "%s: using local hostname \"%s\"\n" msgstr "%s: utilisation du nom de machine local \"%s\"\n" -#: src/irc/irc-send.c:175 src/common/command.c:783 +#: src/irc/irc-send.c:175 src/common/command.c:787 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "%s impossible de trouver le pseudo pour envoyer le message\n" @@ -1420,8 +1420,8 @@ msgstr "" #: src/irc/irc-send.c:472 src/irc/irc-send.c:484 src/irc/irc-send.c:502 #: src/irc/irc-send.c:1166 src/irc/irc-send.c:1264 src/irc/irc-send.c:1796 -#: src/common/command.c:1310 src/common/command.c:1749 -#: src/common/command.c:1885 +#: src/common/command.c:1353 src/common/command.c:1798 +#: src/common/command.c:1934 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "%s nombre de paramtres erron pour la commande \"%s\"\n" @@ -1760,11 +1760,11 @@ msgstr "%s%s %s(%s%s@%s%s)%s tait %s\n" msgid "%s[%s%s%s]%s idle: " msgstr "%s[%s%s%s]%s inactivit: " -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "days" msgstr "jours" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "day" msgstr "jour" @@ -2277,64 +2277,64 @@ msgstr "Jour chang: %s\n" msgid "%s lag is high, disconnecting from server...\n" msgstr "%s le lag est lev, dconnexion du serveur...\n" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "bytes" msgstr "octets" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Kb" msgstr "Ko" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Mb" msgstr "Mo" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Gb" msgstr "Go" -#: src/gui/curses/gui-display.c:1921 +#: src/gui/curses/gui-display.c:1926 msgid "<servers>" msgstr "<serveurs>" -#: src/gui/curses/gui-display.c:1933 +#: src/gui/curses/gui-display.c:1938 msgid "(away)" msgstr "(absent)" -#: src/gui/curses/gui-display.c:2067 +#: src/gui/curses/gui-display.c:2072 msgid "[not connected] " msgstr "[non connect] " -#: src/gui/curses/gui-display.c:2077 +#: src/gui/curses/gui-display.c:2082 msgid "Act: " msgstr "Act: " -#: src/gui/curses/gui-display.c:2165 +#: src/gui/curses/gui-display.c:2170 #, c-format msgid "Lag: %.1f" msgstr "Lag: %.1f" -#: src/gui/curses/gui-display.c:2181 +#: src/gui/curses/gui-display.c:2186 msgid "-MORE-" msgstr "-PLUS-" -#: src/gui/curses/gui-display.c:2359 +#: src/gui/curses/gui-display.c:2364 msgid " [A] Accept" msgstr " [A] Accepter" -#: src/gui/curses/gui-display.c:2360 src/gui/curses/gui-display.c:2364 +#: src/gui/curses/gui-display.c:2365 src/gui/curses/gui-display.c:2369 msgid " [C] Cancel" msgstr " [C] Annuler" -#: src/gui/curses/gui-display.c:2369 +#: src/gui/curses/gui-display.c:2374 msgid " [R] Remove" msgstr " [R] Retirer" -#: src/gui/curses/gui-display.c:2373 +#: src/gui/curses/gui-display.c:2378 msgid " [P] Purge old DCC" msgstr " [P] Purger anciens DCC" -#: src/gui/curses/gui-display.c:2374 +#: src/gui/curses/gui-display.c:2379 msgid " [Q] Close DCC view" msgstr " [Q] Fermer la vue DCC" @@ -2342,11 +2342,11 @@ msgstr " [Q] Fermer la vue DCC" msgid "server" msgstr "serveur" -#: src/gui/gui-common.c:509 +#: src/gui/gui-common.c:637 msgid "Not enough memory for new line\n" msgstr "Pas assez de mmoire pour une nouvelle ligne !\n" -#: src/gui/gui-common.c:854 +#: src/gui/gui-common.c:982 msgid "Not enough memory for infobar message\n" msgstr "Pas assez de mmoire pour un message de la barre d'infos\n" @@ -2498,7 +2498,7 @@ msgstr "rafraichir l'cran" msgid "grab a key" msgstr "capturer une touche" -#: src/gui/gui-keyboard.c:428 src/common/command.c:1764 +#: src/gui/gui-keyboard.c:428 src/common/command.c:1813 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "%s impossible de crer la touche \"%s\"\n" @@ -2597,38 +2597,40 @@ msgid "print debug messages" msgstr "affiche des messages de debuggage" #: src/common/command.c:69 -msgid "dump" -msgstr "dump" +msgid "dump | windows" +msgstr "dump | windows" #: src/common/command.c:70 msgid "" "dump: save memory dump in WeeChat log file (same dump is written when " -"WeeChat crashes)" +"WeeChat crashes)\n" +"windows: display windows tree" msgstr "" "dump: affiche les variables mmoire WeeChat dans le fichier log (les mmes " -"messages sont affichs lorsque WeeChat plante)" +"messages sont affichs lorsque WeeChat plante)\n" +"windows: affiche l'arbre des fentres" -#: src/common/command.c:72 +#: src/common/command.c:73 msgid "display help about commands" msgstr "afficher l'aide sur les commandes" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "[command]" msgstr "[commande]" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "command: name of a WeeChat or IRC command" msgstr "commande: nom d'une commande WeeChat ou IRC" -#: src/common/command.c:75 +#: src/common/command.c:76 msgid "ignore IRC messages and/or hosts" msgstr "ignorer des messages IRC et/ou des masques" -#: src/common/command.c:76 +#: src/common/command.c:77 msgid "[mask [[type | command] [channel [server]]]]" msgstr "[masque [[type | commande] [canal [serveur]]]]" -#: src/common/command.c:77 +#: src/common/command.c:78 msgid "" " mask: nick or host mask to ignore\n" " type: type of message to ignore (action, ctcp, dcc, pv)\n" @@ -2648,15 +2650,15 @@ msgstr "" "Pour chaque paramtre, '*' signifie tou(te)s.\n" "Sans paramtre, la commande /ignore liste les ignore dfinis." -#: src/common/command.c:85 +#: src/common/command.c:86 msgid "bind/unbind keys" msgstr "associer/librer des touches" -#: src/common/command.c:86 +#: src/common/command.c:87 msgid "[key function/command] [unbind key] [functions] [reset -yes]" msgstr "[touche fonction/commande] [unbind touche] [functions] [reset -yes]" -#: src/common/command.c:87 +#: src/common/command.c:88 msgid "" "key: bind this key to an internal function or a command (beginning by \"/" "\")\n" @@ -2674,15 +2676,15 @@ msgstr "" "reset: restaur les touches aux valeurs par dfaut et supprime TOUTES les " "touches personnelles (utiliser avec prcaution !)" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "list/load/unload plugins" msgstr "liste/charge/dcharge des extensions" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "[load fichier] | [autoload] | [reload] | [unload]" -#: src/common/command.c:94 +#: src/common/command.c:95 msgid "" "filename: WeeChat plugin (file) to load\n" "\n" @@ -2692,11 +2694,11 @@ msgstr "" "\n" "Sans paramtre, la commande /plugin liste toutes les extensions charges." -#: src/common/command.c:97 +#: src/common/command.c:98 msgid "list, add or remove servers" msgstr "liste, ajoute ou retire des serveurs" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "" "[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname " @@ -2708,7 +2710,7 @@ msgstr "" "nom_utilisateur] [-realname nom_rel] [-command commande] [-autojoin canal[," "canal]] ] | [del nom_serveur]" -#: src/common/command.c:103 +#: src/common/command.c:104 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -2734,27 +2736,27 @@ msgstr "" "nom_utilisateur: nom d'utilisateur\n" "nom_rel: nom rel de l'utilisateur" -#: src/common/command.c:115 +#: src/common/command.c:116 msgid "save config to disk" msgstr "sauvegarder la configuration sur disque" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "[file]" msgstr "[fichier]" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "file: filename for writing config" msgstr "fichier: fichier pour sauvegarder la configuration" -#: src/common/command.c:118 +#: src/common/command.c:119 msgid "set config parameters" msgstr "modifier des paramtres de configuration" -#: src/common/command.c:119 +#: src/common/command.c:120 msgid "[option [ = value]]" msgstr "[option [ = valeur]]" -#: src/common/command.c:120 +#: src/common/command.c:121 msgid "" "option: name of an option (if name is full and no value is given, then help " "is displayed on option)\n" @@ -2764,27 +2766,27 @@ msgstr "" "donne, alors l'aide sur l'option est affiche)\n" "valeur: valeur pour l'option" -#: src/common/command.c:124 +#: src/common/command.c:125 msgid "remove an alias" msgstr "supprimer un alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name" msgstr "nom_alias" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name: name of alias to remove" msgstr "nom_alias: nom de l'alias supprimer" -#: src/common/command.c:127 +#: src/common/command.c:128 msgid "unignore IRC messages and/or hosts" msgstr "supprimer le ignore des messages IRC et/ou des masques" -#: src/common/command.c:128 +#: src/common/command.c:129 msgid "[number | [mask [[type | command] [channel [server]]]]]" msgstr "[nombre | [masque [[type | commande] [canal [serveur]]]]]" -#: src/common/command.c:129 +#: src/common/command.c:130 msgid "" " number: # of ignore to unignore (number is displayed by list of ignore)\n" " mask: nick or host mask to unignore\n" @@ -2807,31 +2809,27 @@ msgstr "" "Pour chaque paramtre, '*' signifie tou(te)s.\n" "Sans paramtre, /ignore liste les ignore dfinis." -#: src/common/command.c:138 +#: src/common/command.c:139 msgid "show WeeChat uptime" msgstr "montrer l'uptime de WeeChat" -#: src/common/command.c:139 +#: src/common/command.c:140 msgid "-o" msgstr "-o" -#: src/common/command.c:140 +#: src/common/command.c:141 msgid "-o: send uptime on current channel as an IRC message" msgstr "-o: envoyer l'uptime sur le canal courant en tant que message IRC" -#: src/common/command.c:142 +#: src/common/command.c:143 msgid "manage windows" msgstr "gestion des fentres" -#: src/common/command.c:143 -msgid "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" -msgstr "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" - #: src/common/command.c:144 +msgid "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" +msgstr "[list | -1 | +1 | b# | splith [pct] | splitv [ptc] | [merge [all]]]" + +#: src/common/command.c:145 msgid "" "list: list opened windows (no parameter implies this list)\n" "-1: jump to previous window\n" @@ -2839,7 +2837,11 @@ msgid "" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" -"merge: merge window with another" +"merge: merge window with another (all = keep only one window)\n" +"\n" +"For splith and splitv, pct is a pourcentage which represents size of new " +"window, computed with current window as size reference. For example 25 means " +"create a new window with size = current_size / 4" msgstr "" "list: liste les fentres ouvertes (pas de paramtre affiche cette liste)\n" "-1: saute la fentre prcdente\n" @@ -2847,31 +2849,36 @@ msgstr "" "b#: saute la fentre affichant le tampon n#\n" "splith: clate la fentre en deux horizontalement\n" "splitv: clate la fentre en deux verticalement\n" -"merge: fusionne la fentre avec une autre" +"merge: fusionne la fentre avec une autre\n" +"\n" +"Pour splith et splitv, pct est un pourcentage qui reprsente la taille de la " +"nouvelle fentre, calcule par rapport la taille de la fentre courante. " +"Par exemple 25 signifie crer une fentre qui a pour taille: " +"taille_courante / 4" -#: src/common/command.c:293 +#: src/common/command.c:297 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "%s l'alias ou la commande \"%s\" existe dj !\n" -#: src/common/command.c:303 +#: src/common/command.c:307 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "%s l'alias ne peut pas lancer un autre alias !\n" -#: src/common/command.c:310 +#: src/common/command.c:314 #, c-format msgid "%s target command \"/%s\" does not exist!\n" msgstr "%s la commande cible \"/%s\" n'existe pas !\n" -#: src/common/command.c:548 +#: src/common/command.c:552 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nombre de paramtres incorrect pour la commande %s \"%s\" (attendu: %d " "paramtre%s)\n" -#: src/common/command.c:560 +#: src/common/command.c:564 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " @@ -2880,19 +2887,19 @@ msgstr "" "%s nombre de paramtres incorrect pour la commande %s \"%s\" (attendu: entre " "%d et %d paramtre%s)\n" -#: src/common/command.c:582 src/common/command.c:651 +#: src/common/command.c:586 src/common/command.c:655 #, c-format msgid "%s command \"%s\" failed\n" msgstr "%s la commande \"%s\" a chou\n" -#: src/common/command.c:607 +#: src/common/command.c:611 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" "%s nombre de paramtres incorrect pour la commande IRC \"%s\" (attendu: %d " "paramtre%s)\n" -#: src/common/command.c:619 +#: src/common/command.c:623 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " @@ -2901,260 +2908,260 @@ msgstr "" "%s nombre de paramtres incorrect pour la commande IRC \"%s\" (attendu: " "entre %d et %d paramtre%s)\n" -#: src/common/command.c:634 +#: src/common/command.c:638 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "%s la commande \"%s\" ncessite une connexion au serveur !\n" -#: src/common/command.c:694 +#: src/common/command.c:698 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "%s commande \"%s\" inconnue (tapez /help pour l'aide)\n" -#: src/common/command.c:828 +#: src/common/command.c:832 msgid "This window is not a channel!\n" msgstr "Cette fentre n'est pas un canal !\n" -#: src/common/command.c:856 src/common/command.c:887 src/common/command.c:995 +#: src/common/command.c:860 src/common/command.c:891 src/common/command.c:999 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "%s paramtres manquants pour la commande \"%s\"\n" -#: src/common/command.c:863 +#: src/common/command.c:867 #, c-format msgid "%s alias can not start with \"/\"\n" msgstr "%s l'alias ne peut pas commencer par \"/\"\n" -#: src/common/command.c:872 +#: src/common/command.c:876 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "Alias \"%s\" => \"%s\" cr\n" -#: src/common/command.c:878 +#: src/common/command.c:882 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "Impossible de crer l'alias \"%s\" => \"%s\" (pas assez de mmoire)\n" -#: src/common/command.c:898 +#: src/common/command.c:902 msgid "List of aliases:\n" msgstr "Liste des alias:\n" -#: src/common/command.c:912 +#: src/common/command.c:916 msgid "No alias defined.\n" msgstr "Aucun alias dfini.\n" -#: src/common/command.c:929 +#: src/common/command.c:933 #, c-format msgid "%sServer: %s%s\n" msgstr "%sServeur: %s%s\n" -#: src/common/command.c:934 +#: src/common/command.c:938 #, c-format msgid "%sChannel: %s%s %s(server: %s%s%s)\n" msgstr "%sCanal: %s%s %s(serveur: %s%s%s)\n" -#: src/common/command.c:943 +#: src/common/command.c:947 #, c-format msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n" msgstr "%sPriv avec: %s%s %s(serveur: %s%s%s)\n" -#: src/common/command.c:952 +#: src/common/command.c:956 msgid "not connected\n" msgstr "non connect\n" -#: src/common/command.c:974 +#: src/common/command.c:978 msgid "Opened buffers:\n" msgstr "Tampons ouverts:\n" -#: src/common/command.c:1018 +#: src/common/command.c:1022 #, c-format msgid "%s incorrect buffer number\n" msgstr "%s numro de buffer incorrect\n" -#: src/common/command.c:1034 +#: src/common/command.c:1038 #, c-format msgid "%s can not close the single buffer\n" msgstr "%s impossible de fermer le tampon unique\n" -#: src/common/command.c:1044 +#: src/common/command.c:1048 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" "%s impossible de fermer le tampon du serveur tant que des canaux sont " "ouverts\n" -#: src/common/command.c:1093 +#: src/common/command.c:1097 msgid "Notify levels: " msgstr "Niveaux de notification: " -#: src/common/command.c:1122 src/common/command.c:1170 +#: src/common/command.c:1126 src/common/command.c:1174 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "%s niveau de notification incorrect (doit tre entre %d et %d)\n" -#: src/common/command.c:1131 +#: src/common/command.c:1135 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" "%s tampon incorrect pour la notification (doit tre un canal ou un priv)\n" -#: src/common/command.c:1140 +#: src/common/command.c:1144 #, c-format msgid "New notify level for %s%s%s: %s%d %s" msgstr "Nouveau niveau de notification pour %s%s%s: %s%d %s" -#: src/common/command.c:1150 +#: src/common/command.c:1154 msgid "(hotlist: never)\n" msgstr "(hotlist: jamais)\n" -#: src/common/command.c:1153 +#: src/common/command.c:1157 msgid "(hotlist: highlights)\n" msgstr "(hotlist: highlights)\n" -#: src/common/command.c:1156 +#: src/common/command.c:1160 msgid "(hotlist: highlights + messages)\n" msgstr "(hotlist: highlights + messages)\n" -#: src/common/command.c:1159 +#: src/common/command.c:1163 msgid "(hotlist: highlights + messages + join/part (all))\n" msgstr "(hotlist: highlights + messages + join/part (tous))\n" -#: src/common/command.c:1237 +#: src/common/command.c:1241 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "paramtre inconnu \"%s\" pour la commande \"%s\"\n" -#: src/common/command.c:1267 +#: src/common/command.c:1271 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "%s dj connect au serveur \"%s\" !\n" -#: src/common/command.c:1275 +#: src/common/command.c:1279 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "%s une connexion vers le serveur \"%s\" est en cours !\n" -#: src/common/command.c:1293 src/common/command.c:1368 +#: src/common/command.c:1297 src/common/command.c:1417 #, c-format msgid "%s server not found\n" msgstr "%s serveur non trouv\n" -#: src/common/command.c:1323 src/common/command.c:1878 -#: src/common/command.c:2786 src/common/command.c:2810 +#: src/common/command.c:1372 src/common/command.c:1927 +#: src/common/command.c:2850 src/common/command.c:2885 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "%s option inconnue pour la commande \"%s\"\n" -#: src/common/command.c:1352 +#: src/common/command.c:1401 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "%s non connect au serveur \"%s\" !\n" -#: src/common/command.c:1360 +#: src/common/command.c:1409 msgid "Auto-reconnection is cancelled\n" msgstr "La reconnexion automatique est annule\n" -#: src/common/command.c:1391 src/common/weechat.c:365 +#: src/common/command.c:1440 src/common/weechat.c:365 #, c-format msgid "%s internal commands:\n" msgstr "Commandes internes %s :\n" -#: src/common/command.c:1401 src/common/weechat.c:385 +#: src/common/command.c:1450 src/common/weechat.c:385 #, c-format msgid "IRC commands:\n" msgstr "Commandes IRC :\n" -#: src/common/command.c:1415 +#: src/common/command.c:1464 msgid "Plugin commands:\n" msgstr "Commandes d'extension :\n" -#: src/common/command.c:1531 +#: src/common/command.c:1580 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "Pas d'aide disponible, la commande \"%s\" est inconnue\n" -#: src/common/command.c:1550 +#: src/common/command.c:1599 #, c-format msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n" msgstr "%ssur %s%s%s/%s%s%s:%s ignore %s%s%s de %s%s\n" -#: src/common/command.c:1584 +#: src/common/command.c:1633 msgid "List of ignore:\n" msgstr "Liste des ignore:\n" -#: src/common/command.c:1601 +#: src/common/command.c:1650 msgid "No ignore defined.\n" msgstr "Aucun ignore dfini.\n" -#: src/common/command.c:1627 +#: src/common/command.c:1676 msgid "New ignore:" msgstr "Nouveau ignore:" -#: src/common/command.c:1647 +#: src/common/command.c:1696 #, c-format msgid "New key binding: %s" msgstr "Nouvelle touche: %s" -#: src/common/command.c:1681 +#: src/common/command.c:1730 msgid "Key bindings:\n" msgstr "Associations de touches:\n" -#: src/common/command.c:1695 +#: src/common/command.c:1744 #, c-format msgid "Key \"%s\" unbinded\n" msgstr "Touche \"%s\" supprime\n" -#: src/common/command.c:1701 +#: src/common/command.c:1750 #, c-format msgid "%s unable to unbind key \"%s\"\n" msgstr "%s impossible de supprimer la touche \"%s\"\n" -#: src/common/command.c:1709 src/common/weechat.c:416 +#: src/common/command.c:1758 src/common/weechat.c:416 #, c-format msgid "Internal key functions:\n" msgstr "Fonctions internes pour les touches:\n" -#: src/common/command.c:1729 +#: src/common/command.c:1778 msgid "Default key bindings restored\n" msgstr "Touches par dfaut restaures\n" -#: src/common/command.c:1735 +#: src/common/command.c:1784 #, c-format msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" "%s le paramtre \"-yes\" est requis pour la rinitialisation des touches " "(raison de scurit)\n" -#: src/common/command.c:1791 +#: src/common/command.c:1840 msgid "Plugins loaded:\n" msgstr "Extensions charges :\n" -#: src/common/command.c:1807 +#: src/common/command.c:1856 msgid " message handlers:\n" msgstr " fonctions de message :\n" -#: src/common/command.c:1816 +#: src/common/command.c:1865 #, c-format msgid " IRC(%s)\n" msgstr " IRC(%s)\n" -#: src/common/command.c:1823 +#: src/common/command.c:1872 msgid " (no message handler)\n" msgstr " (aucunne fonction de message)\n" -#: src/common/command.c:1828 +#: src/common/command.c:1877 msgid " command handlers:\n" msgstr " commandes :\n" -#: src/common/command.c:1849 +#: src/common/command.c:1898 msgid " (no command handler)\n" msgstr " (aucune commande)\n" -#: src/common/command.c:1855 +#: src/common/command.c:1904 msgid " (no plugin)\n" msgstr " (aucune extension)\n" -#: src/common/command.c:1891 +#: src/common/command.c:1940 msgid "" "Command \"plugin\" is not available, WeeChat was built without plugins " "support.\n" @@ -3162,31 +3169,31 @@ msgstr "" "La commande \"plugin\" n'est pas disponible, WeeChat a t compil sans le " "support des extensions.\n" -#: src/common/command.c:1938 +#: src/common/command.c:1988 msgid "No server.\n" msgstr "Pas de serveur.\n" -#: src/common/command.c:1949 +#: src/common/command.c:1999 #, c-format msgid "Server '%s' not found.\n" msgstr "Serveur '%s' non trouv.\n" -#: src/common/command.c:1961 +#: src/common/command.c:2011 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "%s il manque le nom du serveur pour la commande \"%s\"\n" -#: src/common/command.c:1969 +#: src/common/command.c:2019 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "%s trop de paramtres pour la commande \"%s\", paramtres ignors\n" -#: src/common/command.c:1988 +#: src/common/command.c:2038 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "%s le serveur \"%s\" n'existe pas pour la commande \"%s\"\n" -#: src/common/command.c:1996 +#: src/common/command.c:2046 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" @@ -3195,185 +3202,194 @@ msgstr "" "%s vous ne pouvez pas supprimer le server \"%s\" car vous tes connect " "dessus. Essayez /disconnect %s avant.\n" -#: src/common/command.c:2014 +#: src/common/command.c:2066 #, c-format msgid "Server %s%s%s has been deleted\n" msgstr "Le serveur %s%s%s a t supprim\n" -#: src/common/command.c:2031 +#: src/common/command.c:2085 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "%s paramtres manquants pour la commande \"%s\"\n" -#: src/common/command.c:2041 +#: src/common/command.c:2095 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "%s le serveur \"%s\" existe dj, impossible de le crer !\n" -#: src/common/command.c:2070 src/common/command.c:2098 -#: src/common/command.c:2111 src/common/command.c:2137 +#: src/common/command.c:2124 src/common/command.c:2152 +#: src/common/command.c:2165 src/common/command.c:2191 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "%s mot de passe manquant pour le paramtre \"%s\"\n" -#: src/common/command.c:2083 +#: src/common/command.c:2137 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "%s pseudo(s) manquant(s) pour le paramtre \"%s\"\n" -#: src/common/command.c:2124 +#: src/common/command.c:2178 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "%s commande manquante pour le paramtre \"%s\"\n" -#: src/common/command.c:2159 +#: src/common/command.c:2213 #, c-format msgid "Server %s%s%s created\n" msgstr "Serveur %s%s%s cr\n" -#: src/common/command.c:2168 +#: src/common/command.c:2222 #, c-format msgid "%s unable to create server\n" msgstr "%s impossible de crer le serveur\n" -#: src/common/command.c:2227 +#: src/common/command.c:2281 msgid "(unknown)" msgstr "(inconnu)" -#: src/common/command.c:2250 +#: src/common/command.c:2304 #, c-format msgid "%s(password hidden) " msgstr "%s(mot de passe cach) " -#: src/common/command.c:2317 +#: src/common/command.c:2371 #, c-format msgid "%s server \"%s\" not found\n" msgstr "%s serveur \"%s\" non trouv\n" -#: src/common/command.c:2350 src/common/command.c:2398 +#: src/common/command.c:2404 src/common/command.c:2452 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "%s option de configuration \"%s\" non trouve\n" -#: src/common/command.c:2355 src/common/command.c:2390 +#: src/common/command.c:2409 src/common/command.c:2444 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "%s valeur incorrecte pour l'option \"%s\"\n" -#: src/common/command.c:2371 +#: src/common/command.c:2425 #, 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:2481 +#: src/common/command.c:2535 #, c-format msgid "No config option found with \"%s\"\n" msgstr "Aucune option de configuration trouve avec \"%s\"\n" -#: src/common/command.c:2484 +#: src/common/command.c:2538 msgid "No config option found\n" msgstr "Aucune option de configuration trouve\n" -#: src/common/command.c:2491 +#: src/common/command.c:2545 #, c-format msgid "%sDetail:\n" msgstr "%sDtail :\n" -#: src/common/command.c:2496 src/common/weechat.c:302 +#: src/common/command.c:2550 src/common/weechat.c:302 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr " . type boolen (valeurs: 'on' ou 'off')\n" -#: src/common/command.c:2497 src/common/command.c:2520 -#: src/common/command.c:2526 src/common/command.c:2532 +#: src/common/command.c:2551 src/common/command.c:2574 +#: src/common/command.c:2580 src/common/command.c:2586 #: src/common/weechat.c:303 src/common/weechat.c:326 src/common/weechat.c:332 #: src/common/weechat.c:338 #, c-format msgid " . default value: '%s'\n" msgstr " . valeur par dfaut: '%s'\n" -#: src/common/command.c:2502 src/common/weechat.c:308 +#: src/common/command.c:2556 src/common/weechat.c:308 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr " . type entier (valeurs: entre %d et %d)\n" -#: src/common/command.c:2505 src/common/weechat.c:311 +#: src/common/command.c:2559 src/common/weechat.c:311 #, c-format msgid " . default value: %d\n" msgstr " . valeur par dfaut: %d\n" -#: src/common/command.c:2509 src/common/weechat.c:315 +#: src/common/command.c:2563 src/common/weechat.c:315 #, c-format msgid " . type string (values: " msgstr " . type chane (valeurs: " -#: src/common/command.c:2522 src/common/command.c:2528 -#: src/common/command.c:2534 src/common/weechat.c:328 src/common/weechat.c:334 +#: src/common/command.c:2576 src/common/command.c:2582 +#: src/common/command.c:2588 src/common/weechat.c:328 src/common/weechat.c:334 #: src/common/weechat.c:340 msgid "empty" msgstr "vide" -#: src/common/command.c:2525 src/common/weechat.c:331 +#: src/common/command.c:2579 src/common/weechat.c:331 #, c-format 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:2531 src/common/weechat.c:337 +#: src/common/command.c:2585 src/common/weechat.c:337 #, c-format msgid " . type string (any string)\n" msgstr " . type chane (toute chane)\n" -#: src/common/command.c:2537 src/common/weechat.c:343 +#: src/common/command.c:2591 src/common/weechat.c:343 #, c-format msgid " . description: %s\n" msgstr " . description: %s\n" -#: src/common/command.c:2548 +#: src/common/command.c:2602 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "option(s) de configuration trouve(s) avec \"%s\"\n" -#: src/common/command.c:2551 +#: src/common/command.c:2605 msgid "config option(s) found\n" msgstr "option(s) de configuration trouve(s)\n" -#: src/common/command.c:2572 +#: src/common/command.c:2626 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "%s alias ou commande \"%s\" non trouv\n" -#: src/common/command.c:2582 +#: src/common/command.c:2636 #, c-format msgid "Alias \"%s\" removed\n" msgstr "Alias \"%s\" supprim\n" -#: src/common/command.c:2638 +#: src/common/command.c:2692 msgid "ignore were removed.\n" msgstr "ignore ont t supprims.\n" -#: src/common/command.c:2640 +#: src/common/command.c:2694 msgid "ignore was removed.\n" msgstr "ignore a t supprim.\n" -#: src/common/command.c:2645 +#: src/common/command.c:2699 #, c-format msgid "%s no ignore found\n" msgstr "%s aucun ignore trouv\n" -#: src/common/command.c:2675 +#: src/common/command.c:2729 #, 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:2692 +#: src/common/command.c:2746 #, 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:2732 +#: src/common/command.c:2786 msgid "Opened windows:\n" msgstr "Fentres ouvertes:\n" +#: src/common/command.c:2861 +#, c-format +msgid "" +"%s can not merge windows, there's no other window with same size near " +"current one.\n" +msgstr "" +"%s impossible de fusionner les fentres, aucun autre fentre avec la mme " +"taille cot de la fentre actuelle.\n" + #: src/common/fifo.c:71 src/common/fifo.c:73 #, c-format msgid "%s unable to create FIFO pipe for remote control (%s)\n" @@ -4691,6 +4707,9 @@ msgstr "" msgid "Saving config to disk\n" msgstr "Sauvegarde de la configuration sur disque\n" +#~ msgid "dump" +#~ msgstr "dump" + #~ msgid "%s unable to call handler for message (not enough memory)\n" #~ msgstr "" #~ "%s impossible d'appeler la fonction pour le message (mmoire " diff --git a/weechat/po/weechat.pot b/weechat/po/weechat.pot index dc3b8271c..4a343588f 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: 2005-11-11 10:15+0100\n" +"POT-Creation-Date: 2005-11-13 16:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1289,7 +1289,7 @@ msgstr "" msgid "%s: using local hostname \"%s\"\n" msgstr "" -#: src/irc/irc-send.c:175 src/common/command.c:783 +#: src/irc/irc-send.c:175 src/common/command.c:787 #, c-format msgid "%s cannot find nick for sending message\n" msgstr "" @@ -1305,8 +1305,8 @@ msgstr "" #: src/irc/irc-send.c:472 src/irc/irc-send.c:484 src/irc/irc-send.c:502 #: src/irc/irc-send.c:1166 src/irc/irc-send.c:1264 src/irc/irc-send.c:1796 -#: src/common/command.c:1310 src/common/command.c:1749 -#: src/common/command.c:1885 +#: src/common/command.c:1353 src/common/command.c:1798 +#: src/common/command.c:1934 #, c-format msgid "%s wrong argument count for \"%s\" command\n" msgstr "" @@ -1644,11 +1644,11 @@ msgstr "" msgid "%s[%s%s%s]%s idle: " msgstr "" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "days" msgstr "" -#: src/irc/irc-recv.c:3134 src/common/command.c:2677 src/common/command.c:2698 +#: src/irc/irc-recv.c:3134 src/common/command.c:2731 src/common/command.c:2752 msgid "day" msgstr "" @@ -2117,64 +2117,64 @@ msgstr "" msgid "%s lag is high, disconnecting from server...\n" msgstr "" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "bytes" msgstr "" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Kb" msgstr "" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Mb" msgstr "" -#: src/gui/curses/gui-display.c:1468 +#: src/gui/curses/gui-display.c:1473 msgid "Gb" msgstr "" -#: src/gui/curses/gui-display.c:1921 +#: src/gui/curses/gui-display.c:1926 msgid "<servers>" msgstr "" -#: src/gui/curses/gui-display.c:1933 +#: src/gui/curses/gui-display.c:1938 msgid "(away)" msgstr "" -#: src/gui/curses/gui-display.c:2067 +#: src/gui/curses/gui-display.c:2072 msgid "[not connected] " msgstr "" -#: src/gui/curses/gui-display.c:2077 +#: src/gui/curses/gui-display.c:2082 msgid "Act: " msgstr "" -#: src/gui/curses/gui-display.c:2165 +#: src/gui/curses/gui-display.c:2170 #, c-format msgid "Lag: %.1f" msgstr "" -#: src/gui/curses/gui-display.c:2181 +#: src/gui/curses/gui-display.c:2186 msgid "-MORE-" msgstr "" -#: src/gui/curses/gui-display.c:2359 +#: src/gui/curses/gui-display.c:2364 msgid " [A] Accept" msgstr "" -#: src/gui/curses/gui-display.c:2360 src/gui/curses/gui-display.c:2364 +#: src/gui/curses/gui-display.c:2365 src/gui/curses/gui-display.c:2369 msgid " [C] Cancel" msgstr "" -#: src/gui/curses/gui-display.c:2369 +#: src/gui/curses/gui-display.c:2374 msgid " [R] Remove" msgstr "" -#: src/gui/curses/gui-display.c:2373 +#: src/gui/curses/gui-display.c:2378 msgid " [P] Purge old DCC" msgstr "" -#: src/gui/curses/gui-display.c:2374 +#: src/gui/curses/gui-display.c:2379 msgid " [Q] Close DCC view" msgstr "" @@ -2182,11 +2182,11 @@ msgstr "" msgid "server" msgstr "" -#: src/gui/gui-common.c:509 +#: src/gui/gui-common.c:637 msgid "Not enough memory for new line\n" msgstr "" -#: src/gui/gui-common.c:854 +#: src/gui/gui-common.c:982 msgid "Not enough memory for infobar message\n" msgstr "" @@ -2338,7 +2338,7 @@ msgstr "" msgid "grab a key" msgstr "" -#: src/gui/gui-keyboard.c:428 src/common/command.c:1764 +#: src/gui/gui-keyboard.c:428 src/common/command.c:1813 #, c-format msgid "%s unable to bind key \"%s\"\n" msgstr "" @@ -2424,36 +2424,37 @@ msgid "print debug messages" msgstr "" #: src/common/command.c:69 -msgid "dump" +msgid "dump | windows" msgstr "" #: src/common/command.c:70 msgid "" "dump: save memory dump in WeeChat log file (same dump is written when " -"WeeChat crashes)" +"WeeChat crashes)\n" +"windows: display windows tree" msgstr "" -#: src/common/command.c:72 +#: src/common/command.c:73 msgid "display help about commands" msgstr "" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "[command]" msgstr "" -#: src/common/command.c:73 +#: src/common/command.c:74 msgid "command: name of a WeeChat or IRC command" msgstr "" -#: src/common/command.c:75 +#: src/common/command.c:76 msgid "ignore IRC messages and/or hosts" msgstr "" -#: src/common/command.c:76 +#: src/common/command.c:77 msgid "[mask [[type | command] [channel [server]]]]" msgstr "" -#: src/common/command.c:77 +#: src/common/command.c:78 msgid "" " mask: nick or host mask to ignore\n" " type: type of message to ignore (action, ctcp, dcc, pv)\n" @@ -2465,15 +2466,15 @@ msgid "" "Without argument, /ignore command lists all defined ignore." msgstr "" -#: src/common/command.c:85 +#: src/common/command.c:86 msgid "bind/unbind keys" msgstr "" -#: src/common/command.c:86 +#: src/common/command.c:87 msgid "[key function/command] [unbind key] [functions] [reset -yes]" msgstr "" -#: src/common/command.c:87 +#: src/common/command.c:88 msgid "" "key: bind this key to an internal function or a command (beginning by \"/" "\")\n" @@ -2483,26 +2484,26 @@ msgid "" "binding (use carefully!)" msgstr "" -#: src/common/command.c:92 +#: src/common/command.c:93 msgid "list/load/unload plugins" msgstr "" -#: src/common/command.c:93 +#: src/common/command.c:94 msgid "[load filename] | [autoload] | [reload] | [unload]" msgstr "" -#: src/common/command.c:94 +#: src/common/command.c:95 msgid "" "filename: WeeChat plugin (file) to load\n" "\n" "Without argument, /plugin command lists all loaded plugins." msgstr "" -#: src/common/command.c:97 +#: src/common/command.c:98 msgid "list, add or remove servers" msgstr "" -#: src/common/command.c:98 +#: src/common/command.c:99 msgid "" "[servername] | [servername hostname port [-auto | -noauto] [-ipv6] [-ssl] [-" "pwd password] [-nicks nick1 nick2 nick3] [-username username] [-realname " @@ -2510,7 +2511,7 @@ msgid "" "servername]" msgstr "" -#: src/common/command.c:103 +#: src/common/command.c:104 msgid "" "servername: server name, for internal & display use\n" "hostname: name or IP address of server\n" @@ -2525,54 +2526,54 @@ msgid "" "realname: real name of user" msgstr "" -#: src/common/command.c:115 +#: src/common/command.c:116 msgid "save config to disk" msgstr "" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "[file]" msgstr "" -#: src/common/command.c:116 +#: src/common/command.c:117 msgid "file: filename for writing config" msgstr "" -#: src/common/command.c:118 +#: src/common/command.c:119 msgid "set config parameters" msgstr "" -#: src/common/command.c:119 +#: src/common/command.c:120 msgid "[option [ = value]]" msgstr "" -#: src/common/command.c:120 +#: src/common/command.c:121 msgid "" "option: name of an option (if name is full and no value is given, then help " "is displayed on option)\n" "value: value for option" msgstr "" -#: src/common/command.c:124 +#: src/common/command.c:125 msgid "remove an alias" msgstr "" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name" msgstr "" -#: src/common/command.c:125 +#: src/common/command.c:126 msgid "alias_name: name of alias to remove" msgstr "" -#: src/common/command.c:127 +#: src/common/command.c:128 msgid "unignore IRC messages and/or hosts" msgstr "" -#: src/common/command.c:128 +#: src/common/command.c:129 msgid "[number | [mask [[type | command] [channel [server]]]]]" msgstr "" -#: src/common/command.c:129 +#: src/common/command.c:130 msgid "" " number: # of ignore to unignore (number is displayed by list of ignore)\n" " mask: nick or host mask to unignore\n" @@ -2585,29 +2586,27 @@ msgid "" "Without argument, /unignore command lists all defined ignore." msgstr "" -#: src/common/command.c:138 +#: src/common/command.c:139 msgid "show WeeChat uptime" msgstr "" -#: src/common/command.c:139 +#: src/common/command.c:140 msgid "-o" msgstr "" -#: src/common/command.c:140 +#: src/common/command.c:141 msgid "-o: send uptime on current channel as an IRC message" msgstr "" -#: src/common/command.c:142 +#: src/common/command.c:143 msgid "manage windows" msgstr "" -#: src/common/command.c:143 -msgid "" -"[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | " -"all]]]" +#: src/common/command.c:144 +msgid "[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]" msgstr "" -#: src/common/command.c:144 +#: src/common/command.c:145 msgid "" "list: list opened windows (no parameter implies this list)\n" "-1: jump to previous window\n" @@ -2615,517 +2614,528 @@ msgid "" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" -"merge: merge window with another" +"merge: merge window with another (all = keep only one window)\n" +"\n" +"For splith and splitv, pct is a pourcentage which represents size of new " +"window, computed with current window as size reference. For example 25 means " +"create a new window with size = current_size / 4" msgstr "" -#: src/common/command.c:293 +#: src/common/command.c:297 #, c-format msgid "%s alias or command \"%s\" already exists!\n" msgstr "" -#: src/common/command.c:303 +#: src/common/command.c:307 #, c-format msgid "%s alias cannot run another alias!\n" msgstr "" -#: src/common/command.c:310 +#: src/common/command.c:314 #, c-format msgid "%s target command \"/%s\" does not exist!\n" msgstr "" -#: src/common/command.c:548 +#: src/common/command.c:552 #, c-format msgid "%s wrong argument count for %s command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:560 +#: src/common/command.c:564 #, c-format msgid "" "%s wrong argument count for %s command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:582 src/common/command.c:651 +#: src/common/command.c:586 src/common/command.c:655 #, c-format msgid "%s command \"%s\" failed\n" msgstr "" -#: src/common/command.c:607 +#: src/common/command.c:611 #, c-format msgid "%s wrong argument count for IRC command \"%s\" (expected: %d arg%s)\n" msgstr "" -#: src/common/command.c:619 +#: src/common/command.c:623 #, c-format msgid "" "%s wrong argument count for IRC command \"%s\" (expected: between %d and %d " "arg%s)\n" msgstr "" -#: src/common/command.c:634 +#: src/common/command.c:638 #, c-format msgid "%s command \"%s\" needs a server connection!\n" msgstr "" -#: src/common/command.c:694 +#: src/common/command.c:698 #, c-format msgid "%s unknown command \"%s\" (type /help for help)\n" msgstr "" -#: src/common/command.c:828 +#: src/common/command.c:832 msgid "This window is not a channel!\n" msgstr "" -#: src/common/command.c:856 src/common/command.c:887 src/common/command.c:995 +#: src/common/command.c:860 src/common/command.c:891 src/common/command.c:999 #, c-format msgid "%s missing arguments for \"%s\" command\n" msgstr "" -#: src/common/command.c:863 +#: src/common/command.c:867 #, c-format msgid "%s alias can not start with \"/\"\n" msgstr "" -#: src/common/command.c:872 +#: src/common/command.c:876 #, c-format msgid "Alias \"%s\" => \"%s\" created\n" msgstr "" -#: src/common/command.c:878 +#: src/common/command.c:882 #, c-format msgid "Failed to create alias \"%s\" => \"%s\" (not enough memory)\n" msgstr "" -#: src/common/command.c:898 +#: src/common/command.c:902 msgid "List of aliases:\n" msgstr "" -#: src/common/command.c:912 +#: src/common/command.c:916 msgid "No alias defined.\n" msgstr "" -#: src/common/command.c:929 +#: src/common/command.c:933 #, c-format msgid "%sServer: %s%s\n" msgstr "" -#: src/common/command.c:934 +#: src/common/command.c:938 #, c-format msgid "%sChannel: %s%s %s(server: %s%s%s)\n" msgstr "" -#: src/common/command.c:943 +#: src/common/command.c:947 #, c-format msgid "%sPrivate with: %s%s %s(server: %s%s%s)\n" msgstr "" -#: src/common/command.c:952 +#: src/common/command.c:956 msgid "not connected\n" msgstr "" -#: src/common/command.c:974 +#: src/common/command.c:978 msgid "Opened buffers:\n" msgstr "" -#: src/common/command.c:1018 +#: src/common/command.c:1022 #, c-format msgid "%s incorrect buffer number\n" msgstr "" -#: src/common/command.c:1034 +#: src/common/command.c:1038 #, c-format msgid "%s can not close the single buffer\n" msgstr "" -#: src/common/command.c:1044 +#: src/common/command.c:1048 #, c-format msgid "%s can not close server buffer while channels are opened\n" msgstr "" -#: src/common/command.c:1093 +#: src/common/command.c:1097 msgid "Notify levels: " msgstr "" -#: src/common/command.c:1122 src/common/command.c:1170 +#: src/common/command.c:1126 src/common/command.c:1174 #, c-format msgid "%s incorrect notify level (must be between %d and %d)\n" msgstr "" -#: src/common/command.c:1131 +#: src/common/command.c:1135 #, c-format msgid "%s incorrect buffer for notify (must be channel or private)\n" msgstr "" -#: src/common/command.c:1140 +#: src/common/command.c:1144 #, c-format msgid "New notify level for %s%s%s: %s%d %s" msgstr "" -#: src/common/command.c:1150 +#: src/common/command.c:1154 msgid "(hotlist: never)\n" msgstr "" -#: src/common/command.c:1153 +#: src/common/command.c:1157 msgid "(hotlist: highlights)\n" msgstr "" -#: src/common/command.c:1156 +#: src/common/command.c:1160 msgid "(hotlist: highlights + messages)\n" msgstr "" -#: src/common/command.c:1159 +#: src/common/command.c:1163 msgid "(hotlist: highlights + messages + join/part (all))\n" msgstr "" -#: src/common/command.c:1237 +#: src/common/command.c:1241 #, c-format msgid "unknown parameter \"%s\" for \"%s\" command\n" msgstr "" -#: src/common/command.c:1267 +#: src/common/command.c:1271 #, c-format msgid "%s already connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1275 +#: src/common/command.c:1279 #, c-format msgid "%s currently connecting to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1293 src/common/command.c:1368 +#: src/common/command.c:1297 src/common/command.c:1417 #, c-format msgid "%s server not found\n" msgstr "" -#: src/common/command.c:1323 src/common/command.c:1878 -#: src/common/command.c:2786 src/common/command.c:2810 +#: src/common/command.c:1372 src/common/command.c:1927 +#: src/common/command.c:2850 src/common/command.c:2885 #, c-format msgid "%s unknown option for \"%s\" command\n" msgstr "" -#: src/common/command.c:1352 +#: src/common/command.c:1401 #, c-format msgid "%s not connected to server \"%s\"!\n" msgstr "" -#: src/common/command.c:1360 +#: src/common/command.c:1409 msgid "Auto-reconnection is cancelled\n" msgstr "" -#: src/common/command.c:1391 src/common/weechat.c:365 +#: src/common/command.c:1440 src/common/weechat.c:365 #, c-format msgid "%s internal commands:\n" msgstr "" -#: src/common/command.c:1401 src/common/weechat.c:385 +#: src/common/command.c:1450 src/common/weechat.c:385 #, c-format msgid "IRC commands:\n" msgstr "" -#: src/common/command.c:1415 +#: src/common/command.c:1464 msgid "Plugin commands:\n" msgstr "" -#: src/common/command.c:1531 +#: src/common/command.c:1580 #, c-format msgid "No help available, \"%s\" is an unknown command\n" msgstr "" -#: src/common/command.c:1550 +#: src/common/command.c:1599 #, c-format msgid "%son %s%s%s/%s%s%s:%s ignoring %s%s%s from %s%s\n" msgstr "" -#: src/common/command.c:1584 +#: src/common/command.c:1633 msgid "List of ignore:\n" msgstr "" -#: src/common/command.c:1601 +#: src/common/command.c:1650 msgid "No ignore defined.\n" msgstr "" -#: src/common/command.c:1627 +#: src/common/command.c:1676 msgid "New ignore:" msgstr "" -#: src/common/command.c:1647 +#: src/common/command.c:1696 #, c-format msgid "New key binding: %s" msgstr "" -#: src/common/command.c:1681 +#: src/common/command.c:1730 msgid "Key bindings:\n" msgstr "" -#: src/common/command.c:1695 +#: src/common/command.c:1744 #, c-format msgid "Key \"%s\" unbinded\n" msgstr "" -#: src/common/command.c:1701 +#: src/common/command.c:1750 #, c-format msgid "%s unable to unbind key \"%s\"\n" msgstr "" -#: src/common/command.c:1709 src/common/weechat.c:416 +#: src/common/command.c:1758 src/common/weechat.c:416 #, c-format msgid "Internal key functions:\n" msgstr "" -#: src/common/command.c:1729 +#: src/common/command.c:1778 msgid "Default key bindings restored\n" msgstr "" -#: src/common/command.c:1735 +#: src/common/command.c:1784 #, c-format msgid "%s \"-yes\" argument is required for keys reset (securuty reason)\n" msgstr "" -#: src/common/command.c:1791 +#: src/common/command.c:1840 msgid "Plugins loaded:\n" msgstr "" -#: src/common/command.c:1807 +#: src/common/command.c:1856 msgid " message handlers:\n" msgstr "" -#: src/common/command.c:1816 +#: src/common/command.c:1865 #, c-format msgid " IRC(%s)\n" msgstr "" -#: src/common/command.c:1823 +#: src/common/command.c:1872 msgid " (no message handler)\n" msgstr "" -#: src/common/command.c:1828 +#: src/common/command.c:1877 msgid " command handlers:\n" msgstr "" -#: src/common/command.c:1849 +#: src/common/command.c:1898 msgid " (no command handler)\n" msgstr "" -#: src/common/command.c:1855 +#: src/common/command.c:1904 msgid " (no plugin)\n" msgstr "" -#: src/common/command.c:1891 +#: src/common/command.c:1940 msgid "" "Command \"plugin\" is not available, WeeChat was built without plugins " "support.\n" msgstr "" -#: src/common/command.c:1938 +#: src/common/command.c:1988 msgid "No server.\n" msgstr "" -#: src/common/command.c:1949 +#: src/common/command.c:1999 #, c-format msgid "Server '%s' not found.\n" msgstr "" -#: src/common/command.c:1961 +#: src/common/command.c:2011 #, c-format msgid "%s missing servername for \"%s\" command\n" msgstr "" -#: src/common/command.c:1969 +#: src/common/command.c:2019 #, c-format msgid "%s too much arguments for \"%s\" command, ignoring arguments\n" msgstr "" -#: src/common/command.c:1988 +#: src/common/command.c:2038 #, c-format msgid "%s server \"%s\" not found for \"%s\" command\n" msgstr "" -#: src/common/command.c:1996 +#: src/common/command.c:2046 #, c-format msgid "" "%s you can not delete server \"%s\" because you are connected to. Try /" "disconnect %s before.\n" msgstr "" -#: src/common/command.c:2014 +#: src/common/command.c:2066 #, c-format msgid "Server %s%s%s has been deleted\n" msgstr "" -#: src/common/command.c:2031 +#: src/common/command.c:2085 #, c-format msgid "%s missing parameters for \"%s\" command\n" msgstr "" -#: src/common/command.c:2041 +#: src/common/command.c:2095 #, c-format msgid "%s server \"%s\" already exists, can't create it!\n" msgstr "" -#: src/common/command.c:2070 src/common/command.c:2098 -#: src/common/command.c:2111 src/common/command.c:2137 +#: src/common/command.c:2124 src/common/command.c:2152 +#: src/common/command.c:2165 src/common/command.c:2191 #, c-format msgid "%s missing password for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:2083 +#: src/common/command.c:2137 #, c-format msgid "%s missing nick(s) for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:2124 +#: src/common/command.c:2178 #, c-format msgid "%s missing command for \"%s\" parameter\n" msgstr "" -#: src/common/command.c:2159 +#: src/common/command.c:2213 #, c-format msgid "Server %s%s%s created\n" msgstr "" -#: src/common/command.c:2168 +#: src/common/command.c:2222 #, c-format msgid "%s unable to create server\n" msgstr "" -#: src/common/command.c:2227 +#: src/common/command.c:2281 msgid "(unknown)" msgstr "" -#: src/common/command.c:2250 +#: src/common/command.c:2304 #, c-format msgid "%s(password hidden) " msgstr "" -#: src/common/command.c:2317 +#: src/common/command.c:2371 #, c-format msgid "%s server \"%s\" not found\n" msgstr "" -#: src/common/command.c:2350 src/common/command.c:2398 +#: src/common/command.c:2404 src/common/command.c:2452 #, c-format msgid "%s config option \"%s\" not found\n" msgstr "" -#: src/common/command.c:2355 src/common/command.c:2390 +#: src/common/command.c:2409 src/common/command.c:2444 #, c-format msgid "%s incorrect value for option \"%s\"\n" msgstr "" -#: src/common/command.c:2371 +#: src/common/command.c:2425 #, c-format msgid "%s option \"%s\" can not be changed while WeeChat is running\n" msgstr "" -#: src/common/command.c:2481 +#: src/common/command.c:2535 #, c-format msgid "No config option found with \"%s\"\n" msgstr "" -#: src/common/command.c:2484 +#: src/common/command.c:2538 msgid "No config option found\n" msgstr "" -#: src/common/command.c:2491 +#: src/common/command.c:2545 #, c-format msgid "%sDetail:\n" msgstr "" -#: src/common/command.c:2496 src/common/weechat.c:302 +#: src/common/command.c:2550 src/common/weechat.c:302 #, c-format msgid " . type boolean (values: 'on' or 'off')\n" msgstr "" -#: src/common/command.c:2497 src/common/command.c:2520 -#: src/common/command.c:2526 src/common/command.c:2532 +#: src/common/command.c:2551 src/common/command.c:2574 +#: src/common/command.c:2580 src/common/command.c:2586 #: src/common/weechat.c:303 src/common/weechat.c:326 src/common/weechat.c:332 #: src/common/weechat.c:338 #, c-format msgid " . default value: '%s'\n" msgstr "" -#: src/common/command.c:2502 src/common/weechat.c:308 +#: src/common/command.c:2556 src/common/weechat.c:308 #, c-format msgid " . type integer (values: between %d and %d)\n" msgstr "" -#: src/common/command.c:2505 src/common/weechat.c:311 +#: src/common/command.c:2559 src/common/weechat.c:311 #, c-format msgid " . default value: %d\n" msgstr "" -#: src/common/command.c:2509 src/common/weechat.c:315 +#: src/common/command.c:2563 src/common/weechat.c:315 #, c-format msgid " . type string (values: " msgstr "" -#: src/common/command.c:2522 src/common/command.c:2528 -#: src/common/command.c:2534 src/common/weechat.c:328 src/common/weechat.c:334 +#: src/common/command.c:2576 src/common/command.c:2582 +#: src/common/command.c:2588 src/common/weechat.c:328 src/common/weechat.c:334 #: src/common/weechat.c:340 msgid "empty" msgstr "" -#: src/common/command.c:2525 src/common/weechat.c:331 +#: src/common/command.c:2579 src/common/weechat.c:331 #, c-format msgid " . type color (Curses or Gtk color, look at WeeChat doc)\n" msgstr "" -#: src/common/command.c:2531 src/common/weechat.c:337 +#: src/common/command.c:2585 src/common/weechat.c:337 #, c-format msgid " . type string (any string)\n" msgstr "" -#: src/common/command.c:2537 src/common/weechat.c:343 +#: src/common/command.c:2591 src/common/weechat.c:343 #, c-format msgid " . description: %s\n" msgstr "" -#: src/common/command.c:2548 +#: src/common/command.c:2602 #, c-format msgid "config option(s) found with \"%s\"\n" msgstr "" -#: src/common/command.c:2551 +#: src/common/command.c:2605 msgid "config option(s) found\n" msgstr "" -#: src/common/command.c:2572 +#: src/common/command.c:2626 #, c-format msgid "%s alias or command \"%s\" not found\n" msgstr "" -#: src/common/command.c:2582 +#: src/common/command.c:2636 #, c-format msgid "Alias \"%s\" removed\n" msgstr "" -#: src/common/command.c:2638 +#: src/common/command.c:2692 msgid "ignore were removed.\n" msgstr "" -#: src/common/command.c:2640 +#: src/common/command.c:2694 msgid "ignore was removed.\n" msgstr "" -#: src/common/command.c:2645 +#: src/common/command.c:2699 #, c-format msgid "%s no ignore found\n" msgstr "" -#: src/common/command.c:2675 +#: src/common/command.c:2729 #, c-format msgid "WeeChat uptime: %d %s %02d:%02d:%02d, started on %s" msgstr "" -#: src/common/command.c:2692 +#: src/common/command.c:2746 #, 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:2732 +#: src/common/command.c:2786 msgid "Opened windows:\n" msgstr "" +#: src/common/command.c:2861 +#, c-format +msgid "" +"%s can not merge windows, there's no other window with same size near " +"current one.\n" +msgstr "" + #: src/common/fifo.c:71 src/common/fifo.c:73 #, c-format msgid "%s unable to create FIFO pipe for remote control (%s)\n" diff --git a/weechat/src/common/command.c b/weechat/src/common/command.c index 93319291d..57b8f47a9 100644 --- a/weechat/src/common/command.c +++ b/weechat/src/common/command.c @@ -66,8 +66,9 @@ t_weechat_command weechat_commands[] = N_("servername: server name to disconnect"), 0, 1, weechat_cmd_disconnect, NULL }, { "debug", N_("print debug messages"), - N_("dump"), - N_("dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)"), + N_("dump | windows"), + N_("dump: save memory dump in WeeChat log file (same dump is written when WeeChat crashes)\n" + "windows: display windows tree"), 1, 1, weechat_cmd_debug, NULL }, { "help", N_("display help about commands"), N_("[command]"), N_("command: name of a WeeChat or IRC command"), @@ -140,14 +141,17 @@ t_weechat_command weechat_commands[] = N_("-o: send uptime on current channel as an IRC message"), 0, 1, weechat_cmd_uptime, NULL }, { "window", N_("manage windows"), - N_("[list | -1 | +1 | b# | splith | splitv | [merge [down | up | left | right | all]]]"), + N_("[list | -1 | +1 | b# | splith [pct] | splitv [pct] | [merge [all]]]"), N_("list: list opened windows (no parameter implies this list)\n" "-1: jump to previous window\n" "+1: jump to next window\n" "b#: jump to next window displaying buffer number #\n" "splith: split current window horizontally\n" "splitv: split current window vertically\n" - "merge: merge window with another"), + "merge: merge window with another (all = keep only one window)\n\n" + "For splith and splitv, pct is a pourcentage which represents " + "size of new window, computed with current window as size reference. " + "For example 25 means create a new window with size = current_size / 4"), 0, 2, weechat_cmd_window, NULL }, { NULL, NULL, NULL, NULL, 0, 0, NULL, NULL } }; @@ -1297,6 +1301,45 @@ weechat_cmd_connect (int argc, char **argv) } /* + * weechat_cmd_debug_display_windows: display tree of windows + */ + +void +weechat_cmd_debug_display_windows (t_gui_window_tree *tree, int indent) +{ + int i; + + if (tree) + { + for (i = 0; i < indent; i++) + gui_printf_nolog (NULL, " "); + + if (tree->window) + { + /* leaf */ + gui_printf_nolog (NULL, "leaf: %X (parent:%X), win=%X, child1=%X, child2=%X, %d,%d %dx%d, %d%%x%d%%\n", + tree, tree->parent_node, tree->window, + tree->child1, tree->child2, + tree->window->win_x, tree->window->win_y, + tree->window->win_width, tree->window->win_height, + tree->window->win_width_pct, tree->window->win_height_pct); + } + else + { + /* node */ + gui_printf_nolog (NULL, "node: %X (parent:%X), win=%X, child1=%X, child2=%X)\n", + tree, tree->parent_node, tree->window, + tree->child1, tree->child2); + } + + if (tree->child1) + weechat_cmd_debug_display_windows (tree->child1, indent + 1); + if (tree->child2) + weechat_cmd_debug_display_windows (tree->child2, indent + 1); + } +} + +/* * weechat_cmd_debug: print debug messages */ @@ -1316,6 +1359,12 @@ weechat_cmd_debug (int argc, char **argv) { wee_dump (0); } + else if (ascii_strcasecmp (argv[0], "windows") == 0) + { + gui_printf_nolog (NULL, "\n"); + gui_printf_nolog (NULL, "DEBUG: windows tree:\n"); + weechat_cmd_debug_display_windows (gui_windows_tree, 1); + } else { irc_display_prefix (NULL, NULL, PREFIX_ERROR); @@ -1918,6 +1967,7 @@ weechat_cmd_server (int argc, char **argv) int i; t_irc_server server, *ptr_server, *server_found, *new_server; t_gui_buffer *ptr_buffer; + char *server_name; if ((argc == 0) || (argc == 1)) { @@ -2008,13 +2058,17 @@ weechat_cmd_server (int argc, char **argv) } } + server_name = strdup (server_found->name); + server_free (server_found); irc_display_prefix (NULL, NULL, PREFIX_INFO); gui_printf (NULL, _("Server %s%s%s has been deleted\n"), GUI_COLOR(COLOR_WIN_CHAT_SERVER), - server_found->name, + server_name, GUI_COLOR(COLOR_WIN_CHAT)); + if (server_name) + free (server_name); gui_redraw_buffer (gui_current_window->buffer); @@ -2758,26 +2812,36 @@ weechat_cmd_window (int argc, char **argv) if (ascii_strcasecmp (argv[0], "splith") == 0) { /* split window horizontally */ - gui_window_split_horiz (gui_current_window); + if (argc > 1) + { + error = NULL; + number = strtol (argv[1], &error, 10); + if ((error) && (error[0] == '\0') + && (number > 0) && (number < 100)) + gui_window_split_horiz (gui_current_window, number); + } + else + gui_window_split_horiz (gui_current_window, 50); } else if (ascii_strcasecmp (argv[0], "splitv") == 0) { /* split window vertically */ - gui_window_split_vertic (gui_current_window); + if (argc > 1) + { + error = NULL; + number = strtol (argv[1], &error, 10); + if ((error) && (error[0] == '\0') + && (number > 0) && (number < 100)) + gui_window_split_vertic (gui_current_window, number); + } + else + gui_window_split_vertic (gui_current_window, 50); } else if (ascii_strcasecmp (argv[0], "merge") == 0) { if (argc >= 2) { - if (ascii_strcasecmp (argv[1], "down") == 0) - gui_window_merge_down (gui_current_window); - else if (ascii_strcasecmp (argv[1], "up") == 0) - gui_window_merge_up (gui_current_window); - else if (ascii_strcasecmp (argv[1], "left") == 0) - gui_window_merge_left (gui_current_window); - else if (ascii_strcasecmp (argv[1], "right") == 0) - gui_window_merge_right (gui_current_window); - else if (ascii_strcasecmp (argv[1], "all") == 0) + if (ascii_strcasecmp (argv[1], "all") == 0) gui_window_merge_all (gui_current_window); else { @@ -2789,7 +2853,18 @@ weechat_cmd_window (int argc, char **argv) } } else - gui_window_merge_auto (gui_current_window); + { + if (!gui_window_merge (gui_current_window)) + { + irc_display_prefix (NULL, NULL, PREFIX_ERROR); + gui_printf (NULL, + _("%s can not merge windows, " + "there's no other window with same size " + "near current one.\n"), + WEECHAT_ERROR); + return -1; + } + } } else if (ascii_strncasecmp (argv[0], "b", 1) == 0) { diff --git a/weechat/src/common/completion.c b/weechat/src/common/completion.c index 44f6a4913..f4fa2a286 100644 --- a/weechat/src/common/completion.c +++ b/weechat/src/common/completion.c @@ -186,9 +186,14 @@ completion_build_list (t_completion *completion, void *channel) if (ascii_strcasecmp (completion->base_command, "debug") == 0) { if (completion->base_command_arg == 1) + { weelist_add (&completion->completion_list, &completion->last_completion, "dump"); + weelist_add (&completion->completion_list, + &completion->last_completion, + "windows"); + } else completion_stop (completion); return; diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 7699d6b2b..d7e7db2f5 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -2800,7 +2800,7 @@ gui_window_init_subwindows (t_gui_window *window) */ void -gui_window_split_horiz (t_gui_window *window) +gui_window_split_horiz (t_gui_window *window, int pourcentage) { t_gui_window *new_window; int height1, height2; @@ -2808,24 +2808,32 @@ gui_window_split_horiz (t_gui_window *window) if (!gui_ok) return; - height1 = window->win_height / 2; + height1 = (window->win_height * pourcentage) / 100; height2 = window->win_height - height1; - if ((new_window = gui_window_new (window->win_x, window->win_y, - window->win_width, height1))) + + if ((height1 >= WINDOW_MIN_HEIGHT) && (height2 >= WINDOW_MIN_HEIGHT) + && (pourcentage > 0) && (pourcentage <= 100)) { - /* reduce old window height (bottom window) */ - window->win_y = new_window->win_y + new_window->win_height; - window->win_height = height2; - - /* assign same buffer for new window (top window) */ - new_window->buffer = window->buffer; - new_window->buffer->num_displayed++; - - gui_switch_to_buffer (window, window->buffer); - - gui_current_window = new_window; - gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); - gui_redraw_buffer (gui_current_window->buffer); + if ((new_window = gui_window_new (window, + window->win_x, window->win_y, + window->win_width, height1, + 100, pourcentage))) + { + /* reduce old window height (bottom window) */ + window->win_y = new_window->win_y + new_window->win_height; + window->win_height = height2; + window->win_height_pct = 100 - pourcentage; + + /* assign same buffer for new window (top window) */ + new_window->buffer = window->buffer; + new_window->buffer->num_displayed++; + + gui_switch_to_buffer (window, window->buffer); + + gui_current_window = new_window; + gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); + gui_redraw_buffer (gui_current_window->buffer); + } } } @@ -2834,7 +2842,7 @@ gui_window_split_horiz (t_gui_window *window) */ void -gui_window_split_vertic (t_gui_window *window) +gui_window_split_vertic (t_gui_window *window, int pourcentage) { t_gui_window *new_window; int width1, width2; @@ -2842,185 +2850,146 @@ gui_window_split_vertic (t_gui_window *window) if (!gui_ok) return; - width1 = window->win_width / 2; + width1 = (window->win_width * pourcentage) / 100; width2 = window->win_width - width1 - 1; - if ((new_window = gui_window_new (window->win_x + width1 + 1, window->win_y, - width2, window->win_height))) - { - /* reduce old window height (left window) */ - window->win_width = width1; - - /* assign same buffer for new window (right window) */ - new_window->buffer = window->buffer; - new_window->buffer->num_displayed++; - - gui_switch_to_buffer (window, window->buffer); - - gui_current_window = new_window; - gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); - gui_redraw_buffer (gui_current_window->buffer); - - /* create & draw separator */ - gui_draw_window_separator (gui_current_window); - } -} - -/* - * gui_window_merge_down: merge window, direction down - */ - -int -gui_window_merge_down (t_gui_window *window) -{ - t_gui_window *ptr_win; - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + if ((width1 >= WINDOW_MIN_WIDTH) && (width2 >= WINDOW_MIN_WIDTH) + && (pourcentage > 0) && (pourcentage <= 100)) { - if (ptr_win != window) + if ((new_window = gui_window_new (window, + window->win_x + width1 + 1, window->win_y, + width2, window->win_height, + pourcentage, 100))) { - if ((ptr_win->win_y == window->win_y + window->win_height) - && (ptr_win->win_x == window->win_x) - && (ptr_win->win_width == window->win_width)) - { - window->win_height += ptr_win->win_height; - gui_window_free (ptr_win); - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); - return 0; - } + /* reduce old window height (left window) */ + window->win_width = width1; + window->win_width_pct = 100 - pourcentage; + + /* assign same buffer for new window (right window) */ + new_window->buffer = window->buffer; + new_window->buffer->num_displayed++; + + gui_switch_to_buffer (window, window->buffer); + + gui_current_window = new_window; + gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); + gui_redraw_buffer (gui_current_window->buffer); + + /* create & draw separator */ + gui_draw_window_separator (gui_current_window); } } - - /* no window found below current window */ - return -1; } /* - * gui_window_merge_up: merge window, direction up + * gui_window_merge: merge window with its sister */ int -gui_window_merge_up (t_gui_window *window) +gui_window_merge (t_gui_window *window) { - t_gui_window *ptr_win; + t_gui_window_tree *parent, *sister; - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + parent = window->ptr_tree->parent_node; + if (parent) { - if (ptr_win != window) + sister = (parent->child1->window == window) ? + parent->child2 : parent->child1; + + if (!(sister->window)) + return 0; + + if (window->win_y == sister->window->win_y) { - if ((ptr_win->win_y + ptr_win->win_height == window->win_y) - && (ptr_win->win_x == window->win_x) - && (ptr_win->win_width == window->win_width)) - { - window->win_height += ptr_win->win_height; - window->win_y -= ptr_win->win_height; - gui_window_free (ptr_win); - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); - return 0; - } + /* horizontal merge */ + window->win_width += sister->window->win_width + 1; + window->win_width_pct += sister->window->win_width_pct; + } + else + { + /* vertical merge */ + window->win_height += sister->window->win_height; + window->win_height_pct += sister->window->win_height_pct; } + if (sister->window->win_x < window->win_x) + window->win_x = sister->window->win_x; + if (sister->window->win_y < window->win_y) + window->win_y = sister->window->win_y; + + gui_window_free (sister->window); + gui_window_tree_node_to_leaf (parent, window); + + gui_switch_to_buffer (window, window->buffer); + gui_redraw_buffer (window->buffer); + return 1; } - - /* no window found above current window */ - return -1; + return 0; } /* - * gui_window_merge_left: merge window, direction left + * gui_window_merge_all: merge all windows into only one */ -int -gui_window_merge_left (t_gui_window *window) +void +gui_window_merge_all (t_gui_window *window) { - t_gui_window *ptr_win; - - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + while (gui_windows->next_window) { - if (ptr_win != window) - { - if ((ptr_win->win_x + ptr_win->win_width + 1 == window->win_x) - && (ptr_win->win_y == window->win_y) - && (ptr_win->win_height == window->win_height)) - { - window->win_width += ptr_win->win_width + 1; - window->win_x -= ptr_win->win_width + 1; - gui_window_free (ptr_win); - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); - return 0; - } - } + gui_window_free ((gui_windows == window) ? gui_windows->next_window : gui_windows); } - - /* no window found on the left of current window */ - return -1; + gui_window_tree_free (&gui_windows_tree); + gui_window_tree_init (window); + window->ptr_tree = gui_windows_tree; + window->win_x = 0; + window->win_y = 0; + window->win_width = COLS; + window->win_height = LINES; + window->win_width_pct = 100; + window->win_height_pct = 100; + gui_switch_to_buffer (window, window->buffer); + gui_redraw_buffer (window->buffer); } /* - * gui_window_merge_right: merge window, direction right + * gui_window_auto_resize: auto-resize all windows, according to % of global size + * This function is called after a terminal resize. + * Returns 0 if ok, -1 if all window should be merged + * (not enough space according to windows %) */ -int -gui_window_merge_right (t_gui_window *window) +void +gui_window_auto_resize (t_gui_window_tree *tree, + int x, int y, int width, int height) { - t_gui_window *ptr_win; + int size1, size2; - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + if (tree) { - if (ptr_win != window) + if (tree->window) + { + tree->window->win_x = x; + tree->window->win_y = y; + tree->window->win_width = width; + tree->window->win_height = height; + } + else { - if ((ptr_win->win_x == window->win_x + window->win_width + 1) - && (ptr_win->win_y == window->win_y) - && (ptr_win->win_height == window->win_height)) + if (tree->split_horiz) { - window->win_width += ptr_win->win_width + 1; - gui_window_free (ptr_win); - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); - return 0; + size1 = (height * tree->split_pct) / 100; + size2 = height - size1; + gui_window_auto_resize (tree->child1, x, y + size1, width, size2); + gui_window_auto_resize (tree->child2, x, y, width, size1); + } + else + { + size1 = (width * tree->split_pct) / 100; + size2 = width - size1 - 1; + gui_window_auto_resize (tree->child1, x, y, size1, height); + gui_window_auto_resize (tree->child2, x + size1 + 1, y, size2, height); } } } - - /* no window found on the right of current window */ - return -1; -} - -/* - * gui_window_merge: merge a window, direction auto - */ - -void -gui_window_merge_auto (t_gui_window *window) -{ - if (gui_window_merge_down (window) == 0) - return; - if (gui_window_merge_up (window) == 0) - return; - if (gui_window_merge_left (window) == 0) - return; - if (gui_window_merge_right (window) == 0) - return; -} - -/* - * gui_window_merge_all: merge all windows - */ - -void -gui_window_merge_all (t_gui_window *window) -{ - while (gui_windows->next_window) - { - gui_window_free ((gui_windows == window) ? gui_windows->next_window : gui_windows); - } - window->win_x = 0; - window->win_y = 0; - window->win_width = COLS; - window->win_height = LINES; - gui_switch_to_buffer (window, window->buffer); - gui_redraw_buffer (window->buffer); } /* @@ -3033,7 +3002,7 @@ gui_refresh_screen () t_gui_window *ptr_win, *old_current_window; int old_width, old_height; int new_width, new_height; - int merge_all_windows; + int merge_all; getmaxyx (stdscr, old_height, old_width); @@ -3044,44 +3013,36 @@ gui_refresh_screen () old_current_window = gui_current_window; - gui_ok = ((new_width > 5) && (new_height > 5)); + gui_ok = ((new_width > WINDOW_MIN_WIDTH) && (new_height > WINDOW_MIN_HEIGHT)); - merge_all_windows = 0; - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + if (gui_ok) { - ptr_win->dcc_first = NULL; - ptr_win->dcc_selected = NULL; + gui_window_auto_resize (gui_windows_tree, 0, 0, COLS, LINES); - if (!merge_all_windows) + merge_all = 0; + for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) { - if ((ptr_win->win_x > new_width - 5) - || (ptr_win->win_y > new_height - 5)) - merge_all_windows = 1; - else + if ((ptr_win->win_width < WINDOW_MIN_WIDTH) + || (ptr_win->win_height < WINDOW_MIN_HEIGHT)) { - if (ptr_win->win_x + ptr_win->win_width == old_width) - ptr_win->win_width = new_width - ptr_win->win_x; - if (ptr_win->win_y + ptr_win->win_height == old_height) - ptr_win->win_height = new_height - ptr_win->win_y; - if ((ptr_win->win_width < 5) || (ptr_win->win_height < 5)) - merge_all_windows = 1; + merge_all = 1; + break; } } - } + if (merge_all) + gui_window_merge_all (gui_current_window); - if (merge_all_windows) - gui_window_merge_all (gui_current_window); - - for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) - { - gui_switch_to_buffer (ptr_win, ptr_win->buffer); - gui_redraw_buffer (ptr_win->buffer); - gui_draw_window_separator (ptr_win); + for (ptr_win = gui_windows; ptr_win; ptr_win = ptr_win->next_window) + { + gui_switch_to_buffer (ptr_win, ptr_win->buffer); + gui_redraw_buffer (ptr_win->buffer); + gui_draw_window_separator (ptr_win); + } + + gui_current_window = old_current_window; + gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); + gui_redraw_buffer (gui_current_window->buffer); } - - gui_current_window = old_current_window; - gui_switch_to_buffer (gui_current_window, gui_current_window->buffer); - gui_redraw_buffer (gui_current_window->buffer); } /* @@ -3265,7 +3226,7 @@ gui_init () gui_input_clipboard = NULL; /* create new window/buffer */ - if (gui_window_new (0, 0, COLS, LINES)) + if (gui_window_new (NULL, 0, 0, COLS, LINES, 100, 100)) { gui_current_window = gui_windows; gui_buffer_new (gui_windows, NULL, NULL, 0, 1); @@ -3316,6 +3277,7 @@ gui_end () /* delete all windows */ while (gui_windows) gui_window_free (gui_windows); + gui_window_tree_free (&gui_windows_tree); /* delete global history */ history_global_free (); diff --git a/weechat/src/gui/gui-common.c b/weechat/src/gui/gui-common.c index 81d149499..c52cf4728 100644 --- a/weechat/src/gui/gui-common.c +++ b/weechat/src/gui/gui-common.c @@ -54,6 +54,8 @@ t_gui_window *gui_windows = NULL; /* pointer to first window */ t_gui_window *last_gui_window = NULL; /* pointer to last window */ t_gui_window *gui_current_window = NULL; /* pointer to current window */ +t_gui_window_tree *gui_windows_tree = NULL; /* pointer to windows tree */ + t_gui_buffer *gui_buffers = NULL; /* pointer to first buffer */ t_gui_buffer *last_gui_buffer = NULL; /* pointer to last buffer */ t_gui_buffer *buffer_before_dcc = NULL; /* buffer before dcc switch */ @@ -61,25 +63,148 @@ t_gui_infobar *gui_infobar; /* pointer to infobar content */ char *gui_input_clipboard = NULL; /* clipboard content */ + +/* + * gui_window_tree_init: create first entry in windows tree + */ + +int +gui_window_tree_init (t_gui_window *window) +{ + gui_windows_tree = (t_gui_window_tree *)malloc (sizeof (t_gui_window_tree)); + if (!gui_windows_tree) + return 0; + gui_windows_tree->parent_node = NULL; + gui_windows_tree->split_horiz = 0; + gui_windows_tree->split_pct = 0; + gui_windows_tree->child1 = NULL; + gui_windows_tree->child2 = NULL; + gui_windows_tree->window = window; + return 1; +} + +/* + * gui_window_tree_node_to_leaf: convert a node to a leaf (free any leafs) + * Called when 2 windows are merging into one + */ + +void +gui_window_tree_node_to_leaf (t_gui_window_tree *node, t_gui_window *window) +{ + node->split_horiz = 0; + node->split_pct = 0; + if (node->child1) + { + free (node->child1); + node->child1 = NULL; + } + if (node->child2) + { + free (node->child2); + node->child2 = NULL; + } + node->window = window; + window->ptr_tree = node; +} + +/* + * gui_window_tree_free: delete entire windows tree + */ + +void +gui_window_tree_free (t_gui_window_tree **tree) +{ + if (*tree) + { + if ((*tree)->child1) + gui_window_tree_free (&((*tree)->child1)); + if ((*tree)->child2) + gui_window_tree_free (&((*tree)->child2)); + free (*tree); + *tree = NULL; + } +} + /* * gui_window_new: create a new window */ t_gui_window * -gui_window_new (int x, int y, int width, int height) +gui_window_new (t_gui_window *parent, int x, int y, int width, int height, + int width_pct, int height_pct) { t_gui_window *new_window; + t_gui_window_tree *ptr_tree, *child1, *child2, *ptr_leaf; #ifdef DEBUG wee_log_printf ("Creating new window (x:%d, y:%d, width:%d, height:%d)\n", x, y, width, height); #endif + + if (parent) + { + child1 = (t_gui_window_tree *)malloc (sizeof (t_gui_window_tree)); + if (!child1) + return NULL; + child2 = (t_gui_window_tree *)malloc (sizeof (t_gui_window_tree)); + if (!child2) + { + free (child1); + return NULL; + } + ptr_tree = parent->ptr_tree; + + if (width_pct == 100) + { + ptr_tree->split_horiz = 1; + ptr_tree->split_pct = height_pct; + } + else + { + ptr_tree->split_horiz = 0; + ptr_tree->split_pct = width_pct; + } + + /* parent window leaf becomes node and we add 2 leafs below + (#1 is parent win, #2 is new win) */ + + parent->ptr_tree = child1; + child1->parent_node = ptr_tree; + child1->child1 = NULL; + child1->child2 = NULL; + child1->window = ptr_tree->window; + + child2->parent_node = ptr_tree; + child2->child1 = NULL; + child2->child2 = NULL; + child2->window = NULL; /* will be assigned by new window below */ + + ptr_tree->child1 = child1; + ptr_tree->child2 = child2; + ptr_tree->window = NULL; /* leaf becomes node */ + + ptr_leaf = child2; + } + else + { + if (!gui_window_tree_init (NULL)) + return NULL; + ptr_leaf = gui_windows_tree; + } + if ((new_window = (t_gui_window *)(malloc (sizeof (t_gui_window))))) { new_window->win_x = x; new_window->win_y = y; new_window->win_width = width; new_window->win_height = height; + new_window->win_width_pct = width_pct; + new_window->win_height_pct = height_pct; + + new_window->new_x = -1; + new_window->new_y = -1; + new_window->new_width = -1; + new_window->new_height = -1; new_window->win_chat_x = 0; new_window->win_chat_y = 0; @@ -120,6 +245,9 @@ gui_window_new (int x, int y, int width, int height) new_window->start_line = NULL; new_window->start_line_pos = 0; + new_window->ptr_tree = ptr_leaf; + ptr_leaf->window = new_window; + /* add window to windows queue */ new_window->prev_window = last_gui_window; if (gui_windows) @@ -1427,6 +1555,8 @@ gui_window_print_log (t_gui_window *window) wee_log_printf (" win_y . . . . . . . : %d\n", window->win_y); wee_log_printf (" win_width . . . . . : %d\n", window->win_width); wee_log_printf (" win_height. . . . . : %d\n", window->win_height); + wee_log_printf (" win_width_pct . . . : %d\n", window->win_width_pct); + wee_log_printf (" win_height_pct. . . : %d\n", window->win_height_pct); wee_log_printf (" win_chat_x. . . . . : %d\n", window->win_chat_x); wee_log_printf (" win_chat_y. . . . . : %d\n", window->win_chat_y); wee_log_printf (" win_chat_width. . . : %d\n", window->win_chat_width); diff --git a/weechat/src/gui/gui.h b/weechat/src/gui/gui.h index 52103f204..bf2e09ac6 100644 --- a/weechat/src/gui/gui.h +++ b/weechat/src/gui/gui.h @@ -164,6 +164,9 @@ enum t_weechat_color #define gui_printf_nolog_notime(buffer, fmt, argz...) \ gui_printf_internal(buffer, 0, MSG_TYPE_NOLOG, fmt, ##argz) +#define WINDOW_MIN_WIDTH 10 +#define WINDOW_MIN_HEIGHT 5 + #define NOTIFY_LEVEL_MIN 0 #define NOTIFY_LEVEL_MAX 3 #define NOTIFY_LEVEL_DEFAULT NOTIFY_LEVEL_MAX @@ -261,6 +264,7 @@ struct t_gui_buffer t_gui_buffer *next_buffer; /* link to next buffer */ }; +typedef struct t_gui_window_tree t_gui_window_tree; typedef struct t_gui_window t_gui_window; struct t_gui_window @@ -268,6 +272,11 @@ struct t_gui_window /* global position & size */ int win_x, win_y; /* position of window */ int win_width, win_height; /* window geometry */ + int win_width_pct; /* % of width (compared to term size) */ + int win_height_pct; /* % of height (compared to term size) */ + + int new_x, new_y; /* used for computing new position */ + int new_width, new_height; /* used for computing new size */ /* chat window settings */ int win_chat_x, win_chat_y; /* chat window position */ @@ -320,10 +329,26 @@ struct t_gui_window t_gui_line *start_line; /* pointer to line if scrolling */ int start_line_pos; /* position in first line displayed */ + t_gui_window_tree *ptr_tree; /* pointer to leaf in windows tree */ + t_gui_window *prev_window; /* link to previous window */ t_gui_window *next_window; /* link to next window */ }; +struct t_gui_window_tree +{ + t_gui_window_tree *parent_node; /* pointer to parent node */ + + /* node info */ + int split_horiz; /* 1 if horizontal, 0 if vertical */ + int split_pct; /* % of split size (represents child1) */ + t_gui_window_tree *child1; /* first child, NULL if a leaf */ + t_gui_window_tree *child2; /* second child, NULL if a leaf */ + + /* leaf info */ + t_gui_window *window; /* pointer to window, NULL if a node */ +}; + typedef struct t_gui_key t_gui_key; struct t_gui_key @@ -353,6 +378,7 @@ extern int gui_add_hotlist; extern t_gui_window *gui_windows; extern t_gui_window *last_gui_window; extern t_gui_window *gui_current_window; +extern t_gui_window_tree *gui_windows_tree; extern t_gui_buffer *gui_buffers; extern t_gui_buffer *last_gui_buffer; extern t_gui_buffer *buffer_before_dcc; @@ -369,7 +395,10 @@ extern t_gui_color *gui_color[NUM_COLORS]; /* GUI independent functions: windows & buffers */ -extern t_gui_window *gui_window_new (int, int, int, int); +extern int gui_window_tree_init (t_gui_window *); +extern void gui_window_tree_node_to_leaf (t_gui_window_tree *, t_gui_window *); +extern void gui_window_tree_free (t_gui_window_tree **); +extern t_gui_window *gui_window_new (t_gui_window *, int, int, int, int, int, int); extern t_gui_buffer *gui_buffer_new (t_gui_window *, void *, void *, int, int); extern void gui_buffer_clear (t_gui_buffer *); extern void gui_buffer_clear_all (); @@ -480,13 +509,9 @@ extern void gui_window_nick_end (t_gui_window *); extern void gui_window_nick_page_up (t_gui_window *); extern void gui_window_nick_page_down (t_gui_window *); extern void gui_window_init_subwindows (t_gui_window *); -extern void gui_window_split_horiz (t_gui_window *); -extern void gui_window_split_vertic (t_gui_window *); -extern int gui_window_merge_up (t_gui_window *); -extern int gui_window_merge_down (t_gui_window *); -extern int gui_window_merge_left (t_gui_window *); -extern int gui_window_merge_right (t_gui_window *); -extern void gui_window_merge_auto (t_gui_window *); +extern void gui_window_split_horiz (t_gui_window *, int); +extern void gui_window_split_vertic (t_gui_window *, int); +extern int gui_window_merge (t_gui_window *); extern void gui_window_merge_all (t_gui_window *); extern void gui_refresh_screen (); extern void gui_pre_init (int *, char **[]); |