mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
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"
This commit is contained in:
parent
710d9af234
commit
7b4644c084
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue