Commit 668b5979 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 cfc03315
......@@ -58,6 +58,7 @@ Name[x-test]=xxBackground Servicesxx
Name[zh_CN]=后台服务
Name[zh_TW]=背景服務
Comment=Configure background services
Comment[ast]=Configura los servicios en segundu planu
Comment[ca]=Configura els serveis en segon pla
Comment[de]=Hintergrunddienste einrichten
Comment[es]=Configurar los servicios en segundo plano
......
......@@ -46,6 +46,7 @@ Name[x-test]=xxBackground Servicesxx
Name[zh_CN]=后台服务
Name[zh_TW]=背景服務
Comment=Configure background services
Comment[ast]=Configura los servicios en segundu planu
Comment[ca]=Configura els serveis en segon pla
Comment[de]=Hintergrunddienste einrichten
Comment[es]=Configurar los servicios en segundo plano
......
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