merge --squash from translation up to f9fecd0be0

git merge --squash is simpler for the first time, then we plan to do cherry-pick
This commit is contained in:
plegall
2016-03-08 10:51:10 +01:00
parent d80d853a23
commit 2e071ba4a1
74 changed files with 1307 additions and 226 deletions
@@ -24,4 +24,4 @@ $lang['Autohide the bar of the slideshow'] = 'Diashow-Menüleiste automatisch au
$lang['Loop the slideshow'] = 'Diashow in Endlosschleife';
$lang['More Information'] = 'Mehr Informationen';
$lang['Slideshow Options'] = 'Diashow-Optionen';
$lang['Smartpocket, Configuration Page'] = 'Smartpocket, Konfigurationsseite';
$lang['Smartpocket, Configuration Page'] = 'Smartpocket-Konfigurationsseite';