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

Authored by l10n daemon script <scripty@kde.org>.

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>

Sep 6 2015, 10:28 AM

Parents

R8:89cededf9826: SVN_SILENT made messages (after extraction)

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			kexi/formeditor/factories/kexiforms_standardwidgetsplugin.desktop
	M			kexi/kexi.desktop
	M			kexi/plugins/forms/kexi_formplugin.desktop
	M			kexi/plugins/forms/kexiforms_dbwidgetsplugin.desktop
	M			kexi/plugins/forms/widgets/mapbrowser/kexiforms_mapwidgetplugin.desktop
	M			kexi/plugins/forms/widgets/webbrowser/kexiforms_webbrowserwidgetplugin.desktop
	M			kexi/plugins/importexport/csv/kexi_csvimportexportplugin.desktop
	M			kexi/plugins/queries/kexi_queryplugin.desktop
	M			kexi/plugins/reports/kexi_reportplugin.desktop
	M			kexi/plugins/tables/kexi_tableplugin.desktop