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"icc-effect-5.14.5
parent
e7dae04819
commit
da99315b17
|
@ -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 ウィンドウマネージャ
|
||||
|
|
Loading…
Reference in New Issue