Commit f3385778 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 a2c94527
......@@ -101,6 +101,7 @@ Name[x-test]=xxSettingsxx
Name[zh_CN]=设置
Name[zh_TW]=設定
Comment=System settings options.
Comment[ast]=Opciones de los axustes del sistema.
Comment[ca]=Opcions de l'arranjament del sistema.
Comment[ca@valencia]=Opcions de l'arranjament del sistema.
Comment[cs]=Možnosti nastavení systému.
......
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