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 2018-06-25 07:42:14 +02:00
parent b6f22a98a7
commit c49136a53c
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

@ -52,6 +52,7 @@ Comment=Touch screen swipe gestures
Comment[ca]=Gestos de lliscament en la pantalla tàctil
Comment[ca@valencia]=Gestos de lliscament en la pantalla tàctil
Comment[da]=Strygegestusser til touchskærm
Comment[de]=Wischgesten für Touchscreens
Comment[en_GB]=Touch screen swipe gestures
Comment[es]=Gestos de deslizamiento en pantalla táctil
Comment[eu]=Ukipen-pantailan irrist-keinuak