[pkg-horde] [COMMIT lionel ingo--sid--1--patch-11] Merge with upstream

[Lionel Elie Mamane]

2006-10-31  Lionel Elie Mamane  <lionel at mamane.lu>  patch-11

	* config/backends.php.dist:
	* docs/CHANGES:
	* docs/CREDITS:
	* docs/RELEASE_NOTES:
	* filters.php:
	* lib/Driver/timsieved.php:
	* lib/IMAP/Search.php:
	* lib/Ingo.php:
	* lib/Script/imap.php:
	* lib/Script/maildrop.php:
	* lib/Script/procmail.php:
	* lib/Script/sieve.php:
	* lib/Storage.php:
	* lib/Storage/prefs.php:
	* lib/version.php:
	* locale/da_DK/LC_MESSAGES/ingo.mo:
	* locale/de_DE/LC_MESSAGES/ingo.mo:
	* locale/es_ES/LC_MESSAGES/ingo.mo:
	* locale/fr_FR/LC_MESSAGES/ingo.mo:
	* locale/it_IT/LC_MESSAGES/ingo.mo:
	* locale/nb_NO/LC_MESSAGES/ingo.mo:
	* locale/nl_NL/LC_MESSAGES/ingo.mo:
	* locale/pt_BR/LC_MESSAGES/ingo.mo:
	* locale/zh_TW/LC_MESSAGES/ingo.mo:
	* po/da_DK.po:
	* po/de_DE.po:
	* po/es_ES.po:
	* po/ingo.pot:
	* po/it_IT.po:
	* po/nl_NL.po:
	* po/pt_BR.po:
	* po/zh_TW.po:
	* templates/common-header.inc:
	* templates/filters/filter.html:
	* templates/filters/footer.inc:
	* templates/filters/header.inc:
	* templates/filters/settings.inc:
	+ js/.arch-ids/=id:
	+ js/.arch-ids/stripe.js.id:
	+ js/stripe.js:
	+ locale/ca_ES/.arch-ids/=id:
	+ locale/ca_ES/LC_MESSAGES/.arch-ids/=id:
	+ locale/ca_ES/LC_MESSAGES/.arch-ids/ingo.mo.id:
	+ locale/ca_ES/LC_MESSAGES/ingo.mo:
	+ locale/el_GR/.arch-ids/=id:
	+ locale/el_GR/LC_MESSAGES/.arch-ids/=id:
	+ locale/el_GR/LC_MESSAGES/.arch-ids/ingo.mo.id:
	+ locale/el_GR/LC_MESSAGES/ingo.mo:
	+ locale/et_EE/.arch-ids/=id:
	+ locale/et_EE/LC_MESSAGES/.arch-ids/=id:
	+ locale/et_EE/LC_MESSAGES/.arch-ids/ingo.mo.id:
	+ locale/et_EE/LC_MESSAGES/ingo.mo:
	+ locale/sl_SI/.arch-ids/=id:
	+ locale/sl_SI/LC_MESSAGES/.arch-ids/=id:
	+ locale/sl_SI/LC_MESSAGES/.arch-ids/ingo.mo.id:
	+ locale/sl_SI/LC_MESSAGES/ingo.mo:
	+ po/.arch-ids/ca_ES.po.id:
	+ po/.arch-ids/el_GR.po.id:
	+ po/.arch-ids/et_EE.po.id:
	+ po/.arch-ids/sl_SI.po.id:
	+ po/ca_ES.po:
	+ po/el_GR.po:
	+ po/et_EE.po:
	+ po/sl_SI.po:
	- templates/filters/.arch-ids/javascript.inc.id:
	- templates/filters/javascript.inc:

	Merge with upstream

	Patches applied:

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/ingo--upstream--1--patch-2
	   Imported ingo-h3-1.1.2