Commit df3b2f9f 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 0b931e9b
......@@ -4,6 +4,7 @@
"Description[ca]": "Obre i extreu arxius RAR i LHA",
"Description[cs]": "Otevřít a rozbalit archivy RAR a LHA",
"Description[de]": "Öffnen und Entpacken von RAR- und LHA-Archiven",
"Description[en_GB]": "Open and extract RAR and LHA archives",
"Description[es]": "Abrir y extraer archivos RAR y LHA",
"Description[eu]": "Ireki eta erauzi RAR eta LHA artxiboak",
"Description[fr]": "Ouvre et extrait les archives « RAR » et « LHA »",
......
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