Commit 8937be49 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 1226f354
......@@ -1046,6 +1046,7 @@ Name[es]=Movimiento iniciado
Name[nl]=Beweging gestart
Name[pt]=Movimento Iniciado
Name[sv]=Förflyttningen påbörjad
Name[tr]=Hareket Başladı
Name[uk]=Розпочато рух
Name[x-test]=xxMotion Startedxx
Comment=Mount manual motion started
......@@ -1056,6 +1057,7 @@ 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
Comment[sv]=Manuell stativförflyttningen påbörjad
Comment[tr]=Kaide elle hareket başladı
Comment[uk]=Розпочато рух лафета вручну
Comment[x-test]=xxMount manual motion startedxx
Action=None
......@@ -1068,6 +1070,7 @@ Name[es]=Movimiento completado
Name[nl]=Beweging voltooid
Name[pt]=Movimento Completo
Name[sv]=Förflyttning klar
Name[tr]=Haraket Tamamlandı
Name[uk]=Рух завершено
Name[x-test]=xxMotion Completedxx
Comment=Mount manual motion completed
......@@ -1078,5 +1081,6 @@ 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
Comment[sv]=Manuell stativförflyttning klar
Comment[tr]=Kaide elle hareket tamamlandı
Comment[uk]=Рух лафета вручну завершено
Comment[x-test]=xxMount manual motion completedxx
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