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

Authored by l10n daemon script <scripty@kde.org> on Jan 17 2020, 9:18 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>

Jan 17 2020, 9:18 AM

Parents

R32:9143a96f0f29: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R32:2ba3a02ea1be: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Jan 17 2020, 9:18 AM

Changes (37)

				Path	Packages
	M			app_templates/c/CMake/cmake_plainc/cmake_plainc.kdevtemplate
	M			app_templates/cpp/CMake/cmake_kdevplugin/cmake_kdevplugin.kdevtemplate
	M			app_templates/cpp/CMake/cmake_qt5-qml2/cmake_qt5-qml2.kdevtemplate
	M			app_templates/cpp/QMake/qmake_qt5guiapp/qmake_qt5guiapp.kdevtemplate
	M			app_templates/cpp/QMake/qt5-qml2/qt5-qml2.kdevtemplate
	M			app_templates/empty/empty.kdevtemplate
	M			file_templates/classes/qabstractitemmodel/qabstractitemmodel.desktop
	M			file_templates/classes/qabstractitemmodel_pimpl/qabstractitemmodel_pimpl.desktop
	M			file_templates/classes/qdialog/qdialog.desktop
	M			file_templates/classes/qdialog_pimpl/qdialog_pimpl.desktop
	M			file_templates/classes/qobject_pimpl/qobject_pimpl.desktop
	M			file_templates/classes/qt_interface/qt_interface.desktop
	M			file_templates/classes/qwidget_pimpl/qwidget_pimpl.desktop
	M			kdevplatform/interfaces/kdevelopplugin.desktop
	M			plugins/android/kdevandroid.json
	M			plugins/appwizard/kdevappwizard.knsrc
	M			plugins/bazaar/org.kde.kdevelop_bzr.desktop
	M			plugins/clangtidy/kdevclangtidy.json
	M			plugins/clazy/kdevclazy.json
	M			plugins/cppcheck/kdevcppcheck.json
	M			plugins/docker/dockerfile-template/dockerfile-template.desktop
	M			plugins/docker/kdevdocker.json
	M			plugins/documentview/settings/kcm_documentview_settings.desktop
	M			plugins/filetemplates/kdevfiletemplates.knsrc
	M			plugins/flatpak/flatpak-template/flatpak-builder-manifest.desktop
	M			plugins/flatpak/kdevflatpak.json
	M			plugins/git/org.kde.kdevelop_git.desktop
	M			plugins/heaptrack/kdevheaptrack.json
	M			plugins/okteta/kdevokteta.json
	M			plugins/perforce/kdevperforce.json
	M			plugins/qmljs/kdevqmljs.json
	M			plugins/qthelp/kdevelop-qthelp.knsrc
	M			plugins/scratchpad/scratchpad.json
	M			plugins/sourceformatter/kdevsourceformatter.json
	M			plugins/standardoutputview/kdevstandardoutputview.json
	M			plugins/subversion/org.kde.kdevelop_svn.desktop
	M			plugins/welcomepage/kdevwelcomepage.json