Merge branch 'master' into pu/moviebrowser

This commit is contained in:
svenhoefer
2016-10-29 12:26:05 +02:00
10 changed files with 71 additions and 20 deletions

View File

@@ -2129,11 +2129,11 @@ typedef enum
LOCALE_REMOTEBOX_DEL,
LOCALE_REMOTEBOX_HEAD,
LOCALE_REMOTEBOX_MOD,
LOCALE_REMOTEBOX_USER,
LOCALE_REMOTEBOX_PASS,
LOCALE_REMOTEBOX_PORT,
LOCALE_REMOTEBOX_RBADDR,
LOCALE_REMOTEBOX_RBNAME,
LOCALE_REMOTEBOX_USER,
LOCALE_RESET_ALL,
LOCALE_RESET_CHANNELS,
LOCALE_RESET_CONFIRM,