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

Authored by l10n daemon script <scripty@kde.org> on Jul 23 2018, 3:24 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>

Jul 23 2018, 3:24 AM

Parents

R108:9cff6c21f34d: [effects/slide] Fix coding style

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R108:3b3aa82f5882: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jul 23 2018, 3:24 AM

Changes (62)

				Path	Packages
	M			effects/blur/blur_config.desktop
	M			effects/coverswitch/coverswitch_config.desktop
	M			effects/cube/cube_config.desktop
	M			effects/cube/cubeslide_config.desktop
	M			effects/desktopgrid/desktopgrid_config.desktop
	M			effects/dialogparent/package/metadata.desktop
	M			effects/diminactive/diminactive_config.desktop
	M			effects/fade/package/metadata.desktop
	M			effects/fadedesktop/package/metadata.desktop
	M			effects/flipswitch/flipswitch_config.desktop
	M			effects/frozenapp/package/metadata.desktop
	M			effects/invert/invert_config.desktop
	M			effects/lookingglass/lookingglass_config.desktop
	M			effects/magiclamp/magiclamp_config.desktop
	M			effects/magnifier/magnifier_config.desktop
	M			effects/maximize/package/metadata.desktop
	M			effects/morphingpopups/package/metadata.desktop
	M			effects/mouseclick/mouseclick_config.desktop
	M			effects/mousemark/mousemark_config.desktop
	M			effects/presentwindows/presentwindows_config.desktop
	M			effects/resize/resize_config.desktop
	M			effects/scalein/package/metadata.desktop
	M			effects/showfps/showfps_config.desktop
	M			effects/slide/slide_config.desktop
	M			effects/thumbnailaside/thumbnailaside_config.desktop
	M			effects/trackmouse/trackmouse_config.desktop
	M			effects/translucency/package/metadata.desktop
	M			effects/windowaperture/package/metadata.desktop
	M			effects/windowgeometry/windowgeometry_config.desktop
	M			effects/wobblywindows/wobblywindows_config.desktop
	M			effects/zoom/zoom_config.desktop
	M			kcmkwin/kwincompositing/kcmkwineffects.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			kcmkwin/kwincompositing/kwineffect.knsrc
	M			kcmkwin/kwindecoration/kwindecoration.desktop
	M			kcmkwin/kwindesktop/desktop.desktop
	M			kcmkwin/kwinoptions/kwinactions.desktop
	M			kcmkwin/kwinoptions/kwinadvanced.desktop
	M			kcmkwin/kwinoptions/kwinfocus.desktop
	M			kcmkwin/kwinoptions/kwinmoving.desktop
	M			kcmkwin/kwinoptions/kwinoptions.desktop
	M			kcmkwin/kwinrules/kwinrules.desktop
	M			kcmkwin/kwinscreenedges/kwinscreenedges.desktop
	M			kcmkwin/kwinscreenedges/kwintouchscreen.desktop
	M			kcmkwin/kwinscripts/kwinscripts.desktop
	M			kcmkwin/kwinscripts/kwinscripts.knsrc
	M			kcmkwin/kwintabbox/kwinswitcher.knsrc
	M			kcmkwin/kwintabbox/kwintabbox.desktop
	M			kwin.notifyrc
	M			plugins/platforms/drm/drm.json
	M			plugins/platforms/fbdev/fbdev.json
	M			plugins/platforms/hwcomposer/hwcomposer.json
	M			plugins/platforms/virtual/virtual.json
	M			plugins/platforms/wayland/wayland.json
	M			plugins/platforms/x11/standalone/x11.json
	M			plugins/platforms/x11/windowed/x11.json
	M			plugins/scenes/opengl/opengl.json
	M			plugins/scenes/qpainter/qpainter.json
	M			plugins/scenes/xrender/xrender.json
	M			scripts/desktopchangeosd/metadata.desktop
	M			scripts/enforcedeco/metadata.desktop
	M			scripts/synchronizeskipswitcher/metadata.desktop