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

Authored by l10n daemon script <scripty@kde.org> on Oct 16 2017, 3:07 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 16 2017, 3:07 AM

Parents

R119:af6b7de333ce: desktoptheme kcm: Fix i18n strings

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kaccess/kaccess.notifyrc
	M			kcms/componentchooser/componentchooser.desktop
	M			kcms/solid_actions/device-actions/solid-device-OpticalDisc.desktop
	M			kcms/solid_actions/device-actions/solid-device-OpticalDrive.desktop
	M			kcms/solid_actions/device-actions/solid-device-StorageDrive.desktop
	M			kcms/solid_actions/device-actions/solid-device-StorageVolume.desktop