Commit 757188b3 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 da448883
......@@ -9,6 +9,7 @@ Name[el]=Εξαγωγή στο Facebook
Name[en_GB]=Facebook Export
Name[es]=Exportar a Facebook
Name[fr]=Export vers Facebook
Name[gl]=Exportación de Facebook
Name[id]=Facebook Export
Name[is]=Facebook útflutningur
Name[it]=Esportazione a Facebook
......@@ -31,6 +32,7 @@ Comment[el]=Εργαλείο εξαγωγής εικόνων σε μια απο
Comment[en_GB]=A tool to export images to a remote Facebook web service
Comment[es]=Una herramienta para exportar imágenes al servicio web remoto de Facebook
Comment[fr]=Outil pour exporter des images vers le service en ligne Facebook
Comment[gl]=Unha ferramenta para exportar imaxes a un servizo web Facebook remoto
Comment[id]=Sebuah alat untuk mengekspor citra ke layanan web Facebook jarak jauh
Comment[is]=Verkfæri til að flytja inn myndir frá fjartengdri Facebook vefþjónustu
Comment[it]=Uno strumento per esportare immagini al servizio web remoto Facebook
......
......@@ -9,6 +9,7 @@ Name[el]=Flickr/23
Name[en_GB]=Flickr/23
Name[es]=Flickr/23
Name[fr]=Flickr/23
Name[gl]=Flickr/23
Name[id]=Flickr/23
Name[is]=Flickr/23
Name[it]=Flickr/23
......@@ -30,6 +31,7 @@ Comment[el]=Εργαλείο εξαγωγής εικόνων στις απομα
Comment[en_GB]=A tool to export images to remote Flickr and 23 web services.
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[gl]=Unha ferramenta para exportar imaxes a servizos web remotos Flickr ou 23.
Comment[id]=Sebuah alat untuk mengekspor citra ke layanan web Flickr dan 23 jarak jauh.
Comment[is]=Verkfæri til að senda myndir á fjarlægar Flickr og 23 vefþjónustur.
Comment[it]=Uno strumento per esportare immagini ai servizi web remoti 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