Add of "modifier" hook, migration of charset plugin to new API, SIGHUP signal catched (reload all config files), better config files reloading

9 files changed, 756 insertions, 297 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 80368b825..092baa433 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -80,6 +80,7 @@
 ./src/plugins/aspell/aspell.c
 ./src/plugins/aspell/aspell.h
 ./src/plugins/charset/charset.c
+./src/plugins/charset/charset.h
 ./src/plugins/demo/demo.c
 ./src/plugins/fifo/fifo.c
 ./src/plugins/irc/irc-buffer.c
diff --git a/po/cs.po b/po/cs.po
index dcee9250c..36bb311f1 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-19 17:18+0100\n"
+"POT-Creation-Date: 2008-01-24 16:42+0100\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -218,7 +218,7 @@ msgid "Key:"
 msgstr "Klávesa: \n"
 
 #, fuzzy
-msgid "No key found."
+msgid "No key found"
 msgstr "Žádná klávesa nenalezena.\n"
 
 #, fuzzy, c-format
@@ -305,7 +305,11 @@ msgid "    completions hooked:"
 msgstr "     obsluhovače příkazu:\n"
 
 #, fuzzy
-msgid "No plugin found."
+msgid "    modifiers hooked:"
+msgstr "     obsluhovače časovače:\n"
+
+#, fuzzy
+msgid "No plugin found"
 msgstr "Nebyl nalezen žádný plugin\n"
 
 #, fuzzy
@@ -321,35 +325,19 @@ msgid "%sError: wrong argument count for \"%s\" command"
 msgstr "%s špatný počet parametrů pro příkaz \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file reloaded"
-msgstr "Konfigurační soubor uložen\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to reload WeeChat configuration file"
-msgstr "%s selhalo uložení konfiguračního souboru\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options reloaded"
+msgid "%sOptions reloaded from %s"
 msgstr "Možnosti pluginů uloženy\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to reload plugins options"
+msgid "%sError: failed to reload options from %s"
 msgstr "%s selhalo uložení nastavení pluginů\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file saved"
-msgstr "Konfigurační soubor uložen\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to save WeeChat configuration file"
-msgstr "%s selhalo uložení konfiguračního souboru\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options saved"
+msgid "%sOptions saved to %s"
 msgstr "Možnosti pluginů uloženy\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to save plugins options"
+msgid "%sError: failed to save options to %s"
 msgstr "%s selhalo uložení nastavení pluginů\n"
 
 msgid "(unknown)"
@@ -439,7 +427,7 @@ msgstr "konec /who seznamu"
 #, fuzzy, c-format
 msgid ""
 "%sError: can not merge windows, there's no other window with same size near "
-"current one."
+"current one"
 msgstr ""
 "%s nemohu spojit okna, není zde další okno se stejnou velikostí poblíž "
 "aktuálního okna.\n"
@@ -1308,8 +1296,8 @@ msgid ""
 "\".dll\" under Microsoft Windows)"
 msgstr ""
 
-#, fuzzy
-msgid "Saving WeeChat configuration to disk"
+#, fuzzy, c-format
+msgid "Saving WeeChat configuration to disk (%s)"
 msgstr "Ukládám konfiguraci na disk\n"
 
 #, fuzzy, c-format
@@ -1673,14 +1661,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s cyklický odkaz při volání aliasu \"/%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: configuration file reloaded"
-msgstr "Konfigurační soubor uložen\n"
-
-#, fuzzy, c-format
-msgid "%s%s: failed to reload configuration file"
-msgstr "%s selhalo uložení konfiguračního souboru\n"
-
-#, fuzzy, c-format
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s nedostatek paměti pro infobar zprávu\n"
 
@@ -1748,6 +1728,70 @@ msgstr "jméno_aliasu"
 msgid "alias_name: name of alias to remove"
 msgstr "jméno_aliasu: jméno aliasu pro odebrání"
 
+#, fuzzy, c-format
+msgid "%s%s: error creating charset \"%s\" => \"%s\""
+msgstr "%s nedostatek paměti pro infobar zprávu\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" => \"%s\""
+msgstr "Alias \"%s\" => \"%s\" vytvořen\n"
+
+#, fuzzy, c-format
+msgid "%s%s: charset \"%s\" not found"
+msgstr "%s server \"%s\" nenalezen\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" removed"
+msgstr "Alias \"%s\" odebrán\n"
+
+#, fuzzy
+msgid "List of charsets:"
+msgstr "Seznam pro aliasy:\n"
+
+#, fuzzy, c-format
+msgid "List of charsets with \"%s\":"
+msgstr "Seznam pro aliasy:\n"
+
+#, fuzzy
+msgid "No charset found"
+msgstr "Žádná klávesa nenalezena.\n"
+
+#, fuzzy
+msgid "No charset defined"
+msgstr "Žádné aliasy nejsou definovány.\n"
+
+#, fuzzy, c-format
+msgid "%s%s: terminal: %s, internal: %s"
+msgstr "%s plugin \"%s\" nenalezen\n"
+
+#, fuzzy, c-format
+msgid "%s%s: error creating configuration file \"%s\""
+msgstr "říct serveru, aby znovu načetl svůj konfigurační soubor"
+
+#, fuzzy
+msgid "manage charsets"
+msgstr "řídit buffery"
+
+msgid "[[type.]plugin.string [= charset]]"
+msgstr ""
+
+msgid ""
+"   type: \"decode\" or \"encode\" (if type is omitted, then both \"decode\" "
+"and \"encode\" are set)\n"
+" plugin: plugin name\n"
+" string: string specific to plugin (for example a server name or server."
+"channel for IRC plugin)\n"
+"charset: charset to use (if empty, then charset is removed)\n"
+"\n"
+"Examples :\n"
+"/charset decode iso-8859-15 => set global decode charset to iso-8859-15\n"
+"/charset encode iso-8859-15 => set global encode charset to iso-8859-15\n"
+"/charset decode.irc.freenode => set decode charset to iso-8859-15 for IRC "
+"server \"freenode\" (all channels)\n"
+"/charset decode.irc.freenode.#weechat => set decode charset to iso-8859-15 "
+"for IRC channel \"#weechat\" on server \"freenode\""
+msgstr ""
+
 msgid "demo message without prefix"
 msgstr ""
 
@@ -2775,6 +2819,12 @@ msgstr ""
 msgid "%sirc: too few arguments for \"%s\" command"
 msgstr "%s špatné parametry pro příkaz \"%s\"\n"
 
+#, c-format
+msgid ""
+"%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
+"memory because it's currently used"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: value \"%s\" is invalid for option \"%s\""
 msgstr "%s %s, řádek %d: nevalidní volba \"%s\"\n"
@@ -3021,12 +3071,6 @@ msgstr ""
 "(formát: #kanál:1,..), jméno serveru '*' je rezervováno pro defaultní "
 "hodnotu levelu upozornění"
 
-#, c-format
-msgid ""
-"%s%s: warning: server \"%s\" not found in configuration file. It has not "
-"been deleted because it's used now."
-msgstr ""
-
 msgid "Waiting"
 msgstr "Čekám"
 
@@ -3911,7 +3955,7 @@ msgid "%s%s: no command to execute"
 msgstr "%s Žádný příkaz pro provedení!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\""
+msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", arguments=\"%s\""
 msgstr "%s Neznámý příkaz: příkaz=\"%s\", host=\"%s\", parametry=\"%s\"\n"
 
 #, fuzzy, c-format
@@ -4293,6 +4337,30 @@ msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s špatné parametry pro příkaz \"%s\"\n"
 
 #, fuzzy
+#~ msgid "%sWeeChat configuration file reloaded"
+#~ msgstr "Konfigurační soubor uložen\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to reload WeeChat configuration file"
+#~ msgstr "%s selhalo uložení konfiguračního souboru\n"
+
+#, fuzzy
+#~ msgid "%sWeeChat configuration file saved"
+#~ msgstr "Konfigurační soubor uložen\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to save WeeChat configuration file"
+#~ msgstr "%s selhalo uložení konfiguračního souboru\n"
+
+#, fuzzy
+#~ msgid "%s%s: configuration file reloaded"
+#~ msgstr "Konfigurační soubor uložen\n"
+
+#, fuzzy
+#~ msgid "%s%s: failed to reload configuration file"
+#~ msgstr "%s selhalo uložení konfiguračního souboru\n"
+
+#, fuzzy
 #~ msgid "clear buffer(s)"
 #~ msgstr "  [C] Vyčistit buffer"
 
diff --git a/po/de.po b/po/de.po
index 9f5ff4472..79cbe6adb 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-19 17:18+0100\n"
+"POT-Creation-Date: 2008-01-24 16:42+0100\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Thomas Schuetz <i18n@internet-villa.de>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -224,7 +224,7 @@ msgid "Key:"
 msgstr "Taste:\n"
 
 #, fuzzy
-msgid "No key found."
+msgid "No key found"
 msgstr "Keine Taste gefunden.\n"
 
 #, fuzzy, c-format
@@ -311,7 +311,11 @@ msgid "    completions hooked:"
 msgstr "     Befehls-Handler:\n"
 
 #, fuzzy
-msgid "No plugin found."
+msgid "    modifiers hooked:"
+msgstr "     Timer-Handler:\n"
+
+#, fuzzy
+msgid "No plugin found"
 msgstr "Kein Plugin gefunden.\n"
 
 #, fuzzy
@@ -327,35 +331,19 @@ msgid "%sError: wrong argument count for \"%s\" command"
 msgstr "%s fehlerhafte Anzahl von Argumenten für der \"%s\"-Befehl\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file reloaded"
-msgstr "Konfigurationsdatei gesichert\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to reload WeeChat configuration file"
-msgstr "%s konnte die Konfigurationsdatei nicht sichern\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options reloaded"
+msgid "%sOptions reloaded from %s"
 msgstr "Plugin-Optionen gesichert\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to reload plugins options"
+msgid "%sError: failed to reload options from %s"
 msgstr "%s konnte die Plugin-Konfigurationsdatei nicht sichern\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file saved"
-msgstr "Konfigurationsdatei gesichert\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to save WeeChat configuration file"
-msgstr "%s konnte die Konfigurationsdatei nicht sichern\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options saved"
+msgid "%sOptions saved to %s"
 msgstr "Plugin-Optionen gesichert\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to save plugins options"
+msgid "%sError: failed to save options to %s"
 msgstr "%s konnte die Plugin-Konfigurationsdatei nicht sichern\n"
 
 msgid "(unknown)"
@@ -447,7 +435,7 @@ msgstr "Ende der /who-Liste"
 #, fuzzy, c-format
 msgid ""
 "%sError: can not merge windows, there's no other window with same size near "
-"current one."
+"current one"
 msgstr ""
 "%s kann Fenster nicht vereinigen, es ist kein Fenster mit der gleichen Größe "
 "in der Nähe des aktuellen Fensters.\n"
@@ -1299,8 +1287,8 @@ msgid ""
 "\".dll\" under Microsoft Windows)"
 msgstr ""
 
-#, fuzzy
-msgid "Saving WeeChat configuration to disk"
+#, fuzzy, c-format
+msgid "Saving WeeChat configuration to disk (%s)"
 msgstr "Konfiguration wird gespeichert\n"
 
 #, fuzzy, c-format
@@ -1676,14 +1664,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s Zirkelbezug beim Aufruf des Aliases \"/%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: configuration file reloaded"
-msgstr "Konfigurationsdatei gesichert\n"
-
-#, fuzzy, c-format
-msgid "%s%s: failed to reload configuration file"
-msgstr "%s konnte die Konfigurationsdatei nicht sichern\n"
-
-#, fuzzy, c-format
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s nicht genügend Speicher für Infobar-Nachricht\n"
 
@@ -1751,6 +1731,70 @@ msgstr "Aliasname"
 msgid "alias_name: name of alias to remove"
 msgstr "Aliasname: Name des zu löschenden Aliases"
 
+#, fuzzy, c-format
+msgid "%s%s: error creating charset \"%s\" => \"%s\""
+msgstr "%s nicht genügend Speicher für Infobar-Nachricht\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" => \"%s\""
+msgstr "Alias \"%s\" => \"%s\" angelegt\n"
+
+#, fuzzy, c-format
+msgid "%s%s: charset \"%s\" not found"
+msgstr "%s Server \"%s\" nicht gefunden\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" removed"
+msgstr "Alias \"%s\" entfernt\n"
+
+#, fuzzy
+msgid "List of charsets:"
+msgstr "Liste der Aliases:\n"
+
+#, fuzzy, c-format
+msgid "List of charsets with \"%s\":"
+msgstr "Liste der Aliases:\n"
+
+#, fuzzy
+msgid "No charset found"
+msgstr "Keine Taste gefunden.\n"
+
+#, fuzzy
+msgid "No charset defined"
+msgstr "Keine Aliases definiert.\n"
+
+#, fuzzy, c-format
+msgid "%s%s: terminal: %s, internal: %s"
+msgstr "%s Plugin \"%s\" nicht gefunden\n"
+
+#, fuzzy, c-format
+msgid "%s%s: error creating configuration file \"%s\""
+msgstr "den Server dazu bringen, seine Konfigurationsdatei neu zu laden"
+
+#, fuzzy
+msgid "manage charsets"
+msgstr "Puffer verwalten"
+
+msgid "[[type.]plugin.string [= charset]]"
+msgstr ""
+
+msgid ""
+"   type: \"decode\" or \"encode\" (if type is omitted, then both \"decode\" "
+"and \"encode\" are set)\n"
+" plugin: plugin name\n"
+" string: string specific to plugin (for example a server name or server."
+"channel for IRC plugin)\n"
+"charset: charset to use (if empty, then charset is removed)\n"
+"\n"
+"Examples :\n"
+"/charset decode iso-8859-15 => set global decode charset to iso-8859-15\n"
+"/charset encode iso-8859-15 => set global encode charset to iso-8859-15\n"
+"/charset decode.irc.freenode => set decode charset to iso-8859-15 for IRC "
+"server \"freenode\" (all channels)\n"
+"/charset decode.irc.freenode.#weechat => set decode charset to iso-8859-15 "
+"for IRC channel \"#weechat\" on server \"freenode\""
+msgstr ""
+
 msgid "demo message without prefix"
 msgstr ""
 
@@ -2753,6 +2797,12 @@ msgstr ""
 msgid "%sirc: too few arguments for \"%s\" command"
 msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n"
 
