Commit 05c90d69 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 9310126c
......@@ -545,6 +545,7 @@ Name[fr]=Erreur de point d'arrêt
Name[it]=Errore di interruzione
Name[nl]=Breekpunt-fout
Name[pt]=Erro no Ponto de Paragem
Name[pt_BR]=Erro no ponto de interrupção
Name[sv]=Brytpunktsfel
Name[uk]=Помилка, пов'язана із точкою зупинки
Name[x-test]=xxBreakpoint Errorxx
......@@ -557,6 +558,7 @@ Comment[fr]=Une erreur a été signalée par le débogueur.
Comment[it]=È stato restituito un errore da programma di debug
Comment[nl]=Er is een fout gerapporteerd door de debugger
Comment[pt]=Foi devolvido um erro pelo depurador
Comment[pt_BR]=Um erro foi relatado pelo depurador
Comment[sv]=Ett fel rapporterades av avlusaren
Comment[uk]=Засіб діагностики повідомив про помилку
Comment[x-test]=xxAn error was reported by the debuggerxx
......
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