1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +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:
l10n daemon script 2021-12-12 01:48:07 +00:00
parent 0d35d8963a
commit fbe1ecaa6a

View File

@ -130,6 +130,7 @@ Keywords[sv]=filer;filhantering;filbläddring;samba;delade nätverksresurser;Utf
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;;;;;;;;访;;
X-DBUS-ServiceName=org.kde.dolphin
X-KDE-Shortcuts=Meta+E
StartupWMClass=dolphin