From d806a097e00b72058e030fd30ae6f0a22671fe3e Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 2 Mar 2020 05:54:40 +0100 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 1456b7c2..cf61f79b 100644 --- a/applets/krunner/metadata.desktop +++ b/applets/krunner/metadata.desktop @@ -5,6 +5,7 @@ Name[ca]=Cerca i executa Name[es]=Buscar y ejecutar Name[et]=Otsimine ja käivitamine Name[eu]=Bilatu eta exekutatu +Name[id]=Cari Dan Jalankan Name[it]=Cerca e avvia Name[ko]=찾아서 실행하기 Name[lt]=Ieškoti ir paleisti @@ -24,6 +25,7 @@ Comment[ca]=Cerca i executa aplicacions i serveis 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[id]=Cari dan jalankan Aplikasi dan layanan Comment[it]=Cerca e avvia applicazioni e servizi Comment[ko]=프로그램과 서비스 찾아서 실행하기 Comment[lt]=Ieškoti ir paleisti programas bei tarnybas