Commit 20ac87a5 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 72c26a99
......@@ -7,6 +7,7 @@ Name[ca@valencia]=Arxius web i fitxers HTML
Name[el]=Αρχειοθήκες ιστού και HTML αρχεία
Name[en_GB]=Web Archives and HTML files
Name[es]=Archivos web y HTML
Name[eu]=Web-artxiboak eta HTML fitxategiak
Name[fr]=Archives Internet et fichiers « HTML »
Name[ia]=Archivos Web e files HTML
Name[it]=Archivi web e file HTML
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