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-12-28 04:45:41 +01:00
parent a561f91d29
commit 50b948134c
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/kwinoptions/kwinadvanced.desktop
View file

@ -116,7 +116,7 @@ Comment[gl]=Funcionalidades avanzadas da xestión de xanelas
Comment[he]=תכונות ניהול חלונות מתקדמים
Comment[hu]=Speciális ablakkezelési szolgáltatások
Comment[ia]=Characteristicas avantiate de gestion de fenestra
Comment[id]=Fitur Manajemen Jendela Lanjutan
Comment[id]=Fitur Pengelolaan Jendela Lanjutan
Comment[it]=Funzionalità avanzate della gestione delle finestre
Comment[ja]=高度なウインドウ管理機能
Comment[ko]=고급 창 관리자 기능 설정