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

Authored by l10n daemon script <scripty@kde.org> on Mar 27 2020, 5:43 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>

Mar 27 2020, 5:43 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			effects/eyeonscreen/package/metadata.desktop
	M			effects/fadingpopups/package/metadata.desktop
	M			effects/logout/package/metadata.desktop
	M			effects/magnifier/magnifier_config.desktop
	M			effects/scale/package/metadata.desktop
	M			effects/sessionquit/package/metadata.desktop
	M			effects/showfps/showfps_config.desktop
	M			effects/squash/package/metadata.desktop
	M			effects/windowaperture/package/metadata.desktop
	M			kcmkwin/kwincompositing/kwincompositing.desktop
	M			kcmkwin/kwindecoration/kwindecoration.desktop
	M			kcmkwin/kwindecoration/package/metadata.desktop
	M			kcmkwin/kwindesktop/kcm_kwin_virtualdesktops.desktop
	M			kcmkwin/kwindesktop/package/metadata.desktop
	M			kcmkwin/kwineffects/kcm_kwin_effects.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/kwinscreenedges/kwinscreenedges.desktop
	M			kcmkwin/kwinscreenedges/kwintouchscreen.desktop
	M			plugins/kpackage/effect/kwin-packagestructure-effect.desktop