[pkg-horde] [COMMIT lionel kronolith--sid--2--patch-8] Merge with upstream

[Lionel Elie Mamane]

2006-05-09  Lionel Elie Mamane  <lionel at mamane.lu>  patch-8

	+ .arch-ids/attend.php.id:
	+ .arch-ids/calendar_search.php.id:
	+ .arch-ids/ics.php.id:
	+ .arch-ids/year.php.id:
	+ attend.php:
	+ calendar_search.php:
	+ ics.php:
	+ js/.arch-ids/=id:
	+ js/.arch-ids/fixUnstyledOptions.js.id:
	+ js/.arch-ids/stripe.js.id:
	+ js/fixUnstyledOptions.js:
	+ js/stripe.js:
	+ lib/Block/.arch-ids/tree_alarms.php.id:
	+ lib/Block/tree_alarms.php:
	+ locale/pt_PT/.arch-ids/=id:
	+ locale/pt_PT/LC_MESSAGES/.arch-ids/=id:
	+ locale/pt_PT/LC_MESSAGES/.arch-ids/kronolith.mo.id:
	+ locale/pt_PT/LC_MESSAGES/kronolith.mo:
	+ locale/tr_TR/.arch-ids/=id:
	+ locale/tr_TR/.arch-ids/help.xml.id:
	+ locale/tr_TR/help.xml:
	+ po/.arch-ids/pt_PT.po.id:
	+ po/pt_PT.po:
	+ scripts/.arch-ids/import_icals.php.id:
	+ scripts/import_icals.php:
	+ scripts/sql/.arch-ids/kronolith.mssql.sql.id:
	+ scripts/sql/kronolith.mssql.sql:
	+ templates/calendars/.arch-ids/search.inc.id:
	+ templates/calendars/search.inc:
	+ templates/day/.arch-ids/rows.html.id:
	+ templates/day/rows.html:
	+ templates/fbview/.arch-ids/emptyblock.tpl.id:
	+ templates/fbview/.arch-ids/legend.tpl.id:
	+ templates/fbview/emptyblock.tpl:
	+ templates/fbview/legend.tpl:
	+ templates/javascript/.arch-ids/open_calendar_search.js.id:
	+ templates/javascript/open_calendar_search.js:
	+ templates/prefs/.arch-ids/fb_cals_select.inc.id:
	+ templates/prefs/fb_cals_select.inc:
	+ templates/year/.arch-ids/=id:
	+ templates/year/.arch-ids/head.inc.id:
	+ templates/year/head.inc:
	+ themes/.arch-ids/categoryCSS.php.id:
	+ themes/categoryCSS.php:
	+ themes/graphics/.arch-ids/addressbook_browse.png.id:
	+ themes/graphics/.arch-ids/alarm.png.id:
	+ themes/graphics/.arch-ids/expand.png.id:
	+ themes/graphics/.arch-ids/new_big.png.id:
	+ themes/graphics/.arch-ids/yearview.png.id:
	+ themes/graphics/addressbook_browse.png:
	+ themes/graphics/alarm.png:
	+ themes/graphics/expand.png:
	+ themes/graphics/new_big.png:
	+ themes/graphics/yearview.png:
	+ year.php:
	- .arch-ids/attend.php.id:
	- .arch-ids/calendar_search.php.id:
	- .arch-ids/ics.php.id:
	- .arch-ids/year.php.id:
	- attend.php:
	- calendar_search.php:
	- ics.php:
	- js/.arch-ids/=id:
	- js/.arch-ids/fixUnstyledOptions.js.id:
	- js/.arch-ids/stripe.js.id:
	- js/fixUnstyledOptions.js:
	- js/stripe.js:
	- lib/Block/.arch-ids/tree_alarms.php.id:
	- lib/Block/tree_alarms.php:
	- locale/pt_PT/.arch-ids/=id:
	- locale/pt_PT/LC_MESSAGES/.arch-ids/=id:
	- locale/pt_PT/LC_MESSAGES/.arch-ids/kronolith.mo.id:
	- locale/pt_PT/LC_MESSAGES/kronolith.mo:
	- locale/tr_TR/.arch-ids/=id:
	- locale/tr_TR/.arch-ids/help.xml.id:
	- locale/tr_TR/help.xml:
	- po/.arch-ids/pt_PT.po.id:
	- po/pt_PT.po:
	- scripts/.arch-ids/import_icals.php.id:
	- scripts/import_icals.php:
	- scripts/sql/.arch-ids/kronolith.mssql.sql.id:
	- scripts/sql/kronolith.mssql.sql:
	- templates/calendars/.arch-ids/search.inc.id:
	- templates/calendars/search.inc:
	- templates/day/.arch-ids/rows.html.id:
	- templates/day/rows.html:
	- templates/fbview/.arch-ids/emptyblock.tpl.id:
	- templates/fbview/.arch-ids/legend.tpl.id:
	- templates/fbview/emptyblock.tpl:
	- templates/fbview/legend.tpl:
	- templates/javascript/.arch-ids/open_calendar_search.js.id:
	- templates/javascript/open_calendar_search.js:
	- templates/prefs/.arch-ids/fb_cals_select.inc.id:
	- templates/prefs/fb_cals_select.inc:
	- templates/year/.arch-ids/=id:
	- templates/year/.arch-ids/head.inc.id:
	- templates/year/head.inc:
	- themes/.arch-ids/categoryCSS.php.id:
	- themes/categoryCSS.php:
	- themes/graphics/.arch-ids/addressbook_browse.png.id:
	- themes/graphics/.arch-ids/alarm.png.id:
	- themes/graphics/.arch-ids/expand.png.id:
	- themes/graphics/.arch-ids/new_big.png.id:
	- themes/graphics/.arch-ids/yearview.png.id:
	- themes/graphics/addressbook_browse.png:
	- themes/graphics/alarm.png:
	- themes/graphics/expand.png:
	- themes/graphics/new_big.png:
	- themes/graphics/yearview.png:
	- year.php:

	Merge with upstream

	Repair the mess I made by importing Jose's upload directly into the
	sid branch.


	Patches applied:

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/kronolith--upstream--2--patch-2
	   Imported kronolith-h3-2.1