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

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

Jan 6 2019, 7:48 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			applets/digital-clock/package/metadata.desktop
	M			dataengines/geolocation/plasma-dataengine-geolocation.desktop
	M			dataengines/places/plasma-dataengine-places.desktop
	M			dataengines/weather/plasma-dataengine-weather.desktop
	M			menu/desktop/kf5-edu-miscellaneous.directory
	M			menu/desktop/kf5-education.directory
	M			menu/desktop/kf5-graphics.directory
	M			menu/desktop/kf5-internet.directory
	M			menu/desktop/kf5-office.directory
	M			menu/desktop/kf5-utilities-accessibility.directory
	M			runners/bookmarks/plasma-runner-bookmarks.desktop
	M			runners/locations/plasma-runner-locations.desktop
	M			runners/places/plasma-runner-places.desktop
	M			runners/powerdevil/plasma-runner-powerdevil.desktop
	M			runners/recentdocuments/plasma-runner-recentdocuments.desktop
	M			runners/services/plasma-runner-services.desktop
	M			runners/windows/plasma-runner-windows.desktop
	M			shell/packageplugins/qmlWallpaper/plasma-packagestructure-wallpaper.desktop
	M			wallpapers/color/plasma-wallpaper-color.desktop
	M			wallpapers/image/imagepackage/metadata.desktop
	M			wallpapers/image/slideshowpackage/metadata.desktop