diff --git a/ChangeLog b/ChangeLog
index 5e54276e8..63d533f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,12 +1,13 @@
 WeeChat ChangeLog
 =================
 Sébastien Helleu <flashcode@flashtux.org>
-v0.4.0-dev, 2012-12-19
+v0.4.0-dev, 2012-12-20
 
 
 Version 0.4.0 (under dev!)
 --------------------------
 
+* core: add option "diff" for command /set (list options with changed value)
 * core: fix refresh of windows after split (fix bug with horizontal separator
   between windows) (bug #37874)
 * core: fix stuck mouse (bug #36533)
diff --git a/doc/de/autogen/user/weechat_commands.txt b/doc/de/autogen/user/weechat_commands.txt
index 7f33e7fad..05df7447d 100644
--- a/doc/de/autogen/user/weechat_commands.txt
+++ b/doc/de/autogen/user/weechat_commands.txt
@@ -605,23 +605,29 @@ Wird keine Datei angegeben dann werden alle Konfigurationen (WeeChat und Erweite
 [command]*`set`* Konfigurationsparameter setzen::
 ........................................
 /set  [<option> [<value>]]
+      diff [<option> [<option>...]]
 
-option: Name der zu ändernden Option (darf mit einem Joker '*' beginnen oder enden um mehrere Optionen anzuzeigen)
- value: neuer Wert, den die Option erhalten soll
+option: name of an option (can start or end with '*' to list many options)
+ value: new value for option
+  diff: display only changed options
 
-Abhängig von der ausgewählten Option, kann die Variable folgenden Inhalt haben:
-  boolean: on, off oder toggle
-  integer: Anzahl, ++Anzahl oder --Anzahl
-  string : jede Zeichenkette ("" für eine leere Zeichenkette)
-  color  : Name einer Farbe, ++Anzahl oder --Anzahl
+New value can be, according to variable type:
+  boolean: on, off or toggle
+  integer: number, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number
 
-Für alle Typen von Variablen kann die Zeichenkette "null" (ohne "")  genutzt werden um den Wert der Option zu löschen (undefinierter Wert). Dies  kann nur bei einigen Erweiterungen genutzt werden.
+For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
 
-Beispiele:
-  Zeigt alle Optionen an die etwas mit highlight zu tun haben:
+Examples:
+  display options about highlight:
     /set *highlight*
-  Fügt ein highlight-Wort hinzu:
+  add a word to highlight:
     /set weechat.look.highlight "word"
+  display changed options:
+    /set diff
+  display changed options in irc plugin:
+    /set diff irc.*
 ........................................
 
 [[command_weechat_unset]]
diff --git a/doc/en/autogen/user/weechat_commands.txt b/doc/en/autogen/user/weechat_commands.txt
index 0db618cde..9f45d7a54 100644
--- a/doc/en/autogen/user/weechat_commands.txt
+++ b/doc/en/autogen/user/weechat_commands.txt
@@ -605,15 +605,17 @@ Without argument, all files (WeeChat and plugins) are saved.
 [command]*`set`* set config options::
 ........................................
 /set  [<option> [<value>]]
+      diff [<option> [<option>...]]
 
 option: name of an option (can start or end with '*' to list many options)
  value: new value for option
+  diff: display only changed options
 
 New value can be, according to variable type:
   boolean: on, off or toggle
   integer: number, ++number or --number
-  string : any string ("" for empty string)
-  color  : color name, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number
 
 For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
 
@@ -622,6 +624,10 @@ Examples:
     /set *highlight*
   add a word to highlight:
     /set weechat.look.highlight "word"
+  display changed options:
+    /set diff
+  display changed options in irc plugin:
+    /set diff irc.*
 ........................................
 
 [[command_weechat_unset]]
diff --git a/doc/fr/autogen/user/weechat_commands.txt b/doc/fr/autogen/user/weechat_commands.txt
index 94fed7bdf..69bea3907 100644
--- a/doc/fr/autogen/user/weechat_commands.txt
+++ b/doc/fr/autogen/user/weechat_commands.txt
@@ -605,14 +605,16 @@ Sans paramètre, tous les fichiers (WeeChat et extensions) sont sauvegardés.
 [command]*`set`* modifier des options de configuration::
 ........................................
 /set  [<option> [<valeur>]]
+      diff [<option> [<option>...]]
 
 option: nom d'une option (peut démarrer ou se terminer par '*' pour lister plusieurs options)
 valeur: nouvelle valeur pour l'option
+  diff: afficher seulement les options modifiées
 
 La nouvelle valeur peut être, selon le type de l'option:
   booléen: on, off ou toggle
-  entier : nombre, ++nombre ou --nombre
-  chaîne : toute chaîne ("" pour une chaîne vide)
+   entier: nombre, ++nombre ou --nombre
+   chaîne: toute chaîne ("" pour une chaîne vide)
   couleur: nom de couleur, ++nombre ou --nombre
 
 Pour tous les types, vous pouvez utiliser null pour supprimer la valeur de l'option (valeur non définie). Cela ne fonctionne qu'avec certaines options spéciales des extensions.
@@ -622,6 +624,10 @@ Exemples:
     /set *highlight*
   ajouter un mot pour le highlight:
     /set weechat.look.highlight "mot"
+  afficher les options modifiées:
+    /set diff
+  afficher les options modifiées dans l'extension irc:
+    /set diff irc.*
 ........................................
 
 [[command_weechat_unset]]
diff --git a/doc/it/autogen/user/weechat_commands.txt b/doc/it/autogen/user/weechat_commands.txt
index 1bd978ad3..eeb057f1f 100644
--- a/doc/it/autogen/user/weechat_commands.txt
+++ b/doc/it/autogen/user/weechat_commands.txt
@@ -604,24 +604,30 @@ Senza argomento, vengono salvati tutti i file (WeeChat e plugin).
 [[command_weechat_set]]
 [command]*`set`* imposta le opzioni di configurazione::
 ........................................
-/set  [<opzione> [<valore>]]
+/set  [<option> [<value>]]
+      diff [<option> [<option>...]]
 
-opzione: nome di un'opzione (può iniziare o terminare con '*' per elencare più opzioni)
- valore: nuovo valore per l'opzione
+option: name of an option (can start or end with '*' to list many options)
+ value: new value for option
+  diff: display only changed options
 
-Il nuovo valore può essere, a seconda del tipo di variabile:
-  booleano: on, off o toggle
-  intero  : numero, ++numero o --numero
-  stringa : qualsiasi stringa ("" per una stringa vuota)
-  colore  : nome colore, ++numeero o --numero
+New value can be, according to variable type:
+  boolean: on, off or toggle
+  integer: number, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number
 
-Per tutti i tipi, è possibile usare null per rimuovere il valore dell'opzione (valore non definito). Ciò funziona solo per alcune variabili speciali dei plugin.
+For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
 
-Esempi:
-  mostra le opzioni relative alle notifiche:
+Examples:
+  display options about highlight:
     /set *highlight*
-  aggiunge una parola alle notifiche:
+  add a word to highlight:
     /set weechat.look.highlight "word"
+  display changed options:
+    /set diff
+  display changed options in irc plugin:
+    /set diff irc.*
 ........................................
 
 [[command_weechat_unset]]
diff --git a/doc/ja/autogen/user/weechat_commands.txt b/doc/ja/autogen/user/weechat_commands.txt
index adffe54d0..a770f7e35 100644
--- a/doc/ja/autogen/user/weechat_commands.txt
+++ b/doc/ja/autogen/user/weechat_commands.txt
@@ -605,23 +605,29 @@ file: 保存する設定ファイル (拡張子 ".conf" は不要)
 [command]*`set`* オプションの設定::
 ........................................
 /set  [<option> [<value>]]
+      diff [<option> [<option>...]]
 
-option: オプションの名前 (多くのオプションをリストアップするには、'*' で始めるか終わるかしてください)
- value: オプションに対する新しい値
+option: name of an option (can start or end with '*' to list many options)
+ value: new value for option
+  diff: display only changed options
 
-新しいオプションは以下の変数型に従います:
-  boolean: on、off、toggle
-  integer: 番号、++番号、--番号
-  string : 任意の文字列 (空文字列は "")
-  color  : 色の名前、++色番号、--色番号
+New value can be, according to variable type:
+  boolean: on, off or toggle
+  integer: number, ++number or --number
+   string: any string ("" for empty string)
+    color: color name, ++number or --number
 
-どんな型であっても、オプションの値を削除する (未定義値にする) には null が使えます。これはいくつかの特別なプラグイン変数でのみ有効です。
+For all types, you can use null to remove option value (undefined value). This works only for some special plugin variables.
 
-例:
-  ハイライトに関するオプションを表示:
+Examples:
+  display options about highlight:
     /set *highlight*
-  highlight に単語を追加:
+  add a word to highlight:
     /set weechat.look.highlight "word"
+  display changed options:
+    /set diff
+  display changed options in irc plugin:
+    /set diff irc.*
 ........................................
 
 [[command_weechat_unset]]
diff --git a/po/cs.po b/po/cs.po
index 31feddcb7..708de82ce 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-09-29 11:42+0200\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Czech\n"
@@ -699,19 +699,34 @@ msgstr ""
 "%sVolba \"%s\" nenalezena (tip: můžete použít  \"*\" na začátku a/nebo konci "
 "volby pro zobrazení podlistu)"
 
-msgid "No configuration option found"
-msgstr "Nebyla nalezena žádná volba nastavení"
+#, fuzzy
+msgid "No option found"
+msgstr "Nebyl nalezen žádný plugin"
 
-#, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] "%s%d%s volba nastavení nalezena s \"%s\""
 msgstr[1] "%s%d%s volby nastavení nalezeny s \"%s\""
 msgstr[2] "%s%d%s voleb nastavení nalezeno s \"%s\""
 
-#, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+#, fuzzy, c-format
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "%s%d%s volba nastavení nalezena s \"%s\""
+msgstr[1] "%s%d%s volby nastavení nalezeny s \"%s\""
+msgstr[2] "%s%d%s voleb nastavení nalezeno s \"%s\""
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "%s%d%s volba nastavení nalezena"
+msgstr[1] "%s%d%s volby nastavení nalezeny"
+msgstr[2] "%s%d%s voleb nastavení nalezeno"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "%s%d%s volba nastavení nalezena"
 msgstr[1] "%s%d%s volby nastavení nalezeny"
 msgstr[2] "%s%d%s voleb nastavení nalezeno"
@@ -720,9 +735,9 @@ msgstr[2] "%s%d%s voleb nastavení nalezeno"
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sChyba: selhalo nastavení volby \"%s\""
 
-#, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%sChyba: volba nastavení \"%s\" nenalezena"
+#, fuzzy, c-format
+msgid "%sError: option \"%s\" not found"
+msgstr "%sChyba: plugin \"%s\" nenalezen"
 
 msgid "Option changed: "
 msgstr "Volba změněna: "
@@ -1878,18 +1893,21 @@ msgstr ""
 msgid "set config options"
 msgstr "nastaví konfigurační možnosti"
 
-msgid "[<option> [<value>]]"
+#, fuzzy
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<možnost> [<hodnota>]]"
 
+#, fuzzy
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -1898,7 +1916,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 "možnost: jméno nastavení (může začínat nebo končit '*' pro výpis více "
 "nastavení)\n"
@@ -9262,43 +9284,3 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "automaticky znovu přijít na kanály po vykopnutí"
-
-#~ msgid "prefix for error messages"
-#~ msgstr "prefix pro chybové zprávy"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "prefix pro zprávy sítě"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "prefix pro zprávy akcí"
-
-#~ msgid "prefix for join messages"
-#~ msgstr "prefix pro zprávy připojení"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "prefix pro zprávy ukončení"
-
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "   server: jméno serveru\n"
-#~ "přezdívka: přezdívka (může být maska)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "použít protokol IPv6 pro komunikaci se serverem"
-
-#~ msgid "global decoding charset"
-#~ msgstr "globální znaková sada pro dekódování"
-
-#~ msgid "global encoding charset"
-#~ msgstr "globální znaková sada pro kódování"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: připojuji se k serveru %s/%d%s%s..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: odpojen od serveru"
diff --git a/po/de.po b/po/de.po
index eff6202d1..3cd00e3f1 100644
--- a/po/de.po
+++ b/po/de.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-11-04 15:41+0100\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: Nils Görs <weechatter@arcor.de>\n"
 "Language-Team: German <weechatter@arcor.de>\n"
 "Language: \n"
@@ -719,18 +719,31 @@ msgstr ""
 "%sOption \"%s\" nicht gefunden (Tipp: Der Platzhalter \"*\" kann zu Beginn "
 "und/oder am Ende genutzt werden um Gruppen von Optionen anzusprechen)"
 
-msgid "No configuration option found"
-msgstr "Konfigurationsoption nicht gefunden"
+#, fuzzy
+msgid "No option found"
+msgstr "Keine Erweiterung gefunden"
 
-#, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] "%s%d%s Konfigurationsoption gefunden die auf \"%s\" zutrifft."
 msgstr[1] "%s%d%s Konfigurationsoptionen gefunden die auf \"%s\" zutreffen."
 
-#, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+#, fuzzy, c-format
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "%s%d%s Konfigurationsoption gefunden die auf \"%s\" zutrifft."
+msgstr[1] "%s%d%s Konfigurationsoptionen gefunden die auf \"%s\" zutreffen."
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "%s%d%s Konfigurationsoption gefunden"
+msgstr[1] "%s%d%s Konfigurationsoptionen gefunden"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "%s%d%s Konfigurationsoption gefunden"
 msgstr[1] "%s%d%s Konfigurationsoptionen gefunden"
 
@@ -738,9 +751,9 @@ msgstr[1] "%s%d%s Konfigurationsoptionen gefunden"
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sFehler: Option \"%s\" konnte nicht gesetzt werden"
 
-#, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%sFehler: Konfigurationsoption \"%s\" nicht gefunden"
+#, fuzzy, c-format
+msgid "%sError: option \"%s\" not found"
+msgstr "%sFehler: die Erweiterung \"%s\" wurde nicht gefunden"
 
 msgid "Option changed: "
 msgstr "Option geändert: "
@@ -2107,18 +2120,21 @@ msgstr ""
 msgid "set config options"
 msgstr "Konfigurationsparameter setzen"
 
-msgid "[<option> [<value>]]"
+#, fuzzy
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<option> [<value>]]"
 
+#, fuzzy
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -2127,7 +2143,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 "option: Name der zu ändernden Option (darf mit einem Joker '*' beginnen oder "
 "enden um mehrere Optionen anzuzeigen)\n"
@@ -10085,120 +10105,3 @@ msgstr "Type"
 
 msgid "Constants"
 msgstr "Konstanten"
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "Channels automatisch betreten, falls man rausgeworfen wurde"
-
-#~ msgid "prefix for error messages"
-#~ msgstr "Präfix für Fehlermeldungen"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "Präfix für Netzwerkmeldungen"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "Präfix für Action-Nachrichten"
-
-#~ msgid "prefix for join messages"
-#~ msgstr "Präfix für Join-Nachrichten"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "Präfix für Quit-Nachrichten"
-
-#~ msgid ""
-#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
-#~ "= window must be active, \"inactive\" = window must be inactive, "
-#~ "\"nicklist\" = buffer must have a nicklist"
-#~ msgstr ""
-#~ "Bedingung(en) um eine Bar anzuzeigen (gilt für Bars des Typs \"window\"): "
-#~ "\"active\" = window muss aktiv sein \"inactive\" = window muss inaktiv "
-#~ "sein, \"nicklist\" = Buffer muss über eine Nickliste verfügen"
-
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "server: Servername\n"
-#~ "  nick: Nickname (oder eine Maske)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "Server über IPv6 ansprechen"
-
-#~ msgid "global decoding charset"
-#~ msgstr "globaler Zeichensatz zum dekodieren"
-
-#~ msgid "global encoding charset"
-#~ msgstr "globaler Zeichensatz zum kodieren"
-
-#~ msgid "alt+d=back to list"
-#~ msgstr "alt+d=zurück zur Auswahl"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: Verbinden zum Server %s/%d%s%s..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: Vom Server getrennt!"
-
-#~ msgid "display nick mode ((half)op/voice) before each nick"
-#~ msgstr ""
-#~ "vor dem Nicknamen wird der entsprechende Nickmode ((half)op/voice [@%+]) "
-#~ "angezeigt"
-
-#~ msgid "%s: script \"%s\" held"
-#~ msgstr "%s: Skript \"%s\" kann nicht überschrieben werden"
-
-#~ msgid ""
-#~ "%s%s: cannot authenticate with SASL and mechanism DH-BLOWFISH because "
-#~ "WeeChat was not built with libgcrypt support"
-#~ msgstr ""
-#~ "%s%s Authentifizierung mittels SASL und DH-BLOWFISH Mechanismus nicht "
-#~ "möglich, da WeeChat nicht mit libgcrypt Unterstützung erstellt wurde"
-
-#~ msgid "smart completion for nicks (completes first with last speakers)"
-#~ msgstr ""
-#~ "intelligente Vervollständigung von Nicknamen (vervollständigt zuerst den "
-#~ "letzten Nick, mit dem gesprochen wurde)"
-
-#~ msgid "ended on: "
-#~ msgstr "geendet am: "
-
-#~ msgid "%s%-26s id: %d, protocol: %s, received: %s, sent: %s"
-#~ msgstr "%s%-26s Id: %d, Protokoll: %s, empfangen: %s, gesendet: %s"
-
-#~ msgid "%s: new client from %s%s%s on port %d (id: %d, relaying: %s%s%s)"
-#~ msgstr "%s: neuer Client von %s%s%s an Port %d (id: %d, Relaying: %s%s%s)"
-
-#~ msgid "text color"
-#~ msgstr "Textfarbe"
-
-#~ msgid "background color"
-#~ msgstr "Hintergrundfarbe"
-
-#~ msgid "text color of selected xfer line"
-#~ msgstr "Farbe der ausgewählten Transfer-Zeile"
-
-#~ msgid "display message when (un)marking as away"
-#~ msgstr "bei Abwesenheit und Rückkehr eine Nachricht anzeigen"
-
-#~ msgid "%s%s: error sending data to client %d (%s)"
-#~ msgstr "%s%s: Fehler beim Senden von Daten an den Client %d (%s)"
-
-#~ msgid "display channel modes in \"buffer_name\" bar item"
-#~ msgstr "zeigt die Channel-Modi mittels \"buffer_name\" in der Bar-Item an"
-
-#~ msgid "%sError: name can not start with \"#\""
-#~ msgstr "%sFehler: Name darf nicht mit \"#\"beginnen"
-
-#~ msgid "%s%s: name can not start with \"#\""
-#~ msgstr "%s%s: Name darf nicht mit \"#\" beginnen"
-
-#~ msgid "string inserted after nick completion"
-#~ msgstr "Nach Nick-Vervollständigung anzufügende Zeichenfolge"
-
-#~ msgid "display '+' if prefix is truncated"
-#~ msgstr "Anzeige eines '+' falls das Präfix abgeschnitten ist"
-
-#~ msgid "<nick> <channel>"
-#~ msgstr "<nick> <channel>"
-
-#~ msgid "mechanism for SASL authentication"
-#~ msgstr "Vorrichtung zur SASL Authentifizierung"
diff --git a/po/es.po b/po/es.po
index fd05fed92..ba7fb0d08 100644
--- a/po/es.po
+++ b/po/es.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-09-29 11:42+0200\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Spanish\n"
@@ -702,18 +702,31 @@ msgstr ""
 "%sOpción \"%s\" no encontrada (puedes usar \"*\" al principio y/o al final "
 "de la opción para ver un listado)"
 
-msgid "No configuration option found"
-msgstr "Ninguna opción de configuración encontrada"
+#, fuzzy
+msgid "No option found"
+msgstr "Ningún plugin encontrado"
 
-#, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] "%s%d%s opción de configuración encontrada con \"%s\""
 msgstr[1] "%s%d%s opciones de configuración encontradas con \"%s\""
 
-#, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+#, fuzzy, c-format
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "%s%d%s opción de configuración encontrada con \"%s\""
+msgstr[1] "%s%d%s opciones de configuración encontradas con \"%s\""
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "%s%d%s opción de configuración encontrada"
+msgstr[1] "%s%d%s opciones de configuración encontradas"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "%s%d%s opción de configuración encontrada"
 msgstr[1] "%s%d%s opciones de configuración encontradas"
 
@@ -721,9 +734,9 @@ msgstr[1] "%s%d%s opciones de configuración encontradas"
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sError: no se pudo configurar la opción \"%s\""
 
-#, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%sError: opción de configuración \"%s\" no encontrada"
+#, fuzzy, c-format
+msgid "%sError: option \"%s\" not found"
+msgstr "%sError: plugin \"%s\" no encontrado"
 
 msgid "Option changed: "
 msgstr "Opción cambiada: "
@@ -1985,18 +1998,21 @@ msgstr ""
 msgid "set config options"
 msgstr "establecer opciones de configuración"
 
-msgid "[<option> [<value>]]"
+#, fuzzy
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<opción> [<valor>]]"
 
