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-04-20 04:17:52 +02:00
parent 1427dbad9b
commit 873a51cc62
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

@ -13,6 +13,7 @@ X-KDE-Weight=50
Name=Touch Screen
Name[ca]=Pantalla tàctil
Name[ca@valencia]=Pantalla tàctil
Name[cs]=Dotyková obrazovka
Name[es]=Pantalla táctil
Name[it]=Schermo a sfioramento
Name[nl]=Aanraakscherm