core: add context "search" for keys (to define keys used during search in buffer with ctrl+"r")

12 files changed, 731 insertions, 419 deletions

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0cde426c7..b2b8e13fd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,14 +40,14 @@
 ./src/gui/curses/gui-curses-chat.c
 ./src/gui/curses/gui-curses-color.c
 ./src/gui/curses/gui-curses.h
-./src/gui/curses/gui-curses-keyboard.c
+./src/gui/curses/gui-curses-key.c
 ./src/gui/curses/gui-curses-main.c
 ./src/gui/curses/gui-curses-window.c
 ./src/gui/gtk/gui-gtk-bar-window.c
 ./src/gui/gtk/gui-gtk-chat.c
 ./src/gui/gtk/gui-gtk-color.c
 ./src/gui/gtk/gui-gtk.h
-./src/gui/gtk/gui-gtk-keyboard.c
+./src/gui/gtk/gui-gtk-key.c
 ./src/gui/gtk/gui-gtk-main.c
 ./src/gui/gtk/gui-gtk-window.c
 ./src/gui/gui-bar.c
@@ -72,8 +72,8 @@
 ./src/gui/gui-hotlist.h
 ./src/gui/gui-input.c
 ./src/gui/gui-input.h
-./src/gui/gui-keyboard.c
-./src/gui/gui-keyboard.h
+./src/gui/gui-key.c
+./src/gui/gui-key.h
 ./src/gui/gui-layout.c
 ./src/gui/gui-layout.h
 ./src/gui/gui-line.c
diff --git a/po/cs.po b/po/cs.po
index 5f8db6865..f611f2dce 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
 "PO-Revision-Date: 2011-05-15 10:51+0200\n"
 "Last-Translator: Jiri Golembiovsky <golemj@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -79,9 +79,9 @@ msgstr ""
 "dokumentacích \n"
 "                    k pluginům)\n"
 
-#. TRANSLATORS: "%s" is "weechat"
-#, c-format
-msgid "%s default keys:\n"
+#. TRANSLATORS: first "%s" is "weechat"
+#, fuzzy, c-format
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr "%s výchozí klávesy:\n"
 
 #, c-format
@@ -373,43 +373,28 @@ msgstr "Historie příkazů bufferu:"
 msgid "default command:"
 msgstr "výchozí příkaz:"
 
-#, c-format
-msgid "Key bindings added or redefined (%d):"
+#, fuzzy, c-format
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr "Klávesové zkratky přidány nebo předefinovány (%d):"
 
-#, c-format
-msgid "Key bindings deleted (%d):"
+#, fuzzy, c-format
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr "Klávesové zkratky smazány (%d):"
 
-msgid "No key binding added, redefined or removed"
+#, fuzzy, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr "Nebyly přidány, předefinovány nebo smazny žádné klávesové zkratky"
 
-msgid "No key binding defined"
-msgstr "Žádné klávesové zkratky nejsou definovány"
-
-#, c-format
-msgid "Key bindings (%d):"
-msgstr "Klávesové zkratky (%d):"
-
-msgid "No default key binding"
-msgstr "Žádné výchozí klávesové zkratky"
-
-#, c-format
-msgid "Default key bindings (%d):"
-msgstr "Výchozí klávesové zkratky (%d):"
-
-msgid "Key:"
-msgstr "Klávesa:"
-
-msgid "No key found"
-msgstr "Žádná klávesa nenalezena"
-
 #, c-format
 msgid "%sError: unable to bind key \"%s\""
 msgstr "%sChyba: nemohu napojit kalávesu \"%s\""
 
 #, c-format
-msgid "Key \"%s\" unbound"
+msgid "Key \"%s\" has already default value"
+msgstr "Klávesa \"%s\" již má výhozí hodnotu"
+
+#, fuzzy, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
 msgstr "Klávesa \"%s\" odpojena"
 
 #, c-format
@@ -417,14 +402,37 @@ msgid "%sError: unable to unbind key \"%s\""
 msgstr "%sChyba: nemohu odpojit klávesu \"%s\""
 
 #, c-format
-msgid "Key \"%s\" has already default value"
-msgstr "Klávesa \"%s\" již má výhozí hodnotu"
-
-#, c-format
 msgid "%sKey \"%s\" not found"
 msgstr "%sKlávesa \"%s\" nenalezena"
 
-msgid "Default key bindings restored"
+#, fuzzy, c-format
+msgid "No key binding defined for context \"%s\""
+msgstr "Žádné klávesové zkratky nejsou definovány"
+
+#, fuzzy, c-format
+msgid "Key bindings (%d) for context \"%s\":"
+msgstr "Klávesové zkratky (%d):"
+
+#, fuzzy, c-format
+msgid "No default key binding for context \"%s\""
+msgstr "Žádné výchozí klávesové zkratky"
+
+#, fuzzy, c-format
+msgid "Default key bindings (%d) for context \"%s\":"
+msgstr "Výchozí klávesové zkratky (%d):"
+
+msgid "Key:"
+msgstr "Klávesa:"
+
+msgid "No key found"
+msgstr "Žádná klávesa nenalezena"
+
+#, fuzzy, c-format
+msgid "%sError: context \"%s\" not found"
+msgstr "%sChyba: filtr \"%s\" nenalezen"
+
+#, fuzzy, c-format
+msgid "Default key bindings restored for context \"%s\""
 msgstr "Výchozí klávesové zkratky obnoveny"
 
 #, c-format
@@ -433,9 +441,9 @@ msgstr ""
 "%sChyba: \"-yes\" argument je požadován pro reset kaláves (bezpečnostní "
 "opatření)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "přidána %d nová klávesa"
 msgstr[1] "přidány %d nové klávesy"
 msgstr[2] "přidáno %d nových kláves"
@@ -1270,12 +1278,17 @@ msgstr "funkce pro příkazovou řádku"
 msgid "<action> [<arguments>]"
 msgstr "<action> [<argumenty>]"
 
+#, fuzzy
 msgid ""
 "list of actions:\n"
 "  return: simulate key \"enter\"\n"
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1359,22 +1372,32 @@ msgstr ""
 msgid "bind/unbind keys"
 msgstr "napojit/odpojit klávesy"
 
+#, fuzzy
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 "list|listdefault|listdiff || bind <klávesa> [<příkaz> [<argumenty>]] || "
 "unbind <klávesa> || reset <klávesa> || resetall -yes || missing"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1390,7 +1413,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "       list: vypsat všechny aktuální klávesy (pokud není vuveden žádný "
 "argument, je vypsán tento list)\n"
@@ -1978,9 +2003,16 @@ msgstr "volby pro proxy"
 msgid "options for bars"
 msgstr "volby pro pole"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+#, fuzzy
+msgid "key contexts"
+msgstr "klávesové kódy"
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr "klávesové kódy"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr ""
 "klávesové kódy mohou být resetovány (klávesy přidány, redefinovány nebo "
diff --git a/po/de.po b/po/de.po
index e3e67f935..09f0468b5 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
 "PO-Revision-Date: 2011-06-15 18:51+0100\n"
 "Last-Translator: Nils G.\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -87,9 +87,9 @@ msgstr ""
 "zusätzliche Informationen\n"
 "                    zu den mögliche Optionen zu erhalten.)\n"
 
-#. TRANSLATORS: "%s" is "weechat"
-#, c-format
-msgid "%s default keys:\n"
+#. TRANSLATORS: first "%s" is "weechat"
+#, fuzzy, c-format
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr "%s Standardtastenbelegungen:\n"
 
 #, c-format
