Commit d841f373 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 03b04223
...@@ -16,6 +16,7 @@ Name[fi]=Dropbox-vienti ...@@ -16,6 +16,7 @@ Name[fi]=Dropbox-vienti
Name[fr]=Export vers Dropbox Name[fr]=Export vers Dropbox
Name[gl]=Exportación a Dropbox Name[gl]=Exportación a Dropbox
Name[hu]=Dropbox exportálás Name[hu]=Dropbox exportálás
Name[ia]=Exporta a Dropbox
Name[id]=Dropbox Export Name[id]=Dropbox Export
Name[is]=Dropbox útflutningur Name[is]=Dropbox útflutningur
Name[it]=Esportazione a Dropbox Name[it]=Esportazione a Dropbox
...@@ -14,6 +14,7 @@ Name[eu]=Flickr/23 ...@@ -14,6 +14,7 @@ Name[eu]=Flickr/23
Name[fi]=Flickr/23 Name[fi]=Flickr/23
Name[fr]=Flickr/23 Name[fr]=Flickr/23
Name[gl]=Flickr/23 Name[gl]=Flickr/23
Name[id]=Flickr/23 Name[id]=Flickr/23
Name[is]=Flickr/23 Name[is]=Flickr/23
Name[it]=Flickr/23 Name[it]=Flickr/23
...@@ -16,6 +16,7 @@ Name[fi]=Koko sivu ...@@ -16,6 +16,7 @@ Name[fi]=Koko sivu
Name[fr]=Page entière Name[fr]=Page entière
Name[gl]=Páxina completa Name[gl]=Páxina completa
Name[hu]=Teljes oldal Name[hu]=Teljes oldal
Name[ia]=Pagina plen
Name[id]=Halaman penuh Name[id]=Halaman penuh
Name[is]=Heilsíða Name[is]=Heilsíða
Name[it]=Pagina intera Name[it]=Pagina intera
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