From e2fa4cedba91a660e0f1cbb5173172e78922dd9c Mon Sep 17 00:00:00 2001
From: l10n daemon script <scripty@kde.org>
Date: Fri, 18 Sep 2020 06:22:12 +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"
---
 menu/desktop/kf5-development-translation.directory | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/menu/desktop/kf5-development-translation.directory b/menu/desktop/kf5-development-translation.directory
index 3d68a9d04..10f6b8bf9 100644
--- a/menu/desktop/kf5-development-translation.directory
+++ b/menu/desktop/kf5-development-translation.directory
@@ -87,7 +87,7 @@ Name[ug]=تەرجىمىسى
 Name[uk]=Переклад
 Name[uz]=Tarjima
 Name[uz@cyrillic]=Таржима
-Name[vi]=Phiên dịch
+Name[vi]=Biên dịch
 Name[wa]=Ratournaedje
 Name[x-test]=xxTranslationxx
 Name[zh_CN]=翻译