@@ -386,44 +386,29 @@ msgstr "Befehlsverlauf des Buffers:"
 msgid "default command:"
 msgstr "Standardbefehl:"
 
-#, c-format
-msgid "Key bindings added or redefined (%d):"
+#, fuzzy, c-format
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr "Tastenbelegungen die hinzugefügt oder verändert wurden (%d):"
 
-#, c-format
-msgid "Key bindings deleted (%d):"
+#, fuzzy, c-format
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr "Tastenbelegungen die gelöscht wurden (%d):"
 
-msgid "No key binding added, redefined or removed"
+#, fuzzy, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr ""
 "Es sind keine Tastenbelegungen hinzugefügt, verändert oder gelöscht worden"
 
-msgid "No key binding defined"
-msgstr "Keine Tastenbelegung definiert"
-
-#, c-format
-msgid "Key bindings (%d):"
-msgstr "Tastenbelegungen (%d):"
-
-msgid "No default key binding"
-msgstr "keine Standardtastenbelegungen vorhanden"
-
-#, c-format
-msgid "Default key bindings (%d):"
-msgstr "Standardtastenbelegungen (%d):"
-
-msgid "Key:"
-msgstr "Taste:"
-
-msgid "No key found"
-msgstr "Keine Taste gefunden"
-
 #, c-format
 msgid "%sError: unable to bind key \"%s\""
 msgstr "%sFehler: kann die Taste \"%s\" nicht zuordnen"
 
 #, c-format
-msgid "Key \"%s\" unbound"
+msgid "Key \"%s\" has already default value"
+msgstr "Die Taste \"%s\" ist schon mit einem Standardbefehl belegt"
+
+#, fuzzy, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
 msgstr "Tastenbelegung \"%s\" entfernt"
 
 #, c-format
@@ -431,14 +416,37 @@ msgid "%sError: unable to unbind key \"%s\""
 msgstr "%sFehler: kann die Tastenbelegung \"%s\" nicht entfernen"
 
 #, c-format
-msgid "Key \"%s\" has already default value"
-msgstr "Die Taste \"%s\" ist schon mit einem Standardbefehl belegt"
-
-#, c-format
 msgid "%sKey \"%s\" not found"
 msgstr "%sTastenbelegung \"%s\" nicht gefunden"
 
-msgid "Default key bindings restored"
+#, fuzzy, c-format
+msgid "No key binding defined for context \"%s\""
+msgstr "Keine Tastenbelegung definiert"
+
+#, fuzzy, c-format
+msgid "Key bindings (%d) for context \"%s\":"
+msgstr "Tastenbelegungen (%d):"
+
+#, fuzzy, c-format
+msgid "No default key binding for context \"%s\""
+msgstr "keine Standardtastenbelegungen vorhanden"
+
+#, fuzzy, c-format
+msgid "Default key bindings (%d) for context \"%s\":"
+msgstr "Standardtastenbelegungen (%d):"
+
+msgid "Key:"
+msgstr "Taste:"
+
+msgid "No key found"
+msgstr "Keine Taste gefunden"
+
+#, fuzzy, c-format
+msgid "%sError: context \"%s\" not found"
+msgstr "%sFehler: Filter \"%s\" nicht gefunden"
+
+#, fuzzy, c-format
+msgid "Default key bindings restored for context \"%s\""
 msgstr "Standardtastenbelegungen wiederhergestellt"
 
 #, c-format
@@ -447,9 +455,9 @@ msgstr ""
 "%sFehler: \"-yes\" Argument ist aus Sicherheitsgründen für den Reset der "
 "Tastenbelegung notwendig"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "(%d) neue Taste hinzugefügt"
 msgstr[1] "(%d) neue Tasten hinzugefügt"
 
@@ -1302,12 +1310,17 @@ msgstr "Funktionen für die Befehlszeile"
 msgid "<action> [<arguments>]"
 msgstr "<action> [<arguments>]"
 
+#, fuzzy
 msgid ""
 "list of actions:\n"
 "  return: simulate key \"enter\"\n"
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1402,22 +1415,32 @@ msgstr ""
 msgid "bind/unbind keys"
 msgstr "Einer Taste einen Befehl zuordnen oder entfernen"
 
+#, fuzzy
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 "list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
 "|| reset <key> || resetall -yes || missing"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1433,7 +1456,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "       list: zeigt die aktuelle Tastenbelegungen an (Standardaufruf)\n"
 "listdefault: zeigt die Standardeinstellung der Tastenbelegung an\n"
@@ -2057,9 +2082,16 @@ msgstr "Optionen für Proxies"
 msgid "options for bars"
 msgstr "Optionen für Infobars"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+#, fuzzy
+msgid "key contexts"
+msgstr "Tastaturcodes"
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr "Tastaturcodes"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr ""
 "Tastenbelegungen die zurückgesetzt werden können (hinzugefügte/verändert/"
diff --git a/po/es.po b/po/es.po
index 6ce21a594..2c599bc64 100644
--- a/po/es.po
+++ b/po/es.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
 "PO-Revision-Date: 2011-05-15 10:51+0200\n"
 "Last-Translator: Elián Hanisch <lambdae2@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -80,9 +80,9 @@ msgstr ""
 "                    (ver la documentación del plugin para más información\n"
 "                    sobre posibles opciones)\n"
 
-#. TRANSLATORS: "%s" is "weechat"
-#, c-format
-msgid "%s default keys:\n"
+#. TRANSLATORS: first "%s" is "weechat"
+#, fuzzy, c-format
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr "teclas por defecto de %s:\n"
 
 #, c-format
@@ -377,43 +377,28 @@ msgstr "Historial de comandos:"
 msgid "default command:"
 msgstr "comando predeterminado:"
 
-#, c-format
-msgid "Key bindings added or redefined (%d):"
+#, fuzzy, c-format
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr "Atajos agregados o redefinidos (%d):"
 
-#, c-format
-msgid "Key bindings deleted (%d):"
+#, fuzzy, c-format
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr "Atajos borrados (%d):"
 
-msgid "No key binding added, redefined or removed"
+#, fuzzy, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr "Ningún atajo agregado, redefinido o borrado"
 
-msgid "No key binding defined"
-msgstr "Ningún atajo definido"
-
-#, c-format
-msgid "Key bindings (%d):"
-msgstr "Atajos (%d):"
-
-msgid "No default key binding"
-msgstr "Ningún atajo predefinido"
-
-#, c-format
-msgid "Default key bindings (%d):"
-msgstr "Atajos predefinidos (%d):"
-
-msgid "Key:"
-msgstr "Tecla:"
-
-msgid "No key found"
-msgstr "Ninguna tecla encontrada"
-
 #, c-format
 msgid "%sError: unable to bind key \"%s\""
 msgstr "%sError: no se pudo crear el atajo \"%s\""
 
 #, c-format
-msgid "Key \"%s\" unbound"
+msgid "Key \"%s\" has already default value"
+msgstr "Atajo \"%s\" ya tiene un valor por defecto"
+
+#, fuzzy, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
 msgstr "Atajo \"%s\" deshecho"
 
 #, c-format
@@ -421,14 +406,37 @@ msgid "%sError: unable to unbind key \"%s\""
 msgstr "%sError: no se pudo deshacer el atajo \"%s\""
 
 #, c-format
-msgid "Key \"%s\" has already default value"
-msgstr "Atajo \"%s\" ya tiene un valor por defecto"
-
-#, c-format
 msgid "%sKey \"%s\" not found"
 msgstr "%sTecla \"%s\" no encontrada"
 
