From 1873e2f08fed0397542c04ca02f67efc2fa307d3 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 6 Jan 2019 05:25:48 +0100 Subject: SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- src/settings/kcm/kcmdolphinviewmodes.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/settings/kcm/kcmdolphinviewmodes.desktop') diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop index 286320eaa..14f3e530e 100644 --- a/src/settings/kcm/kcmdolphinviewmodes.desktop +++ b/src/settings/kcm/kcmdolphinviewmodes.desktop @@ -226,5 +226,5 @@ X-KDE-Keywords[sv]=filhanterare X-KDE-Keywords[tr]=dosya yöneticisi X-KDE-Keywords[uk]=менеджер,керування,файл,файли X-KDE-Keywords[x-test]=xxfile managerxx -X-KDE-Keywords[zh_CN]=file manager,文件管理器 +X-KDE-Keywords[zh_CN]=文件管理器 X-KDE-Keywords[zh_TW]=檔案管理員 -- cgit v1.3