Commit 944060df 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 afb981ce
......@@ -724,6 +724,7 @@ Name[es]=Montura interrumpida
Name[nl]=Opstellen afgebroken
Name[pl]=Montaż przerwał
Name[pt]=Montagem Interrompida
Name[sk]=Montáž prerušená
Name[sv]=Stativförflyttning avbrutet
Name[tr]=Kaide İptal Edildi
Name[uk]=Рух лафета перервано
......@@ -1058,6 +1059,7 @@ 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
Comment[sk]=Ručný pohyb montáže spustený
Comment[sv]=Manuell stativförflyttningen påbörjad
Comment[tr]=Kaide elle hareket başladı
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