mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 18:01:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pu/moviebrowser

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1fc717f56f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-29 12:26:05 +02:00
parent dded0065cb 5b0d909a9f
commit 0e9db1640b
10 changed files with 71 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
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,

2
src/system/locals_intern.h
View File

@@ -2129,11 +2129,11 @@ const char * locale_real_names[] =
"remotebox_del",
"remotebox_head",
"remotebox_mod",
"remotebox_user",
"remotebox_pass",
"remotebox_port",
"remotebox_rbaddr",
"remotebox_rbname",
"remotebox_user",
"reset_all",
"reset_channels",
"reset_confirm",