Commit b7b7ddef 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 94fa78b1
......@@ -13,6 +13,7 @@ Name[eu]=Flickr/23
Name[fi]=Flickr/23
Name[fr]=Flickr/23
Name[gl]=Flickr/23
Name[ia]=Flickr/23
Name[id]=Flickr/23
Name[is]=Flickr/23
Name[it]=Flickr/23
......
......@@ -16,6 +16,7 @@ Name[fi]=Koko sivu
Name[fr]=Page entière
Name[gl]=Páxina completa
Name[hu]=Teljes oldal
Name[ia]=Pagina plen
Name[id]=Halaman penuh
Name[is]=Heilsíða
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