+#, c-format
+msgid ""
+"%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
+"memory because it's currently used"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: value \"%s\" is invalid for option \"%s\""
 msgstr "%s %s, Zeile %d: ungültige Option \"%s\"\n"
@@ -3010,12 +3060,6 @@ msgstr ""
 "Server (Format: #channel:1,...), der Channelname '*' ist für den Default-"
 "Server-Notify-Level"
 
-#, c-format
-msgid ""
-"%s%s: warning: server \"%s\" not found in configuration file. It has not "
-"been deleted because it's used now."
-msgstr ""
-
 msgid "Waiting"
 msgstr "warten"
 
@@ -3905,7 +3949,7 @@ msgid "%s%s: no command to execute"
 msgstr "%s Kein Befehl zum Ausführen!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\""
+msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", arguments=\"%s\""
 msgstr "%s Unbekannter Befehl: cmd=\"%s\", host=\"%s\", args=\"%s\"\n"
 
 #, fuzzy, c-format
@@ -4289,6 +4333,30 @@ msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s fehlerhafte Argumente für der \"%s\"-Befehl\n"
 
 #, fuzzy
+#~ msgid "%sWeeChat configuration file reloaded"
+#~ msgstr "Konfigurationsdatei gesichert\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to reload WeeChat configuration file"
+#~ msgstr "%s konnte die Konfigurationsdatei nicht sichern\n"
+
+#, fuzzy
+#~ msgid "%sWeeChat configuration file saved"
+#~ msgstr "Konfigurationsdatei gesichert\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to save WeeChat configuration file"
+#~ msgstr "%s konnte die Konfigurationsdatei nicht sichern\n"
+
+#, fuzzy
+#~ msgid "%s%s: configuration file reloaded"
+#~ msgstr "Konfigurationsdatei gesichert\n"
+
+#, fuzzy
+#~ msgid "%s%s: failed to reload configuration file"
+#~ msgstr "%s konnte die Konfigurationsdatei nicht sichern\n"
+
+#, fuzzy
 #~ msgid "clear buffer(s)"
 #~ msgstr "  [C] Puffer löschen"
 
diff --git a/po/es.po b/po/es.po
index 024d42a0a..7161cad32 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-19 17:18+0100\n"
+"POT-Creation-Date: 2008-01-24 16:42+0100\n"
 "PO-Revision-Date: 2007-09-19 12:09+0200\n"
 "Last-Translator: Roberto González Cardenete <robert.glez@gmail.com>\n"
 "Language-Team:  weechat-dev <weechat-dev@nongnu.org>\n"
@@ -220,7 +220,7 @@ msgid "Key:"
 msgstr ""
 
 #, fuzzy
-msgid "No key found."
+msgid "No key found"
 msgstr "Ningún alias definido.\n"
 
 #, fuzzy, c-format
@@ -307,7 +307,11 @@ msgid "    completions hooked:"
 msgstr "     manejadores de comando:\n"
 
 #, fuzzy
-msgid "No plugin found."
+msgid "    modifiers hooked:"
+msgstr "     manejadores de temporización:\n"
+
+#, fuzzy
+msgid "No plugin found"
 msgstr "Ninguna opción de plugin encontrada\n"
 
 #, fuzzy
@@ -323,35 +327,19 @@ msgid "%sError: wrong argument count for \"%s\" command"
 msgstr "%s número de argumentos incorrecto para el comando \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file reloaded"
-msgstr "Archivo de configuración guardado\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to reload WeeChat configuration file"
-msgstr "%s falló al salvar el archivo de configuración\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options reloaded"
+msgid "%sOptions reloaded from %s"
 msgstr "opción/opciones de plugin encontrada(s)\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to reload plugins options"
-msgstr "%s falló al salvar el archivo de configuración\n"
-
-#, fuzzy, c-format
-msgid "%sWeeChat configuration file saved"
-msgstr "Archivo de configuración guardado\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to save WeeChat configuration file"
+msgid "%sError: failed to reload options from %s"
 msgstr "%s falló al salvar el archivo de configuración\n"
 
 #, fuzzy, c-format
-msgid "%sPlugins options saved"
+msgid "%sOptions saved to %s"
 msgstr "opción/opciones de plugin encontrada(s)\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to save plugins options"
+msgid "%sError: failed to save options to %s"
 msgstr "%s falló al salvar el archivo de configuración\n"
 
 msgid "(unknown)"
@@ -444,7 +432,7 @@ msgstr "fin de la lista /who"
 #, fuzzy, c-format
 msgid ""
 "%sError: can not merge windows, there's no other window with same size near "
-"current one."
+"current one"
 msgstr ""
 "%s no puede fusionar ventanas, no hay ninguna otra ventana con el mismo tamaÃ"
 "±o que la actual.\n"
@@ -1294,8 +1282,8 @@ msgid ""
 "\".dll\" under Microsoft Windows)"
 msgstr ""
 
-#, fuzzy
-msgid "Saving WeeChat configuration to disk"
+#, fuzzy, c-format
+msgid "Saving WeeChat configuration to disk (%s)"
 msgstr "Guardar configuración a disco\n"
 
 #, fuzzy, c-format
@@ -1668,14 +1656,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s referencia circular al llamar alias \"/%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: configuration file reloaded"
-msgstr "Archivo de configuración guardado\n"
-
-#, fuzzy, c-format
-msgid "%s%s: failed to reload configuration file"
-msgstr "%s falló al salvar el archivo de configuración\n"
-
-#, fuzzy, c-format
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr ""
 "No hay suficiente memoria para el mensaje de la barra de información\n"
@@ -1737,6 +1717,71 @@ msgstr "alias"
 msgid "alias_name: name of alias to remove"
 msgstr "alias: nombre del alias a suprimir"
 
+#, fuzzy, c-format
+msgid "%s%s: error creating charset \"%s\" => \"%s\""
+msgstr ""
+"No hay suficiente memoria para el mensaje de la barra de información\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" => \"%s\""
+msgstr "Alias \"%s\" => \"%s\" creado\n"
+
+#, fuzzy, c-format
+msgid "%s%s: charset \"%s\" not found"
+msgstr "%s servidor \"%s\" no encontrado\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" removed"
+msgstr "Alias \"%s\" eliminado\n"
+
+#, fuzzy
+msgid "List of charsets:"
+msgstr "Lista de alias:\n"
+
+#, fuzzy, c-format
+msgid "List of charsets with \"%s\":"
+msgstr "Lista de alias:\n"
+
+#, fuzzy
+msgid "No charset found"
+msgstr "Ningún alias definido.\n"
+
+#, fuzzy
+msgid "No charset defined"
+msgstr "Ningún alias definido.\n"
+
+#, fuzzy, c-format
+msgid "%s%s: terminal: %s, internal: %s"
+msgstr "%s plugin \"%s\" no encontrado\n"
+
+#, fuzzy, c-format
+msgid "%s%s: error creating configuration file \"%s\""
+msgstr "pedir al servidor que recargue su archivo de configuración"
+
+#, fuzzy
+msgid "manage charsets"
+msgstr "gestionar los búfers"
+
+msgid "[[type.]plugin.string [= charset]]"
+msgstr ""
+
+msgid ""
+"   type: \"decode\" or \"encode\" (if type is omitted, then both \"decode\" "
+"and \"encode\" are set)\n"
+" plugin: plugin name\n"
+" string: string specific to plugin (for example a server name or server."
+"channel for IRC plugin)\n"
+"charset: charset to use (if empty, then charset is removed)\n"
+"\n"
+"Examples :\n"
+"/charset decode iso-8859-15 => set global decode charset to iso-8859-15\n"
+"/charset encode iso-8859-15 => set global encode charset to iso-8859-15\n"
+"/charset decode.irc.freenode => set decode charset to iso-8859-15 for IRC "
+"server \"freenode\" (all channels)\n"
+"/charset decode.irc.freenode.#weechat => set decode charset to iso-8859-15 "
+"for IRC channel \"#weechat\" on server \"freenode\""
+msgstr ""
+
 msgid "demo message without prefix"
 msgstr ""
 
