From fb6681d5a54bc13d46d496b3a141f23c2d8ff8f6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 17 Feb 2020 05:51:58 +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 ++ shell/metadata.desktop | 1 + 2 files changed, 3 insertions(+) diff --git a/applets/krunner/metadata.desktop b/applets/krunner/metadata.desktop index 680cd2a7..ffd4ca0f 100644 --- a/applets/krunner/metadata.desktop +++ b/applets/krunner/metadata.desktop @@ -8,6 +8,7 @@ Name[eu]=Bilatu eta exekutatu Name[ko]=찾아서 실행하기 Name[lt]=Ieškoti ir paleisti Name[nl]=Zoeken en uitvoeren +Name[nn]=Søk og køyr Name[pt]=Pesquisar e Executar Name[pt_BR]=Pesquisar e executar Name[ru]=Поиск и запуск @@ -25,6 +26,7 @@ Comment[eu]=Bilatu eta exekutatu aplikazioak eta zerbitzuak Comment[ko]=프로그램과 서비스 찾아서 실행하기 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[pt]=Pesquisa e executa aplicações e serviços Comment[pt_BR]=Pesquisa e executa aplicativos e serviços Comment[ru]=Поиск и запуск приложений и служб diff --git a/shell/metadata.desktop b/shell/metadata.desktop index ca92ada9..432cc0b9 100644 --- a/shell/metadata.desktop +++ b/shell/metadata.desktop @@ -51,6 +51,7 @@ Comment[it]=Shell di Plasma per telefoni Comment[ko]=휴대폰용 Plasma 셸 Comment[lt]=Plasma apvalkalas, skirtas telefonams Comment[nl]=Plasma-shell voor telefoons +Comment[nn]=Plasma-skal for telefonar Comment[pl]=Powłoka Plazmy dla telefonów Comment[pt]=Área de trabalho Plasma para telemóveis Comment[pt_BR]=Plasma Shell para telefones