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

Authored by l10n daemon script <scripty@kde.org> on Jul 16 2017, 2:40 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>

Jul 16 2017, 2:40 AM

Parents

R482:b8535e085035: polish

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			data/printcreator/templates/1_photo_10.5x14.8cm.desktop
	M			data/printcreator/templates/1_photo_10x15cm.desktop
	M			data/printcreator/templates/1_photo_20x25cm.desktop
	M			data/printcreator/templates/1_photo_8x10.desktop
	M			data/printcreator/templates/1_photo_9x13cm.desktop
	M			data/printcreator/templates/2_photos_13x18cm.desktop
	M			data/printcreator/templates/2_photos_5x7.desktop
	M			data/printcreator/templates/3_photos_10x15cm.desktop
	M			data/printcreator/templates/3_photos_4x6.desktop
	M			data/printcreator/templates/4_photos_10x13.33cm.desktop
	M			data/printcreator/templates/4_photos_3.5x5.desktop
	M			data/printcreator/templates/4_photos_4.5x5cm.desktop
	M			data/printcreator/templates/4_photos_9x13cm.desktop
	M			data/printcreator/templates/4x6Album.desktop
	M			data/printcreator/templates/6_photos_3.5x4.5cm.desktop
	M			data/printcreator/templates/6_photos_3.5x4cm.desktop
	M			data/printcreator/templates/8_photos_6x9cm.desktop
	M			data/printcreator/templates/Album-Collage.desktop
	M			data/printcreator/templates/Album-Collage1.desktop
	M			data/printcreator/templates/Album_10x15cm.desktop
	M			data/printcreator/templates/Album_11.5x15cm.desktop
	M			data/printcreator/templates/FullPage.desktop
	M			data/printcreator/templates/Photoframe.desktop
	M			data/printcreator/templates/Thumbnails_5x4.desktop
	M			data/printcreator/templates/Thumbnails_6x5.desktop