SVN_SILENT made messages (.desktop file) - always resolve ours
73a66c2b70a5
Actions

Authored by l10n daemon script <scripty@kde.org> on Apr 18 2020, 4:29 AM.

Description

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"

Committed

l10n daemon script <scripty@kde.org>

Apr 18 2020, 4:29 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			core/plugin/kget_plugin.desktop
	M			desktop/kget_download.desktop
	M			desktop/org.kde.kget.desktop.cmake
	M			extensions/konqueror/kget_plug_in.desktop
	M			sounds/kget.notifyrc
	M			transfer-plugins/bittorrent/kget_bittorrentfactory.desktop
	M			transfer-plugins/checksumsearch/kget_checksumsearchfactory.desktop
	M			transfer-plugins/checksumsearch/kget_checksumsearchfactory_config.desktop
	M			transfer-plugins/contentfetch/kget_contentfetchfactory.desktop
	M			transfer-plugins/contentfetch/kget_contentfetchfactory_config.desktop
	M			transfer-plugins/kio/kget_kiofactory.desktop
	M			transfer-plugins/metalink/kget_metalinkfactory.desktop
	M			transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.desktop
	M			transfer-plugins/mirrorsearch/kget_mirrorsearchfactory_config.desktop
	M			transfer-plugins/mmsthreads/kget_mmsfactory.desktop
	M			transfer-plugins/multisegmentkio/kget_multisegkiofactory.desktop