From fbec3a1f804f0d0c746c72b97f290f82c09a5b02 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 7 Aug 2022 01:49:26 +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" --- src/kwin.notifyrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kwin.notifyrc b/src/kwin.notifyrc index 8dbfe637de..94b7a8055d 100644 --- a/src/kwin.notifyrc +++ b/src/kwin.notifyrc @@ -307,7 +307,7 @@ Name[ar]=إنهيار ويلاند_اكس Name[az]=Xwayland Qəzası Name[bg]=Срив на Xwayland Name[ca]=Fallada de l'Xwayland -Name[ca@valencia]=Fallada de l'XWayland +Name[ca@valencia]=Fallada d'XWayland Name[de]=Xwayland-Absturz Name[en_GB]=Xwayland Crash Name[es]=Fallo de Xwayland @@ -343,7 +343,7 @@ Comment[ar]=إنهار ويلاند_اكس Comment[az]=Xwayland qəzaya uğradı Comment[bg]=Xwayland се срина Comment[ca]=L'Xwayland ha fallat -Comment[ca@valencia]=L'XWayland ha fallat +Comment[ca@valencia]=XWayland ha fallat Comment[cs]=Xwayland spadnul Comment[de]=Xwayland ist abgestürzt Comment[en_GB]=Xwayland has crashed