@@ -2756,6 +2801,12 @@ msgstr ""
 msgid "%sirc: too few arguments for \"%s\" command"
 msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
 
+#, c-format
+msgid ""
+"%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
+"memory because it's currently used"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: value \"%s\" is invalid for option \"%s\""
 msgstr "%s %s, línea %d: opción \"%s\" inválida\n"
@@ -3013,12 +3064,6 @@ msgstr ""
 "lista separada por comas de niveles de notificación para canales de este "
 "servidor (formato: #canal:1,...)"
 
-#, c-format
-msgid ""
-"%s%s: warning: server \"%s\" not found in configuration file. It has not "
-"been deleted because it's used now."
-msgstr ""
-
 msgid "Waiting"
 msgstr "Esperando"
 
@@ -3919,7 +3964,7 @@ msgid "%s%s: no command to execute"
 msgstr "%s ¡Ningún comando para ejecutar!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\""
+msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", arguments=\"%s\""
 msgstr "%s Comando desconocido: cmd=\"%s\", host=\"%s\", params=\"%s\"\n"
 
 #, fuzzy, c-format
@@ -4304,6 +4349,30 @@ msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s argumentos incorrectos para el comando \"%s\"\n"
 
 #, fuzzy
+#~ msgid "%sWeeChat configuration file reloaded"
+#~ msgstr "Archivo de configuración guardado\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to reload WeeChat configuration file"
+#~ msgstr "%s falló al salvar el archivo de configuración\n"
+
+#, fuzzy
+#~ msgid "%sWeeChat configuration file saved"
+#~ msgstr "Archivo de configuración guardado\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to save WeeChat configuration file"
+#~ msgstr "%s falló al salvar el archivo de configuración\n"
+
+#, fuzzy
+#~ msgid "%s%s: configuration file reloaded"
+#~ msgstr "Archivo de configuración guardado\n"
+
+#, fuzzy
+#~ msgid "%s%s: failed to reload configuration file"
+#~ msgstr "%s falló al salvar el archivo de configuración\n"
+
+#, fuzzy
 #~ msgid "clear buffer(s)"
 #~ msgstr "saltar al búfer DCC"
 
diff --git a/po/fr.po b/po/fr.po
index ccf992bf9..aee6029fc 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-19 17:18+0100\n"
-"PO-Revision-Date: 2008-01-19 17:19+0100\n"
+"POT-Creation-Date: 2008-01-24 16:42+0100\n"
+"PO-Revision-Date: 2008-01-24 16:42+0100\n"
 "Last-Translator: FlashCode <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "MIME-Version: 1.0\n"
@@ -204,8 +204,8 @@ msgstr "%sErreur: fonction de touche \"%s\" inconnue"
 msgid "Key:"
 msgstr "Touche:"
 
-msgid "No key found."
-msgstr "Aucune touche trouvée."
+msgid "No key found"
+msgstr "Aucune touche trouvée"
 
 #, c-format
 msgid "%sError: unable to bind key \"%s\""
@@ -279,8 +279,11 @@ msgstr "    options de configuration accrochées:"
 msgid "    completions hooked:"
 msgstr "    completion accrochées:"
 
-msgid "No plugin found."
-msgstr "Aucune extension trouvée."
+msgid "    modifiers hooked:"
+msgstr "    modificateurs accrochés:"
+
+msgid "No plugin found"
+msgstr "Aucune extension trouvée"
 
 msgid "  (no plugin)"
 msgstr "  (aucune extension)"
@@ -294,36 +297,20 @@ msgid "%sError: wrong argument count for \"%s\" command"
 msgstr "%sErreur: nombre de paramètres erroné pour la commande \"%s\""
 
 #, c-format
-msgid "%sWeeChat configuration file reloaded"
-msgstr "%sFichier de configuration WeeChat rechargé"
-
-#, c-format
-msgid "%sError: failed to reload WeeChat configuration file"
-msgstr "%sErreur: impossible de recharger le fichier de configuration WeeChat"
-
-#, c-format
-msgid "%sPlugins options reloaded"
-msgstr "%sOptions des extensions rechargées"
-
-#, c-format
-msgid "%sError: failed to reload plugins options"
-msgstr "%sErreur: impossible de recharger les options des extensions"
+msgid "%sOptions reloaded from %s"
+msgstr "%sOptions rechargées depuis %s"
 
 #, c-format
-msgid "%sWeeChat configuration file saved"
-msgstr "%sFichier de configuration WeeChat sauvé"
+msgid "%sError: failed to reload options from %s"
+msgstr "%sErreur: impossible de recharger les options depuis %s"
 
 #, c-format
-msgid "%sError: failed to save WeeChat configuration file"
-msgstr "%sErreur: impossible de sauver le fichier de configuration WeeChat"
+msgid "%sOptions saved to %s"
+msgstr "%sOptions sauvées dans %s"
 
 #, c-format
-msgid "%sPlugins options saved"
-msgstr "%sOptions des extensions sauvées"
-
-#, c-format
-msgid "%sError: failed to save plugins options"
-msgstr "%sErreur: impossible de sauver les options des extensions"
+msgid "%sError: failed to save options to %s"
+msgstr "%sErreur: impossible de sauver les options dans %s"
 
 msgid "(unknown)"
 msgstr "(inconnu)"
@@ -408,10 +395,10 @@ msgstr "Liste des fenêtres:"
 #, c-format
 msgid ""
 "%sError: can not merge windows, there's no other window with same size near "
-"current one."
+"current one"
 msgstr ""
 "%sErreur: impossible de fusionner les fenêtres, aucun autre fenêtre avec la "
-"même taille à coté de la fenêtre actuelle."
+"même taille à coté de la fenêtre actuelle"
 
 msgid "manage buffers"
 msgstr "gestion des tampons"
@@ -1210,8 +1197,9 @@ msgstr ""
 "extension par défaut des extensions (par example \".so\" sous Linux ou \".dll"
 "\" sous Microsoft Windows)"
 
-msgid "Saving WeeChat configuration to disk"
-msgstr "Sauvegarde de la configuration WeeChat sur disque"
+#, c-format
+msgid "Saving WeeChat configuration to disk (%s)"
+msgstr "Sauvegarde de la configuration WeeChat sur disque (%s)"
 
 #, c-format
 msgid "%sError: cannot create file \"%s\""
@@ -1574,14 +1562,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s%s: erreur, référence circulaire lors de l'appel à l'alias \"%s\""
 
 #, c-format
-msgid "%s%s: configuration file reloaded"
-msgstr "%s%s: fichier de configuration rechargé"
-
-#, c-format
-msgid "%s%s: failed to reload configuration file"
-msgstr "%s%s: impossible de recharger le fichier de configuration"
-
-#, c-format
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s%s: erreur en création de l'alias \"%s\" => \"%s\""
 