-msgid "Default key bindings restored"
+#, fuzzy, c-format
+msgid "No key binding defined for context \"%s\""
+msgstr "Ningún atajo definido"
+
+#, fuzzy, c-format
+msgid "Key bindings (%d) for context \"%s\":"
+msgstr "Atajos (%d):"
+
+#, fuzzy, c-format
+msgid "No default key binding for context \"%s\""
+msgstr "Ningún atajo predefinido"
+
+#, fuzzy, c-format
+msgid "Default key bindings (%d) for context \"%s\":"
+msgstr "Atajos predefinidos (%d):"
+
+msgid "Key:"
+msgstr "Tecla:"
+
+msgid "No key found"
+msgstr "Ninguna tecla encontrada"
+
+#, fuzzy, c-format
+msgid "%sError: context \"%s\" not found"
+msgstr "%sError: filtro \"%s\" no encontrado"
+
+#, fuzzy, c-format
+msgid "Default key bindings restored for context \"%s\""
 msgstr "Atajos predefinidos restaurados"
 
 #, c-format
@@ -437,9 +445,9 @@ msgstr ""
 "%sError: por seguridad, se requiere el argumento \"-yes\" para restaurar los "
 "atajos"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "%d nuevo atajo agregado"
 msgstr[1] "%d nuevos atajos agregados"
 
@@ -1278,12 +1286,17 @@ msgstr "funciones para la línea de comandos"
 msgid "<action> [<arguments>]"
 msgstr "<acción> [<argumentos>]"
 
+#, fuzzy
 msgid ""
 "list of actions:\n"
 "  return: simulate key \"enter\"\n"
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1369,22 +1382,32 @@ msgstr ""
 msgid "bind/unbind keys"
 msgstr "crear/deshacer atajos"
 
+#, fuzzy
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 "list|listdefault|listdiff || bind <tecla> [<comando> [<argumentos>]] || "
 "unbind <tecla> || reset <tecla> || resetall -yes || missing"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1400,7 +1423,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "       list: lista todas los atajos actuales (sin argumentos, esta lista es "
 "mostrada)\n"
@@ -2001,9 +2026,16 @@ msgstr "opciones para proxies"
 msgid "options for bars"
 msgstr "opciones para barras"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+#, fuzzy
+msgid "key contexts"
+msgstr "códigos de tecla"
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr "códigos de tecla"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr ""
 "Atajos que se pueden restaurar (atajos agregados, redefinidos o borrados)"
diff --git a/po/fr.po b/po/fr.po
index 8b4c34c34..f7450d675 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
-"PO-Revision-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
+"PO-Revision-Date: 2011-07-04 21:45+0200\n"
 "Last-Translator: Sebastien Helleu <flashcode@flashtux.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
 "Language: French\n"
@@ -81,10 +81,10 @@ msgstr ""
 "d'information\n"
 "                    sur les options possibles)\n"
 
-#. TRANSLATORS: "%s" is "weechat"
+#. TRANSLATORS: first "%s" is "weechat"
 #, c-format
-msgid "%s default keys:\n"
-msgstr "Touches par défaut %s:\n"
+msgid "%s default keys (context: \"%s\"):\n"
+msgstr "Touches par défaut %s (contexte: \"%s\"):\n"
 
 #, c-format
 msgid "Error: missing argument for \"%s\" option\n"
@@ -378,58 +378,69 @@ msgid "default command:"
 msgstr "commande par défaut:"
 
 #, c-format
-msgid "Key bindings added or redefined (%d):"
-msgstr "Associations de touches ajoutées ou redéfinies (%d):"
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
+msgstr ""
+"Associations de touches ajoutées ou redéfinies (%d) pour le contexte \"%s\":"
 
 #, c-format
-msgid "Key bindings deleted (%d):"
-msgstr "Associations de touches supprimées (%d):"
-
-msgid "No key binding added, redefined or removed"
-msgstr "Aucune association de touche ajoutée, redéfinie ou supprimée"
+msgid "Key bindings deleted (%d) for context \"%s\":"
+msgstr "Associations de touches supprimées (%d) pour le contexte \"%s\":"
 
-msgid "No key binding defined"
-msgstr "Pas d'association de touche définie"
+#, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
+msgstr ""
+"Aucune association de touche ajoutée, redéfinie ou supprimée pour le "
+"contexte \"%s\""
 
 #, c-format
-msgid "Key bindings (%d):"
-msgstr "Associations de touches (%d):"
+msgid "%sError: unable to bind key \"%s\""
+msgstr "%sErreur: impossible de créer la touche \"%s\""
 
-msgid "No default key binding"
-msgstr "Pas de touche par défaut"
+#, c-format
+msgid "Key \"%s\" has already default value"
+msgstr "La touche \"%s\" a déjà la valeur par défaut"
 
 #, c-format
-msgid "Default key bindings (%d):"
-msgstr "Associations de touches par défaut (%d):"
+msgid "Key \"%s\" unbound (context: \"%s\")"
+msgstr "Touche \"%s\" supprimée (contexte: \"%s\")"
 
-msgid "Key:"
-msgstr "Touche:"
+#, c-format
+msgid "%sError: unable to unbind key \"%s\""
+msgstr "%sErreur: impossible de supprimer la touche \"%s\""
 
-msgid "No key found"
-msgstr "Aucune touche trouvée"
+#, c-format
+msgid "%sKey \"%s\" not found"
+msgstr "%sTouche \"%s\" non trouvée"
 
 #, c-format
-msgid "%sError: unable to bind key \"%s\""
-msgstr "%sErreur: impossible de créer la touche \"%s\""
+msgid "No key binding defined for context \"%s\""
+msgstr "Pas d'association de touche définie pour le contexte \"%s\""
 
 #, c-format
-msgid "Key \"%s\" unbound"
-msgstr "Touche \"%s\" supprimée"
+msgid "Key bindings (%d) for context \"%s\":"
+msgstr "Associations de touches (%d) pour le contexte \"%s\":"
 
 #, c-format
-msgid "%sError: unable to unbind key \"%s\""
-msgstr "%sErreur: impossible de supprimer la touche \"%s\""
+msgid "No default key binding for context \"%s\""
+msgstr "Pas de touche par défaut pour le contexte \"%s\""
 
 #, c-format
-msgid "Key \"%s\" has already default value"
-msgstr "La touche \"%s\" a déjà la valeur par défaut"
+msgid "Default key bindings (%d) for context \"%s\":"
+msgstr "Associations de touches par défaut (%d) pour le contexte \"%s\":"
+
+msgid "Key:"
+msgstr "Touche:"
+
+msgid "No key found"
+msgstr "Aucune touche trouvée"
 
 #, c-format
-msgid "%sKey \"%s\" not found"
-msgstr "%sTouche \"%s\" non trouvée"
+msgid "%sError: context \"%s\" not found"
+msgstr "%sErreur: contexte \"%s\" non trouvé"
 
-msgid "Default key bindings restored"
-msgstr "Touches par défaut restaurées"
+#, c-format
+msgid "Default key bindings restored for context \"%s\""
+msgstr "Touches par défaut restaurées pour le contexte \"%s\""
 
 #, c-format
 msgid "%sError: \"-yes\" argument is required for keys reset (security reason)"
@@ -439,9 +450,9 @@ msgstr ""
 
 #, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
