From e2e6d4cc137c40d1236cab9c795dc864594d9351 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Thu, 3 Dec 2020 06:37: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 | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc index 82c1e6bc..9ab4682c 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -1,8 +1,26 @@ [Global] IconName=preferences-system-windows-effect-screenshot Name=Plasma +Name[ca]=Plasma +Name[nl]=Plasma +Name[pt]=Plasma +Name[sv]=Plasma +Name[uk]=Плазма +Name[x-test]=xxPlasmaxx [Event/captured] Name=Captured +Name[ca]=Captura +Name[nl]=Opgenomen +Name[pt]=Capturada +Name[sv]=Lagrad +Name[uk]=Захоплено +Name[x-test]=xxCapturedxx Comment=Captured +Comment[ca]=Captura +Comment[nl]=Opgenomen +Comment[pt]=Capturada +Comment[sv]=Lagrad +Comment[uk]=Захоплено +Comment[x-test]=xxCapturedxx Action=Popup