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:
l10n daemon script 2023-11-26 03:52:36 +00:00
parent 475da39174
commit 26f8e86fde

View file

@ -166,7 +166,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[vi]=files;file management;file browsing;samba;network shares;Explorer;Finder;tp;qun lí tp;duyt tp;chia s mng;
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;;;;
X-DBUS-ServiceName=org.kde.dolphin
X-KDE-Shortcuts=Meta+E