Commit 4c7e8faa 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 eaeda422
......@@ -39,7 +39,7 @@
"Description[de]": "Dieses Modul stellt eine Oberfläche für PDB zur Verfügung.",
"Description[en_GB]": "This plugin provides a frontend for PDB",
"Description[es]": "Este complemento proporciona una interfaz para PDB",
"Description[et]": "PDB kasutajaliidese plugin",
"Description[et]": "See plugin pakub PDB kasutajaliidest",
"Description[fi]": "Tämä liitännäinen tarjoaa PDB-käyttöliittymän",
"Description[fr]": "Ce module externe fournit une interface pour PDB",
"Description[gl]": "Este complemento fornece unha interface para PDB.",
......@@ -67,6 +67,7 @@
"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[et]": "Pythoni siluri (PDB) toetus",
"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)",
......
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