Commit ff593171 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 76fbd527
......@@ -723,7 +723,6 @@ Name[es]=Montura interrumpida
Name[nl]=Opstellen afgebroken
Name[pl]=Montaż przerwał
Name[pt]=Montagem Interrompida
Name[sk]=Montáž zrušená
Name[sv]=Stativförflyttning avbrutet
Name[tr]=Kaide İptal Edildi
Name[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