yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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"
This commit is contained in:
l10n daemon script 2017-05-13 05:59:44 +02:00
parent 6a4e9cbb58
commit 2281bd19d8
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
kcmkwin/kwinscreenedges/kwintouchscreen.desktop
View file

@ -14,6 +14,7 @@ Name=Touch Screen
Name[ca]=Pantalla tàctil
Name[ca@valencia]=Pantalla tàctil
Name[cs]=Dotyková obrazovka
Name[de]=Touchscreen
Name[es]=Pantalla táctil
Name[it]=Schermo a sfioramento
Name[nl]=Aanraakscherm