Commit f6136ef5 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 2f99e780
......@@ -75,7 +75,7 @@ Comment[gl]=Reprodutor incrustábel de vídeo
Comment[he]=נגן וידאו מותמע
Comment[hu]=Beágyazható videolejátszó
Comment[ia]=Reproductor de Video Insertabile
Comment[id]=Pemain Video Dapat Dibenamkan
Comment[id]=Player Video Dapat Dibenamkan
Comment[is]=Ígræðanlegur vídeóspilari
Comment[it]=Lettore video integrabile
......@@ -76,7 +76,7 @@ GenericName[gl]=Reprodutor de vídeo
GenericName[he]=נגן וידאו
GenericName[ia]=Reproductor de Video
GenericName[id]=Pemain Video
GenericName[id]=Player Video
GenericName[it]=Riproduttore video
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