Merge branch 'debian/experimental' into debian/sid

drop changes to debian/gbp.conf

Conflicts:
	bg/locale/bg/calendar/calendar-alarms.properties
	bg/locale/bg/calendar/calendar-invitations-dialog.dtd
	bg/locale/bg/calendar/calendar-occurrence-prompt.properties
	bg/locale/bg/calendar/calendar-subscriptions-dialog.dtd
	bg/locale/bg/calendar/calendar.properties
	bg/locale/bg/calendar/calendarCreation.properties
	bg/locale/bg/calendar/categories.properties
	bg/locale/bg/calendar/dateFormat.properties
	bg/locale/bg/calendar/dialogs/calendar-event-dialog-reminder.dtd
	bg/locale/bg/calendar/global.dtd
	bg/locale/bg/calendar/menuOverlay.dtd
	bg/locale/bg/calendar/migration.dtd
	bg/locale/bg/calendar/migration.properties
	bg/locale/bg/calendar/preferences/advanced.dtd
	bg/locale/bg/calendar/preferences/alarms.dtd
	bg/locale/bg/calendar/preferences/categories.dtd
	bg/locale/bg/calendar/preferences/connection.dtd
	bg/locale/bg/calendar/preferences/general.dtd
	bg/locale/bg/calendar/preferences/preferences.dtd
	bg/locale/bg/calendar/preferences/timezones.dtd
	bg/locale/bg/calendar/preferences/views.dtd
	bg/locale/bg/calendar/provider-uninstall.dtd
	bg/locale/bg/lightning/lightning.dtd
	ca/locale/ca/calendar/preferences/advanced.dtd
	ca/locale/ca/calendar/preferences/connection.dtd
	debian/patches/Brand-ga-IE.patch
	debian/patches/Brand-id.patch
	debian/patches/Brand-ko.patch
	debian/patches/Brand-pa-IN.patch
	debian/patches/Brand-sl.patch
	eu/locale/eu/calendar/preferences/advanced.dtd
	ga-IE/locale/ga-IE/calendar/calendar-alarms.properties
	ga-IE/locale/ga-IE/calendar/calendar-event-dialog.dtd
	ga-IE/locale/ga-IE/calendar/calendar-invitations-dialog.dtd
	ga-IE/locale/ga-IE/calendar/calendar-occurrence-prompt.properties
	ga-IE/locale/ga-IE/calendar/calendar-subscriptions-dialog.dtd
	ga-IE/locale/ga-IE/calendar/calendar.dtd
	ga-IE/locale/ga-IE/calendar/calendar.properties
	ga-IE/locale/ga-IE/calendar/dateFormat.properties
	ga-IE/locale/ga-IE/calendar/global.dtd
	ga-IE/locale/ga-IE/calendar/menuOverlay.dtd
	ga-IE/locale/ga-IE/calendar/preferences/preferences.dtd
	ga-IE/locale/ga-IE/calendar/timezones.properties
	ga-IE/locale/ga-IE/lightning/lightning.dtd
	ga-IE/locale/ga-IE/lightning/lightning.properties
	gl/locale/gl/calendar/calendar.dtd
	gl/locale/gl/calendar/timezones.properties
	he/locale/he/calendar/calendar-alarms.properties
	he/locale/he/calendar/calendar-event-dialog-attendees.properties
	he/locale/he/calendar/calendar-event-dialog.properties
	he/locale/he/calendar/calendar-invitations-dialog.dtd
	he/locale/he/calendar/calendar-occurrence-prompt.dtd
	he/locale/he/calendar/calendar-occurrence-prompt.properties
	he/locale/he/calendar/calendar-subscriptions-dialog.dtd
	he/locale/he/calendar/calendar.properties
	he/locale/he/calendar/calendarCreation.dtd
	he/locale/he/calendar/calendarCreation.properties
	he/locale/he/calendar/dateFormat.properties
	he/locale/he/calendar/migration.properties
	he/locale/he/calendar/preferences/alarms.dtd
	he/locale/he/calendar/preferences/categories.dtd
	he/locale/he/calendar/preferences/general.dtd
	he/locale/he/calendar/preferences/preferences.dtd
	he/locale/he/calendar/provider-uninstall.dtd
	he/locale/he/calendar/wcap.properties
	hr/locale/hr/calendar/calendar.properties
	it/locale/it/calendar/preferences/advanced.dtd
	it/locale/it/calendar/preferences/connection.dtd
	ko/locale/ko/calendar/calendar-alarms.properties
	ko/locale/ko/calendar/calendar-event-dialog-attendees.properties
	ko/locale/ko/calendar/calendar-event-dialog.properties
	ko/locale/ko/calendar/calendar-invitations-dialog.dtd
	ko/locale/ko/calendar/calendar-occurrence-prompt.dtd
	ko/locale/ko/calendar/calendar-occurrence-prompt.properties
	ko/locale/ko/calendar/calendar-subscriptions-dialog.dtd
	ko/locale/ko/calendar/calendarCreation.dtd
	ko/locale/ko/calendar/categories.properties
	ko/locale/ko/calendar/dialogs/calendar-event-dialog-reminder.dtd
	ko/locale/ko/calendar/global.dtd
	ko/locale/ko/calendar/menuOverlay.dtd
	ko/locale/ko/calendar/migration.dtd
	ko/locale/ko/calendar/preferences/advanced.dtd
	ko/locale/ko/calendar/preferences/connection.dtd
	ko/locale/ko/calendar/preferences/preferences.dtd
	ko/locale/ko/calendar/preferences/timezones.dtd
	ko/locale/ko/calendar/preferences/views.dtd
	ko/locale/ko/calendar/wcap.properties
	ko/locale/ko/lightning/lightning.dtd
	nn-NO/locale/nn-NO/calendar/preferences/advanced.dtd
	pa-IN/locale/pa-IN/calendar/calendar.dtd
	pa-IN/locale/pa-IN/calendar/timezones.properties
	sl/locale/sl/calendar/calendar-alarms.properties
	sl/locale/sl/calendar/calendar-event-dialog.dtd
	sl/locale/sl/calendar/calendar-event-dialog.properties
	sl/locale/sl/calendar/calendar-invitations-dialog.dtd
	sl/locale/sl/calendar/calendar.dtd
	sl/locale/sl/calendar/calendar.properties
	sl/locale/sl/calendar/calendarCreation.dtd
	sl/locale/sl/calendar/dateFormat.properties
	sl/locale/sl/calendar/preferences/connection.dtd
	sl/locale/sl/calendar/preferences/general.dtd
	sq/locale/sq/calendar/calendar.dtd
	sq/locale/sq/calendar/preferences/categories.dtd
	sv-SE/locale/sv-SE/calendar/calendar.dtd
	sv-SE/locale/sv-SE/calendar/calendar.properties
	sv-SE/locale/sv-SE/calendar/timezones.properties
	tr/locale/tr/calendar/calendar.properties
	zh-TW/locale/zh-TW/calendar/preferences/advanced.dtd