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

Authored by l10n daemon script <scripty@kde.org> on Aug 27 2018, 5:41 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>

Aug 27 2018, 5:41 AM

Parents

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			plugins/encoder/external/kcm_k3bexternalencoder.desktop
	M			plugins/encoder/lame/k3blameencoder.desktop
	M			plugins/encoder/lame/kcm_k3blameencoder.desktop
	M			plugins/encoder/ogg/k3boggvorbisencoder.desktop
	M			plugins/encoder/ogg/kcm_k3boggvorbisencoder.desktop
	M			plugins/encoder/skeleton.desktop
	M			plugins/encoder/sox/k3bsoxencoder.desktop
	M			plugins/encoder/sox/kcm_k3bsoxencoder.desktop
	M			plugins/project/audiometainforenamer/k3baudiometainforenamerplugin.desktop
	M			plugins/project/audioprojectcddb/k3baudioprojectcddbplugin.desktop
	M			src/helper/k3b.actions
	M			src/k3b.notifyrc