+#, fuzzy
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -2005,7 +2021,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 "opción: nombre de la opción (puede empezar o terminar con '*' para listar "
 "varias opciones)\n"
@@ -9546,55 +9566,3 @@ msgstr "Tipo"
 
 msgid "Constants"
 msgstr "Constantes"
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "automáticamente unirse a los canales al ser expulsado"
-
-#~ msgid "prefix for error messages"
-#~ msgstr "prefijo para mensajes de error"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "prefijo para mensajes de la red"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "prefijo para mensajes de acción"
-
-#~ msgid "prefix for join messages"
-#~ msgstr "prefijo para mensajes de unión"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "prefijo para mensajes de salida"
-
-#~ msgid ""
-#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
-#~ "= window must be active, \"inactive\" = window must be inactive, "
-#~ "\"nicklist\" = buffer must have a nicklist"
-#~ msgstr ""
-#~ "condicion(es) para mostrar barras del tipo \"window\": \"active\" = la "
-#~ "ventana debe estar activa, \"inactive\" = la ventana deber estar "
-#~ "inactiva, \"nicklist\" = buffer debe tener una lista de apodos"
-
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "servidor: nombre del servidor\n"
-#~ "   apodo: apodo del usuario (puede ser una máscara)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "usar el protocolo IPv6 para la comunicación con el servidor"
-
-#~ msgid "display channel modes in \"buffer_name\" bar item"
-#~ msgstr "mostrar los modos del canal en el elemento de barra \"buffer_name\""
-
-#~ msgid "global decoding charset"
-#~ msgstr "set de caracteres para la decodificación global"
-
-#~ msgid "global encoding charset"
-#~ msgstr "set de caracteres para la codificación global"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: conectando al servidor %s/%d%s%s..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: desconectado del servidor"
diff --git a/po/fr.po b/po/fr.po
index be203d78d..8212efeed 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-12-16 17:18+0100\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -705,28 +705,40 @@ msgstr ""
 "%sOption \"%s\" non trouvée (astuce: vous pouvez utiliser \"*\" au début et/"
 "ou à la fin de l'option pour voir une sous-liste)"
 
