diff --git a/po/POTFILES.in b/po/POTFILES.in
index e69d1443c..e0c0b0f4f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,8 +1,8 @@
 ./doc/docgen.py
-./src/core/hook/wee-hook-command-run.c
-./src/core/hook/wee-hook-command-run.h
 ./src/core/hook/wee-hook-command.c
 ./src/core/hook/wee-hook-command.h
+./src/core/hook/wee-hook-command-run.c
+./src/core/hook/wee-hook-command-run.h
 ./src/core/hook/wee-hook-completion.c
 ./src/core/hook/wee-hook-completion.h
 ./src/core/hook/wee-hook-config.c
@@ -17,10 +17,10 @@
 ./src/core/hook/wee-hook-hdata.h
 ./src/core/hook/wee-hook-hsignal.c
 ./src/core/hook/wee-hook-hsignal.h
-./src/core/hook/wee-hook-info-hashtable.c
-./src/core/hook/wee-hook-info-hashtable.h
 ./src/core/hook/wee-hook-info.c
 ./src/core/hook/wee-hook-info.h
+./src/core/hook/wee-hook-info-hashtable.c
+./src/core/hook/wee-hook-info-hashtable.h
 ./src/core/hook/wee-hook-infolist.c
 ./src/core/hook/wee-hook-infolist.h
 ./src/core/hook/wee-hook-line.c
@@ -39,10 +39,10 @@
 ./src/core/wee-arraylist.h
 ./src/core/wee-backtrace.c
 ./src/core/wee-backtrace.h
-./src/core/weechat.c
-./src/core/weechat.h
 ./src/core/wee-calc.c
 ./src/core/wee-calc.h
+./src/core/weechat.c
+./src/core/weechat.h
 ./src/core/wee-command.c
 ./src/core/wee-command.h
 ./src/core/wee-completion.c
@@ -59,6 +59,10 @@
 ./src/core/wee-dir.h
 ./src/core/wee-eval.c
 ./src/core/wee-eval.h
+./src/core/wee-hashtable.c
+./src/core/wee-hashtable.h
+./src/core/wee-hdata.c
+./src/core/wee-hdata.h
 ./src/core/wee-hook.c
 ./src/core/wee-hook.h
 ./src/core/wee-infolist.c
@@ -73,12 +77,12 @@
 ./src/core/wee-network.h
 ./src/core/wee-proxy.c
 ./src/core/wee-proxy.h
-./src/core/wee-secure.c
-./src/core/wee-secure.h
 ./src/core/wee-secure-buffer.c
 ./src/core/wee-secure-buffer.h
+./src/core/wee-secure.c
 ./src/core/wee-secure-config.c
 ./src/core/wee-secure-config.h
+./src/core/wee-secure.h
 ./src/core/wee-signal.c
 ./src/core/wee-signal.h
 ./src/core/wee-string.c
@@ -102,9 +106,12 @@
 ./src/gui/curses/gui-curses-key.c
 ./src/gui/curses/gui-curses-main.c
 ./src/gui/curses/gui-curses-mouse.c
+./src/gui/curses/gui-curses-term.c
 ./src/gui/curses/gui-curses-window.c
-./src/gui/curses/normal/main.c
 ./src/gui/curses/headless/main.c
+./src/gui/curses/headless/ncurses-fake.c
+./src/gui/curses/headless/ncurses-fake.h
+./src/gui/curses/normal/main.c
 ./src/gui/gui-bar.c
 ./src/gui/gui-bar.h
 ./src/gui/gui-bar-item.c
@@ -163,15 +170,15 @@
 ./src/plugins/buflist/buflist-command.h
 ./src/plugins/buflist/buflist-config.c
 ./src/plugins/buflist/buflist-config.h
+./src/plugins/buflist/buflist.h
 ./src/plugins/buflist/buflist-info.c
 ./src/plugins/buflist/buflist-info.h
 ./src/plugins/buflist/buflist-mouse.c
 ./src/plugins/buflist/buflist-mouse.h
-./src/plugins/buflist/buflist.h
 ./src/plugins/charset/charset.c
