Commit ce018e99 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 dafc977e
......@@ -76,6 +76,7 @@
"Name[pl]": "Obsługa diagnostyki Pythona (PDB)",
"Name[pt]": "Suporte para o Depurador de Python (PDB)",
"Name[pt_BR]": "Suporte ao Python Debugger (PDB)",
"Name[sk]": "Podpora Python Debugger-a (PDB)",
"Name[sl]": "Podpora razhroščevalniku za Python (PDB)",
"Name[sv]": "Stöd för Python-avlusare (PDB)",
"Name[tr]": "Python Hata Ayıklayıcı (PDB) desteği",
......
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