-msgstr[0] "%d nouvelle touche ajoutée"
-msgstr[1] "%d nouvelles touches ajoutées"
+msgid_plural "%d new keys added (context: \"%s\")"
+msgstr[0] "%d nouvelle touche ajoutée (contexte: \"%s\")"
+msgstr[1] "%d nouvelles touches ajoutées (contexte: \"%s\")"
 
 #, c-format
 msgid "leaf: id: %d, parent: %d, plugin: \"%s\", buffer: \"%s\""
@@ -1287,6 +1298,10 @@ msgid ""
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1329,6 +1344,10 @@ msgstr ""
 "  complete_next: compléter le mot avec la complétion suivante\n"
 "  complete_previous: compléter le mot avec la complétion précédente\n"
 "  search_text: chercher du texte dans le tampon\n"
+"  search_switch_case: basculer la casse exacte pour la recherche\n"
+"  search_previous: chercher la ligne précédente\n"
+"  search_next: chercher la ligne suivante\n"
+"  search_stop: arrêter la recherche\n"
 "  delete_previous_char: effacer le caractère précédent\n"
 "  delete_next_char: effacer le caractère suivant\n"
 "  delete_previous_word: effacer le mot précédent\n"
@@ -1375,11 +1394,15 @@ msgid "bind/unbind keys"
 msgstr "associer/libérer des touches"
 
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
-"list|listdefault|listdiff || bind <touche> [<commande> [<args>]] || unbind "
-"<touche> || reset <touche> || resetall -yes || missing"
+"list|listdefault|listdiff [<contexte>] || bind <touche> [<commande> "
+"[<args>]] || bindctxt <contexte> <touche> [<commande> [<args>]] || unbind "
+"<touche> || unbindctxt <contexte> <touche> || reset <touche> || resetctxt "
+"<contexte> <touche> || resetall -yes [<contexte>] || missing [<contexte>]"
 
 msgid ""
 "       list: list all current keys (without argument, this list is "
@@ -1387,9 +1410,15 @@ msgid ""
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1405,17 +1434,25 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "       list: afficher toutes les touches courantes (sans paramètre, cette "
 "liste est affichée)\n"
 "listdefault: afficher les touches par défaut\n"
 "   listdiff: afficher les différences entre les touches courantes et celles "
 "par défaut (touches ajoutées, redéfinies ou supprimées)\n"
+"   contexte: nom du contexte (\"default\" ou \"search\")\n"
 "       bind: associer une commande à une touche ou affiche la commande "
 "associée à la touche\n"
+"   bindctxt: associer une commande à une touche ou affiche la commande "
+"associée à la touche pour le contexte donné\n"
 "     unbind: supprimer l'association à une touche\n"
+" unbindctxt: supprimer l'association à une touche pour le contexte donné\n"
 "      reset: réinitialiser une touche à son association par défaut\n"
+"  resetctxt: réinitialiser une touche à son association par défaut pour le "
+"contexte donné\n"
 "   resetall: restaurer les touches aux valeurs par défaut et supprimer "
 "TOUTES les touches personnelles (utiliser avec précaution !)\n"
 "    missing: ajouter les touches manquantes (en utilisant les touches par "
@@ -1431,7 +1468,9 @@ msgstr ""
 "  touche alt-r pour aller sur le canal IRC #weechat:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restaure l'association par défaut pour la touche alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  touche \"tab\" pour arrêter la recherche dans le tampon:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 
 msgid "save/apply/reset layout for buffers and windows"
 msgstr "sauver/appliquer/réinitialiser la disposition des tampons et fenêtres"
@@ -2009,9 +2048,15 @@ msgstr "options pour les proxies"
 msgid "options for bars"
 msgstr "options pour les barres"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+msgid "key contexts"
+msgstr "contextes de touches"
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr "codes des touches"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr ""
 "codes des touches pouvant être réinitialisées (touches ajoutées, redéfinies "
diff --git a/po/hu.po b/po/hu.po
index 7b55bf550..2e28b7bfa 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
 "PO-Revision-Date: 2011-05-15 10:51+0200\n"
 "Last-Translator: Andras Voroskoi <voroskoi@frugalware.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -75,9 +75,9 @@ msgstr ""
 "  -v, --version           WeeChat verziójának mutatása\n"
 "  -w, --weechat-commands  WeeChat parancsok mutatása\n"
 
-#. TRANSLATORS: "%s" is "weechat"
-#, c-format
-msgid "%s default keys:\n"
+#. TRANSLATORS: first "%s" is "weechat"
+#, fuzzy, c-format
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr "%s alapértelmezett billentyűk:\n"
 
 #, fuzzy, c-format
@@ -390,31 +390,51 @@ msgid "default command:"
 msgstr "%s belső parancsok:\n"
 
 #, fuzzy, c-format
-msgid "Key bindings added or redefined (%d):"
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr "Billentyűparancsok:\n"
 
 #, fuzzy, c-format
-msgid "Key bindings deleted (%d):"
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr "Billentyűparancsok:\n"
 
-#, fuzzy
-msgid "No key binding added, redefined or removed"
+#, fuzzy, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr "Billentyűparancsok:\n"
 
-#, fuzzy
-msgid "No key binding defined"
+#, fuzzy, c-format
+msgid "%sError: unable to bind key \"%s\""
+msgstr "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni\n"
+
+#, c-format
+msgid "Key \"%s\" has already default value"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
+msgstr "A(z) \"%s\" billentyűparancs visszavonva\n"
+
+#, fuzzy, c-format
+msgid "%sError: unable to unbind key \"%s\""
+msgstr "%s nem sikerült a(z) \"%s\" billentyűparancsot visszavonni\n"
+
+#, fuzzy, c-format
+msgid "%sKey \"%s\" not found"
+msgstr "%s a \"%s\" szerver nem található\n"
+
+#, fuzzy, c-format
+msgid "No key binding defined for context \"%s\""
 msgstr "Nincs aliasz definiálva.\n"
 
 #, fuzzy, c-format
-msgid "Key bindings (%d):"
+msgid "Key bindings (%d) for context \"%s\":"
 msgstr "Billentyűparancsok:\n"
 
-#, fuzzy
-msgid "No default key binding"
+#, fuzzy, c-format
+msgid "No default key binding for context \"%s\""
 msgstr "Alapértelmezett billentyűparancsok visszaállítva\n"
 
 #, fuzzy, c-format
-msgid "Default key bindings (%d):"
+msgid "Default key bindings (%d) for context \"%s\":"
 msgstr "Alapértelmezett billentyűparancsok visszaállítva\n"
 
 #, fuzzy
@@ -426,27 +446,11 @@ msgid "No key found"
 msgstr "Nem találtam billentyűt.\n"
 
 #, fuzzy, c-format
-msgid "%sError: unable to bind key \"%s\""
-msgstr "%s nem sikerült a(z) \"%s\" billentyűt hozzárendelni\n"
-
-#, fuzzy, c-format
-msgid "Key \"%s\" unbound"
-msgstr "A(z) \"%s\" billentyűparancs visszavonva\n"
-
-#, fuzzy, c-format
-msgid "%sError: unable to unbind key \"%s\""
-msgstr "%s nem sikerült a(z) \"%s\" billentyűparancsot visszavonni\n"
-
-#, c-format
-msgid "Key \"%s\" has already default value"
-msgstr ""
+msgid "%sError: context \"%s\" not found"
+msgstr "%s a \"%s\" modul nem található\n"
 
 #, fuzzy, c-format
-msgid "%sKey \"%s\" not found"
-msgstr "%s a \"%s\" szerver nem található\n"
-
-#, fuzzy
-msgid "Default key bindings restored"
+msgid "Default key bindings restored for context \"%s\""
 msgstr "Alapértelmezett billentyűparancsok visszaállítva\n"
 
 #, fuzzy, c-format
