Commit 3d8fa9b4 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 4c1a5182
......@@ -4,6 +4,7 @@
"Description": "Imports and edits Meson projects",
"Description[ca@valencia]": "Importa i edita projectes del Meson",
"Description[ca]": "Importa i edita projectes del Meson",
"Description[cs]": "Importuje a upravuje vlastní projekty Meson",
"Description[en_GB]": "Imports and edits Meson projects",
"Description[es]": "Importa y edita proyectos Meson",
"Description[fr]": "Importe et édite des projets Meson",
......@@ -21,6 +22,7 @@
"Name": "Meson Project Manager",
"Name[ca@valencia]": "Gestor de projectes Meson",
"Name[ca]": "Gestor de projectes Meson",
"Name[cs]": "Správce projektů Meson",
"Name[en_GB]": "Meson Project Manager",
"Name[es]": "Gestor de proyectos Meson",
"Name[fr]": "Gestionnaire de projet Meson",
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