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 @@ const char * locale_real_names[] =
"remotebox_channel_na",
"remotebox_del",
"remotebox_head",
"remotebox_ip",
"remotebox_mod",
"remotebox_pass",
"remotebox_port",
"remotebox_rbaddr",
"remotebox_rbname",
"remotebox_user",
"reset_all",
"reset_channels",
"reset_confirm",