wilderjds
/
plasma-workspace
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse Source 
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"
wilder-5.22
l10n daemon script 5 years ago
parent b8512b9b03
commit fd513da354
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dataengines/keystate/plasma-dataengine-keystate.desktop

2
dataengines/keystate/plasma-dataengine-keystate.desktop
Unescape View File

@ -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[cs]=Stavy modifikátorů klávesnice a tlačítek myši
Comment[csb]=Mòdifikatora klawiaturë ë stónu klawiszów mëszë Comment[csb]=Mòdifikatora klawiaturë ë stónu klawiszów mëszë
Comment[da]=Tilstand for tastaturets ændringstaster og museknapper 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[el]=Τροποποιητής πληκτρολογίου και κατάστασης κουμπιών ποντικιού
Comment[en_GB]=Keyboard modifier and mouse buttons states Comment[en_GB]=Keyboard modifier and mouse buttons states
Comment[es]=Estado del modificador de teclado y botones del ratón Comment[es]=Estado del modificador de teclado y botones del ratón

Write Preview
Loading…
Cancel
Save