-./src/plugins/exec/exec.c
 ./src/plugins/exec/exec-buffer.c
 ./src/plugins/exec/exec-buffer.h
+./src/plugins/exec/exec.c
 ./src/plugins/exec/exec-command.c
 ./src/plugins/exec/exec-command.h
 ./src/plugins/exec/exec-completion.c
@@ -180,31 +187,31 @@
 ./src/plugins/exec/exec-config.h
 ./src/plugins/exec/exec.h
 ./src/plugins/fifo/fifo.c
-./src/plugins/fifo/fifo.h
 ./src/plugins/fifo/fifo-command.c
 ./src/plugins/fifo/fifo-command.h
 ./src/plugins/fifo/fifo-config.c
 ./src/plugins/fifo/fifo-config.h
+./src/plugins/fifo/fifo.h
 ./src/plugins/fifo/fifo-info.c
 ./src/plugins/fifo/fifo-info.h
 ./src/plugins/fset/fset-bar-item.c
 ./src/plugins/fset/fset-bar-item.h
 ./src/plugins/fset/fset-buffer.c
 ./src/plugins/fset/fset-buffer.h
+./src/plugins/fset/fset.c
 ./src/plugins/fset/fset-command.c
 ./src/plugins/fset/fset-command.h
 ./src/plugins/fset/fset-completion.c
 ./src/plugins/fset/fset-completion.h
 ./src/plugins/fset/fset-config.c
 ./src/plugins/fset/fset-config.h
+./src/plugins/fset/fset.h
 ./src/plugins/fset/fset-info.c
 ./src/plugins/fset/fset-info.h
 ./src/plugins/fset/fset-mouse.c
 ./src/plugins/fset/fset-mouse.h
 ./src/plugins/fset/fset-option.c
 ./src/plugins/fset/fset-option.h
-./src/plugins/fset/fset.c
-./src/plugins/fset/fset.h
 ./src/plugins/guile/weechat-guile-api.c
 ./src/plugins/guile/weechat-guile-api.h
 ./src/plugins/guile/weechat-guile.c
@@ -261,12 +268,9 @@
 ./src/plugins/irc/irc-tag.h
 ./src/plugins/irc/irc-upgrade.c
 ./src/plugins/irc/irc-upgrade.h
-./src/plugins/javascript/weechat-js-api.cpp
 ./src/plugins/javascript/weechat-js-api.h
-./src/plugins/javascript/weechat-js-v8.cpp
-./src/plugins/javascript/weechat-js-v8.h
-./src/plugins/javascript/weechat-js.cpp
 ./src/plugins/javascript/weechat-js.h
+./src/plugins/javascript/weechat-js-v8.h
 ./src/plugins/logger/logger-backlog.c
 ./src/plugins/logger/logger-backlog.h
 ./src/plugins/logger/logger-buffer.c
@@ -303,9 +307,9 @@
 ./src/plugins/plugin.h
 ./src/plugins/plugin-script-api.c
 ./src/plugins/plugin-script-api.h
+./src/plugins/plugin-script.c
 ./src/plugins/plugin-script-config.c
 ./src/plugins/plugin-script-config.h
-./src/plugins/plugin-script.c
 ./src/plugins/plugin-script.h
 ./src/plugins/python/weechat-python-api.c
 ./src/plugins/python/weechat-python-api.h
@@ -387,9 +391,9 @@
 ./src/plugins/tcl/weechat-tcl-api.h
 ./src/plugins/tcl/weechat-tcl.c
 ./src/plugins/tcl/weechat-tcl.h
-./src/plugins/trigger/trigger.c
 ./src/plugins/trigger/trigger-buffer.c
 ./src/plugins/trigger/trigger-buffer.h
+./src/plugins/trigger/trigger.c
 ./src/plugins/trigger/trigger-callback.c
 ./src/plugins/trigger/trigger-callback.h
 ./src/plugins/trigger/trigger-command.c
