From 8d58b81d83d9a5462f1b4aeb274a16a91ef213d1 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Wed, 10 Jun 2009 12:40:05 +0200 Subject: Add buffer merging feature, with /buffer merge/unmerge (task #7404) --- po/weechat.pot | 105 ++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 31 deletions(-) (limited to 'po/weechat.pot') 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 \n" "Language-Team: LANGUAGE \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,13 +3795,17 @@ 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 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 "" @@ -3975,6 +4006,14 @@ msgstr "" 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 "" @@ -4017,6 +4056,10 @@ msgstr "" 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 "" -- cgit v1.2.3