Commit 60a7102e 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 5feb236c
......@@ -3,7 +3,7 @@
"Category": "Debugging",
"Description": "This plugin provides a frontend for GDB, a source-level debugger for C, C++ and more.",
"Description[bs]": "Ovaj dodatak pruža link za GDB, ispravljač grešaka izvornog nivoa za C, C++ i druge.",
"Description[ca]": "Aquest connector proveeix d'un frontal per GDB, un depurador a nivell de codi per C, C++ i més llenguatges.",
"Description[ca]": "Aquest connector proveeix d'un frontal per GDB, un depurador quant a codi per C, C++ i més llenguatges.",
"Description[de]": "Dieses Modul stellt eine Oberfläche für GDB zur Verfügung. GDB ist ein Debugger für C, C++ und weitere Sprachen.",
"Description[en_GB]": "This plugin provides a frontend for GDB, a source-level debugger for C, C++ and more.",
"Description[es]": "Este complemento proporciona una interfaz para GDB, un depurador de código fuente para C, C++ y otros lenguajes.",
......
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