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

Authored by l10n daemon script <scripty@kde.org> on Jan 11 2019, 4:41 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"

Details

Committed

l10n daemon script <scripty@kde.org>

Jan 11 2019, 4:41 AM

Parents

R120:2a1c677472ff: Question resolved: Code unnecessary

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R120:5d6410de38a6: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 11 2019, 4:41 AM

Changes (64)

				Path	Packages
	M			applets/activitybar/metadata.desktop
	M			applets/analog-clock/metadata.desktop
	M			applets/appmenu/package/metadata.desktop
	M			applets/batterymonitor/package/metadata.desktop
	M			applets/calendar/package/metadata.desktop
	M			applets/devicenotifier/package/metadata.desktop
	M			applets/devicenotifier/test-predicate-openinwindow.desktop
	M			applets/digital-clock/package/metadata.desktop
	M			applets/icon/package/metadata.desktop
	M			applets/lock_logout/metadata.desktop
	M			applets/mediacontroller/metadata.desktop
	M			applets/notifications/package/metadata.desktop
	M			applets/systemmonitor/cpu/metadata.desktop
	M			applets/systemmonitor/diskactivity/metadata.desktop
	M			applets/systemmonitor/diskusage/metadata.desktop
	M			applets/systemmonitor/memory/metadata.desktop
	M			applets/systemmonitor/net/metadata.desktop
	M			applets/systemtray/container/package/metadata.desktop
	M			applets/systemtray/package/metadata.desktop
	M			appmenu/appmenu.desktop
	M			components/shellprivate/wallpaperplugin/wallpaperplugin.knsrc
	M			components/shellprivate/widgetexplorer/plasmoids.knsrc
	M			containmentactions/applauncher/plasma-containmentactions-applauncher.desktop
	M			containmentactions/contextmenu/plasma-containmentactions-contextmenu.desktop
	M			containmentactions/paste/plasma-containmentactions-paste.desktop
	M			containmentactions/switchactivity/plasma-containmentactions-switchactivity.desktop
	M			containmentactions/switchdesktop/plasma-containmentactions-switchdesktop.desktop
	M			containmentactions/switchwindow/plasma-containmentactions-switchwindow.desktop
	M			dataengines/activities/plasma-dataengine-activities.desktop
	M			dataengines/applicationjobs/plasma-dataengine-applicationjobs.desktop
	M			dataengines/apps/plasma-dataengine-apps.desktop
	M			dataengines/devicenotifications/plasma-dataengine-devicenotifications.desktop
	M			dataengines/dict/plasma-dataengine-dict.desktop
	M			dataengines/executable/plasma-dataengine-executable.desktop
	M			dataengines/filebrowser/plasma-dataengine-filebrowser.desktop
	M			dataengines/geolocation/plasma-geolocation-gps.desktop
	M			dataengines/geolocation/plasma-geolocation-ip.desktop
	M			dataengines/keystate/plasma-dataengine-keystate.desktop
	M			dataengines/mouse/plasma-dataengine-mouse.desktop
	M			dataengines/notifications/plasma-dataengine-notifications.desktop
	M			dataengines/places/plasma-dataengine-places.desktop
	M			dataengines/share/plasma-dataengine-share.desktop
	M			dataengines/statusnotifieritem/plasma-dataengine-statusnotifieritem.desktop
	M			dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop
	M			dataengines/time/plasma-dataengine-time.desktop
	M			dataengines/weather/ions/bbcukmet/ion-bbcukmet.desktop
	M			dataengines/weather/plasma-dataengine-weather.desktop
	M			freespacenotifier/freespacenotifier.desktop
	M			freespacenotifier/freespacenotifier.notifyrc
	M			kcms/translations/kcm_translations.desktop
	M			kcms/translations/package/metadata.desktop
	M			kioslave/desktop/desktopnotifier.desktop
	M			kioslave/desktop/directory.trash
	M			ktimezoned/ktimezoned.desktop
	M			menu/desktop/kf5-education.directory
	M			phonon/platform_kde/phonon.notifyrc
	M			plasma-windowed/plasma-windowed.desktop
	M			runners/activities/plasma-runner-activityrunner.desktop
	M			runners/bookmarks/plasma-runner-bookmarks.desktop
	M			runners/calculator/plasma-runner-calculator.desktop
	M			runners/places/plasma-runner-places.desktop
	M			runners/services/plasma-runner-services.desktop
	M			runners/windowedwidgets/plasma-runner-windowedwidgets.desktop
	M			systemmonitor/org.kde.systemmonitor.desktop