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"
5 years ago · fd513da354
parent b8512b9b03
commit fd513da354
1 changed files with 1 additions and 1 deletions
--- 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