From 3922350d2072d9fd6208117568d590e397a0abc4 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 15 Dec 2020 06:27:59 +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 191902f6..585ee129 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -1,6 +1,7 @@ [Global] IconName=preferences-system-windows-effect-screenshot Name=Plasma +Name[ast]=Plasma Name[ca]=Plasma Name[cs]=Plasma Name[en_GB]=Plasma