diff options
| author | l10n daemon script <[email protected]> | 2025-09-08 02:03:45 +0000 |
|---|---|---|
| committer | l10n daemon script <[email protected]> | 2025-09-08 02:03:45 +0000 |
| commit | ae7a57ecbf7e2375fa79a910fdf74bf97e69b3ad (patch) | |
| tree | 9282f68e02e774d14e33db4e42e36cac98c5415c /src/org.kde.dolphin.desktop | |
| parent | 76b2443130955a7a830d06ef23f647950ad48507 (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 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/org.kde.dolphin.desktop b/src/org.kde.dolphin.desktop index 7c655d7f6..5e7f3ebf5 100755 --- a/src/org.kde.dolphin.desktop +++ b/src/org.kde.dolphin.desktop @@ -57,7 +57,6 @@ Name[tok]=ilo ijo Dolphin Name[tr]=Dolphin Name[uk]=Dolphin Name[vi]=Dolphin -Name[x-test]=xxDolphinxx Name[zh_CN]=Dolphin 文件管理器 Name[zh_TW]=Dolphin Exec=dolphin %u @@ -123,7 +122,6 @@ GenericName[tok]=ilo ijo GenericName[tr]=Dosya Yöneticisi GenericName[uk]=Менеджер файлів GenericName[vi]=Trình quản lí tệp -GenericName[x-test]=xxFile Managerxx GenericName[zh_CN]=文件管理器 GenericName[zh_TW]=檔案管理員 Comment=Manage your files @@ -153,7 +151,6 @@ Comment[sl]=Upravlja vaše datoteke Comment[sv]=Hantera filer Comment[tr]=Dosyalarınızı yönetin Comment[uk]=Керування вашими файлами -Comment[x-test]=xxManage your filesxx Comment[zh_CN]=文件管理应用 Comment[zh_TW]=管理您的檔案 MimeType=inode/directory; @@ -206,7 +203,6 @@ Keywords[ta]=files;file management;file browsing;samba;network shares;Explorer;F Keywords[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Explorer;Finder;gezgin; Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер; 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;文件;文件夹;文件管理;文件浏览;共享;共享文件夹;网络共享;浏览器;访达;查找器;wenjian;wenjianguanli;wenjianjia;wenjianliulan;SMB;liulanqi;fangda; Keywords[zh_TW]=files;file management;file browsing;samba;network shares;Explorer;Finder;檔案總管;檔案管理員;檔案; X-DBUS-ServiceName=org.kde.dolphin |