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

Authored by l10n daemon script <scripty@kde.org> on Jun 18 2018, 3:35 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>

Jun 18 2018, 3:35 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			effects/coverswitch/coverswitch_config.desktop
	M			effects/diminactive/diminactive_config.desktop
	M			effects/eyeonscreen/package/metadata.desktop
	M			effects/fadedesktop/package/metadata.desktop
	M			effects/frozenapp/package/metadata.desktop
	M			effects/morphingpopups/package/metadata.desktop
	M			effects/slide/slide_config.desktop
	M			effects/windowaperture/package/metadata.desktop
	M			effects/windowgeometry/windowgeometry_config.desktop
	M			effects/wobblywindows/wobblywindows_config.desktop
	M			kcmkwin/kwincompositing/kcmkwineffects.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			kcmkwin/kwincompositing/kwineffect.knsrc
	M			kcmkwin/kwindecoration/kwindecoration.desktop
	M			kcmkwin/kwinscreenedges/kwintouchscreen.desktop
	M			kcmkwin/kwinscripts/kwinscripts.knsrc
	M			kcmkwin/kwintabbox/kwinswitcher.knsrc
	M			kcmkwin/kwintabbox/kwintabbox.desktop
	M			packageplugins/aurorae/kwin-packagestructure-aurorae.desktop
	M			packageplugins/decoration/kwin-packagestructure-decoration.desktop
	M			packageplugins/scripts/kwin-packagestructure-scripts.desktop
	M			packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
	M			plugins/kdecorations/aurorae/src/aurorae.knsrc
	M			scripts/desktopchangeosd/metadata.desktop
	M			scripts/enforcedeco/metadata.desktop
	M			scripts/minimizeall/metadata.desktop
	M			scripts/synchronizeskipswitcher/metadata.desktop
	M			scripts/videowall/metadata.desktop
	M			tabbox/kwindesktopswitcher.desktop
	M			tabbox/kwinwindowswitcher.desktop