diff options
| author | l10n daemon script <[email protected]> | 2023-01-30 02:05:00 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2023-01-30 02:05:00 +0000 |
| commit | 572f4d2e9ac5dcb188630281227b545af41275bb (patch) | |
| tree | 693701774ce7aa9eb758e8b0366fb927f5aea742 /src/org.kde.dolphin.desktop | |
| parent | 4a3ddf29f96d935c0a8e550f7a32d94d74eb8b39 (diff) | |
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"
Diffstat (limited to 'src/org.kde.dolphin.desktop')
| -rwxr-xr-x | src/org.kde.dolphin.desktop | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 4f8f268ec..c0e72d942 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -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 |