From ddccf4f3201d04bb9343a098bc882f1c17a85ad0 Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Wed, 9 Sep 2020 06:36:13 +0200
Subject: [PATCH] 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/kcmdolphingeneral.desktop    | 2 +-
 src/settings/kcm/kcmdolphinnavigation.desktop | 2 +-
 src/settings/kcm/kcmdolphinservices.desktop   | 2 +-
 src/settings/kcm/kcmdolphinviewmodes.desktop  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/settings/kcm/kcmdolphingeneral.desktop b/src/settings/kcm/kcmdolphingeneral.desktop
index f6f996c41..ad3453090 100644
--- a/src/settings/kcm/kcmdolphingeneral.desktop
+++ b/src/settings/kcm/kcmdolphingeneral.desktop
@@ -248,7 +248,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
-X-KDE-Keywords[vi]=file manager,trình quản lí tập tin
+X-KDE-Keywords[vi]=file manager,trình quản lí tệp
 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
diff --git a/src/settings/kcm/kcmdolphinnavigation.desktop b/src/settings/kcm/kcmdolphinnavigation.desktop
index 1db09c88a..18c0b25d6 100644
--- a/src/settings/kcm/kcmdolphinnavigation.desktop
+++ b/src/settings/kcm/kcmdolphinnavigation.desktop
@@ -248,7 +248,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
-X-KDE-Keywords[vi]=file manager,trình quản lí tập tin
+X-KDE-Keywords[vi]=file manager,trình quản lí tệp
 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
diff --git a/src/settings/kcm/kcmdolphinservices.desktop b/src/settings/kcm/kcmdolphinservices.desktop
index b504901b7..e29706d10 100644
--- a/src/settings/kcm/kcmdolphinservices.desktop
+++ b/src/settings/kcm/kcmdolphinservices.desktop
@@ -198,7 +198,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
-X-KDE-Keywords[vi]=file manager,trình quản lí tập tin
+X-KDE-Keywords[vi]=file manager,trình quản lí tệp
 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
diff --git a/src/settings/kcm/kcmdolphinviewmodes.desktop b/src/settings/kcm/kcmdolphinviewmodes.desktop
index 8f13ce5ab..315427a8f 100644
--- a/src/settings/kcm/kcmdolphinviewmodes.desktop
+++ b/src/settings/kcm/kcmdolphinviewmodes.desktop
@@ -247,7 +247,7 @@ X-KDE-Keywords[sr@latin]=file manager,menadžer fajlova
 X-KDE-Keywords[sv]=filhanterare
 X-KDE-Keywords[tr]=dosya yöneticisi
 X-KDE-Keywords[uk]=менеджер,керування,файл,файли
-X-KDE-Keywords[vi]=file manager,trình quản lí tập tin
+X-KDE-Keywords[vi]=file manager,trình quản lí tệp
 X-KDE-Keywords[x-test]=xxfile managerxx
 X-KDE-Keywords[zh_CN]=文件管理器
 X-KDE-Keywords[zh_TW]=檔案管理員
-- 
2.47.3