From: l10n daemon script <scripty@kde.org>
Date: Thu, 24 Sep 2020 08:10:10 +0000 (+0200)
Subject: SVN_SILENT made messages (.desktop file) - always resolve ours
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/71bc4498a37086b6805a0b837983d9a5253dd088

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"
---

diff --git a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
index 26d9993fc..4c33b3b2c 100644
--- a/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
+++ b/src/views/versioncontrol/fileviewversioncontrolplugin.desktop
@@ -45,7 +45,7 @@ Comment[sr@latin]=Priključak upravljanja verzijama za fajl prikaze
 Comment[sv]=Insticksprogram för versionskontroll i filvyer
 Comment[tr]=Dosya Görünümleri için Sürüm Kontrol Eklentisi
 Comment[uk]=Додаток керування версіями для панелей перегляду файлів
-Comment[vi]=Phần bổ sung Quản lí Phiên bản cho khung xem tệp
+Comment[vi]=Phần cài cắm "Quản lí phiên bản" cho khung xem tệp
 Comment[x-test]=xxVersion Control Plugin for File Viewsxx
 Comment[zh_CN]=文件视图的版本控制插件
 Comment[zh_TW]=檔案檢視的版本控制外掛程式