Commit c18bd821 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 946cca4e
......@@ -97,6 +97,7 @@ Comment[sv]=Automatisk fokuseringsåtgärd avslutades med lyckat resultat
Comment[tr]=Otomatik odaklama işlemi başarıyla tamamlandı
Comment[uk]=Дію з автофокусування успішно виконано
Comment[x-test]=xxAutofocus operation completed successfullyxx
Comment[zh_CN]=自动对焦操作成功完成
Comment[zh_TW]=自動對焦操作成功完成
Sound=Oxygen-K3B-Finish-Success.ogg
Action=Sound
......@@ -141,6 +142,7 @@ Comment[sv]=Automatisk fokuseringsåtgärd misslyckades med fel
Comment[tr]=Otomatik odaklama işlemi başarısız oldu
Comment[uk]=Не вдалося виконати дію з автофокусування — помилки
Comment[x-test]=xxAutofocus operation failed with errorsxx
Comment[zh_CN]=自动对焦操作失败,出现错误
Comment[zh_TW]=自動對焦操作發生錯誤
Sound=Oxygen-Sys-App-Error-Serious.ogg
Action=Sound
......
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