From 64fe673253c77695658b3158c731925fabe47233 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 30 Mar 2021 01:16:18 +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" --- plasma_phone_components.notifyrc | 1 + 1 file changed, 1 insertion(+) diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc index 0d286c62..88be6784 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -4,6 +4,7 @@ Name=Plasma Name[ast]=Plasma Name[ca]=Plasma Name[cs]=Plasma +Name[de]=Plasma Name[en_GB]=Plasma Name[es]=Plasma Name[eu]=Plasma