@@ -457,7 +461,7 @@ msgstr ""
 
 #, fuzzy, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "Nincs mellőzés megadva.\n"
 msgstr[1] "Nincs mellőzés megadva.\n"
 
@@ -1164,6 +1168,10 @@ msgid ""
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1207,8 +1215,10 @@ msgstr "billentyűk hozzárendelése/hozzárendelés eltávolítása"
 
 #, fuzzy
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 "[billentyű [funkció/parancs]] [unbind billentyű] [funkciók] [call funkció "
 "[\"paraméterek\"]] [reset -yes]"
@@ -1220,9 +1230,15 @@ msgid ""
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1238,7 +1254,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "billentyű: billentyű hozzárendelése valamely belső funkcióhoz vagy \"/\" "
 "jellel kezdődő parancshoz\n"
@@ -1693,9 +1711,15 @@ msgstr "Aliaszok listája:\n"
 msgid "options for bars"
 msgstr "Aliaszok listája:\n"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+msgid "key contexts"
+msgstr ""
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr ""
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 #, fuzzy
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr "Billentyűparancsok:\n"
diff --git a/po/it.po b/po/it.po
index 88627ad25..0cafa2ab1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
 "PO-Revision-Date: 2011-05-15 10:52+0200\n"
 "Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -79,9 +79,9 @@ msgstr ""
 "                        (consultare la documentazione per maggiori\n"
 "                        informazioni sulle opzioni disponibili)\n"
 
-#. TRANSLATORS: "%s" is "weechat"
-#, c-format
-msgid "%s default keys:\n"
+#. TRANSLATORS: first "%s" is "weechat"
+#, fuzzy, c-format
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr "tasti predefiniti di %s:\n"
 
 #, c-format
@@ -373,43 +373,28 @@ msgstr "Cronologia comandi buffer:"
 msgid "default command:"
 msgstr "comando predefinito:"
 
-#, c-format
-msgid "Key bindings added or redefined (%d):"
+#, fuzzy, c-format
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr "Associazioni tasti aggiunte o ridefinite (%d):"
 
-#, c-format
-msgid "Key bindings deleted (%d):"
+#, fuzzy, c-format
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr "Associazioni tasti rimosse (%d):"
 
-msgid "No key binding added, redefined or removed"
+#, fuzzy, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr "Nessuna combinazione tasti aggiunta, ridefinita o rimossa"
 
-msgid "No key binding defined"
-msgstr "Nessuna combinazione tasti definita"
-
-#, c-format
-msgid "Key bindings (%d):"
-msgstr "Combinazioni (%d):"
-
-msgid "No default key binding"
-msgstr "Nessuna associazione tasti predefinita"
-
-#, c-format
-msgid "Default key bindings (%d):"
-msgstr "Associazione tasti predefinita (%d):"
-
-msgid "Key:"
-msgstr "Tasto:"
-
-msgid "No key found"
-msgstr "Nessun tasto trovato"
-
 #, c-format
 msgid "%sError: unable to bind key \"%s\""
 msgstr "%sErrore: impossibile associare il tasto \"%s\""
 
 #, c-format
-msgid "Key \"%s\" unbound"
+msgid "Key \"%s\" has already default value"
+msgstr "Il tasto \"%s\" ha già un valore predefinito"
+
+#, fuzzy, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
 msgstr "Tasto \"%s\" non associato"
 
 #, c-format
@@ -417,14 +402,37 @@ msgid "%sError: unable to unbind key \"%s\""
 msgstr "%sErrore: impossibile rimuovere l'associazione del tasto \"%s\""
 
 #, c-format
-msgid "Key \"%s\" has already default value"
-msgstr "Il tasto \"%s\" ha già un valore predefinito"
-
-#, c-format
 msgid "%sKey \"%s\" not found"
 msgstr "%sTasto \"%s\" non trovato"
 
-msgid "Default key bindings restored"
+#, fuzzy, c-format
+msgid "No key binding defined for context \"%s\""
+msgstr "Nessuna combinazione tasti definita"
+
+#, fuzzy, c-format
+msgid "Key bindings (%d) for context \"%s\":"
+msgstr "Combinazioni (%d):"
+
+#, fuzzy, c-format
+msgid "No default key binding for context \"%s\""
+msgstr "Nessuna associazione tasti predefinita"
+
+#, fuzzy, c-format
+msgid "Default key bindings (%d) for context \"%s\":"
+msgstr "Associazione tasti predefinita (%d):"
+
+msgid "Key:"
+msgstr "Tasto:"
+
+msgid "No key found"
+msgstr "Nessun tasto trovato"
+
+#, fuzzy, c-format
+msgid "%sError: context \"%s\" not found"
+msgstr "%sErrore: filtro \"%s\" non trovato"
+
+#, fuzzy, c-format
+msgid "Default key bindings restored for context \"%s\""
 msgstr "Associazione tasti predefinita ripristinata"
 
 #, c-format
@@ -433,9 +441,9 @@ msgstr ""
 "%sErrore: l'argomento \"-yes\" è richiesto per il reset dei tasti (motivi di "
 "sicurezza)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "%d nuovo tasto aggiunto"
 msgstr[1] "%d nuovi tasti aggiunti"
 
@@ -1271,12 +1279,17 @@ msgstr "funzioni per la riga di comando"
 msgid "<action> [<arguments>]"
 msgstr "<azioni> [<argomenti>]"
 
+#, fuzzy
 msgid ""
 "list of actions:\n"
 "  return: simulate key \"enter\"\n"
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1364,22 +1377,32 @@ msgstr ""
 msgid "bind/unbind keys"
 msgstr "associa/disassocia tasti"
 
+#, fuzzy
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 "list|listdefault|listdiff || bind <tasto> [<comando> [<args>]] || unbind "
 "<tasto> || reset <tasto> || resetall -yes || missing"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1395,7 +1418,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "       list: elenca tutti i tasti correnti (senza argomento, viene "
 "visualizzata questa lista)\n"
@@ -1997,9 +2022,16 @@ msgstr "opzioni per i proxy"
 msgid "options for bars"
 msgstr "opzioni per le barre"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+#, fuzzy
+msgid "key contexts"
+msgstr "codici tasti"
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr "codici tasti"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr ""
 "codici tasti che possono essere ripristinati (tasti aggiunti, ridefiniti o "
diff --git a/po/pl.po b/po/pl.po
index 5acc8ae9b..156e3967d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
 "PO-Revision-Date: 2011-05-15 10:52+0200\n"
 "Last-Translator: Krzysztof Koroscik <soltys@szluug.org>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -82,9 +82,9 @@ msgstr ""
 "                    (zajrzyj do dokumentacji wtyczek po więcej informacji\n"
 "                    o dostępnych opcjach)\n"
 
-#. TRANSLATORS: "%s" is "weechat"
-#, c-format
-msgid "%s default keys:\n"
+#. TRANSLATORS: first "%s" is "weechat"
+#, fuzzy, c-format
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr "Domyślne skróty klawiszowe %s:\n"
 
 #, c-format
@@ -376,43 +376,28 @@ msgstr "Historia komend bufora:"
 msgid "default command:"
 msgstr "domyślna komenda:"
 
-#, c-format
-msgid "Key bindings added or redefined (%d):"
+#, fuzzy, c-format
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr "Dodane lub przedefiniowane skróty klawiszowe (%d):"
 
-#, c-format
-msgid "Key bindings deleted (%d):"
+#, fuzzy, c-format
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr "Usunięte skróty klawiszowe (%d):"
 
