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

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

Oct 17 2019, 3:41 AM

Parents

R108:f4c6de8ec452: Merge branch 'Plasma/5.17'

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R108:fe27d39b5c20: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Oct 17 2019, 3:41 AM

Changes (59)

				Path	Packages
	M			effects/coverswitch/coverswitch_config.desktop
	M			effects/dialogparent/package/metadata.desktop
	M			effects/diminactive/diminactive_config.desktop
	M			effects/dimscreen/package/metadata.desktop
	M			effects/eyeonscreen/package/metadata.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/glide/glide_config.desktop
	M			effects/invert/invert_config.desktop
	M			effects/login/package/metadata.desktop
	M			effects/logout/package/metadata.desktop
	M			effects/lookingglass/lookingglass_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/scale/package/metadata.desktop
	M			effects/showfps/showfps_config.desktop
	M			effects/showpaint/showpaint_config.desktop
	M			effects/thumbnailaside/thumbnailaside_config.desktop
	M			effects/translucency/package/metadata.desktop
	M			effects/windowaperture/package/metadata.desktop
	M			effects/zoom/zoom_config.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			kcmkwin/kwindecoration/kwindecoration.desktop
	M			kcmkwin/kwindecoration/package/metadata.desktop
	M			kcmkwin/kwindecoration/window-decorations.knsrc
	M			kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop
	M			kcmkwin/kwindesktop/package/metadata.desktop
	M			kcmkwin/kwineffects/kcm_kwin_effects.desktop
	M			kcmkwin/kwineffects/kwineffect.knsrc
	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/kdecorations/aurorae/src/aurorae.knsrc
	M			plugins/kdecorations/aurorae/src/kwindecoration.desktop
	M			plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
	M			plugins/kpackage/aurorae/kwin-packagestructure-aurorae.desktop
	M			plugins/kpackage/decoration/kwin-packagestructure-decoration.desktop
	M			plugins/kpackage/effect/kwin-packagestructure-effect.desktop
	M			scripts/desktopchangeosd/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