mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-05 16:19:10 +00:00
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"
This commit is contained in:
parent
787fa3eebd
commit
e5387d1481
|
@ -170,7 +170,7 @@ Keywords[tr]=dosyalar;dosya yönetimi;dosya göz at;samba;ağ paylaşımları;Ex
|
||||||
Keywords[uk]=files;file management;file browsing;samba;network shares;Explorer;Finder;файли;керування файлами;навігація;самба;спільні ресурси;мережа;експлорер;провідник;файндер;
|
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[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[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_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;檔案總管;檔案管理員;檔案;
|
Keywords[zh_TW]=files;file management;file browsing;samba;network shares;Explorer;Finder;檔案總管;檔案管理員;檔案;
|
||||||
X-DBUS-ServiceName=org.kde.dolphin
|
X-DBUS-ServiceName=org.kde.dolphin
|
||||||
X-KDE-Shortcuts=Meta+E
|
X-KDE-Shortcuts=Meta+E
|
||||||
|
|
Loading…
Reference in a new issue