From ae7a57ecbf7e2375fa79a910fdf74bf97e69b3ad Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 8 Sep 2025 02:03:45 +0000 Subject: 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" --- src/dolphinpartactions.desktop | 3 --- src/org.kde.dolphin.desktop | 4 ---- 2 files changed, 7 deletions(-) diff --git a/src/dolphinpartactions.desktop b/src/dolphinpartactions.desktop index 139e497c6..e60352692 100644 --- a/src/dolphinpartactions.desktop +++ b/src/dolphinpartactions.desktop @@ -63,7 +63,6 @@ Name[ta]=சின்னங்கள் Name[tr]=Simgeler Name[uk]=Піктограми Name[vi]=Biểu tượng -Name[x-test]=xxIconsxx Name[zh_CN]=图标 Name[zh_TW]=圖示 Icon=view-list-icons @@ -126,7 +125,6 @@ Name[ta]=சுருக்கமானது Name[tr]=Sıkışık Name[uk]=Компактний Name[vi]=Gọn -Name[x-test]=xxCompactxx Name[zh_CN]=紧凑 Name[zh_TW]=簡潔模式 Icon=view-list-details @@ -190,7 +188,6 @@ Name[ta]=விவரங்கள் Name[tr]=Ayrıntılar Name[uk]=Подробиці Name[vi]=Chi tiết -Name[x-test]=xxDetailsxx Name[zh_CN]=详情 Name[zh_TW]=詳細模式 Icon=view-list-tree 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 -- cgit v1.3