kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-17 15:31:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
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:
l10n daemon script 2022-05-29 01:46:43 +00:00
parent 734df72e90
commit 1fc3108f14
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dolphinpart.json.in
View file

@ -57,6 +57,7 @@
"Name[uk]": "Перегляд Dolphin", "Name[uk]": "Перегляд Dolphin",
"Name[vi]": "Khung xem Dolphin", "Name[vi]": "Khung xem Dolphin",
"Name[x-test]": "xxDolphin Viewxx", "Name[x-test]": "xxDolphin Viewxx",
"Name[zh_CN]": "Dolphin 视图",
"Name[zh_TW]": "Dolphin 檢視", "Name[zh_TW]": "Dolphin 檢視",
"ServiceTypes": [ "ServiceTypes": [
"KParts/ReadOnlyPart", "KParts/ReadOnlyPart",