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

Authored by l10n daemon script <scripty@kde.org> on Sep 4 2017, 2:34 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>

Sep 4 2017, 2:34 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			file_templates/classes/qdialog_pimpl/qdialog_pimpl.desktop
	M			kdevplatform/interfaces/kdevelopplugin.desktop
	M			kdevplatform/plugins/appwizard/kdevappwizard.json
	M			kdevplatform/plugins/bazaar/kdevbazaar.json
	M			kdevplatform/plugins/cvs/kdevcvs.json
	M			kdevplatform/plugins/docker/dockerfile-template/dockerfile-template.desktop
	M			kdevplatform/plugins/docker/kdevdocker.json
	M			kdevplatform/plugins/documentview/kdevdocumentview.json
	M			kdevplatform/plugins/documentview/settings/kcm_documentview_settings.desktop
	M			kdevplatform/plugins/filemanager/kdevfilemanager.json
	M			kdevplatform/plugins/flatpak/flatpak-template/flatpak-builder-manifest.desktop
	M			kdevplatform/plugins/flatpak/kdevflatpak.json
	M			kdevplatform/plugins/genericprojectmanager/kdevgenericmanager.json
	M			kdevplatform/plugins/git/kdevgit.json
	M			kdevplatform/plugins/konsole/kdevkonsoleview.json
	M			kdevplatform/plugins/perforce/kdevperforce.json
	M			kdevplatform/plugins/projectfilter/kdevprojectfilter.json
	M			kdevplatform/plugins/projectmanagerview/kdevprojectmanagerview.json
	M			kdevplatform/plugins/sourceformatter/kdevsourceformatter.json
	M			kdevplatform/plugins/subversion/kdevsubversion.json
	M			kdevplatform/plugins/vcschangesview/kdevvcschangesview.json