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

Authored by l10n daemon script <scripty@kde.org> on Mar 22 2017, 4:17 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>

Mar 22 2017, 4:17 AM

Parents

R108:f0b3be584489: [kcm_kwindecoration] Respect theme colors in buttons

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R108:8725f2441e94: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Mar 22 2017, 4:17 AM

Changes (40)

				Path	Packages
	M			effects/blur/blur_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/eyeonscreen/package/metadata.desktop
	M			effects/fade/package/metadata.desktop
	M			effects/fadedesktop/package/metadata.desktop
	M			effects/kwineffect.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/scalein/package/metadata.desktop
	M			effects/translucency/package/metadata.desktop
	M			effects/windowaperture/package/metadata.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/kwinscripts/kwinscripts.desktop
	M			kcmkwin/kwinscripts/kwinscripts.knsrc
	M			kcmkwin/kwintabbox/kwinswitcher.knsrc
	M			kcmkwin/kwintabbox/kwintabbox.desktop
	M			kwin.notifyrc
	M			packageplugins/scripts/kwin-packagestructure-scripts.desktop
	M			packageplugins/windowswitcher/kwin-packagestructure-windowswitcher.desktop
	M			plugins/kdecorations/aurorae/src/aurorae.knsrc
	M			plugins/kdecorations/aurorae/themes/plastik/package/metadata.desktop
	M			plugins/platforms/fbdev/fbdev.json
	M			scripts/minimizeall/metadata.desktop