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
+2 -1
View File
@@ -425,4 +425,5 @@ $lang['Photo description'] = 'Fotots beskrivning';
$lang['Photo title'] = 'Fotots titel';
$lang['Album name, A → Z'] = 'Albumnam, A → Ö';
$lang['Album name, Z → A'] = 'Albumnamn, Ö → A';
$lang['Link: %s'] = 'Länk: %s';
$lang['Link: %s'] = 'Länk: %s';
$lang['Your authentication key is no longer valid.'] = 'Din autenticeringsnyckel är inte längre giltig.';