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

Authored by l10n daemon script <scripty@kde.org> on May 27 2017, 3:31 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"

Details

Committed

l10n daemon script <scripty@kde.org>

May 27 2017, 3:31 AM

Parents

R44:3ded7af396c3: GIT_SILENT: prepare 5.5.2

Branches

Unknown

Tags

Unknown

l10n daemon script <scripty@kde.org> committed R44:49586b6362a1: SVN_SILENT made messages (.desktop file) - always resolve ours (authored by l10n daemon script <scripty@kde.org>).May 27 2017, 3:31 AM

Changes (58)

				Path	Packages
	M			agents/invitations/invitationsagent.desktop
	M			agents/maildispatcher/akonadi_maildispatcher_agent.notifyrc
	M			agents/maildispatcher/maildispatcheragent.desktop
	M			agents/migration/migrationagent.desktop
	M			agents/newmailnotifier/akonadi_newmailnotifier_agent.notifyrc
	M			agents/newmailnotifier/newmailnotifieragent.desktop
	M			defaultsetup/defaultaddressbook.desktop
	M			defaultsetup/defaultcalendar.desktop
	M			defaultsetup/defaultnotebook.desktop
	M			plugins/akonadi_serializer_addressee.desktop
	M			plugins/akonadi_serializer_contactgroup.desktop
	M			plugins/akonadi_serializer_kalarm.desktop
	M			plugins/akonadi_serializer_kcalcore.desktop
	M			plugins/akonadi_serializer_mail.desktop
	M			resources/akonotes/akonotesresource.desktop
	M			resources/birthdays/birthdaysresource.desktop
	M			resources/contacts/contactsresource.desktop
	M			resources/contacts/wizard/contactswizard.desktop
	M			resources/dav/resource/davgroupwareprovider.desktop
	M			resources/dav/resource/davgroupwareresource.desktop
	M			resources/dav/services/citadel.desktop
	M			resources/dav/services/davical.desktop
	M			resources/dav/services/egroupware.desktop
	M			resources/dav/services/opengroupware.desktop
	M			resources/dav/services/owncloud-pre5.desktop
	M			resources/dav/services/owncloud-pre9.desktop
	M			resources/dav/services/owncloud.desktop
	M			resources/dav/services/scalix.desktop
	M			resources/dav/services/sogo.desktop
	M			resources/dav/services/yahoo.desktop
	M			resources/dav/services/zarafa.desktop
	M			resources/dav/services/zimbra.desktop
	M			resources/gmail/gmailresource.desktop
	M			resources/google/calendar/googlecalendarresource.desktop
	M			resources/google/contacts/googlecontactsresource.desktop
	M			resources/ical/icalresource.desktop
	M			resources/ical/notes/notesresource.desktop
	M			resources/ical/wizard/icalwizard.desktop
	M			resources/icaldir/icaldirresource.desktop
	M			resources/imap/imapresource.desktop
	M			resources/imap/wizard/imapwizard.desktop
	M			resources/kalarm/kalarm/kalarmresource.desktop
	M			resources/kalarm/kalarmdir/kalarmdirresource.desktop
	M			resources/kolab/kolabresource.desktop
	M			resources/kolab/wizard/kolabwizard.desktop
	M			resources/maildir/maildirresource.desktop
	M			resources/maildir/wizard/maildirwizard.desktop
	M			resources/mbox/mboxresource.desktop
	M			resources/mbox/wizard/mailboxwizard.desktop
	M			resources/mixedmaildir/mixedmaildirresource.desktop
	M			resources/openxchange/openxchangeresource.desktop
	M			resources/pop3/pop3resource.desktop
	M			resources/pop3/wizard/pop3wizard.desktop
	M			resources/tomboynotes/tomboynotesresource.desktop
	M			resources/vcard/vcardresource.desktop
	M			resources/vcard/wizard/vcardwizard.desktop
	M			resources/vcarddir/vcarddirresource.desktop
	M			resources/vcarddir/wizard/vcarddirwizard.desktop