From d0d552d634fa39551ef7c4ec2b66e38162dacd76 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 3 Jul 2022 03:28:02 +0000 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" --- linux/applications/org.kde.falkon.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/applications/org.kde.falkon.desktop b/linux/applications/org.kde.falkon.desktop index 74fd742d8..2091caf43 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -34,7 +34,7 @@ Name[sv]=Falkon Name[tr]=Falkon Name[uk]=Falkon Name[x-test]=xxFalkonxx -Name[zh_CN]=Falkon +Name[zh_CN]=Falkon 浏览器 Name[zh_TW]=Falkon Type=Application Icon=falkon