@@ -1646,6 +1626,83 @@ msgstr "nom_alias"
 msgid "alias_name: name of alias to remove"
 msgstr "nom_alias: nom de l'alias à supprimer"
 
+#, c-format
+msgid "%s%s: error creating charset \"%s\" => \"%s\""
+msgstr "%s%s: erreur en création du charset \"%s\" => \"%s\""
+
+#, c-format
+msgid "%sCharset \"%s\" => \"%s\""
+msgstr "%sCharset \"%s\" => \"%s\""
+
+#, c-format
+msgid "%s%s: charset \"%s\" not found"
+msgstr "%s%s: charset \"%s\" non trouvé"
+
+#, c-format
+msgid "%sCharset \"%s\" removed"
+msgstr "%sCharset \"%s\" supprimé"
+
+msgid "List of charsets:"
+msgstr "Liste des charsets:"
+
+#, c-format
+msgid "List of charsets with \"%s\":"
+msgstr "Liste des charsets avec \"%s\":"
+
+msgid "No charset found"
+msgstr "Aucun charset trouvé"
+
+msgid "No charset defined"
+msgstr "Aucun charset défini"
+
+#, c-format
+msgid "%s%s: terminal: %s, internal: %s"
+msgstr "%s%s: terminal: %s, interne: %s"
+
+#, c-format
+msgid "%s%s: error creating configuration file \"%s\""
+msgstr "%s%s: erreur de création du fichier de configuration \"%s\""
+
+msgid "manage charsets"
+msgstr "gestion des charsets"
+
+msgid "[[type.]plugin.string [= charset]]"
+msgstr "[[type.]extension.chaine [= charset]]"
+
+msgid ""
+"   type: \"decode\" or \"encode\" (if type is omitted, then both \"decode\" "
+"and \"encode\" are set)\n"
+" plugin: plugin name\n"
+" string: string specific to plugin (for example a server name or server."
+"channel for IRC plugin)\n"
+"charset: charset to use (if empty, then charset is removed)\n"
+"\n"
+"Examples :\n"
+"/charset decode iso-8859-15 => set global decode charset to iso-8859-15\n"
+"/charset encode iso-8859-15 => set global encode charset to iso-8859-15\n"
+"/charset decode.irc.freenode => set decode charset to iso-8859-15 for IRC "
+"server \"freenode\" (all channels)\n"
+"/charset decode.irc.freenode.#weechat => set decode charset to iso-8859-15 "
+"for IRC channel \"#weechat\" on server \"freenode\""
+msgstr ""
+"     type: \"decode\" ou \"encode\" (si le type est omis, alors \"decode\" "
+"et \"encode\" sont définis)\n"
+"extension: nom d'une extension\n"
+"   chaine: chaine spécifique à une extension (par exemple un nom de serveur "
+"ou serveur.canal pour l'extension IRC)\n"
+"  charset: charset à utiliser (si non renseigné, alors le charset est "
+"supprimé)\n"
+"\n"
+"Exemples :\n"
+"/charset decode iso-8859-15 => définit le charset de décodage global à iso-"
+"8859-15\n"
+"/charset encode iso-8859-15 => définit le charset d'encodage global à iso-"
+"8859-15\n"
+"/charset decode.irc.freenode => définit le charset de décodage à iso-8859-15 "
+"pour le serveur IRC \"freenode\" (tous les serveurs)\n"
+"/charset decode.irc.freenode.#weechat => définit le charset de décodage à "
+"iso-8859-15 pour le canal IRC \"#weechat\" sur le serveur \"freenode\""
+
 msgid "demo message without prefix"
 msgstr "message de démonstration sans préfixe"
 
@@ -2678,6 +2735,14 @@ msgid "%sirc: too few arguments for \"%s\" command"
 msgstr "%sirc: pas assez de paramètres pour la commande \"%s\""
 
 #, c-format
+msgid ""
+"%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
+"memory because it's currently used"
+msgstr ""
+"%s%s: attention: le serveur \"%s\" n'a pas été trouvé dans le fichier de "
+"configuration, non supprimé en mémoire car il est en cours d'utilisation"
+
+#, c-format
 msgid "%s%s: value \"%s\" is invalid for option \"%s\""
 msgstr "%s%s: valeur \"%s\" invalide pour l'option \"%s\""
 
@@ -2929,14 +2994,6 @@ msgstr ""
 "canaux de ce serveur (format: #canal:1,..), un nom de canal '*' est réservé "
 "pour la notification par défaut du serveur"
 
-#, c-format
-msgid ""
-"%s%s: warning: server \"%s\" not found in configuration file. It has not "
-"been deleted because it's used now."
-msgstr ""
-"%s%s: attention: le serveur \"%s\" n'a pas été trouvé dans le fichier de "
-"configuration. Il n'a pas été supprimé car il est actuellement utilisé."
-
 msgid "Waiting"
 msgstr "Attente"
 
@@ -3831,8 +3888,8 @@ msgid "%s%s: no command to execute"
 msgstr "%s%s: pas de commande à exécuter"
 
 #, c-format
-msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\""
-msgstr "%s%s: commande inconnue: cmd=\"%s\", hôte=\"%s\", params=\"%s\""
+msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", arguments=\"%s\""
+msgstr "%s%s: commande inconnue: cmd=\"%s\", hôte=\"%s\", paramètres=\"%s\""
 
 #, c-format
 msgid "%s%s: cannot read data from socket, disconnecting from server..."
@@ -4225,6 +4282,25 @@ msgstr ""
 msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s%s: paramètres invalides pour la fonction \"%s\""
 
+#~ msgid "%sWeeChat configuration file reloaded"
+#~ msgstr "%sFichier de configuration WeeChat rechargé"
+
+#~ msgid "%sError: failed to reload WeeChat configuration file"
+#~ msgstr ""
+#~ "%sErreur: impossible de recharger le fichier de configuration WeeChat"
+
+#~ msgid "%sWeeChat configuration file saved"
+#~ msgstr "%sFichier de configuration WeeChat sauvé"
+
+#~ msgid "%sError: failed to save WeeChat configuration file"
+#~ msgstr "%sErreur: impossible de sauver le fichier de configuration WeeChat"
+
+#~ msgid "%s%s: configuration file reloaded"
+#~ msgstr "%s%s: fichier de configuration rechargé"
+
+#~ msgid "%s%s: failed to reload configuration file"
+#~ msgstr "%s%s: impossible de recharger le fichier de configuration"
+
 #~ msgid "clear buffer(s)"
 #~ msgstr "effacer le(s) tampon(s)"
 
diff --git a/po/hu.po b/po/hu.po
index 453ee8040..ee39b8230 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-19 17:18+0100\n"
+"POT-Creation-Date: 2008-01-24 16:42+0100\n"
 "PO-Revision-Date: 2007-10-10 18:07+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -223,7 +223,7 @@ msgid "Key:"
 msgstr "Billentyű:\n"
 
 #, fuzzy
-msgid "No key found."
+msgid "No key found"
 msgstr "Nem találtam billentyűt.\n"
 
 #, fuzzy, c-format
@@ -310,7 +310,11 @@ msgid "    completions hooked:"
 msgstr "     parancskezelők:\n"
 
 #, fuzzy
