Commit 813ccede 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 791dae93
......@@ -7,6 +7,7 @@
"Description[de]": "Sprachunterstützung für QML/JS auf der Grundlage von qmljs von QtCreator",
"Description[en_GB]": "QML/JS language support (based on qmljs from QtCreator)",
"Description[es]": "Implementación del lenguaje QML/JS (basado en qmljs de QtCreator)",
"Description[fr]": "Prise en charge du langage QML/JS (utilisant qmljs de QtCreator)",
"Description[gl]": "Compatibilidade con QML/JS (baseada en qmljs de QtCreator)",
"Description[nl]": "Taalondersteuning voor QML/JS (gebaseerd op qmljs uit QtCreator)",
"Description[pt]": "Suporte para a linguagem QML/JS (baseado no 'qmljs' do QtCreator)",
......
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