diff options
| author | Sébastien Helleu <flashcode@flashtux.org> | 2014-12-21 11:12:32 +0100 |
|---|---|---|
| committer | Sébastien Helleu <flashcode@flashtux.org> | 2014-12-21 11:12:32 +0100 |
| commit | adb4d0debd517f205ed9f31b0e4c738ed8e9588b (patch) | |
| tree | 419261f5b6ab659643c66bee2c11a401b0cbda32 | |
| parent | afce3a64270b8c5c290b90e6f5c993d6abea55f3 (diff) | |
| download | weechat-adb4d0debd517f205ed9f31b0e4c738ed8e9588b.zip | |
irc: add option "reorder" in command /server (closes #229)
| -rw-r--r-- | ChangeLog.asciidoc | 1 | ||||
| -rw-r--r-- | po/cs.po | 17 | ||||
| -rw-r--r-- | po/de.po | 17 | ||||
| -rw-r--r-- | po/es.po | 16 | ||||
| -rw-r--r-- | po/fr.po | 20 | ||||
| -rw-r--r-- | po/hu.po | 14 | ||||
| -rw-r--r-- | po/it.po | 16 | ||||
| -rw-r--r-- | po/ja.po | 37 | ||||
| -rw-r--r-- | po/pl.po | 17 | ||||
| -rw-r--r-- | po/pt_BR.po | 14 | ||||
| -rw-r--r-- | po/ru.po | 15 | ||||
| -rw-r--r-- | po/tr.po | 15 | ||||
| -rw-r--r-- | po/weechat.pot | 14 | ||||
| -rw-r--r-- | src/plugins/irc/irc-command.c | 18 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.c | 59 | ||||
| -rw-r--r-- | src/plugins/irc/irc-server.h | 1 |
16 files changed, 240 insertions, 51 deletions
diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index 0a5291d84..fa8c0d67e 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -33,6 +33,7 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * api: add regex replace feature in function string_eval_expression() * api: use microseconds instead of milliseconds in functions util_timeval_diff() and util_timeval_add() +* irc: add option "reorder" in command /server (closes #229) * irc: open channel buffers before the JOIN is received from server (autojoin and manual joins), new options irc.look.buffer_open_before_{autojoin|join} (closes #216) @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-11-09 16:23+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5261,6 +5261,13 @@ msgstr "%s: server %s%s%s byl zkopírován do %s%s%s" msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "%s: server %s%s%s byl přejmenován na %s%s%s" +#, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%d rmodifikátorů odebráno" +msgstr[1] "%d rmodifikátorů odebráno" +msgstr[2] "%d rmodifikátorů odebráno" + #, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "%s%s: server \"%s\" není dočasným serverem" @@ -6226,15 +6233,17 @@ msgstr "" msgid "list, add or remove IRC servers" msgstr "vypíše, přídá nebo odebere IRC servery" +#, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" "keep <server> || deloutq|jump|raw" +#, fuzzy msgid "" " list: list servers (without argument, this list is displayed)\n" "listfull: list servers with detailed info for each server\n" @@ -6247,6 +6256,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -6262,6 +6272,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-12-15 20:36+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <>\n" @@ -6138,6 +6138,12 @@ msgstr "%s: Server %s%s%s wurde nach %s%s%s kopiert" msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "%s: Server %s%s%s wurde in %s%s%s umbenannt" +#, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%d Trigger entfernt" +msgstr[1] "%d Trigger entfernt" + #, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "%s%s: Server \"%s\" ist kein temporärer Server" @@ -7134,15 +7140,17 @@ msgstr "" msgid "list, add or remove IRC servers" msgstr "auflisten, hinzufügen oder entfernen von IRC-Servern" +#, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" "keep <server> || deloutq|jump|raw" +#, fuzzy msgid "" " list: list servers (without argument, this list is displayed)\n" "listfull: list servers with detailed info for each server\n" @@ -7155,6 +7163,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -7170,6 +7179,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -12315,4 +12325,3 @@ msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s" msgid "%s%s: unable to connect: unexpected error (%d)" msgstr "" "%s%s: Verbindung konnte nicht hergestellt werden: unerwarteter Fehler (%d)" - @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-11-09 16:23+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5483,6 +5483,12 @@ msgstr "%s: servidor %s%s%s copiado como %s%s%s" msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "%s: servidor %s%s%s renombrado como %s%s%s" +#, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%d modificadores regulares removidos" +msgstr[1] "%d modificadores regulares removidos" + #, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "%s%s: el servidor \"%s\" no es temporal" @@ -6466,15 +6472,17 @@ msgstr "" msgid "list, add or remove IRC servers" msgstr "lista, añade o elimina servidores IRC" +#, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "list|listfull [<servidor>] || add <servidor> <hostname>[/<puerto>] [-temp] [-" "<opción>[=<valor>]] [-no<opción>] || copy|rename <servidor> <nuevo_nombre> " "|| del|keep <servidor> || deloutq|jump|raw" +#, fuzzy msgid "" " list: list servers (without argument, this list is displayed)\n" "listfull: list servers with detailed info for each server\n" @@ -6487,6 +6495,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -6502,6 +6511,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" -"PO-Revision-Date: 2014-12-14 20:16+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" +"PO-Revision-Date: 2014-12-21 11:10+0100\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: fr\n" @@ -6003,6 +6003,12 @@ msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "%s : le serveur %s%s%s a été renommé en %s%s%s" #, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%d serveur déplacé" +msgstr[1] "%d serveurs déplacés" + +#, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "%s%s : le serveur \"%s\" n'est pas temporaire" @@ -6983,12 +6989,12 @@ msgstr "lister, ajouter ou retirer des serveurs IRC" msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "list|listfull [<serveur>] || add <serveur> <nom>[/<port>] [-temp] [-" "<option>[=<valeur>]] [-no<option>] || copy|rename <serveur> <nouveau_nom> || " -"del|keep <serveur> || deloutq|jump|raw" +"reorder <serveur> [<serveur>...] || del|keep <serveur> || deloutq|jump|raw" msgid "" " list: list servers (without argument, this list is displayed)\n" @@ -7002,6 +7008,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -7017,6 +7024,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -7032,6 +7040,7 @@ msgstr "" "nooption : définir l'option booléenne à 'off' (par exemple : -nossl)\n" " copy : dupliquer un serveur\n" " rename : renommer un serveur\n" +" reorder : réordonner la liste des serveurs\n" " keep : garder le serveur dans le fichier de configuration (pour les " "serveurs temporaires seulement)\n" " del : supprimer un serveur\n" @@ -7049,6 +7058,7 @@ msgstr "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-11-09 16:23+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4831,6 +4831,12 @@ msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "A %s%s%s szerver mostantól: %s%s\n" #, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] " időkezelők:\n" +msgstr[1] " időkezelők:\n" + +#, fuzzy, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "A %s%s%s szerver létrehozva\n" @@ -5705,8 +5711,8 @@ msgstr "szerverek listázása, hozzáadása vagy eltávolítása" #, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "[list [szervernév]] | [listfull [szervernév]] | [add szervernév gépnév [-" "port port] [-temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd jelszó] [-nicks " @@ -5727,6 +5733,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -5742,6 +5749,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-11-09 16:23+0100\n" "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5625,6 +5625,12 @@ msgstr "%s: il server %s%s%s è stato copiato in %s%s%s" msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "%s: il server %s%s%s è stato rinominato in %s%s%s" +#, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%d rmodifier eliminati" +msgstr[1] "%d rmodifier eliminati" + #, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "%s%s: il server \"%s\" non è temporaneo" @@ -6605,15 +6611,17 @@ msgstr "" msgid "list, add or remove IRC servers" msgstr "elenca, aggiunge o rimuove server IRC" +#, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "list|listfull [<server>] || add <server> <host>[/<porta>] [-temp] [-" "<opzione>[=<valore>]] [-no<option>] || copy|rename <server> <nuovo_nome> || " "del|keep <server> || deloutq|jump|raw" +#, fuzzy msgid "" " list: list servers (without argument, this list is displayed)\n" "listfull: list servers with detailed info for each server\n" @@ -6626,6 +6634,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -6641,6 +6650,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-12-15 14:22+0900\n" "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n" @@ -40,11 +40,11 @@ msgid "max chars" msgstr "最大文字数" msgid "" -"a WeeChat color name (default, black, (dark)gray, white, (light)red, (light)" -"green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a terminal " -"color number or an alias; attributes are allowed before color (for text " -"color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" for " -"italic, \"_\" for underline" +"a WeeChat color name (default, black, (dark)gray, white, (light)red, " +"(light)green, brown, yellow, (light)blue, (light)magenta, (light)cyan), a " +"terminal color number or an alias; attributes are allowed before color (for " +"text color only, not background): \"*\" for bold, \"!\" for reverse, \"/\" " +"for italic, \"_\" for underline" msgstr "" "WeeChat の色名 (default、black、(dark)gray、white、(light)red、(light)green、" "brown、yellow、(light)blue、(light)magenta、(light)cyan) 、ターミナル色番号ま" @@ -5745,6 +5745,11 @@ msgstr "%s: サーバ %s%s%s を %s%s%s にコピーしました" msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "%s: サーバ %s%s%s を %s%s%s にリネームしました" +#, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%d 個のトリガを削除" + #, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "%s%s: サーバ \"%s\" は一時的なサーバではありません" @@ -5958,8 +5963,8 @@ msgstr "" " - 内部サーバ名 (/server add で作成されたもの、利用推奨)\n" " - ホスト名/ポート番号又は IP アドレス/ポート番号、デフォルトの" "ポート番号は 6667\n" -" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:password]@]" -"irc.example.org[:port][/#channel1][,#channel2[...]]\n" +" - 次のフォーマットに従う URL: irc[6][s]://[nickname[:" +"password]@]irc.example.org[:port][/#channel1][,#channel2[...]]\n" " 注意: アドレス/IP/URL を指定した場合、サーバを一時的に作ります " "(保存しません)、/help irc.look.temporary_servers を参照してください。\n" " option: サーバに関するオプション (ブール型オプションでは、value は無視さ" @@ -6701,15 +6706,17 @@ msgstr "" msgid "list, add or remove IRC servers" msgstr "IRC サーバのリストアップ、追加、削除" +#, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" "<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" "keep <server> || deloutq|jump|raw" +#, fuzzy msgid "" " list: list servers (without argument, this list is displayed)\n" "listfull: list servers with detailed info for each server\n" @@ -6722,6 +6729,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -6737,6 +6745,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -10941,8 +10950,8 @@ msgid "" "Examples (you can also look at default triggers with /trigger listdefault):\n" " add text attributes *bold*, _underline_ and /italic/ (only in user " "messages):\n" -" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*" -"(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:" +" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==" +"\\*(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:" "underline}${re:1}${color:-underline}_== ==/(\\S+)/==/${color:" "italic}${re:1}${color:-italic}/\"\n" " hide nicklist bar on small terminals:\n" @@ -11018,8 +11027,8 @@ msgstr "" "\n" "例 (/trigger listdefault でデフォルトトリガを見ることができます):\n" " テキスト属性 *太字*、_下線_、/イタリック/ を追加 (ユーザメッセージのみ):\n" -" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==\\*" -"(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:" +" /trigger add effects modifier weechat_print \"${tg_tag_nick}\" \"==" +"\\*(\\S+)\\*==*${color:bold}${re:1}${color:-bold}*== ==_(\\S+)_==_${color:" "underline}${re:1}${color:-underline}_== ==/(\\S+)/==/${color:" "italic}${re:1}${color:-italic}/\"\n" " 狭い端末ではニックネームリストバーを隠す:\n" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-12-13 09:13+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5869,6 +5869,13 @@ msgstr "%s: serwer %s%s%s został skopiowany do %s%s%s" msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "%s: nazwę serwer %s%s%s zmieniono na %s%s%s" +#, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%d triggerów usunięto" +msgstr[1] "%d triggerów usunięto" +msgstr[2] "%d triggerów usunięto" + #, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "%s%s: serwer \"%s\" nie jest serwerem tymczasowym" @@ -6835,15 +6842,17 @@ msgstr "" msgid "list, add or remove IRC servers" msgstr "wyświetla, dodaje lub usuwa serwery IRC" +#, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "list|listfull [<serwer>] || add <serwera> <host>[/<port>] [-temp] [-" "<opcja>[=<wartość>]] [-no<opcja>]|| copy|rename <serwer> <nowa_nazwa> || del|" "keep <serwer>] || deloutq|jump|raw" +#, fuzzy msgid "" " list: list servers (without argument, this list is displayed)\n" "listfull: list servers with detailed info for each server\n" @@ -6856,6 +6865,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -6871,6 +6881,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index af9c06d79..737e87f82 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-11-09 16:23+0100\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -5308,6 +5308,12 @@ msgstr "" msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "" +#, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%d rmodifiers removidos" +msgstr[1] "%d rmodifiers removidos" + #, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "" @@ -6033,8 +6039,8 @@ msgstr "" msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" msgid "" @@ -6049,6 +6055,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -6064,6 +6071,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-11-09 16:23+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4868,6 +4868,13 @@ msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "Сервер %s%s%s переименован в %s%s\n" #, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] " обработчики таймера:\n" +msgstr[1] " обработчики таймера:\n" +msgstr[2] " обработчики таймера:\n" + +#, fuzzy, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "Сервер %s%s%s создан\n" @@ -5737,8 +5744,8 @@ msgstr "перечислить, добавить или удалить серв #, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "[list [сервер]] | [listfull [сервер]] | [add сервер адрес [-port порт] [-" "temp] [-auto | -noauto] [-ipv6] [-ssl] [-pwd пароль] [-nicks ник1 ник2 ник3] " @@ -5759,6 +5766,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -5774,6 +5782,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-07-25 07:50+0200\n" "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4411,6 +4411,11 @@ msgstr "" msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "" +#, fuzzy, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "%s: \"%s\" kaldırıldı" + #, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "" @@ -5119,15 +5124,17 @@ msgstr "" msgid "list, add or remove IRC servers" msgstr "İRC sunucularını listele, ekle veya kaldır" +#, fuzzy msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" "list|listfull [<sunucu>] || add <sunucu> <hostname>[/<port>] [-temp] [-" "<seçenek>[=<değer>]] [-no<seçenek>] || copy|rename <sunucu> <yeni_isim> || " "del|keep <sunucu> || deloutq|jump|raw" +#, fuzzy msgid "" " list: list servers (without argument, this list is displayed)\n" "listfull: list servers with detailed info for each server\n" @@ -5140,6 +5147,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -5155,6 +5163,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" diff --git a/po/weechat.pot b/po/weechat.pot index bc12cdade..33ee02dcd 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2014-12-14 20:12+0100\n" +"POT-Creation-Date: 2014-12-21 11:09+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4406,6 +4406,12 @@ msgid "%s: server %s%s%s has been renamed to %s%s%s" msgstr "" #, c-format +msgid "%d server moved" +msgid_plural "%d servers moved" +msgstr[0] "" +msgstr[1] "" + +#, c-format msgid "%s%s: server \"%s\" is not a temporary server" msgstr "" @@ -5101,8 +5107,8 @@ msgstr "" msgid "" "list|listfull [<server>] || add <server> <hostname>[/<port>] [-temp] [-" -"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || del|" -"keep <server> || deloutq|jump|raw" +"<option>[=<value>]] [-no<option>] || copy|rename <server> <new_name> || " +"reorder <server> [<server>...] || del|keep <server> || deloutq|jump|raw" msgstr "" msgid "" @@ -5117,6 +5123,7 @@ msgid "" "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" +" reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages WeeChat is " @@ -5132,6 +5139,7 @@ msgid "" " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" +" /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq" msgstr "" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 98af43fda..64f2c4cb0 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -4715,7 +4715,7 @@ int irc_command_server (void *data, struct t_gui_buffer *buffer, int argc, char **argv, char **argv_eol) { - int i, detailed_list, one_server_found, length; + int i, detailed_list, one_server_found, length, count; struct t_irc_server *ptr_server2, *server_found, *new_server; char *server_name, *message; @@ -4925,6 +4925,18 @@ irc_command_server (void *data, struct t_gui_buffer *buffer, int argc, WEECHAT_COMMAND_ERROR; } + if (weechat_strcasecmp (argv[1], "reorder") == 0) + { + WEECHAT_COMMAND_MIN_ARGS(3, "reorder"); + + count = irc_server_reorder (((const char **)argv) + 2, argc - 2); + weechat_printf (NULL, + NG_("%d server moved", "%d servers moved", count), + count); + + return WEECHAT_RC_OK; + } + if (weechat_strcasecmp (argv[1], "keep") == 0) { WEECHAT_COMMAND_MIN_ARGS(3, "keep"); @@ -6448,6 +6460,7 @@ irc_command_init () " || add <server> <hostname>[/<port>] [-temp] [-<option>[=<value>]] " "[-no<option>]" " || copy|rename <server> <new_name>" + " || reorder <server> [<server>...]" " || del|keep <server>" " || deloutq|jump|raw"), N_(" list: list servers (without argument, this list is displayed)\n" @@ -6462,6 +6475,7 @@ irc_command_init () "nooption: set boolean option to 'off' (for example: -nossl)\n" " copy: duplicate a server\n" " rename: rename a server\n" + " reorder: reorder list of servers\n" " keep: keep server in config file (for temporary servers only)\n" " del: delete a server\n" " deloutq: delete messages out queue for all servers (all messages " @@ -6478,6 +6492,7 @@ irc_command_init () " /server add freenode3 chat.freenode.net -password=mypass\n" " /server copy oftc oftcbis\n" " /server rename oftc newoftc\n" + " /server reorder oftc freenode\n" " /server del freenode\n" " /server deloutq"), "list %(irc_servers)" @@ -6486,6 +6501,7 @@ irc_command_init () " || copy %(irc_servers) %(irc_servers)" " || rename %(irc_servers) %(irc_servers)" " || keep %(irc_servers)" + " || reorder %(irc_servers)|%*" " || del %(irc_servers)" " || deloutq" " || jump" diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 2061be3ed..de8d13d2b 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -1713,6 +1713,65 @@ irc_server_rename (struct t_irc_server *server, const char *new_name) } /* + * Reorders list of servers. + * + * Returns the number of servers moved in the list (>= 0). + */ + +int +irc_server_reorder (const char **servers, int num_servers) +{ + struct t_irc_server *ptr_server, *ptr_server2; + int i, num_moved; + + ptr_server = irc_servers; + num_moved = 0; + + for (i = 0; ptr_server && (i < num_servers); i++) + { + for (ptr_server2 = ptr_server; ptr_server2; + ptr_server2 = ptr_server2->next_server) + { + if (strcmp (ptr_server2->name, servers[i]) == 0) + break; + } + if (ptr_server2 == ptr_server) + { + ptr_server = ptr_server->next_server; + } + else if (ptr_server2) + { + /* extract server from list */ + if (ptr_server2 == irc_servers) + irc_servers = ptr_server2->next_server; + if (ptr_server2 == last_irc_server) + last_irc_server = ptr_server2->prev_server; + if (ptr_server2->prev_server) + (ptr_server2->prev_server)->next_server = ptr_server2->next_server; + if (ptr_server2->next_server) + (ptr_server2->next_server)->prev_server = ptr_server2->prev_server; + + /* set pointers in ptr_server2 */ + ptr_server2->prev_server = ptr_server->prev_server; + ptr_server2->next_server = ptr_server; + + /* insert ptr_server2 before ptr_server */ + if (ptr_server->prev_server) + (ptr_server->prev_server)->next_server = ptr_server2; + ptr_server->prev_server = ptr_server2; + + /* adjust list of servers if needed */ + if (ptr_server == irc_servers) + irc_servers = ptr_server2; + + num_moved++; + } + } + + return num_moved; +} + +/* * Sends a signal for an IRC message (received or sent). */ diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index 3a2aad4d3..dbf6ac18b 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -290,6 +290,7 @@ extern void irc_server_free_all (); extern struct t_irc_server *irc_server_copy (struct t_irc_server *server, const char *new_name); extern int irc_server_rename (struct t_irc_server *server, const char *new_name); +extern int irc_server_reorder (const char **servers, int num_servers); extern void irc_server_send_signal (struct t_irc_server *server, const char *signal, const char *command, const char *full_message, |