From f3dc2e7ef91aa258f9cd39e0ea258f6ec08a97ca Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sun, 26 Feb 2012 18:18:37 +0100 Subject: [PATCH] irc: add search for lower case nicks in option irc.look.nick_color_force --- ChangeLog | 2 ++ doc/de/autogen/user/irc_options.txt | 2 +- doc/en/autogen/user/irc_options.txt | 2 +- doc/fr/autogen/user/irc_options.txt | 2 +- doc/it/autogen/user/irc_options.txt | 2 +- po/cs.po | 23 ++++++++++-------- po/de.po | 21 +++++++++------- po/es.po | 21 +++++++++------- po/fr.po | 26 +++++++++++--------- po/hu.po | 20 +++++++++------- po/it.po | 21 +++++++++------- po/ja.po | 21 +++++++++------- po/pl.po | 24 +++++++++++-------- po/pt_BR.po | 21 +++++++++------- po/ru.po | 23 ++++++++++-------- po/weechat.pot | 20 +++++++++------- src/plugins/irc/irc-config.c | 4 +++- src/plugins/irc/irc-nick.c | 37 +++++++++++++++++++++++++---- 18 files changed, 179 insertions(+), 113 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8930831cd..8d01dfb02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ v0.3.8-dev, 2012-02-26 Version 0.3.8 (under dev!) -------------------------- +* irc: add search for lower case nicks in option irc.look.nick_color_force + Version 0.3.7 (2012-02-26) -------------------------- diff --git a/doc/de/autogen/user/irc_options.txt b/doc/de/autogen/user/irc_options.txt index ad419371c..4089f201c 100644 --- a/doc/de/autogen/user/irc_options.txt +++ b/doc/de/autogen/user/irc_options.txt @@ -224,7 +224,7 @@ ** Werte: none, next, near_server (Standardwert: `none`) * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force* -** Beschreibung: `Erzwingt für einen Nick eine spezielle Farbe. Die mittels Streuwertfunktion aus dem Nicknamen generierte Nickfarbe findet für diese Nicks keine Anwendung (Format:"Nick1:Farbe1;Nick2:Farbe2")` +** Beschreibung: `force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); lookup for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option` ** Typ: Zeichenkette ** Werte: beliebige Zeichenkette (Standardwert: `""`) diff --git a/doc/en/autogen/user/irc_options.txt b/doc/en/autogen/user/irc_options.txt index 5f8cc608e..f6ec706b8 100644 --- a/doc/en/autogen/user/irc_options.txt +++ b/doc/en/autogen/user/irc_options.txt @@ -224,7 +224,7 @@ ** values: none, next, near_server (default value: `none`) * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force* -** description: `force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2")` +** description: `force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); lookup for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option` ** type: string ** values: any string (default value: `""`) diff --git a/doc/fr/autogen/user/irc_options.txt b/doc/fr/autogen/user/irc_options.txt index 6ee29a32d..acc622e89 100644 --- a/doc/fr/autogen/user/irc_options.txt +++ b/doc/fr/autogen/user/irc_options.txt @@ -224,7 +224,7 @@ ** valeurs: none, next, near_server (valeur par défaut: `none`) * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force* -** description: `force la couleur pour certains pseudos: le hash calculé avec le pseudo pour trouver la couleur ne sera pas utilisé pour ces pseudos (le format est: "pseudo1:couleur1;pseudo2:couleur2")` +** description: `force la couleur pour certains pseudos: le hash calculé avec le pseudo pour trouver la couleur ne sera pas utilisé pour ces pseudos (le format est: "pseudo1:couleur1;pseudo2:couleur2"); la recherche de pseudos s'effectue avec la casse exacte puis en minuscules, donc il est possible d'utiliser uniquement des minuscules pour les pseudos dans cette option` ** type: chaîne ** valeurs: toute chaîne (valeur par défaut: `""`) diff --git a/doc/it/autogen/user/irc_options.txt b/doc/it/autogen/user/irc_options.txt index 877ed6c63..a5bec0b24 100644 --- a/doc/it/autogen/user/irc_options.txt +++ b/doc/it/autogen/user/irc_options.txt @@ -224,7 +224,7 @@ ** valori: none, next, near_server (valore predefinito: `none`) * [[option_irc.look.nick_color_force]] *irc.look.nick_color_force* -** descrizione: `forza colore per alcuni nick: l'hash calcolato con il nick per trovare il colore non verrà usato per questi nick (il formato è: "nick1:color1;nick2:color2")` +** descrizione: `force color for some nicks: hash computed with nickname to find color will not be used for these nicks (format is: "nick1:color1;nick2:color2"); lookup for nicks is with exact case then lower case, so it's possible to use only lower case for nicks in this option` ** tipo: stringa ** valori: qualsiasi stringa (valore predefinito: `""`) diff --git a/po/cs.po b/po/cs.po index 5ffa6b843..e261d470d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -3358,14 +3358,6 @@ msgstr[2] "normálních" msgid "Debug disabled for cursor mode" msgstr "Ladění vypnuto pro \"%s\"" -#, fuzzy, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "Ladění vypnuto pro \"%s\"" - -#, fuzzy -msgid "Debug disabled for mouse" -msgstr "Ladění vypnuto pro \"%s\"" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "Chyba: nedostatek paměti pro přidáni bufferu do hotlistu" @@ -3396,6 +3388,14 @@ msgstr "výchozí příkaz:" msgid "Not enough memory for new line" msgstr "Nedostatek paměti pro nový řádek" +#, fuzzy, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "Ladění vypnuto pro \"%s\"" + +#, fuzzy +msgid "Debug disabled for mouse" +msgstr "Ladění vypnuto pro \"%s\"" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: chyba, cyklický odkaz při volání aliasu \"%s\"" @@ -5513,9 +5513,12 @@ msgstr "text pro zobrazení před přezdívkou v okně rozhovoru" msgid "text to display after nick in chat window" msgstr "text pro zobrazení za přezdívkou v okně rozhovoru" +#, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" "vynutit barvu u některých přezdívek: hash spočítaný z přezdívky pro nalezení " "barvy nebude použit pro tyto přezdívky (formát je: \"přezdívka1:barva1;" diff --git a/po/de.po b/po/de.po index 0e68bb1d9..159c57a25 100644 --- a/po/de.po +++ b/po/de.po @@ -23,7 +23,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.3.8-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2012-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -3653,13 +3653,6 @@ msgstr[1] "normale" msgid "Debug disabled for cursor mode" msgstr "Debug für Cursor Modus deaktiviert" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "Debug-Modus (%s) für Maus aktiviert" - -msgid "Debug disabled for mouse" -msgstr "Debug für Maus deaktiviert" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "" "Fehler: nicht genügend Speicher um den Buffer der Hotlist hinzu zu fügen" @@ -3690,6 +3683,13 @@ msgstr "führe Befehl \"%s\" aus" msgid "Not enough memory for new line" msgstr "Nicht genügend Speicher für eine neue Zeile" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "Debug-Modus (%s) für Maus aktiviert" + +msgid "Debug disabled for mouse" +msgstr "Debug für Maus deaktiviert" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: Fehler, Zirkelbezug beim Aufruf des Alias \"%s\"" @@ -5894,9 +5894,12 @@ msgstr "Text, der im Chatfenster vor dem Nickname erscheinen soll" msgid "text to display after nick in chat window" msgstr "Text, der im Chatfenster nach dem Nickname erscheinen soll" +#, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" "Erzwingt für einen Nick eine spezielle Farbe. Die mittels Streuwertfunktion " "aus dem Nicknamen generierte Nickfarbe findet für diese Nicks keine " diff --git a/po/es.po b/po/es.po index 22187dc9e..ba196e743 100644 --- a/po/es.po +++ b/po/es.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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -3526,13 +3526,6 @@ msgstr[1] "normales" msgid "Debug disabled for cursor mode" msgstr "Depurado para el modo cursor desactivado" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "Depurado para el modo cursor activado (%s)" - -msgid "Debug disabled for mouse" -msgstr "Depurado para el ratón desactivado" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "" "Error: no hay suficiente memoria para agregar el buffer a la lista de " @@ -3564,6 +3557,13 @@ msgstr "Ejecutando el comando: \"%s\"" msgid "Not enough memory for new line" msgstr "No hay suficiente memoria para una línea nueva" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "Depurado para el modo cursor activado (%s)" + +msgid "Debug disabled for mouse" +msgstr "Depurado para el ratón desactivado" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: error, referencia circular al ejecutar el alias \"%s\"" @@ -5714,9 +5714,12 @@ msgstr "texto a mostrar antes del apodo en la ventana de charla" msgid "text to display after nick in chat window" msgstr "texto a mostrar tras el apodo en la ventana de charla" +#, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" "fuerza color para algunos apodos: no se computará el hash usado para elegir " "el color en estos apodos (el formato es: \"apodo1:color1;apodo2:color2\")" diff --git a/po/fr.po b/po/fr.po index d4441d390..6fa46972f 100644 --- a/po/fr.po +++ b/po/fr.po @@ -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-02-26 08:00+0100\n" -"PO-Revision-Date: 2012-02-26 09:16+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" +"PO-Revision-Date: 2012-02-26 18:02+0100\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: French\n" @@ -3560,13 +3560,6 @@ msgstr[1] "normaux" msgid "Debug disabled for cursor mode" msgstr "Debug désactivé pour le mode curseur" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "Debug activé pour la souris (%s)" - -msgid "Debug disabled for mouse" -msgstr "Debug désactivé pour la souris" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "Erreur: impossible d'ajouter le tampon à la liste des tampons actifs" @@ -3596,6 +3589,13 @@ msgstr "Lancement de la commande: \"%s\"" msgid "Not enough memory for new line" msgstr "Pas assez de mémoire pour une nouvelle ligne" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "Debug activé pour la souris (%s)" + +msgid "Debug disabled for mouse" +msgstr "Debug désactivé pour la souris" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: erreur, référence circulaire lors de l'appel à l'alias \"%s\"" @@ -5760,11 +5760,15 @@ msgstr "texte à afficher après le pseudo dans la fenêtre de discussion" msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" "force la couleur pour certains pseudos: le hash calculé avec le pseudo pour " "trouver la couleur ne sera pas utilisé pour ces pseudos (le format est: " -"\"pseudo1:couleur1;pseudo2:couleur2\")" +"\"pseudo1:couleur1;pseudo2:couleur2\"); la recherche de pseudos s'effectue " +"avec la casse exacte puis en minuscules, donc il est possible d'utiliser " +"uniquement des minuscules pour les pseudos dans cette option" msgid "" "chars used to stop in nick when computing color with letters of nick (at " diff --git a/po/hu.po b/po/hu.po index 6eb473bc5..697cee632 100644 --- a/po/hu.po +++ b/po/hu.po @@ -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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -3027,13 +3027,6 @@ msgstr[1] "normál" msgid "Debug disabled for cursor mode" msgstr "" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "" - -msgid "Debug disabled for mouse" -msgstr "" - #, fuzzy msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s nincs elég memória az ignore elkészítéséhez\n" @@ -3065,6 +3058,13 @@ msgstr "%s belső parancsok:\n" msgid "Not enough memory for new line" msgstr "Nincs elég memória az új sorhoz\n" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "" + +msgid "Debug disabled for mouse" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s körreferencia a \"/%s\" aliasz hívásakor\n" @@ -5110,7 +5110,9 @@ msgstr "a név után megjelenítendő szöveg a beszédablakban" msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" msgid "" diff --git a/po/it.po b/po/it.po index 861bf0369..df33e0a9a 100644 --- a/po/it.po +++ b/po/it.po @@ -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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Marco Paolone \n" "Language-Team: weechat-dev \n" @@ -3519,13 +3519,6 @@ msgstr[1] "normali" msgid "Debug disabled for cursor mode" msgstr "Debug disabilitato per la modalità cursore" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "Debug abilitato per il mouse (%s)" - -msgid "Debug disabled for mouse" -msgstr "Debug disabilitato per il mouse" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "Errore: memoria non sufficiente per aggiungere un buffer alla hotlist" @@ -3555,6 +3548,13 @@ msgstr "Esecuzione comando: \"%s\"" msgid "Not enough memory for new line" msgstr "Memoria non sufficiente per una nuova riga" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "Debug abilitato per il mouse (%s)" + +msgid "Debug disabled for mouse" +msgstr "Debug disabilitato per il mouse" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: errore, riferimento circolare alla chiamata dell'alias \"%s\"" @@ -5697,9 +5697,12 @@ msgstr "testo da visualizzare prima del nick nella finestra di chat" msgid "text to display after nick in chat window" msgstr "testo da visualizzare dopo il nick nella finestra di chat" +#, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" "forza colore per alcuni nick: l'hash calcolato con il nick per trovare il " "colore non verrà usato per questi nick (il formato è: \"nick1:color1;nick2:" diff --git a/po/ja.po b/po/ja.po index 155335e84..f0c9ac2fb 100644 --- a/po/ja.po +++ b/po/ja.po @@ -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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: \"AYANOKOUZI, Ryuunosuke\" \n" "Language-Team: Japanese\n" @@ -3431,13 +3431,6 @@ msgstr[0] "通常" msgid "Debug disabled for cursor mode" msgstr "カーソルモードのデバッグを無効化" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "マウス (%s) のデバッグを有効化" - -msgid "Debug disabled for mouse" -msgstr "マウスのデバッグを無効化" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "エラー: バッファをホットリストに追加するメモリが足りません" @@ -3467,6 +3460,13 @@ msgstr "コマンド実行中: \"%s\"" msgid "Not enough memory for new line" msgstr "新しい行に使うメモリが足りません" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "マウス (%s) のデバッグを有効化" + +msgid "Debug disabled for mouse" +msgstr "マウスのデバッグを無効化" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: エラー、別名 \"%s\" の呼び出し中に循環参照を検知" @@ -5572,9 +5572,12 @@ msgstr "チャットウィンドウ内でニックネーム前に表示するテ msgid "text to display after nick in chat window" msgstr "チャットウィンドウ内でニックネーム後に表示するテキスト" +#, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" "ニックネーム色を強制するニックネーム: ニックネームから計算されるハッシュを元" "にした色を利用しない (フォーマット: \"nick1:color1;nick2:color2\")" diff --git a/po/pl.po b/po/pl.po index 52e6fd766..fe8562b41 100644 --- a/po/pl.po +++ b/po/pl.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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -29,7 +29,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " +"|| n%100>=20) ? 1 : 2);\n" #. TRANSLATORS: "%s %s" after "compiled on" is date and time #, c-format @@ -3512,13 +3513,6 @@ msgstr[2] "normalnych" msgid "Debug disabled for cursor mode" msgstr "Debugowanie wyłączone dla trybu kursora" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "Debugowanie włączone dla myszy (%s)" - -msgid "Debug disabled for mouse" -msgstr "Debugowanie wyłączone dla myszy" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "Błąd: za mało pamięci, aby dodać bufor do hotlisty" @@ -3548,6 +3542,13 @@ msgstr "Wykonuję komendę: \"%s\"" msgid "Not enough memory for new line" msgstr "Za mało pamięci na nowy wiersz" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "Debugowanie włączone dla myszy (%s)" + +msgid "Debug disabled for mouse" +msgstr "Debugowanie wyłączone dla myszy" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: błąd, cykliczna referencja przy wywoływaniu aliasu \"%s\"" @@ -5680,9 +5681,12 @@ msgstr "teks wyświetlany przed nickiem w oknie rozmowy" msgid "text to display after nick in chat window" msgstr "teks wyświetlany za nickiem w oknie rozmowy" +#, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" "wymusza kolory dla nicków: hash połączony z nickiem w celu znalezienia " "koloru nie zostanie użyty dla tych nicków (format: \"nick1:kolor1;nick2:" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5762d7244..6f0f637c6 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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -3449,13 +3449,6 @@ msgstr[1] "normais" msgid "Debug disabled for cursor mode" msgstr "Depuração desabilitada para modo cursor" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "Depuração habilitada para mouse (%s)" - -msgid "Debug disabled for mouse" -msgstr "Depuração desabilitada para mouse" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "" "Erro: memória insuficiente para adicionar um buffer na lista de atividades" @@ -3486,6 +3479,13 @@ msgstr "Executando comando: \"%s\"" msgid "Not enough memory for new line" msgstr "Memória insuficiente para nova linha" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "Depuração habilitada para mouse (%s)" + +msgid "Debug disabled for mouse" +msgstr "Depuração desabilitada para mouse" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s%s: erro, referência circular ao chamar atalho \"%s\"" @@ -5262,9 +5262,12 @@ msgstr "texto a ser exibido antes do apelido na janela de chat" msgid "text to display after nick in chat window" msgstr "texto a ser exibido depois do apelido na janela de chat" +#, fuzzy msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" "forçar cor para alguns apelidos: hash computado com apelido para encontar " "cor não será utilizado para estes apelidos (formato: \"apelido1:cor1;" diff --git a/po/ru.po b/po/ru.po index fee81c72d..500665a68 100644 --- a/po/ru.po +++ b/po/ru.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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: 2012-02-26 09:16+0100\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -29,7 +29,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Poedit-Bookmarks: -1,-1,608,-1,-1,-1,-1,-1,-1,-1\n" #. TRANSLATORS: "%s %s" after "compiled on" is date and time @@ -3056,13 +3057,6 @@ msgstr[2] "обычные" msgid "Debug disabled for cursor mode" msgstr "" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "" - -msgid "Debug disabled for mouse" -msgstr "" - #, fuzzy msgid "Error: not enough memory to add a buffer to hotlist" msgstr "%s не могу добавить буфер в хотлист\n" @@ -3094,6 +3088,13 @@ msgstr "Внутренние команды %s:\n" msgid "Not enough memory for new line" msgstr "Недостаточно памяти для новой строчки\n" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "" + +msgid "Debug disabled for mouse" +msgstr "" + #, fuzzy, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "%s рекурсия при вызове сокращения \"/%s\"\n" @@ -5126,7 +5127,9 @@ msgstr "текст, который отображать после ника в msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" msgid "" diff --git a/po/weechat.pot b/po/weechat.pot index 5d2408b62..949b0a03e 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-02-26 08:00+0100\n" +"POT-Creation-Date: 2012-02-26 18:02+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2660,13 +2660,6 @@ msgstr[1] "" msgid "Debug disabled for cursor mode" msgstr "" -#, c-format -msgid "Debug enabled for mouse (%s)" -msgstr "" - -msgid "Debug disabled for mouse" -msgstr "" - msgid "Error: not enough memory to add a buffer to hotlist" msgstr "" @@ -2696,6 +2689,13 @@ msgstr "" msgid "Not enough memory for new line" msgstr "" +#, c-format +msgid "Debug enabled for mouse (%s)" +msgstr "" + +msgid "Debug disabled for mouse" +msgstr "" + #, c-format msgid "%s%s: error, circular reference when calling alias \"%s\"" msgstr "" @@ -4398,7 +4398,9 @@ msgstr "" msgid "" "force color for some nicks: hash computed with nickname to find color will " -"not be used for these nicks (format is: \"nick1:color1;nick2:color2\")" +"not be used for these nicks (format is: \"nick1:color1;nick2:color2\"); " +"lookup for nicks is with exact case then lower case, so it's possible to use " +"only lower case for nicks in this option" msgstr "" msgid "" diff --git a/src/plugins/irc/irc-config.c b/src/plugins/irc/irc-config.c index 205741563..435b45691 100644 --- a/src/plugins/irc/irc-config.c +++ b/src/plugins/irc/irc-config.c @@ -2087,7 +2087,9 @@ irc_config_init () "nick_color_force", "string", N_("force color for some nicks: hash computed with nickname " "to find color will not be used for these nicks (format is: " - "\"nick1:color1;nick2:color2\")"), + "\"nick1:color1;nick2:color2\"); lookup for nicks is with " + "exact case then lower case, so it's possible to use only lower " + "case for nicks in this option"), NULL, 0, 0, "", NULL, 0, NULL, NULL, &irc_config_change_look_nick_color_force, NULL, NULL, NULL); irc_config_look_nick_color_stop_chars = weechat_config_new_option ( diff --git a/src/plugins/irc/irc-nick.c b/src/plugins/irc/irc-nick.c index a360ee117..fbcb944fe 100644 --- a/src/plugins/irc/irc-nick.c +++ b/src/plugins/irc/irc-nick.c @@ -159,6 +159,37 @@ irc_nick_hash_color (const char *nickname) return (color % irc_config_num_nick_colors); } +/* + * irc_nick_get_forced_color: get forced color for a nick + * (NULL if no color is forced for nick) + */ + +const char * +irc_nick_get_forced_color (const char *nickname) +{ + const char *forced_color; + char *nick_lower; + + if (!nickname) + return NULL; + + forced_color = weechat_hashtable_get (irc_config_hashtable_nick_color_force, + nickname); + if (forced_color) + return forced_color; + + nick_lower = strdup (nickname); + if (nick_lower) + { + weechat_string_tolower (nick_lower); + forced_color = weechat_hashtable_get (irc_config_hashtable_nick_color_force, + nick_lower); + free (nick_lower); + } + + return forced_color; +} + /* * irc_nick_find_color: find a color code for a nick * (according to nick letters) @@ -178,8 +209,7 @@ irc_nick_find_color (const char *nickname) return weechat_color ("default"); /* look if color is forced */ - forced_color = weechat_hashtable_get (irc_config_hashtable_nick_color_force, - nickname); + forced_color = irc_nick_get_forced_color (nickname); if (forced_color) { forced_color = weechat_color (forced_color); @@ -218,8 +248,7 @@ irc_nick_find_color_name (const char *nickname) return default_color; /* look if color is forced */ - forced_color = weechat_hashtable_get (irc_config_hashtable_nick_color_force, - nickname); + forced_color = irc_nick_get_forced_color (nickname); if (forced_color) return forced_color;