SVN_SILENT made messages (.desktop file) - always resolve ours
10b5beffd723
Actions

Authored by l10n daemon script <scripty@kde.org> on Dec 11 2019, 8:25 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>

Dec 11 2019, 8:25 AM

Parents

R32:54597a6a389f: Make ForegroundLock::isLockedForThread() also consider the current thread being…

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R32:10b5beffd723: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).Dec 11 2019, 8:25 AM

Changes (57)

				Path	Packages
	M			plugins/astyle/kdevastyle.json
	M			plugins/bazaar/kdevbazaar.json
	M			plugins/clang/kdevclangsupport.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/contextbrowser/kdevcontextbrowser.json
	M			plugins/cppcheck/kdevcppcheck.json
	M			plugins/custom-buildsystem/kdevcustombuildsystem.json
	M			plugins/custom-definesandincludes/kdevdefinesandincludesmanager.json
	M			plugins/custommake/kdevcustommakemanager.json
	M			plugins/customscript/kdevcustomscript.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/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/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/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/switchtobuddy/kdevswitchtobuddy.json
	M			plugins/testview/kdevtestview.json
	M			plugins/vcschangesview/kdevvcschangesview.json
	M			plugins/welcomepage/kdevwelcomepage.json