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 2020-04-29 10:52:05 +02:00
parent f823be570c
commit f579dc339c
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

@ -62,6 +62,7 @@ Comment[fi]=Aseta kosketusnäytön pyyhkäisyeleet
Comment[fr]=Configurer les mouvements sur l'écran tactile
Comment[gl]=Configurar os xestos de pantalla táctil
Comment[hu]=Érintőképernyő-gesztusok beállítása
Comment[ia]=Configura gestos e glissar de schermo tactil
Comment[id]=Konfigurasikan gestur usapan layar sentuh
Comment[it]=Configura gesti dello schermo a sfioramento
Comment[ko]=터치 스크린 밀기 제스처 설정