From 2f63d3aaa16b1ffc617e29771c1fdbd46babc246 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Mar 2020 06:03:45 +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 660e45f6..4f85adc6 100644 --- a/applets/krunner/metadata.desktop +++ b/applets/krunner/metadata.desktop @@ -2,6 +2,7 @@ Encoding=UTF-8 Name=Search And Run Name[ca]=Cerca i executa +Name[cs]=Vyhledat a spustit Name[es]=Buscar y ejecutar Name[et]=Otsimine ja käivitamine Name[eu]=Bilatu eta exekutatu @@ -23,6 +24,7 @@ Name[zh_TW]=搜尋並執行 Comment=Search and run Applications and services Comment[ca]=Cerca i executa aplicacions i serveis +Comment[cs]=Vyhledat a spustit aplikace a služby 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