-msgid "No configuration option found"
-msgstr "Aucune option de configuration trouvée"
+msgid "No option found"
+msgstr "Aucune option trouvée"
 
 #, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
-msgstr[0] "%s%d%s option de configuration trouvée correspondant à \"%s\""
-msgstr[1] "%s%d%s options de configuration trouvées correspondant à \"%s\""
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
+msgstr[0] "%s%d%s option avec valeur changée (correspondant à \"%s\")"
+msgstr[1] "%s%d%s options avec valeur changée (correspondant à \"%s\")"
 
 #, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
-msgstr[0] "%s%d%s option de configuration trouvée"
-msgstr[1] "%s%d%s options de configuration trouvées"
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "%s%d%s option (correspondant à \"%s\")"
+msgstr[1] "%s%d%s options (correspondant à \"%s\")"
+
+#, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "%s%d%s option"
+msgstr[1] "%s%d%s options"
+
+#, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
+msgstr[0] "%s%d%s option avec valeur changée"
+msgstr[1] "%s%d%s options avec valeur changée"
 
 #, c-format
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sErreur: impossible de modifier l'option \"%s\""
 
 #, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%sErreur: option de configuration \"%s\" non trouvée"
+msgid "%sError: option \"%s\" not found"
+msgstr "%sErreur: option \"%s\" non trouvée"
 
 msgid "Option changed: "
 msgstr "Option modifiée: "
