Commit 7b4644c0 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 710d9af2
Pipeline #199537 passed with stage
in 5 minutes and 40 seconds
......@@ -52,7 +52,7 @@ Name[tr]=Dolphin
Name[uk]=Dolphin
Name[vi]=Dolphin
Name[x-test]=xxDolphinxx
Name[zh_CN]=Dolphin
Name[zh_CN]=Dolphin 文件管理器
Name[zh_TW]=Dolphin
Exec=dolphin %u
Icon=system-file-manager
......
Supports Markdown
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