From 8f4377d51751b08a7ab3a3fed799b57877a00c50 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 27 Mar 2021 06:09:43 +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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plasma_phone_components.notifyrc b/plasma_phone_components.notifyrc index 04f717a7..0d286c62 100644 --- a/plasma_phone_components.notifyrc +++ b/plasma_phone_components.notifyrc @@ -28,6 +28,7 @@ Name[x-test]=xxPlasmaxx [Event/captured] Name=Captured Name[ca]=Captura +Name[cs]=Zachyceno Name[en_GB]=Captured Name[es]=Capturado Name[eu]=Atzemanda @@ -48,6 +49,7 @@ Name[uk]=Захоплено Name[x-test]=xxCapturedxx Comment=Captured Comment[ca]=Captura +Comment[cs]=Zachyceno Comment[en_GB]=Captured Comment[es]=Capturado Comment[eu]=Atzemanda