@@ -2045,18 +2057,19 @@ msgstr ""
 msgid "set config options"
 msgstr "modifier des options de configuration"
 
-msgid "[<option> [<value>]]"
-msgstr "[<option> [<valeur>]]"
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
+msgstr "[<option> [<valeur>]] || diff [<option> [<option>...]]"
 
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -2065,16 +2078,21 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 "option: nom d'une option (peut démarrer ou se terminer par '*' pour lister "
 "plusieurs options)\n"
 "valeur: nouvelle valeur pour l'option\n"
+"  diff: afficher seulement les options modifiées\n"
 "\n"
 "La nouvelle valeur peut être, selon le type de l'option:\n"
 "  booléen: on, off ou toggle\n"
-"  entier : nombre, ++nombre ou --nombre\n"
-"  chaîne : toute chaîne (\"\" pour une chaîne vide)\n"
+"   entier: nombre, ++nombre ou --nombre\n"
+"   chaîne: toute chaîne (\"\" pour une chaîne vide)\n"
 "  couleur: nom de couleur, ++nombre ou --nombre\n"
 "\n"
 "Pour tous les types, vous pouvez utiliser null pour supprimer la valeur de "
@@ -2085,7 +2103,11 @@ msgstr ""
 "  afficher les options à propos du highlight:\n"
 "    /set *highlight*\n"
 "  ajouter un mot pour le highlight:\n"
-"    /set weechat.look.highlight \"mot\""
+"    /set weechat.look.highlight \"mot\"\n"
+"  afficher les options modifiées:\n"
+"    /set diff\n"
+"  afficher les options modifiées dans l'extension irc:\n"
+"    /set diff irc.*"
 
 msgid "unset/reset config options"
 msgstr "supprimer/réinitialiser des options de configuration"
@@ -9840,21 +9862,3 @@ msgstr "Type"
 
 msgid "Constants"
 msgstr "Constantes"
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "rejoindre automatiquement les canaux après un \"kick\""
-
-#~ msgid "prefix for error messages"
-#~ msgstr "préfixe pour les messages d'erreur"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "préfixe pour les messages réseau"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "préfixe pour les messages d'action"
-
-#~ msgid "prefix for join messages"
-#~ msgstr "préfixe pour les messages d'arrivée"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "préfixe pour les messages de départ"
diff --git a/po/hu.po b/po/hu.po
index 78886fbef..a69c06990 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-09-29 11:42+0200\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Hungarian\n"
@@ -736,18 +736,30 @@ msgid ""
 msgstr ""
 
 #, fuzzy
-msgid "No configuration option found"
-msgstr "Nem található az opció\n"
+msgid "No option found"
+msgstr "Nem található modul.\n"
 
 #, fuzzy, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] "a \"%s\" kifejezéshez tartozó opciót találtam\n"
 msgstr[1] "a \"%s\" kifejezéshez tartozó opciót találtam\n"
 
 #, fuzzy, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "a \"%s\" kifejezéshez tartozó opciót találtam\n"
+msgstr[1] "a \"%s\" kifejezéshez tartozó opciót találtam\n"
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "megtalált opciók\n"
+msgstr[1] "megtalált opciók\n"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "megtalált opciók\n"
 msgstr[1] "megtalált opciók\n"
 
@@ -756,8 +768,8 @@ msgid "%sError: failed to set option \"%s\""
 msgstr "%s nem sikerült a modul opciókat elmenteni\n"
 
 #, fuzzy, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%s a \"%s\" opció nem található\n"
+msgid "%sError: option \"%s\" not found"
+msgstr "%s a \"%s\" modul nem található\n"
 
 #, fuzzy
 msgid "Option changed: "
@@ -1637,18 +1649,19 @@ msgid "set config options"
 msgstr "konfigurációs paraméterek beállítása"
 
 #, fuzzy
-msgid "[<option> [<value>]]"
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[opció [ = érték]]"
 
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -1657,7 +1670,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 
 #, fuzzy
@@ -8746,42 +8763,3 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
-
-#, fuzzy
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "automatikus visszalépés a szobába kirúgáskor"
-
-#, fuzzy
-#~ msgid "prefix for error messages"
-#~ msgstr "hibakereső üzenetek megjelenítése"
-
-#, fuzzy
-#~ msgid "prefix for action messages"
-#~ msgstr "válasz ping üzenetre"
-
-#, fuzzy
-#~ msgid "prefix for join messages"
-#~ msgstr "új üzenetet tartalmazó ablak színe"
-
-#, fuzzy
-#~ msgid "prefix for quit messages"
-#~ msgstr "alapértelmezett kilépő üzenet"
-
-#, fuzzy
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "    szerver: szerver neve\n"
-#~ "felhasználó: felhasználónév (maszk is lehet)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "IPv6 protokoll használata a kapcsolathoz"
-
-#, fuzzy
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: csatlakozás a(z) %s:%d%s%s szerverhez...\n"
-
-#, fuzzy
-#~ msgid "%s: disconnected from server"
-#~ msgstr "Lekapcsolódott a szerverről!\n"
diff --git a/po/it.po b/po/it.po
index 3833b2563..3648bc211 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-09-29 11:42+0200\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Italian\n"
@@ -699,18 +699,31 @@ msgstr ""
 "%sOpzione \"%s\" non trovata (è possibile usare \"*\" all'inizio e/o fine "
 "dell'opzione per visualizzare una sottolista)"
 
-msgid "No configuration option found"
-msgstr "Nessuna opzione di configurazione trovata"
+#, fuzzy
+msgid "No option found"
+msgstr "Nessun plugin trovato"
 
-#, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] "%s%d%s opzione di configurazione corrispondente a \"%s\" trovata"
 msgstr[1] "%s%d%s opzioni di configurazione corrispondenti a \"%s\" trovate"
 
-#, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+#, fuzzy, c-format
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "%s%d%s opzione di configurazione corrispondente a \"%s\" trovata"
+msgstr[1] "%s%d%s opzioni di configurazione corrispondenti a \"%s\" trovate"
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "%s%d%s opzione di configurazione trovata"
+msgstr[1] "%s%d%s opzioni di configurazione trovate"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "%s%d%s opzione di configurazione trovata"
 msgstr[1] "%s%d%s opzioni di configurazione trovate"
 
@@ -718,9 +731,9 @@ msgstr[1] "%s%d%s opzioni di configurazione trovate"
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sErrore: impossibile impostare l'opzione \"%s\""
 
-#, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%sErrore: opzione di configurazione \"%s\" non trovata"
+#, fuzzy, c-format
+msgid "%sError: option \"%s\" not found"
+msgstr "%sErrore: plugin \"%s\" non trovato"
 
 msgid "Option changed: "
 msgstr "Opzione modificata: "
@@ -1969,18 +1982,21 @@ msgstr ""
 msgid "set config options"
 msgstr "imposta le opzioni di configurazione"
 
-msgid "[<option> [<value>]]"
+#, fuzzy
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<opzione> [<valore>]]"
 