-msgid "No key binding added, redefined or removed"
+#, fuzzy, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr "Nie dodano, usunięto lub zmieniono żadnego skrótu klawiszowego"
 
-msgid "No key binding defined"
-msgstr "Nie zdefiniowano powiązań klawiszy"
-
-#, c-format
-msgid "Key bindings (%d):"
-msgstr "Powiązania klawiszy (%d):"
-
-msgid "No default key binding"
-msgstr "Brak domyślnych skrótów klawiszowych"
-
-#, c-format
-msgid "Default key bindings (%d):"
-msgstr "Domyślne skróty klawiszowe (%d):"
-
-msgid "Key:"
-msgstr "Klawisz:"
-
-msgid "No key found"
-msgstr "Nie znaleziono klawisza"
-
 #, c-format
 msgid "%sError: unable to bind key \"%s\""
 msgstr "%sBłąd: nie można przypisać klawisza \"%s\""
 
 #, c-format
-msgid "Key \"%s\" unbound"
+msgid "Key \"%s\" has already default value"
+msgstr "Klawisz \"%s\" juz ma domyślną wartość"
+
+#, fuzzy, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
 msgstr "Klawisz \"%s\" nieprzypisany"
 
 #, c-format
@@ -420,14 +405,37 @@ msgid "%sError: unable to unbind key \"%s\""
 msgstr "%sBłąd: nie można odbindować klawisza \"%s\""
 
 #, c-format
-msgid "Key \"%s\" has already default value"
-msgstr "Klawisz \"%s\" juz ma domyślną wartość"
-
-#, c-format
 msgid "%sKey \"%s\" not found"
 msgstr "%sKlawisz \"%s\" nie znaleziony"
 
-msgid "Default key bindings restored"
+#, fuzzy, c-format
+msgid "No key binding defined for context \"%s\""
+msgstr "Nie zdefiniowano powiązań klawiszy"
+
+#, fuzzy, c-format
+msgid "Key bindings (%d) for context \"%s\":"
+msgstr "Powiązania klawiszy (%d):"
+
+#, fuzzy, c-format
+msgid "No default key binding for context \"%s\""
+msgstr "Brak domyślnych skrótów klawiszowych"
+
+#, fuzzy, c-format
+msgid "Default key bindings (%d) for context \"%s\":"
+msgstr "Domyślne skróty klawiszowe (%d):"
+
+msgid "Key:"
+msgstr "Klawisz:"
+
+msgid "No key found"
+msgstr "Nie znaleziono klawisza"
+
+#, fuzzy, c-format
+msgid "%sError: context \"%s\" not found"
+msgstr "%sBłąd: nie odnaleziono filtru \"%s\""
+
+#, fuzzy, c-format
+msgid "Default key bindings restored for context \"%s\""
 msgstr "Przywrócono domyślne ustawienia klawiszy"
 
 #, c-format
@@ -436,9 +444,9 @@ msgstr ""
 "%sBłąd: argument \"-yes\" wymagany do zresetowania ustawień klawiszy "
 "(względy bezpieczeństwa)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "dodano %d nowy klawisz"
 msgstr[1] "dodano %d nowe klawisze"
 msgstr[2] "dodano %d nowych klawiszy"
@@ -1281,12 +1289,17 @@ msgstr "funkcje linii komend"
 msgid "<action> [<arguments>]"
 msgstr "<akcja> [<argumenty>]"
 
+#, fuzzy
 msgid ""
 "list of actions:\n"
 "  return: simulate key \"enter\"\n"
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1373,22 +1386,32 @@ msgstr ""
 msgid "bind/unbind keys"
 msgstr "dodaj/usuń przypisanie klawiszy"
 
+#, fuzzy
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 "list|listdefault|listdiff || bind <klawisz> [<komenda> [<argumenty>]] || "
 "unbind <klawisz> || reset <klawisz> || resetall -yes || missing"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1404,7 +1427,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "       list: wyświetla wszystkie obecne skróty (bez podanego argumentu, "
 "pokazywana jest ta lista)\n"
@@ -2002,9 +2027,16 @@ msgstr "opcje proxy"
 msgid "options for bars"
 msgstr "opcje pasków"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+#, fuzzy
+msgid "key contexts"
+msgstr "kody klawiszowe"
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr "kody klawiszowe"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr ""
 "kody klawiszy, które mogą być zresetowane (klawisze dodane, zredefiniowane "
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 934a67808..e5892bb5f 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
 "PO-Revision-Date: 2011-05-15 10:52+0200\n"
 "Last-Translator: Ivan Sichmann Freitas <ivansichfreitas@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -81,9 +81,9 @@ msgstr ""
 "informações\n"
 "                    sobre possíveis plugins)\n"
 
-#. TRANSLATORS: "%s" is "weechat"
-#, c-format
-msgid "%s default keys:\n"
+#. TRANSLATORS: first "%s" is "weechat"
+#, fuzzy, c-format
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr "%s teclas de atalho padrão:\n"
 
 #, c-format
@@ -379,29 +379,52 @@ msgstr "Histórico de comandos de buffer:"
 msgid "default command:"
 msgstr "comando padrão:"
 
-#, c-format
-msgid "Key bindings added or redefined (%d):"
+#, fuzzy, c-format
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr "Atalhos de teclado adicionados ou redefinidos (%d):"
 
-#, c-format
-msgid "Key bindings deleted (%d):"
+#, fuzzy, c-format
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr "Atalhos de teclado deletados (%d):"
 
-msgid "No key binding added, redefined or removed"
+#, fuzzy, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr "Nenhum atalho de teclado adicionado, redefinido ou removido"
 
-msgid "No key binding defined"
-msgstr "Nenhum atalho de teclado definido"
+#, c-format
+msgid "%sError: unable to bind key \"%s\""
+msgstr "%sErro: incapaz de associar o atalho à tecla \"%s\""
+
+#, c-format
+msgid "Key \"%s\" has already default value"
+msgstr "Tecla \"%s\" já possui valor padrão"
+
+#, fuzzy, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
+msgstr "Tecla \"%s\" não associada à nenhum atalho"
+
+#, c-format
+msgid "%sError: unable to unbind key \"%s\""
+msgstr "%sErro: incapaz de desassociar a tecla de atalho \"%s\""
 
 #, c-format
-msgid "Key bindings (%d):"
+msgid "%sKey \"%s\" not found"
+msgstr "%sTecla \"%s\" não encontrada"
+
+#, fuzzy, c-format
+msgid "No key binding defined for context \"%s\""
+msgstr "Nenhum atalho de teclado definido"
+
+#, fuzzy, c-format
+msgid "Key bindings (%d) for context \"%s\":"
 msgstr "Atalhos de teclado (%d):"
 
-msgid "No default key binding"
+#, fuzzy, c-format
+msgid "No default key binding for context \"%s\""
 msgstr "Nenhum atalho de teclado padrão"
 
-#, c-format
-msgid "Default key bindings (%d):"
+#, fuzzy, c-format
+msgid "Default key bindings (%d) for context \"%s\":"
 msgstr "Atalhos de teclado padrão (%d):"
 
 msgid "Key:"
@@ -410,27 +433,12 @@ msgstr "Tecla:"
 msgid "No key found"
 msgstr "Nenhuma tecla encontrada"
 
-#, c-format
-msgid "%sError: unable to bind key \"%s\""
-msgstr "%sErro: incapaz de associar o atalho à tecla \"%s\""
-
 #, fuzzy, c-format
