From ae375cd9c5eea9f94dfc5b1911882aeee263cf42 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 21 Dec 2024 01:28:51 +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-dev.desktop.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/plasma-mobile-dev.desktop.cmake b/bin/plasma-mobile-dev.desktop.cmake index 0c1d8c2a..eebc6d9c 100644 --- a/bin/plasma-mobile-dev.desktop.cmake +++ b/bin/plasma-mobile-dev.desktop.cmake @@ -33,7 +33,7 @@ Name[pl]=Przenośna Plazma (Rozwój) Name[pt]=Plasma Mobile (Desenvolvimento) Name[pt_BR]=Plasma Mobile (desenvolvimento) Name[ru]=Plasma Mobile (разработка) -Name[sa]=प्लाज्मा मोबाईल (विकास) ९. +Name[sa]=प्लाज्मा मोबाईल (विकास) Name[sk]=Plasma Mobile (Vývoj) Name[sl]=Plasma Mobile (Razvoj) Name[sv]=Plasma mobil (utvecklingsversion)