+#, fuzzy
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -1989,7 +2005,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 "opzione: nome di un'opzione (può iniziare o terminare con '*' per elencare "
 "più opzioni)\n"
@@ -9532,52 +9552,3 @@ msgstr "Tipo"
 
 msgid "Constants"
 msgstr "Costanti"
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "rientra automaticamente nei canali dopo il kick"
-
-#~ msgid "prefix for error messages"
-#~ msgstr "prefisso per i messaggi di errore"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "prefisso per i messaggi di rete"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "prefisso per i messaggi di azione"
-
-#~ msgid "prefix for join messages"
-#~ msgstr "prefisso per i messaggi di entrata"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "prefisso per i messaggi di uscita"
-
-#~ msgid ""
-#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
-#~ "= window must be active, \"inactive\" = window must be inactive, "
-#~ "\"nicklist\" = buffer must have a nicklist"
-#~ msgstr ""
-#~ "condizioni per mostrare la barra (per le barre di tipo \"window\"): "
-#~ "\"active\"= la finestra deve essere attiva, \"inactive\" = la finestra "
-#~ "deve essere inattiva, \"nicklist\" = il buffer deve avere una lista nick"
-
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "server: nome server\n"
-#~ "  nick: nick (può essere una mask)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "usa il protocollo IPv6 per le comunicazioni col server"
-
-#~ msgid "global decoding charset"
-#~ msgstr "set di caratteri per la decodifica globale"
-
-#~ msgid "global encoding charset"
-#~ msgstr "set di caratter per la codifica globale"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: connessione al server %s/%d%s%s..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: disconnesso dal server"
diff --git a/po/ja.po b/po/ja.po
index 08b4521d5..9c63db6bd 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-09-29 11:42+0200\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: AYANOKOUZI, Ryuunosuke <i38w7i3@yahoo.co.jp>\n"
 "Language-Team: Japanese <https://github.com/l/WeeChat>\n"
 "Language: ja\n"
@@ -698,27 +698,39 @@ msgstr ""
 "%sオプション \"%s\" が見つかりません (ヒント: sublist を見るには、\"*\" をオ"
 "プションの最初と最後に付けてください)"
 
-msgid "No configuration option found"
-msgstr "設定オプションが見つかりません"
+#, fuzzy
+msgid "No option found"
+msgstr "プラグインが見つかりません"
 
-#, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] ""
 "\"%4$s\" にマッチする %1$s%2$d%3$s 個の設定オプションが見つかりました"
 
-#, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+#, fuzzy, c-format
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] ""
+"\"%4$s\" にマッチする %1$s%2$d%3$s 個の設定オプションが見つかりました"
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "%s%d%s 個のオプションが見つかりました"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "%s%d%s 個のオプションが見つかりました"
 
 #, c-format
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sエラー: オプション \"%s\" の設定に失敗しました"
 
-#, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%sエラー: 設定オプション \"%s\" が見つかりません"
+#, fuzzy, c-format
+msgid "%sError: option \"%s\" not found"
+msgstr "%sエラー: プラグイン \"%s\" が見つかりません"
 
 msgid "Option changed: "
 msgstr "変更されたオプション: "
@@ -1945,18 +1957,21 @@ msgstr ""
 msgid "set config options"
 msgstr "オプションの設定"
 
-msgid "[<option> [<value>]]"
+#, fuzzy
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<option> [<value>]]"
 
+#, fuzzy
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -1965,7 +1980,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 "option: オプションの名前 (多くのオプションをリストアップするには、'*' で始め"
 "るか終わるかしてください)\n"
@@ -9399,55 +9418,3 @@ msgstr "タイプ"
 
 msgid "Constants"
 msgstr "定数"
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "キックされた後に自動的に再度参加"
-
-#~ msgid "prefix for error messages"
-#~ msgstr "エラーメッセージのプレフィックス"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "ネットワークメッセージのプレフィックス"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "アクションメッセージのプレフィックス"
-
-#~ msgid "prefix for join messages"
-#~ msgstr "join メッセージのプレフィックス"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "quit メッセージのプレフィックス"
-
-#~ msgid ""
-#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
-#~ "= window must be active, \"inactive\" = window must be inactive, "
-#~ "\"nicklist\" = buffer must have a nicklist"
-#~ msgstr ""
-#~ "バー表示状態 (\"window\" 型のバー): \"active\" = ウィンドウはアクティブ状"
-#~ "態、\"inactive\" = ウィンドウはインアクティブ状態、\"nicklist\" = バッファ"
-#~ "はニックネームリストを持つ"
-
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "server: サーバ名\n"
-#~ "  nick: ニックネーム (マスクが使えるかも)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "サーバとの通信に IPv6 を利用"
-
-#~ msgid "global decoding charset"
-#~ msgstr "グローバルデコード文字集合"
-
-#~ msgid "global encoding charset"
-#~ msgstr "グローバルエンコード文字集合"
-
-#~ msgid "alt+d=back to list"
-#~ msgstr "alt+d=リストに戻る"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: サーバ %s/%d%s%s に接続中..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: サーバから切断"
diff --git a/po/pl.po b/po/pl.po
index 39a92778a..f5dbd9cdf 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-09-29 11:42+0200\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: Krzysztof Korościk <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Polish\n"
@@ -705,20 +705,36 @@ msgstr ""
 "%sNie znaleziono opcji \"%s\" (porada: możesz użyć \"*\" na początku i/lub "
 "końcu opcji, aby uzyskać listę)"
 
-msgid "No configuration option found"
-msgstr "Nie znaleziono żadnej opcji konfiguracyjnej"
+#, fuzzy
+msgid "No option found"
+msgstr "Nie znaleziono wtyczki"
 
-#, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] "Znaleziono %s%d%s opcję konfiguracyjną pasującą do wyrażenia \"%s\""
 msgstr[1] "Znaleziono %s%d%s opcje konfiguracyjne pasujące do wyrażenia \"%s\""
 msgstr[2] ""
 "Znaleziono %s%d%s opcji konfiguracyjnych pasujących do wyrażenia \"%s\""
 
-#, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+#, fuzzy, c-format
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "Znaleziono %s%d%s opcję konfiguracyjną pasującą do wyrażenia \"%s\""
+msgstr[1] "Znaleziono %s%d%s opcje konfiguracyjne pasujące do wyrażenia \"%s\""
+msgstr[2] ""
+"Znaleziono %s%d%s opcji konfiguracyjnych pasujących do wyrażenia \"%s\""
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "Znaleziono %s%d%s opcję konfiguracyjną"
+msgstr[1] "Znaleziono %s%d%s opcje konfiguracyjne"
+msgstr[2] "Znaleziono %s%d%s opcji konfiguracyjnych"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "Znaleziono %s%d%s opcję konfiguracyjną"
 msgstr[1] "Znaleziono %s%d%s opcje konfiguracyjne"
 msgstr[2] "Znaleziono %s%d%s opcji konfiguracyjnych"
@@ -727,9 +743,9 @@ msgstr[2] "Znaleziono %s%d%s opcji konfiguracyjnych"
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sBłąd: nie udało się ustawić opcji \"%s\""
 
-#, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%sBłąd: nie znaleziono opcji konfiguracyjnej \"%s\""
+#, fuzzy, c-format
+msgid "%sError: option \"%s\" not found"
+msgstr "%sBłąd: nie znaleziono wtyczki \"%s\""
 
 msgid "Option changed: "
 msgstr "Opcja zmieniona: "
@@ -1979,18 +1995,21 @@ msgstr ""
 msgid "set config options"
 msgstr "ustawia opcje konfiguracyjne"
 
-msgid "[<option> [<value>]]"
+#, fuzzy
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<opcja> [<wartość>]]"
 
+#, fuzzy
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -1999,7 +2018,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 "opcja: nazwa opcji (może zaczynać lub kończyć się \"*\" do wyświetlania "
 "wielu opcji)\n"