-msgid "No plugin found."
+msgid "    modifiers hooked:"
+msgstr "     időkezelők:\n"
+
+#, fuzzy
+msgid "No plugin found"
 msgstr "Nem található modul.\n"
 
 #, fuzzy
@@ -326,35 +330,19 @@ msgid "%sError: wrong argument count for \"%s\" command"
 msgstr "%s rossz argumentum szám a \"%s\" parancsnak\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file reloaded"
-msgstr "Konfigurációs fájl elmentve\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to reload WeeChat configuration file"
-msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options reloaded"
+msgid "%sOptions reloaded from %s"
 msgstr "Modul beállítások elmentve\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to reload plugins options"
+msgid "%sError: failed to reload options from %s"
 msgstr "%s nem sikerült a modul opciókat elmenteni\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file saved"
-msgstr "Konfigurációs fájl elmentve\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to save WeeChat configuration file"
-msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options saved"
+msgid "%sOptions saved to %s"
 msgstr "Modul beállítások elmentve\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to save plugins options"
+msgid "%sError: failed to save options to %s"
 msgstr "%s nem sikerült a modul opciókat elmenteni\n"
 
 msgid "(unknown)"
@@ -445,7 +433,7 @@ msgstr "a /who lista vége"
 #, fuzzy, c-format
 msgid ""
 "%sError: can not merge windows, there's no other window with same size near "
-"current one."
+"current one"
 msgstr ""
 "%s nem sikerült az ablakokat összefésülni: nincs a közelben azonos méretű "
 "ablak.\n"
@@ -1312,8 +1300,8 @@ msgid ""
 "\".dll\" under Microsoft Windows)"
 msgstr ""
 
-#, fuzzy
-msgid "Saving WeeChat configuration to disk"
+#, fuzzy, c-format
+msgid "Saving WeeChat configuration to disk (%s)"
 msgstr "Beállítások mentése a lemezre\n"
 
 #, fuzzy, c-format
@@ -1679,14 +1667,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s körreferencia a \"/%s\" aliasz hívásakor\n"
 
 #, fuzzy, c-format
-msgid "%s%s: configuration file reloaded"
-msgstr "Konfigurációs fájl elmentve\n"
-
-#, fuzzy, c-format
-msgid "%s%s: failed to reload configuration file"
-msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"
-
-#, fuzzy, c-format
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s nincs elég memória az információs pult üzenethez\n"
 
@@ -1755,6 +1735,70 @@ msgstr "alias_név"
 msgid "alias_name: name of alias to remove"
 msgstr "alias_név: az eltávolítandó alias neve"
 
+#, fuzzy, c-format
+msgid "%s%s: error creating charset \"%s\" => \"%s\""
+msgstr "%s nincs elég memória az információs pult üzenethez\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" => \"%s\""
+msgstr "A \"%s\" => \"%s\" aliasz elkészült\n"
+
+#, fuzzy, c-format
+msgid "%s%s: charset \"%s\" not found"
+msgstr "%s a \"%s\" szerver nem található\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" removed"
+msgstr "A \"%s\" aliasz eltávolítva\n"
+
+#, fuzzy
+msgid "List of charsets:"
+msgstr "Aliaszok listája:\n"
+
+#, fuzzy, c-format
+msgid "List of charsets with \"%s\":"
+msgstr "Aliaszok listája:\n"
+
+#, fuzzy
+msgid "No charset found"
+msgstr "Nem találtam billentyűt.\n"
+
+#, fuzzy
+msgid "No charset defined"
+msgstr "Nincs aliasz definiálva.\n"
+
+#, fuzzy, c-format
+msgid "%s%s: terminal: %s, internal: %s"
+msgstr "%s a \"%s\" modul nem található\n"
+
+#, fuzzy, c-format
+msgid "%s%s: error creating configuration file \"%s\""
+msgstr "szerver konfigurációs fájljának újraolvastatása"
+
+#, fuzzy
+msgid "manage charsets"
+msgstr "pufferek kezelése"
+
+msgid "[[type.]plugin.string [= charset]]"
+msgstr ""
+
+msgid ""
+"   type: \"decode\" or \"encode\" (if type is omitted, then both \"decode\" "
+"and \"encode\" are set)\n"
+" plugin: plugin name\n"
+" string: string specific to plugin (for example a server name or server."
+"channel for IRC plugin)\n"
+"charset: charset to use (if empty, then charset is removed)\n"
+"\n"
+"Examples :\n"
+"/charset decode iso-8859-15 => set global decode charset to iso-8859-15\n"
+"/charset encode iso-8859-15 => set global encode charset to iso-8859-15\n"
+"/charset decode.irc.freenode => set decode charset to iso-8859-15 for IRC "
+"server \"freenode\" (all channels)\n"
+"/charset decode.irc.freenode.#weechat => set decode charset to iso-8859-15 "
+"for IRC channel \"#weechat\" on server \"freenode\""
+msgstr ""
+
 msgid "demo message without prefix"
 msgstr ""
 
@@ -2785,6 +2829,12 @@ msgstr ""
 msgid "%sirc: too few arguments for \"%s\" command"
 msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
 
+#, c-format
+msgid ""
+"%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
+"memory because it's currently used"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: value \"%s\" is invalid for option \"%s\""
 msgstr "%s %s, %d. sor: érvénytelen opció: \"%s\"\n"
@@ -3020,12 +3070,6 @@ msgstr ""
 "#szoba:1,...), a '*' szobanév a szerver alapértelmezett értesítési "
 "szintjének van fenntartva"
 
-#, c-format
-msgid ""
-"%s%s: warning: server \"%s\" not found in configuration file. It has not "
-"been deleted because it's used now."
-msgstr ""
-
 msgid "Waiting"
 msgstr "Várakozás"
 
@@ -3905,7 +3949,7 @@ msgid "%s%s: no command to execute"
 msgstr "%s A futtatandó parancs nem található!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\""
+msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", arguments=\"%s\""
 msgstr ""
 "%s Ismeretlen parancs: parancs=\"%s\", gépnév=\"%s\", argumentum=\"%s\"\n"
 
@@ -4293,6 +4337,30 @@ msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s rossz argumentum a \"%s\" parancsnak\n"
 
 #, fuzzy
+#~ msgid "%sWeeChat configuration file reloaded"
+#~ msgstr "Konfigurációs fájl elmentve\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to reload WeeChat configuration file"
+#~ msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"
+
+#, fuzzy
+#~ msgid "%sWeeChat configuration file saved"
+#~ msgstr "Konfigurációs fájl elmentve\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to save WeeChat configuration file"
+#~ msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"
+
+#, fuzzy
+#~ msgid "%s%s: configuration file reloaded"
+#~ msgstr "Konfigurációs fájl elmentve\n"
+
+#, fuzzy
+#~ msgid "%s%s: failed to reload configuration file"
+#~ msgstr "%s nem sikerült a konfigurációs fájlt elmenteni\n"
+
+#, fuzzy
 #~ msgid "clear buffer(s)"
 #~ msgstr "  [C] Puffer törlése"
 
diff --git a/po/ru.po b/po/ru.po
index 087d06ff9..b2ce0c7d2 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.2.7-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2008-01-19 17:18+0100\n"
+"POT-Creation-Date: 2008-01-24 16:42+0100\n"
 "PO-Revision-Date: 2007-09-06 12:44+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -220,7 +220,7 @@ msgid "Key:"
 msgstr "Клавиша:\n"
 
 #, fuzzy
-msgid "No key found."
+msgid "No key found"
 msgstr "Клавиши не найдены.\n"
 
 #, fuzzy, c-format
@@ -307,7 +307,11 @@ msgid "    completions hooked:"
 msgstr "     обработчики команд:\n"
 
 #, fuzzy
-msgid "No plugin found."
+msgid "    modifiers hooked:"
+msgstr "     обработчики таймера:\n"
+
+#, fuzzy
+msgid "No plugin found"
 msgstr "Plugin не найден\n"
 
 #, fuzzy
@@ -323,35 +327,19 @@ msgid "%sError: wrong argument count for \"%s\" command"
 msgstr "%s некорректное количество аргументов команды \"%s\"\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file reloaded"
-msgstr "Конфигурационный файл сохранён\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to reload WeeChat configuration file"
-msgstr "%s не могу сохранить конфигурационный файл\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options reloaded"
+msgid "%sOptions reloaded from %s"
 msgstr "Настройки pluginов сохранены\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to reload plugins options"
+msgid "%sError: failed to reload options from %s"
 msgstr "%s не могу сохранить конфигурационный файл pluginов\n"
 
 #, fuzzy, c-format
-msgid "%sWeeChat configuration file saved"
-msgstr "Конфигурационный файл сохранён\n"
-
-#, fuzzy, c-format
-msgid "%sError: failed to save WeeChat configuration file"
-msgstr "%s не могу сохранить конфигурационный файл\n"
-
-#, fuzzy, c-format
-msgid "%sPlugins options saved"
+msgid "%sOptions saved to %s"
 msgstr "Настройки pluginов сохранены\n"
 
 #, fuzzy, c-format
-msgid "%sError: failed to save plugins options"
+msgid "%sError: failed to save options to %s"
 msgstr "%s не могу сохранить конфигурационный файл pluginов\n"
 
 msgid "(unknown)"
@@ -441,7 +429,7 @@ msgstr "конец списка /who"
 #, fuzzy, c-format
 msgid ""
 "%sError: can not merge windows, there's no other window with same size near "
-"current one."
+"current one"
 msgstr ""
 "%s не могу объединить окна, есть другое окно такого-же размера рядом с "
 "текущим.\n"
@@ -1313,8 +1301,8 @@ msgid ""
 "\".dll\" under Microsoft Windows)"
 msgstr ""
 
-#, fuzzy
-msgid "Saving WeeChat configuration to disk"
+#, fuzzy, c-format
+msgid "Saving WeeChat configuration to disk (%s)"
 msgstr "Сохраняю конфигурацию\n"
 
 #, fuzzy, c-format
@@ -1682,14 +1670,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr "%s рекурсия при вызове сокращения \"/%s\"\n"
 
 #, fuzzy, c-format
-msgid "%s%s: configuration file reloaded"
-msgstr "Конфигурационный файл сохранён\n"
-
-#, fuzzy, c-format
-msgid "%s%s: failed to reload configuration file"
-msgstr "%s не могу сохранить конфигурационный файл\n"
-
-#, fuzzy, c-format
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr "%s недостаточно памяти для сообщения в строке информации\n"
 
@@ -1757,6 +1737,70 @@ msgstr "сокращение"
 msgid "alias_name: name of alias to remove"
 msgstr "сокращение: удаляемое сокращение"
 
+#, fuzzy, c-format
+msgid "%s%s: error creating charset \"%s\" => \"%s\""
+msgstr "%s недостаточно памяти для сообщения в строке информации\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" => \"%s\""
+msgstr "Сокращение \"%s\" => \"%s\" создано\n"
+
+#, fuzzy, c-format
+msgid "%s%s: charset \"%s\" not found"
+msgstr "%s сервер \"%s\" не найден\n"
+
+#, fuzzy, c-format
+msgid "%sCharset \"%s\" removed"
+msgstr "Сокращение \"%s\" удалено\n"
+
+#, fuzzy
+msgid "List of charsets:"
+msgstr "Список сокращений:\n"
+
+#, fuzzy, c-format
+msgid "List of charsets with \"%s\":"
+msgstr "Список сокращений:\n"
+
+#, fuzzy
+msgid "No charset found"
+msgstr "Клавиши не найдены.\n"
+
+#, fuzzy
+msgid "No charset defined"
+msgstr "Сокращения не заданы.\n"
+
+#, fuzzy, c-format
+msgid "%s%s: terminal: %s, internal: %s"
+msgstr "%s plugin \"%s\" не найден\n"
+
+#, fuzzy, c-format
+msgid "%s%s: error creating configuration file \"%s\""
+msgstr "перезагрузить конфигурационный файл сервера"
+
+#, fuzzy
+msgid "manage charsets"
+msgstr "управление буферами"
+
+msgid "[[type.]plugin.string [= charset]]"
+msgstr ""
+
+msgid ""
+"   type: \"decode\" or \"encode\" (if type is omitted, then both \"decode\" "
+"and \"encode\" are set)\n"
+" plugin: plugin name\n"
+" string: string specific to plugin (for example a server name or server."
+"channel for IRC plugin)\n"
+"charset: charset to use (if empty, then charset is removed)\n"
+"\n"
+"Examples :\n"
+"/charset decode iso-8859-15 => set global decode charset to iso-8859-15\n"
+"/charset encode iso-8859-15 => set global encode charset to iso-8859-15\n"
+"/charset decode.irc.freenode => set decode charset to iso-8859-15 for IRC "
+"server \"freenode\" (all channels)\n"
+"/charset decode.irc.freenode.#weechat => set decode charset to iso-8859-15 "
+"for IRC channel \"#weechat\" on server \"freenode\""
+msgstr ""
+
 msgid "demo message without prefix"
 msgstr ""
 
@@ -2776,6 +2820,12 @@ msgstr ""
 msgid "%sirc: too few arguments for \"%s\" command"
 msgstr "%s некорректные аргументы команды \"%s\"\n"
 
+#, c-format
+msgid ""
+"%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
+"memory because it's currently used"
+msgstr ""
+
 #, fuzzy, c-format
 msgid "%s%s: value \"%s\" is invalid for option \"%s\""
 msgstr "%s %s, строка %d: некорректный параметр \"%s\"\n"
@@ -3015,12 +3065,6 @@ msgstr ""
 "#канал:1,..), название канала '*' зарезервировано для уровня уведомления "
 "сервера"
 
-#, c-format
-msgid ""
-"%s%s: warning: server \"%s\" not found in configuration file. It has not "
-"been deleted because it's used now."
-msgstr ""
-
 msgid "Waiting"
 msgstr "Ожидание"
 
@@ -3892,7 +3936,7 @@ msgid "%s%s: no command to execute"
 msgstr "%s Нет команд для запуска!\n"
 
 #, fuzzy, c-format
-msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\""
+msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", arguments=\"%s\""
 msgstr ""
 "%s Неизвестная команда: команда=\"%s\", хост=\"%s\", аргументы=\"%s\"\n"
 
@@ -4275,6 +4319,30 @@ msgid "%s%s: wrong arguments for function \"%s\""
 msgstr "%s некорректные аргументы команды \"%s\"\n"
 
 #, fuzzy
