kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-15 18:01:11 +00:00
Code Issues Actions 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 2023-01-30 02:05:00 +00:00
parent 4a3ddf29f9
commit 572f4d2e9a
4 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/org.kde.dolphin.desktop
View file

@ -163,6 +163,7 @@ Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;F
Keywords[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tệp;quản lí tệp;duyệt tệp;chia sẻ mạng;
Keywords[x-test]=xxfilesxx;xxfile managementxx;xxfile browsingxx;xxsambaxx;xxnetwork sharesxx;xxExplorerxx;xxFinderxx;
Keywords[zh_CN]=files;file management;file browsing;samba;network shares;文件;文件管理;文件浏览;共享;共享文件夹;网络共享;浏览器;访达;查找器;
Keywords[zh_TW]=files;file management;file browsing;samba;network shares;Explorer;Finder;檔案總管;檔案管理員;檔案;
X-DBUS-ServiceName=org.kde.dolphin
X-KDE-Shortcuts=Meta+E
StartupWMClass=dolphin

2
src/settings/kcm/kcmdolphingeneral.json
View file

@ -41,6 +41,7 @@
"Description[vi]": "Cấu hình các thiết lập chung cho trình quản lí tệp",
"Description[x-test]": "xxConfigure general file manager settingsxx",
"Description[zh_CN]": "配置文件管理器常规设置",
"Description[zh_TW]": "配置一般檔案管理員設定",
"Icon": "system-file-manager",
"Name": "General",
"Name[ar]": "عامّ",
@ -83,6 +84,7 @@
"Name[vi]": "Chung",
"Name[x-test]": "xxGeneralxx",
"Name[zh_CN]": "常规",
"Name[zh_TW]": "一般",
"ServiceTypes": [
"KCModule"
]

1
src/settings/kcm/kcmdolphinnavigation.json
View file

@ -41,6 +41,7 @@
"Description[vi]": "Cấu hình điều hướng trình quản lí tệp",
"Description[x-test]": "xxConfigure file manager navigationxx",
"Description[zh_CN]": "配置文件管理器导航功能",
"Description[zh_TW]": "設定檔案管理員導覽",
"Icon": "preferences-desktop-navigation",
"Name": "Navigation",
"Name[ar]": "التّنقّل",

1
src/settings/kcm/kcmdolphinviewmodes.json
View file

@ -41,6 +41,7 @@
"Description[vi]": "Cấu hình các chế độ xem trình quản lí tệp",
"Description[x-test]": "xxConfigure file manager view modesxx",
"Description[zh_CN]": "配置文件管理器视图模式",
"Description[zh_TW]": "設定檔案管理員檢視模式",
"Icon": "preferences-desktop-icons",
"Name": "View Modes",
"Name[ar]": "أوضاع المنظور",