@@ -9461,52 +9484,3 @@ msgstr "Typ"
 
 msgid "Constants"
 msgstr "Stałe"
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "automatycznie wejdź na kanał po wykopaniu"
-
-#~ msgid "prefix for error messages"
-#~ msgstr "przedrostek informacji o błędzie"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "przedrostek informacji sieciowych"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "przedrostek informacji o akcjach"
-
-#~ msgid "prefix for join messages"
-#~ msgstr "przedrostek informacji o wejściu na kanał"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "przedrostek informacji o wyjściu"
-
-#~ msgid ""
-#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
-#~ "= window must be active, \"inactive\" = window must be inactive, "
-#~ "\"nicklist\" = buffer must have a nicklist"
-#~ msgstr ""
-#~ "warunek(-ki) wyświetlania paska (dla pasków typu \"window\"): \"active\" "
-#~ "= okno musi być aktywne, \"inactive\" = okno musi być nieaktywne, "
-#~ "\"nicklist\" = bufor musi posiadać listę nicków"
-
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "serwer: nazwa serwera\n"
-#~ "  nick: nick (może być maska)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "użyj protokołu IPv6 do komunikacji z serwerem"
-
-#~ msgid "global decoding charset"
-#~ msgstr "globalne dekodowane kodowanie"
-
-#~ msgid "global encoding charset"
-#~ msgstr "globalnie kodowanie"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: łączę z serwerem %s/%d%s%s..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: rozłączono z serwerem"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 6787e6d26..20eda117a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-09-29 11:43+0200\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:04+0100\n"
 "Last-Translator: Sergio Durigan Junior <sergiosdj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Portuguese\n"
@@ -735,18 +735,31 @@ msgstr ""
 "%sOpção \"%s\" não encontrada (dica: você pode usar \"*\" no começo e/ou fim "
 "da opção para ver uma sublista)"
 
-msgid "No configuration option found"
-msgstr "Nenhuma opção de configuração de opção encontrada"
+#, fuzzy
+msgid "No option found"
+msgstr "Nenhum plugin encontrado"
 
-#, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] "%s%d%s opção de configuração encontrada casando com \"%s\""
 msgstr[1] "%s%d%s opções de configuração encontradas casando com \"%s\""
 
-#, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+#, fuzzy, c-format
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "%s%d%s opção de configuração encontrada casando com \"%s\""
+msgstr[1] "%s%d%s opções de configuração encontradas casando com \"%s\""
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "%s%d%s opção de configuração não encontrada"
+msgstr[1] "%s%d%s opções de configuração não encontradas"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "%s%d%s opção de configuração não encontrada"
 msgstr[1] "%s%d%s opções de configuração não encontradas"
 
@@ -754,9 +767,9 @@ msgstr[1] "%s%d%s opções de configuração não encontradas"
 msgid "%sError: failed to set option \"%s\""
 msgstr "%sErro: falhou ao configurar a opção \"%s\""
 
-#, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%sErro: opção de configuração \"%s\" não encontrada"
+#, fuzzy, c-format
+msgid "%sError: option \"%s\" not found"
+msgstr "%sErro: plugin \"%s\" não encontrado"
 
 msgid "Option changed: "
 msgstr "Opção mudada: "
@@ -1944,18 +1957,21 @@ msgstr ""
 msgid "set config options"
 msgstr "define opções de configuração"
 
-msgid "[<option> [<value>]]"
+#, fuzzy
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[<opção> [<valor>]]"
 
+#, fuzzy
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -1964,7 +1980,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 "opção: nome de uma opção\n"
 "valor: novo valor para a opção\n"
@@ -8892,48 +8912,3 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
-
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "Re-entrar automaticamente em canais após ser chutado"
-
-#~ msgid "prefix for error messages"
-#~ msgstr "prefixo para mensagens de erro"
-
-#~ msgid "prefix for network messages"
-#~ msgstr "prefixo para mensagens de rede"
-
-#~ msgid "prefix for action messages"
-#~ msgstr "prefixo para mensagens de ação"
-
-# Find a better translation to "join messages" or maybe just let "join"
-# untranslated?
-#, fuzzy
-#~ msgid "prefix for join messages"
-#~ msgstr "prefixo para mensagens de join"
-
-#~ msgid "prefix for quit messages"
-#~ msgstr "prefixo para mensagens de saída"
-
-#~ msgid ""
-#~ "condition(s) for displaying bar (for bars of type \"window\"): \"active\" "
-#~ "= window must be active, \"inactive\" = window must be inactive, "
-#~ "\"nicklist\" = buffer must have a nicklist"
-#~ msgstr ""
-#~ "condição(ões) para exibição da barra (para barras do tipo \"window\"): "
-#~ "\"active\" = janela deve estar ativa, \"inactive\" = janela deve estar "
-#~ "inativa, \"nicklist\" = buffer deve possuir uma lista de apelidos"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "usar protocolo IPv6 para comunicação com o servidor"
-
-#~ msgid "global decoding charset"
-#~ msgstr "charset de decodificação global"
-
-#~ msgid "global encoding charset"
-#~ msgstr "charset de codificação global"
-
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: conectando ao servidor %s/%d%s%s..."
-
-#~ msgid "%s: disconnected from server"
-#~ msgstr "%s: desconectado do servidor"
diff --git a/po/ru.po b/po/ru.po
index 683661c03..bccbe02a4 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.4.0-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
-"PO-Revision-Date: 2012-09-29 11:43+0200\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
+"PO-Revision-Date: 2012-12-20 18:05+0100\n"
 "Last-Translator: Aleksey V Zapparov AKA ixti <ixti@member.fsf.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: Russian\n"
@@ -751,19 +751,33 @@ msgstr ""
 "и/или конце названия опции чтобы увидеть список похожих)"
 
 #, fuzzy
-msgid "No configuration option found"
-msgstr "Не найден параметр\n"
+msgid "No option found"
+msgstr "Plugin не найден\n"
 
 #, fuzzy, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] "параметров с \"%s\" найдено\n"
 msgstr[1] "параметров с \"%s\" найдено\n"
 msgstr[2] "параметров с \"%s\" найдено\n"
 
 #, fuzzy, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] "параметров с \"%s\" найдено\n"
+msgstr[1] "параметров с \"%s\" найдено\n"
+msgstr[2] "параметров с \"%s\" найдено\n"
+
+#, fuzzy, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] "параметров найдено\n"
+msgstr[1] "параметров найдено\n"
+msgstr[2] "параметров найдено\n"
+
+#, fuzzy, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] "параметров найдено\n"
 msgstr[1] "параметров найдено\n"
 msgstr[2] "параметров найдено\n"
@@ -773,8 +787,8 @@ msgid "%sError: failed to set option \"%s\""
 msgstr "%s не могу сохранить конфигурационный файл pluginов\n"
 
 #, fuzzy, c-format
-msgid "%sError: configuration option \"%s\" not found"
-msgstr "%s параметр конфигурации \"%s\" не найден\n"
+msgid "%sError: option \"%s\" not found"
+msgstr "%s plugin \"%s\" не найден\n"
 
 #, fuzzy
 msgid "Option changed: "
@@ -1656,18 +1670,19 @@ msgid "set config options"
 msgstr "настроить параметры конфигурации"
 
 #, fuzzy
-msgid "[<option> [<value>]]"
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr "[параметр [ = значение]]"
 
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -1676,7 +1691,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 
 #, fuzzy
@@ -8763,42 +8782,3 @@ msgstr ""
 
 msgid "Constants"
 msgstr ""
