Commit 516a2e6a 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 5e29957d
......@@ -8,6 +8,7 @@
"Description[ca]": "Configura el comportament de l'actualització de programari",
"Description[en_GB]": "Configure software update behaviour",
"Description[es]": "Configurar el comportamiento de las actualizaciones de software",
"Description[fi]": "Määritä ohjelmapäivitysten toiminta",
"Description[fr]": "Configurer le comportement pour les mises à jour des logiciels ",
"Description[hu]": "A szoftverfrissítés működésének beállítása",
"Description[ia]": "Configura ambiente de actualisation de software",
......
Supports Markdown
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