summaryrefslogtreecommitdiff
path: root/po
diff options
context:
space:
mode:
Diffstat (limited to 'po')
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/cs.po118
-rw-r--r--po/de.po118
-rw-r--r--po/es.po118
-rw-r--r--po/fr.po203
-rw-r--r--po/hu.po118
-rw-r--r--po/pl.po105
-rw-r--r--po/ru.po118
-rw-r--r--po/srcfiles.cmake2
-rw-r--r--po/weechat.pot105
10 files changed, 667 insertions, 340 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 154e34ed3..bce7889db 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -74,6 +74,8 @@
./src/gui/gui-keyboard.h
./src/gui/gui-layout.c
./src/gui/gui-layout.h
+./src/gui/gui-line.c
+./src/gui/gui-line.h
./src/gui/gui-main.h
./src/gui/gui-nicklist.c
./src/gui/gui-nicklist.h
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"
diff --git a/po/de.po b/po/de.po
index 31c50892b..9cd123aef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,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: Thomas Schuetz <i18n@internet-villa.de>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -828,8 +828,9 @@ msgid "manage buffers"
msgstr "Puffer verwalten"
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
@@ -837,6 +838,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 "
@@ -856,13 +861,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 ""
" Aktion: Pufferaktion:\n"
" move: Puffer in der Liste bewegen (kann auch relativ sein, wie -1)\n"
@@ -1447,6 +1454,11 @@ msgstr "Nicklisten-Position (top, left, right (Standard), bottom)"
msgid "max size for prefix (0 = no max size)"
msgstr ""
+msgid ""
+"prefix alignment for buffer name, when many buffers are merged with same "
+"number (none, left, right (default))"
+msgstr ""
+
#, fuzzy
msgid "string displayed after prefix"
msgstr "Nach Nickvervollständigung anzufügende Zeichenfolge"
@@ -1499,6 +1511,11 @@ msgstr "Farbe der Zeit im Chatfenster"
msgid "text color for time delimiters"
msgstr "Farbe der Infobar-Trennzeichen"
+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 "Farbe des join-Pfeiles (Präfix)"
@@ -2116,9 +2133,9 @@ msgstr ""
"%s kann Plugin \"%s\" nicht laden: ein gleichnamiges Plugin existiert "
"bereits\n"
-#, fuzzy
-msgid "Not enough memory for new line"
-msgstr "Nicht genügend Speicher für neue Zeile\n"
+#, c-format
+msgid "%sError: it is only possible to merge buffers with formatted content"
+msgstr ""
#, fuzzy
msgid "names of buffers"
@@ -2214,6 +2231,10 @@ msgstr "%s kann die Taste \"%s\" nicht zuordnen\n"
msgid "Error: not enough memory for key binding"
msgstr "%s nicht genügend Speicher für Tastenzuordnung\n"
+#, fuzzy
+msgid "Not enough memory for new line"
+msgstr "Nicht genügend Speicher für neue Zeile\n"
+
#, fuzzy, c-format
msgid "%s%s: error, circular reference when calling alias \"%s\""
msgstr "%s Zirkelbezug beim Aufruf des Aliases \"/%s\"\n"
@@ -2554,10 +2575,6 @@ msgstr ""
msgid "away"
msgstr ""
-#, fuzzy
-msgid "servers"
-msgstr "Server"
-
msgid "Lag"
msgstr ""
@@ -2594,11 +2611,11 @@ msgstr ""
"%s kann keinen Nickname finden, an den die Nachricht gesendet werden soll\n"
#, fuzzy, c-format
-msgid "%s%s: future away: %s"
+msgid "%s: future away: %s"
msgstr "/ignore-Regel entfernt.\n"
#, fuzzy, c-format
-msgid "%s%s: future away removed"
+msgid "%s: future away removed"
msgstr "/ignore-Regel entfernt.\n"
#, fuzzy, c-format
@@ -2638,7 +2655,7 @@ msgid "%s%s: not connected to server \"%s\"!"
msgstr "%s keine Verbindung zum Server \"%s\"!\n"
#, fuzzy, c-format
-msgid "%s%s: auto-reconnection is cancelled"
+msgid "%s: auto-reconnection is cancelled"
msgstr "Automatisches Neuverbinden abgebrochen\n"
#, fuzzy, c-format
@@ -3337,7 +3354,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 ""
"[Servername] | [Servername Hostname Port [-auto | -noauto] [-ipv6] [-ssl] [-"
"pwd Passwort] [-nicks Nick1 Nick2 Nick3] [-username Benutzername] [-realname "
@@ -3362,8 +3379,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"
@@ -3721,8 +3736,9 @@ msgstr "%s nicht genügend Speicher für Infobar-Nachricht\n"
msgid "use nick color in messages from server"
msgstr "Ortszeit des Servers abfragen"
-msgid "use same buffer for all servers"
-msgstr "benutze den gleichen Puffer für alle Server"
+#, fuzzy
+msgid "merge server buffers"
+msgstr "Puffer verwalten"
msgid "open new channels/privates near server"
msgstr "öffne neue Channels oder private Nachrichten neben dem Server-Puffer"
@@ -3895,9 +3911,6 @@ msgstr "Nicknames oder Hosts sperren/verbannen"
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 "Port des IRC-Servers"
@@ -4208,7 +4221,7 @@ msgstr ""
"getrennt!\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: Nickname \"%s\" wird bereits verwendet, versuche 2. Nickname \"%s\"\n"
@@ -4270,19 +4283,19 @@ msgid "%s%s: cannot read data from socket, disconnecting from server..."
msgstr "%s Socket-Lesefehler, die Serververbindung wird getrennt...\n"
#, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s: lag is high, disconnecting from server..."
msgstr "%s der Lag ist hoch, die Verbindung wird getrennt...\n"
#, fuzzy, c-format
-msgid "%s%s: reconnecting to server in %d %s"
+msgid "%s: reconnecting to server in %d %s"
msgstr "%s: Neuverbinden in %d Sekunden\n"
#, fuzzy, c-format
-msgid "%s%s: switching address to %s/%d"
+msgid "%s: switching address to %s/%d"
msgstr "%s IP-Adresse nicht gefunden\n"
#, fuzzy, c-format
-msgid "%s%s: connected to %s (%s)"
+msgid "%s: connected to %s (%s)"
msgstr "%s keine Verbindung zum Server \"%s\"!\n"
#, fuzzy, c-format
@@ -4362,7 +4375,7 @@ msgstr ""
"kompiliert wurde\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: verbinden zu Server %s:%d%s%s via %s-Proxy %s:%d%s...\n"
#, fuzzy, c-format
@@ -4370,6 +4383,10 @@ msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
msgstr "verbinden zu Server %s:%d%s%s via %s-Proxy %s:%d%s...\n"
#, fuzzy, c-format
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr "%s: verbinden zu Server %s:%d%s%s...\n"
+
+#, fuzzy, c-format
msgid "%s%s: connecting to server %s/%d%s%s..."
msgstr "%s: verbinden zu Server %s:%d%s%s...\n"
@@ -4386,13 +4403,25 @@ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
msgstr "%s Fehler beim Setzen der Socketoption \"SO_KEEPALIVE\"\n"
#, fuzzy, c-format
-msgid "%s%s: reconnecting to server..."
+msgid "%s: reconnecting to server..."
msgstr "%s: Neuverbinden zum Server...\n"
#, fuzzy, c-format
msgid "%s%s: disconnected from server"
msgstr "Vom Server getrennt!\n"
+#, fuzzy, c-format
+msgid "%s: disconnected from server"
+msgstr "Vom Server getrennt!\n"
+
+#, fuzzy
+msgid "servers"
+msgstr "Server"
+
+#, fuzzy, c-format
+msgid "%s%s: auto-reconnection is cancelled"
+msgstr "Automatisches Neuverbinden abgebrochen\n"
+
#, fuzzy
msgid "list, add or remove Jabber servers"
msgstr "Auflisten, Hinzufügen oder Entfernen von Servern"
@@ -4539,6 +4568,9 @@ msgstr ""
msgid "automatically rejoin MUCs when kicked"
msgstr "Channels nach Kick automatisch wieder betreten, falls möglich"
+msgid "use same buffer for all servers"
+msgstr "benutze den gleichen Puffer für alle Server"
+
#, fuzzy
msgid "open new MUCs/privates near server"
msgstr "öffne neue Channels oder private Nachrichten neben dem Server-Puffer"
@@ -4613,6 +4645,14 @@ msgid "%s%s: cannot allocate new MUC"
msgstr "%s Neuer Channel konnte nicht alloziert werden"
#, fuzzy, c-format
+msgid "%s%s: reconnecting to server in %d %s"
+msgstr "%s: Neuverbinden in %d Sekunden\n"
+
+#, fuzzy, c-format
+msgid "%s%s: connected to %s (%s)"
+msgstr "%s keine Verbindung zum Server \"%s\"!\n"
+
+#, fuzzy, c-format
msgid "%s%s: GnuTLS init error"
msgstr "%s gnutls Initialisierungsfehler\n"
@@ -4657,6 +4697,10 @@ msgid "%s%s: failed to create id"
msgstr "%s DCC: kann keine Pipe erstellen\n"
#, fuzzy, c-format
+msgid "%s%s: reconnecting to server..."
+msgstr "%s: Neuverbinden zum Server...\n"
+
+#, fuzzy, c-format
msgid "%s%s: I/O error (%d)"
msgstr "%sServer: %s%s\n"
@@ -6166,7 +6210,3 @@ msgstr "%s fehlende Argumente für die \"--dir\"-Option\n"
#~ msgid "-MORE-"
#~ msgstr "-MEHR-"
-
-#, fuzzy
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: verbinden zu Server %s:%d%s%s...\n"
diff --git a/po/es.po b/po/es.po
index 8655ff587..c8a3c8a63 100644
--- a/po/es.po
+++ b/po/es.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: Roberto González Cardenete <robert.glez@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -824,8 +824,9 @@ msgid "manage buffers"
msgstr "gestionar los búfers"
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
@@ -833,6 +834,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 "
@@ -852,13 +857,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 ""
" acción: acción a efectuar:\n"
" move: desplaza el búfer en la lista (puede ser relativo, por ejemplo, -"
@@ -1426,6 +1433,11 @@ msgstr ""
msgid "max size for prefix (0 = no max size)"
msgstr ""
+msgid ""
+"prefix alignment for buffer name, when many buffers are merged with same "
+"number (none, left, right (default))"
+msgstr ""
+
#, fuzzy
msgid "string displayed after prefix"
msgstr "la cadena mostrada tras la finalización de los nombres de usuario"
@@ -1480,6 +1492,11 @@ msgstr "color para la hora en la ventana de conversación"
msgid "text color for time delimiters"
msgstr "color para los delimitadores de la barra de información"
+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 "color para la flecha de join (prefijo)"
@@ -2095,9 +2112,9 @@ msgstr ""
"%s no ha sido posible cargar el plugin \"%s\": un plugin con el mismo nombre "
"ya existe\n"
-#, fuzzy
-msgid "Not enough memory for new line"
-msgstr "No hay suficiente memoria para una nueva línea\n"
+#, c-format
+msgid "%sError: it is only possible to merge buffers with formatted content"
+msgstr ""
#, fuzzy
msgid "names of buffers"
@@ -2193,6 +2210,10 @@ msgstr "%s No ha sido posible atar la clave \"%s\"\n"
msgid "Error: not enough memory for key binding"
msgstr "%s no hay suficiente memoria para atar la clave\n"
+#, fuzzy
+msgid "Not enough memory for new line"
+msgstr "No hay suficiente memoria para una nueva línea\n"
+
#, fuzzy, c-format
msgid "%s%s: error, circular reference when calling alias \"%s\""
msgstr "%s referencia circular al llamar alias \"/%s\"\n"
@@ -2530,10 +2551,6 @@ msgstr ""
msgid "away"
msgstr ""
-#, fuzzy
-msgid "servers"
-msgstr "servidor"
-
msgid "Lag"
msgstr ""
@@ -2568,11 +2585,11 @@ msgid "%s%s: cannot find nick for sending message"
msgstr "%s no ha sido posible encontrar el usuario al que enviar el mensaje\n"
#, fuzzy, c-format
-msgid "%s%s: future away: %s"
+msgid "%s: future away: %s"
msgstr "el ignore fue eliminado.\n"
#, fuzzy, c-format
-msgid "%s%s: future away removed"
+msgid "%s: future away removed"
msgstr "el ignore fue eliminado.\n"
#, fuzzy, c-format
@@ -2613,7 +2630,7 @@ msgid "%s%s: not connected to server \"%s\"!"
msgstr "%s ¡no conectado al servidor \"%s\"!\n"
#, fuzzy, c-format
-msgid "%s%s: auto-reconnection is cancelled"
+msgid "%s: auto-reconnection is cancelled"
msgstr "La reconexión automática está anulada\n"
#, fuzzy, c-format
@@ -3321,7 +3338,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 ""
"[nombre_de_servidor] | [nombre_de_servidor nombre/IP puerto [-auto | -"
"noauto] [-ipv6] [-ssl] [-pwd contraseña] [-nicks alias1 alias2 alias3] [-"
@@ -3347,8 +3364,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"
@@ -3710,8 +3725,9 @@ msgstr ""
msgid "use nick color in messages from server"
msgstr "pedir la hora local del servidor"
-msgid "use same buffer for all servers"
-msgstr "usar el mismo búfer para todos los servidores"
+#, fuzzy
+msgid "merge server buffers"
+msgstr "gestionar los búfers"
msgid "open new channels/privates near server"
msgstr "abrir nuevos canales/privados cerca del servidor"
@@ -3882,9 +3898,6 @@ msgstr "banea usuarios o máquinas"
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 "puerto para el servidor IRC"
@@ -4196,7 +4209,7 @@ msgstr ""
"conexión con el servidor!\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: el nombre de usuario \"%s\" ya está en uso, probando con el 2 nombre de "
"usuario \"%s\"\n"
@@ -4262,19 +4275,19 @@ msgstr ""
"%s no ha sido posible leer datos del socket, desconectando del servidor...\n"
#, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s: lag is high, disconnecting from server..."
msgstr "%s el lag (retraso) es alto, desconectando del servidor...\n"
#, fuzzy, c-format
-msgid "%s%s: reconnecting to server in %d %s"
+msgid "%s: reconnecting to server in %d %s"
msgstr "%s: Reconexión al servidor en %d segundos\n"
#, fuzzy, c-format
-msgid "%s%s: switching address to %s/%d"
+msgid "%s: switching address to %s/%d"
msgstr "%s Dirección IP no encontrada\n"
#, fuzzy, c-format
-msgid "%s%s: connected to %s (%s)"
+msgid "%s: connected to %s (%s)"
msgstr "%s ¡no conectado al servidor \"%s\"!\n"
#, fuzzy, c-format
@@ -4354,7 +4367,7 @@ msgstr ""
"con soporte 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: conectando al servidor %s:%d%s%s vía %s proxy %s: %d%s...\n"
#, fuzzy, c-format
@@ -4362,6 +4375,10 @@ msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
msgstr "Conectando al servidor %s:%d%s%s vía %s proxy %s:%d%s...\n"
#, fuzzy, c-format
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr "%s: conectando al servidor %s:%d%s%s...\n"
+
+#, fuzzy, c-format
msgid "%s%s: connecting to server %s/%d%s%s..."
msgstr "%s: conectando al servidor %s:%d%s%s...\n"
@@ -4378,13 +4395,25 @@ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
msgstr "%s no ha sido posible configurar la opción socket \"SO_KEEPALIVE\"\n"
#, fuzzy, c-format
-msgid "%s%s: reconnecting to server..."
+msgid "%s: reconnecting to server..."
msgstr "%s: Reconectando al servidor...\n"
#, fuzzy, c-format
msgid "%s%s: disconnected from server"
msgstr "¡Desconectado del servidor!\n"
+#, fuzzy, c-format
+msgid "%s: disconnected from server"
+msgstr "¡Desconectado del servidor!\n"
+
+#, fuzzy
+msgid "servers"
+msgstr "servidor"
+
+#, fuzzy, c-format
+msgid "%s%s: auto-reconnection is cancelled"
+msgstr "La reconexión automática está anulada\n"
+
#, fuzzy
msgid "list, add or remove Jabber servers"
msgstr "lista, añde o elimina servidores"
@@ -4528,6 +4557,9 @@ msgstr ""
msgid "automatically rejoin MUCs when kicked"
msgstr "unirse de nuevo automáticamente a los canales cuando sea expulsado"
+msgid "use same buffer for all servers"
+msgstr "usar el mismo búfer para todos los servidores"
+
#, fuzzy
msgid "open new MUCs/privates near server"
msgstr "abrir nuevos canales/privados cerca del servidor"
@@ -4601,6 +4633,14 @@ msgid "%s%s: cannot allocate new MUC"
msgstr "%s no ha sido posible crear un nuevo canal"
#, fuzzy, c-format
+msgid "%s%s: reconnecting to server in %d %s"
+msgstr "%s: Reconexión al servidor en %d segundos\n"
+
+#, fuzzy, c-format
+msgid "%s%s: connected to %s (%s)"
+msgstr "%s ¡no conectado al servidor \"%s\"!\n"
+
+#, fuzzy, c-format
msgid "%s%s: GnuTLS init error"
msgstr "%s error de inicialización de gnutls\n"
@@ -4645,6 +4685,10 @@ msgid "%s%s: failed to create id"
msgstr "%s no es posible crear el servidor\n"
#, fuzzy, c-format
+msgid "%s%s: reconnecting to server..."
+msgstr "%s: Reconectando al servidor...\n"
+
+#, fuzzy, c-format
msgid "%s%s: I/O error (%d)"
msgstr "%sServidor: %s%s\n"
@@ -6147,7 +6191,3 @@ msgstr "%s falta un argumento para la opción --dir\n"
#~ msgid "-MORE-"
#~ msgstr "-MÁS-"
-
-#, fuzzy
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: conectando al servidor %s:%d%s%s...\n"
diff --git a/po/fr.po b/po/fr.po
index 526bcad60..9cf850a39 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ 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"
-"PO-Revision-Date: 2009-06-02 15:55+0200\n"
+"POT-Creation-Date: 2009-06-08 22:24+0200\n"
+"PO-Revision-Date: 2009-06-08 22:24+0200\n"
"Last-Translator: FlashCode <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"MIME-Version: 1.0\n"
@@ -827,16 +827,22 @@ msgid "manage buffers"
msgstr "gestion des tampons"
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 ""
-"[clear [nombre | -all] | move nombre | close [n1[-n2]] | list | notify "
-"niveau | localvar | set propriété valeur | nombre | nom]"
+"[clear [nombre | -all] | move nombre | merge nombre | unmerge [nombre] | "
+"close [n1[-n2]] | list | notify niveau | localvar | set propriété valeur | "
+"nombre | nom]"
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 "
@@ -856,18 +862,25 @@ 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 ""
" clear: efface le contenu du tampon (-all pour tous les tampons, un numéro "
"pour un tampon, ou rien pour le tampon courant)\n"
" move: déplace le tampon dans la liste (peut être relatif, par exemple -"
"1)\n"
+" merge: mélange le tampon courant avec un autre tampon (la zone de "
+"discussion sera un mélange des deux tampons)\n"
+" (par défaut ctrl-x bascule entre les tampons mélangés)\n"
+" unmerge: détache le tampon courant des autres tampons portant le même "
+"numéro\n"
" close: ferme le tampon (nombre/intervalle optionnel)\n"
" list: liste les tampons ouverts (pas de paramètre affiche cette liste)\n"
" notify: définit le niveau de notification pour le tampon courant: ce "
@@ -887,13 +900,15 @@ msgstr ""
" nom: saute au tampon par nom (partiel)\n"
"\n"
"Exemples:\n"
-"effacer le tampon courant: /buffer clear\n"
-" effacer tous les tampons: /buffer clear -all\n"
-" déplacer le tampon: /buffer move 5\n"
-" fermer le tampon courant: /buffer close\n"
-" fermer les tampons 5 à 7: /buffer close 5-7\n"
-" aller sur #weechat: /buffer #weechat\n"
-" aller au tampon suivant: /buffer +1"
+" effacer le tampon courant: /buffer clear\n"
+" effacer tous les tampons: /buffer clear -all\n"
+" déplacer le tampon: /buffer move 5\n"
+"mélanger avec le tampon core: /buffer merge 1\n"
+" détacher le tampon: /buffer unmerge\n"
+" fermer le tampon courant: /buffer close\n"
+" fermer les tampons 5 à 7: /buffer close 5-7\n"
+" aller sur #weechat: /buffer #weechat\n"
+" aller au tampon suivant: /buffer +1"
msgid "launch explicit WeeChat or plugin command"
msgstr "lancer explicitement une commande WeeChat ou d'une extension"
@@ -1595,6 +1610,13 @@ msgstr "alignement de préfixe (none, left, right (par défaut))"
msgid "max size for prefix (0 = no max size)"
msgstr "taille maximum pour le préfixe (0 = pas de taille maximum)"
+msgid ""
+"prefix alignment for buffer name, when many buffers are merged with same "
+"number (none, left, right (default))"
+msgstr ""
+"alignement de préfixe pour le nom du tampon, quand plusieurs tampons sont "
+"mélangés avec le même numéro (none, left, right (par défaut))"
+
msgid "string displayed after prefix"
msgstr "chaîne affichée après le préfixe"
@@ -1642,6 +1664,13 @@ msgstr "couleur du texte pour l'heure dans la fenêtre de discussion"
msgid "text color for time delimiters"
msgstr "couleur du texte pour les délimiteurs de l'heure"
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+"couleur du texte pour le nom du tampon (avant le préfixe, quand plusieurs "
+"tampons sont mélangés avec le numéro)"
+
msgid "text color for error prefix"
msgstr "couleur du texte pour le préfixe d'erreur"
@@ -2233,8 +2262,11 @@ msgstr "Notification changée pour \"%s%s.%s%s\": \"%s%s%s\" à \"%s%s%s\""
msgid "%sError: a buffer with same name (%s) already exists"
msgstr "%sErreur: un tampon avec le même nom (%s) existe déjà"
-msgid "Not enough memory for new line"
-msgstr "Pas assez de mémoire pour une nouvelle ligne"
+#, c-format
+msgid "%sError: it is only possible to merge buffers with formatted content"
+msgstr ""
+"%sErreur: il est possible de mélanger seulement des tampons avec du contenu "
+"formaté"
msgid "names of buffers"
msgstr "noms des tampons"
@@ -2310,6 +2342,9 @@ msgstr "Erreur: impossible de créer la touche \"%s\""
msgid "Error: not enough memory for key binding"
msgstr "Erreur: pas assez de mémoire pour la touche"
+msgid "Not enough memory for new line"
+msgstr "Pas assez de mémoire pour une nouvelle ligne"
+
#, c-format
msgid "%s%s: error, circular reference when calling alias \"%s\""
msgstr "%s%s: erreur, référence circulaire lors de l'appel à l'alias \"%s\""
@@ -2674,9 +2709,6 @@ msgstr "nom du tube FIFO"
msgid "away"
msgstr "absent"
-msgid "servers"
-msgstr "serveurs"
-
msgid "Lag"
msgstr "Lag"
@@ -2716,12 +2748,12 @@ msgid "%s%s: cannot find nick for sending message"
msgstr "%s%s: impossible de trouver le pseudo pour envoyer le message"
#, c-format
-msgid "%s%s: future away: %s"
-msgstr "%s%s: future absence: %s"
+msgid "%s: future away: %s"
+msgstr "%s: future absence: %s"
#, c-format
-msgid "%s%s: future away removed"
-msgstr "%s%s: future absence supprimée"
+msgid "%s: future away removed"
+msgstr "%s: future absence supprimée"
#, c-format
msgid "%s%s: \"%s\" command can only be executed in a channel buffer"
@@ -2762,8 +2794,8 @@ msgid "%s%s: not connected to server \"%s\"!"
msgstr "%s%s: non connecté au serveur \"%s\" !"
#, c-format
-msgid "%s%s: auto-reconnection is cancelled"
-msgstr "%s%s: la reconnexion automatique est annulée"
+msgid "%s: auto-reconnection is cancelled"
+msgstr "%s: la reconnexion automatique est annulée"
#, c-format
msgid "%s%s: server \"%s\" not found"
@@ -3475,12 +3507,12 @@ 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 [nom_serveur]] | [listfull [nom_serveur]] | [add nom_serveur nom[/"
"port] [-temp] [-auto | -noauto] [-ipv6] [-ssl]] | [copy nom_serveur "
"nouveau_nom_serveur] | [rename nom_serveur nouveau_nom_serveur] | [keep "
-"nom_serveur] | [del nom_serveur] | [deloutq] | [raw] | [switch]"
+"nom_serveur] | [del nom_serveur] | [deloutq] | [raw]"
msgid ""
" list: list servers (no parameter implies this list)\n"
@@ -3500,8 +3532,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"
@@ -3534,8 +3564,6 @@ msgstr ""
"serveurs (tous les messages que WeeChat est actuellement en train "
"d'envoyer)\n"
" raw: ouvre le tampon avec les données brutes IRC\n"
-" switch: changer le serveur actif (quand un tampon est utilisé pour tous "
-"les serveurs, touche par défaut: alt-s sur le tampon serveur)\n"
"\n"
"Exemples:\n"
" /server listfull\n"
@@ -3867,8 +3895,8 @@ msgstr "%s%s: erreur de création de l'option serveur \"%s\""
msgid "use nick color in messages from server"
msgstr "utiliser la couleur du pseudo dans les messages du serveur"
-msgid "use same buffer for all servers"
-msgstr "utiliser le même tampon pour tous les serveurs"
+msgid "merge server buffers"
+msgstr "mélange des tampons de serveur"
msgid "open new channels/privates near server"
msgstr "ouvrir les nouveaux canaux/privés près du serveur"
@@ -4041,11 +4069,6 @@ msgstr "retourne le pseudo à partir d'un host IRC"
msgid "get buffer pointer for an IRC server/channel"
msgstr "retourne le pointeur vers le tampon pour un serveur/canal IRC"
-msgid "currently selected server (only if one buffer is used for all servers)"
-msgstr ""
-"serveur actuellement sélectionné (seulement si un tampon est utilisé pour "
-"tous les serveurs)"
-
msgid "list of IRC servers"
msgstr "liste des serveurs IRC"
@@ -4354,10 +4377,10 @@ msgstr ""
"de la connexion avec le serveur"
#, 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%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le pseudo "
-"n°%d (\"%s\")"
+"%s: le pseudo \"%s\" est déjà en cours d'utilisation, essai avec le pseudo n°"
+"%d (\"%s\")"
#, c-format
msgid "%s%s: command \"%s\" not found:"
@@ -4425,20 +4448,20 @@ msgstr ""
"%s%s: impossible de lire des données sur la socket, déconnexion du serveur..."
#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
-msgstr "%s%s: le lag est élevé, déconnexion du serveur..."
+msgid "%s: lag is high, disconnecting from server..."
+msgstr "%s: le lag est élevé, déconnexion du serveur..."
#, c-format
-msgid "%s%s: reconnecting to server in %d %s"
-msgstr "%s%s: reconnexion au serveur dans %d %s"
+msgid "%s: reconnecting to server in %d %s"
+msgstr "%s: reconnexion au serveur dans %d %s"
#, c-format
-msgid "%s%s: switching address to %s/%d"
-msgstr "%s%s: bascule vers l'adresse %s/%d"
+msgid "%s: switching address to %s/%d"
+msgstr "%s: bascule vers l'adresse %s/%d"
#, c-format
-msgid "%s%s: connected to %s (%s)"
-msgstr "%s%s: connecté à %s (%s)"
+msgid "%s: connected to %s (%s)"
+msgstr "%s: connecté à %s (%s)"
#, c-format
msgid "%s%s: proxy address \"%s\" not found"
@@ -4521,14 +4544,18 @@ msgstr ""
"avec le support GnuTLS"
#, c-format
-msgid "%s%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
-msgstr "%s%s: connexion au serveur %s/%d%s%s via le proxy %s %s/%d%s..."
+msgid "%s: connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
+msgstr "%s: connexion au serveur %s/%d%s%s via le proxy %s %s/%d%s..."
#, c-format
msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
msgstr "Connexion au serveur %s/%d%s%s via le proxy %s %s/%d%s..."
#, c-format
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr "%s: connexion au serveur %s/%d%s%s..."
+
+#, c-format
msgid "%s%s: connecting to server %s/%d%s%s..."
msgstr "%s%s: connexion au serveur %s/%d%s%s..."
@@ -4545,13 +4572,24 @@ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
msgstr "%s%s: impossible d'activer l'option socket \"SO_KEEPALIVE\""
#, c-format
-msgid "%s%s: reconnecting to server..."
-msgstr "%s%s: reconnexion au serveur..."
+msgid "%s: reconnecting to server..."
+msgstr "%s: reconnexion au serveur..."
#, c-format
msgid "%s%s: disconnected from server"
msgstr "%s%s: déconnecté du serveur"
+#, c-format
+msgid "%s: disconnected from server"
+msgstr "%s: déconnecté du serveur"
+
+msgid "servers"
+msgstr "serveurs"
+
+#, c-format
+msgid "%s%s: auto-reconnection is cancelled"
+msgstr "%s%s: la reconnexion automatique est annulée"
+
msgid "list, add or remove Jabber servers"
msgstr "liste, ajoute ou retire des serveurs Jabber"
@@ -4712,6 +4750,9 @@ msgstr ""
msgid "automatically rejoin MUCs when kicked"
msgstr "rejoindre automatiquement les MUCs quand mis dehors"
+msgid "use same buffer for all servers"
+msgstr "utiliser le même tampon pour tous les serveurs"
+
msgid "open new MUCs/privates near server"
msgstr "ouvrir les nouveaux MUCs/privés près du serveur"
@@ -4781,6 +4822,14 @@ msgid "%s%s: cannot allocate new MUC"
msgstr "%s%s: impossible d'allouer un nouveau MUC"
#, c-format
+msgid "%s%s: reconnecting to server in %d %s"
+msgstr "%s%s: reconnexion au serveur dans %d %s"
+
+#, c-format
+msgid "%s%s: connected to %s (%s)"
+msgstr "%s%s: connecté à %s (%s)"
+
+#, c-format
msgid "%s%s: GnuTLS init error"
msgstr "%s%s: erreur d'initialisation GnuTLS"
@@ -4827,6 +4876,10 @@ msgid "%s%s: failed to create id"
msgstr "%s%s: impossible de créer l'id"
#, c-format
+msgid "%s%s: reconnecting to server..."
+msgstr "%s%s: reconnexion au serveur..."
+
+#, c-format
msgid "%s%s: I/O error (%d)"
msgstr "%s%s: erreur I/O (%d)"
@@ -5936,31 +5989,15 @@ msgstr "%s%s: impossible de positionner l'option \"nonblock\" pour la socket"
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: délai d'attente dépassé pour \"%s\" avec %s"
+#~ msgid "control server buffers attachment"
+#~ msgstr "contrôle de l'attachement des tampons de serveur"
+
#~ msgid ""
-#~ "port number (or range of ports) that relay plugin listens on (syntax: a "
-#~ "single port, ie. 5000 or a port range, ie. 5000-5015)"
-#~ msgstr ""
-#~ "numéro de port (ou intervalle de ports) sur lesquels écoute l'extension "
-#~ "relay (syntaxe: un port simple, par exemple 5000, un intervalle de ports, "
-#~ "par exemple 5000-5015)"
+#~ "attach server buffers into one buffer (optionally attached to core buffer)"
+#~ msgstr "attachement des tampons des serveurs"
#~ msgid ""
-#~ "allow user to send colors with special codes (\"^Cb\"=bold, \"^Ccxx"
-#~ "\"=color, \"^Ccxx,yy\"=color+background, \"^Cu\"=underline, \"^Cr"
-#~ "\"=reverse)"
+#~ "currently selected server (only if one buffer is used for all servers)"
#~ msgstr ""
-#~ "autorise l'utilisateur à envoyer des couleurs avec des codes spéciaux "
-#~ "(\"^Cb\"=gras, \"^Cxx\"=couleur, \"^Ccxx,yy\"=couleur+fond, \"^Cu"
-#~ "\"=souligné, \"^Cr\"=inversé)"
-
-#~ msgid "wait some time before executing a command"
-#~ msgstr "attendre un certain temps avant d'exécuter une commande"
-
-#~ msgid "filtered"
-#~ msgstr "filtré"
-
-#~ msgid "Bar \"%s\" is now hidden"
-#~ msgstr "La barre \"%s\" est maintenant cachée"
-
-#~ msgid "Bar \"%s\" is now visible"
-#~ msgstr "La barre \"%s\" est maintenant visible"
+#~ "serveur actuellement sélectionné (seulement si un tampon est utilisé pour "
+#~ "tous les serveurs)"
diff --git a/po/hu.po b/po/hu.po
index a25d73303..2536bcc43 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,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: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -828,8 +828,9 @@ msgid "manage buffers"
msgstr "pufferek kezelése"
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
@@ -837,6 +838,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 "
@@ -856,13 +861,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 ""
"utasítás: végrehajtandó utasítás:\n"
" move: puffer mozgatása a listában (lehet relatív is, például -1)\n"
@@ -1457,6 +1464,11 @@ msgstr "névlista helye (top, left, right (alapértelmezett), bottom)"
msgid "max size for prefix (0 = no max size)"
msgstr ""
+msgid ""
+"prefix alignment for buffer name, when many buffers are merged with same "
+"number (none, left, right (default))"
+msgstr ""
+
#, fuzzy
msgid "string displayed after prefix"
msgstr "névkiegészítés után beszúrt szöveg"
@@ -1509,6 +1521,11 @@ msgstr "idő színe a beszédablakban"
msgid "text color for time delimiters"
msgstr "információs pult határolóinak színe"
+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 "belépési nyíl színe"
@@ -2125,9 +2142,9 @@ msgstr "%s%s%s megváltoztatta a %s%s%s szoba témáját:"
msgid "%sError: a buffer with same name (%s) already exists"
msgstr "%s nem sikerült a \"%s\" modult betölteni: már van ilyen nevű modul\n"
-#, fuzzy
-msgid "Not enough memory for new line"
-msgstr "Nincs elég memória az új sorhoz\n"
+#, c-format
+msgid "%sError: it is only possible to merge buffers with formatted content"
+msgstr ""
#, fuzzy
msgid "names of buffers"
@@ -2223,6 +2240,10 @@ msgstr "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni\n"
msgid "Error: not enough memory for key binding"
msgstr "%s nincs elég memória a billentyűhozzárendeléshez\n"
+#, fuzzy
+msgid "Not enough memory for new line"
+msgstr "Nincs elég memória az új sorhoz\n"
+
#, fuzzy, c-format
msgid "%s%s: error, circular reference when calling alias \"%s\""
msgstr "%s körreferencia a \"/%s\" aliasz hívásakor\n"
@@ -2564,10 +2585,6 @@ msgstr ""
msgid "away"
msgstr ""
-#, fuzzy
-msgid "servers"
-msgstr "szerver"
-
msgid "Lag"
msgstr ""
@@ -2602,11 +2619,11 @@ msgid "%s%s: cannot find nick for sending message"
msgstr "%s nem található név az üzenet küldéséhez\n"
#, fuzzy, c-format
-msgid "%s%s: future away: %s"
+msgid "%s: future away: %s"
msgstr "CTCP %sVERSION%s válasz %s%s%s felhasználótól: %s\n"
#, fuzzy, c-format
-msgid "%s%s: future away removed"
+msgid "%s: future away removed"
msgstr "%s%d%s mellőzés eltávolítva.\n"
#, fuzzy, c-format
@@ -2646,7 +2663,7 @@ msgid "%s%s: not connected to server \"%s\"!"
msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"
#, fuzzy, c-format
-msgid "%s%s: auto-reconnection is cancelled"
+msgid "%s: auto-reconnection is cancelled"
msgstr "automata újracsatlakozás megszakítva\n"
#, fuzzy, c-format
@@ -3355,7 +3372,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 [szervernév]] | [listfull [szervernév]] | [add szervernév gépnév [-"
"port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd jelszó] [-nicks "
@@ -3382,8 +3399,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"
@@ -3759,8 +3774,9 @@ msgstr "%s nincs elég memória az információs pult üzenethez\n"
msgid "use nick color in messages from server"
msgstr "helyi idő lekérdezése a szerverről"
-msgid "use same buffer for all servers"
-msgstr "ugyanazon puffer használata minden szerverhez"
+#, fuzzy
+msgid "merge server buffers"
+msgstr "pufferek kezelése"
msgid "open new channels/privates near server"
msgstr "az új szobák/privát beszélgetések a szerverhez közel nyíljanak"
@@ -3925,9 +3941,6 @@ msgstr "név vagy gép letiltása"
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 "IRC szerver portja"
@@ -4235,7 +4248,7 @@ msgid ""
msgstr "%s: minden megadott név foglalt, kapcsolat bontása a szerverrel!\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: a(z) \"%s\" név már foglalt, próbálom a második nevet: \"%s\"\n"
#, fuzzy, c-format
@@ -4297,19 +4310,19 @@ msgstr ""
"%s nem sikerült adatot olvasni a csatornából, kilépés a szerverről...\n"
#, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s: lag is high, disconnecting from server..."
msgstr "%s túl nagy a késés(lag), lecsatlakozás a szerverről...\n"
#, fuzzy, c-format
-msgid "%s%s: reconnecting to server in %d %s"
+msgid "%s: reconnecting to server in %d %s"
msgstr "%s: Újracsatlakozás a szerverhez %d másodperc múlva\n"
#, fuzzy, c-format
-msgid "%s%s: switching address to %s/%d"
+msgid "%s: switching address to %s/%d"
msgstr "%s IP-cím nem található\n"
#, fuzzy, c-format
-msgid "%s%s: connected to %s (%s)"
+msgid "%s: connected to %s (%s)"
msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"
#, fuzzy, c-format
@@ -4389,7 +4402,7 @@ msgstr ""
"támogatás nélkül lett fordítva\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: csatlakozás a(z) %s:%d%s%s szerverhez %s proxy kiszolgálón keresztül: %s:"
"%d%s...\n"
@@ -4401,6 +4414,10 @@ msgstr ""
"s...\n"
#, fuzzy, c-format
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr "%s: csatlakozás a(z) %s:%d%s%s szerverhez...\n"
+
+#, fuzzy, c-format
msgid "%s%s: connecting to server %s/%d%s%s..."
msgstr "%s: csatlakozás a(z) %s:%d%s%s szerverhez...\n"
@@ -4417,13 +4434,25 @@ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
msgstr "%s nem sikerült a \"SO_KEEPALIVE\" csatornaopciót beállítani\n"
#, fuzzy, c-format
-msgid "%s%s: reconnecting to server..."
+msgid "%s: reconnecting to server..."
msgstr "%s: Újracsatlakozás a szerverhez...\n"
#, fuzzy, c-format
msgid "%s%s: disconnected from server"
msgstr "Lekapcsolódott a szerverről!\n"
+#, fuzzy, c-format
+msgid "%s: disconnected from server"
+msgstr "Lekapcsolódott a szerverről!\n"
+
+#, fuzzy
+msgid "servers"
+msgstr "szerver"
+
+#, fuzzy, c-format
+msgid "%s%s: auto-reconnection is cancelled"
+msgstr "automata újracsatlakozás megszakítva\n"
+
#, fuzzy
msgid "list, add or remove Jabber servers"
msgstr "szerverek listázása, hozzáadása vagy eltávolítása"
@@ -4596,6 +4625,9 @@ msgstr ""
msgid "automatically rejoin MUCs when kicked"
msgstr "automatikus visszalépés a szobába kirúgáskor"
+msgid "use same buffer for all servers"
+msgstr "ugyanazon puffer használata minden szerverhez"
+
#, fuzzy
msgid "open new MUCs/privates near server"
msgstr "az új szobák/privát beszélgetések a szerverhez közel nyíljanak"
@@ -4668,6 +4700,14 @@ msgid "%s%s: cannot allocate new MUC"
msgstr "%s nem sikerült új csatornát lefoglalni"
#, fuzzy, c-format
+msgid "%s%s: reconnecting to server in %d %s"
+msgstr "%s: Újracsatlakozás a szerverhez %d másodperc múlva\n"
+
+#, fuzzy, c-format
+msgid "%s%s: connected to %s (%s)"
+msgstr "%s nincs csatlakozva a \"%s\" szerverhez!\n"
+
+#, fuzzy, c-format
msgid "%s%s: GnuTLS init error"
msgstr "%s gnutls inicializációs hiba\n"
@@ -4716,6 +4756,10 @@ msgid "%s%s: failed to create id"
msgstr "%s DCC: nem sikerült a csövet létrehozni\n"
#, fuzzy, c-format
+msgid "%s%s: reconnecting to server..."
+msgstr "%s: Újracsatlakozás a szerverhez...\n"
+
+#, fuzzy, c-format
msgid "%s%s: I/O error (%d)"
msgstr "%sSzerver: %s%s\n"
@@ -6217,7 +6261,3 @@ msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
#~ msgid "-MORE-"
#~ msgstr "-TOVÁBB-"
-
-#, fuzzy
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: csatlakozás a(z) %s:%d%s%s szerverhez...\n"
diff --git a/po/pl.po b/po/pl.po
index 4cc4aa0e2..49d9d9732 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,7 +9,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: <soltys@szluug.org>\n"
"Language-Team: Polish\n"
@@ -770,14 +770,19 @@ msgid "manage buffers"
msgstr ""
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 ""
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 "
@@ -797,13 +802,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 ""
msgid "launch explicit WeeChat or plugin command"
@@ -1280,6 +1287,11 @@ msgstr ""
msgid "max size for prefix (0 = no max size)"
msgstr ""
+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 ""
@@ -1321,6 +1333,11 @@ msgstr ""
msgid "text color for time delimiters"
msgstr ""
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+
msgid "text color for error prefix"
msgstr ""
@@ -1848,7 +1865,8 @@ msgstr ""
msgid "%sError: a buffer with same name (%s) already exists"
msgstr ""
-msgid "Not enough memory for new line"
+#, c-format
+msgid "%sError: it is only possible to merge buffers with formatted content"
msgstr ""
msgid "names of buffers"
@@ -1925,6 +1943,9 @@ msgstr ""
msgid "Error: not enough memory for key binding"
msgstr ""
+msgid "Not enough memory for new line"
+msgstr ""
+
#, c-format
msgid "%s%s: error, circular reference when calling alias \"%s\""
msgstr ""
@@ -2240,9 +2261,6 @@ msgstr ""
msgid "away"
msgstr ""
-msgid "servers"
-msgstr ""
-
msgid "Lag"
msgstr ""
@@ -2277,11 +2295,11 @@ msgid "%s%s: cannot find nick for sending message"
msgstr ""
#, c-format
-msgid "%s%s: future away: %s"
+msgid "%s: future away: %s"
msgstr ""
#, c-format
-msgid "%s%s: future away removed"
+msgid "%s: future away removed"
msgstr ""
#, c-format
@@ -2321,7 +2339,7 @@ msgid "%s%s: not connected to server \"%s\"!"
msgstr ""
#, c-format
-msgid "%s%s: auto-reconnection is cancelled"
+msgid "%s: auto-reconnection is cancelled"
msgstr ""
#, c-format
@@ -2912,7 +2930,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 ""
msgid ""
@@ -2933,8 +2951,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"
@@ -3221,7 +3237,7 @@ msgstr ""
msgid "use nick color in messages from server"
msgstr ""
-msgid "use same buffer for all servers"
+msgid "merge server buffers"
msgstr ""
msgid "open new channels/privates near server"
@@ -3367,9 +3383,6 @@ msgstr ""
msgid "get buffer pointer for an IRC server/channel"
msgstr ""
-msgid "currently selected server (only if one buffer is used for all servers)"
-msgstr ""
-
msgid "list of IRC servers"
msgstr ""
@@ -3670,7 +3683,7 @@ msgid ""
msgstr ""
#, 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 ""
#, c-format
@@ -3730,19 +3743,19 @@ msgid "%s%s: cannot read data from socket, disconnecting from server..."
msgstr ""
#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s: lag is high, disconnecting from server..."
msgstr ""
#, c-format
-msgid "%s%s: reconnecting to server in %d %s"
+msgid "%s: reconnecting to server in %d %s"
msgstr ""
#, c-format
-msgid "%s%s: switching address to %s/%d"
+msgid "%s: switching address to %s/%d"
msgstr ""
#, c-format
-msgid "%s%s: connected to %s (%s)"
+msgid "%s: connected to %s (%s)"
msgstr ""
#, c-format
@@ -3818,7 +3831,7 @@ msgid ""
msgstr ""
#, 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 ""
#, c-format
@@ -3826,6 +3839,10 @@ msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
msgstr ""
#, c-format
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr ""
+
+#, c-format
msgid "%s%s: connecting to server %s/%d%s%s..."
msgstr ""
@@ -3842,13 +3859,24 @@ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
msgstr ""
#, c-format
-msgid "%s%s: reconnecting to server..."
+msgid "%s: reconnecting to server..."
msgstr ""
#, c-format
msgid "%s%s: disconnected from server"
msgstr ""
+#, c-format
+msgid "%s: disconnected from server"
+msgstr ""
+
+msgid "servers"
+msgstr ""
+
+#, c-format
+msgid "%s%s: auto-reconnection is cancelled"
+msgstr ""
+
msgid "list, add or remove Jabber servers"
msgstr ""
@@ -3954,6 +3982,9 @@ msgstr ""
msgid "automatically rejoin MUCs when kicked"
msgstr ""
+msgid "use same buffer for all servers"
+msgstr ""
+
msgid "open new MUCs/privates near server"
msgstr ""
@@ -4013,6 +4044,14 @@ msgid "%s%s: cannot allocate new MUC"
msgstr ""
#, c-format
+msgid "%s%s: reconnecting to server in %d %s"
+msgstr ""
+
+#, c-format
+msgid "%s%s: connected to %s (%s)"
+msgstr ""
+
+#, c-format
msgid "%s%s: GnuTLS init error"
msgstr ""
@@ -4055,6 +4094,10 @@ msgid "%s%s: failed to create id"
msgstr ""
#, c-format
+msgid "%s%s: reconnecting to server..."
+msgstr ""
+
+#, c-format
msgid "%s%s: I/O error (%d)"
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 1b5a46d3f..830a5080c 100644
--- a/po/ru.po
+++ b/po/ru.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: Pavel Shevchuk <stlwrt@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -822,8 +822,9 @@ msgid "manage buffers"
msgstr "управление буферами"
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
@@ -831,6 +832,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 "
@@ -850,13 +855,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 ""
"действие: выполняемое действие:\n"
" move: передвинуть буфер в списке (может быть относительным, например -"
@@ -1460,6 +1467,11 @@ msgstr ""
msgid "max size for prefix (0 = no max size)"
msgstr ""
+msgid ""
+"prefix alignment for buffer name, when many buffers are merged with same "
+"number (none, left, right (default))"
+msgstr ""
+
#, fuzzy
msgid "string displayed after prefix"
msgstr "строка, вставляемая после автодополнения ника"
@@ -1512,6 +1524,11 @@ msgstr "цвет времени в окне чата"
msgid "text color for time delimiters"
msgstr "цвет разделителей информационной панели"
+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 "цвет стрелки захода на канал (префикс)"
@@ -2129,9 +2146,9 @@ msgid "%sError: a buffer with same name (%s) already exists"
msgstr ""
"%s не могу загрузить plugin \"%s\": одноимённый plugin уже существует\n"
-#, fuzzy
-msgid "Not enough memory for new line"
-msgstr "Недостаточно памяти для новой строчки\n"
+#, c-format
+msgid "%sError: it is only possible to merge buffers with formatted content"
+msgstr ""
#, fuzzy
msgid "names of buffers"
@@ -2227,6 +2244,10 @@ msgstr "%s не могу установить клавишу \"%s\"\n"
msgid "Error: not enough memory for key binding"
msgstr "%s недостаточно памяти для установки клавиши\n"
+#, fuzzy
+msgid "Not enough memory for new line"
+msgstr "Недостаточно памяти для новой строчки\n"
+
#, fuzzy, c-format
msgid "%s%s: error, circular reference when calling alias \"%s\""
msgstr "%s рекурсия при вызове сокращения \"/%s\"\n"
@@ -2567,10 +2588,6 @@ msgstr ""
msgid "away"
msgstr ""
-#, fuzzy
-msgid "servers"
-msgstr "сервер"
-
msgid "Lag"
msgstr ""
@@ -2605,11 +2622,11 @@ msgid "%s%s: cannot find nick for sending message"
msgstr "%s не могу найти адресата сообщения\n"
#, fuzzy, c-format
-msgid "%s%s: future away: %s"
+msgid "%s: future away: %s"
msgstr "Планирование статуса на %s%s%s: %s\n"
#, fuzzy, c-format
-msgid "%s%s: future away removed"
+msgid "%s: future away removed"
msgstr "Планирование статуса на %s%s%s удалено.\n"
#, fuzzy, c-format
@@ -2649,7 +2666,7 @@ msgid "%s%s: not connected to server \"%s\"!"
msgstr "%s не подключен к серверу \"%s\"!\n"
#, fuzzy, c-format
-msgid "%s%s: auto-reconnection is cancelled"
+msgid "%s: auto-reconnection is cancelled"
msgstr "Авто-переподключение отменено\n"
#, fuzzy, c-format
@@ -3354,7 +3371,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 [сервер]] | [listfull [сервер]] | [add сервер адрес [-port порт] [-"
"temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd пароль] [-nicks ник1 ник2 ник3] "
@@ -3381,8 +3398,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"
@@ -3751,8 +3766,9 @@ msgstr "%s недостаточно памяти для сообщения в с
msgid "use nick color in messages from server"
msgstr "запросить местное время сервера"
-msgid "use same buffer for all servers"
-msgstr "один буфер для всех серверов"
+#, fuzzy
+msgid "merge server buffers"
+msgstr "управление буферами"
msgid "open new channels/privates near server"
msgstr "открывать новые каналы/приваты рядом с сервером"
@@ -3917,9 +3933,6 @@ msgstr "банит ник или хост"
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 "порт IRC сервера"
@@ -4226,7 +4239,7 @@ msgid ""
msgstr "%s: все предложенные ники заняты, отключаюсь от сервера!\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: ник \"%s\" уже используется, пробую второй ник \"%s\"\n"
#, fuzzy, c-format
@@ -4287,19 +4300,19 @@ msgid "%s%s: cannot read data from socket, disconnecting from server..."
msgstr "%s невозможно прочитать данные из сокета, отключаюсь от сервера...\n"
#, fuzzy, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s: lag is high, disconnecting from server..."
msgstr "%s задержка слишком высокая, отключаюсь от сервера...\n"
#, fuzzy, c-format
-msgid "%s%s: reconnecting to server in %d %s"
+msgid "%s: reconnecting to server in %d %s"
msgstr "%s: Повторное подключение к серверу через %d секунд\n"
#, fuzzy, c-format
-msgid "%s%s: switching address to %s/%d"
+msgid "%s: switching address to %s/%d"
msgstr "%s IP адрес не найден\n"
#, fuzzy, c-format
-msgid "%s%s: connected to %s (%s)"
+msgid "%s: connected to %s (%s)"
msgstr "%s не подключен к серверу \"%s\"!\n"
#, fuzzy, c-format
@@ -4379,7 +4392,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: подключение к серверу %s:%d%s%s через %s proxy %s:%d%s...\n"
#, fuzzy, c-format
@@ -4387,6 +4400,10 @@ msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
msgstr "Подключаюсь к серверу %s:%d%s%s через %s proxy %s:%d%s...\n"
#, fuzzy, c-format
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
+
+#, fuzzy, c-format
msgid "%s%s: connecting to server %s/%d%s%s..."
msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
@@ -4403,13 +4420,25 @@ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
msgstr "%s не могу установить настройку сокета \"SO_KEEPALIVE\"\n"
#, fuzzy, c-format
-msgid "%s%s: reconnecting to server..."
+msgid "%s: reconnecting to server..."
msgstr "%s: Повторное соединение...\n"
#, fuzzy, c-format
msgid "%s%s: disconnected from server"
msgstr "Отключен от сервера!\n"
+#, fuzzy, c-format
+msgid "%s: disconnected from server"
+msgstr "Отключен от сервера!\n"
+
+#, fuzzy
+msgid "servers"
+msgstr "сервер"
+
+#, fuzzy, c-format
+msgid "%s%s: auto-reconnection is cancelled"
+msgstr "Авто-переподключение отменено\n"
+
#, fuzzy
msgid "list, add or remove Jabber servers"
msgstr "перечислить, добавить или удалить серверы"
@@ -4578,6 +4607,9 @@ msgstr ""
msgid "automatically rejoin MUCs when kicked"
msgstr "автоматически перезаходить на каналы после кика"
+msgid "use same buffer for all servers"
+msgstr "один буфер для всех серверов"
+
#, fuzzy
msgid "open new MUCs/privates near server"
msgstr "открывать новые каналы/приваты рядом с сервером"
@@ -4646,6 +4678,14 @@ msgid "%s%s: cannot allocate new MUC"
msgstr "%s не могу расположить новый канал"
#, fuzzy, c-format
+msgid "%s%s: reconnecting to server in %d %s"
+msgstr "%s: Повторное подключение к серверу через %d секунд\n"
+
+#, fuzzy, c-format
+msgid "%s%s: connected to %s (%s)"
+msgstr "%s не подключен к серверу \"%s\"!\n"
+
+#, fuzzy, c-format
msgid "%s%s: GnuTLS init error"
msgstr "%s ошибка инициализации gnutls\n"
@@ -4690,6 +4730,10 @@ msgid "%s%s: failed to create id"
msgstr "%s DCC: не могу создать pipe\n"
#, fuzzy, c-format
+msgid "%s%s: reconnecting to server..."
+msgstr "%s: Повторное соединение...\n"
+
+#, fuzzy, c-format
msgid "%s%s: I/O error (%d)"
msgstr "%sСервер: %s%s\n"
@@ -6186,7 +6230,3 @@ msgstr "%s нет аргумента для параметра \"%s\"\n"
#~ msgid "-MORE-"
#~ msgstr "-ДАЛЬШЕ-"
-
-#, fuzzy
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake
index 2d6c497b2..3b0c8c6c1 100644
--- a/po/srcfiles.cmake
+++ b/po/srcfiles.cmake
@@ -75,6 +75,8 @@ SET(WEECHAT_SOURCES
./src/gui/gui-keyboard.h
./src/gui/gui-layout.c
./src/gui/gui-layout.h
+./src/gui/gui-line.c
+./src/gui/gui-line.h
./src/gui/gui-main.h
./src/gui/gui-nicklist.c
./src/gui/gui-nicklist.h
diff --git a/po/weechat.pot b/po/weechat.pot
index eba3b89b8..a08053d85 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: 2009-06-02 15:54+0200\n"
+"POT-Creation-Date: 2009-06-08 22:24+0200\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"
@@ -738,14 +738,19 @@ msgid "manage buffers"
msgstr ""
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 ""
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 "
@@ -765,13 +770,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 ""
msgid "launch explicit WeeChat or plugin command"
@@ -1248,6 +1255,11 @@ msgstr ""
msgid "max size for prefix (0 = no max size)"
msgstr ""
+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 ""
@@ -1289,6 +1301,11 @@ msgstr ""
msgid "text color for time delimiters"
msgstr ""
+msgid ""
+"text color for buffer name (before prefix, when many buffers are merged with "
+"same number)"
+msgstr ""
+
msgid "text color for error prefix"
msgstr ""
@@ -1815,7 +1832,8 @@ msgstr ""
msgid "%sError: a buffer with same name (%s) already exists"
msgstr ""
-msgid "Not enough memory for new line"
+#, c-format
+msgid "%sError: it is only possible to merge buffers with formatted content"
msgstr ""
msgid "names of buffers"
@@ -1892,6 +1910,9 @@ msgstr ""
msgid "Error: not enough memory for key binding"
msgstr ""
+msgid "Not enough memory for new line"
+msgstr ""
+
#, c-format
msgid "%s%s: error, circular reference when calling alias \"%s\""
msgstr ""
@@ -2207,9 +2228,6 @@ msgstr ""
msgid "away"
msgstr ""
-msgid "servers"
-msgstr ""
-
msgid "Lag"
msgstr ""
@@ -2244,11 +2262,11 @@ msgid "%s%s: cannot find nick for sending message"
msgstr ""
#, c-format
-msgid "%s%s: future away: %s"
+msgid "%s: future away: %s"
msgstr ""
#, c-format
-msgid "%s%s: future away removed"
+msgid "%s: future away removed"
msgstr ""
#, c-format
@@ -2288,7 +2306,7 @@ msgid "%s%s: not connected to server \"%s\"!"
msgstr ""
#, c-format
-msgid "%s%s: auto-reconnection is cancelled"
+msgid "%s: auto-reconnection is cancelled"
msgstr ""
#, c-format
@@ -2879,7 +2897,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 ""
msgid ""
@@ -2900,8 +2918,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"
@@ -3188,7 +3204,7 @@ msgstr ""
msgid "use nick color in messages from server"
msgstr ""
-msgid "use same buffer for all servers"
+msgid "merge server buffers"
msgstr ""
msgid "open new channels/privates near server"
@@ -3333,9 +3349,6 @@ msgstr ""
msgid "get buffer pointer for an IRC server/channel"
msgstr ""
-msgid "currently selected server (only if one buffer is used for all servers)"
-msgstr ""
-
msgid "list of IRC servers"
msgstr ""
@@ -3634,7 +3647,7 @@ msgid ""
msgstr ""
#, 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 ""
#, c-format
@@ -3694,19 +3707,19 @@ msgid "%s%s: cannot read data from socket, disconnecting from server..."
msgstr ""
#, c-format
-msgid "%s%s: lag is high, disconnecting from server..."
+msgid "%s: lag is high, disconnecting from server..."
msgstr ""
#, c-format
-msgid "%s%s: reconnecting to server in %d %s"
+msgid "%s: reconnecting to server in %d %s"
msgstr ""
#, c-format
-msgid "%s%s: switching address to %s/%d"
+msgid "%s: switching address to %s/%d"
msgstr ""
#, c-format
-msgid "%s%s: connected to %s (%s)"
+msgid "%s: connected to %s (%s)"
msgstr ""
#, c-format
@@ -3782,7 +3795,7 @@ msgid ""
msgstr ""
#, 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 ""
#, c-format
@@ -3790,6 +3803,10 @@ msgid "Connecting to server %s/%d%s%s via %s proxy %s/%d%s..."
msgstr ""
#, c-format
+msgid "%s: connecting to server %s/%d%s%s..."
+msgstr ""
+
+#, c-format
msgid "%s%s: connecting to server %s/%d%s%s..."
msgstr ""
@@ -3806,13 +3823,24 @@ msgid "%s%s: cannot set socket option \"SO_KEEPALIVE\""
msgstr ""
#, c-format
-msgid "%s%s: reconnecting to server..."
+msgid "%s: reconnecting to server..."
msgstr ""
#, c-format
msgid "%s%s: disconnected from server"
msgstr ""
+#, c-format
+msgid "%s: disconnected from server"
+msgstr ""
+
+msgid "servers"
+msgstr ""
+
+#, c-format
+msgid "%s%s: auto-reconnection is cancelled"
+msgstr ""
+
msgid "list, add or remove Jabber servers"
msgstr ""
@@ -3918,6 +3946,9 @@ msgstr ""
msgid "automatically rejoin MUCs when kicked"
msgstr ""
+msgid "use same buffer for all servers"
+msgstr ""
+
msgid "open new MUCs/privates near server"
msgstr ""
@@ -3976,6 +4007,14 @@ msgid "%s%s: cannot allocate new MUC"
msgstr ""
#, c-format
+msgid "%s%s: reconnecting to server in %d %s"
+msgstr ""
+
+#, c-format
+msgid "%s%s: connected to %s (%s)"
+msgstr ""
+
+#, c-format
msgid "%s%s: GnuTLS init error"
msgstr ""
@@ -4018,6 +4057,10 @@ msgid "%s%s: failed to create id"
msgstr ""
#, c-format
+msgid "%s%s: reconnecting to server..."
+msgstr ""
+
+#, c-format
msgid "%s%s: I/O error (%d)"
msgstr ""