From 22f11a2e192ac3bbb193530ef2ecd9873b5be6af Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 12 Jun 2023 01:53:33 +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 3cb910f06..8e4bdbad0 100644 --- a/linux/applications/org.kde.falkon.desktop +++ b/linux/applications/org.kde.falkon.desktop @@ -114,7 +114,7 @@ GenericName[ru]=Веб-браузер GenericName[sk]=Webový prehliadač GenericName[sl]=Spletni brskalnik GenericName[sv]=Webbläsare -GenericName[tr]=Web Tarayıcı +GenericName[tr]=Web Tarayıcısı GenericName[uk]=Переглядач інтернету GenericName[x-test]=xxWeb Browserxx GenericName[zh_CN]=网页浏览器