From eb0ffaf3be8d429cc5a45b16c0f4c8d05e551e17 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 16 May 2021 01:24:32 +0000 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" --- look-and-feel/metadata.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/look-and-feel/metadata.desktop b/look-and-feel/metadata.desktop index d9e64337..0a4566ac 100644 --- a/look-and-feel/metadata.desktop +++ b/look-and-feel/metadata.desktop @@ -57,7 +57,7 @@ Comment[lt]=Plasma darbo sritis, skirta išmaniesiems telefonams Comment[nl]=Plasma workspace voor smartphones Comment[nn]=Plasma-arbeidsområde for smarttelefonar Comment[pa]=ਸਮਾਰਟ-ਫ਼ੋਨ ਲਈ ਪਲਾਜ਼ਮਾ ਵਰਕਸਪੇਸ -Comment[pl]=Przestrzeń robocza Plazmy dla smartfonów +Comment[pl]=Przestrzeń pracy Plazmy dla smartfonów Comment[pt]=Área de trabalho Plasma para telemóveis Comment[pt_BR]=Espaço de trabalho Plasma para celulares Comment[ro]=Spațiu de lucru al Plasma pentru telefoane inteligente