Commit a6fbeb2a 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 6cce7fc9
......@@ -66,6 +66,7 @@
"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[gl]": "Compatibilidade co depurador de Python (PDB)",
"Name[it]": "Supporto al debugger di Python (PDB)",
"Name[nl]": "Ondersteuning voor Python-debugger",
"Name[pl]": "Obsługa debuggera (PDB) Python",
......
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