SVN_SILENT made messages (.desktop file) - always resolve ours
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:
parent
e7dae04819
commit
da99315b17
1 changed files with 1 additions and 1 deletions
|
@ -24,7 +24,7 @@ Comment[hi]=केविन विंडो प्रबंधक
|
||||||
Comment[hr]=Upravitelj prozora KWin
|
Comment[hr]=Upravitelj prozora KWin
|
||||||
Comment[hu]=KWin ablakkezelő
|
Comment[hu]=KWin ablakkezelő
|
||||||
Comment[ia]=Gerente de fenestra KWin
|
Comment[ia]=Gerente de fenestra KWin
|
||||||
Comment[id]=Manajer Jendela KWin
|
Comment[id]=Pengelola Jendela KWin
|
||||||
Comment[is]=KWin gluggastjóri
|
Comment[is]=KWin gluggastjóri
|
||||||
Comment[it]=Gestore delle finestre KWin
|
Comment[it]=Gestore delle finestre KWin
|
||||||
Comment[ja]=KWin ウィンドウマネージャ
|
Comment[ja]=KWin ウィンドウマネージャ
|
||||||
|
|
Loading…
Reference in a new issue