Commit 450f28a5 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 b70a9414
......@@ -28,6 +28,7 @@ Comment[zh_TW]=天文_KStars
Name=Focus started
Name[ca]=S'ha iniciat l'enfocament
Name[ca@valencia]=S'ha iniciat l'enfocament
Name[de]=Fokussierung wurde gestartet
Name[en_GB]=Focus started
Name[es]=Enfoque iniciado
Name[nl]=Focusseren is gestart
......@@ -40,6 +41,7 @@ Name[x-test]=xxFocus startedxx
Comment=Autofocus operation started
Comment[ca]=S'ha iniciat l'operació d'enfocament automàtic
Comment[ca@valencia]=S'ha iniciat l'operació d'enfocament automàtic
Comment[de]=Automatische Fokussierung wurde gestartet
Comment[en_GB]=Autofocus operation started
Comment[es]=La operación de enfoque automático se ha iniciado
Comment[nl]=Autofocus is gestart
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