Commit afb981ce 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 ea1e3b8a
......@@ -1042,6 +1042,7 @@ Action=None
Name=Motion Started
Name[ca]=El moviment ha començat
Name[ca@valencia]=El moviment ha començat
Name[cs]=Pohyb byl spuštěn
Name[en_GB]=Motion Started
Name[es]=Movimiento iniciado
Name[nl]=Beweging gestart
......@@ -1066,6 +1067,7 @@ Action=None
Name=Motion Completed
Name[ca]=S'ha completat el moviment
Name[ca@valencia]=S'ha completat el moviment
Name[cs]=Pohyb byl dokončen
Name[en_GB]=Motion Completed
Name[es]=Movimiento completado
Name[nl]=Beweging voltooid
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