pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 22:06:38 +02:00
Code Activity

core: add option "-mask" in command /unset (closes #112)

Browse Source
This commit is contained in:
Sébastien Helleu
2014-07-12 09:14:56 +02:00
parent f80a80204a
commit e0312f7ecf
20 changed files with 306 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.asciidoc
+1
View File
@@ -15,6 +15,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
== Version 1.0 (under dev)
* core: add option "-mask" in command /unset (closes #112)
* core: add option weechat.color.status_nicklist_count (closes #109,
closes #110)
* core: fix socks5 proxy for curl downloads (closes #119)
doc/de/autogen/user/weechat_commands.asciidoc
+8 -6
View File
@@ -795,16 +795,18 @@ Beispiele:
----
/unset <option>
-mask <option>
option: Name einer Option (Platzhalter "*" kann verwendet werden um viele Optionen in einem Arbeitsschritt zurückzusetzen. Nutzen Sie diese Funktion mit äußerster Sorgfalt!)
option: name of an option
-mask: use a mask in option (wildcard "*" is allowed to mass-reset options, use carefully!)
Gemäß der jeweiligen Option wird diese zurückgesetzt (bei Standard-Optionen) oder komplett entfernt (bei optionalen Einstellungen, zum Beispiel die Server-Einstellungen).
According to option, it's reset (for standard options) or removed (for optional settings, like server values).
Beispiele:
Eine Option zurücksetzen:
Examples:
reset one option:
/unset weechat.look.item_time_format
Alle Farboptionen zurücksetzen:
/unset weechat.color.*
reset all color options:
/unset -mask weechat.color.*
----
[[command_weechat_upgrade]]
doc/en/autogen/user/weechat_commands.asciidoc
+4 -2
View File
@@ -795,8 +795,10 @@ Examples:
----
/unset <option>
-mask <option>
option: name of an option (wildcard "*" is allowed to mass-reset options, use carefully!)
option: name of an option
-mask: use a mask in option (wildcard "*" is allowed to mass-reset options, use carefully!)
According to option, it's reset (for standard options) or removed (for optional settings, like server values).
@@ -804,7 +806,7 @@ Examples:
reset one option:
/unset weechat.look.item_time_format
reset all color options:
/unset weechat.color.*
/unset -mask weechat.color.*
----
[[command_weechat_upgrade]]
doc/fr/autogen/user/weechat_commands.asciidoc
+4 -2
View File
@@ -795,8 +795,10 @@ Exemples :
----
/unset <option>
-mask <option>
option : nom d'une option (le caractère joker "*" est autorisé pour réinitialiser plusieurs options, à utiliser avec prudence !)
option : nom d'une option
-mask : utiliser un masque pour l'option (le caractère joker "*" est autorisé pour réinitialiser plusieurs options, à utiliser avec prudence !)
Selon l'option, elle est réinitialisée (pour les options standards) ou supprimée (pour les options facultatives, comme les valeurs pour les serveurs).
@@ -804,7 +806,7 @@ Exemples :
réinitialiser une option :
/unset weechat.look.item_time_format
réinitialiser toutes les options de couleur :
/unset weechat.color.*
/unset -mask weechat.color.*
----
[[command_weechat_upgrade]]
doc/it/autogen/user/weechat_commands.asciidoc
+5 -3
View File
@@ -794,9 +794,11 @@ Examples:
[command]*`unset`* annulla/ripristina opzione::
----
/unset <opzione>
/unset <option>
-mask <option>
option: name of an option (wildcard "*" is allowed to mass-reset options, use carefully!)
option: name of an option
-mask: use a mask in option (wildcard "*" is allowed to mass-reset options, use carefully!)
According to option, it's reset (for standard options) or removed (for optional settings, like server values).
@@ -804,7 +806,7 @@ Examples:
reset one option:
/unset weechat.look.item_time_format
reset all color options:
/unset weechat.color.*
/unset -mask weechat.color.*
----
[[command_weechat_upgrade]]
doc/ja/autogen/user/weechat_commands.asciidoc
+8 -6
View File
@@ -795,16 +795,18 @@ option: オプションの名前 (ワイルドカード '*' を使うことが
----
/unset <option>
-mask <option>
option: オプションの名前 (大量のオプションをリセットするにはワイルドカード "*" を使ってください、注意して使用!)
option: name of an option
-mask: use a mask in option (wildcard "*" is allowed to mass-reset options, use carefully!)
オプションの種類によって (一般的なオプションを) リセットまたは (サーバなどの任意な設定を) 削除が行われます。
According to option, it's reset (for standard options) or removed (for optional settings, like server values).
例:
オプションのリセット:
Examples:
reset one option:
/unset weechat.look.item_time_format
全ての色関連オプションをリセット:
/unset weechat.color.*
reset all color options:
/unset -mask weechat.color.*
----
[[command_weechat_upgrade]]
doc/pl/autogen/user/weechat_commands.asciidoc
+5 -3
View File
@@ -794,9 +794,11 @@ Examples:
[command]*`unset`* skasuj/zresetuj zmienną konfiguracyjną::
----
/unset <opcja>
/unset <option>
-mask <option>
option: name of an option (wildcard "*" is allowed to mass-reset options, use carefully!)
option: name of an option
-mask: use a mask in option (wildcard "*" is allowed to mass-reset options, use carefully!)
According to option, it's reset (for standard options) or removed (for optional settings, like server values).
@@ -804,7 +806,7 @@ Examples:
reset one option:
/unset weechat.look.item_time_format
reset all color options:
/unset weechat.color.*
/unset -mask weechat.color.*
----
[[command_weechat_upgrade]]
po/cs.po
+14 -10
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -874,10 +874,6 @@ msgstr "Volba vytvořena: "
msgid "Option changed"
msgstr "Volba změněna"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr ""
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%sSelhalo odnastavení volby \"%s\""
@@ -889,6 +885,10 @@ msgstr "Volba resetována: "
msgid "Option removed: %s"
msgstr "Volba odebrána: %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr ""
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr "%d volba/volby resetovány, %d volba/volby smazány"
@@ -2244,13 +2244,14 @@ msgstr ""
msgid "unset/reset config options"
msgstr "odnastavit/resetovat konfigurační možnosti"
msgid "<option>"
msgstr "<volba>"
msgid "<option> || -mask <option>"
msgstr ""
#, fuzzy
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2259,7 +2260,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
"volba: jméno volby (může začínat nebo končit \"*\" pro hromadný reset voleb, "
"používejte obezřetně!)\n"
@@ -10716,3 +10717,6 @@ msgstr "%s%s: nemohu nastavit \"neblokovaci\" volbu na soket"
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: vypršel časový limit \"%s\" pro %s"
#~ msgid "<option>"
#~ msgstr "<volba>"
po/de.po
+15 -10
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-29 12:38+0100\n"
"Last-Translator: Nils Görs <weechatter@arcor.de>\n"
"Language-Team: German <weechatter@arcor.de>\n"
@@ -883,10 +883,6 @@ msgstr "Option erstellt: "
msgid "Option changed"
msgstr "Option geändert"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sDas Zurücksetzen aller Optionen ist nicht zulässig"
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%sOption \"%s\" konnte nicht zurück gesetzt werden"
@@ -898,6 +894,10 @@ msgstr "Option wieder hergestellt: "
msgid "Option removed: %s"
msgstr "Option gelöscht: %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sDas Zurücksetzen aller Optionen ist nicht zulässig"
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr "%d Option(en) wieder hergestellt, %d Option(en) entfernt"
@@ -2611,12 +2611,14 @@ msgstr ""
msgid "unset/reset config options"
msgstr "Konfigurationsparameter freigeben/zurücksetzen"
msgid "<option>"
msgstr "<option>"
msgid "<option> || -mask <option>"
msgstr ""
#, fuzzy
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2625,7 +2627,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
"option: Name einer Option (Platzhalter \"*\" kann verwendet werden um viele "
"Optionen in einem Arbeitsschritt zurückzusetzen. Nutzen Sie diese Funktion "
@@ -12086,6 +12088,9 @@ msgstr ""
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: Zeitüberschreitung für \"%s\" mit %s"
#~ msgid "<option>"
#~ msgstr "<option>"
#~ msgid "evaluate expression and send result to buffer"
#~ msgstr "wertet eine Expression aus und zeigt das Resultat im Buffer an"
po/es.po
+14 -10
View File
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -874,10 +874,6 @@ msgstr "Opción creada: "
msgid "Option changed"
msgstr "Opción cambiada"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sNo esta permitido reiniciar todas las opciones"
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%sNo se pudo deshacer la opción \"%s\""
@@ -889,6 +885,10 @@ msgstr "Opción reiniciada: "
msgid "Option removed: %s"
msgstr "Opción removida: %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sNo esta permitido reiniciar todas las opciones"
# better way of handling plurals?
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
@@ -2360,13 +2360,14 @@ msgstr ""
msgid "unset/reset config options"
msgstr "deshacer/reiniciar opciones de configuración"
msgid "<option>"
msgstr "<opción>"
msgid "<option> || -mask <option>"
msgstr ""
#, fuzzy
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2375,7 +2376,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
"opción: nombre de la opción (puede empezar o terminar con \"*\" para "
"reiniciar varias opciones, usar con cuidado!)\n"
@@ -11001,5 +11002,8 @@ msgstr "%s%s: no es posible configurar la opción \"nonblock\" para el socket"
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: tiempo de espera máximo para \"%s\" con %s"
#~ msgid "<option>"
#~ msgstr "<opción>"
#~ msgid "evaluate expression and send result to buffer"
#~ msgstr "evaluar la expresión y enviar el resultado al buffer"
po/fr.po
+19 -14
View File
@@ -21,8 +21,8 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"PO-Revision-Date: 2014-07-12 08:04+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-07-12 08:56+0200\n"
"Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
"Language: fr\n"
@@ -872,10 +872,6 @@ msgstr "Option créée : "
msgid "Option changed"
msgstr "Option modifiée"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sLa réinitialisation de toutes les options n'est pas autorisée"
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%sImpossible de supprimer/réinitialiser l'option \"%s\""
@@ -887,6 +883,10 @@ msgstr "Option réinitialisée : "
msgid "Option removed: %s"
msgstr "Option supprimée : %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sLa réinitialisation de toutes les options n'est pas autorisée"
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr "%d option(s) réinitialisée(s), %d option(s) supprimée(s)"
@@ -2555,12 +2555,13 @@ msgstr ""
msgid "unset/reset config options"
msgstr "supprimer/réinitialiser des options de configuration"
msgid "<option>"
msgstr "<option>"
msgid "<option> || -mask <option>"
msgstr "<option> || -mask <option>"
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2569,10 +2570,11 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
"option : nom d'une option (le caractère joker \"*\" est autorisé pour "
"réinitialiser plusieurs options, à utiliser avec prudence !)\n"
"option : nom d'une option\n"
" -mask : utiliser un masque pour l'option (le caractère joker \"*\" est "
"autorisé pour réinitialiser plusieurs options, à utiliser avec prudence !)\n"
"\n"
"Selon l'option, elle est réinitialisée (pour les options standards) ou "
"supprimée (pour les options facultatives, comme les valeurs pour les "
@@ -2582,7 +2584,7 @@ msgstr ""
" réinitialiser une option :\n"
" /unset weechat.look.item_time_format\n"
" réinitialiser toutes les options de couleur :\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgid "upgrade WeeChat without disconnecting from servers"
msgstr "mettre à jour WeeChat sans se déconnecter des serveurs"
@@ -11836,5 +11838,8 @@ msgstr ""
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s : délai d'attente dépassé pour \"%s\" avec %s"
#~ msgid "<option>"
#~ msgstr "<option>"
#~ msgid "evaluate expression and send result to buffer"
#~ msgstr "évaluer une expression et envoyer le résultat au tampon"
po/hu.po
+15 -11
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -907,10 +907,6 @@ msgstr "nincs a szobában"
msgid "Option changed"
msgstr "nincs a szobában"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr ""
#, fuzzy, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%s nem sikerült a modul opciókat elmenteni\n"
@@ -923,6 +919,10 @@ msgstr "Modul beállítások elmentve\n"
msgid "Option removed: %s"
msgstr "nincs a szobában"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr ""
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr ""
@@ -1971,13 +1971,13 @@ msgstr ""
msgid "unset/reset config options"
msgstr "konfigurációs paraméterek beállítása"
#, fuzzy
msgid "<option>"
msgstr "[parancs]"
msgid "<option> || -mask <option>"
msgstr ""
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -1986,7 +1986,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
msgid "upgrade WeeChat without disconnecting from servers"
@@ -10104,3 +10104,7 @@ msgstr "%s DCC: nem sikerült 'nonblock' opciót beállítani a csatornán\n"
#, fuzzy, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s hiányzó argumentum a(z) \"%s\" opciónak\n"
#, fuzzy
#~ msgid "<option>"
#~ msgstr "[parancs]"
po/it.po
+14 -10
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-28 14:49+0200\n"
"Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -860,10 +860,6 @@ msgstr "Opzione creata: "
msgid "Option changed"
msgstr "Opzione modificata"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sIl ripristino di tutte le opzioni non è consentito"
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%sImpossibile disabilitare l'opzione \"%s\""
@@ -875,6 +871,10 @@ msgstr "Reset dell'opzione: "
msgid "Option removed: %s"
msgstr "Opzione rimossa: %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sIl ripristino di tutte le opzioni non è consentito"
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr "%d opzione(i) ripristinata(e), %d opzione(i) rimossa(e)"
@@ -2446,13 +2446,14 @@ msgstr ""
msgid "unset/reset config options"
msgstr "annulla/ripristina opzione"
msgid "<option>"
msgstr "<opzione>"
msgid "<option> || -mask <option>"
msgstr ""
#, fuzzy
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2461,7 +2462,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
"opzione: nome di un'opzione (può iniziare o terminare con \"*\" per il "
"ripristino di più opzioni, attenzione!)\n"
@@ -11172,5 +11173,8 @@ msgstr ""
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: timeout per \"%s\" con %s"
#~ msgid "<option>"
#~ msgstr "<opzione>"
#~ msgid "evaluate expression and send result to buffer"
#~ msgstr "analizza l'espressione e invia il risultato al buffer"
po/ja.po
+15 -10
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-07-06 10:54+0900\n"
"Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
"Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -857,10 +857,6 @@ msgstr "作成されたオプション: "
msgid "Option changed"
msgstr "変更されたオプション"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%s全てのオプションをリセットすることは出来ません"
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%sオプション \"%s\" の無効化に失敗しました"
@@ -872,6 +868,10 @@ msgstr "リセットされたオプション: "
msgid "Option removed: %s"
msgstr "削除されたオプション: %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%s全てのオプションをリセットすることは出来ません"
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr "%d 個のオプションがリセットされ、%d 個のオプションが削除されました"
@@ -2486,12 +2486,14 @@ msgstr ""
msgid "unset/reset config options"
msgstr "オプションのアンセット/リセット"
msgid "<option>"
msgstr "<option>"
msgid "<option> || -mask <option>"
msgstr ""
#, fuzzy
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2500,7 +2502,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
"option: オプションの名前 (大量のオプションをリセットするにはワイルドカード "
"\"*\" を使ってください、注意して使用!)\n"
@@ -11384,5 +11386,8 @@ msgstr "%s%s: ソケットにオプション \"nonblock\" を設定できませ
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: \"%s\" のタイムアウト %s"
#~ msgid "<option>"
#~ msgstr "<option>"
#~ msgid "evaluate expression and send result to buffer"
#~ msgstr "式を評価して結果をバッファに送信"
po/pl.po
+14 -10
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-28 14:49+0200\n"
"Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -874,10 +874,6 @@ msgstr "Opcja utworzona: "
msgid "Option changed"
msgstr "Zmieniono opcję"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sResetowanie wszystkich opcji jest niedozwolone"
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%sNie powiodło się wyzerowanie opcji \"%s\""
@@ -889,6 +885,10 @@ msgstr "Reset opcji: "
msgid "Option removed: %s"
msgstr "Usunięto opcję: %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sResetowanie wszystkich opcji jest niedozwolone"
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr "zresetowano %d opcje, usunięto %d opcje"
@@ -2521,13 +2521,14 @@ msgstr ""
msgid "unset/reset config options"
msgstr "skasuj/zresetuj zmienną konfiguracyjną"
msgid "<option>"
msgstr "<opcja>"
msgid "<option> || -mask <option>"
msgstr ""
#, fuzzy
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2536,7 +2537,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
"opcja: nazwa opcji (może się zaczynać lub kończyć \"*\", w celu masowego "
"resetowania opcji, używać ostrożnie!)\n"
@@ -11439,5 +11440,8 @@ msgstr "%s%s: nie można ustawić opcji \"nonblock\" dla gniazda: błąd %d %s"
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: przekroczono czas na \"%s\" z %s"
#~ msgid "<option>"
#~ msgstr "<opcja>"
#~ msgid "evaluate expression and send result to buffer"
#~ msgstr "przetwarza wyrażenie i wysyła wynik do buforu"
po/pt_BR.po
+14 -10
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -895,10 +895,6 @@ msgstr "Opção criada: "
msgid "Option changed"
msgstr "Opção mudada"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sRestauração de todas as opções não é permitida"
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%sFalhou ao desabilitar a opção \"%s\""
@@ -910,6 +906,10 @@ msgstr "Restaurar a opção: "
msgid "Option removed: %s"
msgstr "Opção removida: %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sRestauração de todas as opções não é permitida"
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr "%d opção(ões) restaurada(s), %d opção(ões) removidas"
@@ -2313,13 +2313,14 @@ msgstr ""
msgid "unset/reset config options"
msgstr "indefine/restaura opções de configuração"
msgid "<option>"
msgstr "<opção>"
msgid "<option> || -mask <option>"
msgstr ""
#, fuzzy
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2328,7 +2329,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
"opção: nome de uma opção (pode começar ou terminar com \"*\" para restaurar "
"opções em massa, use com cuidado!)\n"
@@ -10365,3 +10366,6 @@ msgstr "%s%s: não foi possível setar opção \"nonblock\" para o socket"
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s%s: tempo esgotado para \"%s\" com %s"
#~ msgid "<option>"
#~ msgstr "<opção>"
po/ru.po
+15 -11
View File
@@ -21,7 +21,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -928,10 +928,6 @@ msgstr "не на канале"
msgid "Option changed"
msgstr "не на канале"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sСброс всех опций запрещён"
#, fuzzy, c-format
msgid "%sFailed to unset option \"%s\""
msgstr "%s не могу сохранить конфигурационный файл pluginов\n"
@@ -944,6 +940,10 @@ msgstr "Настройки pluginов сохранены\n"
msgid "Option removed: %s"
msgstr "не на канале"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr "%sСброс всех опций запрещён"
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr "%d опция сброшено, %d опций удалено"
@@ -1994,13 +1994,13 @@ msgstr ""
msgid "unset/reset config options"
msgstr "настроить параметры конфигурации"
#, fuzzy
msgid "<option>"
msgstr "[команда]"
msgid "<option> || -mask <option>"
msgstr ""
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -2009,7 +2009,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
msgid "upgrade WeeChat without disconnecting from servers"
@@ -10125,3 +10125,7 @@ msgstr "%s DCC: не могу установить неблокирующий р
#, fuzzy, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr "%s нет аргумента для параметра \"%s\"\n"
#, fuzzy
#~ msgid "<option>"
#~ msgstr "[команда]"
po/tr.po
+14 -10
View File
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: WeeChat\n"
"Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
"POT-Creation-Date: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2014-06-28 13:18+0200\n"
"Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -816,10 +816,6 @@ msgstr "Seçenek oluşturuldu: "
msgid "Option changed"
msgstr "Seçenek değiştirildi"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr ""
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr ""
@@ -831,6 +827,10 @@ msgstr ""
msgid "Option removed: %s"
msgstr "Seçenek kaldırıldı: %s"
#, c-format
msgid "%sReset of all options is not allowed"
msgstr ""
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr ""
@@ -1789,12 +1789,13 @@ msgstr ""
msgid "unset/reset config options"
msgstr ""
msgid "<option>"
msgstr "<seçenek>"
msgid "<option> || -mask <option>"
msgstr ""
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -1803,7 +1804,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
msgid "upgrade WeeChat without disconnecting from servers"
@@ -9129,3 +9130,6 @@ msgstr ""
#, c-format
msgid "%s%s: timeout for \"%s\" with %s"
msgstr ""
#~ msgid "<option>"
#~ msgstr "<seçenek>"
po/weechat.pot
+10 -9
View File
@@ -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: 2014-07-12 08:02+0200\n"
"POT-Creation-Date: 2014-07-12 08:50+0200\n"
"PO-Revision-Date: 2013-02-14 18:20+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -821,10 +821,6 @@ msgstr ""
msgid "Option changed"
msgstr ""
#, c-format
msgid "%sReset of all options is not allowed"
msgstr ""
#, c-format
msgid "%sFailed to unset option \"%s\""
msgstr ""
@@ -836,6 +832,10 @@ msgstr ""
msgid "Option removed: %s"
msgstr ""
#, c-format
msgid "%sReset of all options is not allowed"
msgstr ""
#, c-format
msgid "%d option(s) reset, %d option(s) removed"
msgstr ""
@@ -1790,12 +1790,13 @@ msgstr ""
msgid "unset/reset config options"
msgstr ""
msgid "<option>"
msgid "<option> || -mask <option>"
msgstr ""
msgid ""
"option: name of an option (wildcard \"*\" is allowed to mass-reset options, "
"use carefully!)\n"
"option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed (for "
"optional settings, like server values).\n"
@@ -1804,7 +1805,7 @@ msgid ""
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"
" /unset -mask weechat.color.*"
msgstr ""
msgid "upgrade WeeChat without disconnecting from servers"
src/core/wee-command.c
+98 -56
View File
@@ -5873,6 +5873,39 @@ COMMAND_CALLBACK(set)
return WEECHAT_RC_OK;
}
/*
* Unsets/resets one option.
*/
void
command_unset_option (struct t_config_option *option,
const char *option_full_name,
int *number_reset, int *number_removed)
{
switch (config_file_option_unset (option))
{
case WEECHAT_CONFIG_OPTION_UNSET_ERROR:
gui_chat_printf (NULL,
_("%sFailed to unset option \"%s\""),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
option_full_name);
break;
case WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET:
break;
case WEECHAT_CONFIG_OPTION_UNSET_OK_RESET:
command_set_display_option (option, _("Option reset: "));
if (number_reset)
(*number_reset)++;
break;
case WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED:
gui_chat_printf (NULL,
_("Option removed: %s"), option_full_name);
if (number_removed)
(*number_removed)++;
break;
}
}
/*
* Callback for command "/unset": unsets/resets configuration options.
*/
@@ -5882,21 +5915,31 @@ COMMAND_CALLBACK(unset)
struct t_config_file *ptr_config;
struct t_config_section *ptr_section;
struct t_config_option *ptr_option, *next_option;
const char *ptr_name;
char *option_full_name;
int length, number_reset, number_removed;
int mask, length, number_reset, number_removed;
/* make C compiler happy */
(void) data;
(void) buffer;
(void) argv;
number_reset = 0;
number_removed = 0;
if (argc < 2)
return WEECHAT_RC_ERROR;
if (strcmp (argv_eol[1], "*") == 0)
mask = 0;
ptr_name = argv_eol[1];
number_reset = 0;
number_removed = 0;
if (string_strcasecmp (argv[1], "-mask") == 0)
{
mask = 1;
if (argc < 3)
return WEECHAT_RC_ERROR;
ptr_name = argv_eol[2];
}
if (mask && (strcmp (ptr_name, "*") == 0))
{
gui_chat_printf (NULL,
_("%sReset of all options is not allowed"),
@@ -5904,59 +5947,55 @@ COMMAND_CALLBACK(unset)
return WEECHAT_RC_OK;
}
for (ptr_config = config_files; ptr_config;
ptr_config = ptr_config->next_config)
if (mask)
{
for (ptr_section = ptr_config->sections; ptr_section;
ptr_section = ptr_section->next_section)
/* unset all options matching the mask */
for (ptr_config = config_files; ptr_config;
ptr_config = ptr_config->next_config)
{
ptr_option = ptr_section->options;
while (ptr_option)
for (ptr_section = ptr_config->sections; ptr_section;
ptr_section = ptr_section->next_section)
{
next_option = ptr_option->next_option;
length = strlen (ptr_config->name) + 1
+ strlen (ptr_section->name) + 1
+ strlen (ptr_option->name) + 1;
option_full_name = malloc (length);
if (option_full_name)
ptr_option = ptr_section->options;
while (ptr_option)
{
snprintf (option_full_name, length, "%s.%s.%s",
ptr_config->name, ptr_section->name,
ptr_option->name);
if (string_match (option_full_name, argv_eol[1], 0))
{
switch (config_file_option_unset (ptr_option))
{
case WEECHAT_CONFIG_OPTION_UNSET_ERROR:
gui_chat_printf (NULL,
_("%sFailed to unset "
"option \"%s\""),
gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
option_full_name);
break;
case WEECHAT_CONFIG_OPTION_UNSET_OK_NO_RESET:
break;
case WEECHAT_CONFIG_OPTION_UNSET_OK_RESET:
command_set_display_option (ptr_option,
_("Option reset: "));
number_reset++;
break;
case WEECHAT_CONFIG_OPTION_UNSET_OK_REMOVED:
gui_chat_printf (NULL,
_("Option removed: %s"),
option_full_name);
number_removed++;
break;
}
}
free (option_full_name);
}
next_option = ptr_option->next_option;
ptr_option = next_option;
length = strlen (ptr_config->name) + 1
+ strlen (ptr_section->name) + 1
+ strlen (ptr_option->name) + 1;
option_full_name = malloc (length);
if (option_full_name)
{
snprintf (option_full_name, length, "%s.%s.%s",
ptr_config->name, ptr_section->name,
ptr_option->name);
if (string_match (option_full_name, ptr_name, 0))
{
command_unset_option (ptr_option,
option_full_name,
&number_reset,
&number_removed);
}
free (option_full_name);
}
ptr_option = next_option;
}
}
}
}
else
{
/* unset one option */
config_file_search_with_string (ptr_name, NULL, NULL, &ptr_option,
NULL);
if (ptr_option)
{
command_unset_option (ptr_option, ptr_name,
&number_reset, &number_removed);
}
}
gui_chat_printf (NULL,
_("%d option(s) reset, %d option(s) removed"),
@@ -7756,9 +7795,11 @@ command_init ()
hook_command (
NULL, "unset",
N_("unset/reset config options"),
N_("<option>"),
N_("option: name of an option (wildcard \"*\" is allowed to mass-reset "
"options, use carefully!)\n"
N_("<option>"
" || -mask <option>"),
N_("option: name of an option\n"
" -mask: use a mask in option (wildcard \"*\" is allowed to "
"mass-reset options, use carefully!)\n"
"\n"
"According to option, it's reset (for standard options) or removed "
"(for optional settings, like server values).\n"
@@ -7767,8 +7808,9 @@ command_init ()
" reset one option:\n"
" /unset weechat.look.item_time_format\n"
" reset all color options:\n"
" /unset weechat.color.*"),
"%(config_options)",
" /unset -mask weechat.color.*"),
"%(config_options)"
" || -mask %(config_options)",
&command_unset, NULL);
hook_command (
NULL, "upgrade",