Commit 70a3e5ab 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 f5813c30
......@@ -538,12 +538,20 @@ Action=Popup
Name=Breakpoint Error
Name[ca]=Error en el punt d'interrupció
Name[ca@valencia]=Error en el punt d'interrupció
Name[es]=Error de punto de interrupción
Name[it]=Errore di interruzione
Name[pt]=Erro no Ponto de Paragem
Name[uk]=Помилка, пов'язана із точкою зупинки
Name[x-test]=xxBreakpoint Errorxx
Comment=An error was reported by the debugger
Comment[ca]=El depurador ha notificat un error
Comment[ca@valencia]=El depurador ha notificat un error
Comment[es]=El depurador ha notificado un error
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[sv]=Ett fel rapporterades av avlusaren
Comment[uk]=Засіб діагностики повідомив про помилку
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