Commit bc42ed84 authored by Script Kiddy's avatar Script Kiddy
Browse files

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 691c5b3b
......@@ -2,6 +2,7 @@
Comment=Tiny Music Player
Comment[ca]=Reproductor de música petit
Comment[fr]=Lecteur de musique ultra compact
Comment[nl]=Kleine muziekspeler
Comment[pt]=Pequeno Leitor Multimédia
Comment[sk]=Malý hudobný prehrávač
......@@ -26,6 +26,7 @@ MimeType=image/gif;image/jpeg;image/png;image/bmp;image/x-eps;image/x-ico;image/
# Generic name with translations
GenericName=Image Gallery
GenericName[ca]=Galeria d'imatges
GenericName[fr]=Galerie d'images
GenericName[nl]=Galerij met afbeeldingen
GenericName[pt]=Galeria de Imagens
GenericName[sk]=Galéria obrázkov
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