From 2ae5660cc338c4f554e84d857acb05728e2f4ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Sat, 23 Aug 2014 09:11:13 +0200
Subject: [PATCH] trigger: add option "restore" in command /trigger

---
 ChangeLog.asciidoc                            |   4 +
 .../autogen/plugin_api/completions.asciidoc   |   2 +
 doc/de/autogen/user/trigger_commands.asciidoc | 102 +++++++-------
 .../autogen/plugin_api/completions.asciidoc   |   2 +
 doc/en/autogen/user/trigger_commands.asciidoc |   4 +-
 .../autogen/plugin_api/completions.asciidoc   |   2 +
 doc/fr/autogen/user/trigger_commands.asciidoc |   2 +
 .../autogen/plugin_api/completions.asciidoc   |   2 +
 doc/it/autogen/user/trigger_commands.asciidoc |   4 +-
 .../autogen/plugin_api/completions.asciidoc   |   2 +
 doc/ja/autogen/user/trigger_commands.asciidoc | 106 +++++++--------
 .../autogen/plugin_api/completions.asciidoc   |   2 +
 doc/pl/autogen/user/trigger_commands.asciidoc | 126 +++++++++---------
 po/cs.po                                      |  22 ++-
 po/de.po                                      |  24 +++-
 po/es.po                                      |  22 ++-
 po/fr.po                                      |  29 +++-
 po/hu.po                                      |  22 ++-
 po/it.po                                      |  22 ++-
 po/ja.po                                      |  24 +++-
 po/pl.po                                      |  24 +++-
 po/pt_BR.po                                   |  22 ++-
 po/ru.po                                      |  22 ++-
 po/tr.po                                      |  22 ++-
 po/weechat.pot                                |  21 ++-
 src/plugins/trigger/trigger-command.c         |  52 +++++++-
 src/plugins/trigger/trigger-completion.c      |  31 +++++
 27 files changed, 499 insertions(+), 220 deletions(-)

diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index 9a92dfab1..a7a8aa65c 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -15,6 +15,10 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 
 == Version 1.1 (under dev)
 
+=== New features
+
+* trigger: add option "restore" in command /trigger
+
 === Bugs fixed
 
 * core: fix modifier "weechat_print": discard only one line when several lines
diff --git a/doc/de/autogen/plugin_api/completions.asciidoc b/doc/de/autogen/plugin_api/completions.asciidoc
index c03bd625d..2f1430d93 100644
--- a/doc/de/autogen/plugin_api/completions.asciidoc
+++ b/doc/de/autogen/plugin_api/completions.asciidoc
@@ -86,6 +86,8 @@
 
 | trigger | trigger_names | trigger
 
+| trigger | trigger_names_default | default triggers
+
 | trigger | trigger_option_value | Werte für Trigger-Option
 
 | trigger | trigger_options | Optionen für Trigger
diff --git a/doc/de/autogen/user/trigger_commands.asciidoc b/doc/de/autogen/user/trigger_commands.asciidoc
index 228d6645a..fcf74a5b3 100644
--- a/doc/de/autogen/user/trigger_commands.asciidoc
+++ b/doc/de/autogen/user/trigger_commands.asciidoc
@@ -12,67 +12,69 @@
           restart <name>|-all [<name>...]
           show <name>
           del <name>|-all [<name>...]
+          restore <name> [<name>...]
           default -yes
           monitor [<filter>]
 
-       list: zeigt eine Liste aller Trigger (ohne Angabe von Argumente wird diese Liste standardmäßig ausgegeben)
-   listfull: zeigt eine detaillierte Liste, mit zusätzlichen Informationen, aller Trigger an
-listdefault: zeigt die standardmäßig genutzen Trigger an
-        add: fügt einen Trigger hinzu
-     addoff: fügt einen Trigger hinzu (deaktiviert)
- addreplace: fügt oder ersetzt einen schon existierenden Trigger
-       name: Name des Trigger
+       list: list triggers (without argument, this list is displayed)
+   listfull: list triggers with detailed info for each trigger
+listdefault: list default triggers
+        add: add a trigger
+     addoff: add a trigger (disabled)
+ addreplace: add or replace an existing trigger
+       name: name of trigger
        hook: signal, hsignal, modifier, print, command, command_run, timer, config, focus
-  arguments: Argumente für den Hook, abhängig vom genutzten Hook (getrennt durch Semikolon):
-             signal: Name(en) des signals (erforderlich)
-             hsignal: Name(en) des hsignal (erforderlich)
-             modifier: Name(en) des modifier (erforderlich)
+  arguments: arguments for the hook, depending on hook (separated by semicolons):
+             signal: name(s) of signal (required)
+             hsignal: name(s) of hsignal (required)
+             modifier: name(s) of modifier (required)
              print: buffer, tags, message, strip colors
-             command: Befehl (erforderlich), Beschreibung, Argumente, Beschreibung der Argumente, Vervollständigung
-             command_run: Befehl(e) (erforderlich)
-             timer: Intervall (erforderlich), Anpassung an Sekunden (erforderlich), maximale Anzahl an Aufrufen
-             config: Name der Option (erforderlich)
-             focus: Name(n) für sichtbaren Bereich (erforderlich) (z.B. "chat" für Chatbereich)
- conditions: evaluierte Bedingungen für den Trigger
-      regex: einer oder mehrere reguläre Ausdrücke um Zeichenketten in Variablen zu ersetzen
-    command: Befehl welcher ausgeführt werden soll (mehrere Befehle müssen durch ";" voneinander getrennt werden
-return_code: Rückgabewert für Callback (ok (standard), ok_eat, error)
-   addinput: erstellt einen Trigger mit einer standardmäßigen Mustervorlage
-      input: kopiert den kompletten Trigger-Befehl in die Eingabezeile
-     output: schickt den Trigger-Befehl als Text in den Buffer
-   recreate: wie "input", allerdings wird die Option "addreplace" anstelle von "add" genutzt
-        set: definiert, innerhalb eines Triggers, eine Option neu
-     option: Name einer Option: name, hook, arguments, conditions, regex, command, return_code
-             (um Hilfe über eine Option zu erhalten: /help trigger.trigger.<name>.<option>)
-      value: neuer Wert für Option
-     rename: benennt einen Trigger um
-       copy: kopiert einen Trigger
-     enable: aktiviert Trigger (ohne Angabe von Argumenten: aktiviert alle Trigger)
-    disable: deaktiviert Trigger (ohne Angabe von Argumenten: deaktiviert alle Trigger)
-     toggle: de-/aktiviert Trigger (ohne Angabe von Argumenten: de-/aktiviert alle Trigger)
-    restart: startet Trigger neu (Hook(s) werden neu erstellt)
-       show: zeigt detaillierte Informationen zu einem Trigger (inklusive einer kleinen Statistik)
-        del: entfernt einen Trigger
-       -all: führt eine Aktion aus, die alle Trigger beinhaltet
-    default: stellt die standardmäßigen Trigger wieder her
-    monitor: öffnet den Trigger Monitor-Buffer, mit optionaler Filterfunktion:
-     Filter: zeigt Hooks/Trigger an (ein Hook muss mit "@" beginnen, zum Beispiel "@signal"), mehrere Filter können durch Kommata voneinander getrennt werden; Platzhalter "*" kann im Namen des Trigger verwendet werden
+             command: command (required), description, arguments, description of arguments, completion
+             command_run: command(s) (required)
+             timer: interval (required), align on second, max calls
+             config: name(s) of option (required)
+             focus: name(s) of area (required)
+ conditions: evaluated conditions for the trigger
+      regex: one or more regular expressions to replace strings in variables
+    command: command to execute (many commands can be separated by ";"
+return_code: return code in callback (ok (default), ok_eat, error)
+   addinput: set input with default arguments to create a trigger
+      input: set input with the command used to create the trigger
+     output: send the command to create the trigger on the buffer
+   recreate: same as "input", with option "addreplace" instead of "add"
+        set: set an option in a trigger
+     option: name of option: name, hook, arguments, conditions, regex, command, return_code
+             (for help on option, you can type: /help trigger.trigger.<name>.<option>)
+      value: new value for the option
+     rename: rename a trigger
+       copy: copy a trigger
+     enable: enable trigger(s) (without arguments: enable triggers globally)
+    disable: disable trigger(s) (without arguments: disable triggers globally)
+     toggle: toggle trigger(s) (without arguments: toggle triggers globally)
+    restart: restart trigger(s) (recreate the hooks)
+       show: show detailed info on a trigger (with some stats)
+        del: delete a trigger
+       -all: do action on all triggers
+    restore: restore trigger(s) with the default values (works only for default triggers)
+    default: delete all triggers and restore default ones
+    monitor: open the trigger monitor buffer, with optional filter:
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
-Wenn ein Trigger-Callback aufgerufen wird, dann wird folgende Befehlskette ausgeführt:
-  1. Überprüfung von Bedingungen; falls unwahr, beenden
-  2. ersetze Text mittels erweitertem regulärer POSIX Ausdruck (sofern im Trigger definiert)
-  3. ein oder mehrere Befehle werden ausgeführt (sofern im Trigger definiert)
-  4. Beendigung mit einem Rückgabewert (ausgenommen sind modifiers und focus)
+When a trigger callback is called, following actions are performed, in this order:
+  1. check conditions; if false, exit
+  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
+  3. execute command(s) (if defined in trigger)
+  4. exit with a return code (except for modifiers and focus)
 
-Beispiele (die standardmäßig, eingebauten Trigger kann man sich mit "/trigger listdefault" anzeigen lassen):
-  fügt einer Nachricht die Textattribute *fett*, _unterstrichen_ und /kursiv/ hinzu:
+Examples (you can also look at default triggers with /trigger listdefault):
+  add text attributes *bold*, _underline_ and /italic/ (only in user messages):
     /trigger add effects modifier weechat_print "${tg_tag_nick}" "==\*(\S+)\*==*${color:bold}$1${color:-bold}*== ==_(\S+)_==_${color:underline}$1${color:-underline}_== ==/(\S+)/==/${color:italic}$1${color:-italic}/"
-  verbirgt die Nicklist auf kleineren Terminals:
+  hide nicklist bar on small terminals:
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  speichert die Konfiguration jede Stunde ab:
+  silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
-  öffnet den Trigger Monitor und zeigt ausschließlich modifier und Trigger an, die mit "resize" im Namen beginnen:
+  open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
 
diff --git a/doc/en/autogen/plugin_api/completions.asciidoc b/doc/en/autogen/plugin_api/completions.asciidoc
index a841c5e0d..d06f93f47 100644
--- a/doc/en/autogen/plugin_api/completions.asciidoc
+++ b/doc/en/autogen/plugin_api/completions.asciidoc
@@ -86,6 +86,8 @@
 
 | trigger | trigger_names | triggers
 
+| trigger | trigger_names_default | default triggers
+
 | trigger | trigger_option_value | value of a trigger option
 
 | trigger | trigger_options | options for triggers
diff --git a/doc/en/autogen/user/trigger_commands.asciidoc b/doc/en/autogen/user/trigger_commands.asciidoc
index 5f3c36ac2..1892ef661 100644
--- a/doc/en/autogen/user/trigger_commands.asciidoc
+++ b/doc/en/autogen/user/trigger_commands.asciidoc
@@ -12,6 +12,7 @@
           restart <name>|-all [<name>...]
           show <name>
           del <name>|-all [<name>...]
+          restore <name> [<name>...]
           default -yes
           monitor [<filter>]
 
@@ -54,7 +55,8 @@ return_code: return code in callback (ok (default), ok_eat, error)
        show: show detailed info on a trigger (with some stats)
         del: delete a trigger
        -all: do action on all triggers
-    default: restore default triggers
+    restore: restore trigger(s) with the default values (works only for default triggers)
+    default: delete all triggers and restore default ones
     monitor: open the trigger monitor buffer, with optional filter:
      filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
diff --git a/doc/fr/autogen/plugin_api/completions.asciidoc b/doc/fr/autogen/plugin_api/completions.asciidoc
index 08bf53b15..0c341bbcc 100644
--- a/doc/fr/autogen/plugin_api/completions.asciidoc
+++ b/doc/fr/autogen/plugin_api/completions.asciidoc
@@ -86,6 +86,8 @@
 
 | trigger | trigger_names | triggers
 
+| trigger | trigger_names_default | triggers par défaut
+
 | trigger | trigger_option_value | valeur d'une option de trigger
 
 | trigger | trigger_options | options pour les triggers
diff --git a/doc/fr/autogen/user/trigger_commands.asciidoc b/doc/fr/autogen/user/trigger_commands.asciidoc
index e8e68987f..4124424ce 100644
--- a/doc/fr/autogen/user/trigger_commands.asciidoc
+++ b/doc/fr/autogen/user/trigger_commands.asciidoc
@@ -12,6 +12,7 @@
           restart <nom>|-all [<nom>...]
           show <nom>
           del <nom>|-all [<nom>...]
+          restore <nom> [<nom>...]
           default -yes
           monitor [<filtre>]
 
@@ -54,6 +55,7 @@ code_retour : code retour dans le callback (ok (par défaut), ok_eat, error)
        show : afficher des informations détaillées sur un trigger (avec quelques statistiques)
         del : supprimer un trigger
        -all : effectuer l'action sur tous les triggers
+    restore : restaurer un/des trigger(s) avec les valeurs par défaut (fonctionne seulement pour les triggers par défaut)
     default : restaurer les triggers par défaut
     monitor : ouvrir le tampon moniteur des triggers
      filtre : filtrer les hooks/triggers à afficher (un hook doit commencer par "@", par exemple "@signal"), plusieurs filtres peuvent être séparés par des virgules ; le caractère joker "*" est autorisé dans chaque nom de trigger
diff --git a/doc/it/autogen/plugin_api/completions.asciidoc b/doc/it/autogen/plugin_api/completions.asciidoc
index 1921b0889..623f9182b 100644
--- a/doc/it/autogen/plugin_api/completions.asciidoc
+++ b/doc/it/autogen/plugin_api/completions.asciidoc
@@ -86,6 +86,8 @@
 
 | trigger | trigger_names | triggers
 
+| trigger | trigger_names_default | default triggers
+
 | trigger | trigger_option_value | value of a trigger option
 
 | trigger | trigger_options | options for triggers
diff --git a/doc/it/autogen/user/trigger_commands.asciidoc b/doc/it/autogen/user/trigger_commands.asciidoc
index 5f3c36ac2..1892ef661 100644
--- a/doc/it/autogen/user/trigger_commands.asciidoc
+++ b/doc/it/autogen/user/trigger_commands.asciidoc
@@ -12,6 +12,7 @@
           restart <name>|-all [<name>...]
           show <name>
           del <name>|-all [<name>...]
+          restore <name> [<name>...]
           default -yes
           monitor [<filter>]
 
@@ -54,7 +55,8 @@ return_code: return code in callback (ok (default), ok_eat, error)
        show: show detailed info on a trigger (with some stats)
         del: delete a trigger
        -all: do action on all triggers
-    default: restore default triggers
+    restore: restore trigger(s) with the default values (works only for default triggers)
+    default: delete all triggers and restore default ones
     monitor: open the trigger monitor buffer, with optional filter:
      filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
diff --git a/doc/ja/autogen/plugin_api/completions.asciidoc b/doc/ja/autogen/plugin_api/completions.asciidoc
index 42b06a73b..66454da48 100644
--- a/doc/ja/autogen/plugin_api/completions.asciidoc
+++ b/doc/ja/autogen/plugin_api/completions.asciidoc
@@ -86,6 +86,8 @@
 
 | trigger | trigger_names | トリガ
 
+| trigger | trigger_names_default | default triggers
+
 | trigger | trigger_option_value | トリガオプションの値
 
 | trigger | trigger_options | トリガに対するオプション
diff --git a/doc/ja/autogen/user/trigger_commands.asciidoc b/doc/ja/autogen/user/trigger_commands.asciidoc
index a0d8e79dc..fdb16d1b1 100644
--- a/doc/ja/autogen/user/trigger_commands.asciidoc
+++ b/doc/ja/autogen/user/trigger_commands.asciidoc
@@ -12,67 +12,69 @@
           restart <name>|-all [<name>...]
           show <name>
           del <name>|-all [<name>...]
+          restore <name> [<name>...]
           default -yes
           monitor [<filter>]
 
-       list: トリガをリストアップ (引数なしの場合、このリストを表示します)
-   listfull: 各トリガに関する詳細な情報を付けてトリガをリストアップ
-listdefault: デフォルトトリガをリストアップ
-        add: トリガを追加
-     addoff: トリガを追加 (無効状態で)
- addreplace: 追加または存在するトリガを置換
-       name: トリガの名前
-       hook: signal、hsignal、modifier、print、command、command_run、timer、config、focus
-  arguments: フックの引数、フックの種類に依存 (セミコロンで区切る):
-             signal: シグナルの名前 (必須)
-             hsignal: hsignal の名前 (必須)
-             modifier: modifier の名前 (必須)
-             print: バッファ、タグ、メッセージ、色の削除
-             command: コマンド (必須)、説明、引数、引数の説明、補完
-             command_run: コマンド (必須)
-             timer: インターバル (必須)、秒の調節、最大呼び出し回数
-             config: オプションの名前 (必須)
-             focus: エリアの名前 (必須)
- conditions: トリガの実行条件
-      regex: 変数内の文字列を置換する 1 つ以上の正規表現
-    command: 実行するコマンド (複数のコマンドは ";" で区切ってください)
-return_code: コールバック内のリターンコード (ok (デフォルト)、ok_eat、error)
-   addinput: 入力にトリガを作る際のデフォルト引数を設定
-      input: 入力にトリガを作る際に使われるコマンドを設定
-     output: バッファでトリガを作る際のコマンドを送信
-   recreate: "add" の代わりに "addreplace" オプションを使うことを除いて "input" と同じ
-        set: トリガにオプションを設定
-     option: オプションの名前: name、hook、arguments、conditions、regex、command、return_code
-             (オプションに関するヘルプを見るには: /help trigger.trigger.<name>.<option>)
-      value: オプションの新しい値
-     rename: トリガの名前を変更
-       copy: トリガをコピー
-     enable: トリガを有効化 (引数なしの場合: 大域的にトリガを有効化)
-    disable: トリガを無効化 (引数なしの場合: 大域的にトリガを無効化)
-     toggle: トリガの有効無効を切り替え (引数なしの場合: 大域的にトリガの有効無効を切り替え)
-    restart: トリガの再開 (フックを再作成)
-       show: トリガに関する情報を表示 (状態を含めて)
-        del: トリガを削除
-       -all: 全てのトリガに関するアクションを実行
-    default: デフォルトトリガを復元
-    monitor: 任意でフィルタを付けてトリガ監視バッファを開く:
-     filter: フックおよびトリガをフィルタして表示 (フックは必ず "@" で始めてください、たとえば "@signal")、複数のフィルタをかける場合はそれぞれをコンマで区切ってください; 各トリガ名にワイルドカード "*" を使うことができます。
+       list: list triggers (without argument, this list is displayed)
+   listfull: list triggers with detailed info for each trigger
+listdefault: list default triggers
+        add: add a trigger
+     addoff: add a trigger (disabled)
+ addreplace: add or replace an existing trigger
+       name: name of trigger
+       hook: signal, hsignal, modifier, print, command, command_run, timer, config, focus
+  arguments: arguments for the hook, depending on hook (separated by semicolons):
+             signal: name(s) of signal (required)
+             hsignal: name(s) of hsignal (required)
+             modifier: name(s) of modifier (required)
+             print: buffer, tags, message, strip colors
+             command: command (required), description, arguments, description of arguments, completion
+             command_run: command(s) (required)
+             timer: interval (required), align on second, max calls
+             config: name(s) of option (required)
+             focus: name(s) of area (required)
+ conditions: evaluated conditions for the trigger
+      regex: one or more regular expressions to replace strings in variables
+    command: command to execute (many commands can be separated by ";"
+return_code: return code in callback (ok (default), ok_eat, error)
+   addinput: set input with default arguments to create a trigger
+      input: set input with the command used to create the trigger
+     output: send the command to create the trigger on the buffer
+   recreate: same as "input", with option "addreplace" instead of "add"
+        set: set an option in a trigger
+     option: name of option: name, hook, arguments, conditions, regex, command, return_code
+             (for help on option, you can type: /help trigger.trigger.<name>.<option>)
+      value: new value for the option
+     rename: rename a trigger
+       copy: copy a trigger
+     enable: enable trigger(s) (without arguments: enable triggers globally)
+    disable: disable trigger(s) (without arguments: disable triggers globally)
+     toggle: toggle trigger(s) (without arguments: toggle triggers globally)
+    restart: restart trigger(s) (recreate the hooks)
+       show: show detailed info on a trigger (with some stats)
+        del: delete a trigger
+       -all: do action on all triggers
+    restore: restore trigger(s) with the default values (works only for default triggers)
+    default: delete all triggers and restore default ones
+    monitor: open the trigger monitor buffer, with optional filter:
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
-トリガコールバックを呼び出す際には、以下の順番通りにアクションを実行します:
-  1. 条件を確認; 偽の場合、終了
-  2. POSIX 拡張正規表現を使ってテキストを置換 (トリガに定義されている場合)
-  3. コマンドを実行 (トリガに定義されている場合)
-  4. リターンコードを返して終了 (modifier と focus を除く)
+When a trigger callback is called, following actions are performed, in this order:
+  1. check conditions; if false, exit
+  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
+  3. execute command(s) (if defined in trigger)
+  4. exit with a return code (except for modifiers and focus)
 
-例 (/trigger listdefault でデフォルトトリガを見ることができます):
-  テキスト属性 *太字*、_下線_、/イタリック/ を追加 (ユーザメッセージのみ):
+Examples (you can also look at default triggers with /trigger listdefault):
+  add text attributes *bold*, _underline_ and /italic/ (only in user messages):
     /trigger add effects modifier weechat_print "${tg_tag_nick}" "==\*(\S+)\*==*${color:bold}$1${color:-bold}*== ==_(\S+)_==_${color:underline}$1${color:-underline}_== ==/(\S+)/==/${color:italic}$1${color:-italic}/"
-  狭い端末ではニックネームリストバーを隠す:
+  hide nicklist bar on small terminals:
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  設定を 1 時間毎に黙々と保存:
+  silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
-  トリガモニタを開き、修飾子と名前が "resize" から始まるトリガだけを表示:
+  open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
 
diff --git a/doc/pl/autogen/plugin_api/completions.asciidoc b/doc/pl/autogen/plugin_api/completions.asciidoc
index 38e45c512..352488829 100644
--- a/doc/pl/autogen/plugin_api/completions.asciidoc
+++ b/doc/pl/autogen/plugin_api/completions.asciidoc
@@ -86,6 +86,8 @@
 
 | trigger | trigger_names | triggery
 
+| trigger | trigger_names_default | default triggers
+
 | trigger | trigger_option_value | wartość opcji triggera
 
 | trigger | trigger_options | opcje dla triggerów
diff --git a/doc/pl/autogen/user/trigger_commands.asciidoc b/doc/pl/autogen/user/trigger_commands.asciidoc
index 2c1fb51af..ebf8ed695 100644
--- a/doc/pl/autogen/user/trigger_commands.asciidoc
+++ b/doc/pl/autogen/user/trigger_commands.asciidoc
@@ -3,76 +3,78 @@
 
 ----
 /trigger  list|listfull|listdefault
-          add|addoff|addreplace <nazwa> <uchwyt> ["<argumenty>" ["<warunki>" ["<regex>" ["<komenda>" ["<kod powrotu>"]]]]]
-          addinput [<uchwyt>]
-          input|output|recreate <nazwa>
-          set <nazwa> <opcja> <wartość>
-          rename|copy <nazwa> <nowa nazwa>
-          enable|disable|toggle [<nazwa>|-all [<nazwa>...]]
-          restart <nazwa>|-all [<nazwa>...]
-          show <nazwa>
-          del <nazwa>|-all [<nazwa>...]
+          add|addoff|addreplace <name> <hook> ["<arguments>" ["<conditions>" ["<regex>" ["<command>" ["<return_code>"]]]]]
+          addinput [<hook>]
+          input|output|recreate <name>
+          set <name> <option> <value>
+          rename|copy <name> <new_name>
+          enable|disable|toggle [<name>|-all [<name>...]]
+          restart <name>|-all [<name>...]
+          show <name>
+          del <name>|-all [<name>...]
+          restore <name> [<name>...]
           default -yes
-          monitor [<filtr>]
+          monitor [<filter>]
 
-       list: lista triggerów (jeśli nie podano argumentu, wyświetli się ta lista)
-   listfull: lista triggerów ze szczegółowymi informacjami
-listdefault: lista domyślnych triggerów
-        add: dodaje trigger
-     addoff: dodaje trigger (wyłączony)
- addreplace: dodaje lub zastępuje istniejący trigger
-       nazwa: nazwa triggera
-       uchwyt: signal, hsignal, modifier, print, command, command_run, timer, config, focus
-  argumenty: argumenty dla uchwytu, w zależności od jego typu (oddzielone średnikami):
-             signal: nazwa(-y) signal (wymagane)
-             hsignal: nazwa(-y) hsignal (wymagane)
-             modifier: nazwa(-y) modifier (wymagane)
-             print: bufor, tagi, wiadomość, pomiń kolory
-             command: komenda (wymagane), opis, argumenty, opis argumentów, dopełnienie
-             command_run: komenda(-y) (wymagane)
-             timer: interwał (wymagane), wyrównanie sekund, ilość wywołań
-             config: nazwa(-y) opcji (wymagane)
-             focus: nazwa(-y) obszarów (wymagane)
- warunki: przetwarzane warunki dla triggera
-      regex: jedno lub więcej wyrażeń regularnych do zastępowania ciągów w zmiennych
-    komenda: komenda do wykonania (wiele komend można oddzielić ";"
-zwracany kod: kod zwracany w callbacku (ok (domyślne), ok_eat, error)
-   addinput: ustawia wejście z domyślnymi argumentami do stworzenia triggera
-      input: ustawia wejście z komendą użytą do stworzenia triggera
-     output: wysyła komendę do stworzenia triggera do buforu
-   recreate: tak samo jak "input", z opcją "addreplace" zamiast "add"
-        set: ustawia opcje triggera
-     opcja: nazwa opcji: name, hook, arguments, conditions, regex, command, return_code
-             (aby uzyskać pomoc na temat opcji możesz wpisać: /help trigger.trigger.<nazwa>.<opcja>)
-      wartość: nowa wartość dla opcji
-     rename: zmienia nazwę triggera
-       copy: kopiuje trigger
-     enable: włącza trigger(y) (bez argumentów: włącza triggery globalnie)
-    disable: wyłącza trigger(y) (bez argumentów: wyłącza triggery globalnie)
-     toggle: zmienia stan triggera(-ów) (bez argumentów: zmienia stan triggerów globalnie)
-    restart: restartuje trigger(y) (tworzy na nowo uchwyty)
-       show: pokazuje szczegółowe informacje o triggerze (z niektórymi statystykami)
-        del: usuwa trigger
-       -all: wykonaj akcję na wszystkich triggerach
-    default: przywraca domyślne triggery
-    monitor: otwiera bufor monitorowania triggerów, z opcjonalnym filtrem:
-     filtr: filtruje uchwyty/triggery do wyświetlenia (uchwyt musi się zaczynać od "@", na przykład "@signal"), wiele filtrów może być oddzielonych przecinkiem; dzika karta "*" jest dozwolona w nazwie każdego triggera
+       list: list triggers (without argument, this list is displayed)
+   listfull: list triggers with detailed info for each trigger
+listdefault: list default triggers
+        add: add a trigger
+     addoff: add a trigger (disabled)
+ addreplace: add or replace an existing trigger
+       name: name of trigger
+       hook: signal, hsignal, modifier, print, command, command_run, timer, config, focus
+  arguments: arguments for the hook, depending on hook (separated by semicolons):
+             signal: name(s) of signal (required)
+             hsignal: name(s) of hsignal (required)
+             modifier: name(s) of modifier (required)
+             print: buffer, tags, message, strip colors
+             command: command (required), description, arguments, description of arguments, completion
+             command_run: command(s) (required)
+             timer: interval (required), align on second, max calls
+             config: name(s) of option (required)
+             focus: name(s) of area (required)
+ conditions: evaluated conditions for the trigger
+      regex: one or more regular expressions to replace strings in variables
+    command: command to execute (many commands can be separated by ";"
+return_code: return code in callback (ok (default), ok_eat, error)
+   addinput: set input with default arguments to create a trigger
+      input: set input with the command used to create the trigger
+     output: send the command to create the trigger on the buffer
+   recreate: same as "input", with option "addreplace" instead of "add"
+        set: set an option in a trigger
+     option: name of option: name, hook, arguments, conditions, regex, command, return_code
+             (for help on option, you can type: /help trigger.trigger.<name>.<option>)
+      value: new value for the option
+     rename: rename a trigger
+       copy: copy a trigger
+     enable: enable trigger(s) (without arguments: enable triggers globally)
+    disable: disable trigger(s) (without arguments: disable triggers globally)
+     toggle: toggle trigger(s) (without arguments: toggle triggers globally)
+    restart: restart trigger(s) (recreate the hooks)
+       show: show detailed info on a trigger (with some stats)
+        del: delete a trigger
+       -all: do action on all triggers
+    restore: restore trigger(s) with the default values (works only for default triggers)
+    default: delete all triggers and restore default ones
+    monitor: open the trigger monitor buffer, with optional filter:
+     filter: filter hooks/triggers to display (a hook must start with "@", for example "@signal"), many filters can be separated by commas; wildcard "*" is allowed in each trigger name
 
-Kiedy callback triggera jest wywoływany, wykonywane są następujące akcje, w kolejności:
-  1. sprawdzenie warunków; jeśli nie są spełnione, wyjście
-  2. zastąpienie tekstu za pomocą rozszerzonych wyrażeń regularnych POSIX (jeśli zdefiniowane)
-  3. wykonanie komend(y) (jeśli zdefiniowane)
-  4. wyjście z kodem wyjścia (poza modifiers i focus)
+When a trigger callback is called, following actions are performed, in this order:
+  1. check conditions; if false, exit
+  2. replace text using POSIX extended regular expression(s) (if defined in trigger)
+  3. execute command(s) (if defined in trigger)
+  4. exit with a return code (except for modifiers and focus)
 
-Przykłady (możesz też spojrzeć na domyślne triggery za pomocą /trigger listdefault):
-  dodaje atrybuty tekstu *bold*, _underline_ i /italic/ (tylko w wiadomościach użytkowników):
+Examples (you can also look at default triggers with /trigger listdefault):
+  add text attributes *bold*, _underline_ and /italic/ (only in user messages):
     /trigger add effects modifier weechat_print "${tg_tag_nick}" "==\*(\S+)\*==*${color:bold}$1${color:-bold}*== ==_(\S+)_==_${color:underline}$1${color:-underline}_== ==/(\S+)/==/${color:italic}$1${color:-italic}/"
-  ukrywa pasek z nickami na małych terminalach:
+  hide nicklist bar on small terminals:
     /trigger add resize_small signal signal_sigwinch "${info:term_width} < 100" "" "/bar hide nicklist"
     /trigger add resize_big signal signal_sigwinch "${info:term_width} >= 100" "" "/bar show nicklist"
-  cichy zapis plików konfiguracyjnych co każdą godzinę:
+  silently save config each hour:
     /trigger add cfgsave timer 3600000;0;0 "" "" "/mute /save"
-  otwiera monitor triggerów i pokazuje tylko modifiers i triggery, których nazwa zaczyna się od "resize":
+  open trigger monitor and show only modifiers and triggers whose name starts with "resize":
     /trigger monitor @modifier,resize*
 ----
 
diff --git a/po/cs.po b/po/cs.po
index 9055a2388..6144e3b2d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 11:46+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10083,6 +10083,14 @@ msgstr "Rmodifikátor \"%s\" odebrán"
 msgid "Trigger:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Pole \"%s\" vytvořeno"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%sKlávesa \"%s\" nenalezena"
+
 #, fuzzy
 msgid "Default triggers restored:"
 msgstr "Výchozí rmodifikátory obnoveny:"
@@ -10104,8 +10112,8 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 
 msgid ""
@@ -10158,7 +10166,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -10194,6 +10204,10 @@ msgstr ""
 msgid "triggers"
 msgstr ""
 
+#, fuzzy
+msgid "default triggers"
+msgstr "Seznam aliasů:"
+
 #, fuzzy
 msgid "options for triggers"
 msgstr "volby pro proxy"
diff --git a/po/de.po b/po/de.po
index 5f1eafb3c..ff5a0752c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 11:54+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
@@ -11328,6 +11328,14 @@ msgstr "Trigger \"%s\" entfernt"
 msgid "Trigger:"
 msgstr "Trigger:"
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Trigger \"%s\" neu gestartet"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%s%s: Trigger, \"%s\", nicht gefunden"
+
 msgid "Default triggers restored:"
 msgstr "Standard-Trigger wiederhergestellt:"
 
@@ -11342,14 +11350,15 @@ msgstr ""
 msgid "manage triggers, the Swiss Army knife for WeeChat"
 msgstr "verwaltet Trigger, das Schweizer Armeemesser für WeeChat"
 
+#, fuzzy
 msgid ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
 "[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
 "[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
@@ -11359,6 +11368,7 @@ msgstr ""
 "[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
 "monitor [<filter>]"
 
+#, fuzzy
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -11409,7 +11419,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -11536,6 +11548,10 @@ msgstr ""
 msgid "triggers"
 msgstr "trigger"
 
+#, fuzzy
+msgid "default triggers"
+msgstr "Liste der standardmäßigen Trigger:"
+
 msgid "options for triggers"
 msgstr "Optionen für Trigger"
 
diff --git a/po/es.po b/po/es.po
index 1b073f4ac..8efbceb10 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 11:46+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10358,6 +10358,14 @@ msgstr "Modificador regular \"%s\" removido"
 msgid "Trigger:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Barra \"%s\" creada"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%sTecla \"%s\" no encontrada"
+
 #, fuzzy
 msgid "Default triggers restored:"
 msgstr "Modificadores regulares predeterminados restaurados:"
@@ -10379,8 +10387,8 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 
 msgid ""
@@ -10433,7 +10441,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -10469,6 +10479,10 @@ msgstr ""
 msgid "triggers"
 msgstr ""
 
+#, fuzzy
+msgid "default triggers"
+msgstr "Lista de alias:"
+
 #, fuzzy
 msgid "options for triggers"
 msgstr "opciones para proxies"
diff --git a/po/fr.po b/po/fr.po
index ef2d1f4b9..04c15d965 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
-"PO-Revision-Date: 2014-08-19 23:13+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
+"PO-Revision-Date: 2014-08-22 22:25+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: fr\n"
@@ -11079,6 +11079,14 @@ msgstr "Trigger \"%s\" supprimé"
 msgid "Trigger:"
 msgstr "Trigger :"
 
+#, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Trigger \"%s\" restauré"
+
+#, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%sTrigger par défaut \"%s\" non trouvé"
+
 msgid "Default triggers restored:"
 msgstr "Triggers par défaut restaurés :"
 
@@ -11099,16 +11107,16 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <nom> <hook> "
 "[\"<paramètres>\" [\"<conditions>\" [\"<regex>\" [\"<commande>"
 "\" [\"<code_retour>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<nom> || set <nom> <option> <valeur> || rename|copy <nom> <nouveau_nom> || "
 "enable|disable|toggle [<nom>|-all [<nom>...]] || restart <nom>|-all "
-"[<nom>...] || show <nom> || del <nom>|-all [<nom>...] || default -yes || "
-"monitor [<filtre>]"
+"[<nom>...] || show <nom> || del <nom>|-all [<nom>...] || restore <nom> "
+"[<nom>...] || default -yes || monitor [<filtre>]"
 
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
@@ -11160,7 +11168,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -11248,6 +11258,8 @@ msgstr ""
 "quelques statistiques)\n"
 "        del : supprimer un trigger\n"
 "       -all : effectuer l'action sur tous les triggers\n"
+"    restore : restaurer un/des trigger(s) avec les valeurs par défaut "
+"(fonctionne seulement pour les triggers par défaut)\n"
 "    default : restaurer les triggers par défaut\n"
 "    monitor : ouvrir le tampon moniteur des triggers\n"
 "     filtre : filtrer les hooks/triggers à afficher (un hook doit commencer "
@@ -11285,6 +11297,9 @@ msgstr ""
 msgid "triggers"
 msgstr "triggers"
 
+msgid "default triggers"
+msgstr "triggers par défaut"
+
 msgid "options for triggers"
 msgstr "options pour les triggers"
 
diff --git a/po/hu.po b/po/hu.po
index f7458d2f6..83b8fa79b 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 11:46+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9458,6 +9458,14 @@ msgstr "A \"%s\" aliasz eltávolítva\n"
 msgid "Trigger:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%s a \"%s\" szerver nem található\n"
+
 #, fuzzy
 msgid "Default triggers restored:"
 msgstr "Alapértelmezett billentyűparancsok visszaállítva\n"
@@ -9479,8 +9487,8 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 
 msgid ""
@@ -9533,7 +9541,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -9569,6 +9579,10 @@ msgstr ""
 msgid "triggers"
 msgstr ""
 
+#, fuzzy
+msgid "default triggers"
+msgstr "Aliaszok listája:\n"
+
 #, fuzzy
 msgid "options for triggers"
 msgstr "Aliaszok listája:\n"
diff --git a/po/it.po b/po/it.po
index 222118767..e59dbe1c2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 11:46+0200\n"
 "Last-Translator: Esteban I. Ruiz Moreno <exio4.com@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10536,6 +10536,14 @@ msgstr "Rmodifier \"%s\" eliminato"
 msgid "Trigger:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Barra \"%s\" creata"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%sTasto \"%s\" non trovato"
+
 #, fuzzy
 msgid "Default triggers restored:"
 msgstr "Rmodifier predefiniti ripristinati:"
@@ -10557,8 +10565,8 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 
 msgid ""
@@ -10611,7 +10619,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -10647,6 +10657,10 @@ msgstr ""
 msgid "triggers"
 msgstr ""
 
+#, fuzzy
+msgid "default triggers"
+msgstr "Elenco degli alias:"
+
 #, fuzzy
 msgid "options for triggers"
 msgstr "opzioni per i proxy"
diff --git a/po/ja.po b/po/ja.po
index e631e1ada..c70e0c192 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 23:57+0900\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/weechat/tree/translation_ja>\n"
@@ -10673,6 +10673,14 @@ msgstr "トリガ \"%s\" を削除"
 msgid "Trigger:"
 msgstr "トリガ:"
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "トリガ \"%s\" が再開されました"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%s%s: トリガ \"%s\" が見つかりません"
+
 msgid "Default triggers restored:"
 msgstr "復元されたデフォルトトリガ:"
 
@@ -10687,14 +10695,15 @@ msgstr ""
 msgid "manage triggers, the Swiss Army knife for WeeChat"
 msgstr "トリガ (WeeChat 用のスイスアーミーナイフ) の管理"
 
+#, fuzzy
 msgid ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
 "[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
 "[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
@@ -10704,6 +10713,7 @@ msgstr ""
 "[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
 "monitor [<filter>]"
 
+#, fuzzy
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -10754,7 +10764,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -10863,6 +10875,10 @@ msgstr ""
 msgid "triggers"
 msgstr "トリガ"
 
+#, fuzzy
+msgid "default triggers"
+msgstr "デフォルトトリガのリスト:"
+
 msgid "options for triggers"
 msgstr "トリガに対するオプション"
 
diff --git a/po/pl.po b/po/pl.po
index a723cf1c7..842100f7d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 11:46+0200\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -10866,6 +10866,14 @@ msgstr "Trigger \"%s\" został usunięty"
 msgid "Trigger:"
 msgstr "Trigger:"
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Trigger \"%s\" został zrestartowany"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%s%s: trigger \"%s\" nie został znaleziony"
+
 msgid "Default triggers restored:"
 msgstr "Przywrócono domyślne triggery:"
 
@@ -10880,14 +10888,15 @@ msgstr ""
 msgid "manage triggers, the Swiss Army knife for WeeChat"
 msgstr "zarządzaj triggerami, scyzorykiem WeeChat"
 
+#, fuzzy
 msgid ""
 "list|listfull|listdefault || add|addoff|addreplace <name> <hook> "
 "[\"<arguments>\" [\"<conditions>\" [\"<regex>\" [\"<command>"
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 "list|listfull|listdefault || add|addoff|addreplace <nazwa> <uchwyt> "
 "[\"<argumenty>\" [\"<warunki>\" [\"<regex>\" [\"<komenda>\" [\"<kod powrotu>"
@@ -10897,6 +10906,7 @@ msgstr ""
 "[<nazwa>...] || show <nazwa> || del <nazwa>|-all [<nazwa>...] || default -"
 "yes || monitor [<filtr>]"
 
+#, fuzzy
 msgid ""
 "       list: list triggers (without argument, this list is displayed)\n"
 "   listfull: list triggers with detailed info for each trigger\n"
@@ -10947,7 +10957,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -11066,6 +11078,10 @@ msgstr ""
 msgid "triggers"
 msgstr "triggery"
 
+#, fuzzy
+msgid "default triggers"
+msgstr "Lista domyślnych triggerów:"
+
 msgid "options for triggers"
 msgstr "opcje dla triggerów"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2d4f2d3f5..9ba49a030 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 11:46+0200\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9728,6 +9728,14 @@ msgstr "Rmodifier \"%s\" removido"
 msgid "Trigger:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Barra \"%s\" criada"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%sTecla \"%s\" não encontrada"
+
 #, fuzzy
 msgid "Default triggers restored:"
 msgstr "Rmodifiers padrões restaurados:"
@@ -9749,8 +9757,8 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 
 msgid ""
@@ -9803,7 +9811,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -9839,6 +9849,10 @@ msgstr ""
 msgid "triggers"
 msgstr ""
 
+#, fuzzy
+msgid "default triggers"
+msgstr "Lista de atalhos:"
+
 #, fuzzy
 msgid "options for triggers"
 msgstr "opções para proxys"
diff --git a/po/ru.po b/po/ru.po
index 73a6a6489..b5cf7528b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 11:46+0200\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -9484,6 +9484,14 @@ msgstr "Сокращение \"%s\" удалено\n"
 msgid "Trigger:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Сокращение \"%s\" => \"%s\" создано\n"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%s сервер \"%s\" не найден\n"
+
 #, fuzzy
 msgid "Default triggers restored:"
 msgstr "Комбинации клавиш по умолчанию восстановлены\n"
@@ -9504,8 +9512,8 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 
 msgid ""
@@ -9558,7 +9566,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -9594,6 +9604,10 @@ msgstr ""
 msgid "triggers"
 msgstr ""
 
+#, fuzzy
+msgid "default triggers"
+msgstr "Список сокращений:\n"
+
 #, fuzzy
 msgid "options for triggers"
 msgstr "Список сокращений:\n"
diff --git a/po/tr.po b/po/tr.po
index e911c5a43..588eadabe 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-07-25 07:50+0200\n"
 "Last-Translator: Hasan Kiran <sunder67@hotmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8546,6 +8546,14 @@ msgstr "%s: \"%s\" kaldırıldı"
 msgid "Trigger:"
 msgstr ""
 
+#, fuzzy, c-format
+msgid "Trigger \"%s\" restored"
+msgstr "Filtre \"%s\" etkin"
+
+#, fuzzy, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr "%sTuş \"%s\" bulunamadı"
+
 msgid "Default triggers restored:"
 msgstr ""
 
@@ -8564,8 +8572,8 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 
 msgid ""
@@ -8618,7 +8626,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -8654,6 +8664,10 @@ msgstr ""
 msgid "triggers"
 msgstr ""
 
+#, fuzzy
+msgid "default triggers"
+msgstr "filtrelerin listesi"
+
 #, fuzzy
 msgid "options for triggers"
 msgstr "çubukların seçenekleri"
diff --git a/po/weechat.pot b/po/weechat.pot
index 3d026f324..8cb82857a 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2014-08-17 09:50+0200\n"
+"POT-Creation-Date: 2014-08-22 22:25+0200\n"
 "PO-Revision-Date: 2014-08-16 10:27+0200\n"
 "Last-Translator: Sébastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -8477,6 +8477,14 @@ msgstr ""
 msgid "Trigger:"
 msgstr ""
 
+#, c-format
+msgid "Trigger \"%s\" restored"
+msgstr ""
+
+#, c-format
+msgid "%sDefault trigger \"%s\" not found"
+msgstr ""
+
 msgid "Default triggers restored:"
 msgstr ""
 
@@ -8495,8 +8503,8 @@ msgid ""
 "\" [\"<return_code>\"]]]]] || addinput [<hook>] || input|output|recreate "
 "<name> || set <name> <option> <value> || rename|copy <name> <new_name> || "
 "enable|disable|toggle [<name>|-all [<name>...]] || restart <name>|-all "
-"[<name>...] || show <name> || del <name>|-all [<name>...] || default -yes || "
-"monitor [<filter>]"
+"[<name>...] || show <name> || del <name>|-all [<name>...] || restore <name> "
+"[<name>...] || default -yes || monitor [<filter>]"
 msgstr ""
 
 msgid ""
@@ -8549,7 +8557,9 @@ msgid ""
 "       show: show detailed info on a trigger (with some stats)\n"
 "        del: delete a trigger\n"
 "       -all: do action on all triggers\n"
-"    default: restore default triggers\n"
+"    restore: restore trigger(s) with the default values (works only for "
+"default triggers)\n"
+"    default: delete all triggers and restore default ones\n"
 "    monitor: open the trigger monitor buffer, with optional filter:\n"
 "     filter: filter hooks/triggers to display (a hook must start with \"@\", "
 "for example \"@signal\"), many filters can be separated by commas; wildcard "
@@ -8585,6 +8595,9 @@ msgstr ""
 msgid "triggers"
 msgstr ""
 
+msgid "default triggers"
+msgstr ""
+
 msgid "options for triggers"
 msgstr ""
 
diff --git a/src/plugins/trigger/trigger-command.c b/src/plugins/trigger/trigger-command.c
index 56954bdc8..ab918dbd7 100644
--- a/src/plugins/trigger/trigger-command.c
+++ b/src/plugins/trigger/trigger-command.c
@@ -434,7 +434,7 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
     struct t_trigger *ptr_trigger, *ptr_trigger2;
     struct t_trigger_regex *regex;
     char *value, **sargv, **items, input[1024], str_pos[16];
-    int rc, i, type, count, index_option, enable, sargc, num_items, add_rc;
+    int rc, i, j, type, count, index_option, enable, sargc, num_items, add_rc;
     int regex_count, regex_rc;
 
     /* make C compiler happy */
@@ -890,7 +890,49 @@ trigger_command_trigger (void *data, struct t_gui_buffer *buffer, int argc,
         goto end;
     }
 
-    /* restore default triggers */
+    /* restore default trigger(s) */
+    if (weechat_strcasecmp (argv[1], "restore") == 0)
+    {
+        if (argc < 3)
+            goto error;
+        for (i = 2; i < argc; i++)
+        {
+            for (j = 0; trigger_config_default_list[j][0]; j++)
+            {
+                if (weechat_strcasecmp (trigger_config_default_list[j][0],
+                                        argv[i]) == 0)
+                {
+                    break;
+                }
+            }
+            if (trigger_config_default_list[j][0])
+            {
+                ptr_trigger = trigger_search (argv[i]);
+                if (ptr_trigger)
+                    trigger_free (ptr_trigger);
+                trigger_new (
+                    trigger_config_default_list[j][0],   /* name */
+                    trigger_config_default_list[j][1],   /* enabled */
+                    trigger_config_default_list[j][2],   /* hook */
+                    trigger_config_default_list[j][3],   /* arguments */
+                    trigger_config_default_list[j][4],   /* conditions */
+                    trigger_config_default_list[j][5],   /* regex */
+                    trigger_config_default_list[j][6],   /* command */
+                    trigger_config_default_list[j][7]);  /* return code */
+                weechat_printf_tags (NULL, "no_trigger",
+                                     _("Trigger \"%s\" restored"), argv[i]);
+            }
+            else
+            {
+                weechat_printf_tags (NULL, "no_trigger",
+                                     _("%sDefault trigger \"%s\" not found"),
+                                     weechat_prefix ("error"), argv[i]);
+            }
+        }
+        goto end;
+    }
+
+    /* delete all triggers and restore default ones */
     if (weechat_strcasecmp (argv[1], "default") == 0)
     {
         if ((argc >= 3) && (weechat_strcasecmp (argv[2], "-yes") == 0))
@@ -948,6 +990,7 @@ trigger_command_init ()
            " || restart <name>|-all [<name>...]"
            " || show <name>"
            " || del <name>|-all [<name>...]"
+           " || restore <name> [<name>...]"
            " || default -yes"
            " || monitor [<filter>]"),
         N_("       list: list triggers (without argument, this list is displayed)\n"
@@ -1000,7 +1043,9 @@ trigger_command_init ()
            "       show: show detailed info on a trigger (with some stats)\n"
            "        del: delete a trigger\n"
            "       -all: do action on all triggers\n"
-           "    default: restore default triggers\n"
+           "    restore: restore trigger(s) with the default values (works "
+           "only for default triggers)\n"
+           "    default: delete all triggers and restore default ones\n"
            "    monitor: open the trigger monitor buffer, with optional filter:\n"
            "     filter: filter hooks/triggers to display (a hook must start "
            "with \"@\", for example \"@signal\"), many filters can be separated "
@@ -1043,6 +1088,7 @@ trigger_command_init ()
         " || enable|disable|toggle|restart|del %(trigger_names)|-all "
         "%(trigger_names)|%*"
         " || show %(trigger_names)"
+        " || restore %(trigger_names_default)|%*"
         " || default"
         " || monitor %(trigger_names)|%(trigger_hooks_filter)",
         &trigger_command_trigger, NULL);
diff --git a/src/plugins/trigger/trigger-completion.c b/src/plugins/trigger/trigger-completion.c
index 4bad0aa40..9b5a0fe7b 100644
--- a/src/plugins/trigger/trigger-completion.c
+++ b/src/plugins/trigger/trigger-completion.c
@@ -25,6 +25,7 @@
 
 #include "../weechat-plugin.h"
 #include "trigger.h"
+#include "trigger-config.h"
 
 
 /*
@@ -53,6 +54,33 @@ trigger_completion_triggers_cb (void *data, const char *completion_item,
     return WEECHAT_RC_OK;
 }
 
+/*
+ * Adds default triggers to completion list.
+ */
+
+int
+trigger_completion_triggers_default_cb (void *data,
+                                        const char *completion_item,
+                                        struct t_gui_buffer *buffer,
+                                        struct t_gui_completion *completion)
+{
+    int i;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) completion_item;
+    (void) buffer;
+
+    for (i = 0; trigger_config_default_list[i][0]; i++)
+    {
+        weechat_hook_completion_list_add (completion,
+                                          trigger_config_default_list[i][0],
+                                          0, WEECHAT_LIST_POS_SORT);
+    }
+
+    return WEECHAT_RC_OK;
+}
+
 /*
  * Adds options for triggers to completion list.
  */
@@ -393,6 +421,9 @@ trigger_completion_init ()
     weechat_hook_completion ("trigger_names",
                              N_("triggers"),
                              &trigger_completion_triggers_cb, NULL);
+    weechat_hook_completion ("trigger_names_default",
+                             N_("default triggers"),
+                             &trigger_completion_triggers_default_cb, NULL);
     weechat_hook_completion ("trigger_options",
                              N_("options for triggers"),
                              &trigger_completion_options_cb, NULL);