SVN_SILENT made messages (.desktop file) - always resolve ours
304f0e40fd32
Actions

Authored by l10n daemon script <scripty@kde.org> on Apr 19 2018, 5:07 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>

Apr 19 2018, 5:07 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app/org.kde.kdevelop.desktop
	M			app/org.kde.kdevelop_ps.desktop
	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/qdialog_pimpl/qdialog_pimpl.desktop
	M			file_templates/classes/qobject_pimpl/qobject_pimpl.desktop
	M			file_templates/classes/qt_interface/qt_interface.desktop
	M			kdevplatform/interfaces/kdevelopplugin.desktop
	M			plugins/android/kdevandroid.json
	M			plugins/appwizard/kdevappwizard.knsrc
	M			plugins/cppcheck/kdevcppcheck.json
	M			plugins/custom-buildsystem/kdevcustombuildsystem.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/ghprovider/kdevghprovider.json
	M			plugins/heaptrack/kdevheaptrack.json
	M			plugins/lldb/kdevlldb.json
	M			plugins/okteta/kdevokteta.json
	M			plugins/perforce/kdevperforce.json
	M			plugins/qthelp/kdevelop-qthelp.knsrc
	M			plugins/sourceformatter/kdevsourceformatter.json
	M			plugins/subversion/kdevsubversion.json
	M			plugins/welcomepage/kdevwelcomepage.json