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-23 05:54:25 +02:00
parent 0f66fa648f
commit 67ab6d9b31
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

@ -15,6 +15,7 @@ Name[ca]=Pantalla tàctil
Name[ca@valencia]=Pantalla tàctil Name[ca@valencia]=Pantalla tàctil
Name[cs]=Dotyková obrazovka Name[cs]=Dotyková obrazovka
Name[de]=Touchscreen Name[de]=Touchscreen
Name[el]=Οθόνη αφής
Name[en_GB]=Touch Screen Name[en_GB]=Touch Screen
Name[es]=Pantalla táctil Name[es]=Pantalla táctil
Name[it]=Schermo a sfioramento Name[it]=Schermo a sfioramento