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

Authored by l10n daemon script <scripty@kde.org> on Nov 21 2017, 5:04 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>

Nov 21 2017, 5:04 AM

Parents

R32:0e43fa965531: test_kdevformatsource: Fix crash on Windows

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R32:80536b4c4c62: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Nov 21 2017, 5:04 AM

Changes (38)

				Path	Packages
	M			file_templates/classes/qdialog_pimpl/qdialog_pimpl.desktop
	M			file_templates/classes/qt_widget/qt_widget.desktop
	M			kdevplatform/interfaces/kdevelopplugin.desktop
	M			plugins/appwizard/kdevappwizard.json
	M			plugins/appwizard/kdevappwizard.knsrc
	M			plugins/bazaar/kdevbazaar.json
	M			plugins/classbrowser/kdevclassbrowser.json
	M			plugins/codeutils/kdevcodeutils.json
	M			plugins/contextbrowser/kdevcontextbrowser.json
	M			plugins/cvs/kdevcvs.json
	M			plugins/documentswitcher/kdevdocumentswitcher.json
	M			plugins/documentview/kdevdocumentview.json
	M			plugins/documentview/settings/kcm_documentview_settings.desktop
	M			plugins/execute/kdevexecute.json
	M			plugins/executescript/kdevexecutescript.json
	M			plugins/externalscript/kdevexternalscript.json
	M			plugins/filemanager/kdevfilemanager.json
	M			plugins/filetemplates/kdevfiletemplates.json
	M			plugins/filetemplates/kdevfiletemplates.knsrc
	M			plugins/genericprojectmanager/kdevgenericmanager.json
	M			plugins/git/kdevgit.json
	M			plugins/grepview/kdevgrepview.json
	M			plugins/konsole/kdevkonsoleview.json
	M			plugins/openwith/kdevopenwith.json
	M			plugins/outlineview/kdevoutlineview.json
	M			plugins/patchreview/kdevpatchreview.json
	M			plugins/perforce/kdevperforce.json
	M			plugins/problemreporter/kdevproblemreporter.json
	M			plugins/projectfilter/kdevprojectfilter.json
	M			plugins/projectmanagerview/kdevprojectmanagerview.json
	M			plugins/quickopen/kdevquickopen.json
	M			plugins/sourceformatter/kdevsourceformatter.json
	M			plugins/standardoutputview/kdevstandardoutputview.json
	M			plugins/subversion/kdevsubversion.json
	M			plugins/switchtobuddy/kdevswitchtobuddy.json
	M			plugins/testview/kdevtestview.json
	M			plugins/vcschangesview/kdevvcschangesview.json
	M			plugins/welcomepage/kdevwelcomepage.json