Commit 02531c86 authored by Script Kiddy's avatar Script Kiddy

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"
parent e2a2589c
......@@ -1837,7 +1837,7 @@ Comment[hr]=Prozor XMMS-a
Comment[hsb]=Wokno za XMMS-wothrawak
Comment[hu]=XMMS lejátszóablak
Comment[ia]=Fenestra de reproductor XMMS
Comment[id]=Jendela Pemain XMMS
Comment[id]=Jendela Player XMMS
Comment[is]=XMMS spilaragluggi
Comment[it]=Finestra di riproduzione di XMMS
Comment[ja]=XMMS プレーヤーウィンドウ
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment