From 3b7402b0c1f55e6b92aca8ea06ef8cf0ecf3cec6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 3 May 2022 02:52:56 +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 f8048dba3..38f5ce269 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -105,7 +105,7 @@ GenericName[ru]=Веб-браузер GenericName[sk]=Webový prehliadač GenericName[sl]=Spletni brskalnik GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcısı +GenericName[tr]=Web Tarayıcı GenericName[uk]=Переглядач інтернету GenericName[x-test]=xxWeb Browserxx GenericName[zh_CN]=网页浏览器