[pkg-horde] [COMMIT reg turba--sid--2--patch-9] Merge with upstream

[Lionel Elie Mamane]

2007-07-11  Gregory Colpart  <reg at evolix.fr>  patch-9

	* add.php:
	* addressbooks.php:
	* browse.php:
	* config/prefs.php.dist:
	* config/sources.php.dist:
	* data.php:
	* delete.php:
	* display.php:
	* docs/CHANGES:
	* docs/CREDITS:
	* docs/INSTALL:
	* docs/RELEASE_NOTES:
	* docs/UPGRADING:
	* edit.php:
	* index.php:
	* lib/Driver.php:
	* lib/Driver/kolab.php:
	* lib/Driver/ldap.php:
	* lib/Driver/sql.php:
	* lib/ListView.php:
	* lib/Turba.php:
	* lib/api.php:
	* lib/base.php:
	* lib/prefs.php:
	* lib/version.php:
	* locale/ca_ES/LC_MESSAGES/turba.mo:
	* locale/de_DE/LC_MESSAGES/turba.mo:
	* locale/fi_FI/LC_MESSAGES/turba.mo:
	* locale/fr_FR/LC_MESSAGES/turba.mo:
	* locale/nl_NL/LC_MESSAGES/turba.mo:
	* locale/pt_BR/LC_MESSAGES/turba.mo:
	* locale/pt_PT/LC_MESSAGES/turba.mo:
	* locale/zh_TW/LC_MESSAGES/turba.mo:
	* minisearch.php:
	* po/ca_ES.po:
	* po/de_DE.po:
	* po/fi_FI.po:
	* po/nl_NL.po:
	* po/pt_BR.po:
	* po/pt_PT.po:
	* po/turba.pot:
	* po/zh_TW.po:
	* scripts/import_vcards.php:
	* scripts/upgrades/create_default_histories.php:
	* scripts/upgrades/public_to_horde_share.php:
	* search.php:
	* templates/addressbooks.inc:
	* templates/browse/actions.inc:
	* templates/browse/column_footers.inc:
	* templates/browse/column_headers.inc:
	* templates/browse/row.inc:
	* templates/browse/search.inc:
	* templates/browse/search_criteria.inc:
	* test.php:
	* vcard.php:
	* view.php:
	+ lib/tests/.arch-ids/=id:
	+ lib/tests/.arch-ids/tovcard.phpt.id:
	+ lib/tests/tovcard.phpt:
	+ locale/ca_ES/.arch-ids/help.xml.id:
	+ locale/ca_ES/help.xml:
	+ locale/fr_FR/.arch-ids/help.xml.id:
	+ locale/fr_FR/help.xml:
	* scripts/sql/.arch-ids/turba_objects.xml.id -> scripts/sql/.arch-ids/turba.xml.id:
	* scripts/sql/turba_objects.xml -> scripts/sql/turba.xml:

	Merge with upstream

	Patches applied:

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/turba--upstream--2--patch-3
	   Import upstream turba 2.1.3

	 * pkg-horde-hackers at lists.alioth.debian.org--2006/turba--upstream--2--patch-4
	   Import Turba 2.1.4