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

Merge branch 'master' into pu/msgbox

Browse Source 
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2016-11-10 10:27:22 +01:00
parent 7fe97fde28 c4bbe9d2c2
commit 0018c2b158
22 changed files with 707 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
data/locale/deutsch.locale
View File

@@ -1635,6 +1635,7 @@ moviebrowser.book_position Position:
moviebrowser.book_type Sprung (<0 zurück, >0 vor):
moviebrowser.book_type_backward Wiederholung
moviebrowser.book_type_forward Überspringen
moviebrowser.browser_additional Zusätzliche Informationen
moviebrowser.browser_frame_high Anzeigehöhe oberes Fenster [%]
moviebrowser.browser_row_head Spalten Einstellungen
moviebrowser.browser_row_item Spalteninfo
@@ -1663,11 +1664,12 @@ moviebrowser.edit_book_type_info1 Neue Sprunglänge (s)
moviebrowser.edit_book_type_info2 <0 zurück , >0 vor, 0: kein
moviebrowser.edit_serie Name der Serie
moviebrowser.error_no_movies Keine Filme gefunden
moviebrowser.filter_off Filter aus
moviebrowser.foot_filter Filter:
moviebrowser.foot_focus Fenster umschalten
moviebrowser.foot_focus Fenster wechseln
moviebrowser.foot_options Optionen
moviebrowser.foot_play Film starten
moviebrowser.foot_refresh Liste neu laden
moviebrowser.foot_play Wiedergabe
moviebrowser.foot_refresh Neu laden
moviebrowser.foot_sort Sortieren:
moviebrowser.head Meine Aufnahmen
moviebrowser.head_filter Filme nach Kategorie filtern:

4
data/locale/english.locale
View File

@@ -1635,6 +1635,7 @@ moviebrowser.book_position Position:
moviebrowser.book_type Jump (<0 back , >0 for):
moviebrowser.book_type_backward Repeat
moviebrowser.book_type_forward jump over
moviebrowser.browser_additional Additional informations
moviebrowser.browser_frame_high Browser height [%]
moviebrowser.browser_row_head Row settings
moviebrowser.browser_row_item Row item
@@ -1663,10 +1664,11 @@ moviebrowser.edit_book_type_info1 Enter new jump length (s)
moviebrowser.edit_book_type_info2 <0 back , >0 for, 0: none
moviebrowser.edit_serie Enter name of serie
moviebrowser.error_no_movies No movies found
moviebrowser.filter_off Filter off
moviebrowser.foot_filter Filter:
moviebrowser.foot_focus Switch window
moviebrowser.foot_options Options
moviebrowser.foot_play Start movie
moviebrowser.foot_play Playback
moviebrowser.foot_refresh Refresh list
moviebrowser.foot_sort Sort:
moviebrowser.head My recordings