-msgid "Key \"%s\" unbound"
-msgstr "Tecla \"%s\" não associada à nenhum atalho"
-
-#, c-format
-msgid "%sError: unable to unbind key \"%s\""
-msgstr "%sErro: incapaz de desassociar a tecla de atalho \"%s\""
-
-#, c-format
-msgid "Key \"%s\" has already default value"
-msgstr "Tecla \"%s\" já possui valor padrão"
-
-#, c-format
-msgid "%sKey \"%s\" not found"
-msgstr "%sTecla \"%s\" não encontrada"
+msgid "%sError: context \"%s\" not found"
+msgstr "%sErro: filtro \"%s\" não encontrado"
 
-msgid "Default key bindings restored"
+#, fuzzy, c-format
+msgid "Default key bindings restored for context \"%s\""
 msgstr "Atalhos de teclado padrão restaurados"
 
 #, fuzzy, c-format
@@ -439,9 +447,9 @@ msgstr ""
 "%sErro: argumento \"-yes\" é requerido para as teclas de reset (razões de "
 "segurança)"
 
-#, c-format
+#, fuzzy, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "%d nova tecla adicionada"
 msgstr[1] "%d novas teclas adicionadas"
 
@@ -1288,6 +1296,10 @@ msgid ""
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1371,22 +1383,32 @@ msgid "bind/unbind keys"
 msgstr "vincular/desvincular teclas"
 
 # it may be needed to translate this
+#, fuzzy
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 "list|listdefault|listdiff || bind <tecla> [<comando> [<args>]] || unbind "
 "<tecla> || reset <tecla> || resetall -yes || missing"
 
+#, fuzzy
 msgid ""
 "       list: list all current keys (without argument, this list is "
 "displayed)\n"
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1402,7 +1424,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "       list: lista todos as teclas atuais (sem argumentos, esta lista é "
 "mostrada)\n"
@@ -2002,9 +2026,16 @@ msgstr "opções para proxys"
 msgid "options for bars"
 msgstr "opções para barras"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+#, fuzzy
+msgid "key contexts"
+msgstr "códigos de tecla"
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr "códigos de tecla"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr ""
 "códigos de tecla que podem ser restaurados (teclas adicionadas, redefinidas "
diff --git a/po/ru.po b/po/ru.po
index fd369b7e0..5c3ef2338 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WeeChat 0.3.6-dev\n"
 "Report-Msgid-Bugs-To: flashcode@flashtux.org\n"
-"POT-Creation-Date: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\n"
 "PO-Revision-Date: 2011-05-15 10:52+0200\n"
 "Last-Translator: Pavel Shevchuk <stlwrt@gmail.com>\n"
 "Language-Team: weechat-dev <weechat-dev@nongnu.org>\n"
@@ -78,9 +78,9 @@ msgstr ""
 "  -v, --version           отобразить версию WeeChat\n"
 "  -w, --weechat-commands  отобразить команды WeeChat\n"
 
-#. TRANSLATORS: "%s" is "weechat"
-#, c-format
-msgid "%s default keys:\n"
+#. TRANSLATORS: first "%s" is "weechat"
+#, fuzzy, c-format
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr "%s клавиши по умолчанию:\n"
 
 #, fuzzy, c-format
@@ -393,31 +393,51 @@ msgid "default command:"
 msgstr "Внутренние команды %s:\n"
 
 #, fuzzy, c-format
-msgid "Key bindings added or redefined (%d):"
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr "Комбинации клавиш:\n"
 
 #, fuzzy, c-format
-msgid "Key bindings deleted (%d):"
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr "Комбинации клавиш:\n"
 
-#, fuzzy
-msgid "No key binding added, redefined or removed"
+#, fuzzy, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr "Комбинации клавиш:\n"
 
-#, fuzzy
-msgid "No key binding defined"
+#, fuzzy, c-format
+msgid "%sError: unable to bind key \"%s\""
+msgstr "%s не могу установить клавишу \"%s\"\n"
+
+#, c-format
+msgid "Key \"%s\" has already default value"
+msgstr ""
+
+#, fuzzy, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
+msgstr "Клавиша \"%s\" не привязана\n"
+
+#, fuzzy, c-format
+msgid "%sError: unable to unbind key \"%s\""
+msgstr "%s не могу отвязать клавишу \"%s\"\n"
+
+#, fuzzy, c-format
+msgid "%sKey \"%s\" not found"
+msgstr "%s сервер \"%s\" не найден\n"
+
+#, fuzzy, c-format
+msgid "No key binding defined for context \"%s\""
 msgstr "Сокращения не заданы.\n"
 
 #, fuzzy, c-format
-msgid "Key bindings (%d):"
+msgid "Key bindings (%d) for context \"%s\":"
 msgstr "Комбинации клавиш:\n"
 
-#, fuzzy
-msgid "No default key binding"
+#, fuzzy, c-format
+msgid "No default key binding for context \"%s\""
 msgstr "Комбинации клавиш по умолчанию восстановлены\n"
 
 #, fuzzy, c-format
-msgid "Default key bindings (%d):"
+msgid "Default key bindings (%d) for context \"%s\":"
 msgstr "Комбинации клавиш по умолчанию восстановлены\n"
 
 #, fuzzy
@@ -429,27 +449,11 @@ msgid "No key found"
 msgstr "Клавиши не найдены.\n"
 
 #, fuzzy, c-format
-msgid "%sError: unable to bind key \"%s\""
-msgstr "%s не могу установить клавишу \"%s\"\n"
-
-#, fuzzy, c-format
-msgid "Key \"%s\" unbound"
-msgstr "Клавиша \"%s\" не привязана\n"
-
-#, fuzzy, c-format
-msgid "%sError: unable to unbind key \"%s\""
-msgstr "%s не могу отвязать клавишу \"%s\"\n"
-
-#, c-format
-msgid "Key \"%s\" has already default value"
-msgstr ""
+msgid "%sError: context \"%s\" not found"
+msgstr "%s plugin \"%s\" не найден\n"
 
 #, fuzzy, c-format
-msgid "%sKey \"%s\" not found"
-msgstr "%s сервер \"%s\" не найден\n"
-
-#, fuzzy
-msgid "Default key bindings restored"
+msgid "Default key bindings restored for context \"%s\""
 msgstr "Комбинации клавиш по умолчанию восстановлены\n"
 
 #, fuzzy, c-format
@@ -459,7 +463,7 @@ msgstr ""
 
 #, fuzzy, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] "Игнорирования не заданы.\n"
 msgstr[1] "Игнорирования не заданы.\n"
 msgstr[2] "Игнорирования не заданы.\n"
@@ -1172,6 +1176,10 @@ msgid ""
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1215,8 +1223,10 @@ msgstr "установить/снять клавиши"
 
 #, fuzzy
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 "[клавиша [функция/команда]] [unbind клавиша] [функции] [call функция "
 "[\"аргументы\"]] [reset -yes]"
@@ -1228,9 +1238,15 @@ msgid ""
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1246,7 +1262,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 "  клавиша: отобразить или назначить этой клавише функцию или команду "
 "(начинающуюся на \"/\")\n"
