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

Authored by l10n daemon script <scripty@kde.org> on Nov 13 2018, 5:16 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>

Nov 13 2018, 5:16 AM

Parents

R1026:71e87b946695: Q_ENUMS -> Q_ENUM

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			src/libs/kernel/plan_schedulerplugin.desktop
	M			src/libs/ui/reports/items/text/text.json
	M			src/org.kde.calligraplan.desktop
	M			src/plan_viewplugin.desktop
	M			src/planpart.desktop
	M			src/plugins/filters/icalendar/export/plan_icalendar_export.desktop
	M			src/plugins/filters/kplato/import/plan_kplato_import.desktop
	M			src/plugins/schedulers/rcps/planrcpsscheduler.desktop
	M			src/plugins/schedulers/tj/plantjscheduler.desktop
	M			src/plugins/scripting/planscripting.desktop
	M			src/servicetypes/calligraplan_filter.desktop
	M			src/servicetypes/calligraplan_part.desktop
	M			src/templates/Simple/.directory
	M			src/templates/Simple/8HourDay-40HourWeek.desktop
	M			src/templates/Simple/Basicproject.desktop
	M			src/templates/Simple/Plain.desktop
	M			src/workpackage/org.kde.calligraplanwork.desktop
	M			src/workpackage/planworkpart.desktop
	M			src/workpackage/templates/Simple/.directory
	M			src/workpackage/templates/Simple/Empty.desktop