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

Merge branch 'ni/mp/tuxbox' of bitbucket.org:neutrino-images/ni-neutrino-hd into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Commit: ebe71f8d49
Author: FlatTV <FlatTV@gmx.de>
Date: 2018-01-01 (Mon, 01 Jan 2018)
This commit is contained in:
FlatTV
2018-01-01 14:12:24 +01:00
parent 8f4f42f3f6 5176333e4b
commit ce5ded0cee
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
data/locale/deutsch.locale
View File

@@ -417,7 +417,6 @@ daemon_item.ushare_desc A/V und DLNA Medienserver
daemon_item.ushare_name uShare daemon_item.ushare_name uShare
daemon_item.xupnpd_desc eXtensible UPnP agent - DLNA Medienserver für IPTV daemon_item.xupnpd_desc eXtensible UPnP agent - DLNA Medienserver für IPTV
daemon_item.xupnpd_name xupnpd daemon_item.xupnpd_name xupnpd
>>>>>>>
date.Apr Apr date.Apr Apr
date.Aug Aug date.Aug Aug
date.Dec Dez date.Dec Dez