Commit b662c2b6 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 0092020c
......@@ -43,6 +43,7 @@
"Description[fr]": "Ce module externe fournit une interface pour PDB",
"Description[gl]": "Este complemento fornece unha interface para PDB.",
"Description[it]": "Questa estensione fornisce un'interfaccia per PDB",
"Description[ko]": "이 플러그인은 PDB 프론트엔드를 제공합니다",
"Description[nl]": "Deze plug-in levert een frontend voor PDB",
"Description[pl]": "Wtyczka ta zapewnia nakładkę graficzną dla PDB",
"Description[pt]": "Este 'plugin' oferece uma interface para o PDB",
......
......@@ -43,6 +43,7 @@
"Description[fr]": "Prise en charge du langage Python",
"Description[gl]": "Compatibilidade coa linguaxe Python.",
"Description[it]": "Supporto per il linguaggio Python",
"Description[ko]": "파이썬 언어 지원",
"Description[nl]": "Ondersteuning voor de taal Python",
"Description[pl]": "Obsługa języka Python",
"Description[pt]": "Suporte à Linguagem Python",
......@@ -70,6 +71,7 @@
"Name[fr]": "Prise en charge de Python",
"Name[gl]": "Compatibilidade con Python",
"Name[it]": "Supporto per Python",
"Name[ko]": "파이썬 지원",
"Name[nl]": "Python-ondersteuning",
"Name[pl]": "Obsługa Pythona",
"Name[pt]": "Suporte para 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