Commit e8ba6631 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 05fbc4ee
......@@ -61,6 +61,7 @@
"Name[ca]": "Implementació del depurador de Python (PDB)",
"Name[cs]": "Podpora ladění pro Python (PDB)",
"Name[de]": "Unterstützung für Python Debugger (PDB)",
"Name[en_GB]": "Python Debugger (PDB) support",
"Name[es]": "Implementación del depurador Python (PDB)",
"Name[fr]": "Prise en charge du débogueur Python (pdb)",
"Name[it]": "Supporto al debugger di Python (PDB)",
......
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