Add buffer merging feature, with /buffer merge/unmerge (task #7404)

1 files changed, 79 insertions, 39 deletions

diff --git a/po/cs.po b/po/cs.po
index e11a7eddd..2cc9b50c1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2009-06-02 15:54+0200\n"
+"POT-Creation-Date: 2009-06-08 22:24+0200\n"
 "PO-Revision-Date: 2009-05-11 13:02+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -771,8 +771,9 @@ msgid "manage buffers"
 msgstr "řídit buffery"
 
 msgid ""
-"[clear [number | -all] | move number | close [n1[-n2]]| list | notify level "
-"| localvar | set property value | number | name]"
+"[clear [number | -all] | move number | merge number | unmerge [number] | "
+"close [n1[-n2]]| list | notify level | localvar | set property value | "
+"number | name]"
 msgstr ""
 
 #, fuzzy
@@ -780,6 +781,10 @@ msgid ""
 "   clear: clear buffer content (-all for all buffers, number for a buffer, "
 "or nothing for current buffer)\n"
 "    move: move buffer in the list (may be relative, for example -1)\n"
+"   merge: merge current buffer to another buffer (chat area will be mix of "
+"both buffers)\n"
+"          (by default ctrl-x switches between merged buffers)\n"
+" unmerge: unmerge buffer from other buffers which have same number\n"
 "   close: close buffer (number/range is optional)\n"
 "    list: list buffers (no parameter implies this list)\n"
 "  notify: set notify level for current buffer: this level determines whether "
@@ -799,13 +804,15 @@ msgid ""
 "    name: jump to buffer by (partial) name\n"
 "\n"
 "Examples:\n"
-"clear current buffer: /buffer clear\n"
-"   clear all buffers: /buffer clear -all\n"
-"         move buffer: /buffer move 5\n"
-"close current buffer: /buffer close\n"
-"close buffers 5 to 7: /buffer close 5-7\n"
-"    jump to #weechat: /buffer #weechat\n"
-" jump to next buffer: /buffer +1"
+"  clear current buffer: /buffer clear\n"
+"     clear all buffers: /buffer clear -all\n"
+"           move buffer: /buffer move 5\n"
+"merge with core buffer: /buffer merge 1\n"
+"        unmerge buffer: /buffer unmerge\n"
+"  close current buffer: /buffer close\n"
+"  close buffers 5 to 7: /buffer close 5-7\n"
+"      jump to #weechat: /buffer #weechat\n"
+"   jump to next buffer: /buffer +1"
 msgstr ""
 "  akce: akce pro vykonání:\n"
 "  move: přesune buffer v seznamu (může být relativní, například -1)\n"
@@ -1424,6 +1431,11 @@ msgstr "zarovnání prefixu (none, left, right (výchozí))"
 msgid "max size for prefix (0 = no max size)"
 msgstr "maximální velikost prefixu (0 = žádná maximální velikost)"
 
+msgid ""
+"prefix alignment for buffer name, when many buffers are merged with same "
+"number (none, left, right (default))"
+msgstr ""
+
 msgid "string displayed after prefix"
 msgstr "řetězec zobrazený za prefixem"
 
@@ -1475,6 +1487,11 @@ msgstr "barva času v okně rozhovoru"
 msgid "text color for time delimiters"
 msgstr "barva děličů v infobaru"
 
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+
 #, fuzzy
 msgid "text color for error prefix"
 msgstr "barva pro šipku pri 'join' (prefix)"
@@ -2107,9 +2124,9 @@ msgid "%sError: a buffer with same name (%s) already exists"
 msgstr ""
 "%s nemohu načíst plugin \"%s\": plugin se stejným jménem již existuje\n"
 
-#, fuzzy
-msgid "Not enough memory for new line"
-msgstr "Nedostatek paměti pro nový řádek\n"
+#, c-format
+msgid "%sError: it is only possible to merge buffers with formatted content"
+msgstr ""
 
 #, fuzzy
 msgid "names of buffers"
@@ -2205,6 +2222,10 @@ msgstr "%s nemohu napojit kalávesu \"%s\"\n"
 msgid "Error: not enough memory for key binding"
 msgstr "%s nedostatek paměti pro klávesovou zkratku\n"
 
+#, fuzzy
+msgid "Not enough memory for new line"
+msgstr "Nedostatek paměti pro nový řádek\n"
+
 #, fuzzy, c-format
 msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s cyklický odkaz při volání aliasu \"/%s\"\n"
@@ -2551,10 +2572,6 @@ msgstr ""
 msgid "away"
 msgstr ""
 
-#, fuzzy
-msgid "servers"
-msgstr "server"
-
 msgid "Lag"
 msgstr ""
 
@@ -2589,11 +2606,11 @@ msgid "%s%s: cannot find nick for sending message"
 msgstr "%s nemohu najít přezdívku pro poslání zprávy\n"
 
 #, fuzzy, c-format
-msgid "%s%s: future away: %s"
+msgid "%s: future away: %s"
 msgstr "Budoucí zpráva o nepřítomnosit na %s%s%s: %s\n"
 
 #, fuzzy, c-format
-msgid "%s%s: future away removed"
+msgid "%s: future away removed"
 msgstr "Budoucí zpráva o nepřítomnosti na %s%s%s odebrána.\n"
 
 #, fuzzy, c-format
@@ -2633,7 +2650,7 @@ msgid "%s%s: not connected to server \"%s\"!"
 msgstr "%s nepřipojen k serveru \"%s\"!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: auto-reconnection is cancelled"
+msgid "%s: auto-reconnection is cancelled"
 msgstr "Automatické znovupřipojené je zrušeno\n"
 
 #, fuzzy, c-format
@@ -3339,7 +3356,7 @@ msgid ""
 "[list [servername]] | [listfull [servername]] | [add servername hostname[/"
 "port] [-auto | -noauto] [-ipv6] [-ssl]] | [copy servername newservername] | "
 "[rename servername newservername] | [keep servername] | [del servername] | "
-"[deloutq] | [raw] | [switch]"
+"[deloutq] | [raw]"
 msgstr ""
 "[list [jméno_serveru]] | [listfull [jméno_serveru]] | [add jméno_serveru "
 "jméno_hosta [-port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd "
@@ -3368,8 +3385,6 @@ msgid ""
 "   deloutq: delete messages out queue for all servers (all messages WeeChat "
 "is currently sending)\n"
 "       raw: open buffer with raw IRC data\n"
-"    switch: switch active server (when one buffer is used for all servers, "
-"default key: alt-s on server buffer)\n"
 "\n"
 "Examples:\n"
 "  /server listfull\n"
@@ -3744,8 +3759,9 @@ msgstr "%s nedostatek paměti pro infobar zprávu\n"
 msgid "use nick color in messages from server"
 msgstr "získat lokální čas ze serveru"
 
-msgid "use same buffer for all servers"
-msgstr "pužít stejný buffer pro všechny servery"
+#, fuzzy
+msgid "merge server buffers"
+msgstr "řídit buffery"
 
 msgid "open new channels/privates near server"
 msgstr "otevřít nový kanál/soukromý rozhovor poblíž serveru"
@@ -3918,9 +3934,6 @@ msgstr "zakázat přezdívky nebo hosty"
 msgid "get buffer pointer for an IRC server/channel"
 msgstr ""
 
-msgid "currently selected server (only if one buffer is used for all servers)"
-msgstr ""
-
 #, fuzzy
 msgid "list of IRC servers"
 msgstr "heslo pro IRC server"
@@ -4231,7 +4244,7 @@ msgstr ""
 "serverem!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
+msgid "%s: nickname \"%s\" is already in use, trying nickname #%d (\"%s\")"
 msgstr ""
 "%s: přezdívka \"%s\" je již používaná, zkouším druhou přezdívku \"%s\"\n"
 
@@ -4299,19 +4312,19 @@ msgid "%s%s: cannot read data from socket, disconnecting from server..."
 msgstr "%s nemůžu přečíst data ze soketu, odpojuji se od serveru...\n"
 
 #, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s: lag is high, disconnecting from server..."
 msgstr "%s zpoždění je veliké, odpojuji se od serveru...\n"
 
 #, fuzzy, c-format
-msgid "%s%s: reconnecting to server in %d %s"
+msgid "%s: reconnecting to server in %d %s"
 msgstr "%s: Navazuji nové spojení se serverem za %d sekund\n"
 
 #, fuzzy, c-format
-msgid "%s%s: switching address to %s/%d"
+msgid "%s: switching address to %s/%d"
 msgstr "%s IP adresa nenalezena\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connected to %s (%s)"
+msgid "%s: connected to %s (%s)"
 msgstr "%s nepřipojen k serveru \"%s\"!\n"
 
 #, fuzzy, c-format
@@ -4391,7 +4404,7 @@ msgstr ""
 "GNUtls\n"
 
 #, fuzzy, c-format
-msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
+msgid "%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "%s: připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
@@ -4399,6 +4412,10 @@ msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
 msgstr "Připojuji se k serveru %s:%d%s%s přes %s proxy %s:%d%s...\n"
 
 #, fuzzy, c-format
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr "%s: připojuji se k serveru %s:%d%s%s...\n"
+
+#, fuzzy, c-format
 msgid "%s%s: connecting to server %s/%d%s%s..."
 msgstr "%s: připojuji se k serveru %s:%d%s%s...\n"
 
@@ -4415,13 +4432,25 @@ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
 msgstr "%s nemohu nastavit nastavení soketu \"SO_KEEPALIVE\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: reconnecting to server..."
+msgid "%s: reconnecting to server..."
 msgstr "%s: Připojuji se znovu k serveru...\n"
 
 #, fuzzy, c-format
 msgid "%s%s: disconnected from server"
 msgstr "Odpojen od serveru!\n"
 
+#, fuzzy, c-format
+msgid "%s: disconnected from server"
+msgstr "Odpojen od serveru!\n"
+
+#, fuzzy
+msgid "servers"
+msgstr "server"
+
+#, fuzzy, c-format
+msgid "%s%s: auto-reconnection is cancelled"
+msgstr "Automatické znovupřipojené je zrušeno\n"
+
 #, fuzzy
 msgid "list, add or remove Jabber servers"
 msgstr "vypíše, přídá nebo odebere servery"
@@ -4594,6 +4623,9 @@ msgstr ""
 msgid "automatically rejoin MUCs when kicked"
 msgstr "automaticky znovu přijít na kanál po vykopnutí"
 
+msgid "use same buffer for all servers"
+msgstr "pužít stejný buffer pro všechny servery"
+
 #, fuzzy
 msgid "open new MUCs/privates near server"
 msgstr "otevřít nový kanál/soukromý rozhovor poblíž serveru"
@@ -4665,6 +4697,14 @@ msgid "%s%s: cannot allocate new MUC"
 msgstr "%s nemohu přidělit nový kanál"
 
 #, fuzzy, c-format
+msgid "%s%s: reconnecting to server in %d %s"
+msgstr "%s: Navazuji nové spojení se serverem za %d sekund\n"
+
+#, fuzzy, c-format
+msgid "%s%s: connected to %s (%s)"
+msgstr "%s nepřipojen k serveru \"%s\"!\n"
+
+#, fuzzy, c-format
 msgid "%s%s: GnuTLS init error"
 msgstr "%s chyba inicializace gnutls\n"
 
@@ -4709,6 +4749,10 @@ msgid "%s%s: failed to create id"
 msgstr "%s DCC: nemohu vytvořit rouru\n"
 
 #, fuzzy, c-format
+msgid "%s%s: reconnecting to server..."
+msgstr "%s: Připojuji se znovu k serveru...\n"
+
+#, fuzzy, c-format
 msgid "%s%s: I/O error (%d)"
 msgstr "%sServer: %s%s\n"
 
@@ -6288,7 +6332,3 @@ msgstr "%s chybí argument pro volbu \"%s\"\n"
 #, fuzzy
 #~ msgid "Saved buffers layout:"
 #~ msgstr "Seznam bufferů:"
-
-#, fuzzy
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: připojuji se k serveru %s:%d%s%s...\n"