Commit 2cf172fb 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 21ac54c4
......@@ -34,7 +34,7 @@
"Name[et]": "GDB toetus",
"Name[fi]": "GDB-tuki",
"Name[fr]": "Prise en charge de GDB",
"Name[gl]": "Integración de GDB",
"Name[gl]": "Compatibilidade con GDB",
"Name[it]": "Supporto per GDB",
"Name[nl]": "Ondersteuning voor GDB",
"Name[pl]": "Obsługa GDB",
......
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