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 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/update.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd96638c45
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-01 18:18:07 +01:00
parent c498527390 9af8ad3e8a
commit 6fb38c77a5
8 changed files with 107 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
data/locale/deutsch.locale
View File

@@ -722,6 +722,15 @@ flashupdate.selectimage Verfügbare Images/Files
flashupdate.settings Update-Einstellungen
flashupdate.titlereadflash Flash auslesen
flashupdate.titlewriteflash Flash schreiben
flashupdate.type_addon Erweiterung
flashupdate.type_beta Beta
flashupdate.type_internal Intern
flashupdate.type_locale Sprachdatei
flashupdate.type_release Release
flashupdate.type_settings Einstellungen
flashupdate.type_text Text
flashupdate.type_unknown Unbekannt
flashupdate.type_update Aktualisierung
flashupdate.update_with_settings_del_skipped Ordner [%s] kann nicht gelöscht werden. Eintrag wird übersprungen.
flashupdate.update_with_settings_error Error Flashspeicher!\n \nIm neuen Image sind nur noch %ld KB (von %ld KB) frei,\ndas ist zu wenig, um einen sicheren Betrieb zu gewährleisten.\n \nDer Vorgang wird abgebrochen!
flashupdate.update_with_settings_processed Image wird bearbeitet ...

9
data/locale/english.locale
View File

@@ -722,6 +722,15 @@ flashupdate.selectimage Available Images/Files
flashupdate.settings Update settings
flashupdate.titlereadflash Reading Flash
flashupdate.titlewriteflash Writing Flash
flashupdate.type_addon Addon
flashupdate.type_beta Beta
flashupdate.type_internal Internal
flashupdate.type_locale Locale
flashupdate.type_release Release
flashupdate.type_settings Settings
flashupdate.type_text Text
flashupdate.type_unknown Unknown
flashupdate.type_update Update
flashupdate.update_with_settings_del_skipped Folder [%s] can not be deleted. Entry is skipped.
flashupdate.update_with_settings_error Flash Error!\n \nNew Image only has %ld KB (out of %ld KB) left. Not\nenough space to complete this operation.\n \nCanceling operation!
flashupdate.update_with_settings_processed Image is being processed ...