SVN_SILENT made messages (.desktop file) - always resolve ours
14071d32046c
Actions

Authored by l10n daemon script <scripty@kde.org> on Oct 20 2019, 6:55 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>

Oct 20 2019, 6:55 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			applets/icontasks/metadata.desktop
	M			applets/kicker/package/metadata.desktop
	M			applets/kickoff/package/metadata.desktop
	M			applets/taskmanager/package/metadata.desktop
	M			kcms/autostart/autostart.desktop
	M			kcms/componentchooser/componentchooser.desktop
	M			kcms/componentchooser/componentservices/kcm_browser.desktop
	M			kcms/componentchooser/componentservices/kcm_filemanager.desktop
	M			kcms/componentchooser/componentservices/kcm_kemail.desktop
	M			kcms/componentchooser/componentservices/kcm_terminal.desktop
	M			kcms/keys/keys.desktop
	M			kcms/launch/kcm_launchfeedback.desktop
	M			kcms/launch/package/metadata.desktop
	M			kcms/standard_actions/standard_actions.desktop
	M			kcms/style/style.desktop
	M			layout-templates/org.kde.plasma.desktop.appmenubar/metadata.desktop
	M			layout-templates/org.kde.plasma.desktop.defaultPanel/metadata.desktop