-
-#, fuzzy
-#~ msgid "automatically rejoin channels after kick"
-#~ msgstr "автоматически перезаходить на каналы после кика"
-
-#, fuzzy
-#~ msgid "prefix for error messages"
-#~ msgstr "выводить отладочные сообщения"
-
-#, fuzzy
-#~ msgid "prefix for action messages"
-#~ msgstr "ответить на ping"
-
-#, fuzzy
-#~ msgid "prefix for join messages"
-#~ msgstr "цвет  текущего окна с сообщениями"
-
-#, fuzzy
-#~ msgid "prefix for quit messages"
-#~ msgstr "сообщение о выходе по-умолчанию"
-
-#, fuzzy
-#~ msgid ""
-#~ "server: server name\n"
-#~ "  nick: nick (may be a mask)"
-#~ msgstr ""
-#~ "сервер: название сервера\n"
-#~ "   ник: ник (может быть маской)"
-
-#~ msgid "use IPv6 protocol for server communication"
-#~ msgstr "использовать IPv6 при связи с сервером"
-
-#, fuzzy
-#~ msgid "%s: connecting to server %s/%d%s%s..."
-#~ msgstr "%s: поключаюсь к серверу %s:%d%s%s...\n"
-
-#, fuzzy
-#~ msgid "%s: disconnected from server"
-#~ msgstr "Отключен от сервера!\n"
diff --git a/po/weechat.pot b/po/weechat.pot
index dbfb43b62..7197b3379 100644
--- a/po/weechat.pot
+++ b/po/weechat.pot
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2012-12-16 19:14+0100\n"
+"POT-Creation-Date: 2012-12-20 17:20+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -647,18 +647,30 @@ msgid ""
 "option to see a sublist)"
 msgstr ""
 
-msgid "No configuration option found"
+msgid "No option found"
 msgstr ""
 
 #, c-format
-msgid "%s%d%s configuration option found matching with \"%s\""
-msgid_plural "%s%d%s configuration options found matching with \"%s\""
+msgid "%s%d%s option with value changed (matching with \"%s\")"
+msgid_plural "%s%d%s options with value changed (matching with \"%s\")"
 msgstr[0] ""
 msgstr[1] ""
 
 #, c-format
-msgid "%s%d%s configuration option found"
-msgid_plural "%s%d%s configuration options found"
+msgid "%s%d%s option (matching with \"%s\")"
+msgid_plural "%s%d%s options (matching with \"%s\")"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s%d%s option"
+msgid_plural "%s%d%s options"
+msgstr[0] ""
+msgstr[1] ""
+
+#, c-format
+msgid "%s%d%s option with value changed"
+msgid_plural "%s%d%s options with value changed"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -667,7 +679,7 @@ msgid "%sError: failed to set option \"%s\""
 msgstr ""
 
 #, c-format
-msgid "%sError: configuration option \"%s\" not found"
+msgid "%sError: option \"%s\" not found"
 msgstr ""
 
 msgid "Option changed: "
@@ -1456,18 +1468,19 @@ msgstr ""
 msgid "set config options"
 msgstr ""
 
-msgid "[<option> [<value>]]"
+msgid "[<option> [<value>]] || diff [<option> [<option>...]]"
 msgstr ""
 
 msgid ""
 "option: name of an option (can start or end with '*' to list many options)\n"
 " value: new value for option\n"
+"  diff: display only changed options\n"
 "\n"
 "New value can be, according to variable type:\n"
 "  boolean: on, off or toggle\n"
 "  integer: number, ++number or --number\n"
-"  string : any string (\"\" for empty string)\n"
-"  color  : color name, ++number or --number\n"
+"   string: any string (\"\" for empty string)\n"
+"    color: color name, ++number or --number\n"
 "\n"
 "For all types, you can use null to remove option value (undefined value). "
 "This works only for some special plugin variables.\n"
@@ -1476,7 +1489,11 @@ msgid ""
 "  display options about highlight:\n"
 "    /set *highlight*\n"
 "  add a word to highlight:\n"
-"    /set weechat.look.highlight \"word\""
+"    /set weechat.look.highlight \"word\"\n"
+"  display changed options:\n"
+"    /set diff\n"
+"  display changed options in irc plugin:\n"
+"    /set diff irc.*"
 msgstr ""
 
 msgid "unset/reset config options"
