From a63dcf2d9b4f489db77da7b79249dce7d79bf97c Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 16 Nov 2021 01:24:30 +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" --- applets/krunner/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop index 3cf71755..35cc0f9c 100644 --- a/applets/krunner/metadata.desktop +++ b/applets/krunner/metadata.desktop @@ -62,7 +62,7 @@ Comment[ro]=Caută și rulează aplicații și servicii Comment[ru]=Поиск и запуск приложений и служб Comment[sk]=Hľadať a spustiť Aplikácie a služby Comment[sl]=Poišči in poženi program in storitve -Comment[sv]=Sök och kör program och tjänster +Comment[sv]=Sök och kör applikationer och tjänster Comment[uk]=Пошук і запуск програм і служб Comment[x-test]=xxSearch and run Applications and servicesxx Comment[zh_CN]=搜索和运行应用程序及服务