From 44198d7d5ad8e86c24c724217bfdd90f4fa2648b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 7 Feb 2021 06:52:29 +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" --- plasma_phone_components.notifyrc | 1 + 1 file changed, 1 insertion(+) diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc index 9c8664d5..04f717a7 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -18,6 +18,7 @@ Name[pa]=ਪਲਾਜ਼ਮਾ Name[pl]=Plazma Name[pt]=Plasma Name[pt_BR]=Plasma +Name[ru]=Plasma Name[sk]=Plasma Name[sl]=Plasma Name[sv]=Plasma