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-04-08 08:49:10 +02:00
parent 6e1655e3cc
commit 8e35cabd42
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

@ -61,7 +61,7 @@ Comment[fr]=Mouvements sur l'écran tactile
Comment[gl]=Xestos de pantalla táctil
Comment[he]=מחוות החלקה של מסכי מגע
Comment[hu]=Érintőképernyő-gesztusok
Comment[id]=Isyarat usapan layar sentuh
Comment[id]=Gestur usap layar sentuh
Comment[it]=Gesti dello schermo a sfioramento
Comment[ko]=터치 스크린 밀기 제스처
Comment[nl]=Veeggebaren voor aanraakscherm