From dcb68989dd293f04d14d51c7675a860a3aa5ae27 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 11 May 2020 06:33:21 +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" --- applets/krunner/metadata.desktop | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop index 44a67122..9a6b71f6 100644 --- a/applets/krunner/metadata.desktop +++ b/applets/krunner/metadata.desktop @@ -8,6 +8,7 @@ Name[es]=Buscar y ejecutar Name[et]=Otsimine ja käivitamine Name[eu]=Bilatu eta exekutatu Name[fi]=Etsi ja käynnistä +Name[fr]=Chercher et lancer Name[id]=Cari Dan Jalankan Name[it]=Cerca e avvia Name[ko]=찾아서 실행하기 @@ -32,6 +33,7 @@ Comment[es]=Buscar y ejecutar aplicaciones y servicios Comment[et]=Rakenduste ja teenuste otsimine ja käivitamine Comment[eu]=Bilatu eta exekutatu aplikazioak eta zerbitzuak Comment[fi]=Etsi ja käynnistä sovelluksia ja palveluja +Comment[fr]=Chercher et lancer des applications et des services Comment[id]=Cari dan jalankan Aplikasi dan layanan Comment[it]=Cerca e avvia applicazioni e servizi Comment[ko]=프로그램과 서비스 찾아서 실행하기