diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc index cc4dbb2ed..39eca9429 100644 --- a/ChangeLog.asciidoc +++ b/ChangeLog.asciidoc @@ -31,6 +31,8 @@ https://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes] * api: add argument "length" in function utf8_is_valid() * alias: display completion in /alias list (issue #518) * fifo: add /fifo command +* irc: move option irc.network.alternate_nick into servers + (irc.server.xxx.nicks_alternate) (issue #633) * irc: track real names using extended-join and WHO (issue #351) * irc: add support of SNI (Server Name Indication) in SSL connection to IRC server (issue #620) diff --git a/doc/de/autogen/user/irc_options.asciidoc b/doc/de/autogen/user/irc_options.asciidoc index 42e456c79..11b03b11d 100644 --- a/doc/de/autogen/user/irc_options.asciidoc +++ b/doc/de/autogen/user/irc_options.asciidoc @@ -372,11 +372,6 @@ ** Typ: boolesch ** Werte: on, off (Standardwert: `off`) -* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick* -** Beschreibung: `bezieht einen alternativen Nick, sofern alle voreingestellten Nicks am Server schon genutzt werden. Dazu wird das Zeichen "_" an den Nick angehängt, sofern der Nick nicht mehr als neun Zeichen besitzt. Andernfalls wird das letzte bzw. vorletzte Zeichen durch eine Zahl zwischen 1 und 99 ersetzt, bis ein freier Nick für den Server gefunden wird` -** Typ: boolesch -** Werte: on, off (Standardwert: `on`) - * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing* ** Beschreibung: `Multiplikator für die Verzögerung bei der automatischen Wiederverbindung zum Server (1 = immer die selbe Verzögerung nutzen, 2 = Verzögerung*2 für jeden weiteren Versuch, ..)` ** Typ: integer @@ -557,6 +552,11 @@ ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `""`) +* [[option_irc.server_default.nicks_alternate]] *irc.server_default.nicks_alternate* +** Beschreibung: `get an alternate nick when all the declared nicks are already used on server: add some "_" until the nick has a length of 9, and then replace last char (or the two last chars) by a number from 1 to 99, until we find a nick not used on server` +** Typ: boolesch +** Werte: on, off (Standardwert: `on`) + * [[option_irc.server_default.notify]] *irc.server_default.notify* ** Beschreibung: `Liste mit Benachrichtigung für Server (diese Einstellung sollte nicht direkt verändert werden. Dazu sollte der Befehl /notify genutzt werden)` ** Typ: Zeichenkette diff --git a/doc/en/autogen/user/irc_options.asciidoc b/doc/en/autogen/user/irc_options.asciidoc index ebbf8b4bd..2a3cc82fd 100644 --- a/doc/en/autogen/user/irc_options.asciidoc +++ b/doc/en/autogen/user/irc_options.asciidoc @@ -372,11 +372,6 @@ ** type: boolean ** values: on, off (default value: `off`) -* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick* -** description: `get an alternate nick when the nick is already used on server: add some "_" until the nick has a length of 9, and then replace last char (or the two last chars) by a number from 1 to 99, until we find a nick not used on server` -** type: boolean -** values: on, off (default value: `on`) - * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing* ** description: `growing factor for autoreconnect delay to server (1 = always same delay, 2 = delay*2 for each retry, ..)` ** type: integer @@ -557,6 +552,11 @@ ** type: string ** values: any string (default value: `""`) +* [[option_irc.server_default.nicks_alternate]] *irc.server_default.nicks_alternate* +** description: `get an alternate nick when all the declared nicks are already used on server: add some "_" until the nick has a length of 9, and then replace last char (or the two last chars) by a number from 1 to 99, until we find a nick not used on server` +** type: boolean +** values: on, off (default value: `on`) + * [[option_irc.server_default.notify]] *irc.server_default.notify* ** description: `notify list for server (you should not change this option but use /notify command instead)` ** type: string diff --git a/doc/fr/autogen/user/irc_options.asciidoc b/doc/fr/autogen/user/irc_options.asciidoc index e6fbb8e80..c691f7b6c 100644 --- a/doc/fr/autogen/user/irc_options.asciidoc +++ b/doc/fr/autogen/user/irc_options.asciidoc @@ -372,11 +372,6 @@ ** type: booléen ** valeurs: on, off (valeur par défaut: `off`) -* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick* -** description: `obtenir un pseudo alternatif lorsque le pseudo est déjà utilisé sur le serveur : ajouter des "_" jusqu'à ce que le pseudo ait une longueur de 9, puis remplacer le dernier caractère (ou les deux derniers) par un nombre de 1 à 99, jusqu'à trouver un pseudo non utilisé sur le serveur` -** type: booléen -** valeurs: on, off (valeur par défaut: `on`) - * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing* ** description: `facteur de croissance du délai d'auto-reconnexion au serveur (1 = toujours le même délai, 2 = délai*2 pour chaque tentative, etc...)` ** type: entier @@ -557,6 +552,11 @@ ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `""`) +* [[option_irc.server_default.nicks_alternate]] *irc.server_default.nicks_alternate* +** description: `obtenir un pseudo alternatif lorsque tous les pseudos déclarés sont déjà utilisés sur le serveur : ajouter des "_" jusqu'à ce que le pseudo ait une longueur de 9, puis remplacer le dernier caractère (ou les deux derniers) par un nombre de 1 à 99, jusqu'à trouver un pseudo non utilisé sur le serveur` +** type: booléen +** valeurs: on, off (valeur par défaut: `on`) + * [[option_irc.server_default.notify]] *irc.server_default.notify* ** description: `liste de notifications pour le serveur (vous ne devriez pas changer cette option mais utiliser la commande /notify)` ** type: chaîne diff --git a/doc/it/autogen/user/irc_options.asciidoc b/doc/it/autogen/user/irc_options.asciidoc index 1dfcfb81b..071499f35 100644 --- a/doc/it/autogen/user/irc_options.asciidoc +++ b/doc/it/autogen/user/irc_options.asciidoc @@ -372,11 +372,6 @@ ** tipo: bool ** valori: on, off (valore predefinito: `off`) -* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick* -** descrizione: `get an alternate nick when the nick is already used on server: add some "_" until the nick has a length of 9, and then replace last char (or the two last chars) by a number from 1 to 99, until we find a nick not used on server` -** tipo: bool -** valori: on, off (valore predefinito: `on`) - * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing* ** descrizione: `fattore di crescita per il ritardo della riconnessione automatica al server (1 = sempre identico, 2 = ritardo*2 per ogni tentativo, ...)` ** tipo: intero @@ -557,6 +552,11 @@ ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `""`) +* [[option_irc.server_default.nicks_alternate]] *irc.server_default.nicks_alternate* +** descrizione: `get an alternate nick when all the declared nicks are already used on server: add some "_" until the nick has a length of 9, and then replace last char (or the two last chars) by a number from 1 to 99, until we find a nick not used on server` +** tipo: bool +** valori: on, off (valore predefinito: `on`) + * [[option_irc.server_default.notify]] *irc.server_default.notify* ** descrizione: `elenco notifiche per il server (si consiglia di non cambiare questa opzione ma di usare il comando /notify)` ** tipo: stringa diff --git a/doc/ja/autogen/user/irc_options.asciidoc b/doc/ja/autogen/user/irc_options.asciidoc index deb80541a..79fd66533 100644 --- a/doc/ja/autogen/user/irc_options.asciidoc +++ b/doc/ja/autogen/user/irc_options.asciidoc @@ -372,11 +372,6 @@ ** タイプ: ブール ** 値: on, off (デフォルト値: `off`) -* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick* -** 説明: `サーバでニックネームが既に利用されている場合、他のニックネームを生成します: 利用されていないニックネームが見つかるまで、ニックネームの長さが 9 以下なら数個の "_" を追加、その後最後の 1 文字 (または最後の 2 文字) を 1 から 99 で置き換えます` -** タイプ: ブール -** 値: on, off (デフォルト値: `on`) - * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing* ** 説明: `サーバに自動再接続する際の遅延間隔に関する増加係数 (1 = 遅延間隔は常に同じ, 2 = リトライごとに遅延間隔を 2 倍、..)` ** タイプ: 整数 @@ -557,6 +552,11 @@ ** タイプ: 文字列 ** 値: 未制約文字列 (デフォルト値: `""`) +* [[option_irc.server_default.nicks_alternate]] *irc.server_default.nicks_alternate* +** 説明: `get an alternate nick when all the declared nicks are already used on server: add some "_" until the nick has a length of 9, and then replace last char (or the two last chars) by a number from 1 to 99, until we find a nick not used on server` +** タイプ: ブール +** 値: on, off (デフォルト値: `on`) + * [[option_irc.server_default.notify]] *irc.server_default.notify* ** 説明: `サーバの通知リスト (これを変更する場合は、/notify コマンドを使うこと)` ** タイプ: 文字列 diff --git a/doc/pl/autogen/user/irc_options.asciidoc b/doc/pl/autogen/user/irc_options.asciidoc index 48aa08a1b..e5682551d 100644 --- a/doc/pl/autogen/user/irc_options.asciidoc +++ b/doc/pl/autogen/user/irc_options.asciidoc @@ -372,11 +372,6 @@ ** typ: bool ** wartości: on, off (domyślna wartość: `off`) -* [[option_irc.network.alternate_nick]] *irc.network.alternate_nick* -** opis: `pobierz alternatywny nick, kiedy nick jest już zajęty na serwerze: dodaje kilka "_", aż nick będzie miał długość 9, następnie zamienia ostatni znak (lub ostatnie dwa znaki) na numer od 1 do 99, do czasu aż zostanie znaleziony nick nie użyty na swerwerze` -** typ: bool -** wartości: on, off (domyślna wartość: `on`) - * [[option_irc.network.autoreconnect_delay_growing]] *irc.network.autoreconnect_delay_growing* ** opis: `rosnący współczynnik opóźnienia ponownego połączenia z serwerem (1 = stała wartość, 2 = opóźnienie*2 dla każdej próby, ..)` ** typ: liczba @@ -557,6 +552,11 @@ ** typ: ciąg ** wartości: dowolny ciąg (domyślna wartość: `""`) +* [[option_irc.server_default.nicks_alternate]] *irc.server_default.nicks_alternate* +** opis: `get an alternate nick when all the declared nicks are already used on server: add some "_" until the nick has a length of 9, and then replace last char (or the two last chars) by a number from 1 to 99, until we find a nick not used on server` +** typ: bool +** wartości: on, off (domyślna wartość: `on`) + * [[option_irc.server_default.notify]] *irc.server_default.notify* ** opis: `lista powiadomień dla tego serwera (nie powinieneś zmieniać tej opcji tylko użyć w zamian komendy /notify)` ** typ: ciąg diff --git a/po/cs.po b/po/cs.po index 931f35591..2a86cba94 100644 --- a/po/cs.po +++ b/po/cs.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-12-20 17:33+0100\n" "Last-Translator: Ondřej Súkup \n" "Language-Team: weechat-dev \n" @@ -6977,6 +6977,13 @@ msgid "" "see /help eval)" msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" + #, fuzzy msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "příkaz spuštěný při startu WeeChat, před načtením pluginů" @@ -7521,12 +7528,6 @@ msgstr "barva pro nové téma rozhovoru kanálu (když se téma změní)" msgid "color for old channel topic (when topic is changed)" msgstr "barva pro staré téma rozhovoru kanálu (když se téma změní)" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/de.po b/po/de.po index f474907e4..98b639ca2 100644 --- a/po/de.po +++ b/po/de.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-12-20 09:49+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German <>\n" @@ -8051,6 +8051,19 @@ msgstr "" "Nicknamen, die auf dem IRC-Server benutzt werden sollen (durch Komma " "getrennt) (Hinweis: Inhalt wird evaluiert, siehe /help eval)" +#, fuzzy +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" +"bezieht einen alternativen Nick, sofern alle voreingestellten Nicks am " +"Server schon genutzt werden. Dazu wird das Zeichen \"_\" an den Nick " +"angehängt, sofern der Nick nicht mehr als neun Zeichen besitzt. Andernfalls " +"wird das letzte bzw. vorletzte Zeichen durch eine Zahl zwischen 1 und 99 " +"ersetzt, bis ein freier Nick für den Server gefunden wird" + msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" "Username der auf dem Server genutzt werden soll (Hinweis: Inhalt wird " @@ -8743,17 +8756,6 @@ msgstr "" "Farbe in dem das alte Thema des Channels dargestellt werden soll, falls das " "Thema des Channels geändert wurde" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" -"bezieht einen alternativen Nick, sofern alle voreingestellten Nicks am " -"Server schon genutzt werden. Dazu wird das Zeichen \"_\" an den Nick " -"angehängt, sofern der Nick nicht mehr als neun Zeichen besitzt. Andernfalls " -"wird das letzte bzw. vorletzte Zeichen durch eine Zahl zwischen 1 und 99 " -"ersetzt, bis ein freier Nick für den Server gefunden wird" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/es.po b/po/es.po index 735f48e26..4cb84e0c7 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -7227,6 +7227,13 @@ msgid "" "see /help eval)" msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" + #, fuzzy msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "comando ejecutado cuando WeeChat inicia, antes de cargar los plugins" @@ -7812,12 +7819,6 @@ msgstr "color para el nuevo tema del canal (cuando se cambia el tema)" msgid "color for old channel topic (when topic is changed)" msgstr "color para el tema antiguo del canal (cuando se cambia el tema)" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/fr.po b/po/fr.po index bc68f1e44..9f09645e9 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" -"PO-Revision-Date: 2015-12-24 07:52+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" +"PO-Revision-Date: 2015-12-24 20:32+0100\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -7883,6 +7883,17 @@ msgstr "" "pseudos à utiliser sur le serveur (séparés par des virgules) (note : le " "contenu est évalué, voir /help eval)" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" +"obtenir un pseudo alternatif lorsque tous les pseudos déclarés sont déjà " +"utilisés sur le serveur : ajouter des \"_\" jusqu'à ce que le pseudo ait une " +"longueur de 9, puis remplacer le dernier caractère (ou les deux derniers) " +"par un nombre de 1 à 99, jusqu'à trouver un pseudo non utilisé sur le serveur" + msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" "nom d'utilisateur pour le serveur (note : le contenu est évalué, voir /help " @@ -8529,16 +8540,6 @@ msgstr "couleur pour le nouveau titre du canal (lorsque le titre est changé)" msgid "color for old channel topic (when topic is changed)" msgstr "couleur pour l'ancien titre du canal (lorsque le titre est changé)" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" -"obtenir un pseudo alternatif lorsque le pseudo est déjà utilisé sur le " -"serveur : ajouter des \"_\" jusqu'à ce que le pseudo ait une longueur de 9, " -"puis remplacer le dernier caractère (ou les deux derniers) par un nombre de " -"1 à 99, jusqu'à trouver un pseudo non utilisé sur le serveur" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/hu.po b/po/hu.po index 3b900275e..f104912c3 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -6450,6 +6450,13 @@ msgid "" "see /help eval)" msgstr "felhasználónév az IRC szerveren" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" + msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" @@ -6939,12 +6946,6 @@ msgstr "" msgid "color for old channel topic (when topic is changed)" msgstr "" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/it.po b/po/it.po index 0b31eaab1..aec4b23b5 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -7379,6 +7379,13 @@ msgstr "" "nome utente per il server proxy (nota: il contenuto viene valutato, " "consultare /help eval)" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" + #, fuzzy msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" @@ -7978,12 +7985,6 @@ msgstr "colore del nuovo argomento del canale (quando viene cambiato)" msgid "color for old channel topic (when topic is changed)" msgstr "colore del precedente argomento del canale (quando viene cambiato)" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/ja.po b/po/ja.po index c94c6d77e..4cb37288d 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -7551,6 +7551,18 @@ msgstr "" "サーバで使用するニックネーム (コンマ区切り) (注意: 値は評価されます、/help " "eval を参照してください)" +#, fuzzy +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" +"サーバでニックネームが既に利用されている場合、他のニックネームを生成します: " +"利用されていないニックネームが見つかるまで、ニックネームの長さが 9 以下なら数" +"個の \"_\" を追加、その後最後の 1 文字 (または最後の 2 文字) を 1 から 99 で" +"置き換えます" + msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" "サーバで使用するユーザ名 (注意: 値は評価されます、/help eval を参照してくださ" @@ -8163,16 +8175,6 @@ msgstr "新しいチャンネルトピックの色 (トピックが変更され msgid "color for old channel topic (when topic is changed)" msgstr "古いチャンネルトピックの色 (トピックが変更されたときに使われます)" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" -"サーバでニックネームが既に利用されている場合、他のニックネームを生成します: " -"利用されていないニックネームが見つかるまで、ニックネームの長さが 9 以下なら数" -"個の \"_\" を追加、その後最後の 1 文字 (または最後の 2 文字) を 1 から 99 で" -"置き換えます" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/pl.po b/po/pl.po index f5e9da6c4..35fbde3e4 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -7692,6 +7692,18 @@ msgstr "" "nazwy użytkownika do użycia na serwerze (oddzielone przecinkiem) (uwaga: " "zawartość jest przetwarzana, zobacz /help eval)" +#, fuzzy +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" +"pobierz alternatywny nick, kiedy nick jest już zajęty na serwerze: dodaje " +"kilka \"_\", aż nick będzie miał długość 9, następnie zamienia ostatni znak " +"(lub ostatnie dwa znaki) na numer od 1 do 99, do czasu aż zostanie " +"znaleziony nick nie użyty na swerwerze" + msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" "nazwa użytkownika do użycia na serwerze (uwaga: zawartość jest przetwarzana, " @@ -8318,16 +8330,6 @@ msgstr "kolor nowego tematu kanału (kiedy temat został zmieniony)" msgid "color for old channel topic (when topic is changed)" msgstr "kolor starego tematu kanału (kiedy temat został zmieniony)" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" -"pobierz alternatywny nick, kiedy nick jest już zajęty na serwerze: dodaje " -"kilka \"_\", aż nick będzie miał długość 9, następnie zamienia ostatni znak " -"(lub ostatnie dwa znaki) na numer od 1 do 99, do czasu aż zostanie " -"znaleziony nick nie użyty na swerwerze" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/pt_BR.po b/po/pt_BR.po index 63bd8fa4b..6650a46a0 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: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-09-30 20:56+0200\n" "Last-Translator: Eduardo Elias \n" "Language-Team: weechat-dev \n" @@ -6843,6 +6843,13 @@ msgstr "" "comando executado quando o WeeChat inicia, antes do carregamento dos plugins " "(nota: conteúdo é avaliado, veja /help eval)" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" + #, fuzzy msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" @@ -7350,12 +7357,6 @@ msgstr "cor para o novo tópico do canal (quando o tópico é alterado)" msgid "color for old channel topic (when topic is changed)" msgstr "cor para o tópico antigo do canal (quando o tópico é alterado)" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/ru.po b/po/ru.po index 97a6acd67..b0d674252 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-12-02 19:26+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -6480,6 +6480,13 @@ msgid "" "see /help eval)" msgstr "ник, используемый на IRC сервере" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" + msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" @@ -6967,12 +6974,6 @@ msgstr "" msgid "color for old channel topic (when topic is changed)" msgstr "" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/tr.po b/po/tr.po index 1706daef3..04b06659f 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2015-03-10 21:33+0100\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -5796,6 +5796,13 @@ msgid "" "see /help eval)" msgstr "" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" + msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" @@ -6243,12 +6250,6 @@ msgstr "" msgid "color for old channel topic (when topic is changed)" msgstr "" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/po/weechat.pot b/po/weechat.pot index 9c6102635..2155681a3 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: 2015-12-24 07:51+0100\n" +"POT-Creation-Date: 2015-12-24 09:34+0100\n" "PO-Revision-Date: 2014-08-16 10:27+0200\n" "Last-Translator: Sébastien Helleu \n" "Language-Team: weechat-dev \n" @@ -5722,6 +5722,13 @@ msgid "" "see /help eval)" msgstr "" +msgid "" +"get an alternate nick when all the declared nicks are already used on " +"server: add some \"_\" until the nick has a length of 9, and then replace " +"last char (or the two last chars) by a number from 1 to 99, until we find a " +"nick not used on server" +msgstr "" + msgid "user name to use on server (note: content is evaluated, see /help eval)" msgstr "" @@ -6166,12 +6173,6 @@ msgstr "" msgid "color for old channel topic (when topic is changed)" msgstr "" -msgid "" -"get an alternate nick when the nick is already used on server: add some \"_" -"\" until the nick has a length of 9, and then replace last char (or the two " -"last chars) by a number from 1 to 99, until we find a nick not used on server" -msgstr "" - msgid "" "growing factor for autoreconnect delay to server (1 = always same delay, 2 = " "delay*2 for each retry, ..)" diff --git a/src/plugins/irc/irc-command.c b/src/plugins/irc/irc-command.c index cc976e585..9609f98b3 100644 --- a/src/plugins/irc/irc-command.c +++ b/src/plugins/irc/irc-command.c @@ -4532,7 +4532,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " ipv6 . . . . . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_IPV6]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_IPV6])) ? _("on") : _("off")); /* ssl */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL])) @@ -4542,7 +4542,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " ssl. . . . . . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL])) ? _("on") : _("off")); /* ssl_cert */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_SSL_CERT])) @@ -4584,7 +4584,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " ssl_verify . . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL_VERIFY]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_SSL_VERIFY])) ? _("on") : _("off")); /* password */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_PASSWORD])) @@ -4660,7 +4660,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " autoconnect. . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOCONNECT]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOCONNECT])) ? _("on") : _("off")); /* autoreconnect */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT])) @@ -4670,7 +4670,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " autoreconnect. . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTORECONNECT]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTORECONNECT])) ? _("on") : _("off")); /* autoreconnect_delay */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY])) @@ -4690,6 +4690,16 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) weechat_printf (NULL, " nicks. . . . . . . . : %s'%s'", IRC_COLOR_CHAT_VALUE, weechat_config_string (server->options[IRC_SERVER_OPTION_NICKS])); + /* nicks_alternate */ + if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE])) + weechat_printf (NULL, " nicks_alternate. . . : (%s)", + (IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_NICKS_ALTERNATE)) ? + _("on") : _("off")); + else + weechat_printf (NULL, " nicksalternate . . . : %s%s", + IRC_COLOR_CHAT_VALUE, + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE])) ? + _("on") : _("off")); /* username */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_USERNAME])) weechat_printf (NULL, " username . . . . . . : ('%s')", @@ -4762,7 +4772,7 @@ irc_command_display_server (struct t_irc_server *server, int with_detail) else weechat_printf (NULL, " autorejoin . . . . . : %s%s", IRC_COLOR_CHAT_VALUE, - weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOREJOIN]) ? + (weechat_config_boolean (server->options[IRC_SERVER_OPTION_AUTOREJOIN])) ? _("on") : _("off")); /* autorejoin_delay */ if (weechat_config_option_is_null (server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY])) diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 8d7ce0920..c35d712fd 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -131,7 +131,6 @@ struct t_config_option *irc_config_color_topic_old; /* IRC config, network section */ -struct t_config_option *irc_config_network_alternate_nick; struct t_config_option *irc_config_network_autoreconnect_delay_growing; struct t_config_option *irc_config_network_autoreconnect_delay_max; struct t_config_option *irc_config_network_ban_mask_default; @@ -1885,6 +1884,22 @@ irc_config_server_new_option (struct t_config_file *config_file, callback_change, callback_change_data, NULL, NULL); break; + case IRC_SERVER_OPTION_NICKS_ALTERNATE: + new_option = weechat_config_new_option ( + config_file, section, + option_name, "boolean", + N_("get an alternate nick when all the declared nicks are " + "already used on server: add some \"_\" until the nick has " + "a length of 9, and then replace last char (or the two " + "last chars) by a number from 1 to 99, until we find " + "a nick not used on server"), + NULL, 0, 0, + default_value, value, + null_value_allowed, + callback_check_value, callback_check_value_data, + callback_change, callback_change_data, + NULL, NULL); + break; case IRC_SERVER_OPTION_USERNAME: new_option = weechat_config_new_option ( config_file, section, @@ -2940,14 +2955,6 @@ irc_config_init () return 0; } - irc_config_network_alternate_nick = weechat_config_new_option ( - irc_config_file, ptr_section, - "alternate_nick", "boolean", - N_("get an alternate nick when the nick is already used on server: add " - "some \"_\" until the nick has a length of 9, and then replace last " - "char (or the two last chars) by a number from 1 to 99, until we " - "find a nick not used on server"), - NULL, 0, 0, "on", NULL, 0, NULL, NULL, NULL, NULL, NULL, NULL); irc_config_network_autoreconnect_delay_growing = weechat_config_new_option ( irc_config_file, ptr_section, "autoreconnect_delay_growing", "integer", diff --git a/src/plugins/irc/irc-config.h b/src/plugins/irc/irc-config.h index cd0a766b5..88eff3723 100644 --- a/src/plugins/irc/irc-config.h +++ b/src/plugins/irc/irc-config.h @@ -172,7 +172,6 @@ extern struct t_config_option *irc_config_color_topic_current; extern struct t_config_option *irc_config_color_topic_new; extern struct t_config_option *irc_config_color_topic_old; -extern struct t_config_option *irc_config_network_alternate_nick; extern struct t_config_option *irc_config_network_autoreconnect_delay_growing; extern struct t_config_option *irc_config_network_autoreconnect_delay_max; extern struct t_config_option *irc_config_network_ban_mask_default; diff --git a/src/plugins/irc/irc-server.c b/src/plugins/irc/irc-server.c index 3a5d9d9fc..3abc50727 100644 --- a/src/plugins/irc/irc-server.c +++ b/src/plugins/irc/irc-server.c @@ -96,6 +96,7 @@ char *irc_server_options[IRC_SERVER_NUM_OPTIONS][2] = { "autoreconnect", "on" }, { "autoreconnect_delay", "10" }, { "nicks", "" }, + { "nicks_alternate", "on" }, { "username", "" }, { "realname", "" }, { "local_hostname", "" }, @@ -624,8 +625,8 @@ irc_server_get_alternate_nick (struct t_irc_server *server) /* now we have tried all nicks in list */ - /* if alternate nick is disabled, just return NULL */ - if (!weechat_config_boolean (irc_config_network_alternate_nick)) + /* if alternate nicks are disabled, just return NULL */ + if (!IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_NICKS_ALTERNATE)) return NULL; /* use main nick and we will add "_" and then number if needed */ @@ -5414,6 +5415,9 @@ irc_server_add_to_infolist (struct t_infolist *infolist, if (!weechat_infolist_new_var_string (ptr_item, "nicks", IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_NICKS))) return 0; + if (!weechat_infolist_new_var_integer (ptr_item, "nicks_alternate", + IRC_SERVER_OPTION_BOOLEAN(server, IRC_SERVER_OPTION_NICKS_ALTERNATE))) + return 0; if (!weechat_infolist_new_var_string (ptr_item, "username", IRC_SERVER_OPTION_STRING(server, IRC_SERVER_OPTION_USERNAME))) return 0; @@ -5587,7 +5591,7 @@ irc_server_print_log () "on" : "off"); else weechat_log_printf (" ipv6 . . . . . . . . : %s", - weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_IPV6]) ? + (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_IPV6])) ? "on" : "off"); /* ssl */ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SSL])) @@ -5596,7 +5600,7 @@ irc_server_print_log () "on" : "off"); else weechat_log_printf (" ssl. . . . . . . . . : %s", - weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_SSL]) ? + (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_SSL])) ? "on" : "off"); /* ssl_cert */ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_SSL_CERT])) @@ -5633,7 +5637,7 @@ irc_server_print_log () "on" : "off"); else weechat_log_printf (" ssl_verify . . . . . : %s", - weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_SSL_VERIFY]) ? + (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_SSL_VERIFY])) ? "on" : "off"); /* password */ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_PASSWORD])) @@ -5687,7 +5691,7 @@ irc_server_print_log () "on" : "off"); else weechat_log_printf (" autoconnect. . . . . : %s", - weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTOCONNECT]) ? + (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTOCONNECT])) ? "on" : "off"); /* autoreconnect */ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_AUTORECONNECT])) @@ -5696,7 +5700,7 @@ irc_server_print_log () "on" : "off"); else weechat_log_printf (" autoreconnect. . . . : %s", - weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTORECONNECT]) ? + (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTORECONNECT])) ? "on" : "off"); /* autoreconnect_delay */ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_AUTORECONNECT_DELAY])) @@ -5712,6 +5716,15 @@ irc_server_print_log () else weechat_log_printf (" nicks. . . . . . . . : '%s'", weechat_config_string (ptr_server->options[IRC_SERVER_OPTION_NICKS])); + /* nicks_alternate */ + if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE])) + weechat_log_printf (" nicks_alternate. . . : null (%s)", + (IRC_SERVER_OPTION_BOOLEAN(ptr_server, IRC_SERVER_OPTION_NICKS_ALTERNATE)) ? + "on" : "off"); + else + weechat_log_printf (" nicks_alternate. . . : %s", + (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_NICKS_ALTERNATE])) ? + "on" : "off"); /* username */ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_USERNAME])) weechat_log_printf (" username . . . . . . : null ('%s')", @@ -5759,7 +5772,7 @@ irc_server_print_log () "on" : "off"); else weechat_log_printf (" autorejoin . . . . . : %s", - weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTOREJOIN]) ? + (weechat_config_boolean (ptr_server->options[IRC_SERVER_OPTION_AUTOREJOIN])) ? "on" : "off"); /* autorejoin_delay */ if (weechat_config_option_is_null (ptr_server->options[IRC_SERVER_OPTION_AUTOREJOIN_DELAY])) diff --git a/src/plugins/irc/irc-server.h b/src/plugins/irc/irc-server.h index a0f074e20..91401d55c 100644 --- a/src/plugins/irc/irc-server.h +++ b/src/plugins/irc/irc-server.h @@ -64,6 +64,7 @@ enum t_irc_server_option IRC_SERVER_OPTION_AUTORECONNECT, /* autoreconnect when disconnected */ IRC_SERVER_OPTION_AUTORECONNECT_DELAY, /* delay before trying again reco */ IRC_SERVER_OPTION_NICKS, /* nicknames (comma separated list) */ + IRC_SERVER_OPTION_NICKS_ALTERNATE, /* use alternate nicknames */ IRC_SERVER_OPTION_USERNAME, /* user name */ IRC_SERVER_OPTION_REALNAME, /* real name */ IRC_SERVER_OPTION_LOCAL_HOSTNAME,/* custom local hostname */