Commit c2c937c5 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 0c6bf764
Pipeline #3940 failed with stage
in 60 minutes
......@@ -38,7 +38,7 @@
"Description[es]": "Este complemento muestra errores en el código fuente.",
"Description[et]": "See plugin näitab vigu lähtekoodis.",
"Description[fr]": "Ce module affiche les erreurs dans le code source.",
"Description[gl]": "Esta extensión mostra erros no código fonte.",
"Description[gl]": "Este complemento mostra erros no código fonte.",
"Description[it]": "Questa estensione mostra gli errori nel codice sorgente.",
"Description[nl]": "Deze plugin toont fouten in broncode",
"Description[pl]": "Ta wtyczka pokazuje błędy w kodzie źródłowym.",
......
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