From 98acc7f1932ddc7d5f07e6e5ed05b04c7a6ddd2e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 10 Sep 2020 06:35:50 +0200 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/org.kde.dolphin.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/org.kde.dolphin.desktop') diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 6e6b39e03..6427e9ffd 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -99,7 +99,7 @@ GenericName[sr@latin]=Menadžer fajlova GenericName[sv]=Filhanterare GenericName[tr]=Dosya Yöneticisi GenericName[uk]=Менеджер файлів -GenericName[vi]=Trình quản lí tập tin +GenericName[vi]=Trình quản lí tệp GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 GenericName[zh_TW]=檔案管理員 -- cgit v1.3