Commit 76f2fdf7 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 f11d776c
......@@ -35,7 +35,7 @@
"Name[fi]": "GDB-tuki",
"Name[fr]": "Prise en charge de GDB",
"Name[gl]": "Integración de GDB",
"Name[it]": "Supporto GDB",
"Name[it]": "Supporto per GDB",
"Name[nl]": "Ondersteuning voor GDB",
"Name[pl]": "Obsługa GDB",
"Name[pt]": "Suporte ao GDB",
......@@ -29,7 +29,7 @@
"Name[de]": "Unterstützung für LLDB",
"Name[es]": "Implementación de LLDB",
"Name[fr]": "Prise en charge de LLDB",
"Name[it]": "Supporto LLDB",
"Name[it]": "Supporto per LLDB",
"Name[nl]": "Ondersteuning voor LLDB",
"Name[pl]": "Obsługa LLDB",
"Name[pt]": "Suporte ao LLDB",
......@@ -34,7 +34,7 @@
"Name[fi]": "C++-tuki",
"Name[fr]": "Prise en charge du C++",
"Name[gl]": "Compatibilidade con C++",
"Name[it]": "Supporto C++",
"Name[it]": "Supporto per C++",
"Name[nl]": "Ondersteuning voor C++",
"Name[pl]": "Obsługa C++",
"Name[pt]": "Suporte a C/C++",
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