Commit f4504f47 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 e47a5432
......@@ -28,6 +28,7 @@
"Name[ca@valencia]": "Dorsal de Markdown",
"Name[ca]": "Dorsal de Markdown",
"Name[cs]": "Podpůrná vrstva Markdown",
"Name[de]": "Anzeigemodul für Markdown",
"Name[el]": "Σύστημα υποστήριξης markdown",
"Name[es]": "Motor para Markdown",
"Name[fr]": "Moteur de markdown",
......
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