Commit 509f032f 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 8de832e1
......@@ -3,6 +3,7 @@ UntranslatedGenericName=Flickr/23
......@@ -12,6 +13,7 @@ Name[x-test]=xxFlickr/23xx
Comment=A tool to export images to remote Flickr and 23 web services.
Comment[ca]=Una eina per exportar les imatges als serveis web remots Flickr i 23.
Comment[ca@valencia]=Una eina per exportar les imatges als serveis web remots Flickr i 23.
Comment[es]=Una herramienta para exportar imágenes a los servicios web remotos de Flickr y 23.
Comment[fr]=Un outil pour l'export d'images vers les services en ligne Flickr et 23.
Comment[nl]=Een hulpmiddel om afbeeldingen naar een Flickr- en 23-webservice op afstand te exporteren.
Comment[pt]=Uma ferramenta para exportar imagens para os serviços Web remotos do Flickr e 23.
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