SVN_SILENT made messages (.desktop file) - always resolve ours
1c5c5ae1c5e1
Actions

Authored by l10n daemon script <scripty@kde.org> on Apr 13 2020, 8:17 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>

Apr 13 2020, 8:17 AM

Parents

R32:0dda64acb38c: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R32:1c5c5ae1c5e1: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Apr 13 2020, 8:17 AM

Changes (111)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	M			app/kdevelop.notifyrc
	M			app/org.kde.kdevelop.desktop
	M			app/org.kde.kdevelop_kdev4.desktop
	M			app/org.kde.kdevelop_ps.desktop
	M			app/plasma/applet/package/metadata.desktop
	M			app/plasma/dataengine/plasma-dataengine-kdevelopsessions.desktop
	M			app/plasma/runner/kdevelopsessions.desktop
	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_plaincpp/cmake_plaincpp.kdevtemplate
	M			app_templates/cpp/CMake/cmake_qt5-qml2/cmake_qt5-qml2.kdevtemplate
	M			app_templates/cpp/CMake/cmake_qt5guiapp/cmake_qt5guiapp.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/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/python_basic/python_basic.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/other/cmake_module/cmake_module.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			kdevplatform/interfaces/kdevelopplugin.desktop
	M			plugins/android/kdevandroid.json
	M			plugins/appwizard/kdevappwizard.json
	M			plugins/appwizard/kdevappwizard.knsrc
	M			plugins/astyle/kdevastyle.json
	M			plugins/bazaar/kdevbazaar.json
	M			plugins/bazaar/org.kde.kdevelop_bzr.desktop
	M			plugins/clang/kdevclangsupport.json
	M			plugins/clangtidy/kdevclangtidy.json
	M			plugins/classbrowser/kdevclassbrowser.json
	M			plugins/clazy/kdevclazy.json
	M			plugins/cmake/kdevcmakedocumentation.json
	M			plugins/cmake/kdevcmakemanager.json
	M			plugins/cmakebuilder/kdevcmakebuilder.json
	M			plugins/codeutils/kdevcodeutils.json
	M			plugins/contextbrowser/kdevcontextbrowser.json
	M			plugins/cppcheck/kdevcppcheck.json
	M			plugins/custom-buildsystem/kcm_kdevcustombuildsystem.desktop.cmake
	M			plugins/custom-buildsystem/kdevcustombuildsystem.json
	M			plugins/custom-definesandincludes/kdevdefinesandincludesmanager.json
	M			plugins/custommake/kdevcustommakemanager.json
	M			plugins/customscript/kdevcustomscript.json
	M			plugins/docker/dockerfile-template/dockerfile-template.desktop
	M			plugins/docker/kdevdocker.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/executeplasmoid/kdevexecuteplasmoid.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/flatpak/flatpak-template/flatpak-builder-manifest.desktop
	M			plugins/flatpak/kdevflatpak.json
	M			plugins/gdb/kdevgdb.json
	M			plugins/genericprojectmanager/kdevgenericmanager.json
	M			plugins/ghprovider/kdevghprovider.json
	M			plugins/git/kdevgit.json
	M			plugins/git/org.kde.kdevelop_git.desktop
	M			plugins/grepview/kdevgrepview.json
	M			plugins/heaptrack/kdevheaptrack.json
	M			plugins/kdeprovider/kdevkdeprovider.json
	M			plugins/konsole/kdevkonsoleview.json
	M			plugins/lldb/kdevlldb.json
	M			plugins/makebuilder/kdevmakebuilder.json
	M			plugins/manpage/kdevmanpage.json
	M			plugins/meson/kdevmesonmanager.json
	M			plugins/ninjabuilder/kdevninja.json
	M			plugins/okteta/kdevokteta.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/qmakebuilder/kdevqmakebuilder.json
	M			plugins/qmakemanager/kdevqmakemanager.json
	M			plugins/qmljs/kdevqmljs.json
	M			plugins/qthelp/kdevelop-qthelp.knsrc
	M			plugins/qthelp/kdevqthelp.json
	M			plugins/quickopen/kdevquickopen.json
	M			plugins/scratchpad/scratchpad.json
	M			plugins/sourceformatter/kdevsourceformatter.json
	M			plugins/standardoutputview/kdevstandardoutputview.json
	M			plugins/subversion/kdevsubversion.json
	M			plugins/subversion/org.kde.kdevelop_svn.desktop
	M			plugins/switchtobuddy/kdevswitchtobuddy.json
	M			plugins/testview/kdevtestview.json
	M			plugins/vcschangesview/kdevvcschangesview.json
	M			plugins/welcomepage/kdevwelcomepage.json