@@ -1702,9 +1720,15 @@ msgstr "Список сокращений:\n"
 msgid "options for bars"
 msgstr "Список сокращений:\n"
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+msgid "key contexts"
+msgstr ""
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr ""
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 #, fuzzy
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr "Комбинации клавиш:\n"
diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake
index 6d5be3fe9..753bea09e 100644
--- a/po/srcfiles.cmake
+++ b/po/srcfiles.cmake
@@ -41,14 +41,14 @@ SET(WEECHAT_SOURCES
 ./src/gui/curses/gui-curses-chat.c
 ./src/gui/curses/gui-curses-color.c
 ./src/gui/curses/gui-curses.h
-./src/gui/curses/gui-curses-keyboard.c
+./src/gui/curses/gui-curses-key.c
 ./src/gui/curses/gui-curses-main.c
 ./src/gui/curses/gui-curses-window.c
 ./src/gui/gtk/gui-gtk-bar-window.c
 ./src/gui/gtk/gui-gtk-chat.c
 ./src/gui/gtk/gui-gtk-color.c
 ./src/gui/gtk/gui-gtk.h
-./src/gui/gtk/gui-gtk-keyboard.c
+./src/gui/gtk/gui-gtk-key.c
 ./src/gui/gtk/gui-gtk-main.c
 ./src/gui/gtk/gui-gtk-window.c
 ./src/gui/gui-bar.c
@@ -73,8 +73,8 @@ SET(WEECHAT_SOURCES
 ./src/gui/gui-hotlist.h
 ./src/gui/gui-input.c
 ./src/gui/gui-input.h
-./src/gui/gui-keyboard.c
-./src/gui/gui-keyboard.h
+./src/gui/gui-key.c
+./src/gui/gui-key.h
 ./src/gui/gui-layout.c
 ./src/gui/gui-layout.h
 ./src/gui/gui-line.c
diff --git a/po/weechat.pot b/po/weechat.pot
index 6cfb723ca..f972bedd2 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: 2011-06-29 10:27+0200\n"
+"POT-Creation-Date: 2011-07-05 11:34+0200\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"
@@ -47,9 +47,9 @@ msgid ""
 "                    about possible options)\n"
 msgstr ""
 
-#. TRANSLATORS: "%s" is "weechat"
+#. TRANSLATORS: first "%s" is "weechat"
 #, c-format
-msgid "%s default keys:\n"
+msgid "%s default keys (context: \"%s\"):\n"
 msgstr ""
 
 #, c-format
@@ -335,57 +335,65 @@ msgid "default command:"
 msgstr ""
 
 #, c-format
-msgid "Key bindings added or redefined (%d):"
+msgid "Key bindings added or redefined (%d) for context \"%s\":"
 msgstr ""
 
 #, c-format
-msgid "Key bindings deleted (%d):"
+msgid "Key bindings deleted (%d) for context \"%s\":"
 msgstr ""
 
-msgid "No key binding added, redefined or removed"
+#, c-format
+msgid "No key binding added, redefined or removed for context \"%s\""
 msgstr ""
 
-msgid "No key binding defined"
+#, c-format
+msgid "%sError: unable to bind key \"%s\""
 msgstr ""
 
 #, c-format
-msgid "Key bindings (%d):"
+msgid "Key \"%s\" has already default value"
 msgstr ""
 
-msgid "No default key binding"
+#, c-format
+msgid "Key \"%s\" unbound (context: \"%s\")"
 msgstr ""
 
 #, c-format
-msgid "Default key bindings (%d):"
+msgid "%sError: unable to unbind key \"%s\""
 msgstr ""
 
-msgid "Key:"
+#, c-format
+msgid "%sKey \"%s\" not found"
 msgstr ""
 
-msgid "No key found"
+#, c-format
+msgid "No key binding defined for context \"%s\""
 msgstr ""
 
 #, c-format
-msgid "%sError: unable to bind key \"%s\""
+msgid "Key bindings (%d) for context \"%s\":"
 msgstr ""
 
 #, c-format
-msgid "Key \"%s\" unbound"
+msgid "No default key binding for context \"%s\""
 msgstr ""
 
 #, c-format
-msgid "%sError: unable to unbind key \"%s\""
+msgid "Default key bindings (%d) for context \"%s\":"
 msgstr ""
 
-#, c-format
-msgid "Key \"%s\" has already default value"
+msgid "Key:"
+msgstr ""
+
+msgid "No key found"
 msgstr ""
 
 #, c-format
-msgid "%sKey \"%s\" not found"
+msgid "%sError: context \"%s\" not found"
 msgstr ""
 
-msgid "Default key bindings restored"
+#, c-format
+msgid "Default key bindings restored for context \"%s\""
 msgstr ""
 
 #, c-format
@@ -394,7 +402,7 @@ msgstr ""
 
 #, c-format
 msgid "%d new key added"
-msgid_plural "%d new keys added"
+msgid_plural "%d new keys added (context: \"%s\")"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -1016,6 +1024,10 @@ msgid ""
 "  complete_next: complete word with next completion\n"
 "  complete_previous: complete word with previous completion\n"
 "  search_text: search text in buffer\n"
+"  search_switch_case: switch exact case for search\n"
+"  search_previous: search previous line\n"
+"  search_next: search next line\n"
+"  search_stop: stop search\n"
 "  delete_previous_char: delete previous char\n"
 "  delete_next_char: delete next char\n"
 "  delete_previous_word: delete previous word\n"
@@ -1058,8 +1070,10 @@ msgid "bind/unbind keys"
 msgstr ""
 
 msgid ""
-"list|listdefault|listdiff || bind <key> [<command> [<args>]] || unbind <key> "
-"|| reset <key> || resetall -yes || missing"
+"list|listdefault|listdiff [<context>] || bind <key> [<command> [<args>]] || "
+"bindctxt <context> <key> [<command> [<args>]] || unbind <key> || unbindctxt "
+"<context> <key> || reset <key> || resetctxt <context> <key> || resetall -yes "
+"[<context>] || missing [<context>]"
 msgstr ""
 
 msgid ""
@@ -1068,9 +1082,15 @@ msgid ""
 "listdefault: list default keys\n"
 "   listdiff: list differences between current and default keys (keys added, "
 "redefined or deleted)\n"
-"       bind: bind a command to a key or display command bound to key\n"
-"     unbind: remove a key binding\n"
-"      reset: reset a key to default binding\n"
+"    context: name of context (\"default\" or \"search\")\n"
+"       bind: bind a command to a key or display command bound to key (for "
+"context \"default\")\n"
+"   bindctxt: bind a command to a key or display command bound to key, for "
+"given context\n"
+"     unbind: remove a key binding (for context \"default\")\n"
+" unbindctxt: remove a key binding for given context\n"
+"      reset: reset a key to default binding (for context \"default\")\n"
+"  resetctxt: reset a key to default binding, for given context\n"
 "   resetall: restore bindings to the default values and delete ALL personal "
 "bindings (use carefully!)\n"
 "    missing: add missing keys (using default bindings), useful after "
@@ -1086,7 +1106,9 @@ msgid ""
 "  key alt-r to jump to #weechat IRC channel:\n"
 "    /key bind meta-r /buffer #weechat\n"
 "  restore default binding for key alt-r:\n"
-"    /key reset meta-r"
+"    /key reset meta-r\n"
+"  key \"tab\" to stop search in buffer:\n"
+"    /key bindctxt search ctrl-I /input search_stop"
 msgstr ""
 
 msgid "save/apply/reset layout for buffers and windows"
@@ -1464,9 +1486,15 @@ msgstr ""
 msgid "options for bars"
 msgstr ""
 
+#. TRANSLATORS: "key" means "key on the keyboard"
+msgid "key contexts"
+msgstr ""
+
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes"
 msgstr ""
 
+#. TRANSLATORS: "key" means "key on the keyboard"
 msgid "key codes that can be reset (keys added, redefined or removed)"
 msgstr ""