+#~ msgid "%sWeeChat configuration file reloaded"
+#~ msgstr "Конфигурационный файл сохранён\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to reload WeeChat configuration file"
+#~ msgstr "%s не могу сохранить конфигурационный файл\n"
+
+#, fuzzy
+#~ msgid "%sWeeChat configuration file saved"
+#~ msgstr "Конфигурационный файл сохранён\n"
+
+#, fuzzy
+#~ msgid "%sError: failed to save WeeChat configuration file"
+#~ msgstr "%s не могу сохранить конфигурационный файл\n"
+
+#, fuzzy
+#~ msgid "%s%s: configuration file reloaded"
+#~ msgstr "Конфигурационный файл сохранён\n"
+
+#, fuzzy
+#~ msgid "%s%s: failed to reload configuration file"
+#~ msgstr "%s не могу сохранить конфигурационный файл\n"
+
+#, fuzzy
 #~ msgid "clear buffer(s)"
 #~ msgstr "  [C] Очистить буфер"
 
diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake
index 83fbcedfe..a9073beb2 100644
--- a/po/srcfiles.cmake
+++ b/po/srcfiles.cmake
@@ -81,6 +81,7 @@ SET(WEECHAT_SOURCES
 ./src/plugins/aspell/aspell.c
 ./src/plugins/aspell/aspell.h
 ./src/plugins/charset/charset.c
+./src/plugins/charset/charset.h
 ./src/plugins/demo/demo.c
 ./src/plugins/fifo/fifo.c
 ./src/plugins/irc/irc-buffer.c
diff --git a/po/weechat.pot b/po/weechat.pot
index 3147d32e3..89af637dd 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: 2008-01-19 17:18+0100\n"
+"POT-Creation-Date: 2008-01-24 16:42+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"
@@ -185,7 +185,7 @@ msgstr ""
 msgid "Key:"
 msgstr ""
 
-msgid "No key found."
+msgid "No key found"
 msgstr ""
 
 #, c-format
@@ -260,7 +260,10 @@ msgstr ""
 msgid "    completions hooked:"
 msgstr ""
 
-msgid "No plugin found."
+msgid "    modifiers hooked:"
+msgstr ""
+
+msgid "No plugin found"
 msgstr ""
 
 msgid "  (no plugin)"
@@ -275,35 +278,19 @@ msgid "%sError: wrong argument count for \"%s\" command"
 msgstr ""
 
 #, c-format
-msgid "%sWeeChat configuration file reloaded"
-msgstr ""
-
-#, c-format
-msgid "%sError: failed to reload WeeChat configuration file"
-msgstr ""
-
-#, c-format
-msgid "%sPlugins options reloaded"
+msgid "%sOptions reloaded from %s"
 msgstr ""
 
 #, c-format
-msgid "%sError: failed to reload plugins options"
+msgid "%sError: failed to reload options from %s"
 msgstr ""
 
 #, c-format
-msgid "%sWeeChat configuration file saved"
+msgid "%sOptions saved to %s"
 msgstr ""
 
 #, c-format
-msgid "%sError: failed to save WeeChat configuration file"
-msgstr ""
-
-#, c-format
-msgid "%sPlugins options saved"
-msgstr ""
-
-#, c-format
-msgid "%sError: failed to save plugins options"
+msgid "%sError: failed to save options to %s"
 msgstr ""
 
 msgid "(unknown)"
@@ -389,7 +376,7 @@ msgstr ""
 #, c-format
 msgid ""
 "%sError: can not merge windows, there's no other window with same size near "
-"current one."
+"current one"
 msgstr ""
 
 msgid "manage buffers"
@@ -1031,7 +1018,8 @@ msgid ""
 "\".dll\" under Microsoft Windows)"
 msgstr ""
 
-msgid "Saving WeeChat configuration to disk"
+#, c-format
+msgid "Saving WeeChat configuration to disk (%s)"
 msgstr ""
 
 #, c-format
@@ -1381,14 +1369,6 @@ msgid "%s%s: error, circular reference when calling alias \"%s\""
 msgstr ""
 
 #, c-format
-msgid "%s%s: configuration file reloaded"
-msgstr ""
-
-#, c-format
-msgid "%s%s: failed to reload configuration file"
-msgstr ""
-
-#, c-format
 msgid "%s%s: error creating alias \"%s\" => \"%s\""
 msgstr ""
 
@@ -1443,6 +1423,66 @@ msgstr ""
 msgid "alias_name: name of alias to remove"
 msgstr ""
 
+#, c-format
+msgid "%s%s: error creating charset \"%s\" => \"%s\""
+msgstr ""
+
+#, c-format
+msgid "%sCharset \"%s\" => \"%s\""
+msgstr ""
+
+#, c-format
+msgid "%s%s: charset \"%s\" not found"
+msgstr ""
+
+#, c-format
+msgid "%sCharset \"%s\" removed"
+msgstr ""
+
+msgid "List of charsets:"
+msgstr ""
+
+#, c-format
+msgid "List of charsets with \"%s\":"
+msgstr ""
+
+msgid "No charset found"
+msgstr ""
+
+msgid "No charset defined"
+msgstr ""
+
+#, c-format
+msgid "%s%s: terminal: %s, internal: %s"
+msgstr ""
+
+#, c-format
+msgid "%s%s: error creating configuration file \"%s\""
+msgstr ""
+
+msgid "manage charsets"
+msgstr ""
+
+msgid "[[type.]plugin.string [= charset]]"
+msgstr ""
+
+msgid ""
+"   type: \"decode\" or \"encode\" (if type is omitted, then both \"decode\" "
+"and \"encode\" are set)\n"
+" plugin: plugin name\n"
+" string: string specific to plugin (for example a server name or server."
+"channel for IRC plugin)\n"
+"charset: charset to use (if empty, then charset is removed)\n"
+"\n"
+"Examples :\n"
+"/charset decode iso-8859-15 => set global decode charset to iso-8859-15\n"
+"/charset encode iso-8859-15 => set global encode charset to iso-8859-15\n"
+"/charset decode.irc.freenode => set decode charset to iso-8859-15 for IRC "
+"server \"freenode\" (all channels)\n"
+"/charset decode.irc.freenode.#weechat => set decode charset to iso-8859-15 "
+"for IRC channel \"#weechat\" on server \"freenode\""
+msgstr ""
+
 msgid "demo message without prefix"
 msgstr ""
 
@@ -2307,6 +2347,12 @@ msgid "%sirc: too few arguments for \"%s\" command"
 msgstr ""
 
 #, c-format
+msgid ""
+"%s%s: warning: server \"%s\" not found in configuration file, not deleted in "
+"memory because it's currently used"
+msgstr ""
+
+#, c-format
 msgid "%s%s: value \"%s\" is invalid for option \"%s\""
 msgstr ""
 
@@ -2510,12 +2556,6 @@ msgid ""
 "level"
 msgstr ""
 
-#, c-format
-msgid ""
-"%s%s: warning: server \"%s\" not found in configuration file. It has not "
-"been deleted because it's used now."
-msgstr ""
-
 msgid "Waiting"
 msgstr ""
 
@@ -3377,7 +3417,7 @@ msgid "%s%s: no command to execute"
 msgstr ""
 
 #, c-format
-msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", args=\"%s\""
+msgid "%s%s: unknown command: cmd=\"%s\", host=\"%s\", arguments=\"%s\""
 msgstr ""
 
 #, c-format