Commit cd9f45c1 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 cfcd545b
......@@ -389,6 +389,6 @@ Comment[sv]=Använd sammanhangsberoende meny i systembrickan för att återstäl
Comment[tr]=Geri yüklemek için sistem çekmecesindeki bağlam menüsünü kullanın.
Comment[uk]=Скористайтеся контекстним меню піктограми системного лотка, щоб розгорнути вікно програми.
Comment[x-test]=xxUse context menu in system tray to restore.xx
Comment[zh_CN]=在系统托盘中使用上下文菜单还原。
Comment[zh_CN]=在系统托盘中使用右键菜单还原。
Comment[zh_TW]=用系統匣的內文選單來回復。
Action=Popup
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