Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Origin commit data
------------------
Branch: ni/coolstream
Commit: 16340ed026
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-11 13:59:45 +01:00
5 changed files with 47 additions and 27 deletions

View File

@@ -1864,10 +1864,10 @@ moviebrowser.info_file Datei
moviebrowser.info_filename Dateiname
moviebrowser.info_genre_major Genre
moviebrowser.info_genre_minor Genre (untergeordnet)
moviebrowser.info_head Film Informationen
moviebrowser.info_head Film-Informationen
moviebrowser.info_head_update Inhalte in allen sichtbaren Filminfos speichern
moviebrowser.info_info1 Info 1
moviebrowser.info_info2 Info 2
moviebrowser.info_info1 Genre bzw. Episoden
moviebrowser.info_info2 Film-Beschreibung
moviebrowser.info_length Spieldauer (Min)
moviebrowser.info_parental_lockage FSK
moviebrowser.info_parental_lockage_0year immer
@@ -1924,9 +1924,9 @@ moviebrowser.short_filename Name
moviebrowser.short_format Format
moviebrowser.short_genre_major Genre
moviebrowser.short_genre_minor Genre
moviebrowser.short_info1 Info 1
moviebrowser.short_info2 Info 2
moviebrowser.short_length Min
moviebrowser.short_info1 Genre/Episoden
moviebrowser.short_info2 Beschreibung
moviebrowser.short_length Länge
moviebrowser.short_parental_lockage FSK
moviebrowser.short_path Pfad
moviebrowser.short_prevplaydate Zuletzt

View File

@@ -1864,10 +1864,10 @@ moviebrowser.info_file File
moviebrowser.info_filename Filename
moviebrowser.info_genre_major Genre
moviebrowser.info_genre_minor Genre (minor)
moviebrowser.info_head Film Information
moviebrowser.info_head Movie informations
moviebrowser.info_head_update Save changes in all movie info files
moviebrowser.info_info1 Info 1
moviebrowser.info_info2 Info 2
moviebrowser.info_info1 Genre resp. episodes
moviebrowser.info_info2 Movie description
moviebrowser.info_length Length (Min)
moviebrowser.info_parental_lockage Parental Lock age
moviebrowser.info_parental_lockage_0year always
@@ -1924,9 +1924,9 @@ moviebrowser.short_filename Name
moviebrowser.short_format Format
moviebrowser.short_genre_major Genre
moviebrowser.short_genre_minor Genre
moviebrowser.short_info1 Info 1
moviebrowser.short_info2 Info 2
moviebrowser.short_length Min
moviebrowser.short_info1 Genre/Episodes
moviebrowser.short_info2 Description
moviebrowser.short_length Length
moviebrowser.short_parental_lockage Age
moviebrowser.short_path Path
moviebrowser.short_prevplaydate Last