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
734df72e90
commit
1fc3108f14
|
@ -57,6 +57,7 @@
|
|||
"Name[uk]": "Перегляд Dolphin",
|
||||
"Name[vi]": "Khung xem Dolphin",
|
||||
"Name[x-test]": "xxDolphin Viewxx",
|
||||
"Name[zh_CN]": "Dolphin 视图",
|
||||
"Name[zh_TW]": "Dolphin 檢視",
|
||||
"ServiceTypes": [
|
||||
"KParts/ReadOnlyPart",
|
||||
|
|
Loading…
Reference in a new issue