From b79e4f302be6adc41f70e65b3692a0ff7b817e57 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Wed, 22 Jul 2020 06:12:54 +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 4303af24..6e1e655e 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[da]=Søg og kør Name[de]=Suchen und Ausführen Name[en_GB]=Search And Run Name[es]=Buscar y ejecutar @@ -30,6 +31,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[da]=Søg og kør programmer og tjenester 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