From fd513da3544bf2ae7057a2ff7b9f277b77820c93 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 7 Jun 2021 02:17:15 +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" --- dataengines/keystate/plasma-dataengine-keystate.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dataengines/keystate/plasma-dataengine-keystate.desktop b/dataengines/keystate/plasma-dataengine-keystate.desktop index bfbea1da3..f250d5892 100644 --- a/dataengines/keystate/plasma-dataengine-keystate.desktop +++ b/dataengines/keystate/plasma-dataengine-keystate.desktop @@ -82,7 +82,7 @@ Comment[ca@valencia]=Modificador de l'estat del teclat i dels botons del ratolí Comment[cs]=Stavy modifikátorů klávesnice a tlačítek myši Comment[csb]=Mòdifikatora klawiaturë ë stónu klawiszów mëszë Comment[da]=Tilstand for tastaturets ændringstaster og museknapper -Comment[de]=Status von Sonder- und Maustasten +Comment[de]=Status von Modifizierer- und Maustasten Comment[el]=Τροποποιητής πληκτρολογίου και κατάστασης κουμπιών ποντικιού Comment[en_GB]=Keyboard modifier and mouse buttons states Comment[es]=Estado del modificador de teclado y botones del ratón