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-03-03 05:32:16 +01:00
parent e7dae04819
commit da99315b17
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
kwin.notifyrc
View file

@ -24,7 +24,7 @@ Comment[hi]=केविन विंडो प्रबंधक
Comment[hr]=Upravitelj prozora KWin
Comment[hu]=KWin ablakkezelő
Comment[ia]=Gerente de fenestra KWin
Comment[id]=Manajer Jendela KWin
Comment[id]=Pengelola Jendela KWin
Comment[is]=KWin gluggastjóri
Comment[it]=Gestore delle finestre KWin
Comment[ja]=KWin ウィンドウマネージャ