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
@@ -428,4 +428,5 @@ $lang['Photo description'] = '相片描述';
$lang['Photo title'] = '相片标题';
$lang['Album name, A → Z'] = '相册名称, A → Z';
$lang['Album name, Z → A'] = '相册名称, Z → A';
$lang['Link: %s'] = '链接: %s';
$lang['Link: %s'] = '链接: %s';
$lang['Your authentication key is no longer valid.'] = '您的认证密钥已失效。';