Commit bc72ef0f 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 c12fcfd7
......@@ -31,6 +31,7 @@ MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;appl
GenericName=Audio Player
GenericName[ca]=Reproductor d'àudio
GenericName[ca@valencia]=Reproductor d'àudio
GenericName[cs]=Zvukový přehrávač
GenericName[en_GB]=Audio Player
GenericName[es]=Reproductor de sonido
GenericName[nl]=Audiospeler
......
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