Merge branch 'pu/mp' into 'master'

Origin commit data
------------------
Commit: ccb19a8880
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-10-17 (Tue, 17 Oct 2017)

data/locale/Makefile.am

@@ -21,7 +21,7 @@ locale_unmaintained = \
 	unmaintained/svenska.locale
 
 install_DATA  = $(locale)
-install_DATA += $(locale_unmaintained)
+# install_DATA += $(locale_unmaintained)
 
 
 if MAINTAINER_MODE
@@ -38,12 +38,12 @@ sort-locals:
 
 work-locals: $(master.locale)
 	for locale in $(locale); do \
-		$(top_srcdir)/data/locale/helpers/create-locals-work $${locale}; \
+		( cd $(top_srcdir)/data/locale; helpers/create-locals-work $${locale}; ); \
 	done
 
 ordercheck: $(master.locale)
-	cut -d' ' -f1 $(master.locale) | LC_ALL=C sort | uniq > /tmp/log
-	cut -d' ' -f1 $(master.locale) | uniq  | diff - /tmp/log || \
+	cut -d' ' -f1 $(top_srcdir)/data/locale/$(master.locale) | LC_ALL=C sort | uniq > /tmp/log
+	cut -d' ' -f1 $(top_srcdir)/data/locale/$(master.locale) | uniq  | diff - /tmp/log || \
 		(echo "ERROR: $(master.locale) not ordered or contains empty lines" && false)
 
 locals.h: ordercheck
@@ -61,8 +61,8 @@ check: locals.h locals_intern.h
 install-locals: $(locale) locals.h locals_intern.h
 	cp locals.h locals_intern.h $(top_srcdir)/src/system
 	@echo "Consider committing src/system/[locals.h locals_intern.h]"
-	cp -f $(locale) $(top_srcdir)/data/locale
-	@echo "Consider committing data/locale/[$(locale)]"
+	## ??? cp -f $(locale) $(top_srcdir)/data/locale
+	## @echo "Consider committing data/locale/[$(locale)]"
 
 locals-clean:
 	rm -f locals.h locals_intern.h $(locale)

data/locale/deutsch.locale

@@ -2245,8 +2245,8 @@ servicemenu.head Service
 servicemenu.imageinfo Imageinfo
 servicemenu.reload Kanallisten neu laden
 servicemenu.reload_hint Kanallisten werden neu geladen,\nbitte warten ...
-servicemenu.restart GUI neu starten
-servicemenu.restart_hint GUI wird neu gestartet ...
+servicemenu.restart Neutrino neu starten
+servicemenu.restart_hint Neutrino wird neu gestartet ...
 servicemenu.restart_refused_recording Aufnahme läuft. Neustart nicht möglich.
 servicemenu.scants Kanalsuche
 servicemenu.update Software-Aktualisierung

data/locale/english.locale

@@ -1409,7 +1409,7 @@ menu.hint_sleeptimer Set timer to put your box\nin sleep mode
 menu.hint_sleeptimer_min Default setting for sleeptimer
 menu.hint_sms_channel If enabled, numeric buttons in channel list used to search channel in SMS style
 menu.hint_sms_movie If enabled, numeric buttons in moviebrowser used to search movie in SMS style
-menu.hint_soft_restart Restart GUI without reboot
+menu.hint_soft_restart Restart Neutrino without reboot
 menu.hint_softupdate_check Check online update, download and flash firmware
 menu.hint_softupdate_check_local Select and flash firmware from local file
 menu.hint_softupdate_createimage_menu Backup of current software, including all settings
@@ -2246,7 +2246,7 @@ servicemenu.imageinfo Image info
 servicemenu.reload Reload channel lists
 servicemenu.reload_hint Reloading channel lists,\nplease be patient.
 servicemenu.restart Soft restart
-servicemenu.restart_hint Restarting, please wait
+servicemenu.restart_hint Restarting, please wait ...
 servicemenu.restart_refused_recording Cant restart, recording in progress
 servicemenu.scants Servicescan
 servicemenu.update Software Update

data/locale/helpers/create-locals-work

@@ -6,46 +6,56 @@
 # to, after manual editing, replace the outdated locale file.
 
 # Written by Barf on 2005-12-10.
+# reorganized by Stefan Seyfried 2016-01-03, following changes:
+#  * use strict, use warnings to find errors easier
+#  * make it work with the above pragmas
+#  * tolerance against empty locales in english.locale
 
-$masterfilename = "english.locale";
+use warnings;
+use strict;
+
+my $masterfilename = "english.locale";
 
 $#ARGV == 0 || die("Usage: create-locals-work file.locale.");
 
-$no_errors = 0;
-$last_was_ok = 1;
-$localefilename = @ARGV[0];
-$outfilename = $localefilename . "-work";
+my $no_errors = 0;
+my $last_was_ok = 1;
+my $localefilename = $ARGV[0];
+my $outfilename = $localefilename . "-work";
 
-open(masterfile, $masterfilename) || die("Could not open master file");
-open(localefile, $localefilename) || die("Could not open locale file");
-open(outfile, ">" . $outfilename) || die("Could not open output file");
+open(MASTER, $masterfilename) || die("Could not open master file $masterfilename");
+open(LOCALE, $localefilename) || die("Could not open locale file $localefilename");
+open(OUT, ">" . $outfilename) || die("Could not open output file $outfilename");
 
-%master = {};
-%locale = {};
+my %master;
+my %locale;
 
-while (<masterfile>) {
+my $line;
+while ($line = <MASTER>) {
     # master hash
-    $line = $_;
-    ($key) = /([^ ]+)/;
-    ($junk, $text) = /([^ ]+)[ ]+([^\n]+)/;
-    $master{$key} = $text;
+    chomp $line;
+    $line =~ s/^\s+//; # strip whitespace from start of line
+    my ($key, $text) = split /\s+/, $line, 2;
+    $master{$key} = $text ? $text : "";
 }
+close(MASTER);
 
-while (<localefile>) {
+while ($line = <LOCALE>) {
     # locale hash
-    $line = $_;
-    ($key) = /([^ ]+)/;
-    ($junk, $text) = /([^ ]+)[ ]+([^\n]+)/;
-    $locale{$key} = $text;
+    chomp $line;
+    $line =~ s/^\s+//;
+    my ($key, $text) = split /\s+/, $line, 2;
+    $locale{$key} = $text ? $text : "";
 }
+close(LOCALE);
 
-foreach $term (sort keys %master) {
+foreach my $term (sort keys %master) {
     if (exists $locale{$term}) {
-        print outfile $term,  " ", $locale{$term}, "\n";
+        print OUT $term." ".$locale{$term}."\n";
     } else {
         # not found
         $no_errors++;
-        print outfile $term,  " TRANSLATE ", $master{$term}, "\n";
+        print OUT $term." TRANSLATE ".$master{$term}."\n";
     }
 }