Merge branch 'master' into pu/msgbox

This commit is contained in:
2016-10-29 12:38:17 +02:00
14 changed files with 240 additions and 86 deletions

View File

@@ -2128,8 +2128,12 @@ typedef enum
LOCALE_REMOTEBOX_CHANNEL_NA,
LOCALE_REMOTEBOX_DEL,
LOCALE_REMOTEBOX_HEAD,
LOCALE_REMOTEBOX_IP,
LOCALE_REMOTEBOX_MOD,
LOCALE_REMOTEBOX_PASS,
LOCALE_REMOTEBOX_PORT,
LOCALE_REMOTEBOX_RBADDR,
LOCALE_REMOTEBOX_RBNAME,
LOCALE_REMOTEBOX_USER,
LOCALE_RESET_ALL,
LOCALE_RESET_CHANNELS,
LOCALE_RESET_CONFIRM,