Commit 6259704c 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 9fa19758
......@@ -1011,6 +1011,7 @@ Action=None
Name=Motion Started
Name[ca]=El moviment ha començat
Name[ca@valencia]=El moviment ha començat
Name[en_GB]=Motion Started
Name[es]=Movimiento iniciado
Name[nl]=Beweging gestart
Name[pt]=Movimento Iniciado
......@@ -1020,6 +1021,7 @@ Name[x-test]=xxMotion Startedxx
Comment=Mount manual motion started
Comment[ca]=El moviment manual de la muntura ha començat
Comment[ca@valencia]=El moviment manual de la muntura ha començat
Comment[en_GB]=Mount manual motion started
Comment[es]=El movimiento manual de la montura se ha iniciado
Comment[nl]=Met de hand bewegen opstelling gestart
Comment[pt]=O movimento manual da montagem foi iniciado
......@@ -1031,6 +1033,7 @@ Action=None
Name=Motion Completed
Name[ca]=S'ha completat el moviment
Name[ca@valencia]=S'ha completat el moviment
Name[en_GB]=Motion Completed
Name[es]=Movimiento completado
Name[nl]=Beweging voltooid
Name[pt]=Movimento Completo
......@@ -1040,6 +1043,7 @@ Name[x-test]=xxMotion Completedxx
Comment=Mount manual motion completed
Comment[ca]=El moviment manual de la muntura s'ha completat
Comment[ca@valencia]=El moviment manual de la muntura s'ha completat
Comment[en_GB]=Mount manual motion completed
Comment[es]=El movimiento manual de la montura se ha completado
Comment[nl]=Met de hand bewegen opstelling voltooid
Comment[pt]=O movimento manual da montagem terminou
......
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