diff --git a/src/core/wee-command.c b/src/core/wee-command.c
index 601192561..e975643d0 100644
--- a/src/core/wee-command.c
+++ b/src/core/wee-command.c
@@ -4531,7 +4531,8 @@ command_set_display_option (struct t_config_option *option,
  */
 
 int
-command_set_display_option_list (const char *message, const char *search)
+command_set_display_option_list (const char *message, const char *search,
+                                 int display_only_changed)
 {
     int number_found, section_displayed, length;
     struct t_config_file *ptr_config;
@@ -4544,6 +4545,12 @@ command_set_display_option_list (const char *message, const char *search)
     for (ptr_config = config_files; ptr_config;
          ptr_config = ptr_config->next_config)
     {
+        /*
+         * if we are displaying only changed options, skip options plugins.*
+         * because they are all "changed" (default value is always empty string)
+         */
+        if (display_only_changed && strcmp(ptr_config->name, "plugins") == 0)
+            continue;
         for (ptr_section = ptr_config->sections; ptr_section;
              ptr_section = ptr_section->next_section)
         {
@@ -4552,6 +4559,14 @@ command_set_display_option_list (const char *message, const char *search)
             for (ptr_option = ptr_section->options; ptr_option;
                  ptr_option = ptr_option->next_option)
             {
+                /*
+                 * if we are displaying only changed options, skip the option if
+                 * value has not changed (if it is the same as default value)
+                 */
+                if (display_only_changed &&
+                    !config_file_option_has_changed (ptr_option))
+                    continue;
+
                 length = strlen (ptr_config->name) + 1
                     + strlen (ptr_section->name) + 1
                     + strlen (ptr_option->name) + 1;
@@ -4584,72 +4599,159 @@ command_set_display_option_list (const char *message, const char *search)
 }
 
 /*
- * Callback for command "/set": sets configuration options.
+ * Displays multiple lists of options.
+ *
+ * If display_only_changed == 1, then it will display only options with value
+ * changed (different from default value).
+ *
+ * Returns the total number of options displayed.
  */
 
-COMMAND_CALLBACK(set)
+int
+command_set_display_option_lists (char **argv, int arg_start, int arg_end,
+                                  int display_only_changed)
 {
-    char *value;
-    int number_found, rc;
-    struct t_config_option *ptr_option, *ptr_option_before;
+    int i, total_number_found, number_found;
 
-    /* make C compiler happy */
-    (void) data;
-    (void) buffer;
+    total_number_found = 0;
 
-    /* display list of options */
-    if (argc < 3)
+    for (i = arg_start; i <= arg_end; i++)
     {
-        number_found = 0;
+        number_found = command_set_display_option_list (NULL, argv[i],
+                                                        display_only_changed);
 
-        number_found += command_set_display_option_list (NULL,
-                                                         (argc == 2) ?
-                                                         argv[1] : NULL);
+        total_number_found += number_found;
+
+        if (display_only_changed && (arg_start == arg_end))
+            break;
 
         if (number_found == 0)
         {
-            if (argc == 2)
+            if (argv[i])
             {
                 gui_chat_printf (NULL,
                                  _("%sOption \"%s\" not found (tip: you can use "
                                    "\"*\" at beginning and/or end of option to "
                                    "see a sublist)"),
                                  gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
-                                 argv[1]);
+                                 argv[i]);
             }
             else
             {
                 gui_chat_printf (NULL,
-                                 _("No configuration option found"));
+                                 _("No option found"));
             }
         }
         else
         {
             gui_chat_printf (NULL, "");
-            if (argc == 2)
+            if (argv[i])
             {
-                gui_chat_printf (NULL,
-                                 NG_("%s%d%s configuration option found "
-                                     "matching with \"%s\"",
-                                     "%s%d%s configuration options found "
-                                     "matching with \"%s\"",
-                                     number_found),
-                                 GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
-                                 number_found,
-                                 GUI_COLOR(GUI_COLOR_CHAT),
-                                 argv[1]);
+                if (display_only_changed)
+                {
+                    gui_chat_printf (NULL,
+                                     NG_("%s%d%s option with value changed "
+                                         "(matching with \"%s\")",
+                                         "%s%d%s options with value changed "
+                                         "(matching with \"%s\")",
+                                         number_found),
+                                     GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
+                                     number_found,
+                                     GUI_COLOR(GUI_COLOR_CHAT),
+                                     argv[i]);
+                }
+                else
+                {
+                    gui_chat_printf (NULL,
+                                     NG_("%s%d%s option (matching with \"%s\")",
+                                         "%s%d%s options (matching with \"%s\")",
+                                         number_found),
+                                     GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
+                                     number_found,
+                                     GUI_COLOR(GUI_COLOR_CHAT),
+                                     argv[i]);
+                }
             }
             else
             {
                 gui_chat_printf (NULL,
-                                 NG_("%s%d%s configuration option found",
-                                     "%s%d%s configuration options found",
+                                 NG_("%s%d%s option",
+                                     "%s%d%s options",
                                      number_found),
                                  GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
                                  number_found,
                                  GUI_COLOR(GUI_COLOR_CHAT));
             }
         }
+    }
+
+    return total_number_found;
+}
+
+/*
+ * Callback for command "/set": displays or sets configuration options.
+ */
+
+COMMAND_CALLBACK(set)
+{
+    char *value;
+    int number_found, rc, display_only_changed, arg_option_start, arg_option_end;
+    struct t_config_option *ptr_option, *ptr_option_before;
+
+    /* make C compiler happy */
+    (void) data;
+    (void) buffer;
+
+    display_only_changed = 0;
+    arg_option_start = 1;
+    arg_option_end = argc - 1;
+
+    /* if "diff" is specified as first argument, display only changed values */
+    if ((argc >= 2) && (string_strcasecmp (argv[1], "diff") == 0))
+    {
+        display_only_changed = 1;
+        arg_option_start = 2;
+    }
+
+    if (arg_option_end < arg_option_start)
+        arg_option_end = arg_option_start;
+
+    /* display list of options */
+    if ((argc < 3) || display_only_changed)
+    {
+        number_found = command_set_display_option_lists (argv,
+                                                         arg_option_start,
+                                                         arg_option_end,
+                                                         display_only_changed);
+
+        if (display_only_changed)
+        {
+            gui_chat_printf (NULL, "");
+            if (arg_option_start == argc - 1)
+            {
+                gui_chat_printf (NULL,
+                                 NG_("%s%d%s option with value changed "
+                                     "(matching with \"%s\")",
+                                     "%s%d%s options with value changed "
+                                     "(matching with \"%s\")",
+                                     number_found),
+                                 GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
+                                 number_found,
+                                 GUI_COLOR(GUI_COLOR_CHAT),
+                                 argv[arg_option_start]);
+            }
+            else
+            {
+                gui_chat_printf (NULL,
+                                 NG_("%s%d%s option with value changed",
+                                     "%s%d%s options with value changed",
+                                     number_found),
+                                 GUI_COLOR(GUI_COLOR_CHAT_BUFFER),
+                                 number_found,
+                                 GUI_COLOR(GUI_COLOR_CHAT));
+            }
+        }
+
         return WEECHAT_RC_OK;
     }
 
@@ -4671,8 +4773,7 @@ COMMAND_CALLBACK(set)
             return WEECHAT_RC_OK;
         case WEECHAT_CONFIG_OPTION_SET_OPTION_NOT_FOUND:
             gui_chat_printf (NULL,
-                             _("%sError: configuration option \"%s\" not "
-                               "found"),
+                             _("%sError: option \"%s\" not found"),
                              gui_chat_prefix[GUI_CHAT_PREFIX_ERROR],
                              argv[1]);
             return WEECHAT_RC_OK;
@@ -4693,7 +4794,6 @@ COMMAND_CALLBACK(set)
 
     return WEECHAT_RC_OK;
 }
-
 /*
  * Callback for command "/unset": unsets/resets configuration options.
  */
@@ -6359,15 +6459,16 @@ command_init ()
                   &command_save, NULL);
     hook_command (NULL, "set",
                   N_("set config options"),
-                  N_("[<option> [<value>]]"),
+                  N_("[<option> [<value>]] || diff [<option> [<option>...]]"),
                   N_("option: name of an option (can start or end with '*' "
                      "to list many options)\n"
-                     " value: new value for option\n\n"
+                     " value: new value for option\n"
+                     "  diff: display only changed options\n\n"
                      "New value can be, according to variable type:\n"
                      "  boolean: on, off or toggle\n"
                      "  integer: number, ++number or --number\n"
-                     "  string : any string (\"\" for empty string)\n"
-                     "  color  : color name, ++number or --number\n\n"
+                     "   string: any string (\"\" for empty string)\n"
+                     "    color: color name, ++number or --number\n\n"
                      "For all types, you can use null to remove "
                      "option value (undefined value). This works only "
                      "for some special plugin variables.\n\n"
@@ -6375,7 +6476,11 @@ command_init ()
                      "  display options about highlight:\n"
                      "    /set *highlight*\n"
                      "  add a word to highlight:\n"
-                     "    /set weechat.look.highlight \"word\""),
+                     "    /set weechat.look.highlight \"word\"\n"
+                     "  display changed options:\n"
+                     "    /set diff\n"
+                     "  display changed options in irc plugin:\n"
+                     "    /set diff irc.*"),
                   "%(config_options) %(config_option_values)",
                   &command_set, NULL);
     hook_command (NULL, "unset",
diff --git a/src/core/wee-config-file.c b/src/core/wee-config-file.c
index 8acb613d0..cf310a3e9 100644
--- a/src/core/wee-config-file.c
+++ b/src/core/wee-config-file.c
@@ -1605,6 +1605,47 @@ config_file_option_default_is_null (struct t_config_option *option)
     return (option->default_value) ? 0 : 1;
 }
 
+/*
+ * Checks if an option has changed (current value different from default value).
+ *
+ * Returns:
+ *   1: option has changed
+ *   0: option has default value
+ */
+
+int config_file_option_has_changed (struct t_config_option *option)
+{
+    /* both default and current value are null => not changed */
+    if (!option->default_value && !option->value)
+        return 0;
+
+    /* default is null and current value is not null => changed! */
+    if (!option->default_value && option->value)
+        return 1;
+
+    /* default is not null and current value is null => changed! */
+    if (option->default_value && !option->value)
+        return 1;
+
+    /* both default and current value are not null, compare their values */
+    switch (option->type)
+    {
+        case CONFIG_OPTION_TYPE_BOOLEAN:
+            return CONFIG_BOOLEAN(option) != CONFIG_BOOLEAN_DEFAULT(option);
+        case CONFIG_OPTION_TYPE_INTEGER:
+            return CONFIG_INTEGER(option) != CONFIG_INTEGER_DEFAULT(option);
+        case CONFIG_OPTION_TYPE_STRING:
+            return strcmp(CONFIG_STRING(option), CONFIG_STRING_DEFAULT(option)) != 0;
+        case CONFIG_OPTION_TYPE_COLOR:
+            return CONFIG_COLOR(option) != CONFIG_COLOR_DEFAULT(option);
+        case CONFIG_NUM_OPTION_TYPES:
+            /* make C compiler happy */
+            break;
+    }
+
+    return 0;
+}
+
 /*
  * Sets the value for an option using a full name of option (format:
  * "file.section.option").
diff --git a/src/core/wee-config-file.h b/src/core/wee-config-file.h
index 7c87a853c..61f9606e5 100644
--- a/src/core/wee-config-file.h
+++ b/src/core/wee-config-file.h
@@ -226,6 +226,7 @@ extern void *config_file_option_get_pointer (struct t_config_option *option,
                                              const char *property);
 extern int config_file_option_is_null (struct t_config_option *option);
 extern int config_file_option_default_is_null (struct t_config_option *option);
+extern int config_file_option_has_changed (struct t_config_option *option);
 extern int config_file_option_set_with_string (const char *option_name, const char *value);
 extern int config_file_option_boolean (struct t_config_option *option);
 extern int config_file_option_boolean_default (struct t_config_option *option);