Commit ad1e70df 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 066c3ff1
Pipeline #326 passed with stage
in 5 minutes and 56 seconds
......@@ -347,7 +347,7 @@ Name[sv]=JuK kör i dockningsläge
Name[tr]=JuK yerleşik kipte çalışıyor
Name[uk]=JuK запущено у згорнутому режимі
Name[x-test]=xxJuK running in dock modexx
Name[zh_CN]=JuK 在 dock 模式下运行
Name[zh_CN]=JuK 在 dock 模式下运行
Name[zh_TW]=JuK 以嵌入模式執行中
Comment=Use context menu in system tray to restore.
Comment[bg]=Може да възстановите от контекстното меню в системния поднос.
......
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