From 69f223746d65f3c8b90d1654f9424d721d6052b7 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 25 Dec 2020 06:23:37 +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 0e307ec5..3cf71755 100644 --- a/applets/krunner/metadata.desktop +++ b/applets/krunner/metadata.desktop @@ -21,6 +21,7 @@ Name[lt]=Ieškoti ir paleisti Name[nl]=Zoeken en uitvoeren Name[nn]=Søk og køyr Name[pa]=ਖੋਜੋ ਤੇ ਚਲਾਓ +Name[pl]=Znajdź i uruchom Name[pt]=Pesquisar e Executar Name[pt_BR]=Pesquisar e executar Name[ro]=Căutare și lansare @@ -54,6 +55,7 @@ Comment[lt]=Ieškoti ir paleisti programas bei tarnybas Comment[nl]=Zoeken en uitvoeren van toepassingen en services Comment[nn]=Søk etter og køyr program og tenester Comment[pa]=ਐਪਲੀਕੇਸ਼ਨਾਂ ਤੇ ਸੇਵਾਵਾਂ ਖੋਜੋ ਤੇ ਚਲਾਓ +Comment[pl]=Znajduj i uruchamiaj aplikacje i usługi Comment[pt]=Pesquisa e executa aplicações e serviços Comment[pt_BR]=Pesquisa e executa aplicativos e serviços Comment[ro]=Caută și rulează aplicații și servicii