[pkg-horde] [COMMIT lionel nag--sid--2--patch-10] Merge with upstream

[Lionel Elie Mamane]

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

	* COPYING:
	* data.php:
	* debian/changelog:
	* docs/CHANGES:
	* docs/CREDITS:
	* docs/RELEASE_NOTES:
	* js/fixUnstyledOptions.js:
	* lib/Block/summary.php:
	* lib/Driver.php:
	* lib/Driver/kolab.php:
	* lib/Driver/sql.php:
	* lib/Nag.php:
	* lib/api.php:
	* lib/base.php:
	* lib/version.php:
	* locale/da_DK/LC_MESSAGES/nag.mo:
	* locale/de_DE/LC_MESSAGES/nag.mo:
	* locale/el_GR/LC_MESSAGES/nag.mo:
	* locale/es_ES/LC_MESSAGES/nag.mo:
	* locale/fr_FR/LC_MESSAGES/nag.mo:
	* locale/it_IT/LC_MESSAGES/nag.mo:
	* locale/ja_JP/LC_MESSAGES/nag.mo:
	* locale/nb_NO/LC_MESSAGES/nag.mo:
	* locale/nl_NL/LC_MESSAGES/nag.mo:
	* locale/pt_BR/LC_MESSAGES/nag.mo:
	* locale/zh_TW/LC_MESSAGES/nag.mo:
	* po/da_DK.po:
	* po/de_DE.po:
	* po/el_GR.po:
	* po/es_ES.po:
	* po/it_IT.po:
	* po/ja_JP.po:
	* po/nag.pot:
	* po/nl_NL.po:
	* po/pt_BR.po:
	* po/zh_TW.po:
	* scripts/upgrades/2004-09-13_add_uid_field.php:
	* templates/list/task_headers.inc:
	* templates/list/task_summaries.inc:
	* templates/tasklists/tasklists.inc:
	+ locale/sl_SI/.arch-ids/=id:
	+ locale/sl_SI/LC_MESSAGES/.arch-ids/=id:
	+ locale/sl_SI/LC_MESSAGES/.arch-ids/nag.mo.id:
	+ locale/sl_SI/LC_MESSAGES/nag.mo:
	+ po/.arch-ids/sl_SI.po.id:
	+ po/sl_SI.po:
	+ scripts/sql/.arch-ids/nag.xml.id:
	+ scripts/sql/nag.xml:
	+ scripts/upgrades/.arch-ids/1.1_to_2.0.oci8.sql.id:
	+ scripts/upgrades/1.1_to_2.0.oci8.sql:

	Merge with upstream

	Patches applied:

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/nag--upstream--2--patch-3
	   Imported upstream nag 2.1.2