SVN_SILENT made messages (.desktop file) - always resolve ours
97a1bbfb142d
Actions

Authored by l10n daemon script <scripty@kde.org> on Jan 6 2019, 7:36 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>

Jan 6 2019, 7:36 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			app/kdevelop.notifyrc
	M			app_templates/empty/empty.kdevtemplate
	M			file_templates/classes/c_gobject/c_gobject.desktop
	M			file_templates/classes/c_gobject_private/c_gobject_private.desktop
	M			file_templates/classes/c_gobject_properties/c_gobject_properties.desktop
	M			file_templates/classes/cpp_basic/cpp_basic.desktop
	M			file_templates/classes/private_pointer/private_pointer.desktop
	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/qobject.desktop
	M			file_templates/classes/qobject_pimpl/qobject_pimpl.desktop
	M			file_templates/classes/qt_interface/qt_interface.desktop
	M			file_templates/classes/qt_shared/qt_shared.desktop
	M			file_templates/classes/qt_widget/qt_widget.desktop
	M			file_templates/classes/qwidget_pimpl/qwidget_pimpl.desktop
	M			file_templates/testing/cpp_cpputest/cpp_cpputest.desktop
	M			file_templates/testing/cpp_gtest/cpp_gtest.desktop
	M			file_templates/testing/cpp_qtestlib/cpp_qtestlib.desktop
	M			file_templates/testing/cpp_qtestlib_kdevelop/cpp_qtestlib_kdevelop.desktop
	M			file_templates/testing/php_phpunit/php_phpunit.desktop
	M			file_templates/testing/python_pyunit/python_pyunit.desktop
	M			plugins/docker/dockerfile-template/dockerfile-template.desktop
	M			plugins/executeplasmoid/kdevexecuteplasmoid.json
	M			plugins/flatpak/flatpak-template/flatpak-builder-manifest.desktop