Commit 9310126c 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 3e9cbae5
......@@ -539,6 +539,7 @@ IconName=script-error
Name=Breakpoint Error
Name[ca]=Error en el punt d'interrupció
Name[ca@valencia]=Error en el punt d'interrupció
Name[en_GB]=Breakpoint Error
Name[es]=Error de punto de interrupción
Name[fr]=Erreur de point d'arrêt
Name[it]=Errore di interruzione
......@@ -550,6 +551,7 @@ 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[en_GB]=An error was reported by the debugger
Comment[es]=El depurador ha notificado un error
Comment[fr]=Une erreur a été signalée par le débogueur.
Comment[it]=È stato restituito un errore da programma di debug
......
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