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

Authored by l10n daemon script <scripty@kde.org> on Jun 7 2020, 6:57 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>

Jun 7 2020, 6:57 AM

Parents

R37:7d573148c106: Add i18nc to the scripting api

Branches

Unknown

Tags

Unknown

References

refs/keep-around/428be56ad30d293cc8075317548e2dc7f26ad46f

				Path	Packages
	M			krita/data/templates/animation/.directory
	M			plugins/python/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
	M			plugins/python/batch_exporter/kritapykrita_batch_exporter.desktop
	M			plugins/python/channels2layers/kritapykrita_channels2layers.desktop
	M			plugins/python/colorspace/kritapykrita_colorspace.desktop
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/krita_script_starter/kritapykrita_krita_script_starter.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/palette_docker/kritapykrita_palette_docker.desktop
	M			plugins/python/plugin_importer/kritapykrita_plugin_importer.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
	M			plugins/python/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop