diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | po/cs.po | 11 | ||||
| -rw-r--r-- | po/de.po | 13 | ||||
| -rw-r--r-- | po/es.po | 13 | ||||
| -rw-r--r-- | po/fr.po | 23 | ||||
| -rw-r--r-- | po/hu.po | 16 | ||||
| -rw-r--r-- | po/it.po | 13 | ||||
| -rw-r--r-- | po/ja.po | 13 | ||||
| -rw-r--r-- | po/pl.po | 13 | ||||
| -rw-r--r-- | po/pt_BR.po | 11 | ||||
| -rw-r--r-- | po/ru.po | 15 | ||||
| -rw-r--r-- | po/weechat.pot | 11 | ||||
| -rw-r--r-- | src/plugins/irc/irc-command.c | 25 |
13 files changed, 115 insertions, 66 deletions
@@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu <flashcode@flashtux.org> -v0.3.8-dev, 2012-04-07 +v0.3.8-dev, 2012-04-08 Version 0.3.8 (under dev!) @@ -26,6 +26,8 @@ Version 0.3.8 (under dev!) given to plugin API functions (warning displayed if debug for plugin is >= 1) * api: add list "gui_buffer_last_displayed" in hdata "buffer" * guile: add missing function "hook_process_hashtable" in API +* irc: add option "-pending" for command /disconnect (cancel auto-reconnection + on servers currently reconnecting) (task #11985) * irc: set user modes only if target nick is self nick in message 221 (patch #7754) * irc: force the clear of nicklist when joining a channel (nicklist was not sync @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4365,14 +4365,15 @@ msgid "disconnect from one or all IRC servers" msgstr "odpojit z IRC serveru/serverů" #, fuzzy -msgid "[<server>|-all [<reason>]]" +msgid "[<server>|-all|-pending [<reason>]]" msgstr "[[<server>] <maska_serveru>]" #, fuzzy msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" "server: jméno serveru pro odpojení\n" " -all: odpojit se od všech serverů" @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.7-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-03-27 22:46+0100\n" "Last-Translator: Nils Görs <weechatter@arcor.de>\n" "Language-Team: German <weechatter@arcor.de>\n" @@ -4723,13 +4723,16 @@ msgstr "Ziel: Servername" msgid "disconnect from one or all IRC servers" msgstr "Verbindung zu einem oder mehreren IRC-Server(n) trennen" -msgid "[<server>|-all [<reason>]]" +#, fuzzy +msgid "[<server>|-all|-pending [<reason>]]" msgstr "[<server>|-all [<reason>]]" +#, fuzzy msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" "server: Name des Servers zu dem die Verbindung getrennt werden soll\n" " -all: Verbindung zu allen Servern trennen\n" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4552,13 +4552,16 @@ msgstr "objetivo: nombre del servidor" msgid "disconnect from one or all IRC servers" msgstr "desconectarse de un o todos los servidores IRC" -msgid "[<server>|-all [<reason>]]" +#, fuzzy +msgid "[<server>|-all|-pending [<reason>]]" msgstr "[<servidor>|-all [<razón>]]" +#, fuzzy msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" "servidor: nombre del servidor a desconectar\n" " -all: desconectar de todos los servidores\n" @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" -"PO-Revision-Date: 2012-04-07 13:05+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" +"PO-Revision-Date: 2012-04-08 10:09+0200\n" "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" "Language: French\n" @@ -4608,17 +4608,20 @@ msgstr "cible: nom du serveur" msgid "disconnect from one or all IRC servers" msgstr "se déconnecter d'un ou de tous les serveurs IRC" -msgid "[<server>|-all [<reason>]]" -msgstr "[<serveur>|-all [<raison>]]" +msgid "[<server>|-all|-pending [<reason>]]" +msgstr "[<serveur>|-all|-pending [<raison>]]" msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" -"serveur: nom du serveur pour se déconecter\n" -" -all: se déconnecter de tous les serveurs\n" -" raison: raison pour le quit" +" serveur: nom du serveur pour se déconecter\n" +" -all: se déconnecter de tous les serveurs\n" +"-pending: annuler la reconnexion automatique sur les serveurs en cours de " +"reconnexion\n" +" raison: raison pour le quit" msgid "give channel half-operator status to nick(s)" msgstr "donner le statut de demi-opérateur à un/des pseudo(s)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -3971,14 +3971,20 @@ msgid "disconnect from one or all IRC servers" msgstr "kilépés a szerver(ek)ről" #, fuzzy -msgid "[<server>|-all [<reason>]]" +msgid "[<server>|-all|-pending [<reason>]]" msgstr "[[szerver] szerver_maszk]" +#, fuzzy msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" +"-all: újracsatlakozás minden szerverhez\n" +"szervernév: újracsatlakozás a megadott szerverhez\n" +"-nojoin: ne lépjen be semmilyen szobába (még ha az automatikus belépés be is " +"van kapcsolva a szerveren)" #, fuzzy msgid "give channel half-operator status to nick(s)" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4545,13 +4545,16 @@ msgstr "destinazione: nome server" msgid "disconnect from one or all IRC servers" msgstr "disconnette da uno o tutti i server IRC" -msgid "[<server>|-all [<reason>]]" +#, fuzzy +msgid "[<server>|-all|-pending [<reason>]]" msgstr "[<server>|-all [<motivo>]]" +#, fuzzy msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" "server: nome del server da cui disconnettersi\n" " -all: disconnette da tutti i server\n" @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: \"AYANOKOUZI, Ryuunosuke\" <i38w7i3@yahoo.co.jp>\n" "Language-Team: Japanese\n" @@ -4439,13 +4439,16 @@ msgstr "target: サーバ名" msgid "disconnect from one or all IRC servers" msgstr "一つか全ての IRC との接続を切断" -msgid "[<server>|-all [<reason>]]" +#, fuzzy +msgid "[<server>|-all|-pending [<reason>]]" msgstr "[<server>|-all [<reason>]]" +#, fuzzy msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" "server: 接続を切断するサーバ名\n" " -all: 全てのサーバとの接続を切る\n" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4531,13 +4531,16 @@ msgstr "cel: nazwa serwera" msgid "disconnect from one or all IRC servers" msgstr "rozłącza się z jednym lub wszystkimi serwerami IRC" -msgid "[<server>|-all [<reason>]]" +#, fuzzy +msgid "[<server>|-all|-pending [<reason>]]" msgstr "[<serwer>|-all [<powód>]]" +#, fuzzy msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" "serwer: nazwa serwera do rozłączenia\n" " -all: rozłącza się ze wszystkimi serwerami\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index ffef889d3..733237840 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4332,13 +4332,14 @@ msgstr "" msgid "disconnect from one or all IRC servers" msgstr "desconectar de um ou todos os servidores IRC" -msgid "[<server>|-all [<reason>]]" +msgid "[<server>|-all|-pending [<reason>]]" msgstr "" msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" msgid "give channel half-operator status to nick(s)" @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+0200\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n" "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n" @@ -4001,14 +4001,19 @@ msgid "disconnect from one or all IRC servers" msgstr "отключиться от сервера(-ов)" #, fuzzy -msgid "[<server>|-all [<reason>]]" +msgid "[<server>|-all|-pending [<reason>]]" msgstr "[[сервер] маска_сервера]" +#, fuzzy msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" +" -all: переподключиться ко всем серверам\n" +" сервер: название сервера для переподключения-nojoin: не заходить на каналы " +"(даже если автоматический заход включен для сервера)" #, fuzzy msgid "give channel half-operator status to nick(s)" diff --git a/po/weechat.pot b/po/weechat.pot index 9f31dbb24..325246dfe 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: 2012-04-07 13:04+0200\n" +"POT-Creation-Date: 2012-04-08 10:09+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" @@ -3521,13 +3521,14 @@ msgstr "" msgid "disconnect from one or all IRC servers" msgstr "" -msgid "[<server>|-all [<reason>]]" +msgid "[<server>|-all|-pending [<reason>]]" msgstr "" msgid "" -"server: server name to disconnect\n" -" -all: disconnect from all servers\n" -"reason: reason for quit" +" server: server name to disconnect\n" +" -all: disconnect from all servers\n" +"-pending: cancel auto-reconnection on servers currently reconnecting\n" +" reason: reason for quit" msgstr "" msgid "give channel half-operator status to nick(s)" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index 6348bd800..1e2e2a2a1 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -1461,6 +1461,19 @@ irc_command_disconnect (void *data, struct t_gui_buffer *buffer, int argc, } } } + else if (weechat_strcasecmp (argv[1], "-pending") == 0) + { + for (ptr_server = irc_servers; ptr_server; + ptr_server = ptr_server->next_server) + { + if (!ptr_server->is_connected + && (ptr_server->reconnect_start != 0)) + { + if (!irc_command_disconnect_one_server (ptr_server, reason)) + disconnect_ok = 0; + } + } + } else { ptr_server = irc_server_search (argv[1]); @@ -4994,11 +5007,13 @@ irc_command_init () NULL, &irc_command_die, NULL); weechat_hook_command ("disconnect", N_("disconnect from one or all IRC servers"), - N_("[<server>|-all [<reason>]]"), - N_("server: server name to disconnect\n" - " -all: disconnect from all servers\n" - "reason: reason for quit"), - "%(irc_servers)|-all", + N_("[<server>|-all|-pending [<reason>]]"), + N_(" server: server name to disconnect\n" + " -all: disconnect from all servers\n" + "-pending: cancel auto-reconnection on servers " + "currently reconnecting\n" + " reason: reason for quit"), + "%(irc_servers)|-all|-pending", &irc_command_disconnect, NULL); weechat_hook_command ("halfop", N_("give channel half-operator status to " |