From 844be8376e74ad9565e933a56a9bef4d04d06167 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 28 Jun 2021 01:31:11 +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" --- bin/plasma-mobile.desktop.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/plasma-mobile.desktop.cmake b/bin/plasma-mobile.desktop.cmake index ea9b42cd..e7c5a517 100644 --- a/bin/plasma-mobile.desktop.cmake +++ b/bin/plasma-mobile.desktop.cmake @@ -25,7 +25,7 @@ Name[lt]=Plasma mobilioji sąsaja Name[nl]=Plasma-mobiel Name[nn]=Plasma Mobile Name[pa]=ਪਲਾਜ਼ਮਾ ਮੋਬਾਈਲ -Name[pl]=Plazma Mobile +Name[pl]=Przenośna Plazma Name[pt]=Plasma Mobile Name[pt_BR]=Plasma Mobile Name[ro]=Plasma Mobile