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 2019-02-15 05:42:11 +01:00
parent c55568fd80
commit 6d9ac76cf7
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kcmkwin/kwinscreenedges/kwintouchscreen.desktop
View file

@ -69,7 +69,7 @@ Comment[nn]=Fingerrørsler på trykkskjerm
Comment[pa]=ਟੱਚ ਸਕਰੀਨ ਸਕਰਾਉਣ ਜੈਸਚਰ
Comment[pl]=Gesty na ekranie dotykowym
Comment[pt]=Gestos para deslizar o ecrã táctil
Comment[pt_BR]=Gestos no touch screen
Comment[pt_BR]=Gestos no touchscreen
Comment[ru]=Действия при проведении по сенсорному экрану
Comment[sk]=Ťahacie gestá dotykovej obrazovky
Comment[sl]=Kretnje vlečenja za zaslon na dotik