diff --git a/po/srcfiles.cmake b/po/srcfiles.cmake
index af5a5f45c..d1250f4e5 100644
--- a/po/srcfiles.cmake
+++ b/po/srcfiles.cmake
@@ -1,9 +1,9 @@
 SET(WEECHAT_SOURCES
 ./doc/docgen.py
-./src/core/hook/wee-hook-command-run.c
-./src/core/hook/wee-hook-command-run.h
 ./src/core/hook/wee-hook-command.c
 ./src/core/hook/wee-hook-command.h
+./src/core/hook/wee-hook-command-run.c
+./src/core/hook/wee-hook-command-run.h
 ./src/core/hook/wee-hook-completion.c
 ./src/core/hook/wee-hook-completion.h
 ./src/core/hook/wee-hook-config.c
@@ -18,10 +18,10 @@ SET(WEECHAT_SOURCES
 ./src/core/hook/wee-hook-hdata.h
 ./src/core/hook/wee-hook-hsignal.c
 ./src/core/hook/wee-hook-hsignal.h
-./src/core/hook/wee-hook-info-hashtable.c
-./src/core/hook/wee-hook-info-hashtable.h
 ./src/core/hook/wee-hook-info.c
 ./src/core/hook/wee-hook-info.h
+./src/core/hook/wee-hook-info-hashtable.c
+./src/core/hook/wee-hook-info-hashtable.h
 ./src/core/hook/wee-hook-infolist.c
 ./src/core/hook/wee-hook-infolist.h
 ./src/core/hook/wee-hook-line.c
@@ -40,10 +40,10 @@ SET(WEECHAT_SOURCES
 ./src/core/wee-arraylist.h
 ./src/core/wee-backtrace.c
 ./src/core/wee-backtrace.h
-./src/core/weechat.c
-./src/core/weechat.h
 ./src/core/wee-calc.c
 ./src/core/wee-calc.h
+./src/core/weechat.c
+./src/core/weechat.h
 ./src/core/wee-command.c
 ./src/core/wee-command.h
 ./src/core/wee-completion.c
@@ -60,6 +60,10 @@ SET(WEECHAT_SOURCES
 ./src/core/wee-dir.h
 ./src/core/wee-eval.c
 ./src/core/wee-eval.h
+./src/core/wee-hashtable.c
+./src/core/wee-hashtable.h
+./src/core/wee-hdata.c
+./src/core/wee-hdata.h
 ./src/core/wee-hook.c
 ./src/core/wee-hook.h
 ./src/core/wee-infolist.c
@@ -74,12 +78,12 @@ SET(WEECHAT_SOURCES
 ./src/core/wee-network.h
 ./src/core/wee-proxy.c
 ./src/core/wee-proxy.h
-./src/core/wee-secure.c
-./src/core/wee-secure.h
 ./src/core/wee-secure-buffer.c
 ./src/core/wee-secure-buffer.h
+./src/core/wee-secure.c
 ./src/core/wee-secure-config.c
 ./src/core/wee-secure-config.h
+./src/core/wee-secure.h
 ./src/core/wee-signal.c
 ./src/core/wee-signal.h
 ./src/core/wee-string.c
@@ -103,9 +107,12 @@ SET(WEECHAT_SOURCES
 ./src/gui/curses/gui-curses-key.c
 ./src/gui/curses/gui-curses-main.c
 ./src/gui/curses/gui-curses-mouse.c
+./src/gui/curses/gui-curses-term.c
 ./src/gui/curses/gui-curses-window.c
-./src/gui/curses/normal/main.c
 ./src/gui/curses/headless/main.c
+./src/gui/curses/headless/ncurses-fake.c
+./src/gui/curses/headless/ncurses-fake.h
+./src/gui/curses/normal/main.c
 ./src/gui/gui-bar.c
 ./src/gui/gui-bar.h
 ./src/gui/gui-bar-item.c
@@ -164,15 +171,15 @@ SET(WEECHAT_SOURCES
 ./src/plugins/buflist/buflist-command.h
 ./src/plugins/buflist/buflist-config.c
 ./src/plugins/buflist/buflist-config.h
+./src/plugins/buflist/buflist.h
 ./src/plugins/buflist/buflist-info.c
 ./src/plugins/buflist/buflist-info.h
 ./src/plugins/buflist/buflist-mouse.c
 ./src/plugins/buflist/buflist-mouse.h
-./src/plugins/buflist/buflist.h
 ./src/plugins/charset/charset.c
-./src/plugins/exec/exec.c
 ./src/plugins/exec/exec-buffer.c
 ./src/plugins/exec/exec-buffer.h
+./src/plugins/exec/exec.c
 ./src/plugins/exec/exec-command.c
 ./src/plugins/exec/exec-command.h
 ./src/plugins/exec/exec-completion.c
@@ -181,31 +188,31 @@ SET(WEECHAT_SOURCES
 ./src/plugins/exec/exec-config.h
 ./src/plugins/exec/exec.h
 ./src/plugins/fifo/fifo.c
-./src/plugins/fifo/fifo.h
 ./src/plugins/fifo/fifo-command.c
 ./src/plugins/fifo/fifo-command.h
 ./src/plugins/fifo/fifo-config.c
 ./src/plugins/fifo/fifo-config.h
+./src/plugins/fifo/fifo.h
 ./src/plugins/fifo/fifo-info.c
 ./src/plugins/fifo/fifo-info.h
 ./src/plugins/fset/fset-bar-item.c
 ./src/plugins/fset/fset-bar-item.h
 ./src/plugins/fset/fset-buffer.c
 ./src/plugins/fset/fset-buffer.h
+./src/plugins/fset/fset.c
 ./src/plugins/fset/fset-command.c
 ./src/plugins/fset/fset-command.h
 ./src/plugins/fset/fset-completion.c
 ./src/plugins/fset/fset-completion.h
 ./src/plugins/fset/fset-config.c
 ./src/plugins/fset/fset-config.h
+./src/plugins/fset/fset.h
 ./src/plugins/fset/fset-info.c
 ./src/plugins/fset/fset-info.h
 ./src/plugins/fset/fset-mouse.c
 ./src/plugins/fset/fset-mouse.h
 ./src/plugins/fset/fset-option.c
 ./src/plugins/fset/fset-option.h
-./src/plugins/fset/fset.c
-./src/plugins/fset/fset.h
 ./src/plugins/guile/weechat-guile-api.c
 ./src/plugins/guile/weechat-guile-api.h
 ./src/plugins/guile/weechat-guile.c
@@ -262,12 +269,9 @@ SET(WEECHAT_SOURCES
 ./src/plugins/irc/irc-tag.h
 ./src/plugins/irc/irc-upgrade.c
 ./src/plugins/irc/irc-upgrade.h
-./src/plugins/javascript/weechat-js-api.cpp
 ./src/plugins/javascript/weechat-js-api.h
-./src/plugins/javascript/weechat-js-v8.cpp
-./src/plugins/javascript/weechat-js-v8.h
-./src/plugins/javascript/weechat-js.cpp
 ./src/plugins/javascript/weechat-js.h
+./src/plugins/javascript/weechat-js-v8.h
 ./src/plugins/logger/logger-backlog.c
 ./src/plugins/logger/logger-backlog.h
 ./src/plugins/logger/logger-buffer.c
@@ -304,9 +308,9 @@ SET(WEECHAT_SOURCES
 ./src/plugins/plugin.h
 ./src/plugins/plugin-script-api.c
 ./src/plugins/plugin-script-api.h
+./src/plugins/plugin-script.c
 ./src/plugins/plugin-script-config.c
 ./src/plugins/plugin-script-config.h
-./src/plugins/plugin-script.c
 ./src/plugins/plugin-script.h
 ./src/plugins/python/weechat-python-api.c
 ./src/plugins/python/weechat-python-api.h
@@ -388,9 +392,9 @@ SET(WEECHAT_SOURCES
 ./src/plugins/tcl/weechat-tcl-api.h
 ./src/plugins/tcl/weechat-tcl.c
 ./src/plugins/tcl/weechat-tcl.h
-./src/plugins/trigger/trigger.c
 ./src/plugins/trigger/trigger-buffer.c
 ./src/plugins/trigger/trigger-buffer.h
+./src/plugins/trigger/trigger.c
 ./src/plugins/trigger/trigger-callback.c
 ./src/plugins/trigger/trigger-callback.h
 ./src/plugins/trigger/trigger-command.c