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

Authored by l10n daemon script <scripty@kde.org> on Sep 17 2019, 3:30 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>

Sep 17 2019, 3:30 AM

Parents

R120:e7cc46fad0c2: Provide a simple test tool to see what autostart will look like

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R120:dbc616f0fd3b: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Sep 17 2019, 3:30 AM

Changes (100)

				Path	Packages
	M			applets/activitybar/metadata.desktop
	M			applets/analog-clock/metadata.desktop
	M			applets/batterymonitor/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/notifications/package/metadata.desktop
	M			applets/panelspacer/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			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/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/favicons/plasma-dataengine-favicons.desktop
	M			dataengines/filebrowser/plasma-dataengine-filebrowser.desktop
	M			dataengines/geolocation/plasma-dataengine-geolocation.desktop
	M			dataengines/geolocation/plasma-geolocation-gps.desktop
	M			dataengines/geolocation/plasma-geolocation-ip.desktop
	M			dataengines/geolocation/plasma-geolocationprovider.desktop
	M			dataengines/hotplug/plasma-dataengine-hotplug.desktop
	M			dataengines/mouse/plasma-dataengine-mouse.desktop
	M			dataengines/notifications/plasma-dataengine-notifications.desktop
	M			dataengines/powermanagement/plasma-dataengine-powermanagement.desktop
	M			dataengines/soliddevice/plasma-dataengine-soliddevice.desktop
	M			dataengines/systemmonitor/plasma-dataengine-systemmonitor.desktop
	M			dataengines/time/plasma-dataengine-time.desktop
	M			dataengines/weather/ions/envcan/ion-envcan.desktop
	M			dataengines/weather/ions/noaa/ion-noaa.desktop
	M			dataengines/weather/ions/wetter.com/ion-wettercom.desktop
	M			dataengines/weather/plasma-dataengine-weather.desktop
	M			freespacenotifier/freespacenotifier.notifyrc
	M			klipper/klipper.desktop
	M			klipper/klipperrc.desktop
	M			klipper/org.kde.klipper.desktop
	M			ktimezoned/ktimezoned.desktop
	M			menu/desktop/kf5-development-translation.directory
	M			menu/desktop/kf5-development-webdevelopment.directory
	M			menu/desktop/kf5-development.directory
	M			menu/desktop/kf5-editors.directory
	M			menu/desktop/kf5-edu-mathematics.directory
	M			menu/desktop/kf5-edu-miscellaneous.directory
	M			menu/desktop/kf5-edu-science.directory
	M			menu/desktop/kf5-edu-tools.directory
	M			menu/desktop/kf5-games-arcade.directory
	M			menu/desktop/kf5-games-board.directory
	M			menu/desktop/kf5-games-card.directory
	M			menu/desktop/kf5-games-kids.directory
	M			menu/desktop/kf5-games-logic.directory
	M			menu/desktop/kf5-games-roguelikes.directory
	M			menu/desktop/kf5-games-strategy.directory
	M			menu/desktop/kf5-internet.directory
	M			menu/desktop/kf5-main.directory
	M			menu/desktop/kf5-more.directory
	M			menu/desktop/kf5-office.directory
	M			menu/desktop/kf5-science.directory
	M			menu/desktop/kf5-unknown.directory
	M			menu/desktop/kf5-utilities-accessibility.directory
	M			menu/desktop/kf5-utilities-desktop.directory
	M			menu/desktop/kf5-utilities-peripherals.directory
	M			menu/desktop/kf5-utilities-pim.directory
	M			menu/desktop/kf5-utilities-xutils.directory
	M			phonon/platform_kde/phonon.notifyrc
	M			phonon/platform_kde/phononbackend.desktop
	M			runners/bookmarks/plasma-runner-bookmarks.desktop
	M			runners/calculator/plasma-runner-calculator.desktop
	M			runners/kill/plasma-runner-kill.desktop
	M			runners/kill/plasma-runner-kill_config.desktop
	M			runners/locations/plasma-runner-locations.desktop
	M			runners/powerdevil/plasma-runner-powerdevil.desktop
	M			runners/recentdocuments/plasma-runner-recentdocuments.desktop
	M			runners/services/plasma-runner-services.desktop
	M			runners/sessions/plasma-runner-sessions.desktop
	M			runners/shell/plasma-runner-shell.desktop
	M			runners/webshortcuts/plasma-runner-webshortcuts.desktop
	M			runners/windows/plasma-runner-windows.desktop
	M			solidautoeject/solidautoeject.desktop
	M			statusnotifierwatcher/statusnotifierwatcher.desktop
	M			systemmonitor/org.kde.systemmonitor.desktop
	M			themes/qtcde.themerc
	M			themes/qtgtk.themerc
	M			themes/qtmacintosh.themerc
	M			themes/qtmotif.themerc
	M			themes/qtplastique.themerc
	M			themes/qtwindows.themerc
	M			themes/qtwindowsvista.themerc
	M			themes/qtwindowsxp.themerc
	M			wallpapers/color/plasma-wallpaper-color.desktop
	M			wallpapers/image/slideshowpackage/metadata.desktop