From 624d43f9a842f2ed5a8e0dc9fa85691a6f848b80 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 20 Jun 2020 05:14:02 +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 9d28dc49..4303af24 100644 --- a/applets/krunner/metadata.desktop +++ b/applets/krunner/metadata.desktop @@ -3,6 +3,7 @@ Encoding=UTF-8 Name=Search And Run Name[ca]=Cerca i executa Name[cs]=Vyhledat a spustit +Name[de]=Suchen und Ausführen Name[en_GB]=Search And Run Name[es]=Buscar y ejecutar Name[et]=Otsimine ja käivitamine @@ -29,6 +30,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[de]=Anwendungen und Dienste suchen und ausführen Comment[en_GB]=Search and run Applications and services Comment[es]=Buscar y ejecutar aplicaciones y servicios Comment[et]=Rakenduste ja teenuste otsimine ja käivitamine