From ef4d7f0145006fdb9ddbc186d7e38df101eb9134 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 5 Sep 2019 05:26:01 +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" --- runners/appstream/plasma-runner-appstream.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/runners/appstream/plasma-runner-appstream.desktop b/runners/appstream/plasma-runner-appstream.desktop index 4b87b39fb..6ef24c059 100644 --- a/runners/appstream/plasma-runner-appstream.desktop +++ b/runners/appstream/plasma-runner-appstream.desktop @@ -14,7 +14,7 @@ Name[fr]=Logithèque Name[gl]=Centro de Software Name[he]=מרכז התוכנות Name[hu]=Szoftverközpont -Name[id]=Pusat Software +Name[id]=Sentra Perangkat Lunak Name[it]=Software Center Name[ko]=소프트웨어 센터 Name[lt]=Programinės įrangos centras