From c4773e63d8a67cc870878b9a4465ea8d75e88d05 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Mon, 5 Aug 2013 20:37:59 +0200 Subject: [PATCH] rmodifier: add option "missing" for command /rmodifier --- ChangeLog | 3 +- doc/de/autogen/user/rmodifier_commands.txt | 34 ++++++++++++---------- doc/en/autogen/user/rmodifier_commands.txt | 2 ++ doc/fr/autogen/user/rmodifier_commands.txt | 2 ++ doc/it/autogen/user/rmodifier_commands.txt | 34 ++++++++++++---------- doc/ja/autogen/user/rmodifier_commands.txt | 30 ++++++++++--------- po/cs.po | 13 +++++++-- po/de.po | 13 +++++++-- po/es.po | 12 ++++++-- po/fr.po | 16 +++++++--- po/hu.po | 11 +++++-- po/it.po | 13 +++++++-- po/ja.po | 12 ++++++-- po/pl.po | 14 +++++++-- po/pt_BR.po | 12 ++++++-- po/ru.po | 12 ++++++-- po/tr.po | 10 +++++-- po/weechat.pot | 11 +++++-- src/plugins/rmodifier/rmodifier-command.c | 21 ++++++++++--- src/plugins/rmodifier/rmodifier.c | 34 ++++++++++++++++++++++ src/plugins/rmodifier/rmodifier.h | 1 + 21 files changed, 233 insertions(+), 77 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba77a15c3..371e10b9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,7 @@ WeeChat ChangeLog ================= Sébastien Helleu -v0.4.2-dev, 2013-08-04 +v0.4.2-dev, 2013-08-05 This document lists all changes for each version. @@ -83,6 +83,7 @@ Version 0.4.2 (under dev!) * lua: fix interpreter used in API functions (bug #39470) * relay: add command "ping" in weechat protocol (task #12689) * relay: fix binding to an IP address (bug #39119) +* rmodifier: add option "missing" for command /rmodifier * script: add info about things defined by script (like commands, options, ...) in the detailed view of script (/script show) * scripts: add hdata with script callback diff --git a/doc/de/autogen/user/rmodifier_commands.txt b/doc/de/autogen/user/rmodifier_commands.txt index 9dcbc1e26..d7874bc06 100644 --- a/doc/de/autogen/user/rmodifier_commands.txt +++ b/doc/de/autogen/user/rmodifier_commands.txt @@ -4,25 +4,27 @@ /rmodifier list|listdefault add del |-all [...] + missing default -yes - list: zeigt alle rmodifier an -listdefault: zeigt die Standardeinstellung für rmodifier an - add: einen rmodifier hinzufügen - name: Name des rmodifier - modifiers: durch Kommata getrennte Liste der modifier - groups: Aktion auf Gruppen (groups) anwenden, die durch reguläre Ausdrücke abgefragt werden (innerhalb der runden Klammern): durch Kommata getrennte Liste der Gruppen (von 1 bis 9). Optional kann nach der Nummer für die Gruppe ein "*" gesetzt werden um diese Gruppe auszublenden - regex: regulärer Ausdruck (zwischen Groß- und Kleinschreibung wird nicht unterschieden. Um zwischen Groß- und Kleinschreibung zu unterscheiden muss zu Beginn "(?-i)" genutzt werden) - del: löscht einen rmodifier Eintrag - -all: löscht alle rmodifiers Einträge - default: setzt die rmodifier auf seine Standardwerte zurück + list: list all rmodifiers +listdefault: list default rmodifiers + add: add a rmodifier + name: name of rmodifier + modifiers: comma separated list of modifiers + groups: action on groups captured in regular expression (inside parentheses): comma separated list of groups (from 1 to 9) with optional "*" after number to hide the group + regex: regular expression (case insensitive, can start by "(?-i)" to become case sensitive) + del: delete a rmodifier + -all: delete all rmodifiers + missing: add missing rmodifiers + default: restore default rmodifiers -Beispiele: - verbirgt die Eingabe nach dem Befehl /passwort: - /rmodifier add passwort input_text_display 1,2* ^(/passwort +)(.*) - lösche rmodifier "passwort": - /rmodifier del passwort - lösche alle rmodifiers: +Examples: + hide everything typed after a command /password: + /rmodifier add password input_text_display 1,2* ^(/password +)(.*) + delete rmodifier "password": + /rmodifier del password + delete all rmodifiers: /rmodifier del -all ........................................ diff --git a/doc/en/autogen/user/rmodifier_commands.txt b/doc/en/autogen/user/rmodifier_commands.txt index 45fd9b91d..978d74d3a 100644 --- a/doc/en/autogen/user/rmodifier_commands.txt +++ b/doc/en/autogen/user/rmodifier_commands.txt @@ -4,6 +4,7 @@ /rmodifier list|listdefault add del |-all [...] + missing default -yes list: list all rmodifiers @@ -15,6 +16,7 @@ listdefault: list default rmodifiers regex: regular expression (case insensitive, can start by "(?-i)" to become case sensitive) del: delete a rmodifier -all: delete all rmodifiers + missing: add missing rmodifiers default: restore default rmodifiers Examples: diff --git a/doc/fr/autogen/user/rmodifier_commands.txt b/doc/fr/autogen/user/rmodifier_commands.txt index ce02dffb3..56c8f934f 100644 --- a/doc/fr/autogen/user/rmodifier_commands.txt +++ b/doc/fr/autogen/user/rmodifier_commands.txt @@ -4,6 +4,7 @@ /rmodifier list|listdefault add del |-all [...] + missing default -yes list: lister les rmodifiers @@ -15,6 +16,7 @@ listdefault: lister les rmodifiers par défaut regex: expression régulière (insensible à la casse, peut commencer par "(?-i)" pour devenir sensible à la casse) del: supprimer un rmodifier -all: supprimer tous les rmodifiers + missing: ajouter les rmodifiers manquants default: restaurer les rmodifiers par défaut Exemples: diff --git a/doc/it/autogen/user/rmodifier_commands.txt b/doc/it/autogen/user/rmodifier_commands.txt index be160fc69..7d197207e 100644 --- a/doc/it/autogen/user/rmodifier_commands.txt +++ b/doc/it/autogen/user/rmodifier_commands.txt @@ -2,27 +2,29 @@ [command]*`rmodifier`* sostituisce le stringhe del modificatore con le espressioni regolari:: ........................................ /rmodifier list|listdefault - add - del |-all [...] + add + del |-all [...] + missing default -yes - list: elenca tutti gli rmodifier -listdefault: elenca gli rmodifier predefiniti - add: aggiunge un rmodifier - nome: nome rmodifier - modifier: elenco separato da virgole di modificatori - gruppi: azione sui gruppi catturati nell'espressione regolare (tra parentesi): elenco separato da virgole di gruppi (da 1 a 9) con "*" opzionale dopo il numero per nascondere il gruppo - regex: espressione regolare (non sensibile alle maiuscole, può iniziare con "(?-i)" per diventare sensibile alle maiuscole - del: elimina rmodifier - -all: elimina tutti gli rmodifier - default: ripristina gli rmodifier predefiniti + list: list all rmodifiers +listdefault: list default rmodifiers + add: add a rmodifier + name: name of rmodifier + modifiers: comma separated list of modifiers + groups: action on groups captured in regular expression (inside parentheses): comma separated list of groups (from 1 to 9) with optional "*" after number to hide the group + regex: regular expression (case insensitive, can start by "(?-i)" to become case sensitive) + del: delete a rmodifier + -all: delete all rmodifiers + missing: add missing rmodifiers + default: restore default rmodifiers -Esempi: - nasconde ciò che viene digitato dopo il comando /password: +Examples: + hide everything typed after a command /password: /rmodifier add password input_text_display 1,2* ^(/password +)(.*) - elimina rmodifier "password": + delete rmodifier "password": /rmodifier del password - elimina tutti gli rmodifier: + delete all rmodifiers: /rmodifier del -all ........................................ diff --git a/doc/ja/autogen/user/rmodifier_commands.txt b/doc/ja/autogen/user/rmodifier_commands.txt index 158aaf5b2..c0ad07629 100644 --- a/doc/ja/autogen/user/rmodifier_commands.txt +++ b/doc/ja/autogen/user/rmodifier_commands.txt @@ -4,25 +4,27 @@ /rmodifier list|listdefault add del |-all [...] + missing default -yes - list: 全ての rmodifier をリストアップ -listdefault: デフォルトの rmodifier をリストアップ - add: rmodifier を追加 - name: rmodifier の名前 - modifiers: rmodifier のコンマ区切りリスト - groups: 正規表現にマッチするグループに対するアクション (括弧内): グループ (1 から 9) のコンマ区切りリスト、グループを隠すにはオプションで番号の後ろに "*" をつける - regex: 正規表現 (大文字小文字の区別無し、"(?-i)" で始めれば区別有り) - del: rmodifier を削除 - -all: 全ての rmodifier を削除 - default: デフォルトの rmodifier に戻す + list: list all rmodifiers +listdefault: list default rmodifiers + add: add a rmodifier + name: name of rmodifier + modifiers: comma separated list of modifiers + groups: action on groups captured in regular expression (inside parentheses): comma separated list of groups (from 1 to 9) with optional "*" after number to hide the group + regex: regular expression (case insensitive, can start by "(?-i)" to become case sensitive) + del: delete a rmodifier + -all: delete all rmodifiers + missing: add missing rmodifiers + default: restore default rmodifiers -例: - コマンド /password に続く入力は全て隠す: +Examples: + hide everything typed after a command /password: /rmodifier add password input_text_display 1,2* ^(/password +)(.*) - rmodifier "password" を削除: + delete rmodifier "password": /rmodifier del password - 全ての rmodifiers を削除: + delete all rmodifiers: /rmodifier del -all ........................................ diff --git a/po/cs.po b/po/cs.po index 72c7b242a..3d058695b 100644 --- a/po/cs.po +++ b/po/cs.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-07-31 18:41+0200\n" "Last-Translator: Jiri Golembiovsky \n" "Language-Team: weechat-dev \n" @@ -8461,12 +8461,20 @@ msgstr "" "%sChyba: \"-yes\" argument je požadován pro obnovení výchozích rmodifikátorů " "(bezpečnostní opatření)" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "%d rmodifikátorů odebráno" +msgstr[1] "%d rmodifikátorů odebráno" +msgstr[2] "%d rmodifikátorů odebráno" + msgid "alter modifier strings with regular expressions" msgstr "změnit řetězce modifikátorů pomocí regulárních výrazů" +#, fuzzy msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" "list|listdefault || add || del |-" "all [...] || default -yes" @@ -8485,6 +8493,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/de.po b/po/de.po index b38912512..d1d380aee 100644 --- a/po/de.po +++ b/po/de.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-08-01 19:57+0200\n" "Last-Translator: Nils Görs \n" "Language-Team: German \n" @@ -9235,18 +9235,26 @@ msgstr "" "%sFehler: Das Argument \"-yes\" ist aus Sicherheitsgründen zum zurücksetzen " "auf die Standardeinstellungen von rmodifier notwendig" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "%d rmodifiers entfernt" +msgstr[1] "%d rmodifiers entfernt" + msgid "alter modifier strings with regular expressions" msgstr "" "wandelt Schlüsselwörter mit regulären Ausdrücken (regelt die Sichtbarkeit " "von Texten in WeeChat)" +#, fuzzy msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" "list|listdefault || add || del |-" "all [...] || default -yes" +#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" @@ -9260,6 +9268,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/es.po b/po/es.po index e39b52d61..72a0c4123 100644 --- a/po/es.po +++ b/po/es.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-07-31 18:41+0200\n" "Last-Translator: Elián Hanisch \n" "Language-Team: weechat-dev \n" @@ -8735,12 +8735,19 @@ msgstr "" "%sError: por seguridad, se requiere el argumento \"-yes\" para restaurar los " "modificadores regulares" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "%d modificadores regulares removidos" +msgstr[1] "%d modificadores regulares removidos" + msgid "alter modifier strings with regular expressions" msgstr "alterar cadenas en modificadores con expresiones regulares" +#, fuzzy msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" "list|listdefault || add || del " "|-all [...] || default -yes" @@ -8759,6 +8766,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/fr.po b/po/fr.po index 145f0c39a..75f6934b8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -21,8 +21,8 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" -"PO-Revision-Date: 2013-08-04 12:45+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" +"PO-Revision-Date: 2013-08-05 08:29+0200\n" "Last-Translator: Sebastien Helleu \n" "Language-Team: weechat-dev \n" "Language: fr\n" @@ -9084,15 +9084,21 @@ msgstr "" "%sErreur: le paramètre \"-yes\" est requis pour la restauration des " "rmodifiers par défaut (raison de sécurité)" +#, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "%d rmodifier ajouté" +msgstr[1] "%d rmodifiers ajoutés" + msgid "alter modifier strings with regular expressions" msgstr "modifier des chaînes de \"modifier\" avec des expressions régulières" msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgid "" " list: list all rmodifiers\n" @@ -9107,6 +9113,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" @@ -9129,6 +9136,7 @@ msgstr "" "\"(?-i)\" pour devenir sensible à la casse)\n" " del: supprimer un rmodifier\n" " -all: supprimer tous les rmodifiers\n" +" missing: ajouter les rmodifiers manquants\n" " default: restaurer les rmodifiers par défaut\n" "\n" "Exemples:\n" diff --git a/po/hu.po b/po/hu.po index 116fb4f50..2576db0ed 100644 --- a/po/hu.po +++ b/po/hu.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-07-31 18:41+0200\n" "Last-Translator: Andras Voroskoi \n" "Language-Team: weechat-dev \n" @@ -7915,13 +7915,19 @@ msgstr "" "%s \"-yes\" paraméter megadása kötelező a billentyűparancsok " "visszaállításához (biztonsági okokból)\n" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] " időkezelők:\n" +msgstr[1] " időkezelők:\n" + #, fuzzy msgid "alter modifier strings with regular expressions" msgstr "%s nincs elég memória az információs pult üzenethez\n" msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" msgid "" @@ -7937,6 +7943,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/it.po b/po/it.po index 8966a1b29..8b060a9ac 100644 --- a/po/it.po +++ b/po/it.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-07-31 18:41+0200\n" "Last-Translator: Esteban I. Ruiz Moreno \n" "Language-Team: weechat-dev \n" @@ -8826,16 +8826,24 @@ msgstr "" "%sErrore: l'argomento \"-yes\" è richiesto per ripristinare gli rmodifier " "predefiniti (motivi di sicurezza)" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "%d rmodifier eliminati" +msgstr[1] "%d rmodifier eliminati" + msgid "alter modifier strings with regular expressions" msgstr "sostituisce le stringhe del modificatore con le espressioni regolari" +#, fuzzy msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" "list|listdefault || add || del |-" "all [...] || default -yes" +#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" @@ -8849,6 +8857,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/ja.po b/po/ja.po index d30c2356b..5deae9da2 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-08-02 08:50+0200\n" "Last-Translator: AYANOKOUZI, Ryuunosuke \n" "Language-Team: Japanese \n" @@ -8702,16 +8702,23 @@ msgstr "" "%sエラー: デフォルト rmodifiers に戻すためには \"-yes\" 引数が必要 (セキュリ" "ティ上の問題)" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "%d 個の rmodifier を削除" + msgid "alter modifier strings with regular expressions" msgstr "正規表現で modifier 文字列を変更" +#, fuzzy msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" "list|listdefault || add || del |-" "all [...] || default -yes" +#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" @@ -8725,6 +8732,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/pl.po b/po/pl.po index 63f28c7ba..2acf57d5c 100644 --- a/po/pl.po +++ b/po/pl.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-08-02 08:50+0200\n" "Last-Translator: Krzysztof Korościk \n" "Language-Team: weechat-dev \n" @@ -8851,16 +8851,25 @@ msgstr "" "%sBłąd: argument \"-yes\" wymagany do przywrócenia domyślnych rmodifierów " "(względy bezpieczeństwa)" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "%d rmodifierów usunięto" +msgstr[1] "%d rmodifierów usunięto" +msgstr[2] "%d rmodifierów usunięto" + msgid "alter modifier strings with regular expressions" msgstr "zmiany ciągów modyfikujących przez wyrażenia regularne" +#, fuzzy msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" "list|listdefault || add || del " "|-all [...] || default -yes" +#, fuzzy msgid "" " list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" @@ -8874,6 +8883,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index bf80472fe..efc057f3d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-07-31 18:42+0200\n" "Last-Translator: Sergio Durigan Junior \n" "Language-Team: weechat-dev \n" @@ -8108,12 +8108,19 @@ msgstr "" "%sErro: argumento \"-yes\" é necessário para restaurar rmodifiers padrões " "(motivo de segurança)" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "%d rmodifiers removidos" +msgstr[1] "%d rmodifiers removidos" + msgid "alter modifier strings with regular expressions" msgstr "alterar string modifier com expressões regulares" +#, fuzzy msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" "list|listdefault || add " "|| del |-all [...] || default -yes" @@ -8131,6 +8138,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/ru.po b/po/ru.po index eee0b3b56..61b6c028b 100644 --- a/po/ru.po +++ b/po/ru.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-07-31 18:42+0200\n" "Last-Translator: Aleksey V Zapparov AKA ixti \n" "Language-Team: weechat-dev \n" @@ -7940,13 +7940,20 @@ msgid "" msgstr "" "%s аргумент \"-yes\" необходим для сброса ключей (в целях безопасности)\n" +#, fuzzy, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] " обработчики таймера:\n" +msgstr[1] " обработчики таймера:\n" +msgstr[2] " обработчики таймера:\n" + #, fuzzy msgid "alter modifier strings with regular expressions" msgstr "%s недостаточно памяти для сообщения в строке информации\n" msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" msgid "" @@ -7962,6 +7969,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/tr.po b/po/tr.po index 1880e1b9c..23174fa84 100644 --- a/po/tr.po +++ b/po/tr.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.2-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-07-31 18:42+0200\n" "Last-Translator: Hasan Kiran \n" "Language-Team: weechat-dev \n" @@ -7060,12 +7060,17 @@ msgid "" "(security reason)" msgstr "" +#, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "" + msgid "alter modifier strings with regular expressions" msgstr "" msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" msgid "" @@ -7081,6 +7086,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/po/weechat.pot b/po/weechat.pot index c6718e246..b64d3c3cc 100644 --- a/po/weechat.pot +++ b/po/weechat.pot @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: WeeChat 0.4.1-dev\n" "Report-Msgid-Bugs-To: flashcode@flashtux.org\n" -"POT-Creation-Date: 2013-08-04 12:44+0200\n" +"POT-Creation-Date: 2013-08-05 08:28+0200\n" "PO-Revision-Date: 2013-02-14 18:20+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: weechat-dev \n" @@ -7025,12 +7025,18 @@ msgid "" "(security reason)" msgstr "" +#, c-format +msgid "%d rmodifier added" +msgid_plural "%d rmodifiers added" +msgstr[0] "" +msgstr[1] "" + msgid "alter modifier strings with regular expressions" msgstr "" msgid "" "list|listdefault || add || del |-" -"all [...] || default -yes" +"all [...] || missing || default -yes" msgstr "" msgid "" @@ -7046,6 +7052,7 @@ msgid "" "become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" +" missing: add missing rmodifiers\n" " default: restore default rmodifiers\n" "\n" "Examples:\n" diff --git a/src/plugins/rmodifier/rmodifier-command.c b/src/plugins/rmodifier/rmodifier-command.c index 8eb229b2c..958e1fac2 100644 --- a/src/plugins/rmodifier/rmodifier-command.c +++ b/src/plugins/rmodifier/rmodifier-command.c @@ -94,17 +94,17 @@ rmodifier_command_cb (void *data, struct t_gui_buffer *buffer, int argc, (void) data; (void) buffer; + /* list all rmodifiers */ if ((argc == 1) || ((argc == 2) && (weechat_strcasecmp (argv[1], "list") == 0))) { - /* list all rmodifiers */ rmodifier_command_list (_("List of rmodifiers:")); return WEECHAT_RC_OK; } + /* list default rmodifiers */ if (weechat_strcasecmp (argv[1], "listdefault") == 0) { - /* list default rmodifiers */ weechat_printf (NULL, ""); weechat_printf (NULL, _("Default rmodifiers:")); for (i = 0; rmodifier_config_default_list[i][0]; i++) @@ -117,9 +117,9 @@ rmodifier_command_cb (void *data, struct t_gui_buffer *buffer, int argc, return WEECHAT_RC_OK; } + /* add a rmodifier */ if (weechat_strcasecmp (argv[1], "add") == 0) { - /* add a rmodifier */ if (argc < 6) { weechat_printf (NULL, @@ -154,9 +154,9 @@ rmodifier_command_cb (void *data, struct t_gui_buffer *buffer, int argc, return WEECHAT_RC_OK; } + /* delete a rmodifier */ if (weechat_strcasecmp (argv[1], "del") == 0) { - /* add a rmodifier */ if (argc < 3) { weechat_printf (NULL, @@ -220,6 +220,16 @@ rmodifier_command_cb (void *data, struct t_gui_buffer *buffer, int argc, return WEECHAT_RC_OK; } + /* add missing rmodifiers */ + if (weechat_strcasecmp (argv[1], "missing") == 0) + { + count = rmodifier_add_missing (); + weechat_printf (NULL, + NG_("%d rmodifier added", "%d rmodifiers added", count), + count); + return WEECHAT_RC_OK; + } + return WEECHAT_RC_OK; } @@ -235,6 +245,7 @@ rmodifier_command_init () N_("list|listdefault" " || add " " || del |-all [...]" + " || missing" " || default -yes"), N_(" list: list all rmodifiers\n" "listdefault: list default rmodifiers\n" @@ -249,6 +260,7 @@ rmodifier_command_init () "can start by \"(?-i)\" to become case sensitive)\n" " del: delete a rmodifier\n" " -all: delete all rmodifiers\n" + " missing: add missing rmodifiers\n" " default: restore default rmodifiers\n\n" "Examples:\n" " hide everything typed after a command /password:\n" @@ -261,6 +273,7 @@ rmodifier_command_init () " || listdefault" " || add %(rmodifier)" " || del %(rmodifier)|-all %(rmodifier)|%*" + " || missing" " || default", &rmodifier_command_cb, NULL); } diff --git a/src/plugins/rmodifier/rmodifier.c b/src/plugins/rmodifier/rmodifier.c index 0e7ce4655..7f751e387 100644 --- a/src/plugins/rmodifier/rmodifier.c +++ b/src/plugins/rmodifier/rmodifier.c @@ -385,6 +385,40 @@ rmodifier_create_default () } } +/* + * Adds missing rmodifiers. + * + * Returns the number of rmodifiers added. + */ + +int +rmodifier_add_missing () +{ + int i, count; + + count = 0; + + for (i = 0; rmodifier_config_default_list[i][0]; i++) + { + if (!rmodifier_search (rmodifier_config_default_list[i][0])) + { + if (rmodifier_new (rmodifier_config_default_list[i][0], + rmodifier_config_default_list[i][1], + rmodifier_config_default_list[i][2], + rmodifier_config_default_list[i][3])) + { + rmodifier_config_modifier_new_option (rmodifier_config_default_list[i][0], + rmodifier_config_default_list[i][1], + rmodifier_config_default_list[i][2], + rmodifier_config_default_list[i][3]); + count++; + } + } + } + + return count; +} + /* * Frees a rmodifier and removes it from list. */ diff --git a/src/plugins/rmodifier/rmodifier.h b/src/plugins/rmodifier/rmodifier.h index f06809e69..7317f3789 100644 --- a/src/plugins/rmodifier/rmodifier.h +++ b/src/plugins/rmodifier/rmodifier.h @@ -53,6 +53,7 @@ struct t_rmodifier *rmodifier_new (const char *name, extern struct t_rmodifier *rmodifier_new_with_string (const char *name, const char *value); extern void rmodifier_create_default (); +extern int rmodifier_add_missing (); extern void rmodifier_free (struct t_rmodifier *rmodifier); extern void rmodifier_free_all (); extern int rmodifier_add_to_infolist (struct t_infolist *infolist,