Commit 076843b5 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 22e1f386
Pipeline #33755 skipped
......@@ -4,6 +4,7 @@
"Description": "Backend for Python Scientific Programming",
"Description[ca@valencia]": "Dorsal per a la programació científica en Python",
"Description[ca]": "Dorsal per a la programació científica en Python",
"Description[de]": "Modul für die wissenschaftliche Programmierumgebung Python ",
"Description[el]": "Σύστημα υποστήριξης για το Python Scientific Programming",
"Description[en_GB]": "Backend for Python Scientific Programming",
"Description[es]": "Motor para programación científica en Python",
......@@ -28,6 +29,7 @@
"Name[ca@valencia]": "Python",
"Name[ca]": "Python",
"Name[cs]": "Python",
"Name[de]": "Python",
"Name[el]": "Python",
"Name[en_GB]": "Python",
"Name[es]": "Python",
......
......@@ -20,6 +20,7 @@
"License": "GPL",
"Name": "File Browser",
"Name[ca]": "Navegador de fitxers",
"Name[de]": "Dateibrowser",
"Name[es]": "Navegador de archivos",
"Name[fr]": "Navigateur de fichiers",
"Name[it]": "Navigatore dei file",
......
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