diff -Nru davical-0.9.9.7/ChangeLog davical-1.0.2/ChangeLog
--- davical-0.9.9.7/ChangeLog	2011-10-24 06:14:55.000000000 +0000
+++ davical-1.0.2/ChangeLog	2012-01-13 10:41:50.000000000 +0000
@@ -1,3 +1,114 @@
+2012-01-13  Andrew McMillan  <andrew@morphoss.com>
+	* Handle VCARD adr/tel/email which have multiple types.
+	* Set the default URL to the default calendar name rather than /home/
+	* Enable the file upload for addressbook collections.
+	* Handle addressbook import along with calendar import.
+	* Write UID and REV property n VCARD if they are missing.
+	* Fix bug in scheduling on POST request.
+	* Fix permissions on user create via external auth.
+
+2012-01-12  Andrew McMillan  <andrew@morphoss.com>
+	* Allow for silly programs that send content-type XML with a GET request.
+	* Support use of HTTP_AUTHORIZATION in addition to AUTHORIZATION cgi.
+	* Add a default min_age for external binds.
+
+2012-01-06  Rob Ostensen  <rob@boxacle.net>
+	* Prevent external binds from being created/updated if curl is missing.
+	* Add check to setup page to test whether curl is installed.
+
+2012-01-05  Andrew McMillan  <andrew@morphoss.com>
+	* Release 1.0.1
+
+2012-01-04  Andrew McMillan  <andrew@morphoss.com>
+	* Release 1.0
+
+2011-12-14  Andrew McMillan  <andrew@morphoss.com>
+	* Handle bound resources correctly in sync-collection report.
+	* Catch missing-xml in request separately from invalid-xml.
+
+2011-12-07  Andrew McMillan  <andrew@morphoss.com>
+	* Add the "CardDAV" word into DAViCal's description.
+	* Improve expand performance by only doing expansion if we know we need it.
+
+2011-12-03  Andrew McMillan  <andrew@morphoss.com>
+	* Use supplied content_type even on zero-length requests.
+
+2011-12-03  Rob Ostensen  <rob@boxacle.net>
+	* When creating an external bind don't consider local host as external
+
+2011-11-30  Andrew McMillan  <andrew@morphoss.com>
+	* Strip URL-unfriendly characters from UID before using it as URL segment.
+
+2011-11-29  Andrew McMillan  <andrew@morphoss.com>
+	* Slightly more helpful 403 response.
+
+2011-11-27  Andrew McMillan  <andrew@morphoss.com>
+	* Fix logic error in hide_TODO setting.
+	* Make hide_alarm work on bound resources.
+
+2011-11-26  Andrew McMillan  <andrew@morphoss.com>
+	* Correct bug in sync-collection report response.
+	* Fix BIT24 casting for the LDAP driver.
+
+2011-11-25  Andrew McMillan  <andrew@morphoss.com>
+	* Remove password from LDAP log messages.
+
+2011-11-22  Andrew McMillan  <andrew@morphoss.com>
+	* Fix for MOVE into a bound location.
+
+2011-11-21  Andrew McMillan  <andrew@morphoss.com>
+	* Tooltips for schedule-deliver and schedule-send.
+	* Current localisations from Transifex.
+	* The tooltips for schedule-send and schedule-deliver should be different!
+	* Correctly calculate the next alarm time.
+	* Update e-mail address to current one, mention wiki.
+
+2011-11-09  Andrew McMillan  <andrew@morphoss.com>
+	* Make sync-collection handle new format for sync token.
+	* Don't allow a / in the UID to infect the path on import.
+
+2011-11-09  Rob Ostensen  <rob@boxacle.net>
+	* Fix propfind depth:1 on bind to external url
+
+2011-11-02  Andrew McMillan  <andrew@morphoss.com>
+	* Handle DELETE scheduling actions.
+	* Force output buffers to be flushed, if they're turned on.
+	* Correct handling of empty CardDAV:address-data element in request.
+
+2011-11-01  Andrew McMillan  <andrew@morphoss.com>
+	* Update refresh-alarms script to newer style initialisation.
+	* Fix handling of active flag for general external authentication mechanisms.
+	* Update website to reflect new default calendar name.
+
+2011-10-31  Andrew McMillan  <andrew@morphoss.com>
+	* Rationalise confidential event rewriting.
+
+2011-10-30  Andrew McMillan  <andrew@morphoss.com>
+	* Add the $c->hide_alarms functionality into DAVResource class.
+
+2011-10-28  Andrew McMillan  <andrew@morphoss.com>
+	* Allow LDAP sync to work if the date is reasonable and no 'format_updated' is set.
+	* We don't need to test for the PostgreSQL non-PDO drivers now.
+	* Switch out deprecated LDAP mappings before we use them anywhere.
+	* Fix LDAP user creation where memcached support is off.
+
+2011-10-27  Andrew McMillan  <andrew@morphoss.com>
+	* Add test for PHP filter module and wiki links for each test.
+
+2011-10-25  Andrew McMillan  <andrew@morphoss.com>
+	* Updates to Brazilian Portuguese, German and Dutch translations.
+	* We need $c to be global here.
+	* A couple more places restricting numeric usernames.
+
+2011-10-25  Rob Ostensen  <rob@boxacle.net>
+	* External bind changes, added a clean up button, urls now show for
+	  external collections and added a few strings for translation
+
+2011-10-24  Andrew McMillan  <andrew@morphoss.com>
+	* Release 0.9.9.7
+	* More fixes to CalDAV Scheduling
+	  - Handle REPLY from ATTENDEE accepting/declining meeting.
+	  - Handle processing on ORGANIZER further changing meeting.
 2011-10-24  Andrew McMillan  <andrew@morphoss.com>
 	* Release 0.9.9.7
 	* More work on CalDAV Scheduling
diff -Nru davical-0.9.9.7/dba/supported_locales.sql davical-1.0.2/dba/supported_locales.sql
--- davical-0.9.9.7/dba/supported_locales.sql	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/dba/supported_locales.sql	2011-11-20 21:59:37.000000000 +0000
@@ -6,6 +6,8 @@
 INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
   VALUES( 'es_AR', 'Spanish (Argentina)', 'Español (Argentina)' );
 INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
+  VALUES( 'es_ES', 'Spanish (Spain)', 'Español (Espana)' );
+INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
   VALUES( 'es_MX', 'Spanish (Mexico)', 'Español (Mexico)' );
 INSERT INTO supported_locales ( locale, locale_name_en, locale_name_locale )
     VALUES( 'es_VE', 'Spanish (Venezuela)', 'Español (Venezuela)' );
diff -Nru davical-0.9.9.7/debian/changelog davical-1.0.2/debian/changelog
--- davical-0.9.9.7/debian/changelog	2011-10-24 07:09:10.000000000 +0000
+++ davical-1.0.2/debian/changelog	2012-01-13 10:44:36.000000000 +0000
@@ -1,3 +1,22 @@
+davical (1.0.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * New release to Debian (closes:#643809, #618957).
+
+ -- Andrew McMillan <awm@debian.org>  Fri, 13 Jan 2012 23:44:36 +1300
+
+davical (1.0.1-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrew McMillan <awm@debian.org>  Thu, 05 Jan 2012 12:07:18 +1300
+
+davical (1.0.0-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Andrew McMillan <awm@debian.org>  Wed, 04 Jan 2012 16:41:50 +1300
+
 davical (0.9.9.7-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru davical-0.9.9.7/debian/control davical-1.0.2/debian/control
--- davical-0.9.9.7/debian/control	2011-10-19 23:24:08.000000000 +0000
+++ davical-1.0.2/debian/control	2012-01-13 10:43:39.000000000 +0000
@@ -2,7 +2,7 @@
 Section: web
 Priority: extra
 Maintainer: Andrew McMillan <awm@debian.org>
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Build-Depends: debhelper (>= 7), libawl-php, gettext
 Vcs-git: git://repo.or.cz/davical.git
 Vcs-browser: http://repo.or.cz/w/davical.git
@@ -10,24 +10,25 @@
 
 Package: davical
 Architecture: all
-Depends: ${misc:Depends}, debconf (>= 1.0.32), php5-pgsql, postgresql-client (>= 8.1), libawl-php (>= 0.49-1~), libawl-php (<< 0.50), libdbd-pg-perl, libyaml-perl
+Depends: ${misc:Depends}, debconf (>= 1.0.32), php5-pgsql, postgresql-client (>= 8.1), libawl-php (>= 0.51-1~), libawl-php (<< 0.52), libdbd-pg-perl, libyaml-perl
 Recommends: postgresql (>= 8.3)
-Description: The DAViCal CalDAV Server
- The DAViCal CalDAV Server is designed to trivially store
- CalDAV calendars, such as those from Evolution, Sunbird/Lightning,
+Description: The DAViCal CalDAV & CardDAV Server
+ The DAViCal CalDAV Server is designed to store CalDAV calendars and
+ CardDAV addressbooks, such as those from Evolution, Sunbird/Lightning,
  Mulberry, iCal, iPhone or SOHO Organizer, in a central location,
- providing shared calendars, free/busy publication and a basic
- administration interface.
+ providing shared calendars, free/busy publication and a
+ basic administration interface.
 
 Package: davical-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Description: The DAViCal CalDAV Server - documentation
- The DAViCal CalDAV Server is designed to trivially store
- CalDAV calendars, such as those from Evolution, Sunbird/Lightning,
- Mulberry, iCal or SOHO Organizer, in a central location, providing
- shared calendars, free/busy publication and basic administration
+Description: The DAViCal CalDAV & CardDAV Server - technical documentation
+ The DAViCal CalDAV Server is designed to store CalDAV calendars and
+ CardDAV addressbooks, such as those from Evolution, Sunbird/Lightning,
+ Mulberry, iCal, iPhone or SOHO Organizer, in a central location,
+ providing shared calendars, free/busy publication and a
+ basic administration interface.
  .
  This package contains detailed technical documentation for the
  classes and methods in the DAViCal programs.  Some user-centric
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/CalDAVClient.html davical-1.0.2/docs/api/awl/caldav/CalDAVClient.html
--- davical-0.9.9.7/docs/api/awl/caldav/CalDAVClient.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/CalDAVClient.html	2012-01-13 10:44:52.000000000 +0000
@@ -1270,7 +1270,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/CalendarInfo.html davical-1.0.2/docs/api/awl/caldav/CalendarInfo.html
--- davical-0.9.9.7/docs/api/awl/caldav/CalendarInfo.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/CalendarInfo.html	2012-01-13 10:44:52.000000000 +0000
@@ -251,7 +251,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/iCalDate.html davical-1.0.2/docs/api/awl/caldav/iCalDate.html
--- davical-0.9.9.7/docs/api/awl/caldav/iCalDate.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/iCalDate.html	2012-01-13 10:44:56.000000000 +0000
@@ -943,7 +943,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/_inc---caldav-client.php.html davical-1.0.2/docs/api/awl/caldav/_inc---caldav-client.php.html
--- davical-0.9.9.7/docs/api/awl/caldav/_inc---caldav-client.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/_inc---caldav-client.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -63,7 +63,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/_inc---caldav-client-v2.php.html davical-1.0.2/docs/api/awl/caldav/_inc---caldav-client-v2.php.html
--- davical-0.9.9.7/docs/api/awl/caldav/_inc---caldav-client-v2.php.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/_inc---caldav-client-v2.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -108,7 +108,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/_inc---RRule.php.html davical-1.0.2/docs/api/awl/caldav/_inc---RRule.php.html
--- davical-0.9.9.7/docs/api/awl/caldav/_inc---RRule.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/_inc---RRule.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -74,7 +74,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/_inc---RRule-v2.php.html davical-1.0.2/docs/api/awl/caldav/_inc---RRule-v2.php.html
--- davical-0.9.9.7/docs/api/awl/caldav/_inc---RRule-v2.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/_inc---RRule-v2.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -393,7 +393,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/RepeatRuleDateRange.html davical-1.0.2/docs/api/awl/caldav/RepeatRuleDateRange.html
--- davical-0.9.9.7/docs/api/awl/caldav/RepeatRuleDateRange.html	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/RepeatRuleDateRange.html	2012-01-13 10:44:56.000000000 +0000
@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  <html xmlns="http://www.w3.org/1999/xhtml">
+		<head>
+			<!-- template designed by Marco Von Ballmoos -->
+			<title>Docs For Class RepeatRuleDateRange</title>
+			<link rel="stylesheet" href="../../media/stylesheet.css" />
+			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+		</head>
+		<body>
+			<div class="page-body">			
+<h2 class="class-name"><img src="../../media/images/Class_logo.png"
+														alt=" Class"
+														title=" Class"
+														style="vertical-align: middle"> RepeatRuleDateRange</h2>
+
+<a name="sec-description"></a>
+<div class="info-box">
+	<div class="info-box-title">Description</div>
+	<div class="nav-bar">
+					<span class="disabled">Description</span> |
+													<a href="#sec-var-summary">Vars</a> (<a href="#sec-vars">details</a>)
+						|											<a href="#sec-method-summary">Methods</a> (<a href="#sec-methods">details</a>)
+						
+					</div>
+	<div class="info-box-body">
+        		<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">This class is used to hold a pair of dates defining a range.  The range may be open-ended by including  a null for one end or the other, or both.</p>
+	<ul class="tags">
+				<li><span class="field">author:</span> Andrew McMillan &lt;<a href="mailto:andrew@mcmillan.net.nz">andrew@mcmillan.net.nz</a>&gt;</li>
+			</ul>
+		<p class="notes">
+			Located in <a class="field" href="_inc---RRule-v2.php.html">/inc/RRule-v2.php</a> (line <span class="field">522</span>)
+		</p>
+		
+				
+		<pre></pre>
+	
+			</div>
+</div>
+
+
+
+	<a name="sec-var-summary"></a>
+	<div class="info-box">
+		<div class="info-box-title">Variable Summary</span></div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+						<span class="disabled">Vars</span> (<a href="#sec-vars">details</a>)
+							| 
+									<a href="#sec-method-summary">Methods</a> (<a href="#sec-methods">details</a>)
+							
+								</div>
+		<div class="info-box-body">
+			<div class="var-summary">
+																																<div class="var-title">
+					<img src="../../media/images/Variable.png" alt=" " />
+					<span class="var-type">mixed</span>
+					<a href="#$from" title="details" class="var-name">$from</a>
+				</div>
+																<div class="var-title">
+					<img src="../../media/images/Variable.png" alt=" " />
+					<span class="var-type">mixed</span>
+					<a href="#$until" title="details" class="var-name">$until</a>
+				</div>
+											</div>
+		</div>
+	</div>
+
+	<a name="sec-method-summary"></a>
+	<div class="info-box">
+		<div class="info-box-title">Method Summary</span></div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+																		<a href="#sec-var-summary">Vars</a> (<a href="#sec-vars">details</a>)
+				 
+				|
+						<span class="disabled">Methods</span> (<a href="#sec-methods">details</a>)
+		</div>
+		<div class="info-box-body">			
+			<div class="method-summary">
+																																								<div class="method-definition">
+					<img src="../../media/images/Constructor.png" alt=" "/>
+											<span class="method-result">RepeatRuleDateRange</span>
+										<a href="#__construct" title="details" class="method-name">__construct</a>
+											(<span class="var-type"><a href="../../awl/caldav/RepeatRuleDateTime.html">RepeatRuleDateTime</a></span>&nbsp;<span class="var-name">$date1</span>, <span class="var-type"><a href="../../awl/caldav/RepeatRuleDateTime.html">RepeatRuleDateTime</a></span>&nbsp;<span class="var-name">$date2</span>)
+									</div>
+																<div class="method-definition">
+					<img src="../../media/images/Method.png" alt=" "/>
+											<span class="method-result">NULL|<a href="../../awl/caldav/Rfc5545Duration.html">Rfc5545Duration</a></span>
+										<a href="#getDuration" title="details" class="method-name">getDuration</a>
+										()
+									</div>
+																<div class="method-definition">
+					<img src="../../media/images/Method.png" alt=" "/>
+											<span class="method-result">boolean</span>
+										<a href="#overlaps" title="details" class="method-name">overlaps</a>
+											(<span class="var-type"><a href="../../awl/caldav/RepeatRuleDateRange.html">RepeatRuleDateRange</a></span>&nbsp;<span class="var-name">$other</span>)
+									</div>
+											</div>
+		</div>
+	</div>		
+
+	<a name="sec-vars"></a>
+	<div class="info-box">
+		<div class="info-box-title">Variables</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+										<a href="#sec-var-summary">Vars</a> (<span class="disabled">details</span>)
+						
+			
+										| 
+									<a href="#sec-method-summary">Methods</a> (<a href="#sec-methods">details</a>)
+							
+					</div>
+		<div class="info-box-body">
+			
+<a name="var$from" id="$from"><!-- --></A>
+<div class="oddrow">
+
+	<div class="var-header">
+		<img src="../../media/images/Variable.png" />
+		<span class="var-title">
+			<span class="var-type">mixed</span>
+			<span class="var-name">$from</span>
+						(line <span class="line-number">523</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	<ul class="tags">
+				<li><span class="field">access:</span> public</li>
+			</ul>
+	
+	
+		
+		
+
+</div>
+<a name="var$until" id="$until"><!-- --></A>
+<div class="evenrow">
+
+	<div class="var-header">
+		<img src="../../media/images/Variable.png" />
+		<span class="var-title">
+			<span class="var-type">mixed</span>
+			<span class="var-name">$until</span>
+						(line <span class="line-number">524</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	<ul class="tags">
+				<li><span class="field">access:</span> public</li>
+			</ul>
+	
+	
+		
+		
+
+</div>
+						
+		</div>
+	</div>
+	
+	<a name="sec-methods"></a>
+	<div class="info-box">
+		<div class="info-box-title">Methods</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+															<a href="#sec-var-summary">Vars</a> (<a href="#sec-vars">details</a>)
+														<a href="#sec-method-summary">Methods</a> (<span class="disabled">details</span>)
+						
+		</div>
+		<div class="info-box-body">
+			<A NAME='method_detail'></A>
+<a name="method__construct" id="__construct"><!-- --></a>
+<div class="oddrow">
+	
+	<div class="method-header">
+		<img src="../../media/images/Constructor.png" />
+		<span class="method-title">Constructor __construct</span> (line <span class="line-number">535</span>)
+	</div> 
+	
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Construct a new RepeatRuleDateRange which will be the range between $date1 and $date2. The earliest of the two  dates will be used as the start of the period, the latest as the end.  If one of the dates is null then the order  of the parameters is significant, with the null treated as -infinity if it is first, or +infinity if it is second.</p>
+<p class="description"><p>If both parameters are null then the range is from -infinity to +infinity.</p></p>
+	
+	<div class="method-signature">
+		<span class="method-result">RepeatRuleDateRange</span>
+		<span class="method-name">
+			__construct
+		</span>
+					(<span class="var-type"><a href="../../awl/caldav/RepeatRuleDateTime.html">RepeatRuleDateTime</a></span>&nbsp;<span class="var-name">$date1</span>, <span class="var-type"><a href="../../awl/caldav/RepeatRuleDateTime.html">RepeatRuleDateTime</a></span>&nbsp;<span class="var-name">$date2</span>)
+			</div>
+	
+			<ul class="parameters">
+					<li>
+				<span class="var-type"><a href="../../awl/caldav/RepeatRuleDateTime.html">RepeatRuleDateTime</a></span>
+				<span class="var-name">$date1</span>			</li>
+					<li>
+				<span class="var-type"><a href="../../awl/caldav/RepeatRuleDateTime.html">RepeatRuleDateTime</a></span>
+				<span class="var-name">$date2</span>			</li>
+				</ul>
+		
+			
+	</div>
+<a name="methodgetDuration" id="getDuration"><!-- --></a>
+<div class="evenrow">
+	
+	<div class="method-header">
+		<img src="../../media/images/Method.png" />
+		<span class="method-title">getDuration</span> (line <span class="line-number">570</span>)
+	</div> 
+	
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Get an Rfc5545Duration from this date range.  If the from date is null it will be null.</p>
+<p class="description"><p>If the until date is null the duration will either be 1 day (if the from is a date) or 0 otherwise.</p></p>
+	
+	<div class="method-signature">
+		<span class="method-result">NULL|<a href="../../awl/caldav/Rfc5545Duration.html">Rfc5545Duration</a></span>
+		<span class="method-name">
+			getDuration
+		</span>
+				()
+			</div>
+	
+		
+			
+	</div>
+<a name="methodoverlaps" id="overlaps"><!-- --></a>
+<div class="oddrow">
+	
+	<div class="method-header">
+		<img src="../../media/images/Method.png" />
+		<span class="method-title">overlaps</span> (line <span class="line-number">551</span>)
+	</div> 
+	
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Assess whether this range overlaps the supplied range.  null values are treated as infinity.</p>
+	
+	<div class="method-signature">
+		<span class="method-result">boolean</span>
+		<span class="method-name">
+			overlaps
+		</span>
+					(<span class="var-type"><a href="../../awl/caldav/RepeatRuleDateRange.html">RepeatRuleDateRange</a></span>&nbsp;<span class="var-name">$other</span>)
+			</div>
+	
+			<ul class="parameters">
+					<li>
+				<span class="var-type"><a href="../../awl/caldav/RepeatRuleDateRange.html">RepeatRuleDateRange</a></span>
+				<span class="var-name">$other</span>			</li>
+				</ul>
+		
+			
+	</div>
+						
+		</div>
+	</div>
+
+	
+	<p class="notes" id="credit">
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+	</p>
+	</div></body>
+</html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/RepeatRuleDateTime.html davical-1.0.2/docs/api/awl/caldav/RepeatRuleDateTime.html
--- davical-0.9.9.7/docs/api/awl/caldav/RepeatRuleDateTime.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/RepeatRuleDateTime.html	2012-01-13 10:44:56.000000000 +0000
@@ -1043,7 +1043,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/RepeatRule.html davical-1.0.2/docs/api/awl/caldav/RepeatRule.html
--- davical-0.9.9.7/docs/api/awl/caldav/RepeatRule.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/RepeatRule.html	2012-01-13 10:44:56.000000000 +0000
@@ -472,7 +472,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/RepeatRuleTimeZone.html davical-1.0.2/docs/api/awl/caldav/RepeatRuleTimeZone.html
--- davical-0.9.9.7/docs/api/awl/caldav/RepeatRuleTimeZone.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/RepeatRuleTimeZone.html	2012-01-13 10:44:56.000000000 +0000
@@ -238,7 +238,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/Rfc5545Duration.html davical-1.0.2/docs/api/awl/caldav/Rfc5545Duration.html
--- davical-0.9.9.7/docs/api/awl/caldav/Rfc5545Duration.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/Rfc5545Duration.html	2012-01-13 10:44:56.000000000 +0000
@@ -234,7 +234,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/awl/caldav/RRule.html davical-1.0.2/docs/api/awl/caldav/RRule.html
--- davical-0.9.9.7/docs/api/awl/caldav/RRule.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/awl/caldav/RRule.html	2012-01-13 10:44:56.000000000 +0000
@@ -170,7 +170,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/classtrees_awl.html davical-1.0.2/docs/api/classtrees_awl.html
--- davical-0.9.9.7/docs/api/classtrees_awl.html	2011-10-24 07:09:24.000000000 +0000
+++ davical-1.0.2/docs/api/classtrees_awl.html	2012-01-13 10:44:51.000000000 +0000
@@ -54,7 +54,7 @@
 <li><a href="awl/caldav/RepeatRuleTimeZone.html">RepeatRuleTimeZone</a></li></ul>
 
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:24 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:51 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/classtrees_davical.html davical-1.0.2/docs/api/classtrees_davical.html
--- davical-0.9.9.7/docs/api/classtrees_davical.html	2011-10-24 07:09:24.000000000 +0000
+++ davical-1.0.2/docs/api/classtrees_davical.html	2012-01-13 10:44:51.000000000 +0000
@@ -106,7 +106,7 @@
 <li><a href="davical/AtomFeed.html">AtomFeed</a></li></ul>
 
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:24 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:51 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/AtomEntry.html davical-1.0.2/docs/api/davical/AtomEntry.html
--- davical-0.9.9.7/docs/api/davical/AtomEntry.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/davical/AtomEntry.html	2012-01-13 10:44:51.000000000 +0000
@@ -550,7 +550,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:51 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/AtomFeed.html davical-1.0.2/docs/api/davical/AtomFeed.html
--- davical-0.9.9.7/docs/api/davical/AtomFeed.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/davical/AtomFeed.html	2012-01-13 10:44:52.000000000 +0000
@@ -519,7 +519,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:51 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/AtomXHTMLContent.html davical-1.0.2/docs/api/davical/AtomXHTMLContent.html
--- davical-0.9.9.7/docs/api/davical/AtomXHTMLContent.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/davical/AtomXHTMLContent.html	2012-01-13 10:44:52.000000000 +0000
@@ -142,7 +142,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/authentication/_inc---auth-functions.php.html davical-1.0.2/docs/api/davical/authentication/_inc---auth-functions.php.html
--- davical-0.9.9.7/docs/api/davical/authentication/_inc---auth-functions.php.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/davical/authentication/_inc---auth-functions.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -359,7 +359,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_htdocs---caldav.php.html davical-1.0.2/docs/api/davical/caldav/_htdocs---caldav.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_htdocs---caldav.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_htdocs---caldav.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -498,7 +498,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_htdocs---public.php.html davical-1.0.2/docs/api/davical/caldav/_htdocs---public.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_htdocs---public.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_htdocs---public.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -188,7 +188,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-ACL.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-ACL.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-ACL.php.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-ACL.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -109,7 +109,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-BIND.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-BIND.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-BIND.php.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-BIND.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -92,7 +92,7 @@
 		<span class="include-title">
 			<span class="include-type">require_once</span>
 			(<span class="include-name"><a href="../../davical/external-bind/_inc---external-fetch.php.html">'external-fetch.php'</a></span>)
-			(line <span class="line-number">51</span>)
+			(line <span class="line-number">54</span>)
 		</span>
 	</div>
 
@@ -106,7 +106,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-DELETE.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-DELETE.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-DELETE.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-DELETE.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -62,6 +62,21 @@
 			</ul>
 	
 </div>
+<a name="_schedule-functions_php"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../../davical/caldav/_inc---schedule-functions.php.html">'schedule-functions.php'</a></span>)
+			(line <span class="line-number">20</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
 		</div>
 	</div>
 	
@@ -77,11 +92,11 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functiondelete_collection" id="functiondelete_collection"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">delete_collection</span> (line <span class="line-number">21</span>)
+		<span class="method-title">delete_collection</span> (line <span class="line-number">22</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -105,7 +120,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-DELTICKET.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -41,7 +41,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -62,7 +62,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-GET.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-GET.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-GET.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-GET.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -42,7 +42,7 @@
 					</div>
 		<div class="info-box-body">	
 			<a name="_iCalendar_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -57,7 +57,7 @@
 	
 </div>
 <a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -86,7 +86,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionobfuscated_event" id="functionobfuscated_event"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -114,7 +114,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-MKCOL.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -40,7 +40,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_AwlQuery_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -61,7 +61,7 @@
 	
 </div>
 <a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -76,7 +76,7 @@
 	
 </div>
 <a name="_XMLDocument_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -97,7 +97,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-MKTICKET.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -41,7 +41,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -63,7 +63,7 @@
 	
 </div>
 <a name="_XMLDocument_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -84,7 +84,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-MOVE.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-MOVE.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-MOVE.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-MOVE.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -42,7 +42,7 @@
 					</div>
 		<div class="info-box-body">	
 			<a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -71,7 +71,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionrollback" id="functionrollback"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -101,7 +101,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-OPTIONS.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -40,7 +40,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -67,7 +67,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-POST.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-POST.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-POST.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-POST.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -42,7 +42,7 @@
 					</div>
 		<div class="info-box-body">	
 			<a name="_caldav-PUT-functions_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -57,7 +57,7 @@
 	
 </div>
 <a name="_freebusy-functions_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -72,7 +72,7 @@
 	
 </div>
 <a name="_XMLDocument_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -107,7 +107,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionhandle_cancel_request" id="functionhandle_cancel_request"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -132,7 +132,7 @@
 	
 </div>
 <a name="functionhandle_freebusy_request" id="functionhandle_freebusy_request"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -160,7 +160,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PROPPATCH.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -40,7 +40,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_vCalendar_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -61,7 +61,7 @@
 	
 </div>
 <a name="_DAVResource_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -82,7 +82,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PUT-default.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -40,7 +40,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -61,7 +61,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PUT-functions.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -41,45 +41,45 @@
 			|													<a href="#sec-functions">Functions</a>
 					</div>
 		<div class="info-box-body">	
-			<a name="_vCalendar_php"><!-- --></a>
-<div class="oddrow">
+			<a name="_vComponent_php"><!-- --></a>
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">require_once</span>
-			(<span class="include-name">'vCalendar.php'</span>)
-			(line <span class="line-number">20</span>)
+			(<span class="include-name">'vComponent.php'</span>)
+			(line <span class="line-number">19</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_vComponent_php"><!-- --></a>
-<div class="evenrow">
+<a name="_WritableCollection_php"><!-- --></a>
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">require_once</span>
-			(<span class="include-name">'vComponent.php'</span>)
-			(line <span class="line-number">19</span>)
+			(<span class="include-name"><a href="../../davical/_inc---WritableCollection.php.html">'WritableCollection.php'</a></span>)
+			(line <span class="line-number">21</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_WritableCollection_php"><!-- --></a>
-<div class="oddrow">
+<a name="_vCalendar_php"><!-- --></a>
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">require_once</span>
-			(<span class="include-name"><a href="../../davical/_inc---WritableCollection.php.html">'WritableCollection.php'</a></span>)
-			(line <span class="line-number">21</span>)
+			(<span class="include-name">'vCalendar.php'</span>)
+			(line <span class="line-number">20</span>)
 		</span>
 	</div>
 
@@ -87,7 +87,7 @@
 	
 </div>
 <a name="_AwlCache_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -118,7 +118,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functioncontrolRequestContainer" id="functioncontrolRequestContainer"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -156,7 +156,7 @@
 	
 </div>
 <a name="functiondo_scheduling_reply" id="functiondo_scheduling_reply"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -185,7 +185,7 @@
 	
 </div>
 <a name="functiondo_scheduling_requests" id="functiondo_scheduling_requests"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -220,7 +220,7 @@
 	
 </div>
 <a name="functionGetTZID" id="functionGetTZID"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -249,7 +249,7 @@
 	
 </div>
 <a name="functionhandle_schedule_reply" id="functionhandle_schedule_reply"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -278,7 +278,7 @@
 	
 </div>
 <a name="functionhandle_schedule_request" id="functionhandle_schedule_request"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -303,12 +303,53 @@
 		
 	
 </div>
-<a name="functionimport_collection" id="functionimport_collection"><!-- --></a>
+<a name="functionimport_addressbook_collection" id="functionimport_addressbook_collection"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../../media/images/Function.png" />
+		<span class="method-title">import_addressbook_collection</span> (line <span class="line-number">597</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">This function will import a whole calendar</p>
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			import_addressbook_collection
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$vcard_content</span>, <span class="var-type">int</span>&nbsp;<span class="var-name">$user_no</span>, <span class="var-type">string</span>&nbsp;<span class="var-name">$path</span>, <span class="var-type">boolean</span>&nbsp;<span class="var-name">$caldav_context</span>, [<span class="var-type"></span>&nbsp;<span class="var-name">$appending</span> = <span class="var-default">false</span>], <span class="var-type">string</span>&nbsp;<span class="var-name">$ics_content</span>)
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type">string</span>
+				<span class="var-name">$ics_content</span><span class="var-description">: the ics file to import</span>			</li>
+					<li>
+				<span class="var-type">int</span>
+				<span class="var-name">$user_no</span><span class="var-description">: the user wich will receive this ics file</span>			</li>
+					<li>
+				<span class="var-type">string</span>
+				<span class="var-name">$path</span><span class="var-description">: the $path where it will be store such as /user_foo/home/</span>			</li>
+					<li>
+				<span class="var-type">boolean</span>
+				<span class="var-name">$caldav_context</span><span class="var-description">: <p>Whether we are responding via CalDAV or interactively</p><p>Any VEVENTs with the same UID will be concatenated together</p></span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$vcard_content</span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$appending</span>			</li>
+				</ul>
+		
+	
+</div>
+<a name="functionimport_calendar_collection" id="functionimport_calendar_collection"><!-- --></a>
 <div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">import_collection</span> (line <span class="line-number">561</span>)
+		<span class="method-title">import_calendar_collection</span> (line <span class="line-number">694</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -316,7 +357,7 @@
 	<div class="method-signature">
 		<span class="method-result">void</span>
 		<span class="method-name">
-			import_collection
+			import_calendar_collection
 		</span>
 					(<span class="var-type">string</span>&nbsp;<span class="var-name">$ics_content</span>, <span class="var-type">int</span>&nbsp;<span class="var-name">$user_no</span>, <span class="var-type">string</span>&nbsp;<span class="var-name">$path</span>, <span class="var-type">boolean</span>&nbsp;<span class="var-name">$caldav_context</span>, [<span class="var-type"></span>&nbsp;<span class="var-name">$appending</span> = <span class="var-default">false</span>])
 			</div>
@@ -341,11 +382,52 @@
 		
 	
 </div>
-<a name="functionpublic_events_only" id="functionpublic_events_only"><!-- --></a>
+<a name="functionimport_collection" id="functionimport_collection"><!-- --></a>
 <div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
+		<span class="method-title">import_collection</span> (line <span class="line-number">561</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">This function will import a whole collection</p>
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			import_collection
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$import_content</span>, <span class="var-type">int</span>&nbsp;<span class="var-name">$user_no</span>, <span class="var-type">string</span>&nbsp;<span class="var-name">$path</span>, <span class="var-type">boolean</span>&nbsp;<span class="var-name">$caldav_context</span>, [<span class="var-type"></span>&nbsp;<span class="var-name">$appending</span> = <span class="var-default">false</span>], <span class="var-type">string</span>&nbsp;<span class="var-name">$ics_content</span>)
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type">string</span>
+				<span class="var-name">$ics_content</span><span class="var-description">: the ics file to import</span>			</li>
+					<li>
+				<span class="var-type">int</span>
+				<span class="var-name">$user_no</span><span class="var-description">: the user wich will receive this ics file</span>			</li>
+					<li>
+				<span class="var-type">string</span>
+				<span class="var-name">$path</span><span class="var-description">: the $path where it will be store such as /user_foo/home/</span>			</li>
+					<li>
+				<span class="var-type">boolean</span>
+				<span class="var-name">$caldav_context</span><span class="var-description">: <p>Whether we are responding via CalDAV or interactively</p><p>The work is either done by</p></span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$import_content</span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$appending</span>			</li>
+				</ul>
+		
+	
+</div>
+<a name="functionpublic_events_only" id="functionpublic_events_only"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Function.png" />
 		<span class="method-title">public_events_only</span> (line <span class="line-number">144</span>)
 	</div> 
 
@@ -374,7 +456,7 @@
 	
 </div>
 <a name="functionrollback_on_error" id="functionrollback_on_error"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -412,11 +494,11 @@
 	
 </div>
 <a name="functionsimple_write_resource" id="functionsimple_write_resource"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">simple_write_resource</span> (line <span class="line-number">1186</span>)
+		<span class="method-title">simple_write_resource</span> (line <span class="line-number">1306</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -450,11 +532,11 @@
 	
 </div>
 <a name="functionwrite_alarms" id="functionwrite_alarms"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">write_alarms</span> (line <span class="line-number">795</span>)
+		<span class="method-title">write_alarms</span> (line <span class="line-number">915</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -479,11 +561,11 @@
 	
 </div>
 <a name="functionwrite_attendees" id="functionwrite_attendees"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">write_attendees</span> (line <span class="line-number">852</span>)
+		<span class="method-title">write_attendees</span> (line <span class="line-number">972</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -508,11 +590,11 @@
 	
 </div>
 <a name="functionwrite_resource" id="functionwrite_resource"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">write_resource</span> (line <span class="line-number">901</span>)
+		<span class="method-title">write_resource</span> (line <span class="line-number">1021</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -567,7 +649,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PUT-vcalendar.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -40,7 +40,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_caldav-PUT-functions_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -55,7 +55,7 @@
 	
 </div>
 <a name="_DAVResource_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -76,7 +76,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PUT-vcard.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PUT-vcard.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-PUT-vcard.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-PUT-vcard.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -40,7 +40,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -55,14 +55,14 @@
 	
 </div>
 <a name="_vcard_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">require_once</span>
 			(<span class="include-name"><a href="../../davical/_inc---vcard.php.html">'vcard.php'</a></span>)
-			(line <span class="line-number">87</span>)
+			(line <span class="line-number">59</span>)
 		</span>
 	</div>
 
@@ -76,7 +76,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-REPORT.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-REPORT.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-REPORT.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-REPORT.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -41,30 +41,30 @@
 			|													<a href="#sec-functions">Functions</a>
 					</div>
 		<div class="info-box-body">	
-			<a name="_caldav-REPORT-cardquery_php"><!-- --></a>
-<div class="oddrow">
+			<a name="_caldav-REPORT-sync-collection_php"><!-- --></a>
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-cardquery.php.html">"caldav-REPORT-cardquery.php"</a></span>)
-			(line <span class="line-number">345</span>)
+			(<span class="include-name"><a href="../../davical/caldav/_inc---caldav-REPORT-sync-collection.php.html">"caldav-REPORT-sync-collection.php"</a></span>)
+			(line <span class="line-number">68</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_caldav-REPORT-pps-set_php"><!-- --></a>
-<div class="evenrow">
+<a name="_caldav-REPORT-freebusy_php"><!-- --></a>
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../../davical/caldav/_inc---caldav-REPORT-pps-set.php.html">"caldav-REPORT-pps-set.php"</a></span>)
-			(line <span class="line-number">61</span>)
+			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-freebusy.php.html">"caldav-REPORT-freebusy.php"</a></span>)
+			(line <span class="line-number">51</span>)
 		</span>
 	</div>
 
@@ -72,7 +72,7 @@
 	
 </div>
 <a name="_caldav-REPORT-principal_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -86,60 +86,75 @@
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_caldav-REPORT-calquery_php"><!-- --></a>
+<a name="_caldav-REPORT-expand-property_php"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">include</span>
+			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-expand-property.php.html">"caldav-REPORT-expand-property.php"</a></span>)
+			(line <span class="line-number">75</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
+<a name="_caldav-REPORT-pps-set_php"><!-- --></a>
 <div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-calquery.php.html">"caldav-REPORT-calquery.php"</a></span>)
-			(line <span class="line-number">331</span>)
+			(<span class="include-name"><a href="../../davical/caldav/_inc---caldav-REPORT-pps-set.php.html">"caldav-REPORT-pps-set.php"</a></span>)
+			(line <span class="line-number">61</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_caldav-REPORT-freebusy_php"><!-- --></a>
+<a name="_caldav-REPORT-cardquery_php"><!-- --></a>
 <div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-freebusy.php.html">"caldav-REPORT-freebusy.php"</a></span>)
-			(line <span class="line-number">51</span>)
+			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-cardquery.php.html">"caldav-REPORT-cardquery.php"</a></span>)
+			(line <span class="line-number">238</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_caldav-REPORT-expand-property_php"><!-- --></a>
+<a name="_caldav-REPORT-calquery_php"><!-- --></a>
 <div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-expand-property.php.html">"caldav-REPORT-expand-property.php"</a></span>)
-			(line <span class="line-number">75</span>)
+			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-calquery.php.html">"caldav-REPORT-calquery.php"</a></span>)
+			(line <span class="line-number">224</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_caldav-REPORT-sync-collection_php"><!-- --></a>
+<a name="_caldav-REPORT-principal-match_php"><!-- --></a>
 <div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../../davical/caldav/_inc---caldav-REPORT-sync-collection.php.html">"caldav-REPORT-sync-collection.php"</a></span>)
-			(line <span class="line-number">68</span>)
+			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-principal-match.php.html">"caldav-REPORT-principal-match.php"</a></span>)
+			(line <span class="line-number">78</span>)
 		</span>
 	</div>
 
@@ -154,37 +169,37 @@
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-multiget.php.html">"caldav-REPORT-multiget.php"</a></span>)
-			(line <span class="line-number">336</span>)
+			(line <span class="line-number">229</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_caldav-REPORT-principal-match_php"><!-- --></a>
+<a name="_caldav-REPORT-multiget_php"><!-- --></a>
 <div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-principal-match.php.html">"caldav-REPORT-principal-match.php"</a></span>)
-			(line <span class="line-number">78</span>)
+			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-multiget.php.html">"caldav-REPORT-multiget.php"</a></span>)
+			(line <span class="line-number">234</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_caldav-REPORT-multiget_php"><!-- --></a>
+<a name="_external-fetch_php"><!-- --></a>
 <div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
-			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../../davical/_inc---caldav-REPORT-multiget.php.html">"caldav-REPORT-multiget.php"</a></span>)
-			(line <span class="line-number">341</span>)
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../../davical/external-bind/_inc---external-fetch.php.html">"external-fetch.php"</a></span>)
+			(line <span class="line-number">65</span>)
 		</span>
 	</div>
 
@@ -220,37 +235,22 @@
 		<span class="include-title">
 			<span class="include-type">require_once</span>
 			(<span class="include-name"><a href="../../davical/external-bind/_inc---external-fetch.php.html">"external-fetch.php"</a></span>)
-			(line <span class="line-number">325</span>)
+			(line <span class="line-number">72</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_external-fetch_php"><!-- --></a>
+<a name="_vCalendar_php"><!-- --></a>
 <div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">require_once</span>
-			(<span class="include-name"><a href="../../davical/external-bind/_inc---external-fetch.php.html">"external-fetch.php"</a></span>)
-			(line <span class="line-number">65</span>)
-		</span>
-	</div>
-
-	<!-- ========== Info from phpDoc block ========= -->
-	
-</div>
-<a name="_external-fetch_php"><!-- --></a>
-<div class="evenrow">
-	
-	<div>
-		<img src="../../media/images/Page.png" alt=" " />
-		<span class="include-title">
-			<span class="include-type">require_once</span>
-			(<span class="include-name"><a href="../../davical/external-bind/_inc---external-fetch.php.html">"external-fetch.php"</a></span>)
-			(line <span class="line-number">72</span>)
+			(<span class="include-name">"vCalendar.php"</span>)
+			(line <span class="line-number">42</span>)
 		</span>
 	</div>
 
@@ -258,7 +258,7 @@
 	
 </div>
 <a name="_RRule-v2_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -273,7 +273,7 @@
 	
 </div>
 <a name="_DAVResource_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -287,15 +287,15 @@
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="_iCalendar_php"><!-- --></a>
-<div class="oddrow">
+<a name="_external-fetch_php"><!-- --></a>
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">require_once</span>
-			(<span class="include-name">"iCalendar.php"</span>)
-			(line <span class="line-number">42</span>)
+			(<span class="include-name"><a href="../../davical/external-bind/_inc---external-fetch.php.html">"external-fetch.php"</a></span>)
+			(line <span class="line-number">218</span>)
 		</span>
 	</div>
 
@@ -316,44 +316,12 @@
 				|												<span class="disabled">Functions</span>
 		</div>
 		<div class="info-box-body">	
-			<a name="functioncalendar_to_xml" id="functioncalendar_to_xml"><!-- --></a>
-<div class="evenrow">
-	
-	<div>
-		<img src="../../media/images/Function.png" />
-		<span class="method-title">calendar_to_xml</span> (line <span class="line-number">91</span>)
-	</div> 
-
-	<!-- ========== Info from phpDoc block ========= -->
-<p class="short-description">Return XML for a single calendar (or todo) entry from the DB</p>
-	<ul class="tags">
-				<li><span class="field">return:</span> An XML document which is the response for the calendar</li>
-			</ul>
-	<div class="method-signature">
-		<span class="method-result">string</span>
-		<span class="method-name">
-			calendar_to_xml
-		</span>
-					(<span class="var-type">array</span>&nbsp;<span class="var-name">$properties</span>, <span class="var-type">string</span>&nbsp;<span class="var-name">$item</span>)
-			</div>
-
-			<ul class="parameters">
-					<li>
-				<span class="var-type">array</span>
-				<span class="var-name">$properties</span><span class="var-description">: The properties for this calendar</span>			</li>
-					<li>
-				<span class="var-type">string</span>
-				<span class="var-name">$item</span><span class="var-description">: The calendar data for this calendar</span>			</li>
-				</ul>
-		
-	
-</div>
-<a name="functioncomponent_to_xml" id="functioncomponent_to_xml"><!-- --></a>
+			<a name="functioncomponent_to_xml" id="functioncomponent_to_xml"><!-- --></a>
 <div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">component_to_xml</span> (line <span class="line-number">196</span>)
+		<span class="method-title">component_to_xml</span> (line <span class="line-number">92</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -384,7 +352,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-REPORT-pps-set.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -43,7 +43,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionproperty_response" id="functionproperty_response"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -75,7 +75,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html davical-1.0.2/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---caldav-REPORT-sync-collection.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -43,7 +43,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functiondisplay_status" id="functiondisplay_status"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -72,7 +72,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/caldav/_inc---schedule-functions.php.html davical-1.0.2/docs/api/davical/caldav/_inc---schedule-functions.php.html
--- davical-0.9.9.7/docs/api/davical/caldav/_inc---schedule-functions.php.html	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/docs/api/davical/caldav/_inc---schedule-functions.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -0,0 +1,303 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  <html xmlns="http://www.w3.org/1999/xhtml">
+		<head>
+			<!-- template designed by Marco Von Ballmoos -->
+			<title>Docs for page schedule-functions.php</title>
+			<link rel="stylesheet" href="../../media/stylesheet.css" />
+			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+		</head>
+		<body>
+			<div class="page-body">			
+<h2 class="file-name"><img src="../../media/images/Page_logo.png" alt="File" style="vertical-align: middle">/inc/schedule-functions.php</h2>
+
+<a name="sec-description"></a>
+<div class="info-box">
+	<div class="info-box-title">Description</div>
+	<div class="nav-bar">
+					<span class="disabled">Description</span> |
+									<a href="#sec-includes">Includes</a>
+			|											<a href="#sec-functions">Functions</a>
+			</div>
+	<div class="info-box-body">	
+		<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Functions for handling CalDAV Scheduling.</p>
+	<ul class="tags">
+				<li><span class="field">author:</span> Andrew McMillan &lt;<a href="mailto:andrew@morphoss.com">andrew@morphoss.com</a>&gt;</li>
+				<li><span class="field">copyright:</span> Morphoss Ltd - http://www.morphoss.com/</li>
+				<li><span class="field">license:</span> <a href="http://gnu.org/copyleft/gpl.html">GNU GPL v2 or later version</a></li>
+			</ul>
+		
+			</div>
+</div>
+		
+
+	<a name="sec-includes"></a>	
+	<div class="info-box">
+		<div class="info-box-title">Includes</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+						<span class="disabled">Includes</span>
+			|													<a href="#sec-functions">Functions</a>
+					</div>
+		<div class="info-box-body">	
+			<a name="_RRule-v2_php"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../../awl/caldav/_inc---RRule-v2.php.html">'RRule-v2.php'</a></span>)
+			(line <span class="line-number">14</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
+<a name="_WritableCollection_php"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../../davical/_inc---WritableCollection.php.html">'WritableCollection.php'</a></span>)
+			(line <span class="line-number">13</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
+<a name="_vCalendar_php"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name">'vCalendar.php'</span>)
+			(line <span class="line-number">12</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Functions for handling CalDAV Scheduling.</p>
+	<ul class="tags">
+				<li><span class="field">author:</span> Andrew McMillan &lt;<a href="mailto:andrew@morphoss.com">andrew@morphoss.com</a>&gt;</li>
+				<li><span class="field">copyright:</span> Morphoss Ltd - http://www.morphoss.com/</li>
+				<li><span class="field">license:</span> <a href="http://gnu.org/copyleft/gpl.html">GNU GPL v2 or later version</a></li>
+			</ul>
+	
+</div>
+		</div>
+	</div>
+	
+	
+	
+	<a name="sec-functions"></a>	
+	<div class="info-box">
+		<div class="info-box-title">Functions</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+										<a href="#sec-includes">Includes</a>
+				|												<span class="disabled">Functions</span>
+		</div>
+		<div class="info-box-body">	
+			<a name="functiondeliverItipCancel" id="functiondeliverItipCancel"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../../media/images/Function.png" />
+		<span class="method-title">deliverItipCancel</span> (line <span class="line-number">312</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Delivers the iTIP CANCEL message to an ATTENDEE's Scheduling Inbox Collection.</p>
+<p class="description"><p>This is pretty simple at present, but could be extended in the future to do the sending  of e-mail to a remote attendee.</p></p>
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			deliverItipCancel
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$iTIP</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$attendee</span>, <span class="var-type"><a href="../../davical/Resource/WritableCollection.html">WritableCollection</a></span>&nbsp;<span class="var-name">$attendee_inbox</span>)
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type">vCalendar</span>
+				<span class="var-name">$iTIP</span>			</li>
+					<li>
+				<span class="var-type">vProperty</span>
+				<span class="var-name">$attendee</span>			</li>
+					<li>
+				<span class="var-type"><a href="../../davical/Resource/WritableCollection.html">WritableCollection</a></span>
+				<span class="var-name">$attendee_inbox</span>			</li>
+				</ul>
+		
+	
+</div>
+<a name="functiondoItipAttendeeReply" id="functiondoItipAttendeeReply"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Function.png" />
+		<span class="method-title">doItipAttendeeReply</span> (line <span class="line-number">67</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Do the scheduling adjustments for a REPLY when an ATTENDEE updates their status.</p>
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			doItipAttendeeReply
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$resource</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$partstat</span>, <span class="var-type">vCalendar</span>&nbsp;<span class="var-name">$vcal</span>, <span class="var-type">string</span>&nbsp;<span class="var-name">$organizer</span>)
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type">vCalendar</span>
+				<span class="var-name">$vcal</span><span class="var-description">: The resource that the ATTENDEE is writing to their calendar</span>			</li>
+					<li>
+				<span class="var-type">string</span>
+				<span class="var-name">$organizer</span><span class="var-description">: The property which is the event ORGANIZER.</span>			</li>
+					<li>
+				<span class="var-type">vCalendar</span>
+				<span class="var-name">$resource</span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$partstat</span>			</li>
+				</ul>
+		
+	
+</div>
+<a name="functiondoItipOrganizerCancel" id="functiondoItipOrganizerCancel"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../../media/images/Function.png" />
+		<span class="method-title">doItipOrganizerCancel</span> (line <span class="line-number">207</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Handles sending the iTIP CANCEL messages to each ATTENDEE by the ORGANIZER.</p>
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			doItipOrganizerCancel
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$vcal</span>)
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type">vCalendar</span>
+				<span class="var-name">$vcal</span><span class="var-description">: What's being cancelled.</span>			</li>
+				</ul>
+		
+	
+</div>
+<a name="functiondo_scheduling_for_delete" id="functiondo_scheduling_for_delete"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Function.png" />
+		<span class="method-title">do_scheduling_for_delete</span> (line <span class="line-number">24</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Entry point for scheduling on DELETE, for which there are thee outcomes: <ul><li>We don't do scheduling (disabled, no organizer, ...)</li><li>We are an ATTENDEE declining the meeting.</li></ul></p>
+<p class="description"><p><ul><li>We are the ORGANIZER canceling the meeting.</li></ul></p></p>
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			do_scheduling_for_delete
+		</span>
+					(<span class="var-type"><a href="../../davical/Resource/DAVResource.html">DAVResource</a></span>&nbsp;<span class="var-name">$deleted_resource</span>)
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type"><a href="../../davical/Resource/DAVResource.html">DAVResource</a></span>
+				<span class="var-name">$deleted_resource</span><span class="var-description">: The resource which has already been deleted</span>			</li>
+				</ul>
+		
+	
+</div>
+<a name="functionGetItip" id="functionGetItip"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../../media/images/Function.png" />
+		<span class="method-title">GetItip</span> (line <span class="line-number">178</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			GetItip
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$vcal</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$method</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$attendee_value</span>)
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type">VCalendar</span>
+				<span class="var-name">$vcal</span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$method</span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$attendee_value</span>			</li>
+				</ul>
+		
+	
+</div>
+<a name="functionprocessItipCancel" id="functionprocessItipCancel"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Function.png" />
+		<span class="method-title">processItipCancel</span> (line <span class="line-number">265</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Does the actual processing of the iTIP CANCEL message on behalf of an ATTENDEE,  which generally means writing it into the ATTENDEE's default calendar.</p>
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			processItipCancel
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$vcal</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$attendee</span>, <span class="var-type"><a href="../../davical/Resource/WritableCollection.html">WritableCollection</a></span>&nbsp;<span class="var-name">$attendee_calendar</span>, <span class="var-type"><a href="../../davical/Principal/Principal.html">Principal</a></span>&nbsp;<span class="var-name">$attendee_principal</span>)
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type">vCalendar</span>
+				<span class="var-name">$vcal</span><span class="var-description">: The message.</span>			</li>
+					<li>
+				<span class="var-type">vProperty</span>
+				<span class="var-name">$attendee</span>			</li>
+					<li>
+				<span class="var-type"><a href="../../davical/Resource/WritableCollection.html">WritableCollection</a></span>
+				<span class="var-name">$attendee_calendar</span>			</li>
+					<li>
+				<span class="var-type"><a href="../../davical/Principal/Principal.html">Principal</a></span>
+				<span class="var-name">$attendee_principal</span>			</li>
+				</ul>
+		
+	
+</div>
+		</div>
+	</div>
+	
+	<p class="notes" id="credit">
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+	</p>
+	</div></body>
+</html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/CheckResult.html davical-1.0.2/docs/api/davical/CheckResult.html
--- davical-0.9.9.7/docs/api/davical/CheckResult.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/CheckResult.html	2012-01-13 10:44:56.000000000 +0000
@@ -98,7 +98,7 @@
 		<div class="info-box-body">
 			<A NAME='method_detail'></A>
 <a name="method__construct" id="__construct"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Constructor.png" />
@@ -130,7 +130,7 @@
 			
 	</div>
 <a name="methodgetClass" id="getClass"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -154,7 +154,7 @@
 			
 	</div>
 <a name="methodgetDescription" id="getDescription"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -178,7 +178,7 @@
 			
 	</div>
 <a name="methodgetOK" id="getOK"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -202,7 +202,7 @@
 			
 	</div>
 <a name="methodsetClass" id="setClass"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -231,7 +231,7 @@
 			
 	</div>
 <a name="methodsetDescription" id="setDescription"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -265,7 +265,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/DAViCalSession/DAViCalSession.html davical-1.0.2/docs/api/davical/DAViCalSession/DAViCalSession.html
--- davical-0.9.9.7/docs/api/davical/DAViCalSession/DAViCalSession.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/DAViCalSession/DAViCalSession.html	2012-01-13 10:44:54.000000000 +0000
@@ -202,7 +202,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/DAViCalSession/_htdocs---tools.php.html davical-1.0.2/docs/api/davical/DAViCalSession/_htdocs---tools.php.html
--- davical-0.9.9.7/docs/api/davical/DAViCalSession/_htdocs---tools.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/DAViCalSession/_htdocs---tools.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -70,7 +70,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_page-footer_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -85,7 +85,7 @@
 	
 </div>
 <a name="_page-header_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -100,7 +100,7 @@
 	
 </div>
 <a name="_check_UTF8_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -115,7 +115,7 @@
 	
 </div>
 <a name="_interactive-page_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -130,7 +130,7 @@
 	
 </div>
 <a name="_DataEntry_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -145,7 +145,7 @@
 	
 </div>
 <a name="__/always_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -166,7 +166,7 @@
 	
 </div>
 <a name="_classBrowser_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -181,7 +181,7 @@
 	
 </div>
 <a name="_caldav-PUT-functions_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -196,7 +196,7 @@
 	
 </div>
 <a name="_DAViCalSession_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -217,7 +217,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html davical-1.0.2/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html
--- davical-0.9.9.7/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/DAViCalSession/_inc---DAViCalSession.php.html	2012-01-13 10:44:54.000000000 +0000
@@ -170,7 +170,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/DAViCalSession/Tools.html davical-1.0.2/docs/api/davical/DAViCalSession/Tools.html
--- davical-0.9.9.7/docs/api/davical/DAViCalSession/Tools.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/DAViCalSession/Tools.html	2012-01-13 10:44:57.000000000 +0000
@@ -86,7 +86,7 @@
 		<div class="info-box-body">
 			<A NAME='method_detail'></A>
 <a name="methodimportFromDirectory" id="importFromDirectory"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/StaticMethod.png" />
@@ -107,7 +107,7 @@
 			
 	</div>
 <a name="methodrenderImportFromDirectory" id="renderImportFromDirectory"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/StaticMethod.png" />
@@ -128,7 +128,7 @@
 			
 	</div>
 <a name="methodrenderSyncLDAP" id="renderSyncLDAP"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/StaticMethod.png" />
@@ -149,7 +149,7 @@
 			
 	</div>
 <a name="methodrender" id="render"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
@@ -175,7 +175,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/DAVTicket/DAVTicket.html davical-1.0.2/docs/api/davical/DAVTicket/DAVTicket.html
--- davical-0.9.9.7/docs/api/davical/DAVTicket/DAVTicket.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/DAVTicket/DAVTicket.html	2012-01-13 10:44:54.000000000 +0000
@@ -246,7 +246,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html davical-1.0.2/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html
--- davical-0.9.9.7/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/DAVTicket/_inc---DAVTicket.php.html	2012-01-13 10:44:54.000000000 +0000
@@ -97,7 +97,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/external-bind/_inc---external-fetch.php.html davical-1.0.2/docs/api/davical/external-bind/_inc---external-fetch.php.html
--- davical-0.9.9.7/docs/api/davical/external-bind/_inc---external-fetch.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/external-bind/_inc---external-fetch.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -84,7 +84,7 @@
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">fetch_external</span> (line <span class="line-number">37</span>)
+		<span class="method-title">fetch_external</span> (line <span class="line-number">42</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -93,7 +93,7 @@
 		<span class="method-name">
 			fetch_external
 		</span>
-					(<span class="var-type"></span>&nbsp;<span class="var-name">$bind_id</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$min_age</span>)
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$bind_id</span>, [<span class="var-type"></span>&nbsp;<span class="var-name">$min_age</span> = <span class="var-default">&#039;1 hour&#039;</span>])
 			</div>
 
 			<ul class="parameters">
@@ -112,7 +112,7 @@
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">update_external</span> (line <span class="line-number">81</span>)
+		<span class="method-title">update_external</span> (line <span class="line-number">91</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -136,7 +136,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---admin.php.html davical-1.0.2/docs/api/davical/_htdocs---admin.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---admin.php.html	2011-10-24 07:09:24.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---admin.php.html	2012-01-13 10:44:51.000000000 +0000
@@ -206,7 +206,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:24 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:51 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---always.php.html davical-1.0.2/docs/api/davical/_htdocs---always.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---always.php.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---always.php.html	2012-01-13 10:44:51.000000000 +0000
@@ -50,7 +50,7 @@
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name">'../config/config.php'</span>)
-			(line <span class="line-number">141</span>)
+			(line <span class="line-number">142</span>)
 		</span>
 	</div>
 
@@ -65,7 +65,7 @@
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name">'/usr/local/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'</span>)
-			(line <span class="line-number">135</span>)
+			(line <span class="line-number">136</span>)
 		</span>
 	</div>
 
@@ -80,7 +80,7 @@
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name">'/usr/local/etc/davical/config.php'</span>)
-			(line <span class="line-number">138</span>)
+			(line <span class="line-number">139</span>)
 		</span>
 	</div>
 
@@ -95,7 +95,7 @@
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name">'/etc/davical/'.$_SERVER['SERVER_NAME'].'-conf.php'</span>)
-			(line <span class="line-number">129</span>)
+			(line <span class="line-number">130</span>)
 		</span>
 	</div>
 
@@ -111,7 +111,7 @@
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name">'config/config.php'</span>)
-			(line <span class="line-number">144</span>)
+			(line <span class="line-number">145</span>)
 		</span>
 	</div>
 
@@ -126,7 +126,7 @@
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name"><a href="../davical/_inc---davical_configuration_missing.php.html">davical_configuration_missing.php</a></span>)
-			(line <span class="line-number">147</span>)
+			(line <span class="line-number">148</span>)
 		</span>
 	</div>
 
@@ -141,7 +141,7 @@
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name">'/etc/davical/config.php'</span>)
-			(line <span class="line-number">132</span>)
+			(line <span class="line-number">133</span>)
 		</span>
 	</div>
 
@@ -156,7 +156,7 @@
 		<span class="include-title">
 			<span class="include-type">include_once</span>
 			(<span class="include-name">'AWLUtilities.php'</span>)
-			(line <span class="line-number">90</span>)
+			(line <span class="line-number">91</span>)
 		</span>
 	</div>
 
@@ -171,7 +171,7 @@
 		<span class="include-title">
 			<span class="include-type">include_once</span>
 			(<span class="include-name">'AWLUtilities.php'</span>)
-			(line <span class="line-number">77</span>)
+			(line <span class="line-number">78</span>)
 		</span>
 	</div>
 
@@ -186,7 +186,7 @@
 		<span class="include-title">
 			<span class="include-type">require_once</span>
 			(<span class="include-name">'AwlQuery.php'</span>)
-			(line <span class="line-number">193</span>)
+			(line <span class="line-number">194</span>)
 		</span>
 	</div>
 
@@ -202,7 +202,7 @@
 		<span class="include-title">
 			<span class="include-type">require_once</span>
 			(<span class="include-name"><a href="../davical/Principal/_inc---Principal.php.html">Principal.php</a></span>)
-			(line <span class="line-number">211</span>)
+			(line <span class="line-number">212</span>)
 		</span>
 	</div>
 
@@ -229,7 +229,7 @@
 		<img src="../media/images/Constant.png" />
 		<span class="const-title">
 			<span class="const-name">DAVICAL_ADDRESSBOOK_MAXPRIV</span> = &quot;1023&quot;
-			(line <span class="line-number">357</span>)
+			(line <span class="line-number">358</span>)
 		</span>
 	</div>
 	
@@ -244,7 +244,7 @@
 		<img src="../media/images/Constant.png" />
 		<span class="const-title">
 			<span class="const-name">DAVICAL_MAXPRIV</span> = &quot;65535&quot;
-			(line <span class="line-number">356</span>)
+			(line <span class="line-number">357</span>)
 		</span>
 	</div>
 	
@@ -275,7 +275,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">bits_to_privilege</span> (line <span class="line-number">409</span>)
+		<span class="method-title">bits_to_privilege</span> (line <span class="line-number">410</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -307,7 +307,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">ConstructURL</span> (line <span class="line-number">275</span>)
+		<span class="method-title">ConstructURL</span> (line <span class="line-number">276</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -336,7 +336,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">DateToISODate</span> (line <span class="line-number">344</span>)
+		<span class="method-title">DateToISODate</span> (line <span class="line-number">345</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -365,7 +365,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">DeconstructURL</span> (line <span class="line-number">304</span>)
+		<span class="method-title">DeconstructURL</span> (line <span class="line-number">305</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -427,7 +427,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">getStatusMessage</span> (line <span class="line-number">218</span>)
+		<span class="method-title">getStatusMessage</span> (line <span class="line-number">219</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -456,7 +456,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">ISODateToHTTPDate</span> (line <span class="line-number">335</span>)
+		<span class="method-title">ISODateToHTTPDate</span> (line <span class="line-number">336</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -482,7 +482,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">privileges_to_XML</span> (line <span class="line-number">456</span>)
+		<span class="method-title">privileges_to_XML</span> (line <span class="line-number">457</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -511,7 +511,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">privilege_to_bits</span> (line <span class="line-number">358</span>)
+		<span class="method-title">privilege_to_bits</span> (line <span class="line-number">359</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -535,7 +535,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:24 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:51 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---createdb.php.html davical-1.0.2/docs/api/davical/_htdocs---createdb.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---createdb.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---createdb.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -93,7 +93,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---dbexec.php.html davical-1.0.2/docs/api/davical/_htdocs---dbexec.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---dbexec.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---dbexec.php.html	2012-01-13 10:44:54.000000000 +0000
@@ -57,7 +57,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---feed.php.html davical-1.0.2/docs/api/davical/_htdocs---feed.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---feed.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---feed.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -204,7 +204,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---freebusy.php.html davical-1.0.2/docs/api/davical/_htdocs---freebusy.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---freebusy.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---freebusy.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -116,7 +116,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---help.php.html davical-1.0.2/docs/api/davical/_htdocs---help.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---help.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---help.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -115,7 +115,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---index.php.html davical-1.0.2/docs/api/davical/_htdocs---index.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---index.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---index.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -131,7 +131,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---newfile.php.html davical-1.0.2/docs/api/davical/_htdocs---newfile.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---newfile.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---newfile.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -55,7 +55,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---setup.php.html davical-1.0.2/docs/api/davical/_htdocs---setup.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---setup.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---setup.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -66,30 +66,30 @@
 			|													<a href="#sec-functions">Functions</a>
 					</div>
 		<div class="info-box-body">	
-			<a name="_page-footer_php"><!-- --></a>
-<div class="oddrow">
+			<a name="__/always_php"><!-- --></a>
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../davical/_inc---page-footer.php.html">page-footer.php</a></span>)
-			(line <span class="line-number">387</span>)
+			(<span class="include-name"><a href="../davical/_htdocs---always.php.html">"./always.php"</a></span>)
+			(line <span class="line-number">144</span>)
 		</span>
 	</div>
 
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
-<a name="__/always_php"><!-- --></a>
-<div class="evenrow">
+<a name="_page-footer_php"><!-- --></a>
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
-			(<span class="include-name"><a href="../davical/_htdocs---always.php.html">"./always.php"</a></span>)
-			(line <span class="line-number">130</span>)
+			(<span class="include-name"><a href="../davical/_inc---page-footer.php.html">page-footer.php</a></span>)
+			(line <span class="line-number">405</span>)
 		</span>
 	</div>
 
@@ -97,14 +97,14 @@
 	
 </div>
 <a name="_page-header_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name"><a href="../davical/_inc---page-header.php.html">page-header.php</a></span>)
-			(line <span class="line-number">140</span>)
+			(line <span class="line-number">154</span>)
 		</span>
 	</div>
 
@@ -112,14 +112,14 @@
 	
 </div>
 <a name="_interactive-page_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name"><a href="../davical/_inc---interactive-page.php.html">interactive-page.php</a></span>)
-			(line <span class="line-number">139</span>)
+			(line <span class="line-number">153</span>)
 		</span>
 	</div>
 
@@ -127,14 +127,14 @@
 	
 </div>
 <a name="_DAViCalSession_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">include</span>
 			(<span class="include-name"><a href="../davical/DAViCalSession/_inc---DAViCalSession.php.html">DAViCalSession.php</a></span>)
-			(line <span class="line-number">131</span>)
+			(line <span class="line-number">145</span>)
 		</span>
 	</div>
 
@@ -142,14 +142,14 @@
 	
 </div>
 <a name="_AwlQuery_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
 		<span class="include-title">
 			<span class="include-type">require_once</span>
 			(<span class="include-name">"AwlQuery.php"</span>)
-			(line <span class="line-number">142</span>)
+			(line <span class="line-number">156</span>)
 		</span>
 	</div>
 
@@ -172,11 +172,11 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionbuild_dependencies_table" id="functionbuild_dependencies_table"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">build_dependencies_table</span> (line <span class="line-number">234</span>)
+		<span class="method-title">build_dependencies_table</span> (line <span class="line-number">248</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -192,11 +192,11 @@
 	
 </div>
 <a name="functionbuild_site_statistics" id="functionbuild_site_statistics"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">build_site_statistics</span> (line <span class="line-number">206</span>)
+		<span class="method-title">build_site_statistics</span> (line <span class="line-number">220</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -212,11 +212,11 @@
 	
 </div>
 <a name="functioncheck_awl_version" id="functioncheck_awl_version"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">check_awl_version</span> (line <span class="line-number">191</span>)
+		<span class="method-title">check_awl_version</span> (line <span class="line-number">205</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -232,11 +232,11 @@
 	
 </div>
 <a name="functioncheck_calendar" id="functioncheck_calendar"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">check_calendar</span> (line <span class="line-number">81</span>)
+		<span class="method-title">check_calendar</span> (line <span class="line-number">88</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -251,12 +251,32 @@
 		
 	
 </div>
+<a name="functioncheck_curl" id="functioncheck_curl"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../media/images/Function.png" />
+		<span class="method-title">check_curl</span> (line <span class="line-number">110</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			check_curl
+		</span>
+				()
+			</div>
+
+		
+	
+</div>
 <a name="functioncheck_datetime" id="functioncheck_datetime"><!-- --></a>
 <div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">check_datetime</span> (line <span class="line-number">145</span>)
+		<span class="method-title">check_datetime</span> (line <span class="line-number">159</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -276,7 +296,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">check_davical_version</span> (line <span class="line-number">175</span>)
+		<span class="method-title">check_davical_version</span> (line <span class="line-number">189</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -356,7 +376,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">check_magic_quotes_gpc</span> (line <span class="line-number">95</span>)
+		<span class="method-title">check_magic_quotes_gpc</span> (line <span class="line-number">102</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -376,7 +396,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">check_magic_quotes_runtime</span> (line <span class="line-number">99</span>)
+		<span class="method-title">check_magic_quotes_runtime</span> (line <span class="line-number">106</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -452,12 +472,32 @@
 		
 	
 </div>
-<a name="functioncheck_schema_version" id="functioncheck_schema_version"><!-- --></a>
+<a name="functioncheck_real_php" id="functioncheck_real_php"><!-- --></a>
 <div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">check_schema_version</span> (line <span class="line-number">153</span>)
+		<span class="method-title">check_real_php</span> (line <span class="line-number">81</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			check_real_php
+		</span>
+				()
+			</div>
+
+		
+	
+</div>
+<a name="functioncheck_schema_version" id="functioncheck_schema_version"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../media/images/Function.png" />
+		<span class="method-title">check_schema_version</span> (line <span class="line-number">167</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -473,11 +513,11 @@
 	
 </div>
 <a name="functioncheck_suhosin_server_strip" id="functioncheck_suhosin_server_strip"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">check_suhosin_server_strip</span> (line <span class="line-number">88</span>)
+		<span class="method-title">check_suhosin_server_strip</span> (line <span class="line-number">95</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -493,11 +533,11 @@
 	
 </div>
 <a name="functiondo_error" id="functiondo_error"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">do_error</span> (line <span class="line-number">106</span>)
+		<span class="method-title">do_error</span> (line <span class="line-number">120</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -518,11 +558,11 @@
 	
 </div>
 <a name="functionget_phpinfo" id="functionget_phpinfo"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">get_phpinfo</span> (line <span class="line-number">118</span>)
+		<span class="method-title">get_phpinfo</span> (line <span class="line-number">132</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -538,7 +578,7 @@
 	
 </div>
 <a name="functioni18n" id="functioni18n"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
@@ -567,7 +607,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---SqlToArray.php.html davical-1.0.2/docs/api/davical/_htdocs---SqlToArray.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---SqlToArray.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---SqlToArray.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -57,7 +57,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---test.php.html davical-1.0.2/docs/api/davical/_htdocs---test.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---test.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---test.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -28,7 +28,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_htdocs---upgrade.php.html davical-1.0.2/docs/api/davical/_htdocs---upgrade.php.html
--- davical-0.9.9.7/docs/api/davical/_htdocs---upgrade.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_htdocs---upgrade.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -34,7 +34,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_interactive-page_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -49,7 +49,7 @@
 	
 </div>
 <a name="__/always_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -64,7 +64,7 @@
 	
 </div>
 <a name="_DAViCalSession_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -79,7 +79,7 @@
 	
 </div>
 <a name="_classEditor_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -94,7 +94,7 @@
 	
 </div>
 <a name="_page-footer_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -110,7 +110,7 @@
 	
 </div>
 <a name="_AwlUpgrader_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -125,7 +125,7 @@
 	
 </div>
 <a name="_page-header_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -146,7 +146,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html davical-1.0.2/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html
--- davical-0.9.9.7/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/HTTPAuthSession/HTTPAuthSession.html	2012-01-13 10:44:55.000000000 +0000
@@ -296,7 +296,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">AllowedTo</span> (line <span class="line-number">318</span>)
+		<span class="method-title">AllowedTo</span> (line <span class="line-number">329</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -327,7 +327,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">AssignSessionDetails</span> (line <span class="line-number">342</span>)
+		<span class="method-title">AssignSessionDetails</span> (line <span class="line-number">353</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -406,7 +406,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">CheckPassword</span> (line <span class="line-number">273</span>)
+		<span class="method-title">CheckPassword</span> (line <span class="line-number">280</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -436,7 +436,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">DigestAuthSession</span> (line <span class="line-number">178</span>)
+		<span class="method-title">DigestAuthSession</span> (line <span class="line-number">185</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -459,7 +459,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetRoles</span> (line <span class="line-number">326</span>)
+		<span class="method-title">GetRoles</span> (line <span class="line-number">337</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -481,7 +481,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">ParseDigestHeader</span> (line <span class="line-number">240</span>)
+		<span class="method-title">ParseDigestHeader</span> (line <span class="line-number">247</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -510,7 +510,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html davical-1.0.2/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html
--- davical-0.9.9.7/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -63,7 +63,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---AtomFeed.php.html davical-1.0.2/docs/api/davical/_inc---AtomFeed.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---AtomFeed.php.html	2011-10-24 07:09:25.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---AtomFeed.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -152,7 +152,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:25 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:51 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---autodiscover-handler.php.html davical-1.0.2/docs/api/davical/_inc---autodiscover-handler.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---autodiscover-handler.php.html	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---autodiscover-handler.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  <html xmlns="http://www.w3.org/1999/xhtml">
+		<head>
+			<!-- template designed by Marco Von Ballmoos -->
+			<title>Docs for page autodiscover-handler.php</title>
+			<link rel="stylesheet" href="../media/stylesheet.css" />
+			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+		</head>
+		<body>
+			<div class="page-body">			
+<h2 class="file-name"><img src="../media/images/Page_logo.png" alt="File" style="vertical-align: middle">/inc/autodiscover-handler.php</h2>
+
+<a name="sec-description"></a>
+<div class="info-box">
+	<div class="info-box-title">Description</div>
+	<div class="nav-bar">
+					<span class="disabled">Description</span> |
+									<a href="#sec-includes">Includes</a>
+			|											<a href="#sec-functions">Functions</a>
+			</div>
+	<div class="info-box-body">	
+		<!-- ========== Info from phpDoc block ========= -->
+		
+			</div>
+</div>
+		
+
+	<a name="sec-includes"></a>	
+	<div class="info-box">
+		<div class="info-box-title">Includes</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+						<span class="disabled">Includes</span>
+			|													<a href="#sec-functions">Functions</a>
+					</div>
+		<div class="info-box-body">	
+			<a name="_HTTPAuthSession_php"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html">'HTTPAuthSession.php'</a></span>)
+			(line <span class="line-number">9</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Errors are sent as an XML document.</p>
+	
+</div>
+<a name="_CalDAVRequest_php"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../davical/Request/_inc---CalDAVRequest.php.html">'CalDAVRequest.php'</a></span>)
+			(line <span class="line-number">12</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
+		</div>
+	</div>
+	
+	
+	
+	<a name="sec-functions"></a>	
+	<div class="info-box">
+		<div class="info-box-title">Functions</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+										<a href="#sec-includes">Includes</a>
+				|												<span class="disabled">Functions</span>
+		</div>
+		<div class="info-box-body">	
+			<a name="functionerrorResponse" id="functionerrorResponse"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../media/images/Function.png" />
+		<span class="method-title">errorResponse</span> (line <span class="line-number">24</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			errorResponse
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$code</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$message</span>, [<span class="var-type"></span>&nbsp;<span class="var-name">$debugdata</span> = <span class="var-default">&#039;&#039;</span>])
+			</div>
+
+			<ul class="parameters">
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$code</span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$message</span>			</li>
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$debugdata</span>			</li>
+				</ul>
+		
+	
+</div>
+		</div>
+	</div>
+	
+	<p class="notes" id="credit">
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+	</p>
+	</div></body>
+</html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---caldav-LOCK.php.html davical-1.0.2/docs/api/davical/_inc---caldav-LOCK.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---caldav-LOCK.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---caldav-LOCK.php.html	2012-01-13 10:44:52.000000000 +0000
@@ -34,7 +34,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_XMLDocument_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -56,7 +56,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-calquery.php.html davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-calquery.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-calquery.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-calquery.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -36,7 +36,7 @@
 					</div>
 		<div class="info-box-body">	
 			<a name="_vCalendar_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -65,7 +65,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionapply_filter" id="functionapply_filter"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
@@ -100,7 +100,7 @@
 	
 </div>
 <a name="functionBuildSqlFilter" id="functionBuildSqlFilter"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
@@ -132,7 +132,7 @@
 	
 </div>
 <a name="functioncheck_for_expansion" id="functioncheck_for_expansion"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
@@ -157,7 +157,7 @@
 	
 </div>
 <a name="functionSqlFilterFragment" id="functionSqlFilterFragment"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
@@ -195,7 +195,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-cardquery.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -36,7 +36,7 @@
 					</div>
 		<div class="info-box-body">	
 			<a name="_vcard_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -65,7 +65,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionget_address_properties" id="functionget_address_properties"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
@@ -90,11 +90,11 @@
 	
 </div>
 <a name="functionSqlFilterCardDAV" id="functionSqlFilterCardDAV"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">SqlFilterCardDAV</span> (line <span class="line-number">83</span>)
+		<span class="method-title">SqlFilterCardDAV</span> (line <span class="line-number">84</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -128,7 +128,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-expand-property.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -37,7 +37,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionexpand_properties" id="functionexpand_properties"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
@@ -72,7 +72,7 @@
 	
 </div>
 <a name="functionget_href_containers" id="functionget_href_containers"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Function.png" />
@@ -101,7 +101,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-freebusy.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -34,7 +34,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_freebusy-functions_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -56,7 +56,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-multiget.php.html davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-multiget.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-multiget.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-multiget.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -28,7 +28,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-principal-match.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -28,7 +28,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-principal.php.html davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-principal.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---caldav-REPORT-principal.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---caldav-REPORT-principal.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -29,7 +29,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---check_UTF8.php.html davical-1.0.2/docs/api/davical/_inc---check_UTF8.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---check_UTF8.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---check_UTF8.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -119,7 +119,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---davical_configuration_missing.php.html davical-1.0.2/docs/api/davical/_inc---davical_configuration_missing.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---davical_configuration_missing.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---davical_configuration_missing.php.html	2012-01-13 10:44:54.000000000 +0000
@@ -70,7 +70,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---freebusy-functions.php.html davical-1.0.2/docs/api/davical/_inc---freebusy-functions.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---freebusy-functions.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---freebusy-functions.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -118,7 +118,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---interactive-page.php.html davical-1.0.2/docs/api/davical/_inc---interactive-page.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---interactive-page.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---interactive-page.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -55,7 +55,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---other_translated_strings.php.html davical-1.0.2/docs/api/davical/_inc---other_translated_strings.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---other_translated_strings.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---other_translated_strings.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -28,7 +28,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---page-footer.php.html davical-1.0.2/docs/api/davical/_inc---page-footer.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---page-footer.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---page-footer.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -28,7 +28,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---page-header.php.html davical-1.0.2/docs/api/davical/_inc---page-header.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---page-header.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---page-header.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -85,7 +85,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---pubsub.php.html davical-1.0.2/docs/api/davical/_inc---pubsub.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---pubsub.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---pubsub.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -28,7 +28,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---test-RRULE.php.html davical-1.0.2/docs/api/davical/_inc---test-RRULE.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---test-RRULE.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---test-RRULE.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -64,7 +64,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="___/htdocs/always_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -79,7 +79,7 @@
 	
 </div>
 <a name="_RRule_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -100,7 +100,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---test-RRULE-v2.php.html davical-1.0.2/docs/api/davical/_inc---test-RRULE-v2.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---test-RRULE-v2.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---test-RRULE-v2.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -64,7 +64,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_always_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -79,7 +79,7 @@
 	
 </div>
 <a name="_RRule-v2_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -94,7 +94,7 @@
 	
 </div>
 <a name="_AwlQuery_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -115,7 +115,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---ui---collection-edit.php.html davical-1.0.2/docs/api/davical/_inc---ui---collection-edit.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---ui---collection-edit.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---ui---collection-edit.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -86,7 +86,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">edit_grant_row</span> (line <span class="line-number">395</span>)
+		<span class="method-title">edit_grant_row</span> (line <span class="line-number">404</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -111,7 +111,7 @@
 	
 	<div>
 		<img src="../media/images/Function.png" />
-		<span class="method-title">privilege_format_function</span> (line <span class="line-number">179</span>)
+		<span class="method-title">privilege_format_function</span> (line <span class="line-number">188</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -146,7 +146,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---ui---external-browse.php.html davical-1.0.2/docs/api/davical/_inc---ui---external-browse.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---ui---external-browse.php.html	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---ui---external-browse.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  <html xmlns="http://www.w3.org/1999/xhtml">
+		<head>
+			<!-- template designed by Marco Von Ballmoos -->
+			<title>Docs for page external-browse.php</title>
+			<link rel="stylesheet" href="../media/stylesheet.css" />
+			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+		</head>
+		<body>
+			<div class="page-body">			
+<h2 class="file-name"><img src="../media/images/Page_logo.png" alt="File" style="vertical-align: middle">/inc/ui/external-browse.php</h2>
+
+<a name="sec-description"></a>
+<div class="info-box">
+	<div class="info-box-title">Description</div>
+	<div class="nav-bar">
+													</div>
+	<div class="info-box-body">	
+		<!-- ========== Info from phpDoc block ========= -->
+		
+			</div>
+</div>
+		
+
+	
+	
+	
+	
+	<p class="notes" id="credit">
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+	</p>
+	</div></body>
+</html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---ui---principal-browse.php.html davical-1.0.2/docs/api/davical/_inc---ui---principal-browse.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---ui---principal-browse.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---ui---principal-browse.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -28,7 +28,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---ui---principal-edit.php.html davical-1.0.2/docs/api/davical/_inc---ui---principal-edit.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---ui---principal-edit.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---ui---principal-edit.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -491,7 +491,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---vcard.php.html davical-1.0.2/docs/api/davical/_inc---vcard.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---vcard.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---vcard.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -64,7 +64,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_AwlQuery_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -80,7 +80,7 @@
 	
 </div>
 <a name="_vComponent_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../media/images/Page.png" alt=" " />
@@ -101,7 +101,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---well-known.php.html davical-1.0.2/docs/api/davical/_inc---well-known.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---well-known.php.html	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---well-known.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+  <html xmlns="http://www.w3.org/1999/xhtml">
+		<head>
+			<!-- template designed by Marco Von Ballmoos -->
+			<title>Docs for page well-known.php</title>
+			<link rel="stylesheet" href="../media/stylesheet.css" />
+			<meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
+		</head>
+		<body>
+			<div class="page-body">			
+<h2 class="file-name"><img src="../media/images/Page_logo.png" alt="File" style="vertical-align: middle">/inc/well-known.php</h2>
+
+<a name="sec-description"></a>
+<div class="info-box">
+	<div class="info-box-title">Description</div>
+	<div class="nav-bar">
+					<span class="disabled">Description</span> |
+									<a href="#sec-includes">Includes</a>
+			|											<a href="#sec-functions">Functions</a>
+			</div>
+	<div class="info-box-body">	
+		<!-- ========== Info from phpDoc block ========= -->
+		
+			</div>
+</div>
+		
+
+	<a name="sec-includes"></a>	
+	<div class="info-box">
+		<div class="info-box-title">Includes</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+						<span class="disabled">Includes</span>
+			|													<a href="#sec-functions">Functions</a>
+					</div>
+		<div class="info-box-body">	
+			<a name="_iSchedule_php"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">include</span>
+			(<span class="include-name"><a href="../davical/iSchedule/_inc---iSchedule.php.html">'iSchedule.php'</a></span>)
+			(line <span class="line-number">44</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
+<a name="_HTTPAuthSession_php"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../davical/HTTPAuthSession/_inc---HTTPAuthSession.php.html">'HTTPAuthSession.php'</a></span>)
+			(line <span class="line-number">5</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
+<a name="_CalDAVRequest_php"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../davical/Request/_inc---CalDAVRequest.php.html">'CalDAVRequest.php'</a></span>)
+			(line <span class="line-number">10</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
+		</div>
+	</div>
+	
+	
+	
+	<a name="sec-functions"></a>	
+	<div class="info-box">
+		<div class="info-box-title">Functions</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+										<a href="#sec-includes">Includes</a>
+				|												<span class="disabled">Functions</span>
+		</div>
+		<div class="info-box-body">	
+			<a name="functionischedule_get" id="functionischedule_get"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../media/images/Function.png" />
+		<span class="method-title">ischedule_get</span> (line <span class="line-number">58</span>)
+	</div> 
+
+	<!-- ========== Info from phpDoc block ========= -->
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			ischedule_get
+		</span>
+				()
+			</div>
+
+		
+	
+</div>
+		</div>
+	</div>
+	
+	<p class="notes" id="credit">
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+	</p>
+	</div></body>
+</html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/_inc---WritableCollection.php.html davical-1.0.2/docs/api/davical/_inc---WritableCollection.php.html
--- davical-0.9.9.7/docs/api/davical/_inc---WritableCollection.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/_inc---WritableCollection.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -85,7 +85,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/iSchedule/_inc---iSchedule.php.html davical-1.0.2/docs/api/davical/iSchedule/_inc---iSchedule.php.html
--- davical-0.9.9.7/docs/api/davical/iSchedule/_inc---iSchedule.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/iSchedule/_inc---iSchedule.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -116,7 +116,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/iSchedule/iSchedule.html davical-1.0.2/docs/api/davical/iSchedule/iSchedule.html
--- davical-0.9.9.7/docs/api/davical/iSchedule/iSchedule.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/iSchedule/iSchedule.html	2012-01-13 10:44:55.000000000 +0000
@@ -511,7 +511,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/ldap/imapPamDrivers.html davical-1.0.2/docs/api/davical/ldap/imapPamDrivers.html
--- davical-0.9.9.7/docs/api/davical/ldap/imapPamDrivers.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/ldap/imapPamDrivers.html	2012-01-13 10:44:55.000000000 +0000
@@ -133,7 +133,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html davical-1.0.2/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html
--- davical-0.9.9.7/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/ldap/_inc---drivers_imap_pam.php.html	2012-01-13 10:44:54.000000000 +0000
@@ -141,7 +141,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/ldap/_inc---drivers_ldap.php.html davical-1.0.2/docs/api/davical/ldap/_inc---drivers_ldap.php.html
--- davical-0.9.9.7/docs/api/davical/ldap/_inc---drivers_ldap.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/ldap/_inc---drivers_ldap.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -134,7 +134,7 @@
 	
 	<div>
 		<img src="../../media/images/Function.png" />
-		<span class="method-title">LDAP_check</span> (line <span class="line-number">302</span>)
+		<span class="method-title">LDAP_check</span> (line <span class="line-number">292</span>)
 	</div> 
 
 	<!-- ========== Info from phpDoc block ========= -->
@@ -239,7 +239,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/ldap/_inc---drivers_rimap.php.html davical-1.0.2/docs/api/davical/ldap/_inc---drivers_rimap.php.html
--- davical-0.9.9.7/docs/api/davical/ldap/_inc---drivers_rimap.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/ldap/_inc---drivers_rimap.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -141,7 +141,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html davical-1.0.2/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html
--- davical-0.9.9.7/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/ldap/_inc---drivers_squid_pam.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -141,7 +141,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/ldap/ldapDrivers.html davical-1.0.2/docs/api/davical/ldap/ldapDrivers.html
--- davical-0.9.9.7/docs/api/davical/ldap/ldapDrivers.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/ldap/ldapDrivers.html	2012-01-13 10:44:55.000000000 +0000
@@ -211,7 +211,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/ldap/squidPamDrivers.html davical-1.0.2/docs/api/davical/ldap/squidPamDrivers.html
--- davical-0.9.9.7/docs/api/davical/ldap/squidPamDrivers.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/ldap/squidPamDrivers.html	2012-01-13 10:44:55.000000000 +0000
@@ -100,7 +100,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/logging/_inc---log_caldav_action.php.html davical-1.0.2/docs/api/davical/logging/_inc---log_caldav_action.php.html
--- davical-0.9.9.7/docs/api/davical/logging/_inc---log_caldav_action.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/logging/_inc---log_caldav_action.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -88,7 +88,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Principal/DAVPrincipal.html davical-1.0.2/docs/api/davical/Principal/DAVPrincipal.html
--- davical-0.9.9.7/docs/api/davical/Principal/DAVPrincipal.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Principal/DAVPrincipal.html	2012-01-13 10:44:54.000000000 +0000
@@ -27,7 +27,7 @@
         		<!-- ========== Info from phpDoc block ========= -->
 <p class="short-description">A class for things to do with a DAV Principal</p>
 		<p class="notes">
-			Located in <a class="field" href="_inc---DAVPrincipal.php.html">/inc/DAVPrincipal.php</a> (line <span class="field">18</span>)
+			Located in <a class="field" href="_inc---DAVPrincipal.php.html">/inc/DAVPrincipal.php</a> (line <span class="field">19</span>)
 		</p>
 		
 				
@@ -213,7 +213,7 @@
 		<span class="var-title">
 			<span class="var-type">RFC3744:</span>
 			<span class="var-name">$_is_group</span>
-						(line <span class="line-number">41</span>)
+						(line <span class="line-number">42</span>)
 		</span>
 	</div>
 
@@ -369,7 +369,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Constructor.png" />
-		<span class="method-title">Constructor __construct</span> (line <span class="line-number">94</span>)
+		<span class="method-title">Constructor __construct</span> (line <span class="line-number">95</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -405,7 +405,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">addressbook_home_set</span> (line <span class="line-number">358</span>)
+		<span class="method-title">addressbook_home_set</span> (line <span class="line-number">359</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -427,7 +427,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">AsCollection</span> (line <span class="line-number">419</span>)
+		<span class="method-title">AsCollection</span> (line <span class="line-number">420</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -449,7 +449,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">calendar_free_busy_set</span> (line <span class="line-number">381</span>)
+		<span class="method-title">calendar_free_busy_set</span> (line <span class="line-number">382</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -471,7 +471,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">calendar_home_set</span> (line <span class="line-number">335</span>)
+		<span class="method-title">calendar_home_set</span> (line <span class="line-number">336</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -493,7 +493,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchProxyGroups</span> (line <span class="line-number">193</span>)
+		<span class="method-title">FetchProxyGroups</span> (line <span class="line-number">194</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -515,7 +515,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetProperty</span> (line <span class="line-number">302</span>)
+		<span class="method-title">GetProperty</span> (line <span class="line-number">303</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -545,7 +545,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GroupMemberSet</span> (line <span class="line-number">283</span>)
+		<span class="method-title">GroupMemberSet</span> (line <span class="line-number">284</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -567,7 +567,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GroupMembership</span> (line <span class="line-number">274</span>)
+		<span class="method-title">GroupMembership</span> (line <span class="line-number">275</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -589,7 +589,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">InitialiseRecord</span> (line <span class="line-number">143</span>)
+		<span class="method-title">InitialiseRecord</span> (line <span class="line-number">144</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -616,7 +616,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsGroup</span> (line <span class="line-number">293</span>)
+		<span class="method-title">IsGroup</span> (line <span class="line-number">294</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -641,7 +641,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">PrincipalProperty</span> (line <span class="line-number">450</span>)
+		<span class="method-title">PrincipalProperty</span> (line <span class="line-number">451</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -677,7 +677,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">Privileges</span> (line <span class="line-number">403</span>)
+		<span class="method-title">Privileges</span> (line <span class="line-number">404</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -699,7 +699,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">PropertySearch</span> (line <span class="line-number">443</span>)
+		<span class="method-title">PropertySearch</span> (line <span class="line-number">444</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -725,7 +725,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">ProxyFor</span> (line <span class="line-number">264</span>)
+		<span class="method-title">ProxyFor</span> (line <span class="line-number">265</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -752,7 +752,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">ReadProxyGroup</span> (line <span class="line-number">245</span>)
+		<span class="method-title">ReadProxyGroup</span> (line <span class="line-number">246</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -774,7 +774,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">RenderAsXML</span> (line <span class="line-number">568</span>)
+		<span class="method-title">RenderAsXML</span> (line <span class="line-number">569</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -813,7 +813,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">unique_tag</span> (line <span class="line-number">323</span>)
+		<span class="method-title">unique_tag</span> (line <span class="line-number">324</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -838,7 +838,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">WriteProxyGroup</span> (line <span class="line-number">254</span>)
+		<span class="method-title">WriteProxyGroup</span> (line <span class="line-number">255</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -911,7 +911,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Principal/_inc---DAVPrincipal.php.html davical-1.0.2/docs/api/davical/Principal/_inc---DAVPrincipal.php.html
--- davical-0.9.9.7/docs/api/davical/Principal/_inc---DAVPrincipal.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Principal/_inc---DAVPrincipal.php.html	2012-01-13 10:44:54.000000000 +0000
@@ -17,7 +17,8 @@
 	<div class="nav-bar">
 					<span class="disabled">Description</span> |
 							<a href="#sec-classes">Classes</a>
-														</div>
+			|							<a href="#sec-includes">Includes</a>
+												</div>
 	<div class="info-box-body">	
 		<!-- ========== Info from phpDoc block ========= -->
 <p class="short-description">An object representing a DAV 'Principal'</p>
@@ -36,7 +37,8 @@
 		<div class="nav-bar">
 			<a href="#sec-description">Description</a> |
 			<span class="disabled">Classes</span>
-																	</div>
+			|							<a href="#sec-includes">Includes</a>
+																		</div>
 		<div class="info-box-body">	
 			<table cellpadding="2" cellspacing="0" class="class-table">
 				<tr>
@@ -58,12 +60,44 @@
 		</div>
 	</div>
 
+	<a name="sec-includes"></a>	
+	<div class="info-box">
+		<div class="info-box-title">Includes</div>
+		<div class="nav-bar">
+			<a href="#sec-description">Description</a> |
+							<a href="#sec-classes">Classes</a>
+				|						<span class="disabled">Includes</span>
+														</div>
+		<div class="info-box-body">	
+			<a name="_Principal_php"><!-- --></a>
+<div class="oddrow">
+	
+	<div>
+		<img src="../../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../../davical/Principal/_inc---Principal.php.html">'Principal.php'</a></span>)
+			(line <span class="line-number">12</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">An object representing a DAV 'Principal'</p>
+	<ul class="tags">
+				<li><span class="field">author:</span> Andrew McMillan &lt;<a href="mailto:andrew@mcmillan.net.nz">andrew@mcmillan.net.nz</a>&gt;</li>
+				<li><span class="field">copyright:</span> Catalyst .Net Ltd, Morphoss Ltd &lt;http://www.morhposs.com/&gt;</li>
+				<li><span class="field">license:</span> <a href="http://gnu.org/copyleft/gpl.html">GNU GPL v2 or later</a></li>
+			</ul>
+	
+</div>
+		</div>
+	</div>
 	
 	
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Principal/_inc---Principal.php.html davical-1.0.2/docs/api/davical/Principal/_inc---Principal.php.html
--- davical-0.9.9.7/docs/api/davical/Principal/_inc---Principal.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Principal/_inc---Principal.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -97,7 +97,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Principal/Principal.html davical-1.0.2/docs/api/davical/Principal/Principal.html
--- davical-0.9.9.7/docs/api/davical/Principal/Principal.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Principal/Principal.html	2012-01-13 10:44:56.000000000 +0000
@@ -1060,7 +1060,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/StaticMethod.png" />
-		<span class="method-title">static cacheDelete</span> (line <span class="line-number">588</span>)
+		<span class="method-title">static cacheDelete</span> (line <span class="line-number">597</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1092,7 +1092,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/StaticMethod.png" />
-		<span class="method-title">static cacheFlush</span> (line <span class="line-number">577</span>)
+		<span class="method-title">static cacheFlush</span> (line <span class="line-number">586</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1193,7 +1193,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">byEmail</span> (line <span class="line-number">284</span>)
+		<span class="method-title">byEmail</span> (line <span class="line-number">288</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1217,7 +1217,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">Create</span> (line <span class="line-number">566</span>)
+		<span class="method-title">Create</span> (line <span class="line-number">575</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1246,7 +1246,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">dav_name</span> (line <span class="line-number">376</span>)
+		<span class="method-title">dav_name</span> (line <span class="line-number">380</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1271,7 +1271,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">default_calendar</span> (line <span class="line-number">424</span>)
+		<span class="method-title">default_calendar</span> (line <span class="line-number">428</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1296,7 +1296,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">email</span> (line <span class="line-number">367</span>)
+		<span class="method-title">email</span> (line <span class="line-number">371</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1321,7 +1321,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">Exists</span> (line <span class="line-number">279</span>)
+		<span class="method-title">Exists</span> (line <span class="line-number">283</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1345,7 +1345,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchCollections</span> (line <span class="line-number">407</span>)
+		<span class="method-title">FetchCollections</span> (line <span class="line-number">411</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1371,7 +1371,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchDeadProperties</span> (line <span class="line-number">390</span>)
+		<span class="method-title">FetchDeadProperties</span> (line <span class="line-number">394</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1396,7 +1396,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">internal_url</span> (line <span class="line-number">490</span>)
+		<span class="method-title">internal_url</span> (line <span class="line-number">494</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1425,7 +1425,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">principal_id</span> (line <span class="line-number">358</span>)
+		<span class="method-title">principal_id</span> (line <span class="line-number">362</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1450,7 +1450,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">setUsername</span> (line <span class="line-number">338</span>)
+		<span class="method-title">setUsername</span> (line <span class="line-number">342</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1480,7 +1480,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">unCache</span> (line <span class="line-number">495</span>)
+		<span class="method-title">unCache</span> (line <span class="line-number">499</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1504,7 +1504,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">Update</span> (line <span class="line-number">570</span>)
+		<span class="method-title">Update</span> (line <span class="line-number">579</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1533,7 +1533,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">url</span> (line <span class="line-number">464</span>)
+		<span class="method-title">url</span> (line <span class="line-number">468</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1567,7 +1567,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">username</span> (line <span class="line-number">329</span>)
+		<span class="method-title">username</span> (line <span class="line-number">333</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1592,7 +1592,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">user_no</span> (line <span class="line-number">349</span>)
+		<span class="method-title">user_no</span> (line <span class="line-number">353</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1617,7 +1617,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">__get</span> (line <span class="line-number">246</span>)
+		<span class="method-title">__get</span> (line <span class="line-number">251</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1647,7 +1647,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">__isset</span> (line <span class="line-number">256</span>)
+		<span class="method-title">__isset</span> (line <span class="line-number">261</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1678,7 +1678,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html davical-1.0.2/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html
--- davical-0.9.9.7/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html	2011-10-24 07:09:26.000000000 +0000
+++ davical-1.0.2/docs/api/davical/propfind/_inc---caldav-PROPFIND.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -42,7 +42,7 @@
 					</div>
 		<div class="info-box-body">	
 			<a name="_iCalendar_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -57,7 +57,7 @@
 	
 </div>
 <a name="_XMLDocument_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -72,7 +72,7 @@
 	
 </div>
 <a name="_external-fetch_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -88,7 +88,7 @@
 	
 </div>
 <a name="_DAVResource_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -117,7 +117,7 @@
 		</div>
 		<div class="info-box-body">	
 			<a name="functionadd_proxy_response" id="functionadd_proxy_response"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -146,7 +146,7 @@
 	
 </div>
 <a name="functionget_collection_contents" id="functionget_collection_contents"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Function.png" />
@@ -181,7 +181,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:52 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/PublicSession/_inc---PublicSession.php.html davical-1.0.2/docs/api/davical/PublicSession/_inc---PublicSession.php.html
--- davical-0.9.9.7/docs/api/davical/PublicSession/_inc---PublicSession.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/PublicSession/_inc---PublicSession.php.html	2012-01-13 10:44:56.000000000 +0000
@@ -63,7 +63,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/PublicSession/PublicSession.html davical-1.0.2/docs/api/davical/PublicSession/PublicSession.html
--- davical-0.9.9.7/docs/api/davical/PublicSession/PublicSession.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/PublicSession/PublicSession.html	2012-01-13 10:44:56.000000000 +0000
@@ -133,7 +133,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html davical-1.0.2/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html
--- davical-0.9.9.7/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/pwauth/_inc---drivers_pwauth_pam.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -145,7 +145,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/pwauth/pwauthPamDrivers.html davical-1.0.2/docs/api/davical/pwauth/pwauthPamDrivers.html
--- davical-0.9.9.7/docs/api/davical/pwauth/pwauthPamDrivers.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/pwauth/pwauthPamDrivers.html	2012-01-13 10:44:55.000000000 +0000
@@ -100,7 +100,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Request/CalDAVRequest.html davical-1.0.2/docs/api/davical/Request/CalDAVRequest.html
--- davical-0.9.9.7/docs/api/davical/Request/CalDAVRequest.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Request/CalDAVRequest.html	2012-01-13 10:44:53.000000000 +0000
@@ -690,7 +690,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">AllowedTo</span> (line <span class="line-number">992</span>)
+		<span class="method-title">AllowedTo</span> (line <span class="line-number">1002</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -718,7 +718,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">BuildSupportedPrivileges</span> (line <span class="line-number">954</span>)
+		<span class="method-title">BuildSupportedPrivileges</span> (line <span class="line-number">964</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -748,7 +748,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">CoerceContentType</span> (line <span class="line-number">846</span>)
+		<span class="method-title">CoerceContentType</span> (line <span class="line-number">856</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -770,7 +770,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">CollectionId</span> (line <span class="line-number">946</span>)
+		<span class="method-title">CollectionId</span> (line <span class="line-number">956</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -792,7 +792,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">dav_name</span> (line <span class="line-number">712</span>)
+		<span class="method-title">dav_name</span> (line <span class="line-number">722</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -814,7 +814,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">DepthRegexTail</span> (line <span class="line-number">730</span>)
+		<span class="method-title">DepthRegexTail</span> (line <span class="line-number">740</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -836,7 +836,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">DoResponse</span> (line <span class="line-number">1169</span>)
+		<span class="method-title">DoResponse</span> (line <span class="line-number">1179</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -869,7 +869,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FailIfLocked</span> (line <span class="line-number">811</span>)
+		<span class="method-title">FailIfLocked</span> (line <span class="line-number">821</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -894,7 +894,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetDepthName</span> (line <span class="line-number">721</span>)
+		<span class="method-title">GetDepthName</span> (line <span class="line-number">731</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -916,7 +916,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetLockDetails</span> (line <span class="line-number">797</span>)
+		<span class="method-title">GetLockDetails</span> (line <span class="line-number">807</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -943,7 +943,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetLockRow</span> (line <span class="line-number">741</span>)
+		<span class="method-title">GetLockRow</span> (line <span class="line-number">751</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -973,7 +973,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">HavePrivilegeTo</span> (line <span class="line-number">1065</span>)
+		<span class="method-title">HavePrivilegeTo</span> (line <span class="line-number">1075</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1000,7 +1000,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsAddressBook</span> (line <span class="line-number">907</span>)
+		<span class="method-title">IsAddressBook</span> (line <span class="line-number">917</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1022,7 +1022,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsCalendar</span> (line <span class="line-number">898</span>)
+		<span class="method-title">IsCalendar</span> (line <span class="line-number">908</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1044,7 +1044,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsCollection</span> (line <span class="line-number">887</span>)
+		<span class="method-title">IsCollection</span> (line <span class="line-number">897</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1066,7 +1066,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsInfiniteDepth</span> (line <span class="line-number">938</span>)
+		<span class="method-title">IsInfiniteDepth</span> (line <span class="line-number">948</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1088,7 +1088,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsLocked</span> (line <span class="line-number">633</span>)
+		<span class="method-title">IsLocked</span> (line <span class="line-number">643</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1113,7 +1113,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsPrincipal</span> (line <span class="line-number">916</span>)
+		<span class="method-title">IsPrincipal</span> (line <span class="line-number">926</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1135,7 +1135,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsProxyRequest</span> (line <span class="line-number">927</span>)
+		<span class="method-title">IsProxyRequest</span> (line <span class="line-number">937</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1157,7 +1157,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsPublic</span> (line <span class="line-number">670</span>)
+		<span class="method-title">IsPublic</span> (line <span class="line-number">680</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1179,7 +1179,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">MalformedRequest</span> (line <span class="line-number">1142</span>)
+		<span class="method-title">MalformedRequest</span> (line <span class="line-number">1152</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1206,7 +1206,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">NeedPrivilege</span> (line <span class="line-number">1101</span>)
+		<span class="method-title">NeedPrivilege</span> (line <span class="line-number">1111</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1239,7 +1239,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">PreconditionFailed</span> (line <span class="line-number">1126</span>)
+		<span class="method-title">PreconditionFailed</span> (line <span class="line-number">1136</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1275,7 +1275,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">Privileges</span> (line <span class="line-number">1057</span>)
+		<span class="method-title">Privileges</span> (line <span class="line-number">1067</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1297,7 +1297,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">setPermissions</span> (line <span class="line-number">565</span>)
+		<span class="method-title">setPermissions</span> (line <span class="line-number">575</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1327,7 +1327,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">UnsupportedRequest</span> (line <span class="line-number">1078</span>)
+		<span class="method-title">UnsupportedRequest</span> (line <span class="line-number">1088</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1354,7 +1354,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">ValidateLockToken</span> (line <span class="line-number">766</span>)
+		<span class="method-title">ValidateLockToken</span> (line <span class="line-number">776</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1381,7 +1381,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">XMLResponse</span> (line <span class="line-number">1154</span>)
+		<span class="method-title">XMLResponse</span> (line <span class="line-number">1164</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1412,7 +1412,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Request/_inc---CalDAVRequest.php.html davical-1.0.2/docs/api/davical/Request/_inc---CalDAVRequest.php.html
--- davical-0.9.9.7/docs/api/davical/Request/_inc---CalDAVRequest.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Request/_inc---CalDAVRequest.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -168,7 +168,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:26 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Resource/DAVResource.html davical-1.0.2/docs/api/davical/Resource/DAVResource.html
--- davical-0.9.9.7/docs/api/davical/Resource/DAVResource.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Resource/DAVResource.html	2012-01-13 10:44:54.000000000 +0000
@@ -28,7 +28,7 @@
         		<!-- ========== Info from phpDoc block ========= -->
 <p class="short-description">A class for things to do with a DAV Resource</p>
 		<p class="notes">
-			Located in <a class="field" href="_inc---DAVResource.php.html">/inc/DAVResource.php</a> (line <span class="field">23</span>)
+			Located in <a class="field" href="_inc---DAVResource.php.html">/inc/DAVResource.php</a> (line <span class="field">24</span>)
 		</p>
 		
 				
@@ -140,7 +140,7 @@
 		</div>
 		<div class="info-box-body">			
 			<div class="method-summary">
-																																																																																																																																																																																																																																																																																																																																																																																																																																<div class="method-definition">
+																																																																																																																																																																																																																																																																																																																																																																																																																																																<div class="method-definition">
 					<img src="../../media/images/Constructor.png" alt=" "/>
 											<span class="method-result">DAVResource</span>
 										<a href="#__construct" title="details" class="method-name">__construct</a>
@@ -347,6 +347,12 @@
 																<div class="method-definition">
 					<img src="../../media/images/Method.png" alt=" "/>
 											<span class="method-result">void</span>
+										<a href="#IsInSchedulingCollection" title="details" class="method-name">IsInSchedulingCollection</a>
+											([<span class="var-type">string</span>&nbsp;<span class="var-name">$type</span> = <span class="var-default">'any'</span>])
+									</div>
+																<div class="method-definition">
+					<img src="../../media/images/Method.png" alt=" "/>
+											<span class="method-result">void</span>
 										<a href="#IsLocked" title="details" class="method-name">IsLocked</a>
 											([<span class="var-type"></span>&nbsp;<span class="var-name">$depth</span> = <span class="var-default">0</span>])
 									</div>
@@ -365,6 +371,12 @@
 																<div class="method-definition">
 					<img src="../../media/images/Method.png" alt=" "/>
 											<span class="method-result">void</span>
+										<a href="#IsPublicOnly" title="details" class="method-name">IsPublicOnly</a>
+										()
+									</div>
+																<div class="method-definition">
+					<img src="../../media/images/Method.png" alt=" "/>
+											<span class="method-result">void</span>
 										<a href="#IsSchedulingCollection" title="details" class="method-name">IsSchedulingCollection</a>
 											([<span class="var-type">string</span>&nbsp;<span class="var-name">$type</span> = <span class="var-default">'any'</span>])
 									</div>
@@ -460,14 +472,14 @@
 		<div class="info-box-body">
 			
 <a name="var$bound_from" id="$bound_from"><!-- --></A>
-<div class="oddrow">
+<div class="evenrow">
 
 	<div class="var-header">
 		<img src="../../media/images/Variable.png" />
 		<span class="var-title">
 			<span class="var-type">The</span>
 			<span class="var-name">$bound_from</span>
-						(line <span class="line-number">63</span>)
+						(line <span class="line-number">64</span>)
 		</span>
 	</div>
 
@@ -483,14 +495,14 @@
 
 </div>
 <a name="var$contenttype" id="$contenttype"><!-- --></A>
-<div class="evenrow">
+<div class="oddrow">
 
 	<div class="var-header">
 		<img src="../../media/images/Variable.png" />
 		<span class="var-title">
 			<span class="var-type">The</span>
 			<span class="var-name">$contenttype</span>
-						(line <span class="line-number">58</span>)
+						(line <span class="line-number">59</span>)
 		</span>
 	</div>
 
@@ -506,14 +518,14 @@
 
 </div>
 <a name="var$dav_name" id="$dav_name"><!-- --></A>
-<div class="oddrow">
+<div class="evenrow">
 
 	<div class="var-header">
 		<img src="../../media/images/Variable.png" />
 		<span class="var-title">
 			<span class="var-type">The</span>
 			<span class="var-name">$dav_name</span>
-						(line <span class="line-number">28</span>)
+						(line <span class="line-number">29</span>)
 		</span>
 	</div>
 
@@ -529,14 +541,14 @@
 
 </div>
 <a name="var$exists" id="$exists"><!-- --></A>
-<div class="evenrow">
+<div class="oddrow">
 
 	<div class="var-header">
 		<img src="../../media/images/Variable.png" />
 		<span class="var-title">
 			<span class="var-type">Boolean:</span>
 			<span class="var-name">$exists</span>
-						(line <span class="line-number">33</span>)
+						(line <span class="line-number">34</span>)
 		</span>
 	</div>
 
@@ -552,14 +564,14 @@
 
 </div>
 <a name="var$parent" id="$parent"><!-- --></A>
-<div class="oddrow">
+<div class="evenrow">
 
 	<div class="var-header">
 		<img src="../../media/images/Variable.png" />
 		<span class="var-title">
 			<span class="var-type">The</span>
 			<span class="var-name">$parent</span>
-						(line <span class="line-number">48</span>)
+						(line <span class="line-number">49</span>)
 		</span>
 	</div>
 
@@ -575,14 +587,14 @@
 
 </div>
 <a name="var$resource" id="$resource"><!-- --></A>
-<div class="evenrow">
+<div class="oddrow">
 
 	<div class="var-header">
 		<img src="../../media/images/Variable.png" />
 		<span class="var-title">
 			<span class="var-type">The</span>
 			<span class="var-name">$resource</span>
-						(line <span class="line-number">43</span>)
+						(line <span class="line-number">44</span>)
 		</span>
 	</div>
 
@@ -598,14 +610,14 @@
 
 </div>
 <a name="var$resourcetypes" id="$resourcetypes"><!-- --></A>
-<div class="oddrow">
+<div class="evenrow">
 
 	<div class="var-header">
 		<img src="../../media/images/Variable.png" />
 		<span class="var-title">
 			<span class="var-type">The</span>
 			<span class="var-name">$resourcetypes</span>
-						(line <span class="line-number">53</span>)
+						(line <span class="line-number">54</span>)
 		</span>
 	</div>
 
@@ -621,14 +633,14 @@
 
 </div>
 <a name="var$unique_tag" id="$unique_tag"><!-- --></A>
-<div class="evenrow">
+<div class="oddrow">
 
 	<div class="var-header">
 		<img src="../../media/images/Variable.png" />
 		<span class="var-title">
 			<span class="var-type">The</span>
 			<span class="var-name">$unique_tag</span>
-						(line <span class="line-number">38</span>)
+						(line <span class="line-number">39</span>)
 		</span>
 	</div>
 
@@ -660,11 +672,11 @@
 		<div class="info-box-body">
 			<A NAME='method_detail'></A>
 <a name="method__construct" id="__construct"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Constructor.png" />
-		<span class="method-title">Constructor __construct</span> (line <span class="line-number">146</span>)
+		<span class="method-title">Constructor __construct</span> (line <span class="line-number">147</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -687,11 +699,11 @@
 			
 	</div>
 <a name="methodbound_from" id="bound_from"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">bound_from</span> (line <span class="line-number">1138</span>)
+		<span class="method-title">bound_from</span> (line <span class="line-number">1161</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -709,11 +721,11 @@
 			
 	</div>
 <a name="methodBuildACE" id="BuildACE"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">BuildACE</span> (line <span class="line-number">1284</span>)
+		<span class="method-title">BuildACE</span> (line <span class="line-number">1315</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -742,11 +754,11 @@
 			
 	</div>
 <a name="methodBuildPrivileges" id="BuildPrivileges"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">BuildPrivileges</span> (line <span class="line-number">762</span>)
+		<span class="method-title">BuildPrivileges</span> (line <span class="line-number">773</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -772,11 +784,11 @@
 			
 	</div>
 <a name="methodBuildSupportedMethods" id="BuildSupportedMethods"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">BuildSupportedMethods</span> (line <span class="line-number">851</span>)
+		<span class="method-title">BuildSupportedMethods</span> (line <span class="line-number">862</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -794,11 +806,11 @@
 			
 	</div>
 <a name="methodBuildSupportedReports" id="BuildSupportedReports"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">BuildSupportedReports</span> (line <span class="line-number">903</span>)
+		<span class="method-title">BuildSupportedReports</span> (line <span class="line-number">914</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -821,11 +833,11 @@
 			
 	</div>
 <a name="methodBuildTicketinfo" id="BuildTicketinfo"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">BuildTicketinfo</span> (line <span class="line-number">964</span>)
+		<span class="method-title">BuildTicketinfo</span> (line <span class="line-number">975</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -855,11 +867,11 @@
 			
 	</div>
 <a name="methodcollection_id" id="collection_id"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">collection_id</span> (line <span class="line-number">1193</span>)
+		<span class="method-title">collection_id</span> (line <span class="line-number">1216</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -877,11 +889,11 @@
 			
 	</div>
 <a name="methodContainerExists" id="ContainerExists"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">ContainerExists</span> (line <span class="line-number">1106</span>)
+		<span class="method-title">ContainerExists</span> (line <span class="line-number">1129</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -899,11 +911,11 @@
 			
 	</div>
 <a name="methodContainerType" id="ContainerType"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">ContainerType</span> (line <span class="line-number">1250</span>)
+		<span class="method-title">ContainerType</span> (line <span class="line-number">1281</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -921,11 +933,11 @@
 			
 	</div>
 <a name="methodDAV_AllProperties" id="DAV_AllProperties"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">DAV_AllProperties</span> (line <span class="line-number">1413</span>)
+		<span class="method-title">DAV_AllProperties</span> (line <span class="line-number">1449</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -943,11 +955,11 @@
 			
 	</div>
 <a name="methoddav_name" id="dav_name"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">dav_name</span> (line <span class="line-number">1129</span>)
+		<span class="method-title">dav_name</span> (line <span class="line-number">1152</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -965,11 +977,11 @@
 			
 	</div>
 <a name="methodExists" id="Exists"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">Exists</span> (line <span class="line-number">1088</span>)
+		<span class="method-title">Exists</span> (line <span class="line-number">1111</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -987,11 +999,11 @@
 			
 	</div>
 <a name="methodFetchCollection" id="FetchCollection"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchCollection</span> (line <span class="line-number">470</span>)
+		<span class="method-title">FetchCollection</span> (line <span class="line-number">481</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1012,11 +1024,11 @@
 			
 	</div>
 <a name="methodFetchDeadProperties" id="FetchDeadProperties"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchDeadProperties</span> (line <span class="line-number">609</span>)
+		<span class="method-title">FetchDeadProperties</span> (line <span class="line-number">620</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1037,15 +1049,15 @@
 			
 	</div>
 <a name="methodFetchParentContainer" id="FetchParentContainer"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchParentContainer</span> (line <span class="line-number">704</span>)
+		<span class="method-title">FetchParentContainer</span> (line <span class="line-number">715</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
-<p class="short-description">Fetch the parent to this resource.</p>
+<p class="short-description">Fetch the parent to this resource. This is deprecated - use GetParentContainer() instead.</p>
 	
 	<div class="method-signature">
 		<span class="method-result">void</span>
@@ -1059,11 +1071,11 @@
 			
 	</div>
 <a name="methodFetchPrincipal" id="FetchPrincipal"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchPrincipal</span> (line <span class="line-number">557</span>)
+		<span class="method-title">FetchPrincipal</span> (line <span class="line-number">568</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1084,11 +1096,11 @@
 			
 	</div>
 <a name="methodFetchPrivileges" id="FetchPrivileges"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchPrivileges</span> (line <span class="line-number">627</span>)
+		<span class="method-title">FetchPrivileges</span> (line <span class="line-number">638</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1109,11 +1121,11 @@
 			
 	</div>
 <a name="methodFetchResource" id="FetchResource"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchResource</span> (line <span class="line-number">580</span>)
+		<span class="method-title">FetchResource</span> (line <span class="line-number">591</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1134,11 +1146,11 @@
 			
 	</div>
 <a name="methodFetchSupportedMethods" id="FetchSupportedMethods"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchSupportedMethods</span> (line <span class="line-number">774</span>)
+		<span class="method-title">FetchSupportedMethods</span> (line <span class="line-number">785</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1156,11 +1168,11 @@
 			
 	</div>
 <a name="methodFetchSupportedReports" id="FetchSupportedReports"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchSupportedReports</span> (line <span class="line-number">865</span>)
+		<span class="method-title">FetchSupportedReports</span> (line <span class="line-number">876</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1178,11 +1190,11 @@
 			
 	</div>
 <a name="methodFetchTickets" id="FetchTickets"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FetchTickets</span> (line <span class="line-number">919</span>)
+		<span class="method-title">FetchTickets</span> (line <span class="line-number">930</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1200,11 +1212,11 @@
 			
 	</div>
 <a name="methodFromPath" id="FromPath"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FromPath</span> (line <span class="line-number">301</span>)
+		<span class="method-title">FromPath</span> (line <span class="line-number">313</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1227,11 +1239,11 @@
 			
 	</div>
 <a name="methodFromRow" id="FromRow"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">FromRow</span> (line <span class="line-number">187</span>)
+		<span class="method-title">FromRow</span> (line <span class="line-number">188</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1254,11 +1266,11 @@
 			
 	</div>
 <a name="methodGetACL" id="GetACL"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetACL</span> (line <span class="line-number">1305</span>)
+		<span class="method-title">GetACL</span> (line <span class="line-number">1336</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1281,11 +1293,11 @@
 			
 	</div>
 <a name="methodGetParentContainer" id="GetParentContainer"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetParentContainer</span> (line <span class="line-number">685</span>)
+		<span class="method-title">GetParentContainer</span> (line <span class="line-number">696</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1303,11 +1315,11 @@
 			
 	</div>
 <a name="methodGetProperty" id="GetProperty"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetProperty</span> (line <span class="line-number">1337</span>)
+		<span class="method-title">GetProperty</span> (line <span class="line-number">1368</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1330,11 +1342,11 @@
 			
 	</div>
 <a name="methodGetPropStat" id="GetPropStat"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">GetPropStat</span> (line <span class="line-number">1724</span>)
+		<span class="method-title">GetPropStat</span> (line <span class="line-number">1765</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1366,11 +1378,11 @@
 			
 	</div>
 <a name="methodHavePrivilegeTo" id="HavePrivilegeTo"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">HavePrivilegeTo</span> (line <span class="line-number">725</span>)
+		<span class="method-title">HavePrivilegeTo</span> (line <span class="line-number">736</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1399,11 +1411,11 @@
 			
 	</div>
 <a name="methodIsAddressbook" id="IsAddressbook"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsAddressbook</span> (line <span class="line-number">1064</span>)
+		<span class="method-title">IsAddressbook</span> (line <span class="line-number">1087</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1421,11 +1433,11 @@
 			
 	</div>
 <a name="methodIsBinding" id="IsBinding"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsBinding</span> (line <span class="line-number">1072</span>)
+		<span class="method-title">IsBinding</span> (line <span class="line-number">1095</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1443,11 +1455,11 @@
 			
 	</div>
 <a name="methodIsCalendar" id="IsCalendar"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsCalendar</span> (line <span class="line-number">1044</span>)
+		<span class="method-title">IsCalendar</span> (line <span class="line-number">1055</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1465,11 +1477,11 @@
 			
 	</div>
 <a name="methodIsCollection" id="IsCollection"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsCollection</span> (line <span class="line-number">1028</span>)
+		<span class="method-title">IsCollection</span> (line <span class="line-number">1039</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1487,11 +1499,11 @@
 			
 	</div>
 <a name="methodIsExternal" id="IsExternal"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsExternal</span> (line <span class="line-number">1080</span>)
+		<span class="method-title">IsExternal</span> (line <span class="line-number">1103</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1508,12 +1520,39 @@
 		
 			
 	</div>
+<a name="methodIsInSchedulingCollection" id="IsInSchedulingCollection"><!-- --></a>
+<div class="evenrow">
+	
+	<div class="method-header">
+		<img src="../../media/images/Method.png" />
+		<span class="method-title">IsInSchedulingCollection</span> (line <span class="line-number">1076</span>)
+	</div> 
+	
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Checks whether this resource is IN a scheduling inbox/outbox collection</p>
+	
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			IsInSchedulingCollection
+		</span>
+					([<span class="var-type">string</span>&nbsp;<span class="var-name">$type</span> = <span class="var-default">'any'</span>])
+			</div>
+	
+			<ul class="parameters">
+					<li>
+				<span class="var-type">string</span>
+				<span class="var-name">$type</span><span class="var-description">: The type of scheduling collection, 'inbox', 'outbox' or 'any'</span>			</li>
+				</ul>
+		
+			
+	</div>
 <a name="methodIsLocked" id="IsLocked"><!-- --></a>
 <div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsLocked</span> (line <span class="line-number">996</span>)
+		<span class="method-title">IsLocked</span> (line <span class="line-number">1007</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1543,7 +1582,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsPrincipal</span> (line <span class="line-number">1036</span>)
+		<span class="method-title">IsPrincipal</span> (line <span class="line-number">1047</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1565,7 +1604,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsPublic</span> (line <span class="line-number">1242</span>)
+		<span class="method-title">IsPublic</span> (line <span class="line-number">1265</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1582,16 +1621,38 @@
 		
 			
 	</div>
-<a name="methodIsSchedulingCollection" id="IsSchedulingCollection"><!-- --></a>
+<a name="methodIsPublicOnly" id="IsPublicOnly"><!-- --></a>
 <div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">IsSchedulingCollection</span> (line <span class="line-number">1053</span>)
+		<span class="method-title">IsPublicOnly</span> (line <span class="line-number">1273</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
-<p class="short-description">Checks whether this resource is a calendar</p>
+<p class="short-description">Checks whether the target collection is for public events only</p>
+	
+	<div class="method-signature">
+		<span class="method-result">void</span>
+		<span class="method-name">
+			IsPublicOnly
+		</span>
+				()
+			</div>
+	
+		
+			
+	</div>
+<a name="methodIsSchedulingCollection" id="IsSchedulingCollection"><!-- --></a>
+<div class="oddrow">
+	
+	<div class="method-header">
+		<img src="../../media/images/Method.png" />
+		<span class="method-title">IsSchedulingCollection</span> (line <span class="line-number">1064</span>)
+	</div> 
+	
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Checks whether this resource is a scheduling inbox/outbox collection</p>
 	
 	<div class="method-signature">
 		<span class="method-result">void</span>
@@ -1604,17 +1665,17 @@
 			<ul class="parameters">
 					<li>
 				<span class="var-type">string</span>
-				<span class="var-name">$type</span><span class="var-description">: The type of scheduling collection, 'read', 'write' or 'any'</span>			</li>
+				<span class="var-name">$type</span><span class="var-description">: The type of scheduling collection, 'inbox', 'outbox' or 'any'</span>			</li>
 				</ul>
 		
 			
 	</div>
 <a name="methodNeedPrivilege" id="NeedPrivilege"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">NeedPrivilege</span> (line <span class="line-number">747</span>)
+		<span class="method-title">NeedPrivilege</span> (line <span class="line-number">758</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1640,11 +1701,11 @@
 			
 	</div>
 <a name="methodparent_path" id="parent_path"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">parent_path</span> (line <span class="line-number">1159</span>)
+		<span class="method-title">parent_path</span> (line <span class="line-number">1182</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1662,11 +1723,11 @@
 			
 	</div>
 <a name="methodprincipal_url" id="principal_url"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">principal_url</span> (line <span class="line-number">1175</span>)
+		<span class="method-title">principal_url</span> (line <span class="line-number">1198</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1684,11 +1745,11 @@
 			
 	</div>
 <a name="methodPrivileges" id="Privileges"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">Privileges</span> (line <span class="line-number">713</span>)
+		<span class="method-title">Privileges</span> (line <span class="line-number">724</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1706,11 +1767,11 @@
 			
 	</div>
 <a name="methodRenderAsXML" id="RenderAsXML"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">RenderAsXML</span> (line <span class="line-number">1782</span>)
+		<span class="method-title">RenderAsXML</span> (line <span class="line-number">1823</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1745,11 +1806,11 @@
 			
 	</div>
 <a name="methodresource" id="resource"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">resource</span> (line <span class="line-number">1202</span>)
+		<span class="method-title">resource</span> (line <span class="line-number">1225</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1767,11 +1828,11 @@
 			
 	</div>
 <a name="methodResourceProperty" id="ResourceProperty"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">ResourceProperty</span> (line <span class="line-number">1432</span>)
+		<span class="method-title">ResourceProperty</span> (line <span class="line-number">1468</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1803,11 +1864,11 @@
 			
 	</div>
 <a name="methodresource_id" id="resource_id"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">resource_id</span> (line <span class="line-number">1228</span>)
+		<span class="method-title">resource_id</span> (line <span class="line-number">1251</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1825,11 +1886,11 @@
 			
 	</div>
 <a name="methodset_bind_location" id="set_bind_location"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">set_bind_location</span> (line <span class="line-number">1147</span>)
+		<span class="method-title">set_bind_location</span> (line <span class="line-number">1170</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1852,11 +1913,11 @@
 			
 	</div>
 <a name="methodunique_tag" id="unique_tag"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">unique_tag</span> (line <span class="line-number">1211</span>)
+		<span class="method-title">unique_tag</span> (line <span class="line-number">1234</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1874,11 +1935,11 @@
 			
 	</div>
 <a name="methodurl" id="url"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">url</span> (line <span class="line-number">1118</span>)
+		<span class="method-title">url</span> (line <span class="line-number">1141</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1896,11 +1957,11 @@
 			
 	</div>
 <a name="methoduser_no" id="user_no"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">user_no</span> (line <span class="line-number">1184</span>)
+		<span class="method-title">user_no</span> (line <span class="line-number">1207</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -1923,7 +1984,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Resource/_inc---DAVResource.php.html davical-1.0.2/docs/api/davical/Resource/_inc---DAVResource.php.html
--- davical-0.9.9.7/docs/api/davical/Resource/_inc---DAVResource.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Resource/_inc---DAVResource.php.html	2012-01-13 10:44:54.000000000 +0000
@@ -70,7 +70,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_AwlCache_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -91,7 +91,7 @@
 	
 </div>
 <a name="_AwlQuery_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -105,6 +105,21 @@
 	<!-- ========== Info from phpDoc block ========= -->
 	
 </div>
+<a name="_DAVPrincipal_php"><!-- --></a>
+<div class="evenrow">
+	
+	<div>
+		<img src="../../media/images/Page.png" alt=" " />
+		<span class="include-title">
+			<span class="include-type">require_once</span>
+			(<span class="include-name"><a href="../../davical/Principal/_inc---DAVPrincipal.php.html">'DAVPrincipal.php'</a></span>)
+			(line <span class="line-number">14</span>)
+		</span>
+	</div>
+
+	<!-- ========== Info from phpDoc block ========= -->
+	
+</div>
 <a name="_DAVTicket_php"><!-- --></a>
 <div class="oddrow">
 	
@@ -113,7 +128,7 @@
 		<span class="include-title">
 			<span class="include-type">require_once</span>
 			(<span class="include-name"><a href="../../davical/DAVTicket/_inc---DAVTicket.php.html">'DAVTicket.php'</a></span>)
-			(line <span class="line-number">14</span>)
+			(line <span class="line-number">15</span>)
 		</span>
 	</div>
 
@@ -128,7 +143,7 @@
 		<span class="include-title">
 			<span class="include-type">require_once</span>
 			(<span class="include-name">'iCalendar.php'</span>)
-			(line <span class="line-number">15</span>)
+			(line <span class="line-number">16</span>)
 		</span>
 	</div>
 
@@ -142,7 +157,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:54 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/Resource/WritableCollection.html davical-1.0.2/docs/api/davical/Resource/WritableCollection.html
--- davical-0.9.9.7/docs/api/davical/Resource/WritableCollection.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/Resource/WritableCollection.html	2012-01-13 10:44:57.000000000 +0000
@@ -53,7 +53,25 @@
 		</div>
 		<div class="info-box-body">			
 			<div class="method-summary">
-																																<div class="method-definition">
+																																																								<div class="method-definition">
+					<img src="../../media/images/Method.png" alt=" "/>
+											<span class="method-result">boolean</span>
+										<a href="#actualDeleteCalendarMember" title="details" class="method-name">actualDeleteCalendarMember</a>
+											(<span class="var-type">vCalendar</span>&nbsp;<span class="var-name">$member_dav_name</span>)
+									</div>
+																<div class="method-definition">
+					<img src="../../media/images/Method.png" alt=" "/>
+											<span class="method-result">null</span>
+										<a href="#WriteCalendarAlarms" title="details" class="method-name">WriteCalendarAlarms</a>
+											(<span class="var-type"></span>&nbsp;<span class="var-name">$dav_id</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$vcal</span>)
+									</div>
+																<div class="method-definition">
+					<img src="../../media/images/Method.png" alt=" "/>
+											<span class="method-result">null</span>
+										<a href="#WriteCalendarAttendees" title="details" class="method-name">WriteCalendarAttendees</a>
+											(<span class="var-type">int</span>&nbsp;<span class="var-name">$dav_id</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$vcal</span>)
+									</div>
+																<div class="method-definition">
 					<img src="../../media/images/Method.png" alt=" "/>
 											<span class="method-result">string</span>
 										<a href="#WriteCalendarMember" title="details" class="method-name">WriteCalendarMember</a>
@@ -135,6 +153,96 @@
 		</div>
 		<div class="info-box-body">
 			<A NAME='method_detail'></A>
+<a name="methodactualDeleteCalendarMember" id="actualDeleteCalendarMember"><!-- --></a>
+<div class="oddrow">
+	
+	<div class="method-header">
+		<img src="../../media/images/Method.png" />
+		<span class="method-title">actualDeleteCalendarMember</span> (line <span class="line-number">412</span>)
+	</div> 
+	
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.</p>
+	<ul class="tags">
+				<li><span class="field">return:</span> Success is true, or false on failure.</li>
+			</ul>
+	
+	<div class="method-signature">
+		<span class="method-result">boolean</span>
+		<span class="method-name">
+			actualDeleteCalendarMember
+		</span>
+					(<span class="var-type">vCalendar</span>&nbsp;<span class="var-name">$member_dav_name</span>)
+			</div>
+	
+			<ul class="parameters">
+					<li>
+				<span class="var-type">vCalendar</span>
+				<span class="var-name">$member_dav_name</span><span class="var-description">: The path to the resource to be deleted.</span>			</li>
+				</ul>
+		
+			
+	</div>
+<a name="methodWriteCalendarAlarms" id="WriteCalendarAlarms"><!-- --></a>
+<div class="evenrow">
+	
+	<div class="method-header">
+		<img src="../../media/images/Method.png" />
+		<span class="method-title">WriteCalendarAlarms</span> (line <span class="line-number">312</span>)
+	</div> 
+	
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Given a dav_id and an original vCalendar, pull out each of the VALARMs  and write the values into the calendar_alarm table.</p>
+	
+	<div class="method-signature">
+		<span class="method-result">null</span>
+		<span class="method-name">
+			WriteCalendarAlarms
+		</span>
+					(<span class="var-type"></span>&nbsp;<span class="var-name">$dav_id</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$vcal</span>)
+			</div>
+	
+			<ul class="parameters">
+					<li>
+				<span class="var-type"></span>
+				<span class="var-name">$dav_id</span>			</li>
+					<li>
+				<span class="var-type">vCalendar</span>
+				<span class="var-name">$vcal</span>			</li>
+				</ul>
+		
+			
+	</div>
+<a name="methodWriteCalendarAttendees" id="WriteCalendarAttendees"><!-- --></a>
+<div class="oddrow">
+	
+	<div class="method-header">
+		<img src="../../media/images/Method.png" />
+		<span class="method-title">WriteCalendarAttendees</span> (line <span class="line-number">374</span>)
+	</div> 
+	
+	<!-- ========== Info from phpDoc block ========= -->
+<p class="short-description">Parse out the attendee property and write a row to the  calendar_attendee table for each one.</p>
+	
+	<div class="method-signature">
+		<span class="method-result">null</span>
+		<span class="method-name">
+			WriteCalendarAttendees
+		</span>
+					(<span class="var-type">int</span>&nbsp;<span class="var-name">$dav_id</span>, <span class="var-type"></span>&nbsp;<span class="var-name">$vcal</span>)
+			</div>
+	
+			<ul class="parameters">
+					<li>
+				<span class="var-type">int</span>
+				<span class="var-name">$dav_id</span><span class="var-description">: The dav_id of the caldav_data we're processing</span>			</li>
+					<li>
+				<span class="var-type">vComponent</span>
+				<span class="var-name">$vcal</span><span class="var-description">: The VEVENT or VTODO containing the ATTENDEEs</span>			</li>
+				</ul>
+		
+			
+	</div>
 <a name="methodWriteCalendarMember" id="WriteCalendarMember"><!-- --></a>
 <div class="evenrow">
 	
@@ -182,7 +290,7 @@
 	
 	<div class="method-header">
 		<img src="../../media/images/Method.png" />
-		<span class="method-title">WriteMember</span> (line <span class="line-number">301</span>)
+		<span class="method-title">WriteMember</span> (line <span class="line-number">286</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -291,12 +399,16 @@
 													<img src="../../media/images/Method.png" alt=" "/>
 							<span class="method-name"><a href="../../davical/Resource/DAVResource.html#methodIsExternal">DAVResource::IsExternal()</a></span><br>
 													<img src="../../media/images/Method.png" alt=" "/>
+							<span class="method-name"><a href="../../davical/Resource/DAVResource.html#methodIsInSchedulingCollection">DAVResource::IsInSchedulingCollection()</a></span><br>
+													<img src="../../media/images/Method.png" alt=" "/>
 							<span class="method-name"><a href="../../davical/Resource/DAVResource.html#methodIsLocked">DAVResource::IsLocked()</a></span><br>
 													<img src="../../media/images/Method.png" alt=" "/>
 							<span class="method-name"><a href="../../davical/Resource/DAVResource.html#methodIsPrincipal">DAVResource::IsPrincipal()</a></span><br>
 													<img src="../../media/images/Method.png" alt=" "/>
 							<span class="method-name"><a href="../../davical/Resource/DAVResource.html#methodIsPublic">DAVResource::IsPublic()</a></span><br>
 													<img src="../../media/images/Method.png" alt=" "/>
+							<span class="method-name"><a href="../../davical/Resource/DAVResource.html#methodIsPublicOnly">DAVResource::IsPublicOnly()</a></span><br>
+													<img src="../../media/images/Method.png" alt=" "/>
 							<span class="method-name"><a href="../../davical/Resource/DAVResource.html#methodIsSchedulingCollection">DAVResource::IsSchedulingCollection()</a></span><br>
 													<img src="../../media/images/Method.png" alt=" "/>
 							<span class="method-name"><a href="../../davical/Resource/DAVResource.html#methodNeedPrivilege">DAVResource::NeedPrivilege()</a></span><br>
@@ -329,7 +441,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/RRuleTest.html davical-1.0.2/docs/api/davical/RRuleTest.html
--- davical-0.9.9.7/docs/api/davical/RRuleTest.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/RRuleTest.html	2012-01-13 10:44:57.000000000 +0000
@@ -122,7 +122,7 @@
 		<div class="info-box-body">
 			
 <a name="var$description" id="$description"><!-- --></A>
-<div class="oddrow">
+<div class="evenrow">
 
 	<div class="var-header">
 		<img src="../media/images/Variable.png" />
@@ -141,7 +141,7 @@
 
 </div>
 <a name="var$dtstart" id="$dtstart"><!-- --></A>
-<div class="evenrow">
+<div class="oddrow">
 
 	<div class="var-header">
 		<img src="../media/images/Variable.png" />
@@ -160,7 +160,7 @@
 
 </div>
 <a name="var$recur" id="$recur"><!-- --></A>
-<div class="oddrow">
+<div class="evenrow">
 
 	<div class="var-header">
 		<img src="../media/images/Variable.png" />
@@ -179,7 +179,7 @@
 
 </div>
 <a name="var$result_description" id="$result_description"><!-- --></A>
-<div class="evenrow">
+<div class="oddrow">
 
 	<div class="var-header">
 		<img src="../media/images/Variable.png" />
@@ -213,7 +213,7 @@
 		<div class="info-box-body">
 			<A NAME='method_detail'></A>
 <a name="methodRRuleTest" id="RRuleTest"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Constructor.png" />
@@ -248,7 +248,7 @@
 			
 	</div>
 <a name="methodPHPTest" id="PHPTest"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -269,7 +269,7 @@
 			
 	</div>
 <a name="methodSQLTest" id="SQLTest"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -295,7 +295,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/SqlToArray.html davical-1.0.2/docs/api/davical/SqlToArray.html
--- davical-0.9.9.7/docs/api/davical/SqlToArray.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/SqlToArray.html	2012-01-13 10:44:57.000000000 +0000
@@ -117,7 +117,7 @@
 		<div class="info-box-body">
 			
 <a name="var$state" id="$state"><!-- --></A>
-<div class="evenrow">
+<div class="oddrow">
 
 	<div class="var-header">
 		<img src="../media/images/Variable.png" />
@@ -136,7 +136,7 @@
 
 </div>
 <a name="var$statement" id="$statement"><!-- --></A>
-<div class="oddrow">
+<div class="evenrow">
 
 	<div class="var-header">
 		<img src="../media/images/Variable.png" />
@@ -155,7 +155,7 @@
 
 </div>
 <a name="var$statements" id="$statements"><!-- --></A>
-<div class="evenrow">
+<div class="oddrow">
 
 	<div class="var-header">
 		<img src="../media/images/Variable.png" />
@@ -189,7 +189,7 @@
 		<div class="info-box-body">
 			<A NAME='method_detail'></A>
 <a name="method__construct" id="__construct"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Constructor.png" />
@@ -215,7 +215,7 @@
 			
 	</div>
 <a name="methoddoNormalLine" id="doNormalLine"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -241,7 +241,7 @@
 			
 	</div>
 <a name="methodgetStatements" id="getStatements"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -267,7 +267,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:56 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/tzservice/_htdocs---tz.php.html davical-1.0.2/docs/api/davical/tzservice/_htdocs---tz.php.html
--- davical-0.9.9.7/docs/api/davical/tzservice/_htdocs---tz.php.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/tzservice/_htdocs---tz.php.html	2012-01-13 10:44:57.000000000 +0000
@@ -40,7 +40,7 @@
 														</div>
 		<div class="info-box-body">	
 			<a name="_$code_file"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -55,7 +55,7 @@
 	
 </div>
 <a name="__/always_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -76,7 +76,7 @@
 	
 </div>
 <a name="_PublicSession_php"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -91,7 +91,7 @@
 	
 </div>
 <a name="_CalDAVRequest_php"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div>
 		<img src="../../media/images/Page.png" alt=" " />
@@ -112,7 +112,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/tzservice/_inc---tz---capabilities.php.html davical-1.0.2/docs/api/davical/tzservice/_inc---tz---capabilities.php.html
--- davical-0.9.9.7/docs/api/davical/tzservice/_inc---tz---capabilities.php.html	2011-10-24 07:09:27.000000000 +0000
+++ davical-1.0.2/docs/api/davical/tzservice/_inc---tz---capabilities.php.html	2012-01-13 10:44:53.000000000 +0000
@@ -34,7 +34,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:27 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:53 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/tzservice/_inc---tz---expand.php.html davical-1.0.2/docs/api/davical/tzservice/_inc---tz---expand.php.html
--- davical-0.9.9.7/docs/api/davical/tzservice/_inc---tz---expand.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/tzservice/_inc---tz---expand.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -163,7 +163,7 @@
 	</div>
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/tzservice/_inc---tz---get.php.html davical-1.0.2/docs/api/davical/tzservice/_inc---tz---get.php.html
--- davical-0.9.9.7/docs/api/davical/tzservice/_inc---tz---get.php.html	2011-10-24 07:09:28.000000000 +0000
+++ davical-1.0.2/docs/api/davical/tzservice/_inc---tz---get.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -67,7 +67,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:28 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/tzservice/_inc---tz---list.php.html davical-1.0.2/docs/api/davical/tzservice/_inc---tz---list.php.html
--- davical-0.9.9.7/docs/api/davical/tzservice/_inc---tz---list.php.html	2011-10-24 07:09:29.000000000 +0000
+++ davical-1.0.2/docs/api/davical/tzservice/_inc---tz---list.php.html	2012-01-13 10:44:55.000000000 +0000
@@ -67,7 +67,7 @@
 	
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:29 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:55 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/davical/VCard.html davical-1.0.2/docs/api/davical/VCard.html
--- davical-0.9.9.7/docs/api/davical/VCard.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/davical/VCard.html	2012-01-13 10:44:57.000000000 +0000
@@ -88,7 +88,7 @@
 		<div class="info-box-body">
 			<A NAME='method_detail'></A>
 <a name="methodWrite" id="Write"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -117,7 +117,7 @@
 			
 	</div>
 <a name="methodWriteAddresses" id="WriteAddresses"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
@@ -143,11 +143,11 @@
 			
 	</div>
 <a name="methodWriteEmails" id="WriteEmails"><!-- --></a>
-<div class="evenrow">
+<div class="oddrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
-		<span class="method-title">WriteEmails</span> (line <span class="line-number">149</span>)
+		<span class="method-title">WriteEmails</span> (line <span class="line-number">153</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -169,11 +169,11 @@
 			
 	</div>
 <a name="methodWritePhones" id="WritePhones"><!-- --></a>
-<div class="oddrow">
+<div class="evenrow">
 	
 	<div class="method-header">
 		<img src="../media/images/Method.png" />
-		<span class="method-title">WritePhones</span> (line <span class="line-number">120</span>)
+		<span class="method-title">WritePhones</span> (line <span class="line-number">122</span>)
 	</div> 
 	
 	<!-- ========== Info from phpDoc block ========= -->
@@ -200,7 +200,7 @@
 
 	
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</div></body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/elementindex_davical.html davical-1.0.2/docs/api/elementindex_davical.html
--- davical-0.9.9.7/docs/api/elementindex_davical.html	2011-10-24 07:09:24.000000000 +0000
+++ davical-1.0.2/docs/api/elementindex_davical.html	2012-01-13 10:44:51.000000000 +0000
@@ -409,6 +409,14 @@
 			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodAllowedTo">CalDAVRequest::AllowedTo()</a> in CalDAVRequest.php</div>
 							<div class="index-item-description">Are we allowed to do the requested activity</div>
 					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">actualDeleteCalendarMember</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/WritableCollection.html#methodactualDeleteCalendarMember">WritableCollection::actualDeleteCalendarMember()</a> in WritableCollection.php</div>
+							<div class="index-item-description">Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.</div>
+					</dd>
 		</dl>
 	<a name="b"></a>
 	<div class="index-letter-section">
@@ -592,6 +600,13 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">check_curl</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/_htdocs---setup.php.html#functioncheck_curl">check_curl()</a> in setup.php</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">check_datetime</span>
 					</dt>
 		<dd class="index-item-body">
@@ -670,6 +685,13 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">check_real_php</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/_htdocs---setup.php.html#functioncheck_real_php">check_real_php()</a> in setup.php</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">check_schema_version</span>
 					</dt>
 		<dd class="index-item-body">
@@ -842,14 +864,6 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
-			<span class="method-title">calendar_to_xml</span>
-					</dt>
-		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-REPORT.php.html#functioncalendar_to_xml">calendar_to_xml()</a> in caldav-REPORT.php</div>
-							<div class="index-item-description">Return XML for a single calendar (or todo) entry from the DB</div>
-					</dd>
-			<dt class="field">
-						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">component_to_xml</span>
 					</dt>
 		<dd class="index-item-body">
@@ -1269,6 +1283,14 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">deliverItipCancel</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functiondeliverItipCancel">deliverItipCancel()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Delivers the iTIP CANCEL message to an ATTENDEE's Scheduling Inbox Collection.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">display_status</span>
 					</dt>
 		<dd class="index-item-body">
@@ -1277,6 +1299,30 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">doItipAttendeeReply</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functiondoItipAttendeeReply">doItipAttendeeReply()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Do the scheduling adjustments for a REPLY when an ATTENDEE updates their status.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">doItipOrganizerCancel</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functiondoItipOrganizerCancel">doItipOrganizerCancel()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Handles sending the iTIP CANCEL messages to each ATTENDEE by the ORGANIZER.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">do_scheduling_for_delete</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functiondo_scheduling_for_delete">do_scheduling_for_delete()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Entry point for scheduling on DELETE, for which there are thee outcomes: <ul><li>We don't do scheduling (disabled, no organizer, ...)</li><li>We are an ATTENDEE declining the meeting.</li></ul></div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">do_scheduling_reply</span>
 					</dt>
 		<dd class="index-item-body">
@@ -1803,7 +1849,7 @@
 					</dt>
 		<dd class="index-item-body">
 			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodFetchParentContainer">DAVResource::FetchParentContainer()</a> in DAVResource.php</div>
-							<div class="index-item-description">Fetch the parent to this resource.</div>
+							<div class="index-item-description">Fetch the parent to this resource. This is deprecated - use GetParentContainer() instead.</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -2007,6 +2053,13 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">GetItip</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functionGetItip">GetItip()</a> in schedule-functions.php</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">GetTZID</span>
 					</dt>
 		<dd class="index-item-body">
@@ -2326,11 +2379,27 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">import_addressbook_collection</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_addressbook_collection">import_addressbook_collection()</a> in caldav-PUT-functions.php</div>
+							<div class="index-item-description">This function will import a whole calendar</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">import_calendar_collection</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_calendar_collection">import_calendar_collection()</a> in caldav-PUT-functions.php</div>
+							<div class="index-item-description">This function will import a whole calendar</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">import_collection</span>
 					</dt>
 		<dd class="index-item-body">
 			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_collection">import_collection()</a> in caldav-PUT-functions.php</div>
-							<div class="index-item-description">This function will import a whole calendar</div>
+							<div class="index-item-description">This function will import a whole collection</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -2534,6 +2603,14 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">IsInSchedulingCollection</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsInSchedulingCollection">DAVResource::IsInSchedulingCollection()</a> in DAVResource.php</div>
+							<div class="index-item-description">Checks whether this resource is IN a scheduling inbox/outbox collection</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">IsLocked</span>
 					</dt>
 		<dd class="index-item-body">
@@ -2558,11 +2635,19 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">IsPublicOnly</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsPublicOnly">DAVResource::IsPublicOnly()</a> in DAVResource.php</div>
+							<div class="index-item-description">Checks whether the target collection is for public events only</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">IsSchedulingCollection</span>
 					</dt>
 		<dd class="index-item-body">
 			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsSchedulingCollection">DAVResource::IsSchedulingCollection()</a> in DAVResource.php</div>
-							<div class="index-item-description">Checks whether this resource is a calendar</div>
+							<div class="index-item-description">Checks whether this resource is a scheduling inbox/outbox collection</div>
 					</dd>
 		</dl>
 	<a name="l"></a>
@@ -2860,6 +2945,14 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">processItipCancel</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functionprocessItipCancel">processItipCancel()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Does the actual processing of the iTIP CANCEL message on behalf of an ATTENDEE,  which generally means writing it into the ATTENDEE's default calendar.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">process_ace</span>
 					</dt>
 		<dd class="index-item-body">
@@ -3478,6 +3571,13 @@
 			<div class="index-item-details"><a href="davical/SqlToArray.html">SqlToArray</a> in SqlToArray.php</div>
 					</dd>
 			<dt class="field">
+						<img src="media/images/Page.png" alt="Page" title="Page" />
+			<span class="include-title">schedule-functions.php</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html">schedule-functions.php</a> in schedule-functions.php</div>
+					</dd>
+			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">send_dav_header</span>
 					</dt>
@@ -3989,6 +4089,22 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">WriteCalendarAlarms</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/WritableCollection.html#methodWriteCalendarAlarms">WritableCollection::WriteCalendarAlarms()</a> in WritableCollection.php</div>
+							<div class="index-item-description">Given a dav_id and an original vCalendar, pull out each of the VALARMs  and write the values into the calendar_alarm table.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">WriteCalendarAttendees</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/WritableCollection.html#methodWriteCalendarAttendees">WritableCollection::WriteCalendarAttendees()</a> in WritableCollection.php</div>
+							<div class="index-item-description">Parse out the attendee property and write a row to the  calendar_attendee table for each one.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">WriteCalendarMember</span>
 					</dt>
 		<dd class="index-item-body">
diff -Nru davical-0.9.9.7/docs/api/elementindex.html davical-1.0.2/docs/api/elementindex.html
--- davical-0.9.9.7/docs/api/elementindex.html	2011-10-24 07:09:24.000000000 +0000
+++ davical-1.0.2/docs/api/elementindex.html	2012-01-13 10:44:51.000000000 +0000
@@ -59,10 +59,11 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
-			<span class="method-title">addAuthor</span>
+			<span class="method-title">actualDeleteCalendarMember</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomEntry.html#methodaddAuthor">AtomEntry::addAuthor()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="davical/Resource/WritableCollection.html#methodactualDeleteCalendarMember">WritableCollection::actualDeleteCalendarMember()</a> in WritableCollection.php</div>
+							<div class="index-item-description">Writes the data to a member in the collection and returns the segment_name of the  resource in our internal namespace.</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -73,6 +74,13 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">addAuthor</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/AtomEntry.html#methodaddAuthor">AtomEntry::addAuthor()</a> in AtomFeed.php</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">addCategory</span>
 					</dt>
 		<dd class="index-item-body">
@@ -144,23 +152,23 @@
 			<span class="method-title">AllowedTo</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodAllowedTo">CalDAVRequest::AllowedTo()</a> in CalDAVRequest.php</div>
-							<div class="index-item-description">Are we allowed to do the requested activity</div>
+			<div class="index-item-details"><a href="davical/PublicSession/PublicSession.html#methodAllowedTo">PublicSession::AllowedTo()</a> in PublicSession.php</div>
+							<div class="index-item-description">Checks whether a user is allowed to do something.</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">AllowedTo</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/HTTPAuthSession/HTTPAuthSession.html#methodAllowedTo">HTTPAuthSession::AllowedTo()</a> in HTTPAuthSession.php</div>
-							<div class="index-item-description">Checks whether a user is allowed to do something.</div>
+			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodAllowedTo">CalDAVRequest::AllowedTo()</a> in CalDAVRequest.php</div>
+							<div class="index-item-description">Are we allowed to do the requested activity</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">AllowedTo</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/PublicSession/PublicSession.html#methodAllowedTo">PublicSession::AllowedTo()</a> in PublicSession.php</div>
+			<div class="index-item-details"><a href="davical/HTTPAuthSession/HTTPAuthSession.html#methodAllowedTo">HTTPAuthSession::AllowedTo()</a> in HTTPAuthSession.php</div>
 							<div class="index-item-description">Checks whether a user is allowed to do something.</div>
 					</dd>
 			<dt class="field">
@@ -207,7 +215,7 @@
 			<span class="method-title">AssignSessionDetails</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/DAViCalSession/DAViCalSession.html#methodAssignSessionDetails">DAViCalSession::AssignSessionDetails()</a> in DAViCalSession.php</div>
+			<div class="index-item-details"><a href="davical/HTTPAuthSession/HTTPAuthSession.html#methodAssignSessionDetails">HTTPAuthSession::AssignSessionDetails()</a> in HTTPAuthSession.php</div>
 							<div class="index-item-description">Internal function used to assign the session details to a user's new session.</div>
 					</dd>
 			<dt class="field">
@@ -215,7 +223,7 @@
 			<span class="method-title">AssignSessionDetails</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/HTTPAuthSession/HTTPAuthSession.html#methodAssignSessionDetails">HTTPAuthSession::AssignSessionDetails()</a> in HTTPAuthSession.php</div>
+			<div class="index-item-details"><a href="davical/DAViCalSession/DAViCalSession.html#methodAssignSessionDetails">DAViCalSession::AssignSessionDetails()</a> in DAViCalSession.php</div>
 							<div class="index-item-description">Internal function used to assign the session details to a user's new session.</div>
 					</dd>
 			<dt class="field">
@@ -555,14 +563,6 @@
 			<div class="index-item-details"><a href="davical/Principal/Principal.html#methodcacheFlush">Principal::cacheFlush()</a> in Principal.php</div>
 					</dd>
 			<dt class="field">
-						<img src="media/images/Class.png" alt="Class" title="Class" />
-			CalDAVClient
-					</dt>
-		<dd class="index-item-body">
-			<div class="index-item-details"><a href="awl/caldav/CalDAVClient.html">CalDAVClient</a> in caldav-client.php</div>
-							<div class="index-item-description">A class for accessing DAViCal via CalDAV, as a client</div>
-					</dd>
-			<dt class="field">
 						<img src="media/images/Constructor.png" alt="Method" title="Method" />
 			<span class="method-title">CalDAVClient</span>
 					</dt>
@@ -572,6 +572,14 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Class.png" alt="Class" title="Class" />
+			CalDAVClient
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="awl/caldav/CalDAVClient.html">CalDAVClient</a> in caldav-client.php</div>
+							<div class="index-item-description">A class for accessing DAViCal via CalDAV, as a client</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Class.png" alt="Class" title="Class" />
 			CalDAVRequest
 					</dt>
 		<dd class="index-item-body">
@@ -610,14 +618,6 @@
 							<div class="index-item-description">Get the calendar_home_set, as lazily as possible</div>
 					</dd>
 			<dt class="field">
-						<img src="media/images/Function.png" alt="Function" title="Function" />
-			<span class="method-title">calendar_to_xml</span>
-					</dt>
-		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-REPORT.php.html#functioncalendar_to_xml">calendar_to_xml()</a> in caldav-REPORT.php</div>
-							<div class="index-item-description">Return XML for a single calendar (or todo) entry from the DB</div>
-					</dd>
-			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">CheckPassword</span>
 					</dt>
@@ -648,6 +648,13 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">check_curl</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/_htdocs---setup.php.html#functioncheck_curl">check_curl()</a> in setup.php</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">check_datetime</span>
 					</dt>
 		<dd class="index-item-body">
@@ -726,6 +733,13 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">check_real_php</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/_htdocs---setup.php.html#functioncheck_real_php">check_real_php()</a> in setup.php</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">check_schema_version</span>
 					</dt>
 		<dd class="index-item-body">
@@ -1361,19 +1375,19 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
-			<span class="method-title">DaysInMonth</span>
+			<span class="method-title">daysInMonth</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="awl/caldav/iCalDate.html#methodDaysInMonth">iCalDate::DaysInMonth()</a> in RRule.php</div>
-							<div class="index-item-description">No of days in a month 1(Jan) - 12(Dec)</div>
+			<div class="index-item-details"><a href="awl/caldav/RepeatRuleDateTime.html#methoddaysInMonth">RepeatRuleDateTime::daysInMonth()</a> in RRule-v2.php</div>
+							<div class="index-item-description">Returns the number of days in a year/month pair</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
-			<span class="method-title">daysInMonth</span>
+			<span class="method-title">DaysInMonth</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="awl/caldav/RepeatRuleDateTime.html#methoddaysInMonth">RepeatRuleDateTime::daysInMonth()</a> in RRule-v2.php</div>
-							<div class="index-item-description">Returns the number of days in a year/month pair</div>
+			<div class="index-item-details"><a href="awl/caldav/iCalDate.html#methodDaysInMonth">iCalDate::DaysInMonth()</a> in RRule.php</div>
+							<div class="index-item-description">No of days in a month 1(Jan) - 12(Dec)</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Constant.png" alt="Constant" title="Constant" />
@@ -1413,6 +1427,14 @@
 			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-DELETE.php.html#functiondelete_collection">delete_collection()</a> in caldav-DELETE.php</div>
 					</dd>
 			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">deliverItipCancel</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functiondeliverItipCancel">deliverItipCancel()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Delivers the iTIP CANCEL message to an ATTENDEE's Scheduling Inbox Collection.</div>
+					</dd>
+			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">DepthRegexTail</span>
 					</dt>
@@ -1468,6 +1490,22 @@
 							<div class="index-item-description">Get a single item from the server.</div>
 					</dd>
 			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">doItipAttendeeReply</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functiondoItipAttendeeReply">doItipAttendeeReply()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Do the scheduling adjustments for a REPLY when an ATTENDEE updates their status.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">doItipOrganizerCancel</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functiondoItipOrganizerCancel">doItipOrganizerCancel()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Handles sending the iTIP CANCEL messages to each ATTENDEE by the ORGANIZER.</div>
+					</dd>
+			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">doNormalLine</span>
 					</dt>
@@ -1523,6 +1561,14 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">do_scheduling_for_delete</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functiondo_scheduling_for_delete">do_scheduling_for_delete()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Entry point for scheduling on DELETE, for which there are thee outcomes: <ul><li>We don't do scheduling (disabled, no organizer, ...)</li><li>We are an ATTENDEE declining the meeting.</li></ul></div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">do_scheduling_reply</span>
 					</dt>
 		<dd class="index-item-body">
@@ -1882,7 +1928,7 @@
 					</dt>
 		<dd class="index-item-body">
 			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodFetchParentContainer">DAVResource::FetchParentContainer()</a> in DAVResource.php</div>
-							<div class="index-item-description">Fetch the parent to this resource.</div>
+							<div class="index-item-description">Fetch the parent to this resource. This is deprecated - use GetParentContainer() instead.</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -2134,6 +2180,13 @@
 							<div class="index-item-description">Output http response headers</div>
 					</dd>
 			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">GetItip</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functionGetItip">GetItip()</a> in schedule-functions.php</div>
+					</dd>
+			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">GetLockDetails</span>
 					</dt>
@@ -2200,16 +2253,16 @@
 			<span class="method-title">GetProperty</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodGetProperty">DAVResource::GetProperty()</a> in DAVResource.php</div>
-							<div class="index-item-description">Return general server-related properties, in plain form</div>
+			<div class="index-item-details"><a href="davical/Principal/DAVPrincipal.html#methodGetProperty">DAVPrincipal::GetProperty()</a> in DAVPrincipal.php</div>
+							<div class="index-item-description">Return an arbitrary property</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">GetProperty</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Principal/DAVPrincipal.html#methodGetProperty">DAVPrincipal::GetProperty()</a> in DAVPrincipal.php</div>
-							<div class="index-item-description">Return an arbitrary property</div>
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodGetProperty">DAVResource::GetProperty()</a> in DAVResource.php</div>
+							<div class="index-item-description">Return general server-related properties, in plain form</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -2641,14 +2694,6 @@
 							<div class="index-item-description">todo work out something more than true/false returns for dependency checks</div>
 					</dd>
 			<dt class="field">
-						<img src="media/images/Class.png" alt="Class" title="Class" />
-			iCalDate
-					</dt>
-		<dd class="index-item-body">
-			<div class="index-item-details"><a href="awl/caldav/iCalDate.html">iCalDate</a> in RRule.php</div>
-							<div class="index-item-description">A Class for handling dates in iCalendar format.  We do make the simplifying assumption  that all date handling in here is normalised to GMT.  One day we might provide some  functions to do that, but for now it is done externally.</div>
-					</dd>
-			<dt class="field">
 						<img src="media/images/Constructor.png" alt="Method" title="Method" />
 			<span class="method-title">iCalDate</span>
 					</dt>
@@ -2657,6 +2702,14 @@
 							<div class="index-item-description">The constructor takes either an iCalendar date, a text string formatted as  an iCalendar date, or epoch seconds.</div>
 					</dd>
 			<dt class="field">
+						<img src="media/images/Class.png" alt="Class" title="Class" />
+			iCalDate
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="awl/caldav/iCalDate.html">iCalDate</a> in RRule.php</div>
+							<div class="index-item-description">A Class for handling dates in iCalendar format.  We do make the simplifying assumption  that all date handling in here is normalised to GMT.  One day we might provide some  functions to do that, but for now it is done externally.</div>
+					</dd>
+			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">id</span>
 					</dt>
@@ -2695,11 +2748,27 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">import_addressbook_collection</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_addressbook_collection">import_addressbook_collection()</a> in caldav-PUT-functions.php</div>
+							<div class="index-item-description">This function will import a whole calendar</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">import_calendar_collection</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_calendar_collection">import_calendar_collection()</a> in caldav-PUT-functions.php</div>
+							<div class="index-item-description">This function will import a whole calendar</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">import_collection</span>
 					</dt>
 		<dd class="index-item-body">
 			<div class="index-item-details"><a href="davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_collection">import_collection()</a> in caldav-PUT-functions.php</div>
-							<div class="index-item-description">This function will import a whole calendar</div>
+							<div class="index-item-description">This function will import a whole collection</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Page.png" alt="Page" title="Page" />
@@ -2732,19 +2801,19 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
-			<span class="method-title">IsAddressBook</span>
+			<span class="method-title">IsAddressbook</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodIsAddressBook">CalDAVRequest::IsAddressBook()</a> in CalDAVRequest.php</div>
-							<div class="index-item-description">Returns true if the URL referenced by this request points at an addressbook collection.</div>
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsAddressbook">DAVResource::IsAddressbook()</a> in DAVResource.php</div>
+							<div class="index-item-description">Checks whether this resource is an addressbook</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
-			<span class="method-title">IsAddressbook</span>
+			<span class="method-title">IsAddressBook</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsAddressbook">DAVResource::IsAddressbook()</a> in DAVResource.php</div>
-							<div class="index-item-description">Checks whether this resource is an addressbook</div>
+			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodIsAddressBook">CalDAVRequest::IsAddressBook()</a> in CalDAVRequest.php</div>
+							<div class="index-item-description">Returns true if the URL referenced by this request points at an addressbook collection.</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -2759,16 +2828,16 @@
 			<span class="method-title">IsCalendar</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsCalendar">DAVResource::IsCalendar()</a> in DAVResource.php</div>
-							<div class="index-item-description">Checks whether this resource is a calendar</div>
+			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodIsCalendar">CalDAVRequest::IsCalendar()</a> in CalDAVRequest.php</div>
+							<div class="index-item-description">Returns true if the URL referenced by this request points at a calendar collection.</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">IsCalendar</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodIsCalendar">CalDAVRequest::IsCalendar()</a> in CalDAVRequest.php</div>
-							<div class="index-item-description">Returns true if the URL referenced by this request points at a calendar collection.</div>
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsCalendar">DAVResource::IsCalendar()</a> in DAVResource.php</div>
+							<div class="index-item-description">Checks whether this resource is a calendar</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Class.png" alt="Class" title="Class" />
@@ -2841,6 +2910,14 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">IsInSchedulingCollection</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsInSchedulingCollection">DAVResource::IsInSchedulingCollection()</a> in DAVResource.php</div>
+							<div class="index-item-description">Checks whether this resource is IN a scheduling inbox/outbox collection</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">IsLocked</span>
 					</dt>
 		<dd class="index-item-body">
@@ -2905,11 +2982,19 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">IsPublicOnly</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsPublicOnly">DAVResource::IsPublicOnly()</a> in DAVResource.php</div>
+							<div class="index-item-description">Checks whether the target collection is for public events only</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">IsSchedulingCollection</span>
 					</dt>
 		<dd class="index-item-body">
 			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodIsSchedulingCollection">DAVResource::IsSchedulingCollection()</a> in DAVResource.php</div>
-							<div class="index-item-description">Checks whether this resource is a calendar</div>
+							<div class="index-item-description">Checks whether this resource is a scheduling inbox/outbox collection</div>
 					</dd>
 		</dl>
 	<a name="k"></a>
@@ -3243,15 +3328,15 @@
 			<span class="var-title">$privileges</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#var$privileges">CalDAVRequest::$privileges</a> in CalDAVRequest.php</div>
-							<div class="index-item-description">The decimal privileges allowed by this user to the identified resource.</div>
+			<div class="index-item-details"><a href="davical/Principal/Principal.html#var$privileges">Principal::$privileges</a> in Principal.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Variable.png" alt="Variable" title="Variable" />
 			<span class="var-title">$privileges</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Principal/Principal.html#var$privileges">Principal::$privileges</a> in Principal.php</div>
+			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#var$privileges">CalDAVRequest::$privileges</a> in CalDAVRequest.php</div>
+							<div class="index-item-description">The decimal privileges allowed by this user to the identified resource.</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Variable.png" alt="Variable" title="Variable" />
@@ -3444,7 +3529,7 @@
 			<span class="method-title">Privileges</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodPrivileges">CalDAVRequest::Privileges()</a> in CalDAVRequest.php</div>
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodPrivileges">DAVResource::Privileges()</a> in DAVResource.php</div>
 							<div class="index-item-description">Return the privileges bits for the current session user to this resource</div>
 					</dd>
 			<dt class="field">
@@ -3452,7 +3537,7 @@
 			<span class="method-title">Privileges</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#methodPrivileges">DAVResource::Privileges()</a> in DAVResource.php</div>
+			<div class="index-item-details"><a href="davical/Request/CalDAVRequest.html#methodPrivileges">CalDAVRequest::Privileges()</a> in CalDAVRequest.php</div>
 							<div class="index-item-description">Return the privileges bits for the current session user to this resource</div>
 					</dd>
 			<dt class="field">
@@ -3488,6 +3573,14 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
+			<span class="method-title">processItipCancel</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html#functionprocessItipCancel">processItipCancel()</a> in schedule-functions.php</div>
+							<div class="index-item-description">Does the actual processing of the iTIP CANCEL message on behalf of an ATTENDEE,  which generally means writing it into the ATTENDEE's default calendar.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">process_ace</span>
 					</dt>
 		<dd class="index-item-body">
@@ -3518,14 +3611,6 @@
 							<div class="index-item-description">Accessor for read or write proxy</div>
 					</dd>
 			<dt class="field">
-						<img src="media/images/Class.png" alt="Class" title="Class" />
-			PublicSession
-					</dt>
-		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/PublicSession/PublicSession.html">PublicSession</a> in PublicSession.php</div>
-							<div class="index-item-description">A Class for handling a public (anonymous) session</div>
-					</dd>
-			<dt class="field">
 						<img src="media/images/Constructor.png" alt="Method" title="Method" />
 			<span class="method-title">PublicSession</span>
 					</dt>
@@ -3534,6 +3619,14 @@
 							<div class="index-item-description">The constructor, which just calls the actual type configured</div>
 					</dd>
 			<dt class="field">
+						<img src="media/images/Class.png" alt="Class" title="Class" />
+			PublicSession
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/PublicSession/PublicSession.html">PublicSession</a> in PublicSession.php</div>
+							<div class="index-item-description">A Class for handling a public (anonymous) session</div>
+					</dd>
+			<dt class="field">
 						<img src="media/images/Function.png" alt="Function" title="Function" />
 			<span class="method-title">public_events_only</span>
 					</dt>
@@ -3598,14 +3691,14 @@
 			<span class="var-title">$resourcetypes</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#var$resourcetypes">DAVResource::$resourcetypes</a> in DAVResource.php</div>
+			<div class="index-item-details"><a href="davical/Principal/Principal.html#var$resourcetypes">Principal::$resourcetypes</a> in Principal.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Variable.png" alt="Variable" title="Variable" />
 			<span class="var-title">$resourcetypes</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/Principal/Principal.html#var$resourcetypes">Principal::$resourcetypes</a> in Principal.php</div>
+			<div class="index-item-details"><a href="davical/Resource/DAVResource.html#var$resourcetypes">DAVResource::$resourcetypes</a> in DAVResource.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Variable.png" alt="Variable" title="Variable" />
@@ -3653,25 +3746,25 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
-			<span class="method-title">render</span>
+			<span class="method-title">Render</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/DAViCalSession/Tools.html#methodrender">Tools::render()</a> in tools.php</div>
+			<div class="index-item-details"><a href="awl/caldav/iCalDate.html#methodRender">iCalDate::Render()</a> in RRule.php</div>
+							<div class="index-item-description">Set the day of week used for calculation of week starts</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">Render</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="awl/caldav/iCalDate.html#methodRender">iCalDate::Render()</a> in RRule.php</div>
-							<div class="index-item-description">Set the day of week used for calculation of week starts</div>
+			<div class="index-item-details"><a href="davical/AtomXHTMLContent.html#methodRender">AtomXHTMLContent::Render()</a> in AtomFeed.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
-			<span class="method-title">Render</span>
+			<span class="method-title">render</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomXHTMLContent.html#methodRender">AtomXHTMLContent::Render()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="davical/DAViCalSession/Tools.html#methodrender">Tools::render()</a> in tools.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -3943,6 +4036,13 @@
 			<div class="index-item-details"><a href="davical/_htdocs---SqlToArray.php.html">SqlToArray.php</a> in SqlToArray.php</div>
 					</dd>
 			<dt class="field">
+						<img src="media/images/Page.png" alt="Page" title="Page" />
+			<span class="include-title">schedule-functions.php</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/caldav/_inc---schedule-functions.php.html">schedule-functions.php</a> in schedule-functions.php</div>
+					</dd>
+			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">second</span>
 					</dt>
@@ -4004,14 +4104,14 @@
 			<span class="method-title">setDate</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomEntry.html#methodsetDate">AtomEntry::setDate()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="awl/caldav/RepeatRuleDateTime.html#methodsetDate">RepeatRuleDateTime::setDate()</a> in RRule-v2.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">setDate</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="awl/caldav/RepeatRuleDateTime.html#methodsetDate">RepeatRuleDateTime::setDate()</a> in RRule-v2.php</div>
+			<div class="index-item-details"><a href="davical/AtomEntry.html#methodsetDate">AtomEntry::setDate()</a> in AtomFeed.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -4025,14 +4125,14 @@
 			<span class="method-title">setDateModified</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomEntry.html#methodsetDateModified">AtomEntry::setDateModified()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="davical/AtomFeed.html#methodsetDateModified">AtomFeed::setDateModified()</a> in AtomFeed.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">setDateModified</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomFeed.html#methodsetDateModified">AtomFeed::setDateModified()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="davical/AtomEntry.html#methodsetDateModified">AtomEntry::setDateModified()</a> in AtomFeed.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -4053,14 +4153,14 @@
 			<span class="method-title">setDescription</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomEntry.html#methodsetDescription">AtomEntry::setDescription()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="davical/AtomFeed.html#methodsetDescription">AtomFeed::setDescription()</a> in AtomFeed.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">setDescription</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomFeed.html#methodsetDescription">AtomFeed::setDescription()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="davical/AtomEntry.html#methodsetDescription">AtomEntry::setDescription()</a> in AtomFeed.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -4091,14 +4191,14 @@
 			<span class="method-title">setId</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomEntry.html#methodsetId">AtomEntry::setId()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="davical/AtomFeed.html#methodsetId">AtomFeed::setId()</a> in AtomFeed.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">setId</span>
 					</dt>
 		<dd class="index-item-body">
-			<div class="index-item-details"><a href="davical/AtomFeed.html#methodsetId">AtomFeed::setId()</a> in AtomFeed.php</div>
+			<div class="index-item-details"><a href="davical/AtomEntry.html#methodsetId">AtomEntry::setId()</a> in AtomFeed.php</div>
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
@@ -4727,6 +4827,22 @@
 					</dd>
 			<dt class="field">
 						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">WriteCalendarAlarms</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/WritableCollection.html#methodWriteCalendarAlarms">WritableCollection::WriteCalendarAlarms()</a> in WritableCollection.php</div>
+							<div class="index-item-description">Given a dav_id and an original vCalendar, pull out each of the VALARMs  and write the values into the calendar_alarm table.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
+			<span class="method-title">WriteCalendarAttendees</span>
+					</dt>
+		<dd class="index-item-body">
+			<div class="index-item-details"><a href="davical/Resource/WritableCollection.html#methodWriteCalendarAttendees">WritableCollection::WriteCalendarAttendees()</a> in WritableCollection.php</div>
+							<div class="index-item-description">Parse out the attendee property and write a row to the  calendar_attendee table for each one.</div>
+					</dd>
+			<dt class="field">
+						<img src="media/images/Method.png" alt="Method" title="Method" />
 			<span class="method-title">WriteCalendarMember</span>
 					</dt>
 		<dd class="index-item-body">
diff -Nru davical-0.9.9.7/docs/api/errors.html davical-1.0.2/docs/api/errors.html
--- davical-0.9.9.7/docs/api/errors.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/errors.html	2012-01-13 10:44:57.000000000 +0000
@@ -44,6 +44,7 @@
 <a href="#collection-edit.php">collection-edit.php</a><br>
 <a href="#createdb.php">createdb.php</a><br>
 <a href="#davical_configuration_missing.php">davical_configuration_missing.php</a><br>
+<a href="#DAVPrincipal.php">DAVPrincipal.php</a><br>
 <a href="#DAVResource.php">DAVResource.php</a><br>
 <a href="#DAVTicket.php">DAVTicket.php</a><br>
 <a href="#dbexec.php">dbexec.php</a><br>
@@ -75,6 +76,7 @@
 <a href="#public.php">public.php</a><br>
 <a href="#pubsub.php">pubsub.php</a><br>
 <a href="#RRule-v2.php">RRule-v2.php</a><br>
+<a href="#schedule-functions.php">schedule-functions.php</a><br>
 <a href="#setup.php">setup.php</a><br>
 <a href="#SqlToArray.php">SqlToArray.php</a><br>
 <a href="#test-RRULE-v2.php">test-RRULE-v2.php</a><br>
@@ -122,9 +124,9 @@
 <a name="always.php"></a>
 <h1>always.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 28</b> - Page-level DocBlock precedes "function early_exception_handler", use another DocBlock to document the source element<br>
+<b>Warning on line 29</b> - Page-level DocBlock precedes "function early_exception_handler", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 28</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 29</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <a name="AtomFeed.php"></a>
 <h1>AtomFeed.php</h1>
 <h2>Warnings:</h2><br>
@@ -137,8 +139,8 @@
 <h2>Warnings:</h2><br>
 <b>Warning on line 27</b> - Page-level DocBlock precedes "require_once "DataUpdate.php"", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 27</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage authentication"<br>
 <b>Error on line 27</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 27</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage authentication"<br>
 <a name="autodiscover-handler.php"></a>
 <h1>autodiscover-handler.php</h1>
 <h2>Warnings:</h2><br>
@@ -183,16 +185,16 @@
 <h2>Warnings:</h2><br>
 <b>Warning on line 11</b> - Page-level DocBlock precedes "require_once 'AwlQuery.php'", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <b>Error on line 11</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
+<b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <a name="caldav-MKTICKET.php"></a>
 <h1>caldav-MKTICKET.php</h1>
 <h2>Warnings:</h2><br>
 <b>Warning on line 19</b> - package davical is already in category Technical, will now replace with category Documentation<br>
 <b>Warning on line 20</b> - Page-level DocBlock precedes "require_once 'DAVResource.php'", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 20</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
 <b>Error on line 20</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 20</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
 <a name="caldav-MOVE.php"></a>
 <h1>caldav-MOVE.php</h1>
 <h2>Warnings:</h2><br>
@@ -209,8 +211,8 @@
 <h2>Warnings:</h2><br>
 <b>Warning on line 12</b> - Page-level DocBlock precedes "require_once "XMLDocument.php"", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 12</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
 <b>Error on line 12</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 12</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
 <a name="caldav-PROPFIND.php"></a>
 <h1>caldav-PROPFIND.php</h1>
 <h2>Warnings:</h2><br>
@@ -237,11 +239,11 @@
 <a name="caldav-REPORT-calquery.php"></a>
 <h1>caldav-REPORT-calquery.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 360</b> - File "/home/karora/projects/davical/inc/caldav-REPORT-calquery.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 365</b> - File "/home/karora/projects/davical/inc/caldav-REPORT-calquery.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 <a name="caldav-REPORT-cardquery.php"></a>
 <h1>caldav-REPORT-cardquery.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 232</b> - File "/home/karora/projects/davical/inc/caldav-REPORT-cardquery.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 233</b> - File "/home/karora/projects/davical/inc/caldav-REPORT-cardquery.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 <a name="caldav-REPORT-expand-property.php"></a>
 <h1>caldav-REPORT-expand-property.php</h1>
 <h2>Warnings:</h2><br>
@@ -253,8 +255,8 @@
 <a name="caldav-REPORT-multiget.php"></a>
 <h1>caldav-REPORT-multiget.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 107</b> - Unknown tag "@todo:" used<br>
-<b>Warning on line 125</b> - File "/home/karora/projects/davical/inc/caldav-REPORT-multiget.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 106</b> - Unknown tag "@todo:" used<br>
+<b>Warning on line 124</b> - File "/home/karora/projects/davical/inc/caldav-REPORT-multiget.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 <a name="caldav-REPORT-principal-match.php"></a>
 <h1>caldav-REPORT-principal-match.php</h1>
 <h2>Warnings:</h2><br>
@@ -268,8 +270,8 @@
 <h2>Warnings:</h2><br>
 <b>Warning on line 12</b> - Page-level DocBlock precedes "require_once "XMLDocument.php"", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 12</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
 <b>Error on line 12</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 12</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
 <a name="caldav.php"></a>
 <h1>caldav.php</h1>
 <h2>Warnings:</h2><br>
@@ -288,7 +290,7 @@
 <a name="collection-edit.php"></a>
 <h1>collection-edit.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 538</b> - File "/home/karora/projects/davical/inc/ui/collection-edit.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 547</b> - File "/home/karora/projects/davical/inc/ui/collection-edit.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 <a name="createdb.php"></a>
 <h1>createdb.php</h1>
 <h2>Warnings:</h2><br>
@@ -297,6 +299,13 @@
 <h1>davical_configuration_missing.php</h1>
 <h2>Warnings:</h2><br>
 <b>Warning on line 31</b> - File "/home/karora/projects/davical/inc/davical_configuration_missing.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<a name="DAVPrincipal.php"></a>
+<h1>DAVPrincipal.php</h1>
+<h2>Warnings:</h2><br>
+<b>Warning on line 11</b> - Page-level DocBlock precedes "require_once 'Principal.php'", use another DocBlock to document the source element<br>
+<h2>Errors:</h2><br>
+<b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 11</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage Principal"<br>
 <a name="DAVResource.php"></a>
 <h1>DAVResource.php</h1>
 <h2>Warnings:</h2><br>
@@ -331,8 +340,8 @@
 <b>Warning on line 13</b> - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element<br>
 <b>Warning on line 16</b> - no @package tag was used in a DocBlock for class ldapDrivers<br>
 <h2>Errors:</h2><br>
-<b>Error on line 13</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <b>Error on line 13</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"<br>
+<b>Error on line 13</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <a name="drivers_pwauth_pam.php"></a>
 <h1>drivers_pwauth_pam.php</h1>
 <h2>Warnings:</h2><br>
@@ -344,8 +353,8 @@
 <a name="drivers_rimap.php"></a>
 <h1>drivers_rimap.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 13</b> - package davical is already in category Documentation, will now replace with category Technical<br>
 <b>Warning on line 13</b> - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element<br>
+<b>Warning on line 13</b> - package davical is already in category Documentation, will now replace with category Technical<br>
 <b>Warning on line 16</b> - no @package tag was used in a DocBlock for class imapPamDrivers<br>
 <h2>Errors:</h2><br>
 <b>Error on line 13</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
@@ -356,26 +365,26 @@
 <b>Warning on line 13</b> - Page-level DocBlock precedes "require_once "auth-functions.php"", use another DocBlock to document the source element<br>
 <b>Warning on line 16</b> - no @package tag was used in a DocBlock for class squidPamDrivers<br>
 <h2>Errors:</h2><br>
-<b>Error on line 13</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"<br>
 <b>Error on line 13</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 13</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage ldap"<br>
 <a name="expand.php"></a>
 <h1>expand.php</h1>
 <h2>Warnings:</h2><br>
 <b>Warning on line 11</b> - Page-level DocBlock precedes "require_once 'vCalendar.php'", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <b>Error on line 11</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage tzservice"<br>
+<b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <a name="external-browse.php"></a>
 <h1>external-browse.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 26</b> - File "/home/karora/projects/davical/inc/ui/external-browse.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 37</b> - File "/home/karora/projects/davical/inc/ui/external-browse.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 <a name="external-fetch.php"></a>
 <h1>external-fetch.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 34</b> - Page-level DocBlock precedes "function create_external", use another DocBlock to document the source element<br>
+<b>Warning on line 39</b> - Page-level DocBlock precedes "function create_external", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 34</b> - "function" create_external's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage external-bind"<br>
-<b>Error on line 34</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 39</b> - "function" create_external's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage external-bind"<br>
+<b>Error on line 39</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <a name="feed.php"></a>
 <h1>feed.php</h1>
 <h2>Warnings:</h2><br>
@@ -455,15 +464,15 @@
 <h2>Warnings:</h2><br>
 <b>Warning on line 11</b> - Page-level DocBlock precedes "require_once 'AwlCache.php'", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 11</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage Principal"<br>
 <b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 11</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage Principal"<br>
 <a name="public.php"></a>
 <h1>public.php</h1>
 <h2>Warnings:</h2><br>
 <b>Warning on line 10</b> - Page-level DocBlock precedes "require "./always.php"", use another DocBlock to document the source element<br>
 <h2>Errors:</h2><br>
-<b>Error on line 10</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <b>Error on line 10</b> - "include" require's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
+<b>Error on line 10</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <a name="pubsub.php"></a>
 <h1>pubsub.php</h1>
 <h2>Warnings:</h2><br>
@@ -477,11 +486,18 @@
 <b>Warning on line 521</b> - no @package tag was used in a DocBlock for class RepeatRuleDateRange<br>
 <b>Warning on line 589</b> - no @package tag was used in a DocBlock for class RepeatRule<br>
 <b>Warning on line 1448</b> - Unknown tag "@todo:" used<br>
+<a name="schedule-functions.php"></a>
+<h1>schedule-functions.php</h1>
+<h2>Warnings:</h2><br>
+<b>Warning on line 11</b> - Page-level DocBlock precedes "require_once 'vCalendar.php'", use another DocBlock to document the source element<br>
+<h2>Errors:</h2><br>
+<b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
+<b>Error on line 11</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage caldav"<br>
 <a name="setup.php"></a>
 <h1>setup.php</h1>
 <h2>Warnings:</h2><br>
 <b>Warning on line 7</b> - no @package tag was used in a DocBlock for class CheckResult<br>
-<b>Warning on line 386</b> - File "/home/karora/projects/davical/htdocs/setup.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 404</b> - File "/home/karora/projects/davical/htdocs/setup.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 <a name="SqlToArray.php"></a>
 <h1>SqlToArray.php</h1>
 <h2>Warnings:</h2><br>
@@ -507,8 +523,8 @@
 <b>Warning on line 11</b> - Page-level DocBlock precedes "require_once "./always.php"", use another DocBlock to document the source element<br>
 <b>Warning on line 38</b> - no @package tag was used in a DocBlock for class Tools<br>
 <h2>Errors:</h2><br>
-<b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <b>Error on line 11</b> - "include" require_once's DocBlock has @subpackage tags, illegal. ignoring tag "@subpackage DAViCalSession"<br>
+<b>Error on line 11</b> - DocBlock has multiple @package tags, illegal. ignoring additional tag "@package davical"<br>
 <a name="tz.php"></a>
 <h1>tz.php</h1>
 <h2>Warnings:</h2><br>
@@ -524,18 +540,18 @@
 <h1>vcard.php</h1>
 <h2>Warnings:</h2><br>
 <b>Warning on line 8</b> - no @package tag was used in a DocBlock for class VCard<br>
-<b>Warning on line 167</b> - File "/home/karora/projects/davical/inc/vcard.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 173</b> - File "/home/karora/projects/davical/inc/vcard.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 <a name="well-known.php"></a>
 <h1>well-known.php</h1>
 <h2>Warnings:</h2><br>
-<b>Warning on line 106</b> - File "/home/karora/projects/davical/inc/well-known.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 107</b> - File "/home/karora/projects/davical/inc/well-known.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 <a name="WritableCollection.php"></a>
 <h1>WritableCollection.php</h1>
 <h2>Warnings:</h2><br>
 <b>Warning on line 3</b> - no @package tag was used in a DocBlock for class WritableCollection<br>
-<b>Warning on line 319</b> - File "/home/karora/projects/davical/inc/WritableCollection.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
+<b>Warning on line 444</b> - File "/home/karora/projects/davical/inc/WritableCollection.php" has no page-level DocBlock, use @package in the first DocBlock to create one<br>
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/api/index.html davical-1.0.2/docs/api/index.html
--- davical-0.9.9.7/docs/api/index.html	2011-10-24 07:09:24.000000000 +0000
+++ davical-1.0.2/docs/api/index.html	2012-01-13 10:44:51.000000000 +0000
@@ -4,7 +4,7 @@
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
    <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-	<!-- Generated by phpDocumentor on Mon, 24 Oct 2011 20:09:24 +1300  -->
+	<!-- Generated by phpDocumentor on Fri, 13 Jan 2012 23:44:51 +1300  -->
   <title>DAViCal</title>
   <meta http-equiv='Content-Type' content='text/html; charset=iso-8859-1'/>
 </head>
diff -Nru davical-0.9.9.7/docs/api/li_davical.html davical-1.0.2/docs/api/li_davical.html
--- davical-0.9.9.7/docs/api/li_davical.html	2011-10-24 07:09:24.000000000 +0000
+++ davical-1.0.2/docs/api/li_davical.html	2012-01-13 10:44:51.000000000 +0000
@@ -43,6 +43,7 @@
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---feed.php.html#functioncaldav_get_feed' target='right'>caldav_get_feed</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_awl_version' target='right'>check_awl_version</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_calendar' target='right'>check_calendar</a></dd>
+											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_curl' target='right'>check_curl</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_datetime' target='right'>check_datetime</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_davical_version' target='right'>check_davical_version</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_inc---caldav-REPORT-calquery.php.html#functioncheck_for_expansion' target='right'>check_for_expansion</a></dd>
@@ -54,6 +55,7 @@
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_pdo' target='right'>check_pdo</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_pdo_pgsql' target='right'>check_pdo_pgsql</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_pgsql' target='right'>check_pgsql</a></dd>
+											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_real_php' target='right'>check_real_php</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_schema_version' target='right'>check_schema_version</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_inc---check_UTF8.php.html#functioncheck_string' target='right'>check_string</a></dd>
 											<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/_htdocs---setup.php.html#functioncheck_suhosin_server_strip' target='right'>check_suhosin_server_strip</a></dd>
@@ -171,21 +173,28 @@
 				<dd>
 					<dl class="tree">
 																									<dt class="folder-title"><img class="tree-icon" src="media/images/function_folder.png" alt=" ">Functions</dt>
-															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-REPORT.php.html#functioncalendar_to_xml' target='right'>calendar_to_xml</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-REPORT.php.html#functioncomponent_to_xml' target='right'>component_to_xml</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functioncontrolRequestContainer' target='right'>controlRequestContainer</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-DELETE.php.html#functiondelete_collection' target='right'>delete_collection</a></dd>
+															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---schedule-functions.php.html#functiondeliverItipCancel' target='right'>deliverItipCancel</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-REPORT-sync-collection.php.html#functiondisplay_status' target='right'>display_status</a></dd>
+															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---schedule-functions.php.html#functiondoItipAttendeeReply' target='right'>doItipAttendeeReply</a></dd>
+															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---schedule-functions.php.html#functiondoItipOrganizerCancel' target='right'>doItipOrganizerCancel</a></dd>
+															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---schedule-functions.php.html#functiondo_scheduling_for_delete' target='right'>do_scheduling_for_delete</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functiondo_scheduling_reply' target='right'>do_scheduling_reply</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functiondo_scheduling_requests' target='right'>do_scheduling_requests</a></dd>
+															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---schedule-functions.php.html#functionGetItip' target='right'>GetItip</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functionGetTZID' target='right'>GetTZID</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-POST.php.html#functionhandle_cancel_request' target='right'>handle_cancel_request</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-POST.php.html#functionhandle_freebusy_request' target='right'>handle_freebusy_request</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functionhandle_schedule_reply' target='right'>handle_schedule_reply</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functionhandle_schedule_request' target='right'>handle_schedule_request</a></dd>
+															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_addressbook_collection' target='right'>import_addressbook_collection</a></dd>
+															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_calendar_collection' target='right'>import_calendar_collection</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functionimport_collection' target='right'>import_collection</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_htdocs---caldav.php.html#functionlogRequestHeaders' target='right'>logRequestHeaders</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-GET.php.html#functionobfuscated_event' target='right'>obfuscated_event</a></dd>
+															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---schedule-functions.php.html#functionprocessItipCancel' target='right'>processItipCancel</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-ACL.php.html#functionprocess_ace' target='right'>process_ace</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-REPORT-pps-set.php.html#functionproperty_response' target='right'>property_response</a></dd>
 															<dd><img class="tree-icon" src="media/images/Function.png" alt="Function"><a href='davical/caldav/_inc---caldav-PUT-functions.php.html#functionpublic_events_only' target='right'>public_events_only</a></dd>
@@ -217,6 +226,7 @@
 															<dd><img class="tree-icon" src="media/images/Page.png" alt="File"><a href='davical/caldav/_inc---caldav-REPORT.php.html' target='right'>caldav-REPORT.php</a></dd>
 															<dd><img class="tree-icon" src="media/images/Page.png" alt="File"><a href='davical/caldav/_htdocs---caldav.php.html' target='right'>caldav.php</a></dd>
 															<dd><img class="tree-icon" src="media/images/Page.png" alt="File"><a href='davical/caldav/_htdocs---public.php.html' target='right'>public.php</a></dd>
+															<dd><img class="tree-icon" src="media/images/Page.png" alt="File"><a href='davical/caldav/_inc---schedule-functions.php.html' target='right'>schedule-functions.php</a></dd>
 																		</dl>
 				</dd>
 								
diff -Nru davical-0.9.9.7/docs/api/todolist.html davical-1.0.2/docs/api/todolist.html
--- davical-0.9.9.7/docs/api/todolist.html	2011-10-24 07:09:30.000000000 +0000
+++ davical-1.0.2/docs/api/todolist.html	2012-01-13 10:44:57.000000000 +0000
@@ -28,7 +28,7 @@
     <li>Improve this to calculate the days difference and then the clock time diff  and work from there.</li>
 </ul>
 	<p class="notes" id="credit">
-		Documentation generated on Mon, 24 Oct 2011 20:09:30 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
+		Documentation generated on Fri, 13 Jan 2012 23:44:57 +1300 by <a href="http://www.phpdoc.org" target="_blank">phpDocumentor 1.4.3</a>
 	</p>
 	</body>
 </html>
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/website/clients/Chandler-details.php davical-1.0.2/docs/website/clients/Chandler-details.php
--- davical-0.9.9.7/docs/website/clients/Chandler-details.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/docs/website/clients/Chandler-details.php	2011-11-01 01:21:10.000000000 +0000
@@ -7,7 +7,7 @@
 
 <ol>
 <li>Select "Subscribe" from the "Share" menu (or in older builds it was in the "Collection" menu).</li>
-<li>Enter a URL like: "http://calendar.example.net/caldav.php/username/home/" (click "Subscribe") <img src="clients/Chandler-dialog1.png" /> <br /> &nbsp;</li>
+<li>Enter a URL like: "http://calendar.example.net/caldav.php/username/calendar/" (click "Subscribe") <img src="clients/Chandler-dialog1.png" /> <br /> &nbsp;</li>
 <li>You will then be prompted for a username/password with in an expanded dialog.  Enter these and click "Subscribe" again. <img src="clients/Chandler-dialog2.png" /> <br /> &nbsp;</li>
 <li>You should now have a new calendar showing.</li>
 </ol>
diff -Nru davical-0.9.9.7/docs/website/clients/Evolution-details.php davical-1.0.2/docs/website/clients/Evolution-details.php
--- davical-0.9.9.7/docs/website/clients/Evolution-details.php	2009-04-11 00:11:39.000000000 +0000
+++ davical-1.0.2/docs/website/clients/Evolution-details.php	2011-11-01 01:20:57.000000000 +0000
@@ -5,7 +5,7 @@
 
 <ol>
 <li>Select "File" then "New" then "Calendar" from the menus.</li>
-<li>Choose a type of "CalDAV", enter a name, and a URL such as <code>caldav://server.domain.name/caldav.php/username/home/</code>, enter your user name for DAViCal and click "OK".<img src="clients/Evolution-dialog1.png" /> <br />&nbsp;</li>
+<li>Choose a type of "CalDAV", enter a name, and a URL such as <code>caldav://server.domain.name/caldav.php/username/calendar/</code>, enter your user name for DAViCal and click "OK".<img src="clients/Evolution-dialog1.png" /> <br />&nbsp;</li>
 <li>You should now be prompted for a password for that username.  Enter the password and your calendar should now show.</li>
 </ol>
 
diff -Nru davical-0.9.9.7/docs/website/clients/Interoperability-details.php davical-1.0.2/docs/website/clients/Interoperability-details.php
--- davical-0.9.9.7/docs/website/clients/Interoperability-details.php	2009-04-11 00:11:39.000000000 +0000
+++ davical-1.0.2/docs/website/clients/Interoperability-details.php	2011-11-01 02:55:35.000000000 +0000
@@ -10,13 +10,25 @@
 <li>Calendar namespace</li>
 </ul>
 
-<p>The host name is, of course, up to you.  The 'root path' should be <code>/caldav.php/</code> and anything following that is the calendar namespace.</p>
-<p>Within the calendar namespace DAViCal uses the first element of the path as the user or resource name, so that a client connecting at the root path
-can see all of the (accessible) users and resources available to them (Mulberry displays this hierarchy) with any calendars below that.</p>
-<p>Effectively this means that in Evolution, Sunbird and Lightning you should really specify a calendar URL which is something like:</p>
+<p>The host name is, of course, up to you.  The 'root path' should be 
+<code>/caldav.php/</code> and anything following that is the calendar 
+namespace.</p>
+
+<p>Within the calendar namespace DAViCal uses the first element of the 
+path as the user or 'princpal' name, so that a client connecting at the 
+root path can see all of the (accessible) users and resources available 
+to them (Mulberry displays this hierarchy) with any calendars below that.</p>
+
+<p>This means that in Evolution, Lightning and other software wanting a
+'calendar' URL you should specify a URL which is something like:</p>
 <pre>
-http://calendar.example.net/caldav.php/username/home/
+http://calendar.example.net/caldav.php/username/calendar/
 </pre>
-<p>Then, when more calendar client software sees it as useful to be able to browse that hierarchy, you won't be up for any heavy database manipulation.</p>
-<p>I may well enforce this standard in some way before release 1.0, as well as auto-creating the <code>collection</code> records when Evolution, Lightning
-or Sunbird attempt to store to a non-existent collection.</p>
+
+<p>DAViCal creates two collections automatically when a user is created.  In
+recent versions these are called 'calendar' and 'addressbook'.  Some software
+also makes it easy to create more calendars and addressbooks, or you can create
+more through DAViCal's web interface, also.</p>
+
+<p>In older versions of DAViCal (pre 0.9.9.5) the default calendar was named 'home'
+and there was no default addressbook.</p> 
diff -Nru davical-0.9.9.7/docs/website/clients/Mozilla-details.php davical-1.0.2/docs/website/clients/Mozilla-details.php
--- davical-0.9.9.7/docs/website/clients/Mozilla-details.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/docs/website/clients/Mozilla-details.php	2011-11-01 01:20:17.000000000 +0000
@@ -8,7 +8,7 @@
 <ol>
 <li>Select "New Calendar" from the "File" menu.</li>
 <li>Choose "On the Network" (click "Next")<img src="clients/Mozilla-dialog1.png" /> <br /> &nbsp;</li>
-<li>Choose a format of "CalDAV" and enter a URL like: "http://calendar.example.net/caldav.php/username/home/" (click "Next")<img src="clients/Mozilla-dialog2.png" /> <br /> &nbsp;</li>
+<li>Choose a format of "CalDAV" and enter a URL like: "http://calendar.example.net/caldav.php/username/calendar/" (click "Next")<img src="clients/Mozilla-dialog2.png" /> <br /> &nbsp;</li>
 <li>Give the calendar an appropriate display name, and choose a colour for events on this calendar. (click "Next")<img src="clients/Mozilla-dialog3.png" /> <br /> &nbsp;</li>
 <li>click "Finish"</li>
 </ol>
diff -Nru davical-0.9.9.7/docs/website/clients/Other-details.php davical-1.0.2/docs/website/clients/Other-details.php
--- davical-0.9.9.7/docs/website/clients/Other-details.php	2009-04-11 00:11:39.000000000 +0000
+++ davical-1.0.2/docs/website/clients/Other-details.php	2011-11-01 01:35:16.000000000 +0000
@@ -6,3 +6,24 @@
 <p>If you want to point me at more free software that supports CalDAV, or
 send me free copies of such proprietary software, then I will add it to
 the list as well as make DAViCal work with it.</p>
+
+<p>In the general CalDAV terminology, client software will want to know
+several facts about the CalDAV server.  Some (like iCal and iOS) will try
+and discover these facts for themselves, and others (like Lightning and
+Evolution) will require you to enter some information.  When they ask for
+that information they will be asking for the following things:</p>
+<ol>
+<li>Where is the user's "home" collection?</li>
+<li>Where is the user's "calendar" collection?</li>
+<li>What is the server's domain name</li>
+</ol>
+
+<p>Typically the answers, in DAViCal's case, are:</p>
+<ol>
+<li>.../caldav.php/username/</li>
+<li>.../caldav.php/username/calendar/ (although in older versions the default calendar was called 'home' rather than 'calendar')</li>
+<li>I can't help here - whatever you called it, I guess!</li>
+</ol>
+
+<p>There could well be a wider range of information about many and varied client
+ software on the <a href="http://wiki.davical.org/" title="The DAViCal CalDAV Server Wiki">DAViCal Wiki</a> as well.
\ No newline at end of file
diff -Nru davical-0.9.9.7/docs/website/index.php davical-1.0.2/docs/website/index.php
--- davical-0.9.9.7/docs/website/index.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/docs/website/index.php	2011-11-09 07:03:27.000000000 +0000
@@ -65,10 +65,10 @@
 </ul>
 
 <h1>Contributing to DAViCal</h1>
-<p>We welcome contributions from interested people.  You don't need to be able to write code - there are lots of
+<p><img src="images/larger.png" alt="DAViCal Logo" height="160" width="160" align="right" class="gone">We welcome contributions from interested people.  You don't need to be able to write code - there are lots of
 small tasks around the project that can be done.
 CalDAV server:</p>
-Here are some things you could do that will help us to concentrate on making DAViCal a better:<ul>
+<p>Here are some things you could do that will help us to concentrate on making DAViCal better:<ul>
 <li>writing documentation</li>
 <li>helping people on IRC, on the mailing list or sf.net forums</li>
 <li>translating the DAViCal interface to another language</li>
diff -Nru davical-0.9.9.7/docs/website/style.css davical-1.0.2/docs/website/style.css
--- davical-0.9.9.7/docs/website/style.css	2009-09-14 02:02:10.000000000 +0000
+++ davical-1.0.2/docs/website/style.css	2011-11-09 07:04:38.000000000 +0000
@@ -202,6 +202,11 @@
   vertical-align: text-top;
   }
 
+.gone {
+	width: 0.01em;
+	height: 0.01em;
+}
+
 .prompt {
   font-weight: 700;
   width: 4em;
diff -Nru davical-0.9.9.7/htdocs/admin.php davical-1.0.2/htdocs/admin.php
--- davical-0.9.9.7/htdocs/admin.php	2010-12-27 11:25:21.000000000 +0000
+++ davical-1.0.2/htdocs/admin.php	2011-11-02 05:10:34.000000000 +0000
@@ -24,7 +24,7 @@
   $c->messages[] = sprintf('No page found to %s %s%s%s', $action, ($action == 'browse' ? '' : 'a '), $component, ($action == 'browse' ? 's' : ''));
   include('page-header.php');
   include('page-footer.php');
-  exit(0);
+  @ob_flush(); exit(0);
 }
 
 include('page-header.php');
diff -Nru davical-0.9.9.7/htdocs/always.php davical-1.0.2/htdocs/always.php
--- davical-0.9.9.7/htdocs/always.php	2011-10-19 23:24:52.000000000 +0000
+++ davical-1.0.2/htdocs/always.php	2012-01-13 10:44:36.000000000 +0000
@@ -26,6 +26,7 @@
   foreach( $trace AS $k => $v ) {
     printf( "%s[%d] %s%s%s()\n", $v['file'], $v['line'], (isset($v['class'])?$v['class']:''), (isset($v['type'])?$v['type']:''), (isset($v['function'])?$v['function']:'') );
   }
+  @ob_flush();
 }
 set_exception_handler('early_exception_handler');
 
@@ -89,7 +90,7 @@
   }
   if ( ! @include_once('AWLUtilities.php') ) {
     echo "Could not find the AWL libraries. Are they installed? Check your include_path in php.ini!\n";
-    exit;
+    @ob_flush(); exit(0);
   }
 }
 
@@ -145,7 +146,7 @@
 }
 else {
   include('davical_configuration_missing.php');
-  exit;
+  @ob_flush();  exit(0);
 }
 $config_warnings = trim(ob_get_contents());
 ob_end_clean();
@@ -174,8 +175,8 @@
 *
 */
 $c->code_version = 0;
-$c->want_awl_version = '0.49';
-$c->version_string = '0.9.9.7'; // The actual version # is replaced into that during the build /release process
+$c->want_awl_version = '0.51';
+$c->version_string = '1.0.2'; // The actual version # is replaced into that during the build /release process
 if ( isset($c->version_string) && preg_match( '/(\d+)\.(\d+)\.(\d+)(.*)/', $c->version_string, $matches) ) {
   $c->code_major = $matches[1];
   $c->code_minor = $matches[2];
diff -Nru davical-0.9.9.7/htdocs/caldav.php davical-1.0.2/htdocs/caldav.php
--- davical-0.9.9.7/htdocs/caldav.php	2011-10-07 07:55:26.000000000 +0000
+++ davical-1.0.2/htdocs/caldav.php	2011-12-07 01:54:30.000000000 +0000
@@ -17,17 +17,17 @@
   else {
     fpassthru($fh);
   }
-  exit(0);
+  @ob_flush(); exit(0);
 }
 require_once('./always.php');
 
 if ( isset($_SERVER['PATH_INFO']) && preg_match( '{^/\.well-known/(.+)$}', $_SERVER['PATH_INFO'], $matches ) ) {
   require ('well-known.php');
-  exit(0);
+  @ob_flush(); exit(0);
 }
 elseif ( isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'] == '/autodiscover/autodiscover.xml' ) {
   require ('autodiscover-handler.php');
-  exit(0);
+  @ob_flush(); exit(0);
 }
 
 function logRequestHeaders() {
@@ -102,7 +102,7 @@
     $redirect_url = ConstructURL('/caldav.php'.$matches[1]);
     dbg_error_log( 'LOG WARNING', 'Redirecting %s for "%s" to "%s"', $request->method, $request->path, $redirect_url );
     header('Location: '.$redirect_url );
-    exit(0);
+    @ob_flush(); exit(0);
   }
 }
 
diff -Nru davical-0.9.9.7/htdocs/index.php davical-1.0.2/htdocs/index.php
--- davical-0.9.9.7/htdocs/index.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/htdocs/index.php	2011-11-02 05:11:09.000000000 +0000
@@ -4,7 +4,7 @@
   * If the request is not a GET or POST then they must really want caldav.php!
   */
   include("./caldav.php");
-  exit;  // Not that it should return from that!
+  @ob_flush(); exit(0);  // Not that it should return from that!
 }
 
 include("./always.php");
diff -Nru davical-0.9.9.7/htdocs/setup.php davical-1.0.2/htdocs/setup.php
--- davical-0.9.9.7/htdocs/setup.php	2011-09-13 23:25:54.000000000 +0000
+++ davical-1.0.2/htdocs/setup.php	2012-01-07 01:38:58.000000000 +0000
@@ -78,6 +78,13 @@
   return new CheckResult(isset($loaded_extensions['ldap']));
 }
 
+function check_real_php() {
+  global $phpinfo, $loaded_extensions;
+  // Looking for "Server API </td><td class="v">Apache 2.0 Filter" in the phpinfo
+  if ( preg_match('{Server API.*Apache 2\.. Filter}', $phpinfo) ) return new CheckResult(false);
+  return new CheckResult(true);
+}
+
 function check_calendar() {
   global $phpinfo, $loaded_extensions;
 
@@ -100,6 +107,13 @@
   return new CheckResult( (get_magic_quotes_runtime() == 0) );
 }
 
+function check_curl() {
+  global $phpinfo, $loaded_extensions;
+
+  if (!function_exists('curl_init')) return new CheckResult(false);
+  return new CheckResult(isset($loaded_extensions['curl']));
+}
+
 $loaded_extensions = array_flip(get_loaded_extensions());
 
 
@@ -238,16 +252,18 @@
     translate('Current DAViCal version ')         => 'check_davical_version',
     translate('DAViCal DB Schema version ')       => 'check_schema_version',
     translate('AWL Library version ')             => 'check_awl_version',
+    translate('PHP not using Apache Filter mode') => 'check_real_php',
     translate('PHP PDO module available')         => 'check_pdo',
     translate('PDO PostgreSQL drivers')           => 'check_pdo_pgsql',
-    translate('PHP PostgreSQL available')         => 'check_pgsql',
+//    translate('PHP PostgreSQL available')         => 'check_pgsql',
     translate('GNU gettext support')              => 'check_gettext',
     translate('PHP iconv support')                => 'check_iconv',
     translate('PHP DateTime class')               => 'check_datetime',
     translate('Suhosin "server.strip" disabled')  => 'check_suhosin_server_strip',
     translate('PHP Magic Quotes GPC off')         => 'check_magic_quotes_gpc',
     translate('PHP Magic Quotes runtime off')     => 'check_magic_quotes_runtime',
-    translate('PHP calendar extension available') => 'check_calendar'
+    translate('PHP calendar extension available') => 'check_calendar',
+    translate('PHP curl support')                 => 'check_curl'
     );
 
   if ( isset($c->authenticate_hook) && isset($c->authenticate_hook['call']) && $c->authenticate_hook['call'] == 'LDAP_check') {
@@ -258,13 +274,15 @@
   $dep_tpl = '<tr class="%s">
   <td>%s</td>
   <td>%s</td>
+  <td><a href="http://wiki.davical.org/w/Setup_Failure_Codes/%s">Explanation on DAViCal Wiki</a></td>
 </tr>
 ';
   foreach( $dependencies AS $k => $v ) {
     $check_result = $v();
     $dependencies_table .= sprintf( $dep_tpl, $check_result->getClass(),
                              $k,
-                             $check_result->getDescription()
+                             $check_result->getDescription(),
+                             rawurlencode($k)
                            );
   }
   
diff -Nru davical-0.9.9.7/htdocs/tools.php davical-1.0.2/htdocs/tools.php
--- davical-0.9.9.7/htdocs/tools.php	2011-10-18 18:39:06.000000000 +0000
+++ davical-1.0.2/htdocs/tools.php	2012-01-04 22:24:30.000000000 +0000
@@ -20,9 +20,9 @@
 require_once("caldav-PUT-functions.php");
 include_once('check_UTF8.php');
 
-if ( !$session->AllowedTo("Admin" ) )
-  exit;
-
+if ( !$session->AllowedTo("Admin" ) ) {
+  @ob_flush(); exit(0);
+}
 if( function_exists("sync_LDAP") && isset($_POST['Sync_LDAP'])){
   sync_LDAP();
 }
diff -Nru davical-0.9.9.7/inc/always.php.in davical-1.0.2/inc/always.php.in
--- davical-0.9.9.7/inc/always.php.in	2011-09-25 09:04:29.000000000 +0000
+++ davical-1.0.2/inc/always.php.in	2011-11-02 05:11:35.000000000 +0000
@@ -26,6 +26,7 @@
   foreach( $trace AS $k => $v ) {
     printf( "%s[%d] %s%s%s()\n", $v['file'], $v['line'], (isset($v['class'])?$v['class']:''), (isset($v['type'])?$v['type']:''), (isset($v['function'])?$v['function']:'') );
   }
+  @ob_flush();
 }
 set_exception_handler('early_exception_handler');
 
@@ -89,7 +90,7 @@
   }
   if ( ! @include_once('AWLUtilities.php') ) {
     echo "Could not find the AWL libraries. Are they installed? Check your include_path in php.ini!\n";
-    exit;
+    @ob_flush(); exit(0);
   }
 }
 
@@ -145,7 +146,7 @@
 }
 else {
   include('davical_configuration_missing.php');
-  exit;
+  @ob_flush();  exit(0);
 }
 $config_warnings = trim(ob_get_contents());
 ob_end_clean();
diff -Nru davical-0.9.9.7/inc/auth-functions.php davical-1.0.2/inc/auth-functions.php
--- davical-0.9.9.7/inc/auth-functions.php	2011-10-06 09:14:54.000000000 +0000
+++ davical-1.0.2/inc/auth-functions.php	2011-11-02 05:11:40.000000000 +0000
@@ -239,7 +239,7 @@
   if ( isset($usr->active) && ($usr->active === 'f' || $usr->active === false) ) return false;
 
   if ( $type == 'INSERT' ) {
-    $qry = new AwlQuery( 'INSERT INTO principal( type_id, user_no, displayname, default_privileges) SELECT 1, user_no, fullname, :privs::INT::BIT(24) FROM usr WHERE username=:username',
+    $qry = new AwlQuery( 'INSERT INTO principal( type_id, user_no, displayname, default_privileges) SELECT 1, user_no, fullname, :privs::INT::BIT(24) FROM usr WHERE username=(text(:username))',
                           array( ':privs' => privilege_to_bits($c->default_privileges), ':username' => $usr->username) );
     $qry->Exec('Login',__LINE__,__FILE__);
     CreateHomeCalendar($usr->username);
@@ -299,7 +299,7 @@
   </body>
   </html>
 EOERRMSG;
-    exit(1);
+    @ob_flush();  exit(1);
   }
 
   if ( $qry->Exec('Login',__LINE__,__FILE__) && $qry->rows() == 1 ) {
diff -Nru davical-0.9.9.7/inc/autodiscover-handler.php davical-1.0.2/inc/autodiscover-handler.php
--- davical-0.9.9.7/inc/autodiscover-handler.php	2011-10-18 02:32:34.000000000 +0000
+++ davical-1.0.2/inc/autodiscover-handler.php	2011-11-02 04:55:47.000000000 +0000
@@ -14,7 +14,7 @@
 
 if ( !isset($c->enable_autodiscover) || ! $c->enable_autodiscover ) {
   $request->DoResponse( 404 );
-  exit(0);
+  exit(0); // unneccessary
 }
 
 $ns_outlook_req_2006 = "http://schemas.microsoft.com/exchange/autodiscover/outlook/requestschema/2006";
@@ -40,7 +40,7 @@
 ERROR;
 
   $request->DoResponse( $code, $response, 'text/xml; charset="utf-8"' );
-  exit(0);
+  exit(0); // unneccessary
 }
 
 
diff -Nru davical-0.9.9.7/inc/caldav-BIND.php davical-1.0.2/inc/caldav-BIND.php
--- davical-0.9.9.7/inc/caldav-BIND.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/caldav-BIND.php	2012-01-07 01:38:58.000000000 +0000
@@ -47,7 +47,10 @@
   $request->PreconditionFailed(403,'DAV::can-overwrite',translate('A resource already exists at the destination.'));
 }
 
-if ( preg_match ( '{^https?://[A-Za-z][^/]*/.+$}', $href ) ) {
+//  external binds shouldn't ever point back to ourselves but they should be a valid http[s] url
+if ( preg_match ( '{^https?://([^/]+)(:[0-9]\+)?/.+$}', $href, $matches ) && 
+    strcasecmp( $matches[0], 'localhost' ) !== 0 && strcasecmp( $matches[0], '127.0.0.1' ) !== 0 
+    && strcasecmp( $matches[0], $_SERVER['SERVER_NAME'] ) !== 0 && strcasecmp( $matches[0], $_SERVER['SERVER_ADDR'] ) !== 0 ) {
 	require_once('external-fetch.php');
 	$qry = new AwlQuery( );
   $qry->QDo('SELECT collection_id FROM collection WHERE dav_name = :dav_name ', array( ':dav_name' => '/.external/'. md5($href) ));
diff -Nru davical-0.9.9.7/inc/caldav-DELETE.php davical-1.0.2/inc/caldav-DELETE.php
--- davical-0.9.9.7/inc/caldav-DELETE.php	2011-09-14 00:30:20.000000000 +0000
+++ davical-1.0.2/inc/caldav-DELETE.php	2011-10-31 20:03:58.000000000 +0000
@@ -17,6 +17,7 @@
 
 $lock_opener = $request->FailIfLocked();
 
+require_once('schedule-functions.php');
 
 function delete_collection( $id ) {
   $params = array( ':collection_id' => $id );
@@ -72,12 +73,14 @@
     $request->DoResponse( 412, translate("Resource has changed on server - not deleted") );
   }
 
-  $params = array( ':dav_id' => $dav_resource->resource_id() );
-
+  // Check to see if we need to do any scheduling transactions for this one.
+  do_scheduling_for_delete($dav_resource);
+  
   // We need to serialise access to this process just for this collection
   $cache = getCacheInstance();
   $myLock = $cache->acquireLock('collection-'.$dav_resource->parent_path());
 
+  $params = array( ':dav_id' => $dav_resource->resource_id() );
   if ( $qry->QDo("SELECT write_sync_change(collection_id, 404, caldav_data.dav_name) FROM caldav_data WHERE dav_id = :dav_id", $params )
     && $qry->QDo("DELETE FROM property WHERE dav_name = (SELECT dav_name FROM caldav_data WHERE dav_id = :dav_id)", $params )
     && $qry->QDo("DELETE FROM locks WHERE dav_name = (SELECT dav_name FROM caldav_data WHERE dav_id = :dav_id)", $params )
@@ -92,7 +95,6 @@
     $request->DoResponse( 204 );
   }
   $cache->releaseLock($myLock);
-
 }
 
 $request->DoResponse( 500 );
diff -Nru davical-0.9.9.7/inc/caldav-MOVE.php davical-1.0.2/inc/caldav-MOVE.php
--- davical-0.9.9.7/inc/caldav-MOVE.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/caldav-MOVE.php	2011-11-22 10:45:19.000000000 +0000
@@ -102,7 +102,7 @@
 if ( !$qry->Exec('move') ) rollback(500);
 
 $src_name = $src->dav_name();
-$dst_name = $dest->dav_name();
+$dst_name = ($dest->IsBinding() ? $dest->bound_from() : $dest->dav_name());
 $src_collection = $src->GetProperty('collection_id');
 $dst_collection = $dest->GetProperty('collection_id');
 $src_user_no = $src->GetProperty('user_no');
diff -Nru davical-0.9.9.7/inc/caldav-POST.php davical-1.0.2/inc/caldav-POST.php
--- davical-0.9.9.7/inc/caldav-POST.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/caldav-POST.php	2012-01-12 22:26:38.000000000 +0000
@@ -122,7 +122,7 @@
   $request->XMLResponse( 200, $response );
 }
 
-$ical = new vComponent( $request->raw_post );
+$ical = new vCalendar( $request->raw_post );
 $method =  $ical->GetPValue('METHOD');
 
 $resources = $ical->GetComponents('VTIMEZONE',false);
diff -Nru davical-0.9.9.7/inc/caldav-PROPPATCH.php davical-1.0.2/inc/caldav-PROPPATCH.php
--- davical-0.9.9.7/inc/caldav-PROPPATCH.php	2011-10-19 18:14:53.000000000 +0000
+++ davical-1.0.2/inc/caldav-PROPPATCH.php	2011-11-02 04:56:43.000000000 +0000
@@ -353,6 +353,5 @@
 * Or it was all crap.
 */
 $request->DoResponse( 500 );
-
-exit(0);
+exit(0); // unneccessary
 
diff -Nru davical-0.9.9.7/inc/caldav-PUT-default.php davical-1.0.2/inc/caldav-PUT-default.php
--- davical-0.9.9.7/inc/caldav-PUT-default.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/caldav-PUT-default.php	2011-12-02 00:09:48.000000000 +0000
@@ -24,7 +24,7 @@
 
 $dest = new DAVResource($request->path);
 
-$container = $dest->FetchParentContainer();
+$container = $dest->GetParentContainer();
 if ( $container->IsCalendar() ) {
   $request->PreconditionFailed(412,'urn:ietf:params:xml:ns:caldav:supported-calendar-data',
                   translate('Incorrect content type for calendar: ') . $request->content_type );
diff -Nru davical-0.9.9.7/inc/caldav-PUT-functions.php davical-1.0.2/inc/caldav-PUT-functions.php
--- davical-0.9.9.7/inc/caldav-PUT-functions.php	2011-10-24 04:20:27.000000000 +0000
+++ davical-1.0.2/inc/caldav-PUT-functions.php	2012-01-13 02:58:20.000000000 +0000
@@ -550,25 +550,149 @@
 
 
 /**
-* This function will import a whole calendar
+* This function will import a whole collection
 * @param string $ics_content the ics file to import
 * @param int $user_no the user wich will receive this ics file
 * @param string $path the $path where it will be store such as /user_foo/home/
 * @param boolean $caldav_context Whether we are responding via CalDAV or interactively
 *
-* Any VEVENTs with the same UID will be concatenated together
+* The work is either done by 
 */
-function import_collection( $ics_content, $user_no, $path, $caldav_context, $appending = false ) {
-  global $c, $session, $tz_regex;
-
+function import_collection( $import_content, $user_no, $path, $caldav_context, $appending = false ) {
+  global $c;
+  
   if ( ! ini_get('open_basedir') && (isset($c->dbg['ALL']) || isset($c->dbg['put'])) ) {
     $fh = fopen('/tmp/PUT-2.txt','w');
     if ( $fh ) {
-      fwrite($fh,$ics_content);
+      fwrite($fh,$import_content);
       fclose($fh);
     }
   }
 
+  if ( preg_match( '{^begin:(vcard|vcalendar)}i', $import_content, $matches) ) {
+    if ( $matches[1] == 'VCARD' )
+      import_addressbook_collection( $import_content, $user_no, $path, $caldav_context, $appending );
+    elseif ( $matches[1] == 'VCALENDAR' )
+      import_calendar_collection( $import_content, $user_no, $path, $caldav_context, $appending );
+  
+    // Uncache anything to do with the collection
+    $cache = getCacheInstance();
+    $cache_ns = 'collection-'.preg_replace( '{/[^/]*$}', '/', $path);
+    $cache->delete( $cache_ns, null );
+  }
+  else {
+    dbg_error_log('PUT', 'Can only import files which are VCARD or VCALENDAR');
+  } 
+}
+
+/**
+* This function will import a whole calendar
+* @param string $ics_content the ics file to import
+* @param int $user_no the user wich will receive this ics file
+* @param string $path the $path where it will be store such as /user_foo/home/
+* @param boolean $caldav_context Whether we are responding via CalDAV or interactively
+*
+* Any VEVENTs with the same UID will be concatenated together
+*/
+function import_addressbook_collection( $vcard_content, $user_no, $path, $caldav_context, $appending = false ) {
+  global $c, $session;
+  // We hack this into an enclosing component because vComponent only expects a single root component
+  $addressbook = new vComponent("BEGIN:ADDRESSES\r\n".$vcard_content."\r\nEND:ADDRESSES\r\n");
+
+  require_once('vcard.php');
+
+  $sql = 'SELECT * FROM collection WHERE dav_name = :dav_name';
+  $qry = new AwlQuery( $sql, array( ':dav_name' => $path) );
+  if ( ! $qry->Exec('PUT',__LINE__,__FILE__) ) rollback_on_error( $caldav_context, $user_no, $path );
+  if ( ! $qry->rows() == 1 ) {
+    dbg_error_log( 'ERROR', ' PUT: Collection does not exist at "%s" for user %d', $path, $user_no );
+    rollback_on_error( $caldav_context, $user_no, $path );
+  }
+  $collection = $qry->Fetch();
+  
+  if ( !(isset($c->skip_bad_event_on_import) && $c->skip_bad_event_on_import) ) $qry->Begin();
+  $base_params = array(
+       ':collection_id' => $collection->collection_id,
+       ':session_user' => $session->user_no,
+       ':caldav_type' => 'VCARD'
+  );
+  if ( !$appending ) {
+    if ( !$qry->QDo('DELETE FROM caldav_data WHERE collection_id = :collection_id', $base_params) )
+    rollback_on_error( $caldav_context, $user_no, $collection->collection_id );
+  }
+  
+  $dav_data_insert = <<<EOSQL
+INSERT INTO caldav_data ( user_no, dav_name, dav_etag, caldav_data, caldav_type, logged_user, created, modified, collection_id )
+    VALUES( :user_no, :dav_name, :etag, :dav_data, :caldav_type, :session_user, :created, :modified, :collection_id )
+EOSQL;
+  
+
+  $resources = $addressbook->GetComponents();
+  foreach( $resources AS $k => $resource ) {
+    if ( isset($c->skip_bad_event_on_import) && $c->skip_bad_event_on_import ) $qry->Begin();
+  
+    $vcard = new vCard( $resource->Render() );
+
+    $uid = $vcard->GetPValue('UID');
+    if ( empty($uid) ) {
+      $uid = uuid();
+      $vcard->AddProperty('UID',$uid);
+    }
+
+    $last_modified = $vcard->GetPValue('REV');
+    if ( empty($last_modified) ) {
+      $last_modified = gmdate( 'Ymd\THis\Z' );
+      $vcard->AddProperty('REV',$last_modified);
+    }
+
+    $created = $vcard->GetPValue('X-CREATED');
+    if ( empty($last_modified) ) {
+      $created = gmdate( 'Ymd\THis\Z' );
+      $vcard->AddProperty('X-CREATED',$created);
+    }
+
+    $rendered_card = $vcard->Render();
+    
+    $dav_data_params = $base_params;
+    $dav_data_params[':user_no'] = $user_no;
+    // We don't allow any of &?\/@%+: in the UID to appear in the path, but anything else is fair game.
+    $dav_data_params[':dav_name'] = sprintf( '%s%s.ics', $path, preg_replace('{[&?\\/@%+:]}','',$uid) );
+    $dav_data_params[':etag'] = md5($rendered_card);
+    $dav_data_params[':dav_data'] = $rendered_card;
+    $dav_data_params[':modified'] = $last_modified;
+    $dav_data_params[':created'] = $created;
+        
+    if ( isset($c->skip_bad_event_on_import) && $c->skip_bad_event_on_import ) $qry->Begin();
+    
+    if ( !$qry->QDo($dav_data_insert,$dav_data_params) ) rollback_on_error( $caldav_context, $user_no, $path );
+  
+    $qry->QDo('SELECT dav_id FROM caldav_data WHERE dav_name = :dav_name ', array(':dav_name' => $dav_data_params[':dav_name']));
+    if ( $qry->rows() == 1 && $row = $qry->Fetch() ) {
+      $dav_id = $row->dav_id;
+    }
+      
+    $vcard->Write( $row->dav_id, false );
+    
+    if ( isset($c->skip_bad_event_on_import) && $c->skip_bad_event_on_import ) $qry->Commit();
+  }
+  
+  if ( !(isset($c->skip_bad_event_on_import) && $c->skip_bad_event_on_import) ) {
+    if ( ! $qry->Commit() ) rollback_on_error( $caldav_context, $user_no, $path);
+  }
+  
+}
+
+/**
+* This function will import a whole calendar
+* @param string $ics_content the ics file to import
+* @param int $user_no the user wich will receive this ics file
+* @param string $path the $path where it will be store such as /user_foo/home/
+* @param boolean $caldav_context Whether we are responding via CalDAV or interactively
+*
+* Any VEVENTs with the same UID will be concatenated together
+*/
+function import_calendar_collection( $ics_content, $user_no, $path, $caldav_context, $appending = false ) {
+  global $c, $session, $tz_regex;
   $calendar = new vComponent($ics_content);
   $timezones = $calendar->GetComponents('VTIMEZONE',true);
   $components = $calendar->GetComponents('VTIMEZONE',false);
@@ -648,7 +772,8 @@
 
     $dav_data_params = $base_params;
     $dav_data_params[':user_no'] = $user_no;
-    $dav_data_params[':dav_name'] = sprintf( '%s%s.ics', $path, $uid );
+    // We don't allow any of &?\/@%+: in the UID to appear in the path, but anything else is fair game.
+    $dav_data_params[':dav_name'] = sprintf( '%s%s.ics', $path, preg_replace('{[&?\\/@%+:]}','',$uid) );
     $dav_data_params[':etag'] = md5($icalendar);
     $calitem_params = $dav_data_params;
     $dav_data_params[':dav_data'] = $icalendar;
@@ -776,11 +901,6 @@
   if ( !(isset($c->skip_bad_event_on_import) && $c->skip_bad_event_on_import) ) {
     if ( ! $qry->Commit() ) rollback_on_error( $caldav_context, $user_no, $path);
   }
-
-  // Uncache anything to do with the collection
-  $cache = getCacheInstance();
-  $cache_ns = 'collection-'.preg_replace( '{/[^/]*$}', '/', $path);
-  $cache->delete( $cache_ns, null );
 }
 
 
diff -Nru davical-0.9.9.7/inc/caldav-PUT-vcalendar.php davical-1.0.2/inc/caldav-PUT-vcalendar.php
--- davical-0.9.9.7/inc/caldav-PUT-vcalendar.php	2011-10-19 20:08:18.000000000 +0000
+++ davical-1.0.2/inc/caldav-PUT-vcalendar.php	2011-11-29 10:30:41.000000000 +0000
@@ -14,11 +14,11 @@
 
 $dav_resource = new DAVResource($request->path);
 if ( ! $dav_resource->HavePrivilegeTo('DAV::write-content') ) {
-  $request->DoResponse(403);
+  $request->DoResponse(403,'No write permission');
 }
 
 if ( ! $dav_resource->Exists() && ! $dav_resource->HavePrivilegeTo('DAV::bind') ) {
-  $request->DoResponse(403);
+  $request->DoResponse(403,'No bind permission.');
 }
 
 if ( ! ini_get('open_basedir') && (isset($c->dbg['ALL']) || (isset($c->dbg['put']) && $c->dbg['put'])) ) {
diff -Nru davical-0.9.9.7/inc/caldav-PUT-vcard.php davical-1.0.2/inc/caldav-PUT-vcard.php
--- davical-0.9.9.7/inc/caldav-PUT-vcard.php	2011-10-06 09:14:54.000000000 +0000
+++ davical-1.0.2/inc/caldav-PUT-vcard.php	2012-01-13 03:17:42.000000000 +0000
@@ -54,20 +54,50 @@
 
 $collection_id = $container->GetProperty('collection_id');
 
+$original_etag = md5($request->raw_post);
+
+require_once('vcard.php');
+$vcard = new vCard( $request->raw_post );
+
 $qry = new AwlQuery();
 $qry->Begin();
 
-$etag = md5($request->raw_post);
+$uid = $vcard->GetPValue('UID');
+if ( empty($uid) ) {
+  $uid = uuid();
+  $vcard->AddProperty('UID',$uid);
+}
+
+$last_modified = $vcard->GetPValue('REV');
+if ( empty($last_modified) ) {
+  $last_modified = gmdate( 'Ymd\THis\Z' );
+  $vcard->AddProperty('REV',$last_modified);
+}
+elseif ( stripos($last_modified, 'TZ') ) {
+  // At least one of my examples has this crap.
+  $last_modified = str_replace('TZ','T000000Z',$last_modified);
+  $vcard->ClearProperties('REV');
+  $vcard->AddProperty('REV',$last_modified);
+}
+elseif( preg_match('{^(\d{8})(\d{6})Z?}', $last_modified, $matches) ) {
+  $last_modified = $matches[1] . 'T' . $matches[2] . 'Z';
+  $vcard->ClearProperties('REV');
+  $vcard->AddProperty('REV',$last_modified);
+}
+
+$rendered_card = $vcard->Render(); 
+$etag = md5($rendered_card);
 $params = array(
     ':user_no' => $dest->GetProperty('user_no'),
     ':dav_name' => $dest->bound_from(),
     ':etag' => $etag,
-    ':dav_data' => $request->raw_post,
-    ':session_user' => $session->user_no
+    ':dav_data' => $rendered_card,
+    ':session_user' => $session->user_no,
+    ':modified' => $last_modified
 );
 if ( $dest->Exists() ) {
   $sql = 'UPDATE caldav_data SET caldav_data=:dav_data, dav_etag=:etag, logged_user=:session_user,
-          modified=current_timestamp, user_no=:user_no, caldav_type=\'VCARD\' WHERE dav_name=:dav_name';
+          modified=:modified, user_no=:user_no, caldav_type=\'VCARD\' WHERE dav_name=:dav_name';
   $response_code = 200;
   $qry->QDo( $sql, $params );
 
@@ -75,7 +105,7 @@
 }
 else {
   $sql = 'INSERT INTO caldav_data ( user_no, dav_name, dav_etag, caldav_data, caldav_type, logged_user, created, modified, collection_id )
-          VALUES( :user_no, :dav_name, :etag, :dav_data, \'VCARD\', :session_user, current_timestamp, current_timestamp, :collection_id )';
+          VALUES( :user_no, :dav_name, :etag, :dav_data, \'VCARD\', :session_user, current_timestamp, :modified, :collection_id )';
   $params[':collection_id'] = $collection_id;
   $response_code = 201;
   $qry->QDo( $sql, $params );
@@ -84,9 +114,6 @@
 }
 $row = $qry->Fetch();
 
-require_once('vcard.php');
-
-$vcard = new vCard( $request->raw_post );
 $vcard->Write( $row->dav_id, $dest->Exists() );
 
 $qry->QDo("SELECT write_sync_change( $collection_id, $response_code, :dav_name)", array(':dav_name' => $dest->bound_from() ) );
@@ -100,6 +127,6 @@
 $cache = getCacheInstance();
 $cache->delete( 'collection-'.$container->dav_name(), null );
 
-header('ETag: "'. $etag . '"' );
+if ( $etag == $original_etag ) header('ETag: "'. $etag . '"' ); // Only send the ETag if we didn't change what they gave us.
 if ( $response_code == 200 ) $response_code = 204;
 $request->DoResponse( $response_code );
diff -Nru davical-0.9.9.7/inc/caldav-REPORT-calquery.php davical-1.0.2/inc/caldav-REPORT-calquery.php
--- davical-0.9.9.7/inc/caldav-REPORT-calquery.php	2011-10-06 20:01:41.000000000 +0000
+++ davical-1.0.2/inc/caldav-REPORT-calquery.php	2011-12-07 01:51:16.000000000 +0000
@@ -334,28 +334,33 @@
 if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) $sql .= " ORDER BY caldav_data.dav_id";
 $qry = new AwlQuery( $sql, $params );
 if ( $qry->Exec("calquery",__LINE__,__FILE__) && $qry->rows() > 0 ) {
-  while( $calendar_object = $qry->Fetch() ) {
-    if ( !$need_post_filter || apply_filter( $qry_filters, $calendar_object ) ) {
+  while( $dav_object = $qry->Fetch() ) {
+    if ( !$need_post_filter || apply_filter( $qry_filters, $dav_object ) ) {
       if ( $bound_from != $target_collection->dav_name() ) {
-        $calendar_object->dav_name = str_replace( $bound_from, $target_collection->dav_name(), $calendar_object->dav_name);
+        $dav_object->dav_name = str_replace( $bound_from, $target_collection->dav_name(), $dav_object->dav_name);
       }
       if ( $need_expansion ) {
-        $vResource = new vComponent($calendar_object->caldav_data);
+        $vResource = new vComponent($dav_object->caldav_data);
+        $expanded = getVCalendarRange($vResource);
+        if ( !$expanded->overlaps($range_filter) ) continue;
+
         $expanded = expand_event_instances($vResource, $expand_range_start, $expand_range_end, $expand_as_floating );
+
         if ( $expanded->ComponentCount() == 0 ) continue;
-        if ( $need_expansion ) $calendar_object->caldav_data = $expanded->Render();
+        if ( $need_expansion ) $dav_object->caldav_data = $expanded->Render();
       }
       else if ( isset($range_filter) ) {
-        $vResource = new vComponent($calendar_object->caldav_data);
+        $vResource = new vComponent($dav_object->caldav_data);
         $expanded = getVCalendarRange($vResource);
         dbg_error_log('calquery', 'Expanded to %s:%s which might overlap %s:%s',
                        $expanded->from, $expanded->until, $range_filter->from, $range_filter->until );
         if ( !$expanded->overlaps($range_filter) ) continue;
       }
-      $responses[] = calendar_to_xml( $properties, $calendar_object );
+      $responses[] = component_to_xml( $properties, $dav_object );
     }
   }
 }
+
 $multistatus = new XMLElement( "multistatus", $responses, $reply->GetXmlNsArray() );
 
 $request->XMLResponse( 207, $multistatus );
diff -Nru davical-0.9.9.7/inc/caldav-REPORT-cardquery.php davical-1.0.2/inc/caldav-REPORT-cardquery.php
--- davical-0.9.9.7/inc/caldav-REPORT-cardquery.php	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/inc/caldav-REPORT-cardquery.php	2011-11-01 21:13:50.000000000 +0000
@@ -7,7 +7,8 @@
   global $address_data_properties;
   $expansion = $address_data_xml->GetElements();
   foreach( $expansion AS $k => $v ) {
-    $address_data_properties[strtoupper($v->GetAttribute('name'))] = true;
+    if ( $v instanceof XMLElement )
+      $address_data_properties[strtoupper($v->GetAttribute('name'))] = true;
   }
 }
 
diff -Nru davical-0.9.9.7/inc/caldav-REPORT-multiget.php davical-1.0.2/inc/caldav-REPORT-multiget.php
--- davical-0.9.9.7/inc/caldav-REPORT-multiget.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/caldav-REPORT-multiget.php	2011-11-29 19:37:51.000000000 +0000
@@ -89,8 +89,7 @@
   if ( $collection->Privileges() != privilege_to_bits('DAV::all') ) {
     $where .= " AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) ";
   }
-
-  if ( isset($c->hide_TODO) && $c->hide_TODO && ! $collection->Privileges() == privilege_to_bits('all') ) {
+  if ( isset($c->hide_TODO) && $c->hide_TODO && ! $collection->HavePrivilegeTo('all') ) {
     $where .= " AND caldav_data.caldav_type NOT IN ('VTODO') ";
   }
 }
diff -Nru davical-0.9.9.7/inc/caldav-REPORT.php davical-1.0.2/inc/caldav-REPORT.php
--- davical-0.9.9.7/inc/caldav-REPORT.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/caldav-REPORT.php	2011-11-27 08:58:59.000000000 +0000
@@ -39,7 +39,7 @@
   $target->NeedPrivilege( array('DAV::read', 'urn:ietf:params:xml:ns:caldav:read-free-busy'), true ); // They may have either
 }
 
-require_once("iCalendar.php");
+require_once("vCalendar.php");
 
 $reportnum = -1;
 $report = array();
@@ -80,110 +80,6 @@
 }
 
 
-/**
-* Return XML for a single calendar (or todo) entry from the DB
-*
-* @param array $properties The properties for this calendar
-* @param string $item The calendar data for this calendar
-*
-* @return string An XML document which is the response for the calendar
-*/
-function calendar_to_xml( $properties, $item ) {
-  global $session, $c, $request, $reply;
-
-  dbg_error_log("REPORT","Building XML Response for item '%s'", $item->dav_name );
-
-  $denied = array();
-  $caldav_data = $item->caldav_data;
-  $displayname = $item->summary;
-  if ( isset($properties['calendar-data']) || isset($properties['displayname']) ) {
-    if ( !$request->AllowedTo('all') && $session->user_no != $item->user_no ){
-      // the user is not admin / owner of this calendarlooking at his calendar and can not admin the other cal
-      /** @todo We should examine the ORGANIZER and ATTENDEE fields in the event.  If this person is there then they should see this */
-      if ( $item->class == 'CONFIDENTIAL' || !$request->AllowedTo('read') ) {
-        $ical = new iCalComponent( $caldav_data );
-        $resources = $ical->GetComponents('VTIMEZONE',false);
-        $first = $resources[0];
-
-        // if the event is confidential we fake one that just says "Busy"
-        $confidential = new iCalComponent();
-        $confidential->SetType($first->GetType());
-        $confidential->AddProperty( 'SUMMARY', translate('Busy') );
-        $confidential->AddProperty( 'CLASS', 'CONFIDENTIAL' );
-        $confidential->SetProperties( $first->GetProperties('DTSTART'), 'DTSTART' );
-        $confidential->SetProperties( $first->GetProperties('RRULE'), 'RRULE' );
-        $confidential->SetProperties( $first->GetProperties('DURATION'), 'DURATION' );
-        $confidential->SetProperties( $first->GetProperties('DTEND'), 'DTEND' );
-        $confidential->SetProperties( $first->GetProperties('UID'), 'UID' );
-        $ical->SetComponents(array($confidential),$confidential->GetType());
-
-        $caldav_data = $ical->Render();
-        $displayname = translate('Busy');
-      }
-    }
-  }
-
-  $url = ConstructURL($item->dav_name);
-
-  $prop = new XMLElement("prop");
-  foreach( $properties AS $k => $v ) {
-    switch( $k ) {
-      case 'getcontentlength':
-        $contentlength = strlen($caldav_data);
-        $prop->NewElement($k, $contentlength );
-        break;
-      case 'getlastmodified':
-        $prop->NewElement($k, ISODateToHTTPDate($item->modified) );
-        break;
-      case 'calendar-data':
-        $reply->CalDAVElement($prop, $k, $caldav_data );
-        break;
-      case 'getcontenttype':
-        $prop->NewElement($k, "text/calendar" );
-        break;
-      case 'current-user-principal':
-        $prop->NewElement("current-user-principal", $request->current_user_principal_xml);
-        break;
-      case 'displayname':
-        $prop->NewElement($k, $displayname );
-        break;
-      case 'resourcetype':
-        $prop->NewElement($k); // Just an empty resourcetype for a non-collection.
-        break;
-      case 'getetag':
-        $prop->NewElement($k, '"'.$item->dav_etag.'"' );
-        break;
-      case '"current-user-privilege-set"':
-        $prop->NewElement($k, privileges($request->permissions) );
-        break;
-      case 'SOME-DENIED-PROPERTY':  /** indicating the style for future expansion */
-        $denied[] = $v;
-        break;
-      default:
-        dbg_error_log( 'REPORT', "Request for unsupported property '%s' of calendar item.", $v );
-        $unsupported[] = $v;
-    }
-  }
-  $status = new XMLElement("status", "HTTP/1.1 200 OK" );
-
-  $propstat = new XMLElement( "propstat", array( $prop, $status) );
-  $href = new XMLElement("href", $url );
-  $elements = array($href,$propstat);
-
-  if ( count($denied) > 0 ) {
-    $status = new XMLElement("status", "HTTP/1.1 403 Forbidden" );
-    $noprop = new XMLElement("prop");
-    foreach( $denied AS $k => $v ) {
-      $noprop->NewElement( strtolower($v) );
-    }
-    $elements[] = new XMLElement( "propstat", array( $noprop, $status) );
-  }
-
-  $response = new XMLElement( "response", $elements );
-
-  return $response;
-}
-
 
 /**
 * Return XML for a single component from the DB
@@ -219,33 +115,30 @@
       $contenttype = 'text/vcard';
       break;
   }
-  if ( isset($properties['calendar-data']) || isset($properties['displayname']) ) {
-    if ( !$request->AllowedTo('all') && $session->user_no != $item->user_no ){
-      // the user is not admin / owner of this calendarlooking at his calendar and can not admin the other cal
-      /** @todo We should examine the ORGANIZER and ATTENDEE fields in the event.  If this person is there then they should see this */
-      if ( $type == 'calendar' && $item->class == 'CONFIDENTIAL' || !$request->AllowedTo('read') ) {
-        $ical = new iCalComponent( $caldav_data );
-        $resources = $ical->GetComponents('VTIMEZONE',false);
-        $first = $resources[0];
-
-        // if the event is confidential we fake one that just says "Busy"
-        $confidential = new iCalComponent();
-        $confidential->SetType($first->GetType());
-        $confidential->AddProperty( 'SUMMARY', translate('Busy') );
-        $confidential->AddProperty( 'CLASS', 'CONFIDENTIAL' );
-        $confidential->SetProperties( $first->GetProperties('DTSTART'), 'DTSTART' );
-        $confidential->SetProperties( $first->GetProperties('RRULE'), 'RRULE' );
-        $confidential->SetProperties( $first->GetProperties('DURATION'), 'DURATION' );
-        $confidential->SetProperties( $first->GetProperties('DTEND'), 'DTEND' );
-        $confidential->SetProperties( $first->GetProperties('UID'), 'UID' );
-        $ical->SetComponents(array($confidential),$confidential->GetType());
+  if ( $type == 'calendar' ) {
+    if ( isset($properties['calendar-data']) || isset($properties['displayname']) ) {
+      if ( !$request->AllowedTo('all') && $session->user_no != $item->user_no ) {
+        // the user is not admin / owner of this calendar looking at his calendar and can not admin the other cal
+        if ( $item->class == 'CONFIDENTIAL' || !$request->AllowedTo('read') ) {
+          dbg_error_log("REPORT","Anonymising confidential event for: %s", $item->dav_name );
+          $vcal = new vCalendar( $caldav_data );
+          $caldav_data = $vcal->Confidential()->Render();
+          $displayname = translate('Busy');
+        }
+      }
+    }
 
-        $caldav_data = $ical->Render();
-        $displayname = translate('Busy');
+    if ( isset($c->hide_alarm) && $c->hide_alarm ) {
+      $dav_resource = new DAVResource($request->path);
+      if ( isset($properties['calendar-data']) && !$dav_resource->HavePrivilegeTo('write') ) {
+        dbg_error_log("REPORT","Stripping event alarms for: %s", $item->dav_name );
+        $vcal = new vCalendar($caldav_data);
+        $vcal->ClearComponents('VALARM');
+        $caldav_data = $vcal->Render();
       }
     }
   }
-
+  
   $url = ConstructURL($item->dav_name);
 
   $prop = new XMLElement("prop");
diff -Nru davical-0.9.9.7/inc/caldav-REPORT-sync-collection.php davical-1.0.2/inc/caldav-REPORT-sync-collection.php
--- davical-0.9.9.7/inc/caldav-REPORT-sync-collection.php	2011-10-06 09:14:54.000000000 +0000
+++ davical-1.0.2/inc/caldav-REPORT-sync-collection.php	2011-12-13 21:20:27.000000000 +0000
@@ -37,7 +37,10 @@
 if ( !$collection->Exists() ) {
   $request->DoResponse( 404 );
 }
-  
+$bound_from = $collection->bound_from();
+$collection_path = $collection->dav_name();
+$request_via_binding = ($bound_from != $collection_path);
+
 $params = array( ':collection_id' => $collection->GetProperty('collection_id'), ':sync_token' => $sync_token );
 $sql = "SELECT new_sync_token( :sync_token, :collection_id)";
 $qry = new AwlQuery($sql, $params);
@@ -82,8 +85,13 @@
                            LEFT JOIN addressbook_resource USING (dav_id)
                            WHERE collection.collection_id = :collection_id
          AND sync_time > (SELECT modification_time FROM sync_tokens WHERE sync_token = :sync_token)
-     ORDER BY collection.collection_id, sync_changes.dav_name, sync_changes.sync_time
 EOSQL;
+    if ( isset($c->strict_result_ordering) && $c->strict_result_ordering ) {
+      $sql .= " ORDER BY collection.collection_id, lower(sync_changes.dav_name), sync_changes.sync_time";
+    }
+    else {
+      $sql .= " ORDER BY collection.collection_id, sync_changes.dav_name, sync_changes.sync_time";
+    }
   }
   $qry = new AwlQuery($sql, $params );
  
@@ -96,6 +104,9 @@
       $c->sync_resource_data_ok = false;
     }
     while( $object = $qry->Fetch() ) {
+      if ( $request_via_binding )
+        $object->dav_name = str_replace( $bound_from, $collection_path, $object->dav_name);
+
       if ( $object->dav_name == $last_dav_name ) {
         /** The complex case: this is the second or subsequent for this dav_id */
         if ( $object->sync_status == 404 ) {
@@ -104,7 +115,7 @@
             new XMLElement( 'href', ConstructURL($object->dav_name) ),
             new XMLElement( 'status', display_status($object->sync_status) )
           );
-          $responses[] = new XMLElement( 'sync-response', $resultset );
+          $responses[] = new XMLElement( 'response', $resultset );
           $first_status = 404;
         }
         else if ( $object->sync_status == 201 && $first_status == 404 ) {
diff -Nru davical-0.9.9.7/inc/CalDAVRequest.php davical-1.0.2/inc/CalDAVRequest.php
--- davical-0.9.9.7/inc/CalDAVRequest.php	2011-10-12 21:10:13.000000000 +0000
+++ davical-1.0.2/inc/CalDAVRequest.php	2012-01-12 05:43:16.000000000 +0000
@@ -182,12 +182,12 @@
       $_SERVER['REQUEST_METHOD'] = $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'];
     }
     $this->method = $_SERVER['REQUEST_METHOD'];
+    $this->content_type = (isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : null);
+    if ( preg_match( '{^(\S+/\S+)\s*(;.*)?$}', $this->content_type, $matches ) ) {
+      $this->content_type = $matches[1];
+    }
     if ( isset($_SERVER['CONTENT_LENGTH']) && $_SERVER['CONTENT_LENGTH'] > 7 ) {
-      $this->content_type = (isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : null);
-      if ( preg_match( '{^(\S+/\S+)\s*(;.*)?$}', $this->content_type, $matches ) ) {
-        $this->content_type = $matches[1];
-      }
-      if ( $this->method == 'PROPFIND' || $this->method == 'REPORT' ) {
+      if ( $this->method == 'PROPFIND' || $this->method == 'REPORT' || $this->method == 'PROPPATCH' || $this->method == 'BIND' || $this->method == 'MKTICKET' || $this->method == 'ACL' ) {
         if ( !preg_match( '{^(text|application)/xml$}', $this->content_type ) ) {
           @dbg_error_log( "LOG request", 'Request is "%s" but client set content-type to "%s". Assuming they meant XML!',
                                                  $request->method, $this->content_type );
@@ -198,6 +198,13 @@
         $this->CoerceContentType();
       }
     }
+    else if ( !preg_match( '{^(text|application)/xml$}', $this->content_type ) ) {
+      if ( $this->method == 'GET' || $this->method == 'HEAD' || $this->method == 'OPTIONS' || $this->method == 'MKCALENDAR' || $this->method == 'MKCOL' ) {
+        @dbg_error_log( "LOG request", '%s Request specified %s content type but none is present. Assuming null content-type.',
+            $request->method, $this->content_type );
+        $this->content_type = 'text/plain';
+      }
+    }
     $this->user_agent = ((isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : "Probably Mulberry"));
 
     /**
@@ -515,6 +522,9 @@
     * should reasonably expect to see either text/xml or application/xml
     */
     if ( isset($this->content_type) && preg_match( '#(application|text)/xml#', $this->content_type ) ) {
+      if ( !isset($this->raw_post) || $this->raw_post == '' ) {
+        $this->XMLResponse( 400, new XMLElement( 'error', new XMLElement('missing-xml'), array( 'xmlns' => 'DAV:') ) );
+      }
       $xml_parser = xml_parser_create_ns('UTF-8');
       $this->xml_tags = array();
       xml_parser_set_option ( $xml_parser, XML_OPTION_SKIP_WHITE, 1 );
@@ -1201,8 +1211,7 @@
       @dbg_error_log("statistics", "Method: %s, Status: %d, Script: %5.3lfs, Queries: %5.3lfs, URL: %s",
                          $this->method, $status, $script_time, $c->total_query_time, $this->path);
     }
-
-    exit(0);
+    @ob_flush(); exit(0);
   }
 
 }
diff -Nru davical-0.9.9.7/inc/DAViCalSession.php davical-1.0.2/inc/DAViCalSession.php
--- davical-0.9.9.7/inc/DAViCalSession.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/DAViCalSession.php	2011-11-02 05:11:55.000000000 +0000
@@ -113,7 +113,7 @@
       || (isset($c->restrict_admin_port) && $c->restrict_admin_port != $_SERVER['SERVER_PORT'] ) ) {
       header('Location: caldav.php');
       dbg_error_log( 'LOG WARNING', 'Access to "%s" via "%s:%d" rejected.', $_SERVER['REQUEST_URI'], $current_domain, $_SERVER['SERVER_PORT'] );
-      exit(0);
+      @ob_flush(); exit(0);
     }
     if ( isset($c->restrict_admin_roles) && $roles == '' ) $roles = $c->restrict_admin_roles;
     if ( $this->logged_in && $roles == '' ) return;
@@ -156,7 +156,7 @@
     }
 
     include('page-footer.php');
-    exit;
+    @ob_flush(); exit(0);
   }
 }
 
diff -Nru davical-0.9.9.7/inc/DAVPrincipal.php davical-1.0.2/inc/DAVPrincipal.php
--- davical-0.9.9.7/inc/DAVPrincipal.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/DAVPrincipal.php	2011-10-26 19:49:42.000000000 +0000
@@ -9,6 +9,7 @@
 * @license   http://gnu.org/copyleft/gpl.html GNU GPL v2 or later
 */
 
+require_once('Principal.php');
 
 /**
 * A class for things to do with a DAV Principal
diff -Nru davical-0.9.9.7/inc/DAVResource.php davical-1.0.2/inc/DAVResource.php
--- davical-0.9.9.7/inc/DAVResource.php	2011-10-12 21:12:00.000000000 +0000
+++ davical-1.0.2/inc/DAVResource.php	2011-12-02 00:09:39.000000000 +0000
@@ -11,6 +11,7 @@
 
 require_once('AwlCache.php');
 require_once('AwlQuery.php');
+require_once('DAVPrincipal.php');
 require_once('DAVTicket.php');
 require_once('iCalendar.php');
 
@@ -282,6 +283,17 @@
             $this->resource->location = null;
             $this->resource->url = null;
           }
+          else if ( isset($c->hide_alarm) && $c->hide_alarm && !$this->HavePrivilegeTo('write') ) {
+            $vcal1 = new iCalComponent($this->resource->caldav_data);
+            $comps = $vcal1->GetComponents();
+            $vcal2 = new iCalComponent();
+            $vcal2->VCalendar();
+            foreach( $comps AS $comp ) {
+              $comp->ClearComponents('VALARM');
+              $vcal2->AddComponent($comp);
+            }
+            $this->resource->caldav_data = $vcal2->Render();
+          }
         }
         else if ( strtoupper(substr($this->resource->caldav_data,0,11)) == 'BEGIN:VCARD' ) {
           $this->contenttype = 'text/vcard';
@@ -439,7 +451,6 @@
         else
           $this->collection->type = 'collection';
         if ( strlen($row->external_url) > 8 ) {
-          $this->collection->bound_from = $row->external_url;
           $this->_is_external = true;
           if ( $row->external_type == 'calendar' )
             $this->collection->type = 'calendar';
@@ -627,7 +638,7 @@
   protected function FetchPrivileges() {
     global $session, $request;
 
-    if ( $this->dav_name == '/' || $this->dav_name == '' ) {
+    if ( $this->dav_name == '/' || $this->dav_name == '' || $this->_is_external ) {
       $this->privileges = (1 | 16 | 32); // read + read-acl + read-current-user-privilege-set
       dbg_error_log( 'DAVResource', ':FetchPrivileges: Read permissions for user accessing /' );
       return;
@@ -699,7 +710,7 @@
 
   
   /**
-  * Fetch the parent to this resource.
+  * Fetch the parent to this resource. This is deprecated - use GetParentContainer() instead.
   */
   function FetchParentContainer() {
     deprecated('DAVResource::FetchParentContainer');
@@ -1047,8 +1058,8 @@
 
 
   /**
-  * Checks whether this resource is a calendar
-  * @param string $type The type of scheduling collection, 'read', 'write' or 'any'
+  * Checks whether this resource is a scheduling inbox/outbox collection
+  * @param string $type The type of scheduling collection, 'inbox', 'outbox' or 'any'
   */
   function IsSchedulingCollection( $type = 'any' ) {
     if ( $this->_is_collection && preg_match( '{schedule-(inbox|outbox)}', $this->collection->type, $matches ) ) {
@@ -1059,6 +1070,18 @@
 
 
   /**
+  * Checks whether this resource is IN a scheduling inbox/outbox collection
+  * @param string $type The type of scheduling collection, 'inbox', 'outbox' or 'any'
+  */
+  function IsInSchedulingCollection( $type = 'any' ) {
+    if ( !$this->_is_collection && preg_match( '{schedule-(inbox|outbox)}', $this->collection->type, $matches ) ) {
+      return ($type == 'any' || $type == $matches[1]);
+    }
+    return false;
+  }
+
+
+  /**
   * Checks whether this resource is an addressbook
   */
   function IsAddressbook() {
@@ -1245,6 +1268,14 @@
 
 
   /**
+  * Checks whether the target collection is for public events only
+  */
+  function IsPublicOnly() {
+    return ( isset($this->collection->publicly_events_only) && $this->collection->publicly_events_only == 't' );
+  }
+
+
+  /**
   * Return the type of whatever contains this resource, or would if it existed.
   */
   function ContainerType() {
@@ -1370,6 +1401,11 @@
         return clone($this->resource);
         break;
 
+      case 'dav-data':
+        if ( !isset($this->resource) ) $this->FetchResource();
+        return $this->resource->caldav_data;
+        break;
+        
       case 'principal':
         if ( !isset($this->principal) ) $this->FetchPrincipal();
         return clone($this->principal);
@@ -1547,8 +1583,13 @@
 
       case 'DAV::owner':
         // The principal-URL of the owner
-        if ( !isset($this->principal) ) $this->FetchPrincipal();
-        $reply->DAVElement( $prop, 'owner', $reply->href( $this->principal->url() ) );
+        if ( $this->IsExternal() ){
+          $reply->DAVElement( $prop, 'owner', $reply->href( $this->collection->bound_from ) );
+        }
+        else {
+          if ( !isset($this->principal) ) $this->FetchPrincipal();
+          $reply->DAVElement( $prop, 'owner', $reply->href( $this->principal->url() ) );
+        }
         break;
 
       // Empty tag responses.
diff -Nru davical-0.9.9.7/inc/drivers_ldap.php davical-1.0.2/inc/drivers_ldap.php
--- davical-0.9.9.7/inc/drivers_ldap.php	2011-10-18 03:39:14.000000000 +0000
+++ davical-1.0.2/inc/drivers_ldap.php	2011-11-24 18:42:28.000000000 +0000
@@ -212,12 +212,12 @@
     }
     else if ( empty($passwd) || preg_match('/[\x00-\x19]/',$passwd) ) {
       // See http://www.php.net/manual/en/function.ldap-bind.php#73718 for more background
-      dbg_error_log( 'LDAP', 'drivers_ldap : user %s supplied empty or invalid password (%s): login rejected', $dnUser, $passwd );
+      dbg_error_log( 'LDAP', 'drivers_ldap : user %s supplied empty or invalid password: login rejected', $dnUser );
       return false;
     }
     else {
       if ( !@ldap_bind($this->connect, $dnUser, $passwd) ) {
-        dbg_error_log( "LDAP", "drivers_ldap : Failed to bind to user %s using password %s", $dnUser, $passwd );
+        dbg_error_log( "LDAP", "drivers_ldap : Failed to bind to user %s ", $dnUser );
         return false;
       }
     }
@@ -263,16 +263,6 @@
 
   $fields_to_set = array();
   $updateable_fields = Principal::updateableFields();
-  if ( isset($mapping['active']) && !isset($mapping['user_active']) ) {
-    // Backward compatibility: now 'user_active'
-    $mapping['user_active'] = $mapping['active'];
-    unset($mapping['active']);
-  }
-  if ( isset($mapping['updated']) && !isset($mapping['modified']) ) {
-    // Backward compatibility: now 'modified'
-    $mapping['modified'] = $mapping['updated'];
-    unset($mapping['updated']);
-  }
   foreach( $updateable_fields AS $field ) {
     if ( isset($mapping[$field]) && isset($ldap_values[$mapping[$field]]) ) {
       $fields_to_set[$field] = $ldap_values[$mapping[$field]];
@@ -309,6 +299,16 @@
   }
 
   $mapping = $c->authenticate_hook['config']['mapping_field'];
+  if ( isset($mapping['active']) && !isset($mapping['user_active']) ) {
+    // Backward compatibility: now 'user_active'
+    $mapping['user_active'] = $mapping['active'];
+    unset($mapping['active']);
+  }
+  if ( isset($mapping['updated']) && !isset($mapping['modified']) ) {
+    // Backward compatibility: now 'modified'
+    $mapping['modified'] = $mapping['updated'];
+    unset($mapping['updated']);
+  }
   $attributes = array_values($mapping);
 
   /**
@@ -323,7 +323,7 @@
     $filter_munge = "($ldapDriver->filterUsers)";
   }
 
-  $filter = "(&$filter_munge(".$mapping["username"]."=$username))";
+  $filter = "(&$filter_munge(".$mapping['username']."=$username))";
   $valid = $ldapDriver->requestUser( $filter, $attributes, $username, $password );
 
   // is a valid user or not
@@ -332,7 +332,7 @@
     return false;
   }
 
-  $ldap_timestamp = $valid[$mapping["updated"]];
+  $ldap_timestamp = $valid[$mapping['modified']];
 
   /**
   * This splits the LDAP timestamp apart and assigns values to $Y $m $d $H $M and $S
@@ -341,7 +341,7 @@
     $$k = substr($ldap_timestamp,$v[0],$v[1]);
 
   $ldap_timestamp = "$Y"."$m"."$d"."$H"."$M"."$S";
-  $valid[$mapping["updated"]] = "$Y-$m-$d $H:$M:$S";
+  $valid[$mapping['modified']] = "$Y-$m-$d $H:$M:$S";
 
   $principal = new Principal('username',$username);
   if ( $principal->Exists() ) {
@@ -514,7 +514,7 @@
   if ( sizeof($ldap_users_tmp) == 0 ) return;
 
   foreach($ldap_users_tmp as $key => $ldap_user){
-    $ldap_users_info[$ldap_user[$mapping["username"]]] = $ldap_user;
+    $ldap_users_info[$ldap_user[$mapping['username']]] = $ldap_user;
     unset($ldap_users_tmp[$key]);
   }
   $qry = new AwlQuery( "SELECT username, user_no, modified as updated FROM dav_principal where type_id=1");
@@ -540,15 +540,23 @@
     foreach( $users_to_create as $username ) {
       $principal = new Principal( 'username', $username );
       $valid = $ldap_users_info[$username];
-      $ldap_timestamp = $valid[$mapping['updated']];
+      $ldap_timestamp = $valid[$mapping['modified']];
 
-      /**
-      * This splits the LDAP timestamp apart and assigns values to $Y $m $d $H $M and $S
-      */
-      foreach($c->authenticate_hook['config']['format_updated'] as $k => $v)
-          $$k = substr($ldap_timestamp,$v[0],$v[1]);
-      $ldap_timestamp = $Y.$m.$d.$H.$M.$S;
-      $valid[$mapping["updated"]] = "$Y-$m-$d $H:$M:$S";
+      if ( !empty($c->authenticate_hook['config']['format_updated']) ) {
+        /**
+        * This splits the LDAP timestamp apart and assigns values to $Y $m $d $H $M and $S
+        */
+        foreach($c->authenticate_hook['config']['format_updated'] as $k => $v)
+            $$k = substr($ldap_timestamp,$v[0],$v[1]);
+        $ldap_timestamp = $Y.$m.$d.$H.$M.$S;
+      }
+      else if ( preg_match('{^(\d{8})(\d{6})(Z)?$', $ldap_timestamp, $matches ) ) {
+        $ldap_timestamp = $matches[1].'T'.$matches[2].$matches[3];
+      }
+      else if ( empty($ldap_timestamp) ) {
+        $ldap_timestamp = date('c');
+      }
+      $valid[$mapping['modified']] = $ldap_timestamp;
 
       sync_user_from_LDAP( $principal, $mapping, $valid );
     }
@@ -574,7 +582,7 @@
     foreach ( $users_to_update as $key=> $username ) {
       $principal = new Principal( 'username', $username );
       $valid=$ldap_users_info[$username];
-      $ldap_timestamp = $valid[$mapping['updated']];
+      $ldap_timestamp = $valid[$mapping['modified']];
 
       $valid['user_no'] = $db_users_info[$username]['user_no'];
       $mapping['user_no'] = 'user_no';
@@ -586,7 +594,7 @@
         $$k = substr($ldap_timestamp,$v[0],$v[1]);
       }
       $ldap_timestamp = $Y.$m.$d.$H.$M.$S;
-      $valid[$mapping['updated']] = "$Y-$m-$d $H:$M:$S";
+      $valid[$mapping['modified']] = "$Y-$m-$d $H:$M:$S";
 
       $db_timestamp = substr(strtr($db_users_info[$username]['updated'], array(':' => '',' '=>'','-'=>'')),0,14);
       if ( $ldap_timestamp > $db_timestamp ) {
diff -Nru davical-0.9.9.7/inc/external-fetch.php davical-1.0.2/inc/external-fetch.php
--- davical-0.9.9.7/inc/external-fetch.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/external-fetch.php	2012-01-11 20:34:38.000000000 +0000
@@ -13,6 +13,11 @@
 function create_external ( $path,$is_calendar,$is_addressbook )
 {
   global $request;
+  if ( ! function_exists ( "curl_init" ) ) {
+    dbg_error_log("external", "external resource cannot be fetched without curl, please install curl");
+    $request->DoResponse( 503, translate('PHP5 curl support is required for external binds') );
+    return ;
+  }
   $resourcetypes = '<DAV::collection/>';
   if ($is_calendar) $resourcetypes .= '<urn:ietf:params:xml:ns:caldav:calendar/>';
   $qry = new AwlQuery();
@@ -34,8 +39,13 @@
   }
 }
 
-function fetch_external ( $bind_id, $min_age )
+function fetch_external ( $bind_id, $min_age = '1 hour' )
 {
+  if ( ! function_exists ( "curl_init" ) ) {
+    dbg_error_log("external", "external resource cannot be fetched without curl, please install curl");
+    $request->DoResponse( 503, translate('PHP5 curl support is required for external binds') );
+    return ;
+  }
   $sql = 'SELECT collection.*, collection.dav_name AS path, dav_binding.external_url AS external_url FROM dav_binding LEFT JOIN collection ON (collection.collection_id=bound_source_id) WHERE bind_id = :bind_id';
   $params = array( ':bind_id' => $bind_id );
   if ( strlen ( $min_age ) > 2 ) {
@@ -83,6 +93,10 @@
 	global $c;
   if ( $c->external_refresh < 1 )
     return ;
+  if ( ! function_exists ( "curl_init" ) ) {
+    dbg_error_log("external", "external resource cannot be fetched without curl, please install curl");
+    return ;
+  }
   $sql = 'SELECT bind_id from dav_binding LEFT JOIN collection ON (collection.collection_id=bound_source_id) WHERE dav_binding.dav_name = :dav_name AND collection.modified + interval :interval < NOW()';
   $qry = new AwlQuery( $sql, array ( ':dav_name' => $request->dav_name(), ':interval' => $c->external_refresh . ' minutes' ) );
 	dbg_error_log("external", "checking if external resource needs update");
diff -Nru davical-0.9.9.7/inc/freebusy-functions.php davical-1.0.2/inc/freebusy-functions.php
--- davical-0.9.9.7/inc/freebusy-functions.php	2011-10-19 18:05:43.000000000 +0000
+++ davical-1.0.2/inc/freebusy-functions.php	2011-10-24 19:03:31.000000000 +0000
@@ -11,7 +11,7 @@
 
 
 function get_freebusy( $path_match, $range_start, $range_end, $bin_privs = null ) {
-  global $request;
+  global $request, $c;
 
 //  printf( "Path: %s\n", $path_match);
 //  print_r($range_start);
diff -Nru davical-0.9.9.7/inc/HTTPAuthSession.php davical-1.0.2/inc/HTTPAuthSession.php
--- davical-0.9.9.7/inc/HTTPAuthSession.php	2011-10-16 05:24:45.000000000 +0000
+++ davical-1.0.2/inc/HTTPAuthSession.php	2012-01-11 23:14:34.000000000 +0000
@@ -88,7 +88,7 @@
     header( $auth_header );
     echo 'Please log in for access to this system.';
     dbg_error_log( "HTTPAuth", ":Session: User is not authorised: %s ", $_SERVER['REMOTE_ADDR'] );
-    exit;
+    @ob_flush();   exit(0);
   }
 
 
@@ -101,6 +101,8 @@
     /**
     * Get HTTP Auth to work with PHP+FastCGI
     */
+    if ( !isset($_SERVER["AUTHORIZATION"]) && isset($_SERVER["HTTP_AUTHORIZATION"]) && !empty($_SERVER["HTTP_AUTHORIZATION"]))
+      $_SERVER["AUTHORIZATION"] = $_SERVER["HTTP_AUTHORIZATION"];
     if (isset($_SERVER["AUTHORIZATION"]) && !empty($_SERVER["AUTHORIZATION"])) {
       list ($type, $cred) = split (" ", $_SERVER['AUTHORIZATION']);
       if ($type == 'Basic') {
@@ -139,6 +141,11 @@
     */
     if ( isset($_SERVER['PHP_AUTH_USER']) ) {
       if ( $p = $this->CheckPassword( $_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW'] ) ) {
+        if ( isset($p->active) && !isset($p->user_active) ) {
+          trace_bug('Some authentication failed to return a dav_principal record and needs fixing.');
+          $p->user_active = $p->active;
+        }
+
         /**
          * Maybe some external authentication didn't return false for an inactive
          * user, so we'll be pedantic here. 
@@ -300,7 +307,11 @@
       * It can expect that:
       *   - Configuration data will be in $c->authenticate_hook['config'], which might be an array, or whatever is needed.
       */
-      return call_user_func( $c->authenticate_hook['call'], $username, $password );
+      $principal = call_user_func( $c->authenticate_hook['call'], $username, $password );
+      if ( $principal !== false && !($principal instanceof Principal) ) {
+        $principal = new Principal('username', $username);
+      }
+      return $principal;
     }
 
     return false;
diff -Nru davical-0.9.9.7/inc/Principal.php davical-1.0.2/inc/Principal.php
--- davical-0.9.9.7/inc/Principal.php	2011-10-18 03:38:17.000000000 +0000
+++ davical-1.0.2/inc/Principal.php	2012-01-12 07:56:41.000000000 +0000
@@ -137,19 +137,29 @@
         break;
     }
 
-    
+
+    /**
+     * There are some values we can construct on the basis of the constructor value.
+     */
+    switch ( $type ) {
+      case 'user_no':        $this->user_no = $value;          break;
+      case 'principal_id':   $this->principal_id = $value;     break;
+      case 'email':          $this->email = $value;            break;
+      case 'username':       $this->username = $value;         break;
+      default:
+        throw new Exception('Can only retrieve a Principal by user_no,principal_id,username or email address');
+    }
+
     $cache = new AwlCache();
     if ( $use_cache && isset($session->principal_id) ) {
       switch ( $type ) {
         case 'user_no':
-          $this->user_no = $value;
           if ( isset(self::$byUserno[$value]) ) {
             $type = 'username';
             $value = self::$byUserno[$value];
           }
           break;
         case 'principal_id':
-          $this->principal_id = $value;
           if ( isset(self::$byId[$value]) ) {
             $type = 'username';
             $value = self::$byId[$value];
@@ -157,16 +167,11 @@
           break;
         case 'email':
           $this->by_email = true;
-          $this->email = $value;
           if ( isset(self::$byEmail[$value]) ) {
             $type = 'username';
             $value = self::$byEmail[$value];
           }
           break;
-        case 'username':
-          break;
-        default:
-          throw new Exception('Can only retrieve a Principal by user_no,principal_id,username or email address');
       }
 
       if ( $type == 'username' ) {
@@ -200,7 +205,7 @@
     $sql .= 'FROM dav_principal WHERE ';
     switch ( $type ) {
       case 'username':
-        $sql .= 'lower(username)=lower(:param)';
+        $sql .= 'lower(username)=lower(text(:param))';
         break;
       case 'user_no':
         $sql .= 'user_no=:param';
@@ -260,13 +265,12 @@
   private function assignGuestValues() {
     $this->user_no = -1;
     $this->exists = false;
-    $this->username = translate('unauthenticated');
+    if ( empty($this->username) ) $this->username = translate('unauthenticated');
     $this->fullname = $this->displayname = translate('Unauthenticated User');
     $this->email = false;
     $this->is_principal = true;
     $this->is_calendar = false;
     $this->principal_id = -1;
-    $this->dav_name = '/';
     $this->privileges = $this->default_privileges = 0;    
   }
 
@@ -528,14 +532,19 @@
     $sql_params = array();
     foreach( self::updateableFields() AS $k ) {
       if ( !isset($field_values->{$k}) && !isset($this->{$k}) ) continue;
+      $param_name = ':'.$k;
+      $sql_params[$param_name] = (isset($field_values->{$k}) ? $field_values->{$k} : $this->{$k});  
+      if ( $k == 'default_privileges' ) {
+        $sql_params[$param_name] = sprintf('%024s',$sql_params[$param_name]);
+        $param_name = 'cast('.$param_name.' as text)::BIT(24)';
+      }
       if ( $inserting ) {
+        $param_names[] = $param_name;
         $insert_fields[] = $k;
-        $param_names[] = ':'.$k . ($k == 'default_privileges' ? '::BIT(24)' : '');
       }
       else {
-        $update_list[] = $k.'=:'.($k == 'default_privileges' ? '::BIT(24)' : '');
+        $update_list[] = $k.'='.$param_name;
       }
-      $sql_params[':'.$k] = (isset($field_values->{$k}) ? $field_values->{$k} : $this->{$k});  
     }
 
     if ( $inserting && isset(self::$db_mandatory_fields) ) {
diff -Nru davical-0.9.9.7/inc/schedule-functions.php davical-1.0.2/inc/schedule-functions.php
--- davical-0.9.9.7/inc/schedule-functions.php	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/inc/schedule-functions.php	2011-11-08 21:39:41.000000000 +0000
@@ -0,0 +1,315 @@
+<?php
+/**
+ * Functions for handling CalDAV Scheduling.
+ * 
+ * @package   davical
+ * @subpackage   caldav
+ * @author    Andrew McMillan <andrew@morphoss.com>
+ * @copyright Morphoss Ltd - http://www.morphoss.com/
+ * @license   http://gnu.org/copyleft/gpl.html GNU GPL v2 or later version
+ */
+
+require_once('vCalendar.php');
+require_once('WritableCollection.php');
+require_once('RRule-v2.php');
+
+/**
+ * Entry point for scheduling on DELETE, for which there are thee outcomes:
+ *  - We don't do scheduling (disabled, no organizer, ...)
+ *  - We are an ATTENDEE declining the meeting.
+ *  - We are the ORGANIZER canceling the meeting.
+ *   
+ * @param DAVResource $deleted_resource The resource which has already been deleted
+ */
+function do_scheduling_for_delete(DAVResource $deleted_resource ) {
+  // By the time we arrive here the resource *has* actually been deleted from disk
+  // we can only fail to (de-)schedule the activity...
+  global $request, $c; 
+
+  if ( !isset($request) || (isset($c->enable_auto_schedule) && !$c->enable_auto_schedule) ) return true;
+  if ( $deleted_resource->IsInSchedulingCollection() ) return true;
+  
+  $caldav_data = $deleted_resource->GetProperty('dav-data');
+  if ( empty($caldav_data) ) return true;
+  
+  $vcal = new vCalendar($caldav_data);
+  $organizer = $vcal->GetOrganizer();
+  if ( $organizer === false || empty($organizer) ) {
+    dbg_error_log( 'schedule', 'Event has no organizer - no scheduling required.' );
+    return true;
+  }
+  if ( $vcal->GetScheduleAgent() != 'SERVER' ) {
+    dbg_error_log( 'schedule', 'SCHEDULE-AGENT=%s - no scheduling required.', $vcal->GetScheduleAgent() );
+    return true;
+  }
+  $organizer_email = preg_replace( '/^mailto:/i', '', $organizer->Value() );
+  
+  if ( $request->principal->email() == $organizer_email ) {
+    return doItipOrganizerCancel( $vcal );
+  }
+  else {
+    if ( isset($_SERVER['HTTP_SCHEDULE_REPLY']) && $_SERVER['HTTP_SCHEDULE_REPLY'] == 'F') {
+      dbg_error_log( 'schedule', 'Schedule-Reply header set to "F" - no scheduling required.' );
+      return true;
+    }
+    return doItipAttendeeReply( $vcal, 'DECLINED', $request->principal->email());
+  }
+  
+}
+
+
+/**
+* Do the scheduling adjustments for a REPLY when an ATTENDEE updates their status.
+* @param vCalendar $vcal The resource that the ATTENDEE is writing to their calendar
+* @param string $organizer The property which is the event ORGANIZER.
+*/
+//function do_scheduling_reply( vCalendar $vcal, vProperty $organizer ) {
+function doItipAttendeeReply( vCalendar $resource, $partstat ) {
+  global $request;
+  
+  $organizer = $resource->GetOrganizer();
+  $organizer_email = preg_replace( '/^mailto:/i', '', $organizer->Value() );
+  $organizer_principal = new Principal('email',$organizer_email );
+  
+  if ( !$organizer_principal->Exists() ) {
+    dbg_error_log( 'schedule', 'Unknown ORGANIZER "%s" - unable to notify.', $organizer->Value() );
+    return true;
+  }
+
+  $sql = 'SELECT caldav_data.dav_name, caldav_data.caldav_data FROM caldav_data JOIN calendar_item USING(dav_id) ';
+  $sql .= 'WHERE caldav_data.collection_id IN (SELECT collection_id FROM collection WHERE is_calendar AND user_no =?) ';
+  $sql .= 'AND uid=? LIMIT 1';
+  $uids = $resource->GetPropertiesByPath('/VCALENDAR/*/UID');
+  if ( count($uids) == 0 ) {
+    dbg_error_log( 'schedule', 'No UID in VCALENDAR - giving up on REPLY.' );
+    return true;
+  }
+  $uid = $uids[0]->Value();
+  $qry = new AwlQuery($sql, $organizer_principal->user_no(), $uid);
+  if ( !$qry->Exec('schedule',__LINE__,__FILE__) || $qry->rows() < 1 ) {
+    dbg_error_log( 'schedule', 'Could not find original event from organizer - giving up on REPLY.' );
+    return true;
+  }
+  $row = $qry->Fetch();
+  $collection_path = preg_replace('{/[^/]+$}', '/', $row->dav_name );
+  $segment_name = str_replace($collection_path, '', $row->dav_name );
+  $vcal = new vCalendar($row->caldav_data);
+  
+  $attendees = $vcal->GetAttendees();
+  foreach( $attendees AS $v ) {
+    $email = preg_replace( '/^mailto:/i', '', $v->Value() );
+    if ( $email == $request->principal->email() ) {
+      $attendee = $v;
+      break;
+    }
+  }
+  if ( empty($attendee) ) {
+    dbg_error_log( 'schedule', 'Could not find ATTENDEE in VEVENT - giving up on REPLY.' );
+    return true;
+  }
+
+  $attendee->SetParameterValue('PARTSTAT', $partstat);
+  $attendee->SetParameterValue('SCHEDULE-STATUS', '2.0');
+  $vcal->UpdateAttendeeStatus($request->principal->email(), clone($attendee) );
+
+  $organizer_calendar = new WritableCollection(array('path' => $collection_path));
+  $organizer_inbox = new WritableCollection(array('path' => $organizer_principal->internal_url('schedule-inbox')));
+
+  $schedule_reply = GetItip(new vCalendar($row->caldav_data),'REPLY',$attendee->Value());
+  $schedule_request = GetItip(new vCalendar($row->caldav_data),'REQUEST',null);
+  
+  dbg_error_log( 'schedule', 'Writing ATTENDEE scheduling REPLY from %s to %s', $request->principal->email(), $organizer_principal->email() );
+
+  $response = '3.7'; // Organizer was not found on server.
+  if ( !$organizer_calendar->Exists() ) {
+    dbg_error_log('ERROR','Default calendar at "%s" does not exist for user "%s"',
+    $organizer_calendar->dav_name(), $schedule_target->username());
+    $response = '5.2'; // No scheduling support for user
+  }
+  else {
+    if ( ! $organizer_inbox->HavePrivilegeTo('schedule-deliver-reply') ) {
+      $response = '3.8'; // No authority to deliver replies to organizer.
+    }
+    $response = '1.2'; // Scheduling reply delivered successfully
+    if ( $organizer_calendar->WriteCalendarMember($vcal, false, false, $segment_name) === false ) {
+      dbg_error_log('ERROR','Could not write updated calendar member to %s', $attendee_calendar->dav_name() );
+      trace_bug('Failed to write scheduling resource.');
+    }
+    $organizer_inbox->WriteCalendarMember($schedule_reply, false, false, $request->principal->username().$segment_name);
+  }
+
+
+  dbg_error_log( 'schedule', 'Status for organizer <%s> set to "%s"', $organizer->Value(), $response );
+  $organizer->SetParameterValue( 'SCHEDULE-STATUS', $response );
+  $resource->UpdateOrganizerStatus($organizer);   // Which was passed in by reference, and we're updating it here.
+
+  // Now we loop through the *other* ATTENDEEs, updating them on the status of the ATTENDEE DECLINE/ACCEPT
+  foreach( $attendees AS $attendee ) {
+    $email = preg_replace( '/^mailto:/i', '', $attendee->Value() );
+    if ( $email == $request->principal->email() || $email == $organizer_principal->email() ) continue;
+
+    $agent = $attendee->GetParameterValue('SCHEDULE-AGENT');
+    if ( !empty($agent) && $agent != 'SERVER' ) continue;
+
+    $schedule_target = new Principal('email',$email);
+    if ( $schedule_target->Exists() ) {
+      $attendee_calendar = new WritableCollection(array('path' => $schedule_target->internal_url('schedule-default-calendar')));
+      if ( !$attendee_calendar->Exists() ) {
+        dbg_error_log('ERROR','Default calendar at "%s" does not exist for user "%s"',
+                                              $attendee_calendar->dav_name(), $schedule_target->username());
+        continue;
+      }
+      else {
+        $attendee_inbox = new WritableCollection(array('path' => $schedule_target->internal_url('schedule-inbox')));
+        if ( ! $attendee_inbox->HavePrivilegeTo('schedule-deliver-invite') ) continue;
+
+        if ( $attendee_calendar->WriteCalendarMember($vcal, false) === false ) {
+          dbg_error_log('ERROR','Could not write updated calendar member to %s', $attendee_calendar->dav_name());
+          trace_bug('Failed to write scheduling resource.');
+        }
+        $attendee_inbox->WriteCalendarMember($schedule_request, false);
+      }
+    }
+  }
+
+  return true;
+}
+
+function GetItip( VCalendar $vcal, $method, $attendee_value ) {
+
+  $iTIP = $vcal->GetItip($method, $attendee_value );
+  $iTIP->AddProperty('REQUEST-STATUS','2.0');
+  $components = $iTIP->GetComponents(); 
+  foreach( $components AS $comp ) {
+    $properties = array();
+    foreach( $comp->GetProperties() AS $k=> $property ) {
+      switch( $property->Name() ) {
+        case 'DTSTART':
+        case 'DTEND':
+        case 'DUE':
+          $when = new RepeatRuleDateTime($property);
+          $properties[] = new vProperty( $property->Name() . ":" . $when->UTC() );
+          break;
+        default:
+          $properties[] = $property;
+      }
+    }
+    $comp->SetProperties($properties);
+  }
+  
+  return $iTIP;
+}
+
+/**
+ * Handles sending the iTIP CANCEL messages to each ATTENDEE by the ORGANIZER.
+ * @param vCalendar $vcal  What's being cancelled.
+ */
+function doItipOrganizerCancel( vCalendar $vcal ) {
+  global $request;
+  
+  $attendees = $vcal->GetAttendees();
+  if ( count($attendees) == 0 && count($old_attendees) == 0 ) {
+    dbg_error_log( 'schedule', 'Event has no attendees - no scheduling required.', count($attendees) );
+    return true;
+  }
+
+  dbg_error_log( 'schedule', 'Writing scheduling resources for %d attendees', count($attendees) );
+  $scheduling_actions = false;
+
+  $iTIP = GetItip($vcal, 'CANCEL', null);
+  
+  foreach( $attendees AS $attendee ) {
+    $email = preg_replace( '/^mailto:/i', '', $attendee->Value() );
+    if ( $email == $request->principal->email() ) {
+      dbg_error_log( 'schedule', "not delivering to owner '%s'", $request->principal->email() );
+      continue;
+    }
+    
+    $agent = $attendee->GetParameterValue('SCHEDULE-AGENT');
+    if ( $agent && $agent != 'SERVER' ) {
+      dbg_error_log( 'schedule', "not delivering to %s, schedule agent set to value other than server", $email );
+      continue;
+    }
+    $schedule_target = new Principal('email',$email);
+    if ( !$schedule_target->Exists() ) {
+      $response = '3.7';
+    }
+    else {
+      $attendee_inbox = new WritableCollection(array('path' => $schedule_target->internal_url('schedule-inbox')));
+      if ( ! $attendee_inbox->HavePrivilegeTo('schedule-deliver-invite') ) {
+        dbg_error_log( 'schedule', "No authority to deliver invite to %s", $schedule_target->internal_url('schedule-inbox') );
+        $response = '3.8';
+      }
+      else {
+        $attendee_calendar = new WritableCollection(array('path' => $schedule_target->internal_url('schedule-default-calendar')));
+        $response = processItipCancel( $vcal, $attendee, $attendee_calendar, $schedule_target );
+        deliverItipCancel( $iTIP, $attendee, $attendee_inbox );
+      }
+    }
+    dbg_error_log( 'schedule', 'Status for attendee <%s> set to "%s"', $attendee->Value(), $response );
+    $attendee->SetParameterValue( 'SCHEDULE-STATUS', $response );
+    $scheduling_actions = true;
+  }
+
+  return true;
+}
+
+/**
+ * Does the actual processing of the iTIP CANCEL message on behalf of an ATTENDEE,
+ * which generally means writing it into the ATTENDEE's default calendar.
+ * 
+ * @param vCalendar $vcal The message.
+ * @param vProperty $attendee
+ * @param WritableCollection $attendee_calendar
+ */
+function processItipCancel( vCalendar $vcal, vProperty $attendee, WritableCollection $attendee_calendar, Principal $attendee_principal ) {
+
+  dbg_error_log( 'schedule', 'Processing iTIP CANCEL to %s', $attendee->Value());
+  if ( !$attendee_calendar->Exists() ) {
+    dbg_error_log('ERROR', 'Default calendar at "%s" does not exist for attendee "%s"',
+                                                $attendee_calendar->dav_name(), $attendee->Value());
+    return '5.2';  // No scheduling support for user
+  }
+
+  $sql = 'SELECT caldav_data.dav_name FROM caldav_data JOIN calendar_item USING(dav_id) ';
+  $sql .= 'WHERE caldav_data.collection_id IN (SELECT collection_id FROM collection WHERE is_calendar AND user_no =?) ';
+  $sql .= 'AND uid=? LIMIT 1';
+  $uids = $vcal->GetPropertiesByPath('/VCALENDAR/*/UID');
+  if ( count($uids) == 0 ) {
+    dbg_error_log( 'schedule', 'No UID in VCALENDAR - giving up on CANCEL processing.' );
+    return '3.8';
+  }
+  $uid = $uids[0]->Value();
+  $qry = new AwlQuery($sql, $attendee_principal->user_no(), $uid);
+  if ( !$qry->Exec('schedule',__LINE__,__FILE__) || $qry->rows() < 1 ) {
+    dbg_error_log( 'schedule', 'Could not find ATTENDEE copy of original event - not trying to DELETE it!' );
+    return '1.2';
+  }
+  $row = $qry->Fetch();
+  
+  if ( $attendee_calendar->actualDeleteCalendarMember($row->dav_name) === false ) {
+    dbg_error_log('ERROR', 'Could not delete calendar member %s for %s',
+                                    $row->dav_name(), $attendee->Value());
+    trace_bug('Failed to write scheduling resource.');
+    return '5.2';
+  }
+
+  return '1.2';  // Scheduling invitation delivered successfully
+    
+}
+
+
+/**
+ * Delivers the iTIP CANCEL message to an ATTENDEE's Scheduling Inbox Collection.
+ * 
+ * This is pretty simple at present, but could be extended in the future to do the sending
+ * of e-mail to a remote attendee.
+ * 
+ * @param vCalendar $iTIP
+ * @param vProperty $attendee
+ * @param WritableCollection $attendee_inbox
+ */
+function deliverItipCancel( vCalendar $iTIP, vProperty $attendee, WritableCollection $attendee_inbox ) {
+  $attendee_inbox->WriteCalendarMember($iTIP, false);
+}
+
diff -Nru davical-0.9.9.7/inc/tz/expand.php davical-1.0.2/inc/tz/expand.php
--- davical-0.9.9.7/inc/tz/expand.php	2011-10-06 09:14:54.000000000 +0000
+++ davical-1.0.2/inc/tz/expand.php	2011-12-01 23:19:15.000000000 +0000
@@ -163,7 +163,7 @@
 
 $response = new XMLDocument(array("urn:ietf:params:xml:ns:timezone-service" => ""));
 $timezones = $response->NewXMLElement('urn:ietf:params:xml:ns:timezone-service:timezones');
-$qry = new AwlQuery('SELECT to_char(max(last_modified),\'YYYY-MM-DD\"T\"HH24:MI:SS"Z"\') AS dtstamp FROM timezones');
+$qry = new AwlQuery('SELECT to_char(max(last_modified),\'YYYY-MM-DD"T"HH24:MI:SS"Z"\') AS dtstamp FROM timezones');
 if ( $qry->Exec('tz/list',__LINE__,__FILE__) && $qry->rows() > 0 ) {
   $row = $qry->Fetch();
   $timezones->NewElement('dtstamp', $row->dtstamp);
diff -Nru davical-0.9.9.7/inc/tz/list.php davical-1.0.2/inc/tz/list.php
--- davical-0.9.9.7/inc/tz/list.php	2011-10-06 09:14:54.000000000 +0000
+++ davical-1.0.2/inc/tz/list.php	2011-12-01 23:18:20.000000000 +0000
@@ -13,7 +13,7 @@
 
 $response = new XMLDocument( array("urn:ietf:params:xml:ns:timezone-service" => "") );
 $tzlist = $response->NewXMLElement('timezone-list');
-$qry = new AwlQuery('SELECT to_char(max(last_modified),\'YYYY-MM-DD\"T\"HH24:MI:SS"Z"\') AS dtstamp FROM timezones');
+$qry = new AwlQuery('SELECT to_char(max(last_modified),\'YYYY-MM-DD"T"HH24:MI:SS"Z"\') AS dtstamp FROM timezones');
 if ( $qry->Exec('tz/list',__LINE__,__FILE__) && $qry->rows() > 0 ) {
   $row = $qry->Fetch();
   $tzlist->NewElement('dtstamp', $row->dtstamp);
@@ -22,7 +22,7 @@
   $tzlist->NewElement('dtstamp', gmdate('Y-m-d\TH:i:s\Z'));
 }
 
-$sql = 'SELECT our_tzno, tzid, active, to_char(last_modified,\'YYYY-MM-DD\"T\"HH24:MI:SS"Z"\') AS last_modified, olson_name, vtimezone FROM timezones';
+$sql = 'SELECT our_tzno, tzid, active, to_char(last_modified,\'YYYY-MM-DD"T"HH24:MI:SS"Z"\') AS last_modified, olson_name, vtimezone FROM timezones';
 $params = array();
 $where = '';
 if ( $returnall !== true ) {
diff -Nru davical-0.9.9.7/inc/ui/collection-edit.php davical-1.0.2/inc/ui/collection-edit.php
--- davical-0.9.9.7/inc/ui/collection-edit.php	2011-10-07 11:12:18.000000000 +0000
+++ davical-1.0.2/inc/ui/collection-edit.php	2012-01-13 02:45:22.000000000 +0000
@@ -132,6 +132,15 @@
   $entryqry = new AwlQuery( 'SELECT count(*) as count from caldav_data where collection_id='.$editor->Value('collection_id')  );
   $entryqry->Exec('admin-collection-edit');
   $entries = $entryqry->Fetch();  $entries = $entries->count;
+  
+  $externalqry = new AwlQuery( 'SELECT external_url from dav_binding where bound_source_id=:id  limit 1', array(':id' => $editor->Value('collection_id') ) );
+  $externalqry->Exec('external-bind-url');
+  $external = $externalqry->Fetch();  $external_url = $external->external_url;
+  if ( $external_url ) {
+    $external_bind = "\n<tr> <th class='right'>" . translate('External Url') . "</th>         <td class='left'>$external_url</td> </tr>";
+  } else {
+    $external_bind = "";
+  }
 }
 else {
   $c->page_title = $editor->Title(translate('Create New Collection'));
@@ -217,8 +226,8 @@
 $btn_rw  = htmlspecialchars(translate('Read/Write'));      $btn_rw_title = htmlspecialchars(translate('Set read+write privileges'));
 $btn_read = htmlspecialchars(translate('Read'));           $btn_read_title = htmlspecialchars(translate('Set read privileges'));
 $btn_fb = htmlspecialchars(translate('Free/Busy'));        $btn_fb_title = htmlspecialchars(translate('Set free/busy privileges'));
-$btn_sd = htmlspecialchars(translate('Schedule Deliver')); $btn_sd_title = htmlspecialchars(translate('Set schedule-deliver privileges'));
-$btn_ss = htmlspecialchars(translate('Schedule Send'));    $btn_ss_title = htmlspecialchars(translate('Set schedule-deliver privileges'));
+$btn_sd = htmlspecialchars(translate('Schedule Deliver')); $btn_sd_title = htmlspecialchars(translate('Privileges to allow delivery of scheduling messages'));
+$btn_ss = htmlspecialchars(translate('Schedule Send'));    $btn_ss_title = htmlspecialchars(translate('Privileges to delegate scheduling decisions'));
 
 
 $id = $editor->Value('collection_id');
@@ -315,7 +324,7 @@
 </style>
 <table>
  <tr> <th class="right">$prompt_collection_id:</th>    <td class="left">$value_id</td> </tr>
- <tr> <th class="right">$prompt_dav_name:</th>         <td class="left">$value_dav_name</td> </tr>
+ <tr> <th class="right">$prompt_dav_name:</th>         <td class="left">$value_dav_name</td> </tr>$external_bind
  <tr> <th class="right">$prompt_entries:</th>          <td class="left">$entries</td> </tr>
  <tr> <th class="right">$prompt_load_file:</th>        <td class="left">##ics_file.file.60##
   <label class="privilege" title="Should the uploaded entries be appended to the calendar"><input type="checkbox" name="mode" value="append">Append</label>
@@ -348,7 +357,7 @@
 </form>
 <script language="javascript">
 toggle_enabled('fld_is_calendar','=fld_timezone','=fld_schedule_transp','!fld_is_addressbook','=fld_ics_file');
-toggle_enabled('fld_is_addressbook','!fld_is_calendar');
+toggle_enabled('fld_is_addressbook','!fld_is_calendar','=fld_ics_file');
 toggle_visible('fld_use_default_privs','!privileges_settings');
 </script>
 
diff -Nru davical-0.9.9.7/inc/ui/external-browse.php davical-1.0.2/inc/ui/external-browse.php
--- davical-0.9.9.7/inc/ui/external-browse.php	2011-10-07 07:46:31.000000000 +0000
+++ davical-1.0.2/inc/ui/external-browse.php	2011-10-24 08:18:04.000000000 +0000
@@ -4,7 +4,7 @@
 $browser = new Browser(translate('External Calendars'));
 
 $browser->AddColumn( 'collection_id', translate('ID'), 'right', '##collection_link##' );
-$rowurl = $c->base_url . '/admin.php?action=edit&t=external&id=';
+$rowurl = $c->base_url . '/admin.php?action=edit&t=collection&id=';
 $browser->AddHidden( 'collection_link', "'<a href=\"$rowurl' || collection_id || '\">' || collection_id || '</a>'" );
 $browser->AddColumn( 'dav_displayname', translate('Display Name') );
 $browser->AddColumn( 'refs', translate('References'),'right','','(select count(*) from dav_binding where bound_source_id=collection_id )' );
@@ -26,3 +26,13 @@
 
 $page_elements[] = $browser;
 
+
+$externalqry = new AwlQuery( "SELECT count(*) as count from collection where parent_container='/.external/' and collection_id not in ( select bound_source_id from dav_binding where external_url is not null)" );
+$externalqry->Exec('external-bind-url');
+$external = $externalqry->Fetch();  
+if ( $external->count > 0 ) {
+  $link = '<a href="'.$c->base_url . '/admin.php?action=edit&t=external&subaction=clean" class="submit">'. 
+    translate("Remove dangling external calendars").'('.$external->count.')</a>';
+  $c->stylesheets[] = 'css/edit.css';
+  $page_elements[] = $link;
+}
diff -Nru davical-0.9.9.7/inc/ui/principal-edit.php davical-1.0.2/inc/ui/principal-edit.php
--- davical-0.9.9.7/inc/ui/principal-edit.php	2011-09-25 09:04:57.000000000 +0000
+++ davical-1.0.2/inc/ui/principal-edit.php	2012-01-12 23:29:14.000000000 +0000
@@ -376,8 +376,8 @@
   $btn_rw  = htmlspecialchars(translate('Read/Write'));      $btn_rw_title = htmlspecialchars(translate('Set read+write privileges'));
   $btn_read = htmlspecialchars(translate('Read'));           $btn_read_title = htmlspecialchars(translate('Set read privileges'));
   $btn_fb = htmlspecialchars(translate('Free/Busy'));        $btn_fb_title = htmlspecialchars(translate('Set free/busy privileges'));
-  $btn_sd = htmlspecialchars(translate('Schedule Deliver')); $btn_sd_title = htmlspecialchars(translate('Set schedule-deliver privileges'));
-  $btn_ss = htmlspecialchars(translate('Schedule Send'));    $btn_ss_title = htmlspecialchars(translate('Set schedule-deliver privileges'));
+  $btn_sd = htmlspecialchars(translate('Schedule Deliver')); $btn_sd_title = htmlspecialchars(translate('Privileges to allow delivery of scheduling messages'));
+  $btn_ss = htmlspecialchars(translate('Schedule Send'));    $btn_ss_title = htmlspecialchars(translate('Privileges to delegate scheduling decisions'));
   
   $privs_dec = bindec($ed->Value($fname));
   $privileges_set = sprintf('<div id="privileges"><input type="hidden" name="%s[fake_privilege_for_input]" value="0">%s', $fname, "\n");
@@ -794,7 +794,7 @@
     $ticket_id = substr( str_replace('/', '', str_replace('+', '',base64_encode(sha1(date('r') .rand(0,2100000000) . microtime(true),true)))), 7, 8);
     $extra_row = array( 'ticket_id' => $ticket_id,
                         'expires' => date( 'Y-m-d', time() + (86400 * 31) ),
-                        'target' => '/'.$editor->Value('username').'/home/'
+                        'target' => '/'.$editor->Value('username').'/'.$c->home_calendar_name.'/'
                       );
     $browser->MatchedRow('ticket_id', $ticket_id, 'edit_ticket_row');
     $browser->AddRow($extra_row);
diff -Nru davical-0.9.9.7/inc/vcard.php davical-1.0.2/inc/vcard.php
--- davical-0.9.9.7/inc/vcard.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/inc/vcard.php	2012-01-13 04:18:38.000000000 +0000
@@ -90,7 +90,9 @@
     $params = array( ':dav_id' => $dav_id );
     $qry->QDo('DELETE FROM addressbook_address_adr WHERE dav_id = :dav_id', $params );
     foreach( $addresses AS $adr ) {
-      $params[':type'] = $adr->GetParameterValue('TYPE');
+      $type = $adr->GetParameterValue('TYPE');
+      if ( is_array($type) ) $type = implode('~|~',$type);
+      $params[':type'] = $type;
       $address = explode(';',$adr->Value());
 
       // We use @ to suppress the warnings here, because the NULL in the database suits us well.
@@ -128,7 +130,9 @@
     $params = array( ':dav_id' => $dav_id );
     $qry->QDo('DELETE FROM addressbook_address_tel WHERE dav_id = :dav_id', $params );
     foreach( $telephones AS $tel ) {
-      $params[':type'] = $tel->GetParameterValue('TYPE');
+      $type = $tel->GetParameterValue('TYPE');
+      if ( is_array($type) ) $type = implode('~|~',$type);
+      $params[':type'] = $type;
       if ( ! isset($params[':type']) ) $params[':type'] = 'voice';
       $params[':tel'] = $tel->Value();
       $params[':property'] = $tel->Render();
@@ -157,7 +161,9 @@
     $params = array( ':dav_id' => $dav_id );
     $qry->QDo('DELETE FROM addressbook_address_email WHERE dav_id = :dav_id', $params );
     foreach( $emails AS $email ) {
-      $params[':type'] = $email->GetParameterValue('TYPE');
+      $type = $email->GetParameterValue('TYPE');
+      if ( is_array($type) ) $type = implode('~|~',$type);
+      $params[':type'] = $type;
       $params[':email'] = $email->Value();
       $params[':property'] = $email->Render();
       $qry->QDo( 'INSERT INTO addressbook_address_email (dav_id, type, email, property) VALUES( :dav_id, :type, :email, :property)', $params );
diff -Nru davical-0.9.9.7/inc/well-known.php davical-1.0.2/inc/well-known.php
--- davical-0.9.9.7/inc/well-known.php	2011-10-07 07:55:02.000000000 +0000
+++ davical-1.0.2/inc/well-known.php	2011-11-02 05:12:04.000000000 +0000
@@ -34,7 +34,7 @@
 if ( $c->enable_scheduling != true )
 {
  $request->DoResponse( 404, translate('The application program does not understand that request.') );
- exit ();
+ // Does not return
 }
 
 header ( 'iSchedule-Version: 1.0' );
@@ -103,5 +103,6 @@
     </capability-set>
  </query-result>
 RESPONSE;
- exit ( 0 );
+
+  @ob_flush();   exit(0);
 }
diff -Nru davical-0.9.9.7/inc/WritableCollection.php davical-1.0.2/inc/WritableCollection.php
--- davical-0.9.9.7/inc/WritableCollection.php	2011-10-19 22:42:24.000000000 +0000
+++ davical-1.0.2/inc/WritableCollection.php	2011-11-01 05:21:45.000000000 +0000
@@ -17,7 +17,7 @@
     return $p->GetParameterValue('TZID');
   }
   
-    /**
+  /**
    * Writes the data to a member in the collection and returns the segment_name of the 
    * resource in our internal namespace.
    *  
@@ -36,7 +36,7 @@
       return false;
     }
 
-    global $tz_regex, $session, $caldav_context;
+    global $session, $caldav_context;
   
     $resources = $vcal->GetComponents('VTIMEZONE',false); // Not matching VTIMEZONE
     $user_no = $this->user_no();
@@ -179,18 +179,11 @@
     $calitem_params[':dtstamp'] = $dtstamp;
   
     $class = $first->GetPValue('CLASS');
-    /* Check and see if we should over ride the class. */
-    /** @todo is there some way we can move this out of this function? Or at least get rid of the need for the SQL query here. */
-    if ( public_events_only($user_no, $path) ) {
-      $class = 'PUBLIC';
-    }
-  
     /*
      * It seems that some calendar clients don't set a class...
-     * RFC2445, 4.8.1.3:
-     * Default is PUBLIC
+     * RFC2445, 4.8.1.3: Default is PUBLIC
      */
-    if ( !isset($class) || $class == '' ) {
+    if ( $this->IsPublicOnly() || !isset($class) || $class == '' ) {
       $class = 'PUBLIC';
     }
     $calitem_params[':class'] = $class;
@@ -202,19 +195,11 @@
       $tz = $vcal->GetTimeZone($tzid);
       $olson = $vcal->GetOlsonName($tz);
     
-      dbg_error_log( 'PUT', ' Using TZID[%s] and location of [%s]', $tzid, (isset($olson) ? $olson : '') );
-      if ( !empty($olson) && ($olson != $last_olson) && preg_match( $tz_regex, $olson ) ) {
+      if ( !empty($olson) && ($olson != $last_olson) ) {
         dbg_error_log( 'PUT', ' Setting timezone to %s', $olson );
         $qry->QDo('SET TIMEZONE TO \''.$olson."'" );
         $last_olson = $olson;
       }
-      $params = array( ':tzid' => $tzid);
-      $qry = new AwlQuery('SELECT 1 FROM timezones WHERE tzid = :tzid', $params );
-      if ( $qry->Exec('PUT',__LINE__,__FILE__) && $qry->rows() == 0 ) {
-        $params[':olson_name'] = $olson;
-        $params[':vtimezone'] = (isset($tz) ? $tz->Render() : null );
-        $qry->QDo('INSERT INTO timezones (tzid, olson_name, active, vtimezone) VALUES(:tzid,:olson_name,false,:vtimezone)', $params );
-      }
     }
 
     $created = $first->GetPValue('CREATED');
@@ -258,8 +243,8 @@
     }
   
     if ( !$this->IsSchedulingCollection() ) {
-      write_alarms($dav_id, $first);
-      write_attendees($dav_id, $vcal);
+      $this->WriteCalendarAlarms($dav_id, $vcal);
+      $this->WriteCalendarAttendees($dav_id, $vcal);
       if ( $log_action && function_exists('log_caldav_action') ) {
         log_caldav_action( $put_action_type, $first->GetPValue('UID'), $user_no, $collection_id, $path );
       }
@@ -317,4 +302,144 @@
     return $segment_name;
   }
 
+  
+  /**
+  * Given a dav_id and an original vCalendar, pull out each of the VALARMs
+  * and write the values into the calendar_alarm table.
+  *
+  * @return null
+  */
+  function WriteCalendarAlarms( $dav_id, vCalendar $vcal ) {
+    $qry = new AwlQuery('DELETE FROM calendar_alarm WHERE dav_id = '.$dav_id );
+    $qry->Exec('PUT',__LINE__,__FILE__);
+
+    $components = $vcal->GetComponents();
+    
+    $qry->SetSql('INSERT INTO calendar_alarm ( dav_id, action, trigger, summary, description, component, next_trigger )
+            VALUES( '.$dav_id.', :action, :trigger, :summary, :description, :component,
+                                        :related::timestamp with time zone + :related_trigger::interval )' );
+    $qry->Prepare();
+    foreach( $components AS $component ) {
+      if ( $component->GetType() == 'VTIMEZONE' ) continue;
+      $alarms = $component->GetComponents('VALARM');
+      if ( count($alarms) < 1 ) return;
+
+      foreach( $alarms AS $v ) {
+        $trigger = array_merge($v->GetProperties('TRIGGER'));
+        if ( $trigger == null ) continue; // Bogus data.
+        $trigger = $trigger[0];
+        $related = null;
+        $related_trigger = '0M';
+        $trigger_type = $trigger->GetParameterValue('VALUE');
+        if ( !isset($trigger_type) || $trigger_type == 'DURATION' ) {
+          switch ( $trigger->GetParameterValue('RELATED') ) {
+            case 'DTEND':  $related = $component->GetPValue('DTEND'); break;
+            case 'DUE':    $related = $component->GetPValue('DUE');   break;
+            default:       $related = $component->GetPValue('DTSTART');
+          }
+          $duration = $trigger->Value();
+          if ( !preg_match('{^-?P(:?\d+W)?(:?\d+D)?(:?T(:?\d+H)?(:?\d+M)?(:?\d+S)?)?$}', $duration ) ) continue;
+          $minus = (substr($duration,0,1) == '-');
+          $related_trigger = trim(preg_replace( '#[PT-]#', ' ', $duration ));
+          if ( $minus ) {
+            $related_trigger = preg_replace( '{(\d+[WDHMS])}', '-$1 ', $related_trigger );
+          }
+          else {
+            $related_trigger = preg_replace( '{(\d+[WDHMS])}', '$1 ', $related_trigger );
+          }
+        }
+        else {
+          if ( false === strtotime($trigger->Value()) ) continue; // Invalid date.
+        }
+        $qry->Bind(':action', $v->GetPValue('ACTION'));
+        $qry->Bind(':trigger', $trigger->Render());
+        $qry->Bind(':summary', $v->GetPValue('SUMMARY'));
+        $qry->Bind(':description', $v->GetPValue('DESCRIPTION'));
+        $qry->Bind(':component', $v->Render());
+        $qry->Bind(':related', $related );
+        $qry->Bind(':related_trigger', $related_trigger );
+        $qry->Exec('PUT',__LINE__,__FILE__);
+      }
+    }
+  }
+  
+  
+  /**
+   * Parse out the attendee property and write a row to the
+   * calendar_attendee table for each one.
+   * @param int $dav_id The dav_id of the caldav_data we're processing
+   * @param vComponent The VEVENT or VTODO containing the ATTENDEEs
+   * @return null
+   */
+  function WriteCalendarAttendees( $dav_id, vCalendar $vcal ) {
+    $qry = new AwlQuery('DELETE FROM calendar_attendee WHERE dav_id = '.$dav_id );
+    $qry->Exec('PUT',__LINE__,__FILE__);
+  
+    $attendees = $vcal->GetAttendees();
+    if ( count($attendees) < 1 ) return;
+  
+    $qry->SetSql('INSERT INTO calendar_attendee ( dav_id, status, partstat, cn, attendee, role, rsvp, property )
+            VALUES( '.$dav_id.', :status, :partstat, :cn, :attendee, :role, :rsvp, :property )' );
+    $qry->Prepare();
+    $processed = array();
+    foreach( $attendees AS $v ) {
+      $attendee = $v->Value();
+      if ( isset($processed[$attendee]) ) {
+        dbg_error_log( 'LOG', 'Duplicate attendee "%s" in resource "%d"', $attendee, $dav_id );
+        dbg_error_log( 'LOG', 'Original:  "%s"', $processed[$attendee] );
+        dbg_error_log( 'LOG', 'Duplicate: "%s"', $v->Render() );
+        continue; /** @todo work out why we get duplicate ATTENDEE on one VEVENT */
+      }
+      $qry->Bind(':attendee', $attendee );
+      $qry->Bind(':status',   $v->GetParameterValue('STATUS') );
+      $qry->Bind(':partstat', $v->GetParameterValue('PARTSTAT') );
+      $qry->Bind(':cn',       $v->GetParameterValue('CN') );
+      $qry->Bind(':role',     $v->GetParameterValue('ROLE') );
+      $qry->Bind(':rsvp',     $v->GetParameterValue('RSVP') );
+      $qry->Bind(':property', $v->Render() );
+      $qry->Exec('PUT',__LINE__,__FILE__);
+      $processed[$attendee] = $v->Render();
+    }
+  }
+  
+  /**
+   * Writes the data to a member in the collection and returns the segment_name of the 
+   * resource in our internal namespace.
+   *  
+   * @param vCalendar $member_dav_name The path to the resource to be deleted.
+   * @return boolean Success is true, or false on failure.
+   */
+  function actualDeleteCalendarMember( $member_dav_name ) {
+    global $session, $caldav_context;
+
+    // A quick sanity check...
+    $segment_name = str_replace( $this->dav_name(), '', $member_dav_name );
+    if ( strstr($segment_name, '/') !== false ) {
+      @dbg_error_log( "DELETE", "DELETE: Refused to delete member '%s' from calendar '%s'!", $member_dav_name, $this->dav_name() );
+      return false;
+    }
+
+    // We need to serialise access to this process just for this collection
+    $cache = getCacheInstance();
+    $myLock = $cache->acquireLock('collection-'.$this->dav_name());
+    
+    $qry = new AwlQuery();
+    $params = array( ':dav_name' => $member_dav_name );
+
+    if ( $qry->QDo("SELECT write_sync_change(collection_id, 404, caldav_data.dav_name) FROM caldav_data WHERE dav_name = :dav_name", $params )
+                    && $qry->QDo("DELETE FROM property WHERE dav_name = :dav_name", $params )
+                    && $qry->QDo("DELETE FROM locks WHERE dav_name = :dav_name", $params )
+                    && $qry->QDo("DELETE FROM caldav_data WHERE dav_name = :dav_name", $params ) ) {
+      @dbg_error_log( "DELETE", "DELETE: Calendar member %s deleted from calendar '%s'", $member_dav_name, $this->dav_name() );
+
+      $cache->releaseLock($myLock);
+      
+      return true;
+    }
+
+    $cache->releaseLock($myLock);
+    return false;
+    
+  }
+
 }
diff -Nru davical-0.9.9.7/po/de.po davical-1.0.2/po/de.po
--- davical-0.9.9.7/po/de.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/de.po	2012-01-13 10:33:09.000000000 +0000
@@ -1,30 +1,34 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# thoerb <thoerb@hotmail.com>, 2011.
-# spasstl <marty@xemail.de>, 2011.
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
 # fmms <mail@felixmoeller.de>, 2011.
+#   <mail@felixmoeller.de>, 2011, 2012.
+# spasstl <marty@xemail.de>, 2011.
+# thoerb <thoerb@hotmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-07-09 18:08+0000\n"
-"Last-Translator: gurkenpapst <gurkenpapst@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2012-01-07 09:14+0000\n"
+"Last-Translator: fmms <mail@felixmoeller.de>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/davical/team/de/)\n"
-"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -74,51 +78,47 @@
 msgid "- updating user records : %s"
 msgstr "- aktualisiere Benutzereinträge: %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
-"<b>WARNUNG: Vor dem Einfügen der ICS-Kalenderdatei werden alle Termine in diesem Pfad gelöscht</b>"
+"<b>WARNUNG: Vor dem Einfügen der ICS-Kalenderdatei werden alle Termine in "
+"diesem Pfad gelöscht</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 "<h1>Hilfe</h1>\n"
-"<p>Besuchen Sie die <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal-Homepage</a> oder "
-"schauen Sie \n"
-"in das <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal-Wiki</a> um Hilfe zu erhalten."
-"</p>\n"
-"<p>Falls Sie dort nicht die gesuchten Informationen finden, können Sie uns über <a href=\"http://de."
-"wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> im\n"
-"Channel <b>#davical</b> auf <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a> "
-"besuchen\n"
-"oder Ihre Frage an die <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal-Users-Mailingliste</a> schicken.</p>\n"
-"<p>Das <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal-Users-"
-"Mailingliste\" target=\"_blank\">Archiv der Mailingliste\n"
+"<p>Besuchen Sie die <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal-Homepage</a> oder schauen Sie \n"
+"in das <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal-Wiki</a> um Hilfe zu erhalten.</p>\n"
+"<p>Falls Sie dort nicht die gesuchten Informationen finden, können Sie uns über <a href=\"http://de.wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> im\n"
+"Channel <b>#davical</b> auf <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a> besuchen\n"
+"oder Ihre Frage an die <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal-Users-Mailingliste</a> schicken.</p>\n"
+"<p>Das <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal-Users-Mailingliste\" target=\"_blank\">Archiv der Mailingliste\n"
 "könnte ebenfalls interessant sein.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
-"<h1>Bitte anmelden</h1><p>Um auf %s zuzugreifen, müssen Sie sich mit demBenutzernamen und dem Passwort "
-"anmelden, die ihnen zugeteilt wurden.</p><p>Um einen Zugang zu beantragen, schreiben Sie eine E-Mail "
-"an %s.</p>"
+"<h1>Bitte anmelden</h1><p>Um auf %s zuzugreifen, müssen Sie sich mit "
+"demBenutzernamen und dem Passwort anmelden, die ihnen zugeteilt "
+"wurden.</p><p>Um einen Zugang zu beantragen, schreiben Sie eine E-Mail an "
+"%s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
-msgstr "Eine DAViCal-Prinzipalen-Sammlung darf nur andere Sammlungen enthalten"
+msgstr ""
+"Eine DAViCal-Prinzipalen-Sammlung darf nur andere Sammlungen enthalten"
 
 msgid "A collection already exists at that location."
 msgstr "An diesem Ort ist bereits eine Sammlung vorhanden."
@@ -160,8 +160,16 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "Sämtliche Daten der Sammlung werden unwiderruflich gelöscht."
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
-msgstr "Alle Kalender und Termine des Prinzipals werden unwiderruflich gelöscht."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+"All Ereignisse des Benutzers \"%s\" wurden gelöscht und durch die aus der "
+"Datei %s ersetzt"
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
+msgstr ""
+"Alle Kalender und Termine des Prinzipals werden unwiderruflich gelöscht."
 
 msgid "All privileges"
 msgstr "Alle Rechte"
@@ -169,8 +177,10 @@
 msgid "All requested changes were made."
 msgstr "Alle gewünschten Änderungen wurden durchgeführt."
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-msgstr "Erlaube Frei-/Beschäftigt-Anfragen an den Besitzer dieser Termineingangsbox "
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgstr ""
+"Erlaube Frei-/Beschäftigt-Anfragen an den Besitzer dieser Termineingangsbox "
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
 msgstr "Ein \"Administrator\" besitzt alle Rechte im DAViCal-System"
@@ -179,7 +189,8 @@
 msgstr "Nicht angemeldete Benutzer dürfen keine Kalender verändern"
 
 msgid "Anonymous users may only access public calendars"
-msgstr "Nicht angemeldete Benutzer können nur auf öffentliche Kalender zugreifen"
+msgstr ""
+"Nicht angemeldete Benutzer können nur auf öffentliche Kalender zugreifen"
 
 msgid "Application DB User"
 msgstr "Anwendungsdatenbankbenutzer"
@@ -205,6 +216,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr "Zuordnungen zur Sammlung dieses Prinzipalen"
 
+msgid "Body contains no XML data!"
+msgstr "Der Hauptteil enthält kein XML!"
+
 msgid "Bound As"
 msgstr "Zugeordnet als"
 
@@ -251,8 +265,11 @@
 msgid "Collection deleted"
 msgstr "Sammlung gelöscht"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
-msgstr "Sammlungen können nicht gleichzeitig CalDAV-Kalender und -Adressbuch sein"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
+msgstr ""
+"Sammlungen können nicht gleichzeitig CalDAV-Kalender und -Adressbuch sein"
 
 msgid "Configuring Calendar Clients for DAViCal"
 msgstr "Konfiguration von Kalender-Clients für DAViCal"
@@ -303,7 +320,9 @@
 msgstr "Prinzipalen anlegen"
 
 msgid "Create a new principal (i.e. a new user, resource or group)"
-msgstr "Einen neuen Prinzipalen (z.B. neuen Benutzer, Ressource oder Gruppe) erstellen"
+msgstr ""
+"Einen neuen Prinzipalen (z.B. neuen Benutzer, Ressource oder Gruppe) "
+"erstellen"
 
 msgid "Create a resource or collection"
 msgstr "Neue Ressource oder Sammlung erstellen"
@@ -315,7 +334,9 @@
 msgstr "Erstelle neuen Prinizipalen."
 
 msgid "Creating new ticket granting privileges to this Principal"
-msgstr "Generiere ein neues Ticket, um diesem Prinzipalen Berechtigungen zu verleihen"
+msgstr ""
+"Generiere ein neues Ticket, um diesem Prinzipalen Berechtigungen zu "
+"verleihen"
 
 msgid "Current DAViCal version "
 msgstr "aktuelle DAViCal-Version"
@@ -323,8 +344,11 @@
 msgid "DAV Path"
 msgstr "DAV-Pfad"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-msgstr "DAV::resourcetype darf nur auf einen neuen Wert gesetzt, nicht aber gelöscht werden."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
+msgstr ""
+"DAV::resourcetype darf nur auf einen neuen Wert gesetzt, nicht aber gelöscht"
+" werden."
 
 msgid "DAViCal CalDAV Server"
 msgstr "DAViCal-CalDAV-Server"
@@ -357,7 +381,8 @@
 msgstr "DKIM-Signaturvalidierung fehlgeschlagen (KEY Validation ERROR)"
 
 msgid "DKIM signature validation failed(Signature verification ERROR)"
-msgstr "DKIM-Signaturvalidierung fehlgeschlagen (Signature verification ERROR)"
+msgstr ""
+"DKIM-Signaturvalidierung fehlgeschlagen (Signature verification ERROR)"
 
 msgid "Database Error"
 msgstr "Datenbankfehler"
@@ -393,7 +418,7 @@
 msgstr "Standardrechte"
 
 msgid "Default relationships added."
-msgstr ""
+msgstr "Standardbeziehungen hinzugefügt."
 
 msgid "Delete"
 msgstr "Löschen"
@@ -422,11 +447,16 @@
 msgid "Deleting Ticket:"
 msgstr "Lösche Ticket:"
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-msgstr "Auslieferung von Termineinladungen von einem Organisierer an diese Termineingangsbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgstr ""
+"Auslieferung von Termineinladungen von einem Organisator an diese "
+"Termineingangsbox"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
-msgstr "Auslieferung von Terminantworten von einem Teilnehmer an diese Termineingangsbox"
+msgstr ""
+"Auslieferung von Terminantworten von einem Teilnehmer an diese "
+"Termineingangsbox"
 
 msgid "Dependencies"
 msgstr "Abhängigkeiten"
@@ -476,13 +506,17 @@
 msgid "Email Address"
 msgstr "E-Mail-Adresse"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
-"Geben Sie Ihren Benutzernamen ein (falls bekannt) und klicken Sie hier, um ein temporäres Passwort per "
-"E-Mail zu erhalten."
+"Geben Sie Ihren Benutzernamen ein (falls bekannt) und klicken Sie hier, um "
+"ein temporäres Passwort per E-Mail zu erhalten."
 
 msgid "Enter your username and password then click here to log in."
-msgstr "Geben Sie Benutzernamen und Passwort ein und klicken Sie hier, um sich anzumelden."
+msgstr ""
+"Geben Sie Benutzernamen und Passwort ein und klicken Sie hier, um sich "
+"anzumelden."
 
 #, php-format
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
@@ -490,7 +524,9 @@
 
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
-msgstr "Der Fehler NoUserFound ist mit dem Filter >%s<, den Attributen >%s< und dn >%s< aufgetreten"
+msgstr ""
+"Der Fehler NoUserFound ist mit dem Filter >%s<, den Attributen >%s< und dn "
+">%s< aufgetreten"
 
 msgid "Error querying database."
 msgstr "Fehler bei der Datenbankabfrage"
@@ -508,14 +544,23 @@
 msgstr "Europäisch (tt.mm.jjjj)"
 
 msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Bestehende Ressource passt nicht zum \"If-Match\"-Header - nicht akzeptiert."
+msgstr ""
+"Bestehende Ressource passt nicht zum \"If-Match\"-Header - nicht akzeptiert."
 
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
-msgstr "Bestehende Ressource passt nicht zum \"If-None-Match\"-Header - nicht akzeptiert."
+msgstr ""
+"Bestehende Ressource passt nicht zum \"If-None-Match\"-Header - nicht "
+"akzeptiert."
 
 msgid "Expires"
 msgstr "Läuft ab"
 
+msgid "External Calendars"
+msgstr "Externe Kalender"
+
+msgid "External Url"
+msgstr "Externe URL"
+
 msgid "Fail"
 msgstr "Fehlgeschlagen"
 
@@ -665,6 +710,9 @@
 msgid "Last used"
 msgstr "Zuletzt verwendet"
 
+msgid "List External Calendars"
+msgstr "Externe Kalender anzeigen"
+
 msgid "List Groups"
 msgstr "Gruppen anzeigen"
 
@@ -695,8 +743,12 @@
 msgid "Member deleted from this Group Principal"
 msgstr "Mitglied wurde von diesem Gruppenprinzipalen entfernt"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
-msgstr "DAViCal wird größtenteils funktionieren, aber PHP 5.2 oder neuer wird dringend empfohlen. "
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
+msgstr ""
+"DAViCal wird größtenteils funktionieren, aber PHP 5.2 oder neuer wird "
+"dringend empfohlen. "
 
 msgid "Name"
 msgstr "Name"
@@ -714,18 +766,12 @@
 msgid "No"
 msgstr "Nein"
 
-msgid "No authority to deliver invitations to user."
-msgstr "Keine Berechtigung, Einladungen an Benutzer zu versenden."
-
 msgid "No calendar content"
 msgstr "Keine Kalendereinträge vorhanden"
 
 msgid "No collection found at that location."
 msgstr "Keine Sammlung an dem Ort gefunden."
 
-msgid "No scheduling support for user"
-msgstr "Keine Scheduling-Unterstützung für den Benutzer"
-
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
@@ -769,18 +815,26 @@
 msgid "PHP PDO module available"
 msgstr "PHP-PDO-Modul vorhanden"
 
-msgid "PHP PostgreSQL available"
-msgstr "PHP-PostgreSQL vorhanden"
-
 msgid "PHP calendar extension available"
-msgstr ""
+msgstr "PHP Kalendererweiterung verfügbar"
 
 msgid "PHP iconv support"
 msgstr "PHP-iconv-Unterstützung"
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr "PHP benutzt nicht den Apache Filter-Modus"
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+"PUT-Anfrage an eine Collection ist nur mit text/calendar-Inhalt an eine "
+"Kalender-Collection erlaubt"
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
-"PUT-Anfrage an eine Collection ist nur mit text/calendar-Inhalt an eine Kalender-Collection erlaubt"
 
 msgid "Passed"
 msgstr "Erfolgreich"
@@ -807,7 +861,8 @@
 msgstr "Bitte bestätigen Sie die Löschung des Prinzipalen"
 
 msgid "Please note the time and advise the administrator of your system."
-msgstr "Notieren Sie bitte die Zeit und benachrichtigen Sie den Systemadministrator."
+msgstr ""
+"Notieren Sie bitte die Zeit und benachrichtigen Sie den Systemadministrator."
 
 msgid "Principal"
 msgstr "Prinzipal"
@@ -833,6 +888,12 @@
 msgid "Privileges granted to All Users"
 msgstr "Berechtigungen für alle Benutzer gesetzt"
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr "Rechte um die Zustellung von Scheduling-Nachrichten zu erlauben"
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr "Rechte um Scheduling-Anfragen zu delegieren"
+
 msgid "Property is read-only"
 msgstr "Eigenschaft ist schreibgeschützt"
 
@@ -867,7 +928,8 @@
 msgid "Read the content of a resource or collection"
 msgstr "Den Inhalt einer Ressource oder Sammlung lesen"
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr "Lesen der Details der Zugriffsberechtigungen des aktuellen Benutzers"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -876,12 +938,18 @@
 msgid "Read/Write"
 msgstr "Lesen/Schreiben"
 
+msgid "References"
+msgstr "Verlinkungen"
+
 msgid "Remove"
 msgstr "Entfernen"
 
 msgid "Remove a lock"
 msgstr "Sperre entfernen"
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Fehler melden"
 
@@ -894,7 +962,8 @@
 msgid "Request body is not valid XML data!"
 msgstr "Anfrage-Body enthält keine gültigen XML-Daten!"
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Ressource"
 
@@ -922,9 +991,6 @@
 msgid "Schedule Transparency"
 msgstr "Terminplantransparenz"
 
-msgid "Scheduling invitation delivered successfully"
-msgstr "Termineinladung erfolgreich übermittelt"
-
 msgid "Scheduling: Deliver a Reply"
 msgstr "Terminverarbeitung: Antwort zustellen"
 
@@ -952,11 +1018,19 @@
 msgid "Send free/busy enquiries"
 msgstr "Verfügbarkeitsanfrage senden"
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-msgstr "Einladungen als Organisator vom Besitzer dieser Terminausgangsbox verschicken."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
+msgstr ""
+"Einladungen als Organisator vom Besitzer dieser Terminausgangsbox "
+"verschicken."
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-msgstr "Einladungsantworten als Teilnehmer vom Besitzer dieser Terminausgangsbox versenden."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
+msgstr ""
+"Einladungsantworten als Teilnehmer vom Besitzer dieser Terminausgangsbox "
+"versenden."
 
 msgid "Set free/busy privileges"
 msgstr "Verfügbarkeitsrechte setzen"
@@ -967,13 +1041,10 @@
 msgid "Set read+write privileges"
 msgstr "Schreib-/Leserechte setzen"
 
-msgid "Set schedule-deliver privileges"
-msgstr "Terminauslieferungsberechtigungen setzen"
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
-"Pfad in dem .ics-Dateien gespeichert werden sollen; \"home\" wird z.B. als \"/caldav.php/me/home/\" "
-"referenziert"
 
 msgid "Setup"
 msgstr "Konfiguration"
@@ -999,8 +1070,11 @@
 msgid "Source resource does not exist."
 msgstr "Quellressource existiert nicht."
 
-msgid "Special collections may not contain a calendar or other special collection."
-msgstr "Spezialsammlungen dürfen keine Kalender oder andere Spezialsammlungen enthalten."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
+msgstr ""
+"Spezialsammlungen dürfen keine Kalender oder andere Spezialsammlungen "
+"enthalten."
 
 msgid "Specific Privileges"
 msgstr "Sonderrechte"
@@ -1018,8 +1092,8 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr "Suhosin: \"server.strip\" deaktiviert"
 
-msgid "Sync LDAP Groups with RSCDS"
-msgstr "Synchronisiere LDAP-Gruppen mit DAViCal"
+msgid "Sync LDAP Groups with DAViCal"
+msgstr "LDAP-Gruppen mit DAViCal synchronisieren"
 
 msgid "Sync LDAP with DAViCal"
 msgstr "Synchronisiere LDAP mit DAViCal"
@@ -1042,8 +1116,11 @@
 msgid "The BIND method is not allowed at that location."
 msgstr "Die BIND-Methode ist an dieser Stelle nicht erlaubt."
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-msgstr "Das Attribut \"CalDAV:schedule-calendar-transp\" darf nur bei Kalendern gesetzt werden."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgstr ""
+"Das Attribut \"CalDAV:schedule-calendar-transp\" darf nur bei Kalendern "
+"gesetzt werden."
 
 msgid "The DAViCal Home Page"
 msgstr "Die DAViCal-Startseite"
@@ -1051,11 +1128,12 @@
 msgid "The access ticket will be deleted."
 msgstr "Das Zugriffsticket wird gelöscht."
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr "addressbook-query darf nur bei einem Adressbuch ausgeführt werden"
 
 msgid "The application failed to understand that request."
-msgstr ""
+msgstr "Die Anwendungen konnte die Anfrage nicht verarbeiten."
 
 msgid "The application program does not understand that request."
 msgstr "Das Anwendungsprogramm versteht diese Anfrage nicht."
@@ -1067,13 +1145,18 @@
 msgstr "Der Kalenderpfad enthält ungültige Zeichen."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
-"Das Attribut \"calendar-free-busy-set\" ist vom Attribut \"schedule-transp\" einer Kalendersammlung "
-"ersetzt worden."
+"Das Attribut \"calendar-free-busy-set\" ist vom Attribut \"schedule-transp\""
+" einer Kalendersammlung ersetzt worden."
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-msgstr "calendar-query darf nur bei einem Kalender oder einer Terminsammlung ausgeführt werden"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
+msgstr ""
+"calendar-query darf nur bei einem Kalender oder einer Terminsammlung "
+"ausgeführt werden"
 
 msgid "The collection name may not be blank."
 msgstr "Der Name für die Sammlung darf nicht leer sein."
@@ -1081,14 +1164,26 @@
 msgid "The destination collection does not exist"
 msgstr "Die angeforderte Sammlung existiert nicht"
 
-msgid "The displayname may only be set on collections, principals or bindings."
-msgstr "Der Anzeigenname darf nur für Sammlungen, Prinzipale oder Verknüpfungen gesetzt werden."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
+msgstr ""
+"Der Anzeigenname darf nur für Sammlungen, Prinzipale oder Verknüpfungen "
+"gesetzt werden."
 
 msgid "The email address really should not be blank."
 msgstr "Das Feld für die E-Mail-Adresse sollte auf keinen Fall leer bleiben."
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
-msgstr "Die Datei ist nicht in UTF-8-kodiert, bitte Fehler überprüfen für mehr Details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+"Die Datei \"%s\" ist nicht UTF-8-kodiert; weitere Details stehen in der "
+"Fehlermeldung."
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
+"Die Datei ist nicht in UTF-8-kodiert, bitte Fehler überprüfen für mehr "
+"Details."
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "Der vollständige Name dieser Person, Gruppe oder anderer Prinzipale."
@@ -1105,6 +1200,10 @@
 msgid "The preferred language for this person."
 msgstr "Die bevorzugte Sprache dieses Benutzers."
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr "Der Prinzipale \"%s\" existiert nicht."
+
 msgid "The style of dates used for this person."
 msgstr "Das Datumsformat, das von diesem Benutzer verwendet wird."
 
@@ -1127,10 +1226,12 @@
 msgstr "Beim Schreiben in die Datenbank ist ein Fehler aufgetreten."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 "Diese Funktion erledigt die folgenden Aufgaben:\n"
 "<ul>\n"
@@ -1138,18 +1239,18 @@
 "  <li>überprüfen der Gruppen in DAViCal</li>\n"
 "</ul> danach\n"
 "<ul>\n"
-"  <li>falls eine Gruppe in DAViCal vorhanden ist, nicht aber im LDAP, diese in DAViCal als inaktiv "
-"markieren</li>\n"
+"  <li>falls eine Gruppe in DAViCal vorhanden ist, nicht aber im LDAP, diese in DAViCal als inaktiv markieren</li>\n"
 "  <li>falls eine Gruppe im LDAP vorhanden ist, nicht aber in DAViCal, diese in DAViCal anlegen</li>\n"
-"  <li>falls eine Gruppe im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren</"
-"li>\n"
+"  <li>falls eine Gruppe im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren</li>\n"
 "</ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 "Diese Funktion erledigt die folgenden Aufgaben:\n"
 "<ul>\n"
@@ -1157,20 +1258,26 @@
 "  <li>überprüfen der Benutzer in DAViCal</li>\n"
 "</ul> danach\n"
 "<ul>\n"
-"  <li>falls ein Benutzer in DAViCal vorhanden ist, nicht aber im LDAP, diesen in DAViCal als inaktiv "
-"markieren</li>\n"
+"  <li>falls ein Benutzer in DAViCal vorhanden ist, nicht aber im LDAP, diesen in DAViCal als inaktiv markieren</li>\n"
 "  <li>falls ein Benutzer im LDAP vorhanden ist, nicht aber in DAViCal, diesen in DAViCal anlegen</li>\n"
-"  <li>falls ein Benutzer im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal "
-"aktualisieren</li>\n"
+"  <li>falls ein Benutzer im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren</li>\n"
 "</ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
-"Diese Seite überprüft in erster Linie die Umgebung, die für DAViCal für korrektes Fuktionieren "
-"benötigt wird. Vorschläge oder Korrekturen, um diese Seite noch sinnvoller zu gestalten werden dankbar "
-"angenommen."
+"Diese Seite überprüft in erster Linie die Umgebung, die für DAViCal für "
+"korrektes Fuktionieren benötigt wird. Vorschläge oder Korrekturen, um diese "
+"Seite noch sinnvoller zu gestalten werden dankbar angenommen."
+
+msgid ""
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
+msgstr ""
+"Dieser Prozess wird jede Datei eines Verzeichnis in der Form "
+"\"Benutzer.ics\" importieren und die entsprechenden Benutzer anlegen."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr "Der Server unterstützt nur das text/calendar-Format für FreeBusy-URLs"
@@ -1232,10 +1339,12 @@
 msgid "Upgrade Database"
 msgstr "Datenbank aktualisieren"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
-"Laden Sie eine .ics-Kalenderdatei im iCalendar-Format hoch, um diesen Kalender zu initialisieren oder "
-"zu ersetzen."
+"Laden Sie eine .ics-Kalenderdatei im iCalendar-Format hoch, um diesen "
+"Kalender zu initialisieren oder zu ersetzen."
 
 msgid "User Calendar Principals"
 msgstr "Prinzipal des Benutzerkalenders"
@@ -1278,8 +1387,8 @@
 msgstr "Erwartet: %s, erhalten: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 "Warnung: Es sind keine aktiven Admin-Benutzer. Sie sollten dies vor dem Abmelden beheben. \n"
 "\n"
@@ -1331,11 +1440,8 @@
 msgstr "Sie müssen angemeldet sein um dieses System zu nutzen."
 
 msgid "Your configuration produced PHP errors which should be corrected"
-msgstr "Ihre Konfiguration hat PHP-Fehler verursacht. Dies sollte korrigiert werden."
-
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "Alle Termine des Benutzers %s wurden gelöscht und durch Termine aus der Datei %s ersetzt"
+msgstr ""
+"Ihre Konfiguration hat PHP-Fehler verursacht. Dies sollte korrigiert werden."
 
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr "Die Eigenschaft \"calendar-timezone\" ist nur für einen Kalender gültig."
@@ -1344,32 +1450,49 @@
 msgid "directory %s is not readable"
 msgstr "Verzeichnis %s kann nicht gelesen werden"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_imap_pam: imap_url-Parameter wurde nicht in /etc/davical/*-conf.php konfiguriert"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
+msgstr ""
+"drivers_imap_pam: imap_url-Parameter wurde nicht in /etc/davical/*-conf.php "
+"konfiguriert"
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
-msgstr "drivers_ldap: TLS konnte nicht gestartet werden: ldap_start_tls() ist fehlgeschlagen"
+msgstr ""
+"drivers_ldap: TLS konnte nicht gestartet werden: ldap_start_tls() ist "
+"fehlgeschlagen"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-msgstr "drivers_ldap: Verbindung (bind) zu Host %1$s auf Port %2$s mit bindDN %3$s ist fehlgeschlagen"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap: Verbindung (bind) zu Host %1$s auf Port %2$s mit bindDN %3$s "
+"ist fehlgeschlagen"
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-msgstr "drivers_ldap: LDAP Protokoll-Version 3 konnte nicht gesetzt werden, TLS wird nicht unterstützt"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
+msgstr ""
+"drivers_ldap: LDAP Protokoll-Version 3 konnte nicht gesetzt werden, TLS wird"
+" nicht unterstützt"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap: Verbindung (bind) zu LDAP fehlgeschlagen - bitte überprüfen, ob bindDN und passDN "
-"richtig konfiguriert sind, und ob der LDAP Server erreichbar ist"
+"drivers_ldap: Verbindung (bind) zu LDAP fehlgeschlagen - bitte überprüfen, "
+"ob bindDN und passDN richtig konfiguriert sind, und ob der LDAP Server "
+"erreichbar ist"
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap: LDAP-Verbindung zu Port %s auf Host %s fehlgeschlagen"
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-msgstr "drivers_ldap: Funktion ldap_connect nicht definiert, bitte php_ldap Modul überprüfen"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
+"drivers_ldap: Funktion ldap_connect nicht definiert, bitte php_ldap Modul "
+"überprüfen"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
@@ -1379,7 +1502,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam: Kann Datei %s nicht finden"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "angemeldet bleiben"
 
@@ -1389,12 +1513,13 @@
 msgid "path to store your ics"
 msgstr "Speicherort für .ics-Datei"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "Die Datei %s ist nicht UTF-8-kodiert; weitere Details stehen in der Fehlermeldung."
-
 msgid "unauthenticated"
 msgstr "Nicht angemeldet"
 
-msgid "you should log on with the username and password that have been issued to you."
-msgstr "Melden Sie sich mit dem Ihnen zugeteilten Benutzernamen und Passwort an."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
+msgstr ""
+"Melden Sie sich mit dem Ihnen zugeteilten Benutzernamen und Passwort an."
+
+
diff -Nru davical-0.9.9.7/po/es_AR.po davical-1.0.2/po/es_AR.po
--- davical-0.9.9.7/po/es_AR.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/es_AR.po	2012-01-04 23:04:36.000000000 +0000
@@ -1,27 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -71,32 +74,32 @@
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-msgstr ""
-"<h1>Por favor, iniciar sesión</h1><p>Para acceder al %s debe conectarse con el nombre de usuario y "
-"contraseña que le han sido asignado.</p><p>Si desea solicitar el acceso, por favor, e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
+msgstr ""
+"<h1>Por favor, iniciar sesión</h1><p>Para acceder al %s debe conectarse con "
+"el nombre de usuario y contraseña que le han sido asignado.</p><p>Si desea "
+"solicitar el acceso, por favor, e-mail %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -141,7 +144,12 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr ""
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -150,7 +158,8 @@
 msgid "All requested changes were made."
 msgstr ""
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -186,6 +195,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -232,7 +244,9 @@
 msgid "Collection deleted"
 msgstr ""
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -304,7 +318,8 @@
 msgid "DAV Path"
 msgstr ""
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -403,7 +418,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -446,7 +462,9 @@
 msgstr ""
 
 msgid "ERROR: There was a database error writing the roles information!"
-msgstr "ERROR: Hubo un error en la base de datos al grabar la información de los roles!"
+msgstr ""
+"ERROR: Hubo un error en la base de datos al grabar la información de los "
+"roles!"
 
 msgid "Edit"
 msgstr ""
@@ -457,7 +475,9 @@
 msgid "Email Address"
 msgstr ""
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -495,6 +515,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -644,6 +670,9 @@
 msgid "Last used"
 msgstr "Utilizado por última vez"
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr ""
 
@@ -674,7 +703,9 @@
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
@@ -693,18 +724,12 @@
 msgid "No"
 msgstr ""
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr ""
 
 msgid "No collection found at that location."
 msgstr ""
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -748,16 +773,23 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr ""
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -785,7 +817,9 @@
 msgstr ""
 
 msgid "Please note the time and advise the administrator of your system."
-msgstr "Por favor, tome nota de la fecha y hora y contacte a su administrador de sistemas."
+msgstr ""
+"Por favor, tome nota de la fecha y hora y contacte a su administrador de "
+"sistemas."
 
 msgid "Principal"
 msgstr ""
@@ -811,6 +845,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr ""
 
@@ -845,7 +885,8 @@
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -854,12 +895,18 @@
 msgid "Read/Write"
 msgstr ""
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Reportar Error"
 
@@ -872,7 +919,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -900,9 +948,6 @@
 msgid "Schedule Transparency"
 msgstr ""
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr ""
 
@@ -930,10 +975,14 @@
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -945,10 +994,9 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
-msgstr ""
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -975,7 +1023,8 @@
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -994,7 +1043,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1018,7 +1067,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1027,7 +1077,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1043,10 +1094,13 @@
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1055,13 +1109,19 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1079,6 +1139,10 @@
 msgid "The preferred language for this person."
 msgstr "El idioma preferido por ésta persona."
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr "El estilo de fechas utilizado por ésta persona."
 
@@ -1101,22 +1165,32 @@
 msgstr "Hubo un error al grabar en la base de datos."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1179,7 +1253,9 @@
 msgid "Upgrade Database"
 msgstr ""
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
 
 msgid "User Calendar Principals"
@@ -1223,8 +1299,8 @@
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1275,10 +1351,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr ""
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1286,29 +1358,35 @@
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr ""
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
@@ -1319,7 +1397,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr ""
 
@@ -1329,12 +1408,14 @@
 msgid "path to store your ics"
 msgstr ""
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
+msgid "unauthenticated"
 msgstr ""
 
-msgid "unauthenticated"
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr ""
+"Para conectarse debe utilizar el nombre de usuario y contraseña que le ha "
+"sido asignado."
+
 
-msgid "you should log on with the username and password that have been issued to you."
-msgstr "Para conectarse debe utilizar el nombre de usuario y contraseña que le ha sido asignado."
diff -Nru davical-0.9.9.7/po/es_ES.po davical-1.0.2/po/es_ES.po
--- davical-0.9.9.7/po/es_ES.po	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/po/es_ES.po	2012-01-04 23:04:39.000000000 +0000
@@ -0,0 +1,1520 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Eugene Ciurana <transifex@cime.net>, 2011.
+# Jorge López <jorge@adobo.org>, 2011.
+# pr3d4t0r <transifex@ciurana.eu>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: DAViCal\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
+"Language-Team: Spanish (Spain) (http://www.transifex.net/projects/p/davical/team/es_ES/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es_ES\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
+msgid "%F %T"
+msgstr "%F %T"
+
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
+msgid "%T"
+msgstr "%T"
+
+msgid "*** Default Locale ***"
+msgstr "*** Configuración regional estándar ***"
+
+msgid "*** Unknown ***"
+msgstr "*** Desconocido ***"
+
+#, php-format
+msgid "- adding %s to group : %s"
+msgstr "- agregando %s al grupo %s"
+
+#, php-format
+msgid "- adding users %s to group : %s"
+msgstr "- agregando usuarios %s al grupo %s"
+
+#, php-format
+msgid "- creating groups : %s"
+msgstr "- creando los grupos:  %s"
+
+#, php-format
+msgid "- creating record for users :  %s"
+msgstr "- creando el registro para usuarios:  %s"
+
+#, php-format
+msgid "- deactivate groups : %s"
+msgstr "- grupos %s desactivados"
+
+#, php-format
+msgid "- deactivating users : %s"
+msgstr "- desactivando a los usuarios:  %s"
+
+#, php-format
+msgid "- nothing done on : %s"
+msgstr "- ningún cambio para:  %s"
+
+#, php-format
+msgid "- removing %s from group : %s"
+msgstr "- eliminando a %s del grupo:  %s"
+
+#, php-format
+msgid "- updating groups : %s"
+msgstr "- actualizando los grupos:  %s"
+
+#, php-format
+msgid "- updating user records : %s"
+msgstr "- actualizando los registros de usuario:  %s"
+
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
+msgstr ""
+"<b>ADVERTENCIA:  todos los eventos en este contenedor serán eliminados antes"
+" de insertar el archivo ics</b>"
+
+#, php-format
+msgid ""
+"<h1>Help</h1>\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
+"a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
+"archives can be helpful too.</p>"
+msgstr ""
+"<h1>Ayuda</h>\n"
+"<p>Visita <a href='http://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para ayuda inicial, o consulta<a href='http://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>.</p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='http://wikipedia.org/wiki/Internet_Relay_Chat' target='_blank'>IRC</a> enel canal <b>#davical</b> en <a href='http://www.oftc.net/' target='_blank'>irc.oftc.net</a>,\n"
+"o envía tus preguntas a <a href='http://lists.sourceforge.net/mailman/listinfo/davical-general' target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n"
+"<p>El <a href='http://sourceforge.net/mailarchive/forum.php?forum_id=8348' title='Lista de Correo de Usuarios DAViCal' target='_blank'>archivo de la lista de correo</a>tambien te será útil."
+
+#, php-format
+msgid ""
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
+msgstr ""
+"<h1>Por favor, autentíquese</h1><p>Para acceder a %s debe identificarse con "
+"su nombre de usuario y su clave de acceso.</p><p>Escriba a %s si desea "
+"solicitar acceso."
+
+msgid "A DAViCal principal collection may only contain collections"
+msgstr ""
+"Una colección principal de DAViCal solo puede contener otras colecciones"
+
+msgid "A collection already exists at that location."
+msgstr "Ya existe una colección en esa ruta."
+
+msgid "A resource already exists at the destination."
+msgstr "Ya existe un recurso en ese destino."
+
+msgid "AWL Library version "
+msgstr "Versión de la biblioteca AWL"
+
+msgid "Access Tickets"
+msgstr "Tickets de acceso"
+
+msgid "Access ticket deleted"
+msgstr "Ticket de acceso eliminado"
+
+msgid "Action"
+msgstr "Acción"
+
+msgid "Active"
+msgstr "Activo"
+
+msgid "Adding new member to this Group Principal"
+msgstr "Agregando un nuevo miembro a este grupo"
+
+#. Translators: in the sense of 'systems admin'
+msgid "Admin"
+msgstr "Admin"
+
+msgid "Administration"
+msgstr "Administración"
+
+msgid "Administrator"
+msgstr "Administrador"
+
+msgid "All"
+msgstr "Todos"
+
+msgid "All collection data will be unrecoverably deleted."
+msgstr "Todos los datos de esta colección serán eliminados permanentemente."
+
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+"Todos los eventos del usuario \"%s\" fueron eliminados y reemplazados por "
+"los contenidos en el fichero %s"
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
+msgstr ""
+"Todos los calendarios y eventos de este 'principal' serán eliminados "
+"permanentemente."
+
+msgid "All privileges"
+msgstr "Todos los privilegios"
+
+msgid "All requested changes were made."
+msgstr "Todos los cambios solicitados fueron aplicados."
+
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgstr ""
+"Permitir consultas libre/ocupado sobre el dueño de este buzón de "
+"planificación"
+
+msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
+msgstr "Un usuario \"Administrador\" tiene todos los permisos en DAViCal."
+
+msgid "Anonymous users are not allowed to modify calendars"
+msgstr "Los usuarios anónimos no tienen permiso para modificar calendarios"
+
+msgid "Anonymous users may only access public calendars"
+msgstr "Los usuarios anónimos solo pueden ver calendarios públicos"
+
+msgid "Application DB User"
+msgstr "Usuario de la base de datos"
+
+msgid "Apply Changes"
+msgstr "Aplicar cambios"
+
+msgid "Apply DB Patches"
+msgstr "Aplicar cambios a la base de datos"
+
+msgid "Attachment"
+msgstr "Adjunto"
+
+msgid "Binding deleted"
+msgstr "Enlace eliminado"
+
+msgid "Bindings to other collections"
+msgstr "Enlaces a otras colecciones"
+
+msgid "Bindings to this Collection"
+msgstr "Enlaces a esta colección"
+
+msgid "Bindings to this Principal's Collections"
+msgstr "Enlaces a las colecciones de este 'principal'"
+
+msgid "Body contains no XML data!"
+msgstr "¡El cuerpo no contiene datos XML!"
+
+msgid "Bound As"
+msgstr "Enlazado como"
+
+msgid "Browse all users"
+msgstr "Ver todos los usuarios"
+
+msgid "Busy"
+msgstr "Ocupado"
+
+#, php-format
+msgid "Calendar \"%s\" was loaded from file."
+msgstr "El calendario \"%s\" fue cargado desde un fichero."
+
+msgid "Calendar Principals"
+msgstr "'Principales' del calendario"
+
+msgid "Calendar Timezone"
+msgstr "Zona horaria del calendario"
+
+msgid "Can only add tickets for existing collection paths which you own"
+msgstr ""
+"Solo puede agregar tickets en conexiones existentes que le pertenezcan"
+
+msgid "Categories"
+msgstr "Categorías"
+
+msgid "Change Password"
+msgstr "Cambiar la contraseña"
+
+msgid "Click to display user details"
+msgstr "Haga click para ver los detalles del usuario"
+
+msgid "Click to edit principal details"
+msgstr "Haga click para ver los detalles del 'principal'"
+
+msgid "Collection"
+msgstr "Colección"
+
+msgid "Collection Grants"
+msgstr "Permisos sobre la colección"
+
+msgid "Collection ID"
+msgstr "ID de la colección"
+
+msgid "Collection deleted"
+msgstr "Colección eliminada"
+
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
+msgstr ""
+"Las colecciones no pueden ser calendarios CalDAV y agendas de teléfono "
+"CardDAV al mismo tiempo"
+
+msgid "Configuring Calendar Clients for DAViCal"
+msgstr "Configurando clientes de calendario para DAViCal"
+
+msgid "Configuring DAViCal"
+msgstr "Configurando DAViCal"
+
+msgid "Confirm"
+msgstr "Confirmar"
+
+msgid "Confirm Deletion of the Binding"
+msgstr "Confirmar eliminación del enlace"
+
+msgid "Confirm Deletion of the Collection"
+msgstr "Confirmar eliminación de la colección"
+
+msgid "Confirm Deletion of the Principal"
+msgstr "Confirmar eliminación del 'principal'"
+
+msgid "Confirm Deletion of the Ticket"
+msgstr "Confirmar eliminación del ticket"
+
+msgid "Confirm Password"
+msgstr "Confirmar la contraseña"
+
+msgid "Confirm the new password."
+msgstr "Confirmar la nueva contraseña"
+
+msgid "Could not retrieve"
+msgstr "No se pudo obtener"
+
+msgid "Create"
+msgstr "Crear"
+
+msgid "Create Collection"
+msgstr "Crear una colección"
+
+msgid "Create Events/Collections"
+msgstr "Crear eventos/colecciones"
+
+msgid "Create New Collection"
+msgstr "Crear una colección nueva"
+
+msgid "Create New Principal"
+msgstr "Crear un 'principal' nuevo"
+
+msgid "Create Principal"
+msgstr "Crear un 'principal'"
+
+msgid "Create a new principal (i.e. a new user, resource or group)"
+msgstr "Crear un principal nuevo (i.e. un usuario, recurso, o grupo)"
+
+msgid "Create a resource or collection"
+msgstr "Crear un recurso o colección"
+
+msgid "Creating new Collection."
+msgstr "Creando una colección nueva."
+
+msgid "Creating new Principal record."
+msgstr "Creando un registro nuevo de 'principal'."
+
+msgid "Creating new ticket granting privileges to this Principal"
+msgstr "Creando un ticket nuevo para dar privilegios a este 'principal'"
+
+msgid "Current DAViCal version "
+msgstr "Versión actual de DAViCal"
+
+msgid "DAV Path"
+msgstr "Ruta DAV"
+
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
+msgstr ""
+"DAV::resourcetype sólo puede tener un nuevo valor, no puede ser eliminado"
+
+msgid "DAViCal CalDAV Server"
+msgstr "Servidor CalDAV DAViCal"
+
+msgid "DAViCal DB Schema version "
+msgstr "Versión del esquema de la base de datos de DAViCal "
+
+msgid "DAViCal Homepage"
+msgstr "Página web de DAViCal"
+
+msgid "DAViCal Wiki"
+msgstr "Wiki de DAViCal"
+
+msgid "DAViCal only allows BIND requests for collections at present."
+msgstr "DAViCal solo permite BINDs a collecciones por ahora."
+
+msgid "DKIM signature invalid "
+msgstr "Firma DKIM inválida"
+
+msgid "DKIM signature missing"
+msgstr "Falta la firma DKIM"
+
+msgid "DKIM signature validation failed(DNS ERROR)"
+msgstr "La validación de la firma DKIM falló(ERROR de DNS)"
+
+msgid "DKIM signature validation failed(KEY Parse ERROR)"
+msgstr "Validación de firma DKIM falló (ERROR al interpretar KEY)"
+
+msgid "DKIM signature validation failed(KEY Validation ERROR)"
+msgstr "La validación de la firma DKIM falló(ERROR de validación de LLAVE)"
+
+msgid "DKIM signature validation failed(Signature verification ERROR)"
+msgstr "La validación de la firma DKIM falló(ERROR de verificación de firma)"
+
+msgid "Database Error"
+msgstr "Error en la base de datos"
+
+msgid "Database Host"
+msgstr "Servidor de base de datos"
+
+msgid "Database Name"
+msgstr "Nombre de la base de datos"
+
+msgid "Database Owner"
+msgstr "Propietario de la base de datos"
+
+msgid "Database Password"
+msgstr "Contraseña de la base de datos"
+
+msgid "Database Port"
+msgstr "Puerto de la base de datos"
+
+msgid "Database Username"
+msgstr "Nombre de usuario para la base de datos"
+
+msgid "Database error"
+msgstr "Error en la base de datos"
+
+msgid "Date Format Style"
+msgstr "Estilo del formato de fecha"
+
+msgid "Date Style"
+msgstr "Formato de fecha"
+
+msgid "Default Privileges"
+msgstr "Privilegios por defecto"
+
+msgid "Default relationships added."
+msgstr "Relaciones por defecto añadidas"
+
+msgid "Delete"
+msgstr "Eliminar"
+
+msgid "Delete Events/Collections"
+msgstr "Eliminar eventos/colecciones"
+
+msgid "Delete Principal"
+msgstr "Eliminar el 'principal'"
+
+msgid "Delete a resource or collection"
+msgstr "Eliminar un recurso o colección"
+
+msgid "Deleted a grant from this Principal"
+msgstr "Prilegio eliminado de este 'principal'"
+
+msgid "Deleting Binding:"
+msgstr "Eliminando enlace:"
+
+msgid "Deleting Collection:"
+msgstr "Eliminando colección:"
+
+msgid "Deleting Principal:"
+msgstr "Eliminando 'principal':"
+
+msgid "Deleting Ticket:"
+msgstr "Eliminando ticket:"
+
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgstr ""
+"Permitir al organizador de un evento enviar una invitación a este buzón de "
+"planificación"
+
+msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
+msgstr ""
+"Permitir a un asistente a un evento enviar una respuesta a este buzón de "
+"planificación"
+
+msgid "Dependencies"
+msgstr "Dependencias"
+
+msgid "Dependency"
+msgstr "Dependencia"
+
+msgid "Description"
+msgstr "Descripción"
+
+msgid "Destination collection does not exist"
+msgstr "La colección de destino no existe"
+
+msgid "Directory on the server"
+msgstr "Directorio en el servidor"
+
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+msgid "Displayname"
+msgstr "Nombre mostrado"
+
+msgid "Does the user have the right to perform this role?"
+msgstr "¿El usuario tiene permiso para desempeñar este rol?"
+
+msgid "EMail"
+msgstr "Email"
+
+msgid "EMail OK"
+msgstr "Email correcto"
+
+msgid "ERROR: The full name may not be blank."
+msgstr "ERROR: El nombre completo no puede estar vacío."
+
+msgid "ERROR: The new password must match the confirmed password."
+msgstr ""
+"ERROR: La nueva contraseña debe coincidir con el campo de confirmación"
+
+msgid "ERROR: There was a database error writing the roles information!"
+msgstr ""
+"ERROR: Hubo un error en la base de datos al escribir la información sobre "
+"los roles"
+
+msgid "Edit"
+msgstr "Editar"
+
+msgid "Edit this user record"
+msgstr "Editar el registro de este usuario"
+
+msgid "Email Address"
+msgstr "Dirección de email"
+
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
+msgstr ""
+"Proporcione un nombre de usuario, si lo sabe, y haga click aquí para "
+"enviarle una contraseña temporal."
+
+msgid "Enter your username and password then click here to log in."
+msgstr ""
+"Proporcione su nombre de usuario y contraseña, depues haga click aquí para "
+"acceder."
+
+#, php-format
+msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
+msgstr "Error NoGroupFound con el filtro >%s<, atributos >%s< , dn >%s<"
+
+#, php-format
+msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
+msgstr "Error NoUserFound con filtro >%s<, atributos >%s< , dn >%s<"
+
+msgid "Error querying database."
+msgstr "Error consultando la base de datos."
+
+msgid "Error writing calendar details to database."
+msgstr "Error al escribir los detalles del calendario en la base de datos."
+
+msgid "Error writing calendar properties to database."
+msgstr "Error al escribir las propiedades del calendario en la base de datos."
+
+msgid "European"
+msgstr "Europeo"
+
+msgid "European (d/m/y)"
+msgstr "Europeo (d/m/y)"
+
+msgid "Existing resource does not match \"If-Match\" header - not accepted."
+msgstr ""
+"El recurso existente no coincide con el encabezado \"If-Match\" - rechazado."
+
+msgid "Existing resource matches \"If-None-Match\" header - not accepted."
+msgstr ""
+"El recurso existente coincide con el encabezado \"If-None-Match\" - "
+"rechazado."
+
+msgid "Expires"
+msgstr "Expira"
+
+msgid "External Calendars"
+msgstr "Calendarios externos"
+
+msgid "External Url"
+msgstr "URL externa"
+
+msgid "Fail"
+msgstr "Fallo"
+
+msgid "Failed to write collection."
+msgstr "Fallo al escribir la colección."
+
+msgid "Feeds are only supported for calendars at present."
+msgstr "Los 'feeds' sólo se permiten en calendarios por ahora"
+
+msgid "For access to the"
+msgstr "Para acceso al"
+
+msgid "Forbidden"
+msgstr "Prohibido"
+
+msgid "Free/Busy"
+msgstr "Libre/Ocupado"
+
+msgid "Full Name"
+msgstr "Nombre completo"
+
+msgid "Fullname"
+msgstr "Nombre"
+
+msgid "GET requests on collections are only supported for calendars."
+msgstr ""
+"Las solicitudes GET en colecciones solo están disponibles para calendarios."
+
+msgid "GNU gettext support"
+msgstr "Soporte para GNU gettext"
+
+msgid "GO!"
+msgstr "¡Adelante!"
+
+msgid "Go to the DAViCal Feature Requests"
+msgstr "Ir a las peticiones de funcionalidad de DAViCal"
+
+msgid "Grant"
+msgstr "Permiso"
+
+msgid "Granting new privileges from this Principal"
+msgstr "Añadiendo nuevos permisos a este 'principal'"
+
+#. Translators: in the sense of a group of people
+msgid "Group"
+msgstr "Grupo"
+
+msgid "Group Members"
+msgstr "Miembros del grupo"
+
+msgid "Group Memberships"
+msgstr "Membresías de grupo"
+
+msgid "Group Principals"
+msgstr "'Principals' del grupo"
+
+msgid "Has Members"
+msgstr "Tiene miembros"
+
+msgid "Help"
+msgstr "Ayuda"
+
+msgid "Help on the current screen"
+msgstr "Ayuda con la pantalla actual"
+
+msgid "Help! I've forgotten my password!"
+msgstr "¡Ayuda! ¡He olvidado mi contraseña!"
+
+msgid "Home"
+msgstr "Inicio"
+
+msgid "Home Page"
+msgstr "Página principal"
+
+msgid "Home addressbook added."
+msgstr "Libreta de direcciones inicial añadida."
+
+msgid "Home addressbook already exists."
+msgstr "La libreta de direcciones inicial ya existía."
+
+msgid "Home calendar added."
+msgstr "Calendario inicial añadido."
+
+msgid "Home calendar already exists."
+msgstr "El calendario inicial ya existe."
+
+msgid "ID"
+msgstr "ID"
+
+msgid "ISO Format"
+msgstr "Formato ISO"
+
+msgid "ISO Format (YYYY-MM-DD)"
+msgstr "Formato ISO (YYYY-MM-DD)"
+
+#. Translators: short for 'Identifier'
+msgid "Id"
+msgstr "ID"
+
+msgid "If you have forgotten your password then"
+msgstr "Si olvidó su contraseña, entonces"
+
+msgid "If you would like to request access, please e-mail"
+msgstr "Si usted quiere solicitar acceso, por favor escriba a la dirección "
+
+msgid "Import all .ics files of a directory"
+msgstr "Importar todos los ficheros .ics desde un directorio"
+
+msgid "Import calendars and Synchronise LDAP."
+msgstr "Importar calendarios y sincronizar con LDAP."
+
+msgid "Inactive Principals"
+msgstr "'Principals' inactivos"
+
+msgid "Incorrect content type for addressbook: "
+msgstr "Tipo incorrecto para una libreta de direcciones: "
+
+msgid "Incorrect content type for calendar: "
+msgstr "Tipo de contenido incorrecto para un calendario: "
+
+msgid "Invalid user name or password."
+msgstr "Nombre de usuario o contraseña inválidos."
+
+msgid "Invalid username or password."
+msgstr "Nombre de usuario o contraseña inválidos."
+
+msgid "Is Member of"
+msgstr "Es miembro de"
+
+msgid "Is a Calendar"
+msgstr "Es un calendario"
+
+msgid "Is an Addressbook"
+msgstr "Es una libreta de direcciones"
+
+msgid "Is this user active?"
+msgstr "¿Está habilitado este usuario?"
+
+msgid "Items in Collection"
+msgstr "Elementos en la colección"
+
+msgid "Joined"
+msgstr "Unido"
+
+msgid "Language"
+msgstr "Idioma"
+
+msgid "Last used"
+msgstr "Último uso"
+
+msgid "List External Calendars"
+msgstr "Listar calendarios externos"
+
+msgid "List Groups"
+msgstr "Listar grupos"
+
+msgid "List Resources"
+msgstr "Listar recursos"
+
+msgid "List Users"
+msgstr "Listar usuarios"
+
+msgid "Load From File"
+msgstr "Cargar desde fichero"
+
+msgid "Locale"
+msgstr "Configuración regional"
+
+msgid "Location"
+msgstr "Lugar"
+
+msgid "Log On Please"
+msgstr "Por favor, autentíquese"
+
+msgid "Log out of DAViCal"
+msgstr "Salir de DAViCal"
+
+msgid "Logout"
+msgstr "Salir"
+
+msgid "Member deleted from this Group Principal"
+msgstr "Miembro eliminado de este grupo"
+
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
+msgstr ""
+"La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable"
+" actualizar a PHP 5.2 o más reciente."
+
+msgid "Name"
+msgstr "Nombre"
+
+msgid "New Collection"
+msgstr "Nueva colección"
+
+msgid "New Password"
+msgstr "Nueva contraseña"
+
+msgid "New Principal"
+msgstr "Nuevo 'principal'"
+
+#. Translators: not 'Yes'
+msgid "No"
+msgstr "No"
+
+msgid "No calendar content"
+msgstr "El calendario no tiene contenido"
+
+msgid "No collection found at that location."
+msgstr "No se encontró ninguna colección en esa ruta"
+
+msgid "No summary"
+msgstr "Sin resumen"
+
+#. Translators: short for 'Number'
+msgid "No."
+msgstr "Núm."
+
+msgid "No. of Collections"
+msgstr "Núm. de colecciones"
+
+msgid "No. of Principals"
+msgstr "Núm. de 'principals'"
+
+msgid "No. of Resources"
+msgstr "Núm. de recursos"
+
+msgid "Not overwriting existing destination resource"
+msgstr "No se sobreescribió el recurso ya existente."
+
+msgid "Opaque"
+msgstr "Opaco"
+
+msgid "Override a Lock"
+msgstr "Ignorar un bloqueo"
+
+msgid "PDO PostgreSQL drivers"
+msgstr "Drivers PDO para PostgreSQL"
+
+msgid "PHP DateTime class"
+msgstr "Clase DateTime de PHP"
+
+msgid "PHP LDAP module available"
+msgstr "Módulo LDAP PHP disponible"
+
+msgid "PHP Magic Quotes GPC off"
+msgstr "\"Magic quotes GPC\" de PHP desactivadas"
+
+msgid "PHP Magic Quotes runtime off"
+msgstr "\"Magic quotes GPC\" de PHP desactivadas en tiempo de ejecución"
+
+msgid "PHP PDO module available"
+msgstr "Módulo PHP PDO disponible"
+
+msgid "PHP calendar extension available"
+msgstr "Extensión de calendarios para PHP disponible"
+
+msgid "PHP iconv support"
+msgstr "Soporte PHP iconv"
+
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+"El método PUT con contenido de tipo text/calendar sólo se permite en una "
+"colección de tipo calendario"
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
+msgstr ""
+"El método PUT con contenido de tipo text/vcard sólo se permite en una "
+"colección de tipo libreta de direcciones"
+
+msgid "Passed"
+msgstr "Aceptado"
+
+msgid "Password"
+msgstr "Contraseña"
+
+msgid "Path"
+msgstr "Ruta"
+
+msgid "Person"
+msgstr "Persona"
+
+msgid "Please confirm deletion of access ticket - see below"
+msgstr ""
+"Por favor confirme la eliminación del ticket de acceso - véase más abajo"
+
+msgid "Please confirm deletion of binding - see below"
+msgstr "Por favor confirme la eliminación del enlace - véase más abajo"
+
+msgid "Please confirm deletion of collection - see below"
+msgstr "Por favor confirme la eliminación de la colección - véase más abajo"
+
+msgid "Please confirm deletion of the principal"
+msgstr "Por favor confirme la eliminación del 'principal'"
+
+msgid "Please note the time and advise the administrator of your system."
+msgstr "Por favor anote la hora y coméntelo a su administrador del sistema."
+
+msgid "Principal"
+msgstr "'Principal'"
+
+msgid "Principal Collections"
+msgstr "Colecciones del 'principal'"
+
+msgid "Principal Grants"
+msgstr "Permisos del 'principal'"
+
+msgid "Principal ID"
+msgstr "ID del 'principal'"
+
+msgid "Principal Type"
+msgstr "Tipo de 'principal'"
+
+msgid "Principal deleted"
+msgstr "'Principal' eliminado"
+
+msgid "Privileges"
+msgstr "Permisos"
+
+msgid "Privileges granted to All Users"
+msgstr "Permisos dados a todos los usuarios"
+
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
+msgid "Property is read-only"
+msgstr "Esta propiedad es de sólo lectura"
+
+#. Translators: in the sense of being available to all users
+msgid "Public"
+msgstr "Público"
+
+msgid "Publicly Readable"
+msgstr "De lectura pública"
+
+msgid "REPORT body contains no XML data!"
+msgstr "¡El cuerpo de la operación REPORT no contiene datos XML!"
+
+msgid "REPORT body is not valid XML data!"
+msgstr "¡El cuerpo de la operación REPORT contiene datos XML inválidos!"
+
+msgid "Read"
+msgstr "Lectura"
+
+msgid "Read ACLs for a resource or collection"
+msgstr "Leer ACLs (listas de control de acceso) de un recurso o colección"
+
+msgid "Read Access Controls"
+msgstr "Leer controles de acceso"
+
+msgid "Read Current User's Access"
+msgstr "Leer permisos de acceso del usuario actual"
+
+msgid "Read Free/Busy Information"
+msgstr "Consultar información libre/ocupado"
+
+msgid "Read the content of a resource or collection"
+msgstr "Leer el contenido de un recurso o colección"
+
+msgid ""
+"Read the details of the current user's access control to this resource."
+msgstr ""
+"Leer los detalles de control de acceso para el usuario actual a este recurso"
+
+msgid "Read the free/busy information for a calendar collection"
+msgstr ""
+"Consultar la información libre/ocupado para una colección de calendario"
+
+msgid "Read/Write"
+msgstr "Lectura/escritura"
+
+msgid "References"
+msgstr "Apunta a"
+
+msgid "Remove"
+msgstr "Eliminar"
+
+msgid "Remove a lock"
+msgstr "Eliminar un bloqueo"
+
+msgid "Remove dangling external calendars"
+msgstr "Eliminar calendarios externos que van y vienen"
+
+msgid "Report Bug"
+msgstr "Informar de un fallo"
+
+msgid "Report a bug in the system"
+msgstr "Informar de un problema en el sistema"
+
+msgid "Request Feature"
+msgstr "Solicitar una funcionalidad"
+
+msgid "Request body is not valid XML data!"
+msgstr "¡El cuerpo de la petición no contiene datos XML válidos!"
+
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
+msgid "Resource"
+msgstr "Recurso"
+
+msgid "Resource Calendar Principals"
+msgstr "'Principals' de tipo recurso con calendario"
+
+msgid "Resource Not Found."
+msgstr "Recurso no encontrado."
+
+msgid "Resource has changed on server - not deleted"
+msgstr "El recurso fue modificado en el servidor - no se eliminó"
+
+msgid "Resources may not be changed to / from collections."
+msgstr "Los recursos no pueden ser convertidos a colecciones (y viceversa)"
+
+msgid "Revoke"
+msgstr "Revocar"
+
+msgid "Schedule Deliver"
+msgstr "Entrega de planificaciones"
+
+msgid "Schedule Send"
+msgstr "Envío de planificaciones"
+
+msgid "Schedule Transparency"
+msgstr "Transparencia de planificaciones"
+
+msgid "Scheduling: Deliver a Reply"
+msgstr "Planificación: entregar una respuesta"
+
+msgid "Scheduling: Deliver an Invitation"
+msgstr "Planificación: entregar una invitación"
+
+msgid "Scheduling: Delivery"
+msgstr "Planificación: entrega"
+
+msgid "Scheduling: Query free/busy"
+msgstr "Planificación: consultar disponibilidad (libre/ocupado)"
+
+msgid "Scheduling: Send a Reply"
+msgstr "Planificación: enviar una respuesta"
+
+msgid "Scheduling: Send an Invitation"
+msgstr "Planificación: enviar una invitación"
+
+msgid "Scheduling: Send free/busy"
+msgstr "Planificación: enviar información libre/ocupado"
+
+msgid "Scheduling: Sending"
+msgstr "Planificación: envío"
+
+msgid "Send free/busy enquiries"
+msgstr "Enviar comprobaciones de libre/ocupado"
+
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
+msgstr ""
+"Envío de invitaciones de planificación como organizador por parte del dueño "
+"de este buzón de planificación"
+
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
+msgstr ""
+"Envío de respuestas a propuestas de planificación como asistente por parte "
+"del dueño de este buzón de planificación"
+
+msgid "Set free/busy privileges"
+msgstr "Activar permisos libre/ocupado"
+
+msgid "Set read privileges"
+msgstr "Activar permisos de lectura"
+
+msgid "Set read+write privileges"
+msgstr "Activar permisos de lectura+escritura"
+
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
+msgstr ""
+"Indique la ruta en la que se almacenarán sus ics. Por ejemplo, 'calendario' "
+"se traducirá en '/caldav.php/usuario/calendario/'"
+
+msgid "Setup"
+msgstr "Configuración"
+
+msgid "Setup DAViCal"
+msgstr "Configurar DAViCal"
+
+msgid "Show help on"
+msgstr "Mostrar ayuda sobre"
+
+msgid "Site Statistics"
+msgstr "Estadísticas del sitio"
+
+msgid "Site Statistics require the database to be available!"
+msgstr ""
+"¡Las estadísticas del sitio necesitan que la base de datos esté disponible!"
+
+msgid "Some properties were not able to be changed."
+msgstr "No fue posible cambiar algunas propiedades."
+
+msgid "Some properties were not able to be set."
+msgstr "No fue posible configurar algunas propiedades."
+
+msgid "Source resource does not exist."
+msgstr "El recurso de origen no existe."
+
+msgid ""
+"Special collections may not contain a calendar or other special collection."
+msgstr ""
+"Las colecciones especiales no pueden contener un calendario u otra colección"
+" especial."
+
+msgid "Specific Privileges"
+msgstr "Privilegios concretos."
+
+msgid "Status"
+msgstr "Estado"
+
+#, php-format
+msgid "Status: %d, Message: %s, User: %d, Path: %s"
+msgstr "Estado: %d, Mensaje: %s, Usuario: %d, Ruta: %s"
+
+msgid "Submit"
+msgstr "Enviar"
+
+msgid "Suhosin \"server.strip\" disabled"
+msgstr "Suhosin \"server.strip\" desactivado"
+
+msgid "Sync LDAP Groups with DAViCal"
+msgstr "Sincronizar grupos LDAP con DAViCal"
+
+msgid "Sync LDAP with DAViCal"
+msgstr "Sincronizar LDAP en DAViCal"
+
+msgid "Target"
+msgstr "Destino"
+
+msgid "That destination name contains invalid characters."
+msgstr "El nombre de destino tiene caracteres inválidos."
+
+msgid "That resource is not present on this server."
+msgstr "El recurso no existe en este servidor."
+
+msgid "The BIND Request MUST identify an existing resource."
+msgstr "La solicitud BIND DEBE identificar un recurso existente."
+
+msgid "The BIND Request-URI MUST identify a collection."
+msgstr "El URI de la solicitud BIND DEBE identificar a una colección."
+
+msgid "The BIND method is not allowed at that location."
+msgstr "No está permitido el método BIND en esa ruta."
+
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgstr ""
+"La propiedad CalDAV:schedule-calendar-transp sólo puede ser configurada en "
+"calendarios."
+
+msgid "The DAViCal Home Page"
+msgstr "Página principal de DAViCal"
+
+msgid "The access ticket will be deleted."
+msgstr "El ticket de acceso será eliminado."
+
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
+msgstr ""
+"La solicitud addressbook-query debe ejecutarse contra una colección de tipo "
+"libreta de direcciones"
+
+msgid "The application failed to understand that request."
+msgstr "La aplicación no pudo entender la petición"
+
+msgid "The application program does not understand that request."
+msgstr "La aplicación no entendió su petición"
+
+msgid "The binding will be deleted."
+msgstr "El enlace será eliminado."
+
+msgid "The calendar path contains illegal characters."
+msgstr "La ruta al calendario contiene caracteres no permitidos."
+
+msgid ""
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
+msgstr ""
+"La propiedad calendar-free-busy-set tiene menos prioridad que la propiedad "
+"schedule-transp en una colección de tipo calendario."
+
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
+msgstr ""
+"La petición calendar-query debe ejecutarse contra un calendario o una "
+"colección de planificación."
+
+msgid "The collection name may not be blank."
+msgstr "El nombre de la colección no puede dejarse en blanco."
+
+msgid "The destination collection does not exist"
+msgstr "La colección de destino no existe."
+
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
+msgstr ""
+"El nombre mostrado puede asignarse sólo en colecciones, 'principals', o "
+"enlaces."
+
+msgid "The email address really should not be blank."
+msgstr "La dirección de correo electrónico no debería estar vacía."
+
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+"El fichero \"%s\" no está codificado en UTF-8, por favor compruebe el log de"
+" errores para conocer más detalles"
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
+"El fichero no está codificado en UTF-8, por favor compruebe el log de "
+"errores para conocer más detalles"
+
+msgid "The full name for this person, group or other type of principal."
+msgstr ""
+"El nombre completo de esta persona, grupo, u otro tipo de 'principal'."
+
+msgid "The full name must not be blank."
+msgstr "El nombre completo no puede estar en blanco."
+
+msgid "The name this user can log into the system with."
+msgstr "El nombre con el que este usuario accederá el sistema."
+
+msgid "The path on the server where your .ics files are."
+msgstr "La ruta en el servidor donde están los ficheros .ics."
+
+msgid "The preferred language for this person."
+msgstr "El idioma preferido de esta persona."
+
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr "El 'principal' %s no existe"
+
+msgid "The style of dates used for this person."
+msgstr "El formato de fecha usado por esta persona."
+
+msgid "The user's e-mail address."
+msgstr "El correo electrónico del usuario."
+
+msgid "The user's full name."
+msgstr "El nombre completo del usuario."
+
+msgid "The user's password for logging in."
+msgstr "La contraseña del usuario para acceder al sistema."
+
+msgid "The username must not be blank, and may not contain a slash"
+msgstr ""
+"El nombre de usuario no puede estar vacío, y no debe contener barras "
+"inclinadas."
+
+msgid "There was an error reading from the database."
+msgstr "Ocurrió un error al leer la base de datos."
+
+msgid "There was an error writing to the database."
+msgstr "Ocurrió un error al escribir en la base de datos."
+
+msgid ""
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Esta operación hace lo siguiente: <ul> <li>comprobar los grupos válidos en "
+"LDAP</li> <li>comprobar los grupos en DAViCal</li> </ul>, tras esto: <ul> "
+"<li>si un grupo está en DAViCal pero no en LDAP, marcarlo como inactivo</li>"
+" <li>si un grupo está en LDAP pero no en DAViCal, crearlo en DAViCal</li> "
+"<li>si está en ambos, actualizar la información en DAViCal</li> </ul>"
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Esta operación hace lo siguiente: <ul> <li>comprobar los usuarios válidos en"
+" LDAP</li> <li>comprobar los usuarios en DAViCal</li> </ul>, tras esto: <ul>"
+" <li>si un usuario está en DAViCal pero no en LDAP, marcarlo como "
+"inactivo</li> <li>si un usuario está en LDAP pero no en DAViCal, crearlo en "
+"DAViCal</li> <li>si está en ambos, actualizar la información en DAViCal</li>"
+" </ul>"
+
+msgid ""
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
+msgstr ""
+"Esta página comprueba si el entorno es el necesario para que DAViCal "
+"funcione correctamente.  Las sugerencias y los parches para hacerla más útil"
+" son bienvenidos."
+
+msgid ""
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
+msgstr ""
+"Este proceso importará de un directorio cada fichero \"usuario.ics\", "
+"creando un usuario con el nombre indicado y un calendario, uno por cada "
+"fichero encontrado."
+
+msgid "This server only supports the text/calendar format for freebusy URLs"
+msgstr ""
+"Este servidor sólo soporta el formato text/calendar para URLs freebusy"
+
+msgid "Ticket ID"
+msgstr "ID del ticket"
+
+msgid "Time"
+msgstr "Tiempo"
+
+msgid "To Collection"
+msgstr "A la colección"
+
+msgid "To ID"
+msgstr "Al ID"
+
+msgid "Toggle all privileges"
+msgstr "Invertir todos los permisos"
+
+msgid "Tools"
+msgstr "Herramientas"
+
+msgid "Transparent"
+msgstr "Transparente"
+
+msgid "URL"
+msgstr "URL"
+
+msgid "US Format"
+msgstr "Formato EEUU"
+
+msgid "Unauthenticated User"
+msgstr "Usuario no autenticado"
+
+msgid "United States of America (m/d/y)"
+msgstr "Estados Unidos de Norteamérica (m/d/y)"
+
+msgid "Update"
+msgstr "Actualizar"
+
+msgid "Updated"
+msgstr "Actualizado"
+
+msgid "Updating Collection record."
+msgstr "Actualizando el registro de la colección."
+
+msgid "Updating Member of this Group Principal"
+msgstr "Actualizando un miembro de este grupo"
+
+msgid "Updating Principal record."
+msgstr "Actualizando el registro del 'principal'"
+
+msgid "Updating grants by this Principal"
+msgstr "Actualizando los permisos desde este 'principal'"
+
+msgid "Upgrade DAViCal database schema"
+msgstr "Actualizar el esquema de la base de datos de DAViCal"
+
+msgid "Upgrade Database"
+msgstr "Actualizar la base de datos"
+
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
+msgstr ""
+"Subir un fichero .ics en formato iCalendar para inicializar o reemplazar "
+"este calendario."
+
+msgid "User Calendar Principals"
+msgstr "'Principals' de tipo usuario"
+
+msgid "User Details"
+msgstr "Detalles del usuario"
+
+msgid "User Functions"
+msgstr "Funciones sobre usuarios"
+
+msgid "User Name"
+msgstr "Nombre del usuario"
+
+msgid "User Roles"
+msgstr "Roles del usuario"
+
+msgid "User is active"
+msgstr "El usuario está activo"
+
+msgid "User record written."
+msgstr "Registro del usuario guardado."
+
+msgid "Username"
+msgstr "Nombre de usuario"
+
+msgid "View My Details"
+msgstr "Ver mis detalles"
+
+msgid "View my own principal record"
+msgstr "Ver el registro de mi propio 'principal'"
+
+msgid "View this user record"
+msgstr "Ver el registro de este usuario"
+
+msgid "Visit the DAViCal Wiki"
+msgstr "Visitar el Wiki de DAViCal"
+
+#, php-format
+msgid "Want: %s, Currently: %s"
+msgstr "Quiere: %s, Actualmente: %s"
+
+msgid ""
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
+msgstr ""
+"Precaución:  ¡No hay usuarios con privilegios de administración activos!  "
+"Debe reparar esto antes de salir. Plantéese utilizar el parámetro "
+"$c->do_not_sync_from_ldap en la configuración."
+
+msgid "When the user's e-mail account was validated."
+msgstr "Cuando la dirección de correo electrónico del usuario fue validada."
+
+msgid "Write"
+msgstr "Escribir"
+
+msgid "Write ACLs for a resource or collection"
+msgstr "Escribir ACLs para un recurso o colección"
+
+msgid "Write Access Controls"
+msgstr "Escribir controles de acceso"
+
+msgid "Write Data"
+msgstr "Escribir datos"
+
+msgid "Write Metadata"
+msgstr "Escribir meta-datos"
+
+msgid "Write content"
+msgstr "Escribir contenido"
+
+msgid "Write properties"
+msgstr "Escribir propiedades"
+
+msgid "Yes"
+msgstr "Sí"
+
+msgid "You are editing"
+msgstr "Está editando"
+
+msgid "You are not authorised to use this function."
+msgstr "No está autorizado a usar esta función."
+
+msgid "You are viewing"
+msgstr "Está viendo"
+
+msgid "You do not have permission to modify this record."
+msgstr "No tiene permiso para modificar este registro."
+
+msgid "You may not PUT to a collection URL"
+msgstr "No puede usar PUT sobre la URL de una colección"
+
+msgid "You must log in to use this system."
+msgstr "Debe autenticarse para utilizar el sistema"
+
+msgid "Your configuration produced PHP errors which should be corrected"
+msgstr "Su configuración produjo errores de PHP que deberían ser corregidos"
+
+msgid "calendar-timezone property is only valid for a calendar."
+msgstr "La propiedad calendar-timezone sólo es válida en calendarios."
+
+#, php-format
+msgid "directory %s is not readable"
+msgstr "no se puede leer el directorio %s"
+
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
+msgstr ""
+"drivers_imap_pam : el parámetro imap_url parámetro no está configurado en "
+"/etc/davical/*-conf.php"
+
+msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
+msgstr "drivers_ldap : no se pudo usar TLS:  ldap_start_tls() falló"
+
+#, php-format
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap : falló el bind en el host %1$s por el puerto %2$s con DN %3$s"
+
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
+msgstr ""
+"drivers_ldap : no se pudo usar LDAP versión 3, el uso de TLS no está "
+"soportado"
+
+msgid ""
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
+msgstr ""
+"drivers_ldap : no se pudo hacer bind en LDAP - compruebe la configuración de"
+" los parámetros bindDN y passDN, y asegúrese de que su servidor LDAP es "
+"accesible."
+
+#, php-format
+msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
+msgstr ""
+"drivers_ldap : no se pudo conectar a LDAP por el puerto %s en el host %s"
+
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
+"drivers_ldap : la función ldap_connect no existe; compruebe que tiene "
+"instalado el módulo php_ldap"
+
+#, php-format
+msgid "drivers_pwauth_pam : Unable to find %s file"
+msgstr "drivers_pwauth_pam : no se encontró el fichero %s"
+
+#, php-format
+msgid "drivers_squid_pam : Unable to find %s file"
+msgstr "drivers_squid_pam : no se encontró el fichero %s"
+
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
+msgid "forget me not"
+msgstr "recuérdame"
+
+msgid "from principal"
+msgstr "del 'principal'"
+
+msgid "path to store your ics"
+msgstr "ruta para almacenar sus ics"
+
+msgid "unauthenticated"
+msgstr "no autenticado"
+
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
+msgstr ""
+"deberá autenticarse con el nombre de usuario y contraseña que se le "
+"comunicaron."
+
+
diff -Nru davical-0.9.9.7/po/es_ES.values davical-1.0.2/po/es_ES.values
--- davical-0.9.9.7/po/es_ES.values	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/po/es_ES.values	2011-10-25 18:42:05.000000000 +0000
@@ -0,0 +1 @@
+  VALUES( 'es_ES', 'Spanish (Spain)', 'Español (Espana)' );
diff -Nru davical-0.9.9.7/po/es_MX.po davical-1.0.2/po/es_MX.po
--- davical-0.9.9.7/po/es_MX.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/es_MX.po	2012-01-04 23:04:18.000000000 +0000
@@ -1,28 +1,31 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# pr3d4t0r <transifex@ciurana.eu>, 2011.
+# 
+# Translators:
 # Eugene Ciurana <transifex@cime.net>, 2011.
+# pr3d4t0r <transifex@ciurana.eu>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-08-02 19:21+0000\n"
-"Last-Translator: pr3d4t0r <transifex@cime.net>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: Spanish (Mexican) (http://www.transifex.net/projects/p/davical/team/es_MX/)\n"
-"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -72,44 +75,38 @@
 msgid "- updating user records : %s"
 msgstr "- actualizando los registros de usuario:  %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
-"<b>ADVERTENCIA:  todos los eventos en este repositorio serán eliminados antes de insertar el archivo "
-"ics</b>"
+"<b>ADVERTENCIA:  todos los eventos en este repositorio serán eliminados "
+"antes de insertar el archivo ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 "<h1>Ayuda</h>\n"
-"<p>Visita <a href='http://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para "
-"ayuda inicial, o consulta<a href='http://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>.</"
-"p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='http://wikipedia.org/wiki/"
-"Internet_Relay_Chat' target='_blank'>IRC</a> enel canal <b>#davical</b> en <a href='http://www.oftc."
-"net/' target='_blank'>irc.oftc.net</a>,\n"
-"o envía tus preguntas a <a href='http://lists.sourceforge.net/mailman/listinfo/davical-general' "
-"target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n"
-"<p>El <a href='http://sourceforge.net/mailarchive/forum.php?forum_id=8348' title='Lista de Correo de "
-"Usuarios DAViCal' target='_blank'>archivo de la lista de correo</a>tambien te será útil."
+"<p>Visita <a href='http://www.davical.org/' target='_blank'>la Página Principal de DAViCal</a> para ayuda inicial, o consulta<a href='http://wiki.davical.org/%s' target='_blank'>el Wiki de DAViCal</a>.</p><p>Si no encuentras la respuesta a tus dudas, visítanos en <a href='http://wikipedia.org/wiki/Internet_Relay_Chat' target='_blank'>IRC</a> enel canal <b>#davical</b> en <a href='http://www.oftc.net/' target='_blank'>irc.oftc.net</a>,\n"
+"o envía tus preguntas a <a href='http://lists.sourceforge.net/mailman/listinfo/davical-general' target='_blank'>la lista de correo de Usuarios de DAViCal</a>.</p>\n"
+"<p>El <a href='http://sourceforge.net/mailarchive/forum.php?forum_id=8348' title='Lista de Correo de Usuarios DAViCal' target='_blank'>archivo de la lista de correo</a>tambien te será útil."
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
-"<h1>Por Favor Entra Identifícate</h1><p>Debes para entrar a %s debes identificarte con tu nombre de "
-"usuario y tu clave de acceso.</p><p>Notifica a %s si deseas solicitar acceso."
+"<h1>Por Favor Entra Identifícate</h1><p>Debes para entrar a %s debes "
+"identificarte con tu nombre de usuario y tu clave de acceso.</p><p>Notifica "
+"a %s si deseas solicitar acceso."
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Una colección principal de DAViCal solo puede contener colecciones"
@@ -154,8 +151,15 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "Todos los datos de esta colección serán eliminados."
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
-msgstr "Todos los calendarios y eventos de este principal serán eliminados permanentemente."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
+msgstr ""
+"Todos los calendarios y eventos de este principal serán eliminados "
+"permanentemente."
 
 msgid "All privileges"
 msgstr "Todos los privilegios"
@@ -163,11 +167,14 @@
 msgid "All requested changes were made."
 msgstr "Todos los cambios solicitados fueron hechos."
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-msgstr "Permite solicitudes libre/ocupado para el dueño de este buzón de itinerario."
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgstr ""
+"Permite solicitudes libre/ocupado para el dueño de este buzón de itinerario."
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
-msgstr "Un usuario \"Administrador\" tiene todos derechos al Sistema DAViCal entero."
+msgstr ""
+"Un usuario \"Administrador\" tiene todos derechos al Sistema DAViCal entero."
 
 msgid "Anonymous users are not allowed to modify calendars"
 msgstr "Los usuarios anónimos no tienen permitido modificar calendarios"
@@ -199,6 +206,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr "Enlaces a las Colleciones de este Principal"
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr "Enlazado con"
 
@@ -245,8 +255,12 @@
 msgid "Collection deleted"
 msgstr "Colección eliminada"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
-msgstr "Las colecciones no pueden ser calendarios CalDAV y agendas de teléfono CardDAV al mismo tiempo"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
+msgstr ""
+"Las colecciones no pueden ser calendarios CalDAV y agendas de teléfono "
+"CardDAV al mismo tiempo"
 
 msgid "Configuring Calendar Clients for DAViCal"
 msgstr "Configurando Clientes de Calendario para DAViCal"
@@ -317,8 +331,10 @@
 msgid "DAV Path"
 msgstr "Camino DAV"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-msgstr "DAV::resourcetype solo puede tener un valor nuevo, y no puede ser eliminado."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
+msgstr ""
+"DAV::resourcetype solo puede tener un valor nuevo, y no puede ser eliminado."
 
 msgid "DAViCal CalDAV Server"
 msgstr "Servidor DAViCal CalDAV"
@@ -416,11 +432,16 @@
 msgid "Deleting Ticket:"
 msgstr "Eliminando Boleto:"
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-msgstr "Enviar invitaciones de itinerario de un organizador a este buzón de itinerarios"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgstr ""
+"Enviar invitaciones de itinerario de un organizador a este buzón de "
+"itinerarios"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
-msgstr "Enviar respuestas de itinerario de un participante a este buzón de itinerarios"
+msgstr ""
+"Enviar respuestas de itinerario de un participante a este buzón de "
+"itinerarios"
 
 msgid "Dependencies"
 msgstr "Dependencias"
@@ -456,10 +477,13 @@
 msgstr "ERROR: El nombre completo no puede estar vacío."
 
 msgid "ERROR: The new password must match the confirmed password."
-msgstr "ERROR: La clave de acceso debe coincidir con la clave de acceso confirmada."
+msgstr ""
+"ERROR: La clave de acceso debe coincidir con la clave de acceso confirmada."
 
 msgid "ERROR: There was a database error writing the roles information!"
-msgstr "ERROR: ¡Un error de base de datos ocurrió al escribir la información de papeles!"
+msgstr ""
+"ERROR: ¡Un error de base de datos ocurrió al escribir la información de "
+"papeles!"
 
 msgid "Edit"
 msgstr "Editar"
@@ -470,13 +494,17 @@
 msgid "Email Address"
 msgstr "Dirección de Email"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
-"Proporcione un nombre de usuario, si lo sabe, y haga click aquí, para enviarle una clave de acceso "
-"temporal."
+"Proporcione un nombre de usuario, si lo sabe, y haga click aquí, para "
+"enviarle una clave de acceso temporal."
 
 msgid "Enter your username and password then click here to log in."
-msgstr "Proporcione su nombre de usuario y clave de accesso, depues haga click aquí para entrar."
+msgstr ""
+"Proporcione su nombre de usuario y clave de accesso, depues haga click aquí "
+"para entrar."
 
 #, php-format
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
@@ -502,14 +530,23 @@
 msgstr "Europeo (d/m/y)"
 
 msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "El recurso existente no coincide con el encabezado \"If-Match\" - rechazado."
+msgstr ""
+"El recurso existente no coincide con el encabezado \"If-Match\" - rechazado."
 
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
-msgstr "El recurso existente coincide con el encabezado \"If-None-Match\" - rechazado."
+msgstr ""
+"El recurso existente coincide con el encabezado \"If-None-Match\" - "
+"rechazado."
 
 msgid "Expires"
 msgstr "Expira"
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr "Falla"
 
@@ -535,7 +572,8 @@
 msgstr "Nombre"
 
 msgid "GET requests on collections are only supported for calendars."
-msgstr "Las solicitudes GET en colecciones solo son suportadas para calendarios."
+msgstr ""
+"Las solicitudes GET en colecciones solo son suportadas para calendarios."
 
 msgid "GNU gettext support"
 msgstr "Soporte para GNU gettext"
@@ -659,6 +697,9 @@
 msgid "Last used"
 msgstr "Último uso"
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr "Listar Grupos"
 
@@ -689,10 +730,12 @@
 msgid "Member deleted from this Group Principal"
 msgstr "Miembro eliminado de este Grupo de Principales"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
-"La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable actualizar a PHP 5.2 o "
-"mas reciente."
+"La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable"
+" actualizar a PHP 5.2 o mas reciente."
 
 msgid "Name"
 msgstr "Nombre"
@@ -710,18 +753,12 @@
 msgid "No"
 msgstr "No"
 
-msgid "No authority to deliver invitations to user."
-msgstr "Sin autoridad para enviar invitaciones al usuario."
-
 msgid "No calendar content"
 msgstr "Calendario vacío"
 
 msgid "No collection found at that location."
 msgstr "No se encontró ninguna colección en esa localización."
 
-msgid "No scheduling support for user"
-msgstr "Itinerarios de usuario no soportados"
-
 msgid "No summary"
 msgstr "Sin resumen"
 
@@ -765,19 +802,26 @@
 msgid "PHP PDO module available"
 msgstr "Módulo PHP PDO disponible"
 
-msgid "PHP PostgreSQL available"
-msgstr "PHP PostgreSQL disponible"
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr "Soporte PHP iconv"
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+"PUT solo se permite para una colección si el contenido es text/calendar para"
+" una colección de calendario"
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
-"PUT solo se permite para una colección si el contenido es text/calendar para una colección de "
-"calendario"
 
 msgid "Passed"
 msgstr "Aceptado"
@@ -792,7 +836,8 @@
 msgstr "Persona"
 
 msgid "Please confirm deletion of access ticket - see below"
-msgstr "Por favor confirme la eliminación del billete de acceso - vea en seguida"
+msgstr ""
+"Por favor confirme la eliminación del billete de acceso - vea en seguida"
 
 msgid "Please confirm deletion of binding - see below"
 msgstr "Por favor confirme la eliminación del enlace - vea en seguida"
@@ -830,6 +875,12 @@
 msgid "Privileges granted to All Users"
 msgstr "Privilegios otorgados a Todos los Usuarios"
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr "Esta propiedad es solo de lectura"
 
@@ -864,8 +915,11 @@
 msgid "Read the content of a resource or collection"
 msgstr "Leer el contenido de un recurso o colección"
 
-msgid "Read the details of the current user's access control to this resource."
-msgstr "Leer los detalles de control de acceso para el usuario actaul respecto a este recurso."
+msgid ""
+"Read the details of the current user's access control to this resource."
+msgstr ""
+"Leer los detalles de control de acceso para el usuario actaul respecto a "
+"este recurso."
 
 msgid "Read the free/busy information for a calendar collection"
 msgstr "Leer la información libre/ocupado para una colección de calendario"
@@ -873,12 +927,18 @@
 msgid "Read/Write"
 msgstr "Leer/Escribir"
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr "Remover"
 
 msgid "Remove a lock"
 msgstr "Remover un seguro"
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Reportar un problema"
 
@@ -891,7 +951,8 @@
 msgid "Request body is not valid XML data!"
 msgstr "¡El cuerpo de la solicitud no contiene datos XML válidos!"
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -919,9 +980,6 @@
 msgid "Schedule Transparency"
 msgstr "Transparencia de Itinerario"
 
-msgid "Scheduling invitation delivered successfully"
-msgstr "Invitación de itinerario entregada con éxito"
-
 msgid "Scheduling: Deliver a Reply"
 msgstr "Itinerario:  Entregar una Respuesta"
 
@@ -949,12 +1007,19 @@
 msgid "Send free/busy enquiries"
 msgstr "Enviar verificaciones de libre/ocupado"
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
-"Enviar invitaciones de itinerario como el organizador desde el dueño de  este buzón de itinerario."
+"Enviar invitaciones de itinerario como el organizador desde el dueño de  "
+"este buzón de itinerario."
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-msgstr "Enviando respuestas como participante desde el dueño de este buzón de salida para itinerarios."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
+msgstr ""
+"Enviando respuestas como participante desde el dueño de este buzón de salida"
+" para itinerarios."
 
 msgid "Set free/busy privileges"
 msgstr "Activar privilegios libre/ocupado"
@@ -965,11 +1030,10 @@
 msgid "Set read+write privileges"
 msgstr "Activar privilegios de lectura+escritura"
 
-msgid "Set schedule-deliver privileges"
-msgstr "Asignar privilegios de entrega-itinerario"
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
-msgstr "La trayectoria para grabar su ics (e.g. 'home') será referido como /caldar.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
+msgstr ""
 
 msgid "Setup"
 msgstr "Configuración"
@@ -984,7 +1048,8 @@
 msgstr "Estadísticas del Sitio"
 
 msgid "Site Statistics require the database to be available!"
-msgstr "¡Las Estadísticas del Sitio requieren que la base de datos esté disponible!"
+msgstr ""
+"¡Las Estadísticas del Sitio requieren que la base de datos esté disponible!"
 
 msgid "Some properties were not able to be changed."
 msgstr "No fue posible cambiar algunas propiedades."
@@ -995,8 +1060,11 @@
 msgid "Source resource does not exist."
 msgstr "El recurso fuente no existe."
 
-msgid "Special collections may not contain a calendar or other special collection."
-msgstr "Las colecciones especiales no pueden contener un calendario u otra colección especial."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
+msgstr ""
+"Las colecciones especiales no pueden contener un calendario u otra colección"
+" especial."
 
 msgid "Specific Privileges"
 msgstr "Privilegios Específicos"
@@ -1014,8 +1082,8 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr "Suhosin \"server.strip\" deactivado"
 
-msgid "Sync LDAP Groups with RSCDS"
-msgstr "Sincronizar LDAP Groups y RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
+msgstr ""
 
 msgid "Sync LDAP with DAViCal"
 msgstr "Sincronizar LDAP y DAViCal"
@@ -1038,8 +1106,11 @@
 msgid "The BIND method is not allowed at that location."
 msgstr "No está permitido el método BIND en esa localización."
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-msgstr "La propiedad CalDAV:schedule-calendar-transp solo puede ser configurada en calendarios."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgstr ""
+"La propiedad CalDAV:schedule-calendar-transp solo puede ser configurada en "
+"calendarios."
 
 msgid "The DAViCal Home Page"
 msgstr "La Página Principal de DAViCal"
@@ -1047,10 +1118,11 @@
 msgid "The access ticket will be deleted."
 msgstr "El boleto de acceso será eliminado."
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
-"El reporte de solicitud-lista-de-direcciones debe ejecutarse con respecto a una colección de lista de "
-"direcciones."
+"El reporte de solicitud-lista-de-direcciones debe ejecutarse con respecto a "
+"una colección de lista de direcciones."
 
 msgid "The application failed to understand that request."
 msgstr ""
@@ -1065,12 +1137,18 @@
 msgstr "La trayectoria del calendario contiene caracteres ilegales."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
-"La propiedad calendar-free-busy-set es reemplazada por schedule-transp en unacolección de calendario."
+"La propiedad calendar-free-busy-set es reemplazada por schedule-transp en "
+"unacolección de calendario."
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-msgstr "El reporte calendar-query debe ejecutarse contra un calendario o una colecciónde itinerario"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
+msgstr ""
+"El reporte calendar-query debe ejecutarse contra un calendario o una "
+"colecciónde itinerario"
 
 msgid "The collection name may not be blank."
 msgstr "El nombre de la colección no puede dejarse en blanco."
@@ -1078,15 +1156,24 @@
 msgid "The destination collection does not exist"
 msgstr "La colección de destino no existe."
 
-msgid "The displayname may only be set on collections, principals or bindings."
-msgstr "El nombre de despliegue puede asignarse solo en colecciones, principales, o enlaces."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
+msgstr ""
+"El nombre de despliegue puede asignarse solo en colecciones, principales, o "
+"enlaces."
 
 msgid "The email address really should not be blank."
 msgstr "La dirección de correo electrónico no deberá estar en blanco."
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
-"Ël archivo no está codificado en UTF-8, por favor verifica el mensaje de error para mayores detalles."
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
+"Ël archivo no está codificado en UTF-8, por favor verifica el mensaje de "
+"error para mayores detalles."
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "El nombre completo de esta persona, grupo, u otro tipo de principal."
@@ -1103,6 +1190,10 @@
 msgid "The preferred language for this person."
 msgstr "El lenguaje predilecto de esta persona."
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr "El estilo de fechas usado por esta persona."
 
@@ -1116,7 +1207,9 @@
 msgstr "La clave de acceso del usuario para acceder al sistema."
 
 msgid "The username must not be blank, and may not contain a slash"
-msgstr "El nombre de usuario no puede estar en blanco, y no debe contener diagonales."
+msgstr ""
+"El nombre de usuario no puede estar en blanco, y no debe contener "
+"diagonales."
 
 msgid "There was an error reading from the database."
 msgstr "Ocurrió un error al leer la base de datos."
@@ -1125,38 +1218,53 @@
 msgstr "Ocurrió un error al escribir en la base de datos."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
-"Esta operación hace lo sigiente: <ul><li>verificar los grupos en el directorio LDAP</li><li>checar los "
-"grupos en DAViCal</li></ul> luego <ul><li>si un grupo existe en DAViCal mas no en LDAP, asignarlo como "
-"inactivo en DAViCal</li> <li>si un grupo está presente en LDAP pero no ed DAViCal, crear el grupo en "
-"DAViCal</li> <li>si un grupo está presente en ambos LDAP y DAViCal, actualizar la información en "
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Esta operación hace lo sigiente: <ul><li>verificar los grupos en el "
+"directorio LDAP</li><li>checar los grupos en DAViCal</li></ul> luego "
+"<ul><li>si un grupo existe en DAViCal mas no en LDAP, asignarlo como "
+"inactivo en DAViCal</li> <li>si un grupo está presente en LDAP pero no ed "
+"DAViCal, crear el grupo en DAViCal</li> <li>si un grupo está presente en "
+"ambos LDAP y DAViCal, actualizar la información en DAViCal</li></ul>"
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Esta operación hace lo siguiente:  <ul><li>verificar que los usuarios son "
+"válidos en el directorio LDAP</li><li>checar los usuarios en "
+"DAViCal</li></ul> luego <ul><li>si un usuario está presente en DAViCal pero "
+"no en LDAP, assignarlo como inactivo en DAViCal</li> <li>si un usuario está "
+"presente en LDAP mas no en DAViCal, crear al usuario en DAViCal</li><li>si "
+"un usuario está presente en LDAP y en DAViCal, actualizar la información en "
 "DAViCal</li></ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
-"Esta operación hace lo siguiente:  <ul><li>verificar que los usuarios son válidos en el directorio "
-"LDAP</li><li>checar los usuarios en DAViCal</li></ul> luego <ul><li>si un usuario está presente en "
-"DAViCal pero no en LDAP, assignarlo como inactivo en DAViCal</li> <li>si un usuario está presente en "
-"LDAP mas no en DAViCal, crear al usuario en DAViCal</li><li>si un usuario está presente en LDAP y en "
-"DAViCal, actualizar la información en DAViCal</li></ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
+msgstr ""
+"Esta página valida el ambiente operativo necesario para que DAViCal funcione"
+" correctamente.  Sugestiones o parches para hacerla mas útil o efectiva "
+"serán graciosamente recibidas."
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
-"Esta página valida el ambiente operativo necesario para que DAViCal funcione correctamente.  "
-"Sugestiones o parches para hacerla mas útil o efectiva serán graciosamente recibidas."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
-msgstr "Este servidor solo soporta el formato text/calendar para URLs freebusy"
+msgstr ""
+"Este servidor solo soporta el formato text/calendar para URLs freebusy"
 
 msgid "Ticket ID"
 msgstr "ID del Boleto"
@@ -1215,8 +1323,12 @@
 msgid "Upgrade Database"
 msgstr "Actualizar la Base de Datos"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
-msgstr "Subir un calendario .ics en formato iCalendar para inicializar o reemplazar este calendario."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
+msgstr ""
+"Subir un calendario .ics en formato iCalendar para inicializar o reemplazar "
+"este calendario."
 
 msgid "User Calendar Principals"
 msgstr "Principales Usuarios de Calendario"
@@ -1259,11 +1371,12 @@
 msgstr "Quiere: %s, Actualmente: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
-"Precaución:  ¡No hay usuarios administrativos activos!  Debe reparar esto antes de salirdel sistema.  "
-"Considere utilizar el parámetro $c->do_not_sync_from_ldap de configuración."
+"Precaución:  ¡No hay usuarios administrativos activos!  Debe reparar esto "
+"antes de salirdel sistema.  Considere utilizar el parámetro "
+"$c->do_not_sync_from_ldap de configuración."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Cuando la dirección de correo electrónico del usuario fue validada."
@@ -1313,44 +1426,55 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr "Su configuración produjo errors PHP que deben ser corregidos"
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "Todos los eventos del usuario %s fueron eliminados y reemplazados con los del archivo %s"
-
 msgid "calendar-timezone property is only valid for a calendar."
-msgstr "calendar-timezone es una propiedad válida solamente para un calendario."
+msgstr ""
+"calendar-timezone es una propiedad válida solamente para un calendario."
 
 #, php-format
 msgid "directory %s is not readable"
 msgstr "el directorio %s no es legible"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : imap_url parámetro no configurado en /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
+msgstr ""
+"drivers_imap_pam : imap_url parámetro no configurado en "
+"/etc/davical/*-conf.php"
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : No pudo arrancar TLS:  ldap_start_tls() falló"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-msgstr "drivers_ldap : Falló la atadura entre el sistema %1$s en el puerto %2$s con atadura DN de %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap : Falló la atadura entre el sistema %1$s en el puerto %2$s con "
+"atadura DN de %3$s"
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
-"drivers_ldap : Falló en establecer que LDAP utilice la versión 3 del protocol, TLS no es soportada"
+"drivers_ldap : Falló en establecer que LDAP utilice la versión 3 del "
+"protocol, TLS no es soportada"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap : Incapaz de atar a LDAP - verifique su configuración de bindDN y passDN, y que su "
-"servidor LDAP sea accesible"
+"drivers_ldap : Incapaz de atar a LDAP - verifique su configuración de bindDN"
+" y passDN, y que su servidor LDAP sea accesible"
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
-msgstr "drivers_ldap : Incapaz de conectar a LDAP en el puerto %s del servidor %s"
+msgstr ""
+"drivers_ldap : Incapaz de conectar a LDAP en el puerto %s del servidor %s"
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-msgstr "drivers_ldap : la función ldap_connect no fue definida; cheque su módulo php_ldap"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
+"drivers_ldap : la función ldap_connect no fue definida; cheque su módulo "
+"php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
@@ -1360,7 +1484,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Incapaz de encontrar el archivo %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "no me olvides"
 
@@ -1370,12 +1495,14 @@
 msgid "path to store your ics"
 msgstr "trayectoria para almacenar ics"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "el archivo %s no está codificado en UTF-8; por favor verifique el error para mayores detalles"
-
 msgid "unauthenticated"
 msgstr "Desautenticado"
 
-msgid "you should log on with the username and password that have been issued to you."
-msgstr "deberá identificarse con el nombre de usuario y clave de acceso que le fueron otorgados."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
+msgstr ""
+"deberá identificarse con el nombre de usuario y clave de acceso que le "
+"fueron otorgados."
+
+
diff -Nru davical-0.9.9.7/po/es_VE.po davical-1.0.2/po/es_VE.po
--- davical-0.9.9.7/po/es_VE.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/es_VE.po	2012-01-04 23:04:28.000000000 +0000
@@ -1,27 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # e1th0r <hcolina@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-26 13:25+0000\n"
-"Last-Translator: e1th0r <hcolina@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.net/projects/p/davical/team/es_VE/)\n"
-"Language: es_VE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -71,29 +74,28 @@
 msgid "- updating user records : %s"
 msgstr "- actualizando registros de usuario: %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr "</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -139,7 +141,12 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr ""
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -148,7 +155,8 @@
 msgid "All requested changes were made."
 msgstr ""
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -184,6 +192,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -230,7 +241,9 @@
 msgid "Collection deleted"
 msgstr ""
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -302,7 +315,8 @@
 msgid "DAV Path"
 msgstr "Ruta DAV"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -401,7 +415,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -455,7 +470,9 @@
 msgid "Email Address"
 msgstr ""
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -493,6 +510,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -642,6 +665,9 @@
 msgid "Last used"
 msgstr ""
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr ""
 
@@ -672,7 +698,9 @@
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
@@ -691,18 +719,12 @@
 msgid "No"
 msgstr ""
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr "No hay contenido en el calendario"
 
 msgid "No collection found at that location."
 msgstr ""
 
-msgid "No scheduling support for user"
-msgstr "No hay calendario soportado para el usuario"
-
 msgid "No summary"
 msgstr "Sin resumen"
 
@@ -746,16 +768,23 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr "PHP PostgreSQL disponible"
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr "PHP iconv soportado"
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -809,6 +838,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr ""
 
@@ -843,7 +878,8 @@
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -852,12 +888,18 @@
 msgid "Read/Write"
 msgstr "Leer/escribir"
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr "Remover"
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Reportar un error"
 
@@ -870,7 +912,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -898,9 +941,6 @@
 msgid "Schedule Transparency"
 msgstr ""
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr ""
 
@@ -928,10 +968,14 @@
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -943,10 +987,9 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
-msgstr ""
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -973,7 +1016,8 @@
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -992,7 +1036,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1016,7 +1060,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1025,7 +1070,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1041,10 +1087,13 @@
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1053,13 +1102,19 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1077,6 +1132,10 @@
 msgid "The preferred language for this person."
 msgstr ""
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr ""
 
@@ -1099,22 +1158,32 @@
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1177,7 +1246,9 @@
 msgid "Upgrade Database"
 msgstr ""
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
 
 msgid "User Calendar Principals"
@@ -1221,8 +1292,8 @@
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1273,10 +1344,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr ""
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1284,29 +1351,35 @@
 msgid "directory %s is not readable"
 msgstr "El directorio %s no es legible"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr ""
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
@@ -1317,7 +1390,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "Mantender la sesión activa"
 
@@ -1327,14 +1401,12 @@
 msgid "path to store your ics"
 msgstr "ruta para almacenar tu ics"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr ""
-"El archivo %s no está codificado en formato UTF-8; por favor, chequee los errores para obtener más "
-"detalles"
-
 msgid "unauthenticated"
 msgstr "No autenticado"
 
-msgid "you should log on with the username and password that have been issued to you."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr ""
+
+
diff -Nru davical-0.9.9.7/po/et.po davical-1.0.2/po/et.po
--- davical-0.9.9.7/po/et.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/et.po	2012-01-04 23:04:20.000000000 +0000
@@ -1,26 +1,29 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: Estonian (http://www.transifex.net/projects/p/davical/team/et/)\n"
-"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -70,29 +73,28 @@
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -138,7 +140,12 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr ""
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -147,7 +154,8 @@
 msgid "All requested changes were made."
 msgstr ""
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -183,6 +191,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -229,7 +240,9 @@
 msgid "Collection deleted"
 msgstr ""
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -301,7 +314,8 @@
 msgid "DAV Path"
 msgstr ""
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -400,7 +414,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -454,7 +469,9 @@
 msgid "Email Address"
 msgstr ""
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -492,6 +509,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -641,6 +664,9 @@
 msgid "Last used"
 msgstr ""
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr ""
 
@@ -671,7 +697,9 @@
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
@@ -690,18 +718,12 @@
 msgid "No"
 msgstr ""
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr ""
 
 msgid "No collection found at that location."
 msgstr ""
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -745,16 +767,23 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr ""
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -808,6 +837,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr ""
 
@@ -842,7 +877,8 @@
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -851,12 +887,18 @@
 msgid "Read/Write"
 msgstr ""
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr ""
 
@@ -869,7 +911,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -897,9 +940,6 @@
 msgid "Schedule Transparency"
 msgstr ""
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr ""
 
@@ -927,10 +967,14 @@
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -942,10 +986,9 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
-msgstr ""
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -972,7 +1015,8 @@
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -991,7 +1035,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1015,7 +1059,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1024,7 +1069,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1040,10 +1086,13 @@
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1052,13 +1101,19 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1076,6 +1131,10 @@
 msgid "The preferred language for this person."
 msgstr ""
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr ""
 
@@ -1098,22 +1157,32 @@
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1176,7 +1245,9 @@
 msgid "Upgrade Database"
 msgstr ""
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
 
 msgid "User Calendar Principals"
@@ -1220,8 +1291,8 @@
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1272,10 +1343,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr ""
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1283,29 +1350,35 @@
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr ""
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
@@ -1316,7 +1389,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr ""
 
@@ -1326,12 +1400,12 @@
 msgid "path to store your ics"
 msgstr ""
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr ""
-
 msgid "unauthenticated"
 msgstr ""
 
-msgid "you should log on with the username and password that have been issued to you."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr ""
+
+
diff -Nru davical-0.9.9.7/po/fr.po davical-1.0.2/po/fr.po
--- davical-0.9.9.7/po/fr.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/fr.po	2012-01-04 23:04:03.000000000 +0000
@@ -1,33 +1,38 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# tikismoke <webmaster@tikijs.dyndns.org>, 2011.
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
+#   <cgiraud@free.fr>, 2011.
+# tikismoke <webmaster@tikijs.dyndns.org>, 2011.
+#   <webmaster@tikijs.dyndns.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-04-05 16:53+0000\n"
-"Last-Translator: tikismoke <webmaster@tikijs.dyndns.org>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-21 22:03+0000\n"
+"Last-Translator: Frizou <cgiraud@free.fr>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/davical/team/fr/)\n"
-"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
 msgid "*** Default Locale ***"
-msgstr "*** Locale par défaut ***"
+msgstr "*** Langue par défaut ***"
 
 msgid "*** Unknown ***"
 msgstr "*** Inconnu ***"
@@ -46,7 +51,7 @@
 
 #, php-format
 msgid "- creating record for users :  %s"
-msgstr "- création de l'enregistrement des utilisateurs : %s"
+msgstr "- création d'enregistrement pour l'utilisateurs : %s"
 
 #, php-format
 msgid "- deactivate groups : %s"
@@ -70,40 +75,45 @@
 
 #, php-format
 msgid "- updating user records : %s"
-msgstr "- mise à jour des enregistrements d'utilisateurs : %s"
+msgstr "- mise à jour des enregistrements de l'utilisateur : %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
-"<b>Attention : tous les événements de ce chemin seront supprimés avant l'insertion de tous ceux du "
-"fichier ics</b>"
+"<b>Attention : tous les événements de ce chemin seront supprimés avant "
+"l'insertion de tous ceux du fichier ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
+"<h1>Aide</h1>\n"
+"<p>Pour obtenir de l'aide, vous devez commencer par aller voir sur le site <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> (en anglais) ou sur le <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">Wiki DAViCal</a> (presque complètement traduit en français).</p>\n"
+"<p>Si vous n'y trouvez pas ce que vous cherchez, prenez contact avec nous en anglais par <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> sur le canal <b>#davical</b> du serveur <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
+"ou envoyez une question en anglais sur <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>Les archives <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\"> peuvent également vous être utiles.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-msgstr ""
-"<h1>Veuillez vous connecter</h1><p>Pour accéder à %s vous devez vous connecter avec le nom "
-"d'utilisateur et le mot de passe qui vous ont été fournis.</p><p>Si vous voulez un accès, envoyé un e-"
-"mail à %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
+msgstr ""
+"<h1>Veuillez vous connecter</h1><p>Pour accéder à %s vous devez vous "
+"connecter avec le nom d'utilisateur et le mot de passe qui vous ont été "
+"fournis.</p><p>Si vous voulez demander un accès, envoyez un courriel à "
+"%s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
-msgstr "Une collection DAViCal principale ne peut contenir que des collections"
+msgstr "Un compte collection DAViCal ne peut contenir que des collections"
 
 msgid "A collection already exists at that location."
 msgstr "Une collection existe déjà à cet emplacement."
@@ -145,26 +155,38 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "Toutes les données de la collection seront effacées définitivement."
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
-msgstr "Tous les calendriers et les évènements de l'utilisateur seront effacées définitivement."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+"Tous les événements de l'utilisateur \"%s\" ont été supprimés et remplacés "
+"par ceux du fichier %s"
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
+msgstr ""
+"Tous les agendas et les évènements de l'utilisateur seront effacées "
+"définitivement."
 
 msgid "All privileges"
 msgstr "Tous les Privilèges"
 
 msgid "All requested changes were made."
-msgstr "Toutes les modifications demandées ont eu lieu"
+msgstr "Toutes les modifications demandées ont été effectuées"
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
+"Autoriser les requêtes Libre/Occupé envoyées au propriétaire de cette boîte "
+"de réception planification"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
-msgstr "Un \"administrateur\" a tous les droits sur le système DAViCal"
+msgstr "Mise à jour d'enregistrement de principal."
 
 msgid "Anonymous users are not allowed to modify calendars"
-msgstr "Les utilisateurs anonymes ne sont pas autorisés à modifier les calendriers"
+msgstr "Mise à jour accorde par ce principal"
 
 msgid "Anonymous users may only access public calendars"
-msgstr "Les utilisateurs anonymes peuvent uniquement accéder aux calendriers publics"
+msgstr "Les utilisateurs anonymes ne peuvent accéder qu'aux agendas publics"
 
 msgid "Application DB User"
 msgstr "Utilisateur de BDD Application"
@@ -188,41 +210,46 @@
 msgstr "Liaison vers cette Collection"
 
 msgid "Bindings to this Principal's Collections"
-msgstr "Liaison vers cette Collection Principale"
+msgstr "Liaisons vers ces Collections du compte"
+
+msgid "Body contains no XML data!"
+msgstr "Le corps ne contient aucune donnée XML !"
 
 msgid "Bound As"
-msgstr ""
+msgstr "Lié à"
 
 msgid "Browse all users"
-msgstr "Affiche tous les utilisateurs"
+msgstr "Afficher tous les utilisateurs"
 
 msgid "Busy"
 msgstr "Occupé"
 
 #, php-format
 msgid "Calendar \"%s\" was loaded from file."
-msgstr "Le calendrier \"%s\" a été chargé à partir d'un fichier."
+msgstr "L'agenda \"%s\" a été chargé à partir du fichier."
 
 msgid "Calendar Principals"
-msgstr "Compte du calendrier"
+msgstr "Liste des comptes"
 
 msgid "Calendar Timezone"
 msgstr "Fuseau horaire"
 
 msgid "Can only add tickets for existing collection paths which you own"
-msgstr "Ne peut ajouter des ticket que sur un chemin de collection existant que vous possédez"
+msgstr ""
+"Ne peut ajouter des tickets que sur un chemin de collection existant que "
+"vous possédez"
 
 msgid "Categories"
 msgstr "Catégories"
 
 msgid "Change Password"
-msgstr "changer le mot de passe"
+msgstr "Changer le mot de passe"
 
 msgid "Click to display user details"
 msgstr "Cliquer pour afficher les détails de cet utilisateur"
 
 msgid "Click to edit principal details"
-msgstr "Cliquer pour afficher les détails de cet élément"
+msgstr "Cliquer pour afficher le détail du compte"
 
 msgid "Collection"
 msgstr "Collection"
@@ -236,13 +263,15 @@
 msgid "Collection deleted"
 msgstr "Collection supprimée"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
-"Les collections ne peuvent pas être des calendriers CalDAV et des carnets d'adresses CardDAV en même "
-"temps"
+"Les collections ne peuvent pas être des agendas CalDAV et des carnets "
+"d'adresses CardDAV en même temps"
 
 msgid "Configuring Calendar Clients for DAViCal"
-msgstr "Configurer des clients Calendar pour DAViCal"
+msgstr "Configurer les clients d'agendas pour DAViCal"
 
 msgid "Configuring DAViCal"
 msgstr "Configurer DAViCal"
@@ -284,13 +313,14 @@
 msgstr "Créer une nouvelle collection"
 
 msgid "Create New Principal"
-msgstr "Créer un nouvel utilisateur"
+msgstr "Créer un nouveau compte"
 
 msgid "Create Principal"
 msgstr "Créer un compte"
 
 msgid "Create a new principal (i.e. a new user, resource or group)"
-msgstr "Créer un nouvel utilisateur (c-à-d un utilisateur, une ressource ou un groupe)"
+msgstr ""
+"Créer un nouveau compte (c-à-d un utilisateur, une ressource ou un groupe)"
 
 msgid "Create a resource or collection"
 msgstr "Créer une ressource ou une collection"
@@ -299,10 +329,10 @@
 msgstr "Créer une nouvelle collection."
 
 msgid "Creating new Principal record."
-msgstr "Création de l'enregistrement d'un nouveau compte."
+msgstr "Création d'un nouveau compte."
 
 msgid "Creating new ticket granting privileges to this Principal"
-msgstr "Création d'un nouveau billet accordant des privilèges à cet utilisateur principal"
+msgstr "Création d'un nouveau ticket accordant des privilèges à ce compte"
 
 msgid "Current DAViCal version "
 msgstr "Version DAViCal courante "
@@ -310,8 +340,11 @@
 msgid "DAV Path"
 msgstr "Chemin DAV"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
+"DAV::resourcetype ne peut qu'être positionné à une nouvelle valeur, pas "
+"supprimé."
 
 msgid "DAViCal CalDAV Server"
 msgstr "Serveur CalDAV DAViCal"
@@ -327,6 +360,8 @@
 
 msgid "DAViCal only allows BIND requests for collections at present."
 msgstr ""
+"A l'heure actuelle DAViCal ne permet que les requêtes BIND pour les "
+"collections."
 
 msgid "DKIM signature invalid "
 msgstr "Signature DKIM invalide."
@@ -341,10 +376,13 @@
 msgstr "La validation de la signature DKIM a échoué (erreur d'analyse de clé)"
 
 msgid "DKIM signature validation failed(KEY Validation ERROR)"
-msgstr "La validation de la signature DKIM a échoué (erreur de validation de clé)"
+msgstr ""
+"La validation de la signature DKIM a échoué (erreur de validation de clé)"
 
 msgid "DKIM signature validation failed(Signature verification ERROR)"
-msgstr "validation de la signature DKIM échouée (erreur de vérification de signature)"
+msgstr ""
+"validation de la signature DKIM échouée (erreur de vérification de "
+"signature)"
 
 msgid "Database Error"
 msgstr "Erreur de base de données"
@@ -380,7 +418,7 @@
 msgstr "Privilèges par défaut"
 
 msgid "Default relationships added."
-msgstr ""
+msgstr "Relations par défaut ajoutées."
 
 msgid "Delete"
 msgstr "Supprimer"
@@ -395,7 +433,7 @@
 msgstr "Supprimer une ressource ou une collection"
 
 msgid "Deleted a grant from this Principal"
-msgstr "Supprimer un accès donné par cet utilisateur"
+msgstr "Un accès donné par ce compte a été supprimé"
 
 msgid "Deleting Binding:"
 msgstr "Suppression des liaisons:"
@@ -404,16 +442,21 @@
 msgstr "Suppression de la collection :"
 
 msgid "Deleting Principal:"
-msgstr "Suppression le compte :"
+msgstr "Suppression du compte :"
 
 msgid "Deleting Ticket:"
 msgstr "Suppression du Ticket:"
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
+"Envoyer des invitations (programmées par un organisateur à cette boîte de "
+"réception planification)"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
 msgstr ""
+"Envoyer des réponses aux invitations (d'un participant à cette boîte de "
+"réception planification)"
 
 msgid "Dependencies"
 msgstr "Dépendances"
@@ -449,12 +492,14 @@
 msgstr "ERREUR : Le nom complet ne peut être vide."
 
 msgid "ERROR: The new password must match the confirmed password."
-msgstr "ERREUR : Le nouveau mot de passe doit être identique au mot de passe confirmé."
+msgstr ""
+"ERREUR : Le nouveau mot de passe doit être identique au mot de passe "
+"confirmé."
 
 msgid "ERROR: There was a database error writing the roles information!"
 msgstr ""
-"ERREUR: Il y a eu une erreur lors de l'écriture dans la base de données des informations pour les "
-"rôles !"
+"ERREUR: Il y a eu une erreur lors de l'écriture dans la base de données des "
+"informations pour les rôles !"
 
 msgid "Edit"
 msgstr "Modifier"
@@ -465,17 +510,21 @@
 msgid "Email Address"
 msgstr "Adresse de courriel"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
-"Indiquez un nom d'utilisateur, si vous le connaissez et cliquez ici pour recevoir un mot de passe "
-"temporaire."
+"Indiquez un nom d'utilisateur, si vous le connaissez et cliquez ici pour "
+"recevoir un mot de passe temporaire."
 
 msgid "Enter your username and password then click here to log in."
-msgstr "Indiquez votre nom d'utilisateur et votre mot de passe puis cliquez ici pour vous connecter"
+msgstr ""
+"Indiquez votre nom d'utilisateur et votre mot de passe puis cliquez ici pour"
+" vous connecter"
 
 #, php-format
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
-msgstr ""
+msgstr "Erreur NoGroupFound avec le filtre >%s<, attributs >%s< , dn >%s<"
 
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
@@ -497,14 +546,24 @@
 msgstr "Européen (jj/mm/aa)"
 
 msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "La ressource existante ne correspond pas à l'entête (HTTP) 'If-Match' - pas accepté."
+msgstr ""
+"La ressource existante ne correspond pas à l'entête (HTTP) 'If-Match' - pas "
+"accepté."
 
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
-msgstr "La ressource existante correspond à l'entête (HTTP) 'if-None-Match' - pas accepté."
+msgstr ""
+"La ressource existante correspond à l'entête (HTTP) 'if-None-Match' - pas "
+"accepté."
 
 msgid "Expires"
 msgstr "Expires"
 
+msgid "External Calendars"
+msgstr "Agendas externes"
+
+msgid "External Url"
+msgstr "URL externe"
+
 msgid "Fail"
 msgstr "Échec"
 
@@ -513,6 +572,7 @@
 
 msgid "Feeds are only supported for calendars at present."
 msgstr ""
+"A l'heure actuelle, les flux ne sont pris en charge que pour les agendas."
 
 msgid "For access to the"
 msgstr "Pour accéder à"
@@ -530,7 +590,9 @@
 msgstr "Nom complet"
 
 msgid "GET requests on collections are only supported for calendars."
-msgstr "Les demandes GET sur les collections ne sont pris en charge que pour les calendriers."
+msgstr ""
+"Les demandes GET sur les collections ne sont prises en charge que pour les "
+"agendas."
 
 msgid "GNU gettext support"
 msgstr "support de GNU gettext"
@@ -545,7 +607,7 @@
 msgstr "Accorder"
 
 msgid "Granting new privileges from this Principal"
-msgstr "Accord de nouveaux privilèges de cet utilisateur"
+msgstr "Accord de nouveaux privilèges par ce compte"
 
 #. Translators: in the sense of a group of people
 msgid "Group"
@@ -558,7 +620,7 @@
 msgstr "Adhésions au groupe"
 
 msgid "Group Principals"
-msgstr "Groupe d'utilisateurs"
+msgstr "Liste des groupes"
 
 msgid "Has Members"
 msgstr "A des membres"
@@ -585,10 +647,10 @@
 msgstr "Carnet d'adresses déjà existant."
 
 msgid "Home calendar added."
-msgstr "Calendrier Home ajouté."
+msgstr "Agenda Home ajouté."
 
 msgid "Home calendar already exists."
-msgstr "Le calendrier Home existe déjà."
+msgstr "L'agenda Home existe déjà."
 
 msgid "ID"
 msgstr "ID."
@@ -613,16 +675,16 @@
 msgstr "Importer tous les fichiers .ics d'un répertoire"
 
 msgid "Import calendars and Synchronise LDAP."
-msgstr ""
+msgstr "Importer les agendas et synchroniser l'annuaire LDAP."
 
 msgid "Inactive Principals"
 msgstr "Comptes inactifs"
 
 msgid "Incorrect content type for addressbook: "
-msgstr "type de contenu incorrect pour le carnet d'adresses:"
+msgstr "Type de contenu incorrect pour le carnet d'adresses:"
 
 msgid "Incorrect content type for calendar: "
-msgstr "type de contenu incorrect pour le calendrier:"
+msgstr "Type de contenu incorrect pour l'agenda:"
 
 msgid "Invalid user name or password."
 msgstr "Nom d'utilisateur ou mot de passe incorrects."
@@ -634,7 +696,7 @@
 msgstr "Est membre de"
 
 msgid "Is a Calendar"
-msgstr "Est un calendrier"
+msgstr "Est un agenda"
 
 msgid "Is an Addressbook"
 msgstr "Est un carnet d'adresses"
@@ -654,6 +716,9 @@
 msgid "Last used"
 msgstr "Dernier utilisé"
 
+msgid "List External Calendars"
+msgstr "Liste des Agendas Externes"
+
 msgid "List Groups"
 msgstr "Liste des Groupes"
 
@@ -684,10 +749,12 @@
 msgid "Member deleted from this Group Principal"
 msgstr "Membre supprimé de ce groupe"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
-"La plupart des fonctions DAViCal fonctionneront, mais une mise à jour vers PHP 5.2 ou ultérieure est "
-"fortement recommandé."
+"La plupart des fonctions DAViCal fonctionneront, mais une mise à jour vers "
+"PHP 5.2 ou ultérieure est fortement recommandé."
 
 msgid "Name"
 msgstr "Nom"
@@ -705,20 +772,14 @@
 msgid "No"
 msgstr "No"
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
-msgstr "Pas de contenu dans ce calendrier"
+msgstr "Pas de contenu dans cet agenda"
 
 msgid "No collection found at that location."
 msgstr "Pas de collection trouvée à cet endroit."
 
-msgid "No scheduling support for user"
-msgstr "Programmation non supportée pour l'utilisateur"
-
 msgid "No summary"
-msgstr ""
+msgstr "Aucun résumé"
 
 #. Translators: short for 'Number'
 msgid "No."
@@ -734,7 +795,7 @@
 msgstr "Nb. de ressources"
 
 msgid "Not overwriting existing destination resource"
-msgstr ""
+msgstr "N'écrase pas la ressource destination existante"
 
 msgid "Opaque"
 msgstr "Opaque"
@@ -746,10 +807,10 @@
 msgstr "Pilote PDO pour PostgreSQL"
 
 msgid "PHP DateTime class"
-msgstr ""
+msgstr "Classe PHP DateTime"
 
 msgid "PHP LDAP module available"
-msgstr "module PHP LDAP disponible"
+msgstr "Module PHP LDAP disponible"
 
 msgid "PHP Magic Quotes GPC off"
 msgstr "PHP Magic Quotes GPC désactivé"
@@ -760,17 +821,28 @@
 msgid "PHP PDO module available"
 msgstr "Module PDO PHP disponible"
 
-msgid "PHP PostgreSQL available"
-msgstr "PHP PostgreSQL disponible"
-
 msgid "PHP calendar extension available"
-msgstr ""
+msgstr "Extension d'agenda PHP disponible"
 
 msgid "PHP iconv support"
 msgstr "support PHP iconv"
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr "PHP n'utilise pas le mode Apache Filter"
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
 msgstr ""
+"Mise à jour d'une collection agenda autorisée uniquement pour un contenu "
+"text/calendar"
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
+msgstr ""
+"Mise à jour d'une collection carnet d'adresses autorisée uniquement pour un "
+"contenu text/vcard"
 
 msgid "Passed"
 msgstr "Passé"
@@ -794,10 +866,12 @@
 msgstr "Veuillez confirmer la suppression de la collection - voir ci-dessous"
 
 msgid "Please confirm deletion of the principal"
-msgstr "Veuillez confirmer la suppression"
+msgstr "Veuillez confirmer la suppression du compte"
 
 msgid "Please note the time and advise the administrator of your system."
-msgstr "Veuillez noter l'heure et informer l'administrateur de votre système informatique."
+msgstr ""
+"Veuillez noter l'heure et informer l'administrateur de votre système "
+"informatique."
 
 msgid "Principal"
 msgstr "Compte"
@@ -806,7 +880,7 @@
 msgstr "Collections de comptes"
 
 msgid "Principal Grants"
-msgstr "Accès accordés par l'utilisateur"
+msgstr "Accès accordés par le compte"
 
 msgid "Principal ID"
 msgstr "Id compte"
@@ -823,6 +897,16 @@
 msgid "Privileges granted to All Users"
 msgstr "Privilèges accordés à tous les utilisateurs"
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+"Privilèges de gestion standard des invitations (inviter, accepter, "
+"libre/occupé)"
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+"Privilèges de gestion des invitations par délégation (inviter, accepter, "
+"libre/occupé)"
+
 msgid "Property is read-only"
 msgstr "Cette propriété est en lecture-seule"
 
@@ -857,21 +941,30 @@
 msgid "Read the content of a resource or collection"
 msgstr "Lire le contenu de la ressource ou de la collection"
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
+"Lire les détails du contrôle d'accès de l'utilisateur courant à cette "
+"ressource."
 
 msgid "Read the free/busy information for a calendar collection"
-msgstr "Lire les informations Libre/Occupé pour un calendrier"
+msgstr "Lire les informations Libre/Occupé pour un agenda"
 
 msgid "Read/Write"
 msgstr "Lecture/Écriture"
 
+msgid "References"
+msgstr "Références"
+
 msgid "Remove"
 msgstr "Supprimer"
 
 msgid "Remove a lock"
 msgstr "Supprimer un verrou"
 
+msgid "Remove dangling external calendars"
+msgstr "Retirer les agendas externes liés"
+
 msgid "Report Bug"
 msgstr "Signaler une erreur"
 
@@ -882,14 +975,15 @@
 msgstr "Demander une amélioration"
 
 msgid "Request body is not valid XML data!"
-msgstr ""
+msgstr "Le corps de la requête n'est pas du XML valide !"
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Ressource"
 
 msgid "Resource Calendar Principals"
-msgstr "Ressources du calendrier"
+msgstr "Liste des Ressources"
 
 msgid "Resource Not Found."
 msgstr "Ressource introuvable."
@@ -898,55 +992,61 @@
 msgstr "La ressource a été modifiée sur le serveur - non supprimée"
 
 msgid "Resources may not be changed to / from collections."
-msgstr "Les ressources ne devraient pas être modifiées en/à partir de collections."
+msgstr ""
+"Les ressources ne devraient pas être modifiées en/à partir de collections."
 
 msgid "Revoke"
 msgstr "Retirer"
 
 msgid "Schedule Deliver"
-msgstr "Programmation de livraison"
+msgstr "Planif: Invitations"
 
 msgid "Schedule Send"
-msgstr "Programmation d'envoi"
+msgstr "Planif: Délégation"
 
 msgid "Schedule Transparency"
-msgstr ""
-
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
+msgstr "Transparence de planification"
 
 msgid "Scheduling: Deliver a Reply"
-msgstr "Programmation: Envoyer une réponse"
+msgstr "Planification: Envoyer une réponse"
 
 msgid "Scheduling: Deliver an Invitation"
-msgstr "Programmation: Envoyer une invitation"
+msgstr "Planification: Envoyer une invitation"
 
 msgid "Scheduling: Delivery"
-msgstr "Programmation: livraison"
+msgstr "Planification: Envoi"
 
 msgid "Scheduling: Query free/busy"
-msgstr "Programmation: Requête Libre/Occupé"
+msgstr "Planification: Requête Libre/Occupé"
 
 msgid "Scheduling: Send a Reply"
-msgstr "Programmation: Envoyer une réponse"
+msgstr "Planification: Envoyer une réponse par délégation"
 
 msgid "Scheduling: Send an Invitation"
-msgstr "Programmation: Envoyer une invitation"
+msgstr "Planification: Envoyer une invitation par délégation"
 
 msgid "Scheduling: Send free/busy"
-msgstr "Programmation: Envoyer Libre/Occupé"
+msgstr "Planification: Envoyer Libre/Occupé par délégation"
 
 msgid "Scheduling: Sending"
-msgstr "Programmation d'envoi"
+msgstr "Planification: Délégation d'envoi"
 
 msgid "Send free/busy enquiries"
 msgstr "Envoyer une requête Libre/Occupé"
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
+"Envoyer des invitations en tant qu'organisateur depuis cette boîte d’envoi "
+"planification (délégation)."
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
+"Envoyer des réponses aux invitations en tant que participant depuis cette "
+"boîte d’envoi planification (délégation)"
 
 msgid "Set free/busy privileges"
 msgstr "Attribuer le privilège Libre/Occupé"
@@ -957,11 +1057,12 @@
 msgid "Set read+write privileges"
 msgstr "Définir des privilèges de lecture + écriture"
 
-msgid "Set schedule-deliver privileges"
-msgstr "Définir les privilèges de programmation-livraison"
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
-msgstr "Veuillez indiquer le chemin où stocker votre ics ex : 'home' pour avoir /caldav.php/moi/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
+msgstr ""
+"Positionnez le chemin d'accès à l'agenda, par exemple 'calendar' pour y "
+"accéder par le chemin /caldav.php/username/calendar/"
 
 msgid "Setup"
 msgstr "Configuration"
@@ -987,9 +1088,11 @@
 msgid "Source resource does not exist."
 msgstr "La ressource source n'existe pas"
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr ""
-"Les collections spéciales ne peuvent pas contenir un calendrier ou une autre collection spéciale."
+"Les collections spéciales ne peuvent pas contenir un agenda ou une autre "
+"collection spéciale."
 
 msgid "Specific Privileges"
 msgstr "Privilèges spécifiques"
@@ -1005,10 +1108,10 @@
 msgstr "Valider"
 
 msgid "Suhosin \"server.strip\" disabled"
-msgstr "Suhosin \"server.strip\" désacitivé"
+msgstr "Suhosin \"server.strip\" désactivé"
 
-msgid "Sync LDAP Groups with RSCDS"
-msgstr ""
+msgid "Sync LDAP Groups with DAViCal"
+msgstr "Synchroniser les groupes LDAP avec DAViCal"
 
 msgid "Sync LDAP with DAViCal"
 msgstr "Synchroniser LDAP avec DAViCal"
@@ -1017,7 +1120,7 @@
 msgstr "Cible"
 
 msgid "That destination name contains invalid characters."
-msgstr "le chemin vers le calendrier contient des caractères interdits."
+msgstr "Ce chemin contient des caractères interdits."
 
 msgid "That resource is not present on this server."
 msgstr "Cette ressource n'est pas présente sur ce serveur"
@@ -1026,13 +1129,16 @@
 msgstr "La requête BIND DOIT identifier une ressource existante."
 
 msgid "The BIND Request-URI MUST identify a collection."
-msgstr ""
+msgstr "La requête-URI BIND DOIT identifier une collection."
 
 msgid "The BIND method is not allowed at that location."
 msgstr "La méthode de connexion (BIND) n'est pas autorisée à cet endroit."
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
+"La propriété CalDAV:schedule-calendar-transp ne peut être positionnée que "
+"sur des agendas."
 
 msgid "The DAViCal Home Page"
 msgstr "Page d'accueil DAViCal"
@@ -1040,11 +1146,14 @@
 msgid "The access ticket will be deleted."
 msgstr "Le ticket d'accès sera supprimé."
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
+"Le rapport de carnet d'adresses doit être demandé sur une collection de type"
+" carnet d'adresses"
 
 msgid "The application failed to understand that request."
-msgstr ""
+msgstr "L'application n'a pas réussi à comprendre cette rzquête."
 
 msgid "The application program does not understand that request."
 msgstr "L'application ne comprend pas la demande."
@@ -1053,14 +1162,21 @@
 msgstr "La liaison sera supprimée."
 
 msgid "The calendar path contains illegal characters."
-msgstr "le chemin vers le calendrier contient des caractères interdits."
+msgstr "Le chemin vers l'agenda contient des caractères interdits."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
+"La propriété calendar-free-busy-set est écrasée par la propriété schedule-"
+"transp d'une collection."
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
+"Le rapport d'agenda doit être demandé sur un agenda ou une collection "
+"planification"
 
 msgid "The collection name may not be blank."
 msgstr "Le nom de la collection ne devrait pas être vide."
@@ -1068,14 +1184,26 @@
 msgid "The destination collection does not exist"
 msgstr "La collection de destination n'existe pas"
 
-msgid "The displayname may only be set on collections, principals or bindings."
-msgstr "Le nom à afficher ne peut être défini que pour une Collection, Principale ou une liaison"
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
+msgstr ""
+"Le nom à afficher ne peut être défini que pour une Collection, un Compte ou "
+"une liaison."
 
 msgid "The email address really should not be blank."
 msgstr "L'adresse courriel ne devrait vraiment pas être vide."
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
-msgstr "Le fichier n'est pas encodé en UTF-8, veuillez vérifier les erreurs pour plus d'information."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+"Le fichier \"%s\" n'est pas au format UTF-8, merci de regarder les erreurs "
+"pour plus de détail"
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
+"Le fichier n'est pas encodé en UTF-8, veuillez vérifier les erreurs pour "
+"plus d'information."
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "Le nom complet pour cette personne, groupe ou autre type de compte."
@@ -1084,7 +1212,9 @@
 msgstr "Le nom complet ne doit pas être vide."
 
 msgid "The name this user can log into the system with."
-msgstr "Le nom ou pseudonyme que cet utilisateur emploiera pour se connecter à l'application."
+msgstr ""
+"Le nom ou pseudonyme que cet utilisateur emploiera pour se connecter à "
+"l'application."
 
 msgid "The path on the server where your .ics files are."
 msgstr "Le chemin sur le serveur où sont stockés tous les fichiers .ics."
@@ -1092,6 +1222,10 @@
 msgid "The preferred language for this person."
 msgstr "La langue parlée par cette personne."
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr "Le compte \"%s\" n'existe pas"
+
 msgid "The style of dates used for this person."
 msgstr "Le style de dates utilisé par cette personne."
 
@@ -1105,7 +1239,9 @@
 msgstr "Mot de passe utilisateur pour se connecter."
 
 msgid "The username must not be blank, and may not contain a slash"
-msgstr "Le nom de l'utilisateur ne devrait pas être vide et ne devrait pas contenir de slash ('/')"
+msgstr ""
+"Le nom de l'utilisateur ne devrait pas être vide et ne devrait pas contenir "
+"de slash ('/')"
 
 msgid "There was an error reading from the database."
 msgstr "Il y a eu une erreur lors de la lecture de la base de données."
@@ -1114,29 +1250,57 @@
 msgstr "Il s'est produit une erreur lors de l'écriture des données."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Cette action: <ul><li>regarde les groupes valides dans l'annuaire LDAP</li> "
+"<li>regarde les groupes dans DAViCal</li></ul> puis <ul><li>si un groupe est"
+" présent dans DAViCal et pas dans l'annuaire LDAP, le positionne inactif "
+"dans DAViCal</li> <li>si un groupe est présent dans l'annuaire LDAP et pas "
+"dans DAViCal, crée le groupe dans DAViCal</li> <li>si un groupe est présent "
+"dans l'annuaire LDAP et dans DAViCal, le met à jour dans DAViCal</li> </ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Cette action: <ul><li>regarde des comptes utilisateurs valides dans "
+"l'annuaire LDAP</li> <li>regarde les comptes utilisateurs dans "
+"DAViCal</li></ul> puis <ul><li>si un compte est présent dans DAViCal et pas "
+"dans l'annuaire LDAP, le rend inactif dans DAViCal</li> <li>si un compte est"
+" présent dans l'annuaire LDAP mais pas dans DAViCal, le crée dans "
+"DAViCal</li> <li>si un compte est présent dans LDAP et dans DAViCal, le met "
+"à jour dans DAViCal</li> </ul>"
+
+msgid ""
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
+msgstr ""
+"Cette page vérifie principalement l'environnement nécessaire pour faire "
+"fonctionner Davical correctement. Les suggestions ou correctifs pour lui "
+"faire faire des choses plus utiles sont les bienvenus."
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
-"Cette page vérifie principalement l'environnement nécessaire pour faire fonctionner Davical "
-"correctement. Les suggestions ou correctifs pour lui faire faire des choses plus utiles sont les "
-"bienvenus."
+"Cette action va importer chaque fichier dans un répertoire nommé "
+"\"username.ics\" et créer un utilisateur et un agenda pour chaque fichier à "
+"importer."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
-msgstr "Ce serveur ne supporte que le format texte/calendrier pour l'URL Libre/occupé"
+msgstr ""
+"Ce serveur ne supporte que le format texte/calendrier pour l'URL "
+"Libre/occupé"
 
 msgid "Ticket ID"
 msgstr "Id du ticket"
@@ -1145,7 +1309,7 @@
 msgstr "Temps"
 
 msgid "To Collection"
-msgstr ""
+msgstr "Pour la Collection"
 
 msgid "To ID"
 msgstr "Pour l'ID"
@@ -1178,16 +1342,16 @@
 msgstr "Mis à jour"
 
 msgid "Updating Collection record."
-msgstr ""
+msgstr "Mise à jour de l'enregistrement collection"
 
 msgid "Updating Member of this Group Principal"
-msgstr "Membre de ce groupe mis à jour"
+msgstr "Mise à jour des membres de ce groupe"
 
 msgid "Updating Principal record."
-msgstr ""
+msgstr "Mise à jour du compte."
 
 msgid "Updating grants by this Principal"
-msgstr ""
+msgstr "Mise à jour des droits accordés par ce compte"
 
 msgid "Upgrade DAViCal database schema"
 msgstr "Mise à jour le schéma de la base de données de DAViCal"
@@ -1195,11 +1359,15 @@
 msgid "Upgrade Database"
 msgstr "Mise à jour de la base"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
-msgstr "Envoyer votre calendrier .ics au format ical pour initialiser ou remplacer votre calendrier"
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
+msgstr ""
+"Envoyer un fichier .ics au format ical pour initialiser ou remplacer cet "
+"agenda"
 
 msgid "User Calendar Principals"
-msgstr ""
+msgstr "Liste des comptes utilisateurs"
 
 msgid "User Details"
 msgstr "Informations sur l'utilisateur"
@@ -1239,9 +1407,12 @@
 msgstr "Nécessite: %s , actuellement: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
+"Attention: il n'y a pas de compte admin actif ! Vous devez corriger ça avant"
+" de vous déconnecter. Utilisez éventuellement le paramétrage "
+"$c->do_not_sync_from_ldap."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Date à laquelle l'adresse courriel de cet utilisateur a été validée."
@@ -1250,7 +1421,7 @@
 msgstr "Écrire"
 
 msgid "Write ACLs for a resource or collection"
-msgstr ""
+msgstr "Positionner ACLs d'une ressource ou collection"
 
 msgid "Write Access Controls"
 msgstr "Ecrire des contrôles d'accès"
@@ -1283,7 +1454,7 @@
 msgstr "Vous n'avez pas l'autorisation de modifier cet enregistrement."
 
 msgid "You may not PUT to a collection URL"
-msgstr ""
+msgstr "Vous ne pouvez pas mettre à jour vers une URL de collection"
 
 msgid "You must log in to use this system."
 msgstr "Vous devez vous connecter pour utiliser ce logiciel."
@@ -1291,69 +1462,84 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr "Votre configuration a généré des erreurs PHP qui devrait être corrigé"
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "tous les événements de l'utilisateur %s ont été supprimés et remplacés par ceux du fichier %s."
-
 msgid "calendar-timezone property is only valid for a calendar."
-msgstr ""
+msgstr "La propriété fuseau horaire n'est valide que pour un agenda."
 
 #, php-format
 msgid "directory %s is not readable"
 msgstr "le répertoire %s n'est pas accessible en lecture."
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
+"drivers_imap_pam : le paramètre imap_url n'est pas configuré dans "
+"/etc/davical/*-conf.php"
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
-msgstr "drivers_ldap : impossible de démarrer TLS : ldap_start_tlf() a échoué."
+msgstr ""
+"drivers_ldap : impossible de démarrer TLS : ldap_start_tlf() a échoué."
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-msgstr "drivers_ldap : impossible de se connecter à l'hôte %1$s sur le port %2$s avec bindDN %3$s."
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap : impossible de se connecter à l'hôte %1$s sur le port %2$s "
+"avec bindDN %3$s."
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-msgstr "drivers_ldap : impossible pour LDAP d'utiliser le protocole version 3, TLS n'est pas géré."
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
+msgstr ""
+"drivers_ldap : impossible pour LDAP d'utiliser le protocole version 3, TLS "
+"n'est pas géré."
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap : Impossible de se lier à LDAP, veuillez vérifier votre bindDN et passDN de votre "
-"configuration ou si votre serveur LDAP est accessible."
+"drivers_ldap : Impossible de se lier à LDAP, veuillez vérifier votre bindDN "
+"et passDN de votre configuration ou si votre serveur LDAP est accessible."
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
-msgstr "drivers_ldap : impossible de se connecter à LDAP sur le port %s et sur l'hôte %s."
+msgstr ""
+"drivers_ldap : impossible de se connecter à l'annuaire LDAP sur le port %s "
+"de l'hôte %s."
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
-"drivers_ldap : la fonction ldap_connect n'est pas définie, vérifiez que vous avez l'extension php_ldap."
+"drivers_ldap : la fonction ldap_connect n'est pas définie, vérifiez que vous"
+" avez l'extension php_ldap."
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
-msgstr ""
+msgstr "drivers_pwauth_pam : fichier %s introuvable"
 
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : incapable de trouver le fichier %s."
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "Ne pas m'oublier"
 
 msgid "from principal"
-msgstr "depuis principal"
+msgstr "depuis le compte"
 
 msgid "path to store your ics"
 msgstr "le chemin où stocker votre ics"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "Le fichier %s n'est pas encodé en UTF-8, merci de vérifier les erreurs pour plus d'information."
-
 msgid "unauthenticated"
 msgstr "non authentifié"
 
-msgid "you should log on with the username and password that have been issued to you."
-msgstr "Vous devez vous connecter avec le nom d'utilisateur et le mot de passe qui vous ont été fournis."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
+msgstr ""
+"Vous devez vous connecter avec le nom d'utilisateur et le mot de passe qui "
+"vous ont été fournis."
+
+
diff -Nru davical-0.9.9.7/po/hu.po davical-1.0.2/po/hu.po
--- davical-0.9.9.7/po/hu.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/hu.po	2012-01-04 23:04:14.000000000 +0000
@@ -1,27 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -71,32 +74,31 @@
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
-"<h1>Lépjen be</h1><p>'%s' - hozzáféréshez lépjen befelhasználónevével és jelszavával</p><p>Ha "
-"hozzáférést szeretne kapni, írjon ide: %s</p>"
+"<h1>Lépjen be</h1><p>'%s' - hozzáféréshez lépjen befelhasználónevével és "
+"jelszavával</p><p>Ha hozzáférést szeretne kapni, írjon ide: %s</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -141,7 +143,12 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr ""
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -150,7 +157,8 @@
 msgid "All requested changes were made."
 msgstr "Minden változás mentve"
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -186,6 +194,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -232,7 +243,9 @@
 msgid "Collection deleted"
 msgstr ""
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -304,7 +317,8 @@
 msgid "DAV Path"
 msgstr ""
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -403,7 +417,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -457,8 +472,12 @@
 msgid "Email Address"
 msgstr ""
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-msgstr "Írja be a felhasználónevet. Egy e-mailt fog kapni egy új ideiglenes jelszóval."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
+msgstr ""
+"Írja be a felhasználónevet. Egy e-mailt fog kapni egy új ideiglenes "
+"jelszóval."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Írja be a felhasználónevét és jelszavát a belépéshez"
@@ -495,6 +514,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -644,6 +669,9 @@
 msgid "Last used"
 msgstr "Utoljára használva"
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr ""
 
@@ -674,7 +702,9 @@
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
@@ -693,18 +723,12 @@
 msgid "No"
 msgstr ""
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr ""
 
 msgid "No collection found at that location."
 msgstr "Ezen a helyen nincs gyűjtemény."
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -748,16 +772,23 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr ""
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -811,6 +842,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr "Csak olvasható"
 
@@ -845,7 +882,8 @@
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -854,12 +892,18 @@
 msgid "Read/Write"
 msgstr ""
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Hibajelentés"
 
@@ -872,7 +916,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Erőforrás"
 
@@ -900,9 +945,6 @@
 msgid "Schedule Transparency"
 msgstr ""
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr ""
 
@@ -930,10 +972,14 @@
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -945,10 +991,9 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
-msgstr ""
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -975,7 +1020,8 @@
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -994,7 +1040,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1018,7 +1064,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1027,7 +1074,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1043,10 +1091,13 @@
 msgstr "A naptár elérési útja érvénytelen karaktert tartalmaz."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1055,13 +1106,19 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1079,6 +1136,10 @@
 msgid "The preferred language for this person."
 msgstr "Preferált nyelv"
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr "Dátumformátum"
 
@@ -1101,22 +1162,32 @@
 msgstr "Adatbázis-hiba történt íráskor."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1179,7 +1250,9 @@
 msgid "Upgrade Database"
 msgstr ""
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
 
 msgid "User Calendar Principals"
@@ -1223,8 +1296,8 @@
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1275,10 +1348,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr ""
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1286,29 +1355,35 @@
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr ""
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
@@ -1319,7 +1394,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "Emlékezzen rám"
 
@@ -1329,12 +1405,12 @@
 msgid "path to store your ics"
 msgstr ""
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr ""
-
 msgid "unauthenticated"
 msgstr ""
 
-msgid "you should log on with the username and password that have been issued to you."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr "Lépjen be felhasználónevével és jelszavával."
+
+
diff -Nru davical-0.9.9.7/po/it.po davical-1.0.2/po/it.po
--- davical-0.9.9.7/po/it.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/it.po	2012-01-04 23:04:12.000000000 +0000
@@ -1,27 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -71,33 +74,34 @@
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
-"<b>ATTENZIONE: tutti gli eventi in questo path saranno cancellati dall'inserimento del file ics</b>"
+"<b>ATTENZIONE: tutti gli eventi in questo path saranno cancellati "
+"dall'inserimento del file ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-msgstr ""
-"<h1>Log On</h1><p>Per accedere a %s devi autenticarti con le credenziali username e password che ti "
-"sono state assegnate.</p><p>Se desideri ottenere un accesso, invia una richiesta e-mail a %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
+msgstr ""
+"<h1>Log On</h1><p>Per accedere a %s devi autenticarti con le credenziali "
+"username e password che ti sono state assegnate.</p><p>Se desideri ottenere "
+"un accesso, invia una richiesta e-mail a %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -142,7 +146,12 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr ""
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -151,7 +160,8 @@
 msgid "All requested changes were made."
 msgstr "Tutte le modifiche richieste sono state apportate."
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -187,6 +197,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -233,7 +246,9 @@
 msgid "Collection deleted"
 msgstr "Archivio cancellato"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -305,7 +320,8 @@
 msgid "DAV Path"
 msgstr ""
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -404,7 +420,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -458,7 +475,9 @@
 msgid "Email Address"
 msgstr ""
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -496,6 +515,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -645,6 +670,9 @@
 msgid "Last used"
 msgstr "Ultimo accesso"
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr ""
 
@@ -675,7 +703,9 @@
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
@@ -694,18 +724,12 @@
 msgid "No"
 msgstr ""
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr ""
 
 msgid "No collection found at that location."
 msgstr ""
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -749,16 +773,23 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr ""
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -812,6 +843,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr ""
 
@@ -846,7 +883,8 @@
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -855,12 +893,18 @@
 msgid "Read/Write"
 msgstr ""
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Segnala Bug"
 
@@ -873,7 +917,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -901,9 +946,6 @@
 msgid "Schedule Transparency"
 msgstr ""
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr ""
 
@@ -931,10 +973,14 @@
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -946,13 +992,10 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
-msgstr ""
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
-"Impostare il percorso per memorizzare il file ics - es. 'home' - che sarà referenziato come /caldav."
-"php/me/home/"
 
 msgid "Setup"
 msgstr ""
@@ -978,7 +1021,8 @@
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -997,7 +1041,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1021,7 +1065,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1030,7 +1075,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1046,10 +1092,13 @@
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1058,13 +1107,19 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1082,6 +1137,10 @@
 msgid "The preferred language for this person."
 msgstr ""
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr ""
 
@@ -1104,22 +1163,32 @@
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1182,7 +1251,9 @@
 msgid "Upgrade Database"
 msgstr ""
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
 
 msgid "User Calendar Principals"
@@ -1226,8 +1297,8 @@
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1278,10 +1349,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr ""
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1289,29 +1356,35 @@
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr ""
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
@@ -1322,7 +1395,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "Mantieni aperta la connessione"
 
@@ -1332,12 +1406,12 @@
 msgid "path to store your ics"
 msgstr "percorso dove memorizzare il file ics"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr ""
-
 msgid "unauthenticated"
 msgstr ""
 
-msgid "you should log on with the username and password that have been issued to you."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr ""
+
+
diff -Nru davical-0.9.9.7/po/ja.po davical-1.0.2/po/ja.po
--- davical-0.9.9.7/po/ja.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/ja.po	2012-01-04 23:04:23.000000000 +0000
@@ -1,27 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -71,32 +74,30 @@
 msgid "- updating user records : %s"
 msgstr "- ユーザー情報を更新中: %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr "<b>警告：このパス内の全てのイベントは、icsファイルの挿入の前に削除されます。</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
-"<H1>ログオンして下さい</H1><P>%sにアクセスするには、あなたに対して発行されたユーザー名およびパスワード"
-"でログオンして下さい。</P><P>アクセスをリクエストしたい場合は、%sにメールを送ってください。</P>"
+"<H1>ログオンして下さい</H1><P>%sにアクセスするには、あなたに対して発行されたユーザー名およびパスワードでログオンして下さい。</P><P>アクセスをリクエストしたい場合は、%sにメールを送ってください。</P>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -141,7 +142,12 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "全てのコレクションデータが回復不能な方法で削除されます。"
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "そのプリンシパルの全てのカレンダーとイベントが回復不能な方法で削除されます。"
 
 msgid "All privileges"
@@ -150,7 +156,8 @@
 msgid "All requested changes were made."
 msgstr "全てのリクエストされた変更が実行されました。"
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "このスケジュール受信箱のオーナーに対する予定の有無の問い合わせを許可する。"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -186,6 +193,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -232,7 +242,9 @@
 msgid "Collection deleted"
 msgstr "コレクションが削除されました"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -304,7 +316,8 @@
 msgid "DAV Path"
 msgstr "DAVパス"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -403,7 +416,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr "主催者からのスケジュール招待をこのスケジュール受信箱に届ける"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -457,9 +471,10 @@
 msgid "Email Address"
 msgstr "Emailアドレス"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-msgstr ""
-"知っている場合はユーザー名を入力し、ここをクリックしてください。暫定パスワードがメールで送信されます。"
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
+msgstr "知っている場合はユーザー名を入力し、ここをクリックしてください。暫定パスワードがメールで送信されます。"
 
 msgid "Enter your username and password then click here to log in."
 msgstr "あなたのユーザー名とパスワードを入力してから、ここをクリックしてログインして下さい。"
@@ -496,6 +511,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -645,6 +666,9 @@
 msgid "Last used"
 msgstr "最終更新日"
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr "グループのリスト"
 
@@ -675,7 +699,9 @@
 msgid "Member deleted from this Group Principal"
 msgstr "このグループプリンシパルからメンバーを削除しました"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
@@ -694,18 +720,12 @@
 msgid "No"
 msgstr "いいえ"
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr "カレンダーの内容がありません"
 
 msgid "No collection found at that location."
 msgstr "その場所にはコレクションが見つかりませんでした。"
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -749,16 +769,23 @@
 msgid "PHP PDO module available"
 msgstr "PHP PDOモジュール利用可能"
 
-msgid "PHP PostgreSQL available"
-msgstr "PHP PostgreSQL利用可能"
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -812,6 +839,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr "その特性は読み取り専用です。"
 
@@ -846,7 +879,8 @@
 msgid "Read the content of a resource or collection"
 msgstr "資源またはコレクションの内容を読み取る"
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr "この資源への現在のユーザーのアクセス制御の詳細を読み取る"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -855,12 +889,18 @@
 msgid "Read/Write"
 msgstr "読み書き"
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr "ロックを解除する"
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "バグの報告"
 
@@ -873,7 +913,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "資源"
 
@@ -901,9 +942,6 @@
 msgid "Schedule Transparency"
 msgstr "スケジュールの透明性"
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr "スケジューリング: 返信を届ける"
 
@@ -931,10 +969,14 @@
 msgid "Send free/busy enquiries"
 msgstr "予定の有無の問い合わせを送信する"
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr "このスケジュール送信箱のオーナーから、主催者としてスケジュール招待を送信する"
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr "このスケジュール送信箱のオーナーから、出席者としてスケジュール返信を送信する"
 
 msgid "Set free/busy privileges"
@@ -946,11 +988,10 @@
 msgid "Set read+write privileges"
 msgstr "読み書き権限を設定する"
 
-msgid "Set schedule-deliver privileges"
-msgstr "スケジュール配達権限を設定する"
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
-msgstr "あなたのicsを保管するパスを設定して下さい。例:'home'は/caldav.php/me/home/として参照されます。"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
+msgstr ""
 
 msgid "Setup"
 msgstr "セットアップ"
@@ -976,7 +1017,8 @@
 msgid "Source resource does not exist."
 msgstr "元の資源が存在しません。"
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr "特殊なコレクションは、カレンダーまたは他の特殊なコレクションを含めません。"
 
 msgid "Specific Privileges"
@@ -995,7 +1037,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1019,7 +1061,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1028,7 +1071,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1044,10 +1088,13 @@
 msgstr "カレンダーパスに不正な文字が使用されています。"
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr "カレンダー予定有無設定よりも、カレンダーコレクションのスケジュール透過属性が優先します。"
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1056,15 +1103,20 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
-"そのファイル%sはUTF-8でエンコードされていません。さらなる詳細についてはそのエラーを確認して下さい。"
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
+msgstr "そのファイル%sはUTF-8でエンコードされていません。さらなる詳細についてはそのエラーを確認して下さい。"
 
 msgid "The full name for this person, group or other type of principal."
 msgstr ""
@@ -1081,6 +1133,10 @@
 msgid "The preferred language for this person."
 msgstr "この人が好む言語。"
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr "この人が利用する日付のスタイル。"
 
@@ -1103,22 +1159,32 @@
 msgstr "データベースへの書き込み中にエラーがありました。"
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
+msgstr ""
+
+msgid ""
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1181,7 +1247,9 @@
 msgid "Upgrade Database"
 msgstr "データベースのアップグレード"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr "このカレンダーを初期化または置換するために、.icsカレンダーをiCalendar形式でアップロードする"
 
 msgid "User Calendar Principals"
@@ -1225,8 +1293,8 @@
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1277,10 +1345,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "ユーザー%sのイベントは全て削除され、ファイル%sのもので置き換えられました。"
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1288,31 +1352,37 @@
 msgid "directory %s is not readable"
 msgstr "ディレクトリ%sは読み取り可能ではありません。"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : TLSを開始できませんでした : ldap_start_tls()failed"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr "drivers_ldap : ホスト%1$sにポート%2$s、bindDN%3$sでバインドに失敗しました"
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr "drivers_ldap : LDAPをプロトコルバージョン３で使用に失敗しました、TLSはサポートされていません"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap : LDAPにバインドできません - bindDNとpassDNの設定を確認し、LDAPサーバーに到達可能であるこ"
-"と確認して下さい。"
+"drivers_ldap : LDAPにバインドできません - "
+"bindDNとpassDNの設定を確認し、LDAPサーバーに到達可能であること確認して下さい。"
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : ホスト%2$sのポート%1$sでLDAPに接続できませんでした"
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr "drivers_ldap : 関数ldap_connectが定義できませんでした、php_ldap moduleを確認して下さい"
 
 #, php-format
@@ -1323,7 +1393,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : ファイル%sが見つかりません"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "私を忘れないで"
 
@@ -1333,12 +1404,12 @@
 msgid "path to store your ics"
 msgstr "あなたのicsを保管するパス"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "ファイル%sはUTF-8でエンコードされていません、詳細はエラーを確認して下さい"
-
 msgid "unauthenticated"
 msgstr ""
 
-msgid "you should log on with the username and password that have been issued to you."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr "あなたに発行したユーザー名とパスワードでログオンして下さい。"
+
+
diff -Nru davical-0.9.9.7/po/messages.pot davical-1.0.2/po/messages.pot
--- davical-0.9.9.7/po/messages.pot	2011-10-07 07:45:40.000000000 +0000
+++ davical-1.0.2/po/messages.pot	2011-11-20 21:59:37.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -146,6 +146,11 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr ""
 
+#, php-format
+msgid ""
+"All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
 msgid ""
 "All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
@@ -193,6 +198,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -508,6 +516,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -657,6 +671,9 @@
 msgid "Last used"
 msgstr ""
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr ""
 
@@ -708,18 +725,12 @@
 msgid "No"
 msgstr ""
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr ""
 
 msgid "No collection found at that location."
 msgstr ""
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -754,9 +765,6 @@
 msgid "PHP LDAP module available"
 msgstr ""
 
-msgid "PHP calendar extension available"
-msgstr ""
-
 msgid "PHP Magic Quotes GPC off"
 msgstr ""
 
@@ -766,20 +774,25 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr ""
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
 msgid ""
 "PUT on a collection is only allowed for text/calendar content against a "
 "calendar collection"
 msgstr ""
 
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
+msgstr ""
+
 msgid "Passed"
 msgstr ""
 
@@ -831,6 +844,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr ""
 
@@ -874,12 +893,18 @@
 msgid "Read/Write"
 msgstr ""
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr ""
 
@@ -920,9 +945,6 @@
 msgid "Schedule Transparency"
 msgstr ""
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr ""
 
@@ -969,12 +991,9 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
-msgstr ""
-
 msgid ""
-"Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/"
-"me/home/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav."
+"php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1021,7 +1040,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1093,6 +1112,11 @@
 msgid "The email address really should not be blank."
 msgstr ""
 
+#, php-format
+msgid ""
+"The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
 msgid "The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
@@ -1111,6 +1135,10 @@
 msgid "The preferred language for this person."
 msgstr ""
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr ""
 
@@ -1156,6 +1184,11 @@
 "gratefully received."
 msgstr ""
 
+msgid ""
+"This process will import each file in a directory named \"username.ics\" and "
+"create a user and calendar for each file to import."
+msgstr ""
+
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr ""
 
@@ -1314,10 +1347,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr ""
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1374,10 +1403,6 @@
 msgid "path to store your ics"
 msgstr ""
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr ""
-
 msgid "unauthenticated"
 msgstr ""
 
diff -Nru davical-0.9.9.7/po/nb_NO.po davical-1.0.2/po/nb_NO.po
--- davical-0.9.9.7/po/nb_NO.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/nb_NO.po	2012-01-04 23:04:42.000000000 +0000
@@ -1,33 +1,37 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 #   <daniel@aleksand.no>, 2011.
+# Daniel  <i18n@daniel.priv.no>, 2011.
 # Sven Olsen <sven@svenolsen.net>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-08-15 23:39+0000\n"
-"Last-Translator: aleksand <daniel@aleksand.no>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-12-09 17:37+0000\n"
+"Last-Translator: Daniel <i18n@daniel.priv.no>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/davical/team/nb_NO/)\n"
-"Language: nb_NO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
 msgid "*** Default Locale ***"
-msgstr "*** Standard Locale ***"
+msgstr "*** Forvalgt nasjonalitet ***"
 
 msgid "*** Unknown ***"
 msgstr "*** Ukjent ***"
@@ -38,7 +42,7 @@
 
 #, php-format
 msgid "- adding users %s to group : %s"
-msgstr "- legger til brukerene %s i gruppe : %s"
+msgstr "- legger til brukerne %s i gruppe : %s"
 
 #, php-format
 msgid "- creating groups : %s"
@@ -72,43 +76,38 @@
 msgid "- updating user records : %s"
 msgstr "- oppdaterer brukerdata : %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
-msgstr "<b>ADVARSEL: alle hendelser i denne banen vil bli slettet ved innsetting av ics filen</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
+msgstr ""
+"<b>ADVARSEL: alle hendelser i denne banen vil bli slettet ved innsetting av "
+"ics-filen</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 "<h1>Hjelp</h1>\n"
-"<p>For oppstartshjelp bør du besøke <a href=\"http://www.davical.org\" target=\"_blank\">DAViCal-"
-"hjemmesiden</a> eller ta en titt på <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal "
-"wikien.</a></p>\n"
-"<p>Kan du ikke finne svaret der, kom innom vår kanal <b>#davical</b> på <a href=\"http://www.oftc.net/"
-"\" target=\"_blank\">irc.oftc.net</a> nettverket på <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC.</a>\n"
-"Eller send spørsmålet til <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal epostlisten for brukere</a>.</p>\n"
-"<p><a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">Epostlistearkivene</a> kan også være nyttige.</p>"
+"<p>For oppstartshjelp bør du besøke <a href=\"http://www.davical.org\" target=\"_blank\">DAViCal-hjemmesiden</a> eller ta en titt på <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal wikien.</a></p>\n"
+"<p>Kan du ikke finne svaret der, kom innom vår <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a>-kanal <b>#davical</b> på <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>-nettverket,\n"
+"eller send spørsmålet til <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal epostlisten for brukere</a>.</p>\n"
+"<p><a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">Epostlistearkivene</a> kan også være nyttige.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
-"<h1>Logg deg inn</h1><p>For tilgang til %s skal du oppgi brukernavnet og passordet du fikk</p><p>Vil "
-"du be om tilgang, kontakt %s.</p>"
+"<h1>Logg deg inn</h1><p>For tilgang til %s skal du oppgi brukernavnet og "
+"passordet du fikk</p><p>Vil du be om tilgang, kontakt %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "En DAViCal kontosamling kan bare inneholde samlinger"
@@ -120,7 +119,7 @@
 msgstr "En ressurs finnes allerede der "
 
 msgid "AWL Library version "
-msgstr "AWL Bibliotek versjon "
+msgstr "AWL bibliotekversjon "
 
 msgid "Access Tickets"
 msgstr "Adgangstilganger"
@@ -135,7 +134,7 @@
 msgstr "Aktiv"
 
 msgid "Adding new member to this Group Principal"
-msgstr "Legger nytt medlem til denne Gruppekontoen"
+msgstr "Legger nytt medlem til denne gruppekontoen"
 
 #. Translators: in the sense of 'systems admin'
 msgid "Admin"
@@ -153,20 +152,30 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "Alle data til samlingen vil ugjenopprettelig bli slettet"
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+"Alle hendelser tilhørende \"%s\" ble slettet og erstattet med de fra filen "
+"%s"
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr "Alle kontoens kalendre og hendelser vil ugjenopprettelig bli slettet"
 
 msgid "All privileges"
 msgstr "Alle privilegier"
 
 msgid "All requested changes were made."
-msgstr "Alle forespurte endringer ble utfort"
+msgstr "Alle forespurte endringer ble utført"
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-msgstr "Tillat ledig/opptatt forespørsler rettet til eieren av denne innboksen"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgstr ""
+"Tillat ledig/opptatt-forespørsler rettet til eieren av denne innboksen"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
-msgstr "En \"Administrator\" bruker har fulle rettigheter til hele DAViCal systemet"
+msgstr ""
+"En \"Administrator\" bruker har fulle rettigheter til hele DAViCal-systemet"
 
 msgid "Anonymous users are not allowed to modify calendars"
 msgstr "Anonyme brukere har ikke tillatelse til endring av kalendre"
@@ -175,13 +184,13 @@
 msgstr "Anonyme brukere har kun tilgang til offentlige kalendre"
 
 msgid "Application DB User"
-msgstr "Applikasjonens DB Bruker"
+msgstr "Applikasjonens DB-bruker"
 
 msgid "Apply Changes"
 msgstr "Utfør endringer"
 
 msgid "Apply DB Patches"
-msgstr "Utfør DB endringer"
+msgstr "Utfør DB-endringer"
 
 msgid "Attachment"
 msgstr "Vedlegg"
@@ -198,6 +207,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr "Forbindelse til denne kontoens samlinger"
 
+msgid "Body contains no XML data!"
+msgstr "Meldingskroppen inneholder ingen XML-data!"
+
 msgid "Bound As"
 msgstr "Forbundet som"
 
@@ -218,7 +230,7 @@
 msgstr "Kalender tidssone"
 
 msgid "Can only add tickets for existing collection paths which you own"
-msgstr "Kan bare legge til tilgang til eksiterende samlinger du eier"
+msgstr "Kan bare legge til tilgang til eksisterende samlinger du eier"
 
 msgid "Categories"
 msgstr "Kategorier"
@@ -239,16 +251,18 @@
 msgstr "Samlingsrettigheter"
 
 msgid "Collection ID"
-msgstr "Samlings ID"
+msgstr "Samlings-ID"
 
 msgid "Collection deleted"
 msgstr "Samling slettet"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr "Samlinger kan ikke være både CalDAV og CardDAV adressebøker samtidig"
 
 msgid "Configuring Calendar Clients for DAViCal"
-msgstr "Konfigurerer Kalender klienter for DAViCal"
+msgstr "Konfigurerer kalender-klienter for DAViCal"
 
 msgid "Configuring DAViCal"
 msgstr "Konfigurerer DAViCal"
@@ -316,14 +330,15 @@
 msgid "DAV Path"
 msgstr "DAV bane"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr "DAV::ressurstype kan bare settes til ny verdi, kan ikke slettes"
 
 msgid "DAViCal CalDAV Server"
 msgstr "DAViCal CalDAV Server"
 
 msgid "DAViCal DB Schema version "
-msgstr "DAViCal DB Schema versjon "
+msgstr "DAViCal DB Schema-versjon "
 
 msgid "DAViCal Homepage"
 msgstr "DAViCal hjemmeside"
@@ -332,13 +347,13 @@
 msgstr "DAViCal Wiki"
 
 msgid "DAViCal only allows BIND requests for collections at present."
-msgstr "DAViCal tillater bare BIND forespørsler for gjeldende samlinger"
+msgstr "DAViCal tillater bare BIND-forespørsler for gjeldende samlinger"
 
 msgid "DKIM signature invalid "
-msgstr "DKIM signatur ugyldig"
+msgstr "DKIM-signatur ugyldig"
 
 msgid "DKIM signature missing"
-msgstr "DKIM signatur mangler"
+msgstr "DKIM-signatur mangler"
 
 msgid "DKIM signature validation failed(DNS ERROR)"
 msgstr "DKIM signatursjekk feilet(DNS ERROR)"
@@ -353,7 +368,7 @@
 msgstr "DKIM signatursjekk feilet(Signature verification ERROR)"
 
 msgid "Database Error"
-msgstr "Database Feil"
+msgstr "Databasefeil"
 
 msgid "Database Host"
 msgstr "Database Host"
@@ -374,7 +389,7 @@
 msgstr "Database Brukernavn"
 
 msgid "Database error"
-msgstr "Database feil"
+msgstr "Databasefeil"
 
 msgid "Date Format Style"
 msgstr "Datoformat "
@@ -383,10 +398,10 @@
 msgstr "Datoformat"
 
 msgid "Default Privileges"
-msgstr "Standard privilegier"
+msgstr "Forvalgte privilegier"
 
 msgid "Default relationships added."
-msgstr ""
+msgstr "La til forvalgte relasjoner."
 
 msgid "Delete"
 msgstr "Slett"
@@ -415,11 +430,12 @@
 msgid "Deleting Ticket:"
 msgstr "Sletter tilgang"
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-msgstr "Lever invitasjoner fra en organisator til denne innboksen"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgstr "Levér invitasjoner fra en organisator til denne innboksen"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
-msgstr "Lever svar fra en deltaker til denne innboksen"
+msgstr "Levér svar fra en deltaker til denne innboksen"
 
 msgid "Dependencies"
 msgstr "Avhengigheter"
@@ -443,7 +459,7 @@
 msgstr "Visningsnavn"
 
 msgid "Does the user have the right to perform this role?"
-msgstr "Har brukeren rettigheter til denne rollen ?"
+msgstr "Har brukeren rettigheter til denne rollen?"
 
 msgid "EMail"
 msgstr "Epost"
@@ -461,16 +477,20 @@
 msgstr "FEIL: Det var en databasefeil under skriving av rolleinformasjon"
 
 msgid "Edit"
-msgstr "Rediger"
+msgstr "Redigér"
 
 msgid "Edit this user record"
-msgstr "Rediger denne brukerens post"
+msgstr "Redigér denne brukerens post"
 
 msgid "Email Address"
 msgstr "Epostadresse"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-msgstr "Oppgi brukernavnet, om du vet det, og klikk her for tilsending av midlertidig passord "
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
+msgstr ""
+"Oppgi brukernavnet, om du vet det, og klikk her for tilsending av "
+"midlertidig passord "
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Oppgi brukernavn og passord og klikk her for å logge inn"
@@ -481,7 +501,7 @@
 
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
-msgstr "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
+msgstr "Feil NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 
 msgid "Error querying database."
 msgstr "Feil under spørring i database"
@@ -505,7 +525,13 @@
 msgstr "Eksisterende ressurs passer \"If-None-Match\" header - ikke akseptert,"
 
 msgid "Expires"
-msgstr "Løper ut"
+msgstr "Utløper"
+
+msgid "External Calendars"
+msgstr "Eksterne kalendere"
+
+msgid "External Url"
+msgstr "Ekstern URL"
 
 msgid "Fail"
 msgstr "Feil"
@@ -529,10 +555,10 @@
 msgstr "Fullt navn"
 
 msgid "Fullname"
-msgstr "Fulltnavn"
+msgstr "Fullt navn"
 
 msgid "GET requests on collections are only supported for calendars."
-msgstr "HENT forespørsler på samlinger støttes bare for kalendre"
+msgstr "GET-forespørsler på samlinger støttes bare for kalendre"
 
 msgid "GNU gettext support"
 msgstr "GNU gettext support"
@@ -587,10 +613,10 @@
 msgstr "Hovedadressebok finnes fra før."
 
 msgid "Home calendar added."
-msgstr "Home kalender lagt til"
+msgstr "Hovedkalender lagt til"
 
 msgid "Home calendar already exists."
-msgstr "Home kalender eksisterer allerede"
+msgstr "Hovedkalender eksisterer allerede"
 
 msgid "ID"
 msgstr "ID"
@@ -606,7 +632,7 @@
 msgstr "Id"
 
 msgid "If you have forgotten your password then"
-msgstr "Hvis du har glemt passordet da"
+msgstr "Hvis du har glemt passordet"
 
 msgid "If you would like to request access, please e-mail"
 msgstr "Hvis du vil ha tilgang, send epost "
@@ -615,7 +641,7 @@
 msgstr "Importer alle .ics filer fra en mappe"
 
 msgid "Import calendars and Synchronise LDAP."
-msgstr "Importer kalendre og synkroniser LDAP"
+msgstr "Importér kalendre og synkronisér LDAP"
 
 msgid "Inactive Principals"
 msgstr "Inaktive kontoer"
@@ -627,7 +653,7 @@
 msgstr "Uriktig innholdstype for kalender"
 
 msgid "Invalid user name or password."
-msgstr "Ugyldig navn eller passord"
+msgstr "Ugyldig brukernavn eller passord"
 
 msgid "Invalid username or password."
 msgstr "Ugyldig brukernavn eller passord"
@@ -656,6 +682,9 @@
 msgid "Last used"
 msgstr "Sist brukt"
 
+msgid "List External Calendars"
+msgstr "List opp eksterne kalendere"
+
 msgid "List Groups"
 msgstr "Liste grupper"
 
@@ -686,10 +715,12 @@
 msgid "Member deleted from this Group Principal"
 msgstr "Medlem slettet fra denne gruppekonto"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
-"De fleste funksjoner av DAViCal vil fungere, men å oppgradere til PHP 5.2 eller nyere er anbefalt på "
-"det sterkeste."
+"De fleste funksjoner av DAViCal vil fungere, men å oppgradere til PHP 5.2 "
+"eller nyere er anbefalt på det sterkeste."
 
 msgid "Name"
 msgstr "Navn"
@@ -707,18 +738,12 @@
 msgid "No"
 msgstr "Nei"
 
-msgid "No authority to deliver invitations to user."
-msgstr "Ingen autorisasjon til å levere invitasjoner til bruker"
-
 msgid "No calendar content"
 msgstr "Ikke noe kalenderinnhold"
 
 msgid "No collection found at that location."
 msgstr "Ingen samling funnet på den lokasjonen"
 
-msgid "No scheduling support for user"
-msgstr "Ingen hendelsesupport for bruker"
-
 msgid "No summary"
 msgstr "Ingen oppsummering"
 
@@ -727,13 +752,13 @@
 msgstr "Nr."
 
 msgid "No. of Collections"
-msgstr "Samlingens nr."
+msgstr "Antall samlinger"
 
 msgid "No. of Principals"
-msgstr "Nr. til konto"
+msgstr "Antall kontoer"
 
 msgid "No. of Resources"
-msgstr "Nr. til ressurs"
+msgstr "Antall ressurser"
 
 msgid "Not overwriting existing destination resource"
 msgstr "Skriver ikke over eksisterende ressurs"
@@ -762,17 +787,28 @@
 msgid "PHP PDO module available"
 msgstr "PHP PDO modul tilgjengelig"
 
-msgid "PHP PostgreSQL available"
-msgstr "PHP PostgreSQL tilgjengelig"
-
 msgid "PHP calendar extension available"
-msgstr ""
+msgstr "PHP kalenderutvidelse er tilgjengelig."
 
 msgid "PHP iconv support"
 msgstr "Støtte for PHP iconv"
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
-msgstr "PUT på en samling er bare tillatt for tekst/kaldender innhold i en kalendersamling"
+msgid "PHP not using Apache Filter mode"
+msgstr "PHP er ikke satt til å bruke Apache Filter-modus."
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+"PUT på en samling er bare tillatt for tekst-/kalenderinnhold i en "
+"kalendersamling"
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
+msgstr ""
+"En PUT-forespørsel er kun tillatt for tekst-/vcard-innhold i en "
+"adresseboksamling."
 
 msgid "Passed"
 msgstr "Godkjent"
@@ -799,22 +835,22 @@
 msgstr "Bekreft sletting av kontoen"
 
 msgid "Please note the time and advise the administrator of your system."
-msgstr "Noter klokkeslett og oppgi til systemets administrator"
+msgstr "Notér klokkeslett og meld fra til systemets administrator"
 
 msgid "Principal"
 msgstr "Konto"
 
 msgid "Principal Collections"
-msgstr "Konto samlinger"
+msgstr "Kontosamlinger"
 
 msgid "Principal Grants"
-msgstr "Konto rettigheter"
+msgstr "Kontorettigheter"
 
 msgid "Principal ID"
-msgstr "Konto ID"
+msgstr "Konto-ID"
 
 msgid "Principal Type"
-msgstr "Konto type"
+msgstr "Kontotype"
 
 msgid "Principal deleted"
 msgstr "Konto slettet"
@@ -825,6 +861,12 @@
 msgid "Privileges granted to All Users"
 msgstr "Rettigheter tildelt til alle brukere"
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr "Privilegier til å tillate møteplanmeldingsvarsler"
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr "Privilegier til å delegere møteplanavgjørelser"
+
 msgid "Property is read-only"
 msgstr "Egenskapen er kun lese"
 
@@ -836,10 +878,10 @@
 msgstr "Offentlig lesbar"
 
 msgid "REPORT body contains no XML data!"
-msgstr "REPORT body inneholder ingen XML data!"
+msgstr "REPORT body inneholder ingen XML-data!"
 
 msgid "REPORT body is not valid XML data!"
-msgstr "REPORT body er ikke gyldig XML data!"
+msgstr "REPORT body er ikke gyldig XML-data!"
 
 msgid "Read"
 msgstr "Les"
@@ -859,7 +901,8 @@
 msgid "Read the content of a resource or collection"
 msgstr "Les innholdet til en ressurs eller samling"
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr "Les detaljer om gjeldende brukers adgangskontroll til denne ressursen"
 
 msgid "Read the free/busy information for a calendar collection"
@@ -868,30 +911,37 @@
 msgid "Read/Write"
 msgstr "Les/Skriv"
 
+msgid "References"
+msgstr "Referanser"
+
 msgid "Remove"
 msgstr "Fjern"
 
 msgid "Remove a lock"
 msgstr "Fjern en lås"
 
+msgid "Remove dangling external calendars"
+msgstr "Fjern haltende eksterne kalendere"
+
 msgid "Report Bug"
-msgstr "Rapporter feil"
+msgstr "Rapportér feil"
 
 msgid "Report a bug in the system"
-msgstr "Rapporter feil i systemet"
+msgstr "Rapportér feil i systemet"
 
 msgid "Request Feature"
 msgstr "Be om funksjonalitet"
 
 msgid "Request body is not valid XML data!"
-msgstr "Request body er ikke gyldig XML data!"
+msgstr "Request body er ikke gyldig XML-data!"
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Ressurs"
 
 msgid "Resource Calendar Principals"
-msgstr "Ressurs kalender kontoer"
+msgstr "Ressurskalender-kontoer"
 
 msgid "Resource Not Found."
 msgstr "Ressurs ikke funnet"
@@ -906,7 +956,7 @@
 msgstr "Gjenopprett"
 
 msgid "Schedule Deliver"
-msgstr "Hendelse Lever"
+msgstr "Hendelse Levér"
 
 msgid "Schedule Send"
 msgstr "Hendelse Send"
@@ -914,14 +964,11 @@
 msgid "Schedule Transparency"
 msgstr "Hendelse gjennomsiktighet"
 
-msgid "Scheduling invitation delivered successfully"
-msgstr "Hendelsesinvitasjon ble levert"
-
 msgid "Scheduling: Deliver a Reply"
 msgstr "Hendelse: Gi et svar"
 
 msgid "Scheduling: Deliver an Invitation"
-msgstr "Hendlese: Lever en invitasjon"
+msgstr "Hendlese: Levér en invitasjon"
 
 msgid "Scheduling: Delivery"
 msgstr "Hendelse: Levering"
@@ -944,11 +991,15 @@
 msgid "Send free/busy enquiries"
 msgstr "Send Ledig/Opptatt forespørsel"
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr "Send hendelsesinvitasjon som organisator fra eieren av denne utboksen"
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-msgstr "Send invitasjonsvar som deltaker fra eieren av denne utboksen"
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
+msgstr "Send invitasjonssvar som deltaker fra eieren av denne utboksen"
 
 msgid "Set free/busy privileges"
 msgstr "Sett Ledig/Opptatt rettigheter"
@@ -957,13 +1008,14 @@
 msgstr "Sett leserettigheter"
 
 msgid "Set read+write privileges"
-msgstr "Sett lese+skrive rettigheter"
-
-msgid "Set schedule-deliver privileges"
-msgstr "Sett hendelse-leveringsprivilegier"
+msgstr "Sett lese+skriverettigheter"
 
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
-msgstr "Sett banen for å lagre din ics, f.eks. vil 'home' bli referert som /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
+msgstr ""
+"Angi en sti for lagring av ics. For eksempel ‹kalender› vil bli referert som"
+" /caldav.php/brukernavn/kalender/"
 
 msgid "Setup"
 msgstr "Oppsett"
@@ -989,8 +1041,10 @@
 msgid "Source resource does not exist."
 msgstr "Ressurskilde finnes ikke"
 
-msgid "Special collections may not contain a calendar or other special collection."
-msgstr "Spesielle samlinger kan ikke inneholde kalendre eller andre spesialsamlinger"
+msgid ""
+"Special collections may not contain a calendar or other special collection."
+msgstr ""
+"Spesielle samlinger kan ikke inneholde kalendre eller andre spesialsamlinger"
 
 msgid "Specific Privileges"
 msgstr "Spesifikke privilegier"
@@ -1008,8 +1062,8 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr "Suhosin \"server.strip\" disabled"
 
-msgid "Sync LDAP Groups with RSCDS"
-msgstr "Synk LDAP Grupper med RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
+msgstr "Synkroniser LDAP grupper med DAViCal"
 
 msgid "Sync LDAP with DAViCal"
 msgstr "Synk LDAP med DAViCal"
@@ -1032,7 +1086,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr "BIND metoden er ikke tillatt på den lokasjonen."
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr "CalDAV:schedule-calendar-transp egenskap kan bare settes på kalendre"
 
 msgid "The DAViCal Home Page"
@@ -1041,11 +1096,12 @@
 msgid "The access ticket will be deleted."
 msgstr "Adgangstilgangen vil bli slettet"
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr "Adressebok-forespørselsrapport må kjøres mot en adressebok-samling"
 
 msgid "The application failed to understand that request."
-msgstr ""
+msgstr "Programmet kunne ikke forstå den anmodningen."
 
 msgid "The application program does not understand that request."
 msgstr "Programmet forstår ikke forespørselen"
@@ -1057,11 +1113,18 @@
 msgstr "Kalenderbanen inneholder ulovlige karakterer"
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
-msgstr "Kalenderens Ledig/Opptatt-sett er overstyrt av schedule-transp egenskapen til en kalendersamling"
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
+msgstr ""
+"Kalenderens Ledig/Opptatt-sett er overstyrt av schedule-transp egenskapen "
+"til en kalendersamling"
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-msgstr "Kalender forespørselsrapport må kjøres mot en kalender eller hendelsessamling"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
+msgstr ""
+"Kalender forespørselsrapport må kjøres mot en kalender eller "
+"hendelsessamling"
 
 msgid "The collection name may not be blank."
 msgstr "Samlingens navn kan ikke være tom"
@@ -1069,13 +1132,21 @@
 msgid "The destination collection does not exist"
 msgstr "Målsamlingen eksisterer ikke"
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr "Visningsnavn kan bare settes på samlinger, kontoer eller forbindelser"
 
 msgid "The email address really should not be blank."
-msgstr "Epostadressen skulle absolutt ikke være tom"
+msgstr "Epostadressen bør absolutt ikke være tom"
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+"Filen \"%s\" er ikke inkodet i UTF-8 encoded. Kontroller feilen for flere "
+"detaljer."
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr "Filen er ikke UTF-8 encoded, sjekk feilen for flere detaljer"
 
 msgid "The full name for this person, group or other type of principal."
@@ -1088,11 +1159,15 @@
 msgstr "Navnet denne brukeren skal logge inn på systemet med"
 
 msgid "The path on the server where your .ics files are."
-msgstr "Banen på tjeneren hvor dine ics filer er"
+msgstr "Banen på tjeneren hvor dine ics-filer er"
 
 msgid "The preferred language for this person."
 msgstr "Foretrukket språk for denne personen"
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr "Kontoen \"%s\" finnes ikke."
+
 msgid "The style of dates used for this person."
 msgstr "Datoformat brukt for denne personen"
 
@@ -1109,46 +1184,62 @@
 msgstr "Brukernavnet kan ikke være tomt og kan ikke inneholde slash"
 
 msgid "There was an error reading from the database."
-msgstr "En feil oppsto ved lesning fra databasen."
+msgstr "En feil oppsto ved lesing fra databasen."
 
 msgid "There was an error writing to the database."
 msgstr "Det oppsto en feil under skriving til databasen"
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
-"Denne operasjonen gjør følgende: <ul><li>sjekker gyldige grupper i LDAP katalogen</li> <li>sjekker "
-"grupper i DAViCal</li></ul> deretter <ul><li>hvis en gruppe finnes i DAViCal men ikke i LDAP setter "
-"som inaktiv i DAViCal</li> <li>hvis en gruppe finnnes i LDAP men ikke i DAViCal oppretter en gruppe i "
-"DAViCal</li> <li>hvis en gruppe finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal</li> </ul>"
-
-msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
-"Denne operasjonen gjør følgende: <ul><li>sjekker gyldige gruppe i LDAP katalogen</li> <li>sjekker "
-"brukere i DAViCal</li></ul> deretter <ul><li>hvis en bruker finnes i DAViCal men ikke i LDAP setter "
-"denne sim inaktiv i DAViCal</li> <li>hvis en bruker finnes i LDAP men ikke i DAViCal oppretter "
-"brukeren i DAViCal</li> <li>hvis brukeren finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal</"
-"li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Denne operasjonen gjør følgende: <ul><li>sjekker gyldige grupper i LDAP "
+"katalogen</li> <li>sjekker grupper i DAViCal</li></ul> deretter <ul><li>hvis"
+" en gruppe finnes i DAViCal men ikke i LDAP setter som inaktiv i "
+"DAViCal</li> <li>hvis en gruppe finnnes i LDAP men ikke i DAViCal oppretter "
+"en gruppe i DAViCal</li> <li>hvis en gruppe finnes i LDAP og DAViCal "
+"oppdaterer informasjonen i DAViCal</li> </ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
-"Denne siden sjekker miljøet nødvendig for at DAViCal skal virke korrekt.  Forslag eller patsjer for å "
-"gjøre det enda bedre vil mottas med takk."
+"Denne operasjonen gjør følgende: <ul><li>sjekker gyldige gruppe i LDAP "
+"katalogen</li> <li>sjekker brukere i DAViCal</li></ul> deretter <ul><li>hvis"
+" en bruker finnes i DAViCal men ikke i LDAP setter denne sim inaktiv i "
+"DAViCal</li> <li>hvis en bruker finnes i LDAP men ikke i DAViCal oppretter "
+"brukeren i DAViCal</li> <li>hvis brukeren finnes i LDAP og DAViCal "
+"oppdaterer informasjonen i DAViCal</li> </ul>"
+
+msgid ""
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
+msgstr ""
+"Denne siden sjekker miljøet nødvendig for at DAViCal skal virke korrekt.  "
+"Forslag eller patsjer for å gjøre det enda bedre vil mottas med takk."
+
+msgid ""
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
+msgstr ""
+"Prosesen vil hente inn hver fil i mappen med navnet \"brukernavn.ics\" og "
+"opprette en bruker og kalender for hver bruker og kalender som hentes inn."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
-msgstr "Denne tjeneren støtter bare text/calendar formatert freebusy-adresser."
+msgstr ""
+"Denne tjeneren støtter bare text/calendar-formatet for freebusy-adresser."
 
 msgid "Ticket ID"
-msgstr "Tilgangs ID"
+msgstr "Tilgangs-ID"
 
 msgid "Time"
 msgstr "Tid"
@@ -1204,8 +1295,12 @@
 msgid "Upgrade Database"
 msgstr "Oppgrader database"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
-msgstr "Last opp en .ics kalender i iCalender format for å sette opp eller erstatte denne kalenderen"
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
+msgstr ""
+"Last opp en .ics-kalender i iCalender format for å sette opp eller erstatte "
+"denne kalenderen"
 
 msgid "User Calendar Principals"
 msgstr "Bruker kalenderkonto"
@@ -1217,7 +1312,7 @@
 msgstr "Brukerfunksjoner"
 
 msgid "User Name"
-msgstr "Brukers Navn"
+msgstr "Brukers navn"
 
 msgid "User Roles"
 msgstr "Brukerroller"
@@ -1248,11 +1343,12 @@
 msgstr "Ønsket: %s, Nåværende: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
-"Advarsel: det finnes ingen administratorbrukere! Du bør rette feilen før du logger ut. Foreslår bruk "
-"av $c->do_not_sync_from_ldap konfigurasjonsinstillingen."
+"Advarsel: det finnes ingen administratorbrukere! Du bør rette feilen før du "
+"logger ut. Foreslår bruk av $c->do_not_sync_from_ldap "
+"konfigurasjonsinstillingen."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Da brukerens epost ble kontrollert"
@@ -1288,7 +1384,7 @@
 msgstr "Du er ikke autorisert til å bruke denne funksjonen"
 
 msgid "You are viewing"
-msgstr "Du viser"
+msgstr "Du ser på"
 
 msgid "You do not have permission to modify this record."
 msgstr "Du har ikke tillatelse til å endre denne posten"
@@ -1302,43 +1398,53 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr "Konfigurasjonen lagde PHP feil som må rettes"
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "alle hendelser til bruker %s ble slettet og erstattet av dem fra filen %s"
-
 msgid "calendar-timezone property is only valid for a calendar."
-msgstr "kalender tidssone egenskap er kun gyldig for en kalender"
+msgstr "kalender-tidssone egenskap er kun gyldig for en kalender"
 
 #, php-format
 msgid "directory %s is not readable"
 msgstr "mappen %s er ikke lesbar"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_imap_pam : imap_url parameter ikke konfigurert i /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
+msgstr ""
+"drivers_imap_pam : imap_url parameter ikke konfigurert i "
+"/etc/davical/*-conf.php"
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : Kunne ikke starte TLS: ldap_start_tls() feilet"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-msgstr "drivers_ldap : Feilet å binde til vert %1$s på port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap : Feilet å binde til vert %1$s på port %2$s with bindDN of %3$s"
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-msgstr "drivers_ldap : Feilet å sette LDAP til å bruke protokoll version 3, TLS ikke støttet"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
+msgstr ""
+"drivers_ldap : Feilet å sette LDAP til å bruke protokoll version 3, TLS ikke"
+" støttet"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap : Ute av stand til å binde til LDAP - sjekk din konfigurasjon for bindDN og passDN, og at "
-"din  LDAP server kan nås"
+"drivers_ldap : Ute av stand til å binde til LDAP - sjekk din konfigurasjon "
+"for bindDN og passDN, og at din  LDAP server kan nås"
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
-msgstr "drivers_ldap : Ute av stand til kommunikasjon med LDAP med port %s på vert %s"
+msgstr ""
+"drivers_ldap : Ute av stand til kommunikasjon med LDAP med port %s på vert "
+"%s"
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-msgstr "drivers_ldap : function ldap_connect ikke definert, sjekk din php_ldap modul"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
+"drivers_ldap : function ldap_connect ikke definert, sjekk din php_ldap modul"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
@@ -1348,7 +1454,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Unable to find %s file"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "forglem meg ei"
 
@@ -1358,12 +1465,12 @@
 msgid "path to store your ics"
 msgstr "bane for å lagre din ics"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "filen %s er ikke UTF-8 encoded, sjekk feil for flere detaljer"
-
 msgid "unauthenticated"
 msgstr "Ikke-autentisert"
 
-msgid "you should log on with the username and password that have been issued to you."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr "logg på med brukernavnet og passordet du fikk utstedt"
+
+
diff -Nru davical-0.9.9.7/po/nl.po davical-1.0.2/po/nl.po
--- davical-0.9.9.7/po/nl.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/nl.po	2012-01-04 23:04:26.000000000 +0000
@@ -1,122 +1,140 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
+#   <zenlord@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-12-12 16:48+0000\n"
+"Last-Translator: zenlord <zenlord@gmail.com>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/davical/team/nl/)\n"
-"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
-msgstr ""
+msgstr "%F%T"
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
-msgstr ""
+msgstr "%T"
 
 msgid "*** Default Locale ***"
-msgstr ""
+msgstr "*** Standaard Landinstellingen ***"
 
 msgid "*** Unknown ***"
-msgstr ""
+msgstr "*** Onbekend ***"
 
 #, php-format
 msgid "- adding %s to group : %s"
-msgstr ""
+msgstr "- toevoegen van %s aan groep: %s"
 
 #, php-format
 msgid "- adding users %s to group : %s"
-msgstr ""
+msgstr "- toevoegen van gebruikers %s aan groep: %s"
 
 #, php-format
 msgid "- creating groups : %s"
-msgstr ""
+msgstr "- aanmaken van groepen: %s"
 
 #, php-format
 msgid "- creating record for users :  %s"
-msgstr "- gebruiker aanmaken :  %s"
+msgstr "- aanmaken van gebruikers: %s"
 
 #, php-format
 msgid "- deactivate groups : %s"
-msgstr ""
+msgstr "- groepen: %s uitschakelen"
 
 #, php-format
 msgid "- deactivating users : %s"
-msgstr "- desactiveren van gebruikers : %s"
+msgstr "- gebruikers: %s uitschakelen"
 
 #, php-format
 msgid "- nothing done on : %s"
-msgstr "- ongewijzigd : %s"
+msgstr "- ongewijzigd: %s"
 
 #, php-format
 msgid "- removing %s from group : %s"
-msgstr ""
+msgstr "- verwijderen van %s uit de groep: %s"
 
 #, php-format
 msgid "- updating groups : %s"
-msgstr ""
+msgstr "- bijwerken van groepen: %s"
 
 #, php-format
 msgid "- updating user records : %s"
-msgstr "- wijzigen van gebruikers : %s"
+msgstr "- wijzigen van gebruikers: %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
-"<b>OPGELET: Alle afspraken in deze map zullen verwijderd worden vooraleer het ics-bestand wordt "
-"ingevoegd</b>"
+"<b>OPGELET: Alle afspraken in deze map zullen verwijderd worden vooraleer "
+"het ics-bestand wordt ingevoegd</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
+"<h1>Help</h1><p>Voor de eerste hulp kunt u terecht op de<a "
+"href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> of "
+"neem een kijkje op de <a href=\"http://wiki.davical.org/%s\" "
+"target=\"_blank\">DAViCal Wiki</a> . </p><p> Als u daar de antwoorden niet "
+"kan vinden, bezoek ons op <a "
+"href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" "
+"target=\"_blank\">IRC</a> in het <b>#davical</b> kanaal op <a "
+"href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a> , of stuur "
+"een vraag aan de <a href=\"http://lists.sourceforge.net/mailman/listinfo"
+"/davical-general\" target=\"_blank\">DAViCal Gebruikers mailing "
+"list</a>.</p><p>De<a "
+"href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" "
+"title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list "
+"archieven kunnen ook nuttig zijn.</a> </p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-msgstr ""
-"<h1>Meld U alstublieft aan</h1><p>Om toegang te krijgen tot de %s moet U zich aanmelden met de "
-"gebruikersnaam en het wachtwoord dat U heeft gekregen.</p><p>Om toegang aan te vragen mail je %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
+msgstr ""
+"<h1>Meld u alstublieft aan</h1><p>Om toegang te krijgen tot de %s moet u "
+"zich aanmelden met de gebruikersnaam en het wachtwoord dat u heeft "
+"gekregen.</p><p>Om toegang aan te vragen, dient u %s te contacteren.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
-msgstr ""
+msgstr "Een DAViCal principaalcollectie kan alleen collecties bevatten"
 
 msgid "A collection already exists at that location."
-msgstr "Er bestaat al een verzameling op die plek"
+msgstr "Er bestaat reeds een collectie op die locatie"
 
 msgid "A resource already exists at the destination."
-msgstr ""
+msgstr "Er bestaat reeds een bron op die bestemming."
 
 msgid "AWL Library version "
-msgstr ""
+msgstr "AWL Library versie"
 
 msgid "Access Tickets"
-msgstr ""
+msgstr "Toegang Tickets"
 
 msgid "Access ticket deleted"
-msgstr ""
+msgstr "Toegang ticket verwijderd"
 
 msgid "Action"
 msgstr "Actie"
@@ -143,53 +161,67 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "Alle gegevens van de collectie worden onherroepelijk verwijderd."
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
-msgstr "Alle agenda's en afspraken van de Principaal worden onherroepelijk verwijderd."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+"Alle afspraken van gebruiker \"%s\" werden verwijderd en vervangen door die "
+"van bestand %s"
 
-msgid "All privileges"
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
+"Alle agenda's en afspraken van de Principaal worden onherroepelijk "
+"verwijderd."
+
+msgid "All privileges"
+msgstr "Alle bevoegdheden"
 
 msgid "All requested changes were made."
 msgstr "De gevraagde wijzigingen werden doorgevoerd"
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
+"Laat Vrij/Bezet-queries gericht aan de eigenaar van deze planning inbox toe"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
-msgstr "Een \"Beheerder\" heeft alle privileges in een DAViCal Systeem"
+msgstr "Een \"Beheerder\" heeft alle bevoegdheden in een DAViCal Systeem"
 
 msgid "Anonymous users are not allowed to modify calendars"
-msgstr "Anonieme gebruikers kunnen geen agenda's aanpassen"
+msgstr "Anonieme gebruikers kunnen geen agenda's bewerken"
 
 msgid "Anonymous users may only access public calendars"
-msgstr "Anonieme gebruikers kunnen hebben enkel toegang tot openbare agenda's"
+msgstr "Anonieme gebruikers hebben enkel toegang tot openbare agenda's"
 
 msgid "Application DB User"
-msgstr ""
+msgstr "'Application DB' gebruiker"
 
 msgid "Apply Changes"
-msgstr "Pas wijzigingen toe"
+msgstr "Wijzigingen toepassen"
 
 msgid "Apply DB Patches"
-msgstr ""
+msgstr "DB patches toepassen"
 
 msgid "Attachment"
-msgstr ""
+msgstr "Bijlage"
 
 msgid "Binding deleted"
-msgstr ""
+msgstr "Associatie verwijderd"
 
 msgid "Bindings to other collections"
-msgstr ""
+msgstr "Associaties met andere collecties"
 
 msgid "Bindings to this Collection"
-msgstr ""
+msgstr "Associaties met deze Collectie"
 
 msgid "Bindings to this Principal's Collections"
-msgstr ""
+msgstr "Associaties met de Collecties van deze Principaal"
+
+msgid "Body contains no XML data!"
+msgstr "Body bevat geen XML data!"
 
 msgid "Bound As"
-msgstr ""
+msgstr "Geassocieerd als"
 
 msgid "Browse all users"
 msgstr "Blader door alle gebruikers"
@@ -202,85 +234,89 @@
 msgstr "Agenda \"%s\" werd ingeladen van bestand."
 
 msgid "Calendar Principals"
-msgstr ""
+msgstr "Agenda Principalen"
 
 msgid "Calendar Timezone"
 msgstr "Tijdzone van Agenda"
 
 msgid "Can only add tickets for existing collection paths which you own"
-msgstr ""
+msgstr "Kan enkel tickets toevoegen voor uw reeds bestaande, collecties"
 
 msgid "Categories"
-msgstr ""
+msgstr "Categorieën"
 
 msgid "Change Password"
 msgstr "Wijzig wachtwoord"
 
 msgid "Click to display user details"
-msgstr "Klik om de gebruikersdetails te tonen"
+msgstr "Klik om de gebruikersgegevens weer te geven"
 
 msgid "Click to edit principal details"
-msgstr ""
+msgstr "Klik om de Principaalgegevens te bewerken"
 
 msgid "Collection"
-msgstr "Verzameling"
+msgstr "Collectie"
 
 msgid "Collection Grants"
-msgstr "Privileges van de Verzameling"
+msgstr "Toekenningen van de Collectie"
 
 msgid "Collection ID"
-msgstr "ID van de Verzameling"
+msgstr "ID van de Collectie"
 
 msgid "Collection deleted"
-msgstr "Verzameling verwijderd"
+msgstr "Collectie verwijderd"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
+"Collecties kunnen niet terzelfdertijd CalDAV agenda's en CardDAV adresboeken"
+" zijn"
 
 msgid "Configuring Calendar Clients for DAViCal"
-msgstr ""
+msgstr "Agenda applicaties instellen voor DAViCal"
 
 msgid "Configuring DAViCal"
-msgstr ""
+msgstr "DAViCal instellen"
 
 msgid "Confirm"
 msgstr "Bevestig"
 
 msgid "Confirm Deletion of the Binding"
-msgstr ""
+msgstr "Bevestig het verwijderen van de Associatie"
 
 msgid "Confirm Deletion of the Collection"
-msgstr "Bevestig het verwijderen van de Verzameling"
+msgstr "Bevestig het verwijderen van de Collectie"
 
 msgid "Confirm Deletion of the Principal"
-msgstr ""
+msgstr "Bevestig het verwijderen van de Principaal"
 
 msgid "Confirm Deletion of the Ticket"
-msgstr ""
+msgstr "Bevestig het verwijderen van het Ticket"
 
 msgid "Confirm Password"
 msgstr "Bevestig het wachtwoord"
 
 msgid "Confirm the new password."
-msgstr "Bevestig het nieuwe wachtwoord"
+msgstr "Bevestig het nieuwe wachtwoord."
 
 msgid "Could not retrieve"
-msgstr ""
+msgstr "Kon gegevens niet ophalen"
 
 msgid "Create"
 msgstr "Maak"
 
 msgid "Create Collection"
-msgstr "Maak Verzameling aan"
+msgstr "Maak Collectie aan"
 
 msgid "Create Events/Collections"
-msgstr "Maak Afspraken/Verzamelingen aan"
+msgstr "Maak Afspraken/Collecties aan"
 
 msgid "Create New Collection"
-msgstr "Maak nieuwe Verzameling aan"
+msgstr "Maak nieuwe Collectie aan"
 
 msgid "Create New Principal"
-msgstr ""
+msgstr "Maak nieuwe Principaal aan"
 
 msgid "Create Principal"
 msgstr "Maak Principaal aan"
@@ -289,31 +325,34 @@
 msgstr "Maak nieuwe Principaal aan (d.i. een nieuwe gebruiker, bron of groep)"
 
 msgid "Create a resource or collection"
-msgstr "Maak een Bron of Verzameling aan"
+msgstr "Maak een Bron of Collectie aan"
 
 msgid "Creating new Collection."
-msgstr ""
+msgstr "Nieuwe Collectie aanmaken"
 
 msgid "Creating new Principal record."
 msgstr "Nieuwe Principaal aanmaken"
 
 msgid "Creating new ticket granting privileges to this Principal"
-msgstr ""
+msgstr "Nieuw Ticket aanmaken dat bevoegdheden toekent aan deze Principaal"
 
 msgid "Current DAViCal version "
-msgstr ""
+msgstr "Huidige DAViCal versie"
 
 msgid "DAV Path"
-msgstr "DAV map"
+msgstr "DAV Pad"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
+"DAV::resourcetype mag alleen worden ingesteld op een nieuwe waarde en kan "
+"het niet worden verwijderd."
 
 msgid "DAViCal CalDAV Server"
 msgstr "DAViCal CalDAV Server"
 
 msgid "DAViCal DB Schema version "
-msgstr ""
+msgstr "DAViCal DB schema versie"
 
 msgid "DAViCal Homepage"
 msgstr "DAViCal website"
@@ -322,115 +361,116 @@
 msgstr "DAViCal wiki"
 
 msgid "DAViCal only allows BIND requests for collections at present."
-msgstr ""
+msgstr "DAViCal staat op heden enkel BIND requests toe voor collecties"
 
 msgid "DKIM signature invalid "
-msgstr ""
+msgstr "DKIM handtekening ongeldig"
 
 msgid "DKIM signature missing"
-msgstr ""
+msgstr "DKIM handtekening ontbreekt"
 
 msgid "DKIM signature validation failed(DNS ERROR)"
-msgstr ""
+msgstr "DKIM handtekening validatie mislukt (DNS ERROR)"
 
 msgid "DKIM signature validation failed(KEY Parse ERROR)"
-msgstr ""
+msgstr "DKIM handtekening validatie mislukt (KEY Parse ERROR)"
 
 msgid "DKIM signature validation failed(KEY Validation ERROR)"
-msgstr ""
+msgstr "DKIM handtekening validatie mislukt (KEY Validation ERROR)"
 
 msgid "DKIM signature validation failed(Signature verification ERROR)"
-msgstr ""
+msgstr "DKIM handtekening validatie mislukt (Signature verification ERROR)"
 
 msgid "Database Error"
-msgstr "Database fout"
+msgstr "Database Fout"
 
 msgid "Database Host"
-msgstr ""
+msgstr "Database Host"
 
 msgid "Database Name"
-msgstr ""
+msgstr "Database Naam"
 
 msgid "Database Owner"
-msgstr ""
+msgstr "Database Eigenaar"
 
 msgid "Database Password"
-msgstr ""
+msgstr "Database Wachtwoord"
 
 msgid "Database Port"
-msgstr ""
+msgstr "Database Poort"
 
 msgid "Database Username"
-msgstr ""
+msgstr "Database Gebruikersnaam"
 
 msgid "Database error"
 msgstr "Database fout"
 
 msgid "Date Format Style"
-msgstr "Opmaak datum"
+msgstr "Opmaakstijl datum"
 
 msgid "Date Style"
 msgstr "Opmaak datum"
 
 msgid "Default Privileges"
-msgstr "Standaard Privileges"
+msgstr "Standaard Bevoegdheden"
 
 msgid "Default relationships added."
-msgstr ""
+msgstr "Standaard relaties toegevoegd."
 
 msgid "Delete"
 msgstr "Verwijder"
 
 msgid "Delete Events/Collections"
-msgstr "Verwijder Afspraken/Verzamelingen"
+msgstr "Verwijder Afspraken/Collecties"
 
 msgid "Delete Principal"
 msgstr "Verwijder Principaal"
 
 msgid "Delete a resource or collection"
-msgstr "Verwijder een Bron of Verzameling"
+msgstr "Verwijder een Bron of Collectie"
 
 msgid "Deleted a grant from this Principal"
-msgstr "Deze Principaal werd een privilege ontnomen"
+msgstr "Deze Principaal werd een toekenning ontnomen"
 
 msgid "Deleting Binding:"
-msgstr ""
+msgstr "Verwijderen Associatie:"
 
 msgid "Deleting Collection:"
-msgstr "Deze Verzameling verwijderen:"
+msgstr "Verwijderen Collectie:"
 
 msgid "Deleting Principal:"
-msgstr "Deze Principaal verwijderen:"
+msgstr "Verwijderen Principaal:"
 
 msgid "Deleting Ticket:"
-msgstr ""
+msgstr "Verwijderen Ticket:"
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-msgstr ""
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgstr "Bezorg uitnodigingen van een organisator aan deze planning inbox"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
-msgstr ""
+msgstr "Bezorg bevestigingen van een genodigde aan deze planning inbox"
 
 msgid "Dependencies"
-msgstr ""
+msgstr "Afhankelijkheden"
 
 msgid "Dependency"
-msgstr ""
+msgstr "Afhankelijkheid"
 
 msgid "Description"
 msgstr "Beschrijving"
 
 msgid "Destination collection does not exist"
-msgstr ""
+msgstr "Bestemmingscollectie bestaat niet"
 
 msgid "Directory on the server"
 msgstr "Map op de server"
 
 msgid "Display Name"
-msgstr ""
+msgstr "Weergavenaam"
 
 msgid "Displayname"
-msgstr ""
+msgstr "Weergavenaam"
 
 msgid "Does the user have the right to perform this role?"
 msgstr "Heeft de gebruiker het recht om deze rol uit te voeren"
@@ -445,7 +485,9 @@
 msgstr "FOUT: De volledige naam mag niet leeg zijn."
 
 msgid "ERROR: The new password must match the confirmed password."
-msgstr "FOUT: Het nieuwe wachtwoord is niet exact hetzelfde als het bevestigingswachtwoord."
+msgstr ""
+"FOUT: Het nieuwe wachtwoord is niet exact hetzelfde als het "
+"bevestigingswachtwoord."
 
 msgid "ERROR: There was a database error writing the roles information!"
 msgstr "FOUT: Database fout bij het schrijven van de rolleninformatie"
@@ -459,21 +501,28 @@
 msgid "Email Address"
 msgstr "E-mailadres"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
-"Voer een gebruikersnaam in als je die weet en klik hier om een tijdelijk wachtwoord te krijgen via E-"
-"mail"
+"Voer een gebruikersnaam in als je die weet en klik hier om een tijdelijk "
+"wachtwoord te krijgen via e-mail"
 
 msgid "Enter your username and password then click here to log in."
-msgstr "Voer je gebruikersnaam en wachtwoord in en klik hier om U aan te melden"
+msgstr ""
+"Voer je gebruikersnaam en wachtwoord in en klik hier om U aan te melden"
 
 #, php-format
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
+"Fout NoGroupFound met filter &gt; %s &lt;, attributen &gt; %s &lt;, dn &gt; "
+"%s &lt;"
 
 #, php-format
 msgid "Error NoUserFound with filter >%s<, attributes >%s< , dn >%s<"
 msgstr ""
+"Fout NoUserFound met filter &gt; %s &lt;, attributen &gt; %s &lt;, dn &gt; "
+"%s &lt;"
 
 msgid "Error querying database."
 msgstr "Fout bij het bevragen van de database"
@@ -482,31 +531,41 @@
 msgstr "Fout bij het schrijven van agendadetails naar de database"
 
 msgid "Error writing calendar properties to database."
-msgstr ""
+msgstr "Fout bij het schrijven van agenda-eigenschappen naar de database"
 
 msgid "European"
-msgstr ""
+msgstr "Europees"
 
 msgid "European (d/m/y)"
 msgstr "Europees (d/m/y)"
 
 msgid "Existing resource does not match \"If-Match\" header - not accepted."
 msgstr ""
+"Bestaande bron stemt niet overeen met \"If-Match\" header - niet "
+"geaccepteerd."
 
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr ""
+"Bestaande bron stemt overeen met \"If-None-Match\" header - niet "
+"geaccepteerd."
 
 msgid "Expires"
-msgstr ""
+msgstr "Verstrijkt"
+
+msgid "External Calendars"
+msgstr "Externe Agenda's"
+
+msgid "External Url"
+msgstr "Externe Url"
 
 msgid "Fail"
-msgstr ""
+msgstr "Mislukt"
 
 msgid "Failed to write collection."
-msgstr ""
+msgstr "Collectie schrijven mislukt."
 
 msgid "Feeds are only supported for calendars at present."
-msgstr ""
+msgstr "Feeds worden alleen ondersteund voor agenda's op dit moment."
 
 msgid "For access to the"
 msgstr "Voor toegang tot de"
@@ -518,32 +577,32 @@
 msgstr "Vrij/Bezet"
 
 msgid "Full Name"
-msgstr "Volledige naam"
+msgstr "Volledige Naam"
 
 msgid "Fullname"
-msgstr "Volledige naam"
+msgstr "Volledige Naam"
 
 msgid "GET requests on collections are only supported for calendars."
-msgstr ""
+msgstr "GET requests op collecties worden enkel ondersteund op agenda's"
 
 msgid "GNU gettext support"
-msgstr ""
+msgstr "GNU gettext ondersteuning"
 
 msgid "GO!"
 msgstr "Ga!"
 
 msgid "Go to the DAViCal Feature Requests"
-msgstr ""
+msgstr "Ga naar de DAViCal feature requests"
 
 msgid "Grant"
-msgstr ""
+msgstr "Toekenning"
 
 msgid "Granting new privileges from this Principal"
-msgstr ""
+msgstr "Nieuwe bevoegdheden toekennen van deze Principaal"
 
 #. Translators: in the sense of a group of people
 msgid "Group"
-msgstr "Groepeer"
+msgstr "Groep"
 
 msgid "Group Members"
 msgstr "Groepsleden"
@@ -570,25 +629,25 @@
 msgstr "Thuis"
 
 msgid "Home Page"
-msgstr ""
+msgstr "Website"
 
 msgid "Home addressbook added."
-msgstr ""
+msgstr "Home adresboek toegevoegd."
 
 msgid "Home addressbook already exists."
-msgstr ""
+msgstr "Home adresboek bestaat reeds."
 
 msgid "Home calendar added."
-msgstr "Thuis Agenda toegevoegd"
+msgstr "Thuis-agenda toegevoegd"
 
 msgid "Home calendar already exists."
-msgstr ""
+msgstr "Thuis-agenda bestaat reeds"
 
 msgid "ID"
 msgstr "ID"
 
 msgid "ISO Format"
-msgstr ""
+msgstr "ISO formaat"
 
 msgid "ISO Format (YYYY-MM-DD)"
 msgstr "ISO formaat (YYYY-MM-DD)"
@@ -598,25 +657,25 @@
 msgstr "Id"
 
 msgid "If you have forgotten your password then"
-msgstr "Indien U Uw wachtwoord vergeten bent dan"
+msgstr "Indien u uw wachtwoord vergeten bent dan"
 
 msgid "If you would like to request access, please e-mail"
-msgstr "Indien U toegang wilt aanvragen, e-mail dan"
+msgstr "Indien u toegang wilt aanvragen, e-mail dan"
 
 msgid "Import all .ics files of a directory"
 msgstr "Importeer alle ics-bestanden in een map"
 
 msgid "Import calendars and Synchronise LDAP."
-msgstr ""
+msgstr "Importeer agenda's en synchroniseer LDAP"
 
 msgid "Inactive Principals"
-msgstr ""
+msgstr "Niet-actieve Principalen"
 
 msgid "Incorrect content type for addressbook: "
-msgstr ""
+msgstr "Onjuist 'content type' voor adresboek"
 
 msgid "Incorrect content type for calendar: "
-msgstr ""
+msgstr "Onjuist 'content type' voor agenda"
 
 msgid "Invalid user name or password."
 msgstr "Verkeerde gebruikersnaam of wachtwoord."
@@ -637,7 +696,7 @@
 msgstr "Is deze gebruiker actief?"
 
 msgid "Items in Collection"
-msgstr ""
+msgstr "Items in Collectie"
 
 msgid "Joined"
 msgstr "Gekoppeld"
@@ -648,6 +707,9 @@
 msgid "Last used"
 msgstr "Laatst gebruikt"
 
+msgid "List External Calendars"
+msgstr "Lijst met Externe Agenda's"
+
 msgid "List Groups"
 msgstr "Toon groepen"
 
@@ -661,69 +723,67 @@
 msgstr "Inladen van bestand"
 
 msgid "Locale"
-msgstr ""
+msgstr "Landinstellingen"
 
 msgid "Location"
-msgstr ""
+msgstr "Plaats"
 
 msgid "Log On Please"
 msgstr "Meld U aan, alstublieft"
 
 msgid "Log out of DAViCal"
-msgstr ""
+msgstr "Afmelden uit DAViCal"
 
 msgid "Logout"
 msgstr "Afmelden"
 
 msgid "Member deleted from this Group Principal"
-msgstr ""
+msgstr "Lid verwijderd van deze groep-Principaal"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
+"Het grootste deel van DAViCal zal werken, maar upgraden naar PHP 5.2 of "
+"hoger wordt sterk aanbevolen."
 
 msgid "Name"
 msgstr "Naam"
 
 msgid "New Collection"
-msgstr "Nieuwe verzameling"
+msgstr "Nieuwe Collectie"
 
 msgid "New Password"
-msgstr "Nieuw wachtwoord"
+msgstr "Nieuw Wachtwoord"
 
 msgid "New Principal"
-msgstr ""
+msgstr "Nieuwe Principaal"
 
 #. Translators: not 'Yes'
 msgid "No"
 msgstr "Nee"
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr "Geen agenda-inhoud"
 
 msgid "No collection found at that location."
-msgstr "Geen verzameling gevonden op die plaats"
-
-msgid "No scheduling support for user"
-msgstr ""
+msgstr "Geen collectie gevonden op die plaats"
 
 msgid "No summary"
-msgstr ""
+msgstr "Geen samenvatting"
 
 #. Translators: short for 'Number'
 msgid "No."
-msgstr "Nr."
+msgstr "Aantal"
 
 msgid "No. of Collections"
-msgstr ""
+msgstr "Aantal Collecties"
 
 msgid "No. of Principals"
-msgstr ""
+msgstr "Aantal Principalen"
 
 msgid "No. of Resources"
-msgstr ""
+msgstr "Aantal bronnen"
 
 msgid "Not overwriting existing destination resource"
 msgstr "Bestaande doelbron wordt niet overschreven"
@@ -732,40 +792,51 @@
 msgstr "Transparantie"
 
 msgid "Override a Lock"
-msgstr ""
+msgstr "Negeer een Lock"
 
 msgid "PDO PostgreSQL drivers"
-msgstr ""
+msgstr "PDO PostgreSQL drivers"
 
 msgid "PHP DateTime class"
-msgstr ""
+msgstr "PHP DateTime class"
 
 msgid "PHP LDAP module available"
-msgstr ""
+msgstr "PHP LDAP module beschikbaar"
 
 msgid "PHP Magic Quotes GPC off"
-msgstr ""
+msgstr "PHP Magic Quotes GPC uit"
 
 msgid "PHP Magic Quotes runtime off"
-msgstr ""
+msgstr "PHP Magic Quotes Runtime uit"
 
 msgid "PHP PDO module available"
-msgstr ""
-
-msgid "PHP PostgreSQL available"
-msgstr ""
+msgstr "PHP PDO module beschikbaar "
 
 msgid "PHP calendar extension available"
-msgstr ""
+msgstr "PHP calendar extensie beschikbaar"
 
 msgid "PHP iconv support"
+msgstr "PHP iconv ondersteuning"
+
+msgid "PHP not using Apache Filter mode"
+msgstr "PHP gebruikt geen 'Apache Filter'-modus"
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
 msgstr ""
+"PUT in een collectie is enkel toegestaan voor het type text/calendar tegen "
+"een agenda collectie"
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
+"PUT naar een collectie is enkel toegestaan indien het een text/vcard betreft"
+" naar een adresboek"
 
 msgid "Passed"
-msgstr ""
+msgstr "Geslaagd"
 
 msgid "Password"
 msgstr "Wachtwoord"
@@ -774,46 +845,55 @@
 msgstr "Pad"
 
 msgid "Person"
-msgstr ""
+msgstr "Persoon"
 
 msgid "Please confirm deletion of access ticket - see below"
 msgstr ""
+"Bevestig a.u.b. het verwijderen van het toegangsticket - zie hieronder"
 
 msgid "Please confirm deletion of binding - see below"
-msgstr ""
+msgstr "Bevestig a.u.b. het verwijderen van de associatie - zie hieronder"
 
 msgid "Please confirm deletion of collection - see below"
-msgstr "Bevestig aub het verwijderen van de verzameling - zie hieronder"
+msgstr "Bevestig a.u.b. het verwijderen van de collectie - zie hieronder"
 
 msgid "Please confirm deletion of the principal"
-msgstr ""
+msgstr "Bevestig a.u.b. het verwijderen van de Principaal"
 
 msgid "Please note the time and advise the administrator of your system."
-msgstr "Noteer aub het tijdstip en breng de beheerder van Uw systeem op de hoogte."
+msgstr ""
+"Noteer a.u.b. het tijdstip en breng de beheerder van Uw systeem op de "
+"hoogte."
 
 msgid "Principal"
-msgstr ""
+msgstr "Principaal"
 
 msgid "Principal Collections"
-msgstr ""
+msgstr "Principaal collecties"
 
 msgid "Principal Grants"
-msgstr ""
+msgstr "Toekenningen aan deze Principaal"
 
 msgid "Principal ID"
-msgstr ""
+msgstr "Principaal ID"
 
 msgid "Principal Type"
-msgstr ""
+msgstr "Principaal Type"
 
 msgid "Principal deleted"
-msgstr ""
+msgstr "Principaal verwijderd"
 
 msgid "Privileges"
-msgstr "Privileges"
+msgstr "Bevoegdheden"
 
 msgid "Privileges granted to All Users"
-msgstr ""
+msgstr "Bevoegdheden aan alle Gebruikers toegekend"
+
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr "Bevoegdheden tot verzenden van planning-berichten"
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr "Bevoegdheden tot delegeren van planning-beslissingen"
 
 msgid "Property is read-only"
 msgstr "Eigenschap is alleen-lezen"
@@ -835,35 +915,43 @@
 msgstr "Lees"
 
 msgid "Read ACLs for a resource or collection"
-msgstr "Bevraag ACLs voor een bron of verzameling"
+msgstr "Bevraag ACLs voor een bron of collectie"
 
 msgid "Read Access Controls"
-msgstr ""
+msgstr "Bevraag Toegangscontrole"
 
 msgid "Read Current User's Access"
-msgstr "Bevraag de privileges van de huidige gebruiker"
+msgstr "Bevraag de bevoegdheden van de huidige gebruiker"
 
 msgid "Read Free/Busy Information"
 msgstr "Bevraag de Vrij/Bezet-informatie"
 
 msgid "Read the content of a resource or collection"
-msgstr ""
+msgstr "Bevraag de inhoud van een bron of collectie"
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
+"Bevraag de toegangsmogelijkheden van de huidige gebruiker m.b.t. deze bron"
 
 msgid "Read the free/busy information for a calendar collection"
-msgstr ""
+msgstr "Bevraag de Vrij/Bezet informatie m.b.t. een collectie/agenda"
 
 msgid "Read/Write"
 msgstr "Lees/Schrijf"
 
+msgid "References"
+msgstr "Referenties"
+
 msgid "Remove"
-msgstr ""
+msgstr "Verwijder"
 
 msgid "Remove a lock"
 msgstr "Verwijder een beveiliging"
 
+msgid "Remove dangling external calendars"
+msgstr "Verwijder achtergelaten externe agenda's"
+
 msgid "Report Bug"
 msgstr "Rapporteer softwarefout"
 
@@ -874,9 +962,10 @@
 msgstr "Vraag een feature aan"
 
 msgid "Request body is not valid XML data!"
-msgstr ""
+msgstr "Request body is geen geldige XML data"
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Bron"
 
@@ -884,93 +973,97 @@
 msgstr "Bron Agenda Principalen"
 
 msgid "Resource Not Found."
-msgstr ""
+msgstr "Bron niet gevonden"
 
 msgid "Resource has changed on server - not deleted"
 msgstr "Bron gewijzigd op de server - niet verwijderd"
 
 msgid "Resources may not be changed to / from collections."
-msgstr "Bronnen kunnen niet omgezet worden in Verzamelingen en vice versa"
+msgstr "Bronnen kunnen niet omgezet worden in Collecties en vice versa"
 
 msgid "Revoke"
-msgstr ""
+msgstr "Herroepen"
 
 msgid "Schedule Deliver"
-msgstr "Agendeer de levering"
+msgstr "Levering van de planning"
 
 msgid "Schedule Send"
-msgstr "Agendeer de verzending"
+msgstr "Verzending van de planning"
 
 msgid "Schedule Transparency"
-msgstr "Agendeer de transparantie"
-
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
+msgstr "Transparantie van de planning"
 
 msgid "Scheduling: Deliver a Reply"
-msgstr "Agenderen: Lever een antwoord af"
+msgstr "Planning: Lever een antwoord af"
 
 msgid "Scheduling: Deliver an Invitation"
-msgstr "Agenderen: Lever een uitndoging af"
+msgstr "Planning: Lever een uitnodiging af"
 
 msgid "Scheduling: Delivery"
-msgstr ""
+msgstr "Planning: Bezorging"
 
 msgid "Scheduling: Query free/busy"
-msgstr "Agenderen: Bevraag vrij/bezet"
+msgstr "Planning: Bevraag Vrij/Bezet"
 
 msgid "Scheduling: Send a Reply"
-msgstr "Agenderen: Verzend een antwoord"
+msgstr "Planning: Verzend een antwoord"
 
 msgid "Scheduling: Send an Invitation"
-msgstr "Agenderen: Verzend een uitnodiging"
+msgstr "Planning: Verzend een uitnodiging"
 
 msgid "Scheduling: Send free/busy"
-msgstr "Agenderen: Verzend vrij/bezet"
+msgstr "Planning: Verzend Vrij/Bezet"
 
 msgid "Scheduling: Sending"
-msgstr ""
+msgstr "Planning: Verzenden"
 
 msgid "Send free/busy enquiries"
-msgstr ""
+msgstr "Verzend Vrij/Bezet-rondvraag"
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
+"Verzend planning-informatie als een organisator vanwege de eigenaar van deze"
+" planning-outbox"
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
+"Verzend planning-antwoorden als een genodigde vanwege de eigenaar van deze "
+"planning-outbox"
 
 msgid "Set free/busy privileges"
-msgstr "Configureer Vrij/Bezet-privileges"
+msgstr "'Vrij/Bezet'-bevoegdheden instellen"
 
 msgid "Set read privileges"
-msgstr "Configureer Alleen-lezen -privileges"
+msgstr "'Alleen-lezen'-bevoegdheden instellen"
 
 msgid "Set read+write privileges"
-msgstr "Configureer Lees+Schrijf -privileges"
-
-msgid "Set schedule-deliver privileges"
-msgstr ""
+msgstr "'Lees+Schrijf'-bevoegdheden instellen"
 
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
-"Configureer de map waar Uw ics zullen bewaard worden. 'Home' zal bereikbaar zijn als /caldav.php/"
-"gebruikersnaam/Home/"
+"Configureer het pad waar uw ics zal worden bewaard, bijvoorbeeld 'kalender' "
+"zal worden verwezen als /caldav.php/gebruikersnaam/kalender/"
 
 msgid "Setup"
-msgstr "Configureer"
+msgstr "Configureren"
 
 msgid "Setup DAViCal"
-msgstr "Configureer DAViCal"
+msgstr "DAViCal instellen"
 
 msgid "Show help on"
 msgstr "Toon hulp over"
 
 msgid "Site Statistics"
-msgstr ""
+msgstr "Website statistieken"
 
 msgid "Site Statistics require the database to be available!"
-msgstr ""
+msgstr "Website statistieken vereisen dat de database beschikbaar is"
 
 msgid "Some properties were not able to be changed."
 msgstr "Sommige eigenschappen konden niet gewijzigd worden."
@@ -981,14 +1074,17 @@
 msgid "Source resource does not exist."
 msgstr "Oorspronkelijke bron bestaat niet"
 
-msgid "Special collections may not contain a calendar or other special collection."
-msgstr "Bijzondere verzamelingen kunnen geen Agenda of andere bijzondere verzameling bevatten."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
+msgstr ""
+"Bijzondere collecties kunnen geen Agenda of andere bijzondere collectie "
+"bevatten."
 
 msgid "Specific Privileges"
-msgstr "Specifieke privileges"
+msgstr "Specifieke bevoegdheden"
 
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #, php-format
 msgid "Status: %d, Message: %s, User: %d, Path: %s"
@@ -998,165 +1094,226 @@
 msgstr "Verzend"
 
 msgid "Suhosin \"server.strip\" disabled"
-msgstr ""
+msgstr "Suhosin \"server.strip\" uitgeschakeld"
 
-msgid "Sync LDAP Groups with RSCDS"
-msgstr ""
+msgid "Sync LDAP Groups with DAViCal"
+msgstr "Synchroniseer LDAP groepen met DAViCal"
 
 msgid "Sync LDAP with DAViCal"
-msgstr ""
+msgstr "Synchroniseer LDAP groepen met DAViCal"
 
 msgid "Target"
-msgstr ""
+msgstr "Doel"
 
 msgid "That destination name contains invalid characters."
-msgstr ""
+msgstr "De naam van dat doel bevat ongeldige karakters"
 
 msgid "That resource is not present on this server."
 msgstr "Die bron is niet aanwezig op deze server"
 
 msgid "The BIND Request MUST identify an existing resource."
-msgstr ""
+msgstr "De 'BIND request' MOET een bestaande bron identificeren"
 
 msgid "The BIND Request-URI MUST identify a collection."
-msgstr ""
+msgstr "De 'BIND request-URI' MOET een collectie identificeren"
 
 msgid "The BIND method is not allowed at that location."
-msgstr ""
+msgstr "De 'BIND method' is niet toegestaan op die locatie"
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
+"De 'CalDAV:schedule-calendar-transp'-eigenschap kan enkel toegepast worden "
+"op een agenda."
 
 msgid "The DAViCal Home Page"
 msgstr "De DAViCal website"
 
 msgid "The access ticket will be deleted."
-msgstr ""
+msgstr "Het toegangsticket zal verwijderd worden"
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
+"Het 'addressbook-query' rapport moet uitgevoerd worden in een "
+"collectie/adresboek"
 
 msgid "The application failed to understand that request."
-msgstr ""
+msgstr "De toepassing kent dat verzoek niet."
 
 msgid "The application program does not understand that request."
 msgstr "Deze applicatie begrijpt dat verzoek niet."
 
 msgid "The binding will be deleted."
-msgstr ""
+msgstr "De associatie zal verwijderd worden"
 
 msgid "The calendar path contains illegal characters."
-msgstr "Het pad naar de agenda bevat niet-toegestane tekens."
+msgstr "Het agenda-pad bevat niet-toegestane tekens."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
+"De instructie 'calendar-free-busy-set' werd vervangen door de 'schedule-"
+"transp'-eigenschap van een collectie/agenda."
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
+"Het 'calendar-query' rapport moet uitgevoerd worden in een collectie/agenda"
 
 msgid "The collection name may not be blank."
-msgstr ""
+msgstr "De naam van de collectie kan niet leeg gelaten worden"
 
 msgid "The destination collection does not exist"
-msgstr ""
+msgstr "De doel-collectie bestaat niet"
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
+"De weergavenaam kan enkel bij collecties, principalen of associaties "
+"ingesteld worden"
 
 msgid "The email address really should not be blank."
+msgstr "Het emailadres kan echt niet leeg gelaten worden"
+
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
 msgstr ""
+"Het bestand \"%s\" is niet UTF-8 ge-encodeerd. Ga de foutmelding na voor "
+"meer details"
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
-msgstr "Het bestand is niet UTF-8 ge-encodeerd, bekijk aub de foutmelding voor meer details."
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
+"Het bestand is niet UTF-8 ge-encodeerd, bekijk aub de foutmelding voor meer "
+"details."
 
 msgid "The full name for this person, group or other type of principal."
-msgstr ""
+msgstr "De volledige naam voor deze persoon, groep of ander soort prinicpaal"
 
 msgid "The full name must not be blank."
-msgstr ""
+msgstr "De volledige naam kan niet leeg gelaten worden"
 
 msgid "The name this user can log into the system with."
 msgstr "De naam waarmee deze gebruiker zich op het systeem kan aanmelden."
 
 msgid "The path on the server where your .ics files are."
-msgstr "De map op de server waar Uw ics-bestanden zich bevinden."
+msgstr "De map op de server waar uw ics-bestanden zich bevinden."
 
 msgid "The preferred language for this person."
 msgstr "De voorkeurstaal van deze gebruiker"
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr "De principaal \"%s\" bestaat niet"
+
 msgid "The style of dates used for this person."
 msgstr "De datumweergave die gebruikt wordt voor deze gebruiker"
 
 msgid "The user's e-mail address."
-msgstr "Het e-mail adres van de gebruiker"
+msgstr "Het e-mailadres van de gebruiker"
 
 msgid "The user's full name."
 msgstr "De volledige naam van de gebruiker"
 
 msgid "The user's password for logging in."
-msgstr "Het wachtwoord van de gebruiker om aan te melden"
+msgstr "Het wachtwoord waarmee de gebruiker zich aanmeldt"
 
 msgid "The username must not be blank, and may not contain a slash"
 msgstr ""
+"De gebruikersnaam kan niet leeg gelaten worden en kan geen slash bevatten"
 
 msgid "There was an error reading from the database."
-msgstr ""
+msgstr "Er is een fout opgetreden bij het lezen uit de database."
 
 msgid "There was an error writing to the database."
 msgstr "Er is een fout opgetreden bij het schrijven naar de database"
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Deze actie doet het volgende:<ul><li>controleer op geldige groepen in de "
+"LDAP-directory</li><li>controleer op groepen in "
+"DAViCal</li></ul>dan<ul><li>als er een groep aanwezig is in DAViCal maar "
+"niet in LDAP: als inactief markeren in DAViCal</li><li>als er een groep "
+"bestaat in LDAP, maar niet in DAViCal: de groep in DAViCal "
+"aanmaken</li><li>als een groep in LDAP en DAViCal bestaat: de informatie in "
+"DAViCal bijwerken</li></ul>"
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Deze actie doet het volgende:<ul><li>controleer op geldige gebruikers in de "
+"LDAP-directory</li><li>controleer op gebruikers in "
+"DAViCal</li></ul>dan<ul><li>als een gebruiker aanwezig is in DAViCal maar "
+"niet in LDAP: markeer hem als inactief in DAViCal</li><li>als een gebruiker "
+"aanwezig is in LDAP, maar niet in DAViCal: de gebruiker in DAViCal "
+"aanmaken</li><li>als een gebruiker aanwezig is in LDAP en DAViCal: de "
+"informatie in DAViCal bijwerken</li></ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
+msgstr ""
+"Deze pagina controleert in de eerste plaats de omgeving die nodig is om "
+"DAViCal correct te laten werken. Suggesties of patches om het meer nuttige "
+"dingen te laten doen zullen dankbaar worden ontvangen."
+
+msgid ""
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
+"Deze procedure zal elk bestand van het type \"gebruikersnaam.ics\" in een "
+"bepaalde map importeren en een gebruikersnaam en kalender voor elk te "
+"importeren bestand aanmaken."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
 msgstr ""
+"Deze server ondersteunt alleen het 'text/calendar'-formaat voor Vrij/Bezet-"
+"URL's"
 
 msgid "Ticket ID"
-msgstr ""
+msgstr "Ticket ID"
 
 msgid "Time"
-msgstr ""
+msgstr "Tijd"
 
 msgid "To Collection"
-msgstr ""
+msgstr "Naar Collectie"
 
 msgid "To ID"
 msgstr "Naar ID"
 
 msgid "Toggle all privileges"
-msgstr "Vink alle privileges aan/af"
+msgstr "Vink alle bevoegdheden aan/af"
 
 msgid "Tools"
-msgstr ""
+msgstr "Extra"
 
 msgid "Transparent"
 msgstr "Transparant"
 
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 msgid "US Format"
-msgstr ""
+msgstr "US Formaat"
 
 msgid "Unauthenticated User"
-msgstr ""
+msgstr "Niet-geverifieerde gebruiker"
 
 msgid "United States of America (m/d/y)"
 msgstr "Verenigde Staten van Amerika (m/d/y)"
@@ -1168,28 +1325,32 @@
 msgstr "Bijgewerkt"
 
 msgid "Updating Collection record."
-msgstr ""
+msgstr "Collectie bijwerken"
 
 msgid "Updating Member of this Group Principal"
-msgstr ""
+msgstr "Lid van deze Groep Principaal bijwerken"
 
 msgid "Updating Principal record."
-msgstr ""
+msgstr "Principaal bijwerken"
 
 msgid "Updating grants by this Principal"
-msgstr "Bijwerken van toezeggingen door deze Principaal"
+msgstr "Bijwerken van toekenningen door deze Principaal"
 
 msgid "Upgrade DAViCal database schema"
-msgstr "Upgrade DAViCal database schema"
+msgstr "DAViCal database schema bijwerken"
 
 msgid "Upgrade Database"
-msgstr "Upgrade database"
+msgstr "Database bijwerken"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
-msgstr "Upload een ics-bestand in iCalendar-formaat om deze Agenda te initialiseren of te vervangen."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
+msgstr ""
+"Upload een ics-bestand in iCalendar-formaat om deze Agenda te initialiseren "
+"of te vervangen."
 
 msgid "User Calendar Principals"
-msgstr ""
+msgstr "Principalen van de Agenda van deze Gebruiker"
 
 msgid "User Details"
 msgstr "Gebruikersgegevens"
@@ -1207,49 +1368,52 @@
 msgstr "Gebruiker is actief"
 
 msgid "User record written."
-msgstr "Gebruikersgegevens geschreven."
+msgstr "Gebruiker weggeschreven."
 
 msgid "Username"
 msgstr "Gebruikersnaam"
 
 msgid "View My Details"
-msgstr "Bekijk mijn details"
+msgstr "Bekijk mijn gegevens"
 
 msgid "View my own principal record"
-msgstr ""
+msgstr "Bekijk mijn eigen Principaal"
 
 msgid "View this user record"
-msgstr "Bekijk deze gebruikersgegevens"
+msgstr "Bekijk deze gebruiker"
 
 msgid "Visit the DAViCal Wiki"
 msgstr "Bezoek de DAViCal wiki"
 
 #, php-format
 msgid "Want: %s, Currently: %s"
-msgstr ""
+msgstr "Wilt: %s, Nu: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
+"Opgelet: er zijn geen actieve admin gebruikers! U moet dit oplossen vóór u "
+"zich afmeldt. Overweeg het gebruik van de '$c->do_not_sync_from_ldap' "
+"configuratie-instelling."
 
 msgid "When the user's e-mail account was validated."
-msgstr "Nadat het e-mail adres van de gebruiker bevestigd is."
+msgstr "Nadat het e-mailadres van de gebruiker bevestigd is."
 
 msgid "Write"
 msgstr "Schrijf"
 
 msgid "Write ACLs for a resource or collection"
-msgstr "Schrijf ACLs voor een bron of verzameling"
+msgstr "Schrijf ACLs voor een bron of collectie"
 
 msgid "Write Access Controls"
-msgstr "Schrijf Permissies"
+msgstr "Schrijf Bevoegdheden"
 
 msgid "Write Data"
-msgstr "Schrijf gegevens"
+msgstr "Schrijf Gegevens"
 
 msgid "Write Metadata"
-msgstr "Schrijf metadata"
+msgstr "Schrijf Metadata"
 
 msgid "Write content"
 msgstr "Schrijf inhoud"
@@ -1261,7 +1425,7 @@
 msgstr "Ja"
 
 msgid "You are editing"
-msgstr "U bent aan het bewerken"
+msgstr "U bent aan het bijwerken"
 
 msgid "You are not authorised to use this function."
 msgstr "U bent niet bevoegd om deze functie te gebruiken"
@@ -1270,79 +1434,93 @@
 msgstr "U bent aan het bekijken"
 
 msgid "You do not have permission to modify this record."
-msgstr ""
+msgstr "U bent niet bevoegd om deze record bij te werken"
 
 msgid "You may not PUT to a collection URL"
-msgstr ""
+msgstr "U kan 'PUT' niet toepassen op de URL van een collectie"
 
 msgid "You must log in to use this system."
-msgstr "U moet zich aanmelden om dit systeem te gebruiken"
+msgstr "U moet zich aanmelden om dit systeem te gebruiken."
 
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
-
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "Alle afspraken van gebruiker %s zijn verwijderd en vervangen door deze in bestand %s"
+"Uw configuratie heeft PHP fouten weergegeven die gecorrigeerd moeten worden"
 
 msgid "calendar-timezone property is only valid for a calendar."
-msgstr ""
+msgstr "De 'calendar-timezone'-eigenschap is enkel geldig voor een agenda."
 
 #, php-format
 msgid "directory %s is not readable"
 msgstr "Map %s kan niet worden gelezen"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
+"drivers_imap_pam : 'imap_url'-parameter niet ingesteld in "
+"/etc/davical/*-conf.php"
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : Kan TLS niet starten: ldap_start_tls() mislukt"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-msgstr "drivers_ldap : Binden met host %1$s via poort %2$s met bindDN %3$s mislukt"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap : Binden met host %1$s via poort %2$s met bindDN %3$s mislukt"
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-msgstr "drivers_ldap : LDAP configureren om protocol versie 3 te gebruiken mislukt, TLS niet ondersteund"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
+msgstr ""
+"drivers_ldap : LDAP instellen om protocol versie 3 te gebruiken mislukt, TLS"
+" niet ondersteund"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap : Kan niet binden met LDAP - kijk de configuratie (bindDN en passDN) na en zorg ervoor "
-"dat de LDAP server bereikbaar is"
+"drivers_ldap : Kan niet binden met LDAP - kijk de configuratie (bindDN en "
+"passDN) na en zorg ervoor dat de LDAP server bereikbaar is"
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
-msgstr "drivers_ldap : Kan geen verbinding maken met LDAP met poort %s op host %s"
+msgstr ""
+"drivers_ldap : Kan geen verbinding maken met LDAP met poort %s op host %s"
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-msgstr "drivers_ldap : functie ldap_connect niet ingesteld, kijk Uw php_ldap module na"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
+"drivers_ldap : functie ldap_connect niet ingesteld, kijk Uw php_ldap module "
+"na"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
-msgstr ""
+msgstr "drivers_pwauth_pam : Kan bestand %s niet vinden"
 
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Kan bestand %s niet vinden"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "Aangemeld blijven"
 
 msgid "from principal"
-msgstr ""
+msgstr "van Principaal"
 
 msgid "path to store your ics"
-msgstr "pad waar Uw ics worden bewaard"
-
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "het bestand %s is niet UTF-8 ge-encodeerd, kijk aub de foutmelding na voor verdere details"
+msgstr "map waar Uw ics-bestanden zullen worden bewaard"
 
 msgid "unauthenticated"
+msgstr "niet geverifieerd"
+
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr ""
+"U moet zich aanmelden met de gebruikersnaam en het wachtwoord die U zijn "
+"toegewezen."
+
 
-msgid "you should log on with the username and password that have been issued to you."
-msgstr "U moet zich aanmelden met de gebruikersnaam en het wachtwoord die U zijn toegewezen."
diff -Nru davical-0.9.9.7/po/pl.po davical-1.0.2/po/pl.po
--- davical-0.9.9.7/po/pl.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/pl.po	2012-01-04 23:04:44.000000000 +0000
@@ -1,36 +1,41 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
-# spasstl <marty@xemail.de>, 2011.
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
+#   <dziobak84@interia.pl>, 2011.
+#   <silk@boktor.net>, 2011.
+# spasstl <marty@xemail.de>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-25 10:26+0000\n"
+"Last-Translator: dziobak <dziobak84@interia.pl>\n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/davical/team/pl/)\n"
-"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pl\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
-msgstr ""
+msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
-msgstr ""
+msgstr "%T"
 
 msgid "*** Default Locale ***"
-msgstr ""
+msgstr "*** Domyślne ustawienia lokalne ***"
 
 msgid "*** Unknown ***"
-msgstr ""
+msgstr "*** Nieznane ***"
 
 #, php-format
 msgid "- adding %s to group : %s"
@@ -42,62 +47,69 @@
 
 #, php-format
 msgid "- creating groups : %s"
-msgstr ""
+msgstr "- tworzenie grup: %s"
 
 #, php-format
 msgid "- creating record for users :  %s"
-msgstr ""
+msgstr "- tworzenie rekordów użytkowników: %s"
 
 #, php-format
 msgid "- deactivate groups : %s"
-msgstr ""
+msgstr "- wyłącz grupy: %s"
 
 #, php-format
 msgid "- deactivating users : %s"
-msgstr ""
+msgstr "- wyłączenie użytkowników: %s"
 
 #, php-format
 msgid "- nothing done on : %s"
-msgstr ""
+msgstr "nic nie wykonano na: %s"
 
 #, php-format
 msgid "- removing %s from group : %s"
-msgstr ""
+msgstr "- usuwanie %s z grupy: %s"
 
 #, php-format
 msgid "- updating groups : %s"
-msgstr ""
+msgstr "- aktualizacja grup: %s"
 
 #, php-format
 msgid "- updating user records : %s"
-msgstr ""
+msgstr "- aktualizacja rekordów użytkownika: %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
+"<b>OSTRZEŻENIE: wszystkie zdarzenia z tej ścieżki zostaną usunięte przed "
+"wstawieniem plików ICS</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
+"<h1>Pomoc</h1>\n"
+"<p>Aby uzyskać pomoc, odwiedź <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> lub przeczytaj <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
+"<p>Jeżeli nie znalazłeś odpowiedzi, odwiedź nas na <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRCu</a> na kanale <b>#davical</b> na stronie <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
+"lub wyślij zapytanie na <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal lista dyskusyjna Użytkowników</a>.</p>\n"
+"<p>Pomocną może też się okazać archiwum listy dyskusyjnej <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal lista dyskusyjna Użytkowników\" target=\"_blank\">.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-msgstr ""
-"<h1>Zaloguj się</h1><p>Aby uzyskać dostęp do %s powinieneś zalogować się swoją nazwą użytkownika i "
-"hasłem.</p><p>Jeśli chcesz uzyskać dostęp, wyślij e-mail do %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
+msgstr ""
+"<h1>Zaloguj się</h1><p>Aby uzyskać dostęp do %s powinieneś zalogować się "
+"swoją nazwą użytkownika i hasłem.</p><p>Jeśli chcesz uzyskać dostęp, wyślij "
+"e-mail do %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -106,16 +118,16 @@
 msgstr "Zbiór już istnieje w tej lokalizacji."
 
 msgid "A resource already exists at the destination."
-msgstr ""
+msgstr "Zasób już istnieje w lokalizacji docelowej."
 
 msgid "AWL Library version "
-msgstr ""
+msgstr "Wersja biblioteki AWL "
 
 msgid "Access Tickets"
-msgstr ""
+msgstr "Możliwość dostępu"
 
 msgid "Access ticket deleted"
-msgstr ""
+msgstr "Możliwość dostępu została usunięta"
 
 msgid "Action"
 msgstr "Akcja"
@@ -137,43 +149,52 @@
 msgstr "Administrator"
 
 msgid "All"
-msgstr ""
+msgstr "Wszystko"
 
 msgid "All collection data will be unrecoverably deleted."
+msgstr "Wszystkie dane kolekcji zostaną nieodwracalnie usunięte."
+
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
 msgstr ""
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
-msgstr ""
+msgstr "Wszystkie uprawnienia"
 
 msgid "All requested changes were made."
 msgstr "Wszystkie zażądane zmiany zostały wprowadzone"
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
+"Zezwól na pytania free/busy skierowane do właściciela tej skrzynki "
+"harmonogramu"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
-msgstr ""
+msgstr "Użytkownik \"Administrator\" ma pełne prawa do całego systemu DAViCal"
 
 msgid "Anonymous users are not allowed to modify calendars"
-msgstr ""
+msgstr "Użytkownicy anonimowi nie mają pozwolenia na modyfikację kalendarzy"
 
 msgid "Anonymous users may only access public calendars"
 msgstr ""
+"Użytkownicy anonimowi mogą uzyskać dostęp tylko do publicznych kalendarzy"
 
 msgid "Application DB User"
 msgstr ""
 
 msgid "Apply Changes"
-msgstr ""
+msgstr "Zatwierdź zmiany"
 
 msgid "Apply DB Patches"
 msgstr ""
 
 msgid "Attachment"
-msgstr ""
+msgstr "Załącznik"
 
 msgid "Binding deleted"
 msgstr ""
@@ -187,6 +208,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -204,16 +228,16 @@
 msgstr ""
 
 msgid "Calendar Timezone"
-msgstr ""
+msgstr "Strefa czasowa kalendarza"
 
 msgid "Can only add tickets for existing collection paths which you own"
 msgstr ""
 
 msgid "Categories"
-msgstr ""
+msgstr "Kategorie"
 
 msgid "Change Password"
-msgstr ""
+msgstr "Zmień hasło"
 
 msgid "Click to display user details"
 msgstr "Kliknij aby wyświetlić dane użytkownika"
@@ -222,25 +246,27 @@
 msgstr ""
 
 msgid "Collection"
-msgstr ""
+msgstr "Kolekcja"
 
 msgid "Collection Grants"
-msgstr ""
+msgstr "Prawa kolekcji"
 
 msgid "Collection ID"
-msgstr ""
+msgstr "ID kolekcji"
 
 msgid "Collection deleted"
-msgstr ""
+msgstr "Kolekcja została usunięta"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
-msgstr ""
+msgstr "Konfiguracja klientów kalendarza dla DAViCal"
 
 msgid "Configuring DAViCal"
-msgstr ""
+msgstr "Konfiguracja DAViCal"
 
 msgid "Confirm"
 msgstr "Potwierdź"
@@ -249,7 +275,7 @@
 msgstr ""
 
 msgid "Confirm Deletion of the Collection"
-msgstr ""
+msgstr "Potwierdź usunięcie kolekcji"
 
 msgid "Confirm Deletion of the Principal"
 msgstr ""
@@ -258,7 +284,7 @@
 msgstr ""
 
 msgid "Confirm Password"
-msgstr ""
+msgstr "Potwierdź hasło"
 
 msgid "Confirm the new password."
 msgstr "Potwierdź nowe hasło"
@@ -270,13 +296,13 @@
 msgstr "Utwórz"
 
 msgid "Create Collection"
-msgstr ""
+msgstr "Utwórz kolekcję"
 
 msgid "Create Events/Collections"
-msgstr ""
+msgstr "Utwórz zdarzenia/kolekcje"
 
 msgid "Create New Collection"
-msgstr ""
+msgstr "Utwórz nową kolekcję"
 
 msgid "Create New Principal"
 msgstr ""
@@ -291,7 +317,7 @@
 msgstr ""
 
 msgid "Creating new Collection."
-msgstr ""
+msgstr "Tworzenie nowej kolejcji"
 
 msgid "Creating new Principal record."
 msgstr ""
@@ -300,25 +326,26 @@
 msgstr ""
 
 msgid "Current DAViCal version "
-msgstr ""
+msgstr "Atkualna wersja DAViCal"
 
 msgid "DAV Path"
-msgstr ""
+msgstr "Ścieżka DAV"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
-msgstr ""
+msgstr "DAViCal CalDAV Server"
 
 msgid "DAViCal DB Schema version "
-msgstr ""
+msgstr "Wersja schematu DB DAViCal"
 
 msgid "DAViCal Homepage"
-msgstr ""
+msgstr "Strona główna DAViCal"
 
 msgid "DAViCal Wiki"
-msgstr ""
+msgstr "DAViCal Wiki"
 
 msgid "DAViCal only allows BIND requests for collections at present."
 msgstr ""
@@ -345,34 +372,34 @@
 msgstr "Błąd bazy danych"
 
 msgid "Database Host"
-msgstr ""
+msgstr "Host bazy danych"
 
 msgid "Database Name"
-msgstr ""
+msgstr "Nazwa bazy danych"
 
 msgid "Database Owner"
-msgstr ""
+msgstr "Właściciel bazy danych"
 
 msgid "Database Password"
-msgstr ""
+msgstr "Hasło bazy danych"
 
 msgid "Database Port"
-msgstr ""
+msgstr "Port bazy danych"
 
 msgid "Database Username"
-msgstr ""
+msgstr "Nazwa użytkownika bazy danych"
 
 msgid "Database error"
 msgstr "Błąd bazy danych"
 
 msgid "Date Format Style"
-msgstr ""
+msgstr "Styl formatowania daty"
 
 msgid "Date Style"
 msgstr "Format daty"
 
 msgid "Default Privileges"
-msgstr ""
+msgstr "Domyślne uprawnienia"
 
 msgid "Default relationships added."
 msgstr ""
@@ -404,7 +431,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -444,25 +472,31 @@
 msgstr ""
 
 msgid "ERROR: The new password must match the confirmed password."
-msgstr ""
+msgstr "ERROR: Podane hasła nie pasują do siebie"
 
 msgid "ERROR: There was a database error writing the roles information!"
-msgstr "Błąd: Wystąpił błąd bazy danych podczas zapisywania informacji o roli."
+msgstr ""
+"Błąd: Wystąpił błąd bazy danych podczas zapisywania informacji o roli."
 
 msgid "Edit"
-msgstr ""
+msgstr "Edytuj"
 
 msgid "Edit this user record"
 msgstr "Zmień dane tego użytkownika "
 
 msgid "Email Address"
-msgstr ""
+msgstr "Adres Email"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-msgstr "Wpisz nazwę użytkownika (jeśli ją znasz) i naciśnij tutaj aby otrzymać emailem tymczasowe hasło."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
+msgstr ""
+"Wpisz nazwę użytkownika (jeśli ją znasz) i naciśnij tutaj aby otrzymać "
+"emailem tymczasowe hasło."
 
 msgid "Enter your username and password then click here to log in."
-msgstr "Wpisz nazwę użytkownika oraz hasło i naciśnij tutaj aby się zalogować."
+msgstr ""
+"Wpisz nazwę użytkownika oraz hasło i naciśnij tutaj aby się zalogować."
 
 #, php-format
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
@@ -482,7 +516,7 @@
 msgstr ""
 
 msgid "European"
-msgstr ""
+msgstr "Europejski"
 
 msgid "European (d/m/y)"
 msgstr "Europejski (d/m/r)"
@@ -494,6 +528,12 @@
 msgstr ""
 
 msgid "Expires"
+msgstr "Wygasa"
+
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
 msgstr ""
 
 msgid "Fail"
@@ -509,16 +549,16 @@
 msgstr "Aby uzyskać dostęp do"
 
 msgid "Forbidden"
-msgstr ""
+msgstr "Zabronione"
 
 msgid "Free/Busy"
-msgstr ""
+msgstr "Free/Busy"
 
 msgid "Full Name"
 msgstr "Imię i nazwisko"
 
 msgid "Fullname"
-msgstr ""
+msgstr "Pełna nazwa"
 
 msgid "GET requests on collections are only supported for calendars."
 msgstr ""
@@ -543,16 +583,16 @@
 msgstr "Grupa"
 
 msgid "Group Members"
-msgstr ""
+msgstr "Członkowie grupy"
 
 msgid "Group Memberships"
-msgstr ""
+msgstr "Członkostwo grupy"
 
 msgid "Group Principals"
 msgstr ""
 
 msgid "Has Members"
-msgstr ""
+msgstr "Ma członków"
 
 msgid "Help"
 msgstr "Pomoc"
@@ -567,7 +607,7 @@
 msgstr "Początek"
 
 msgid "Home Page"
-msgstr ""
+msgstr "Strona główna"
 
 msgid "Home addressbook added."
 msgstr ""
@@ -582,10 +622,10 @@
 msgstr ""
 
 msgid "ID"
-msgstr ""
+msgstr "ID"
 
 msgid "ISO Format"
-msgstr ""
+msgstr "Format ICS"
 
 msgid "ISO Format (YYYY-MM-DD)"
 msgstr "ISO (RRRR-MM-DD)"
@@ -601,7 +641,7 @@
 msgstr "Jeśli chcesz poprosić o dostęp, wyślij e-mail do"
 
 msgid "Import all .ics files of a directory"
-msgstr ""
+msgstr "Importuj wszystkie pliki ICS z katalogu"
 
 msgid "Import calendars and Synchronise LDAP."
 msgstr ""
@@ -622,13 +662,13 @@
 msgstr "Błędna nazwa użytkownika lub hasło"
 
 msgid "Is Member of"
-msgstr ""
+msgstr "Jest członkiem"
 
 msgid "Is a Calendar"
-msgstr ""
+msgstr "Jest kalendarzem"
 
 msgid "Is an Addressbook"
-msgstr ""
+msgstr "Jest książką adresową"
 
 msgid "Is this user active?"
 msgstr "Aktywny użytkownik?"
@@ -645,6 +685,9 @@
 msgid "Last used"
 msgstr "Ostatnio używany"
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr ""
 
@@ -661,13 +704,13 @@
 msgstr ""
 
 msgid "Location"
-msgstr ""
+msgstr "Lokalizacja"
 
 msgid "Log On Please"
 msgstr "Proszę się zalogować"
 
 msgid "Log out of DAViCal"
-msgstr ""
+msgstr "Wyloguj z DAViCal"
 
 msgid "Logout"
 msgstr "Wyloguj się"
@@ -675,14 +718,16 @@
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
 msgstr "Nazwa"
 
 msgid "New Collection"
-msgstr ""
+msgstr "Nowa kolekcja"
 
 msgid "New Password"
 msgstr "Nowe hasło"
@@ -692,10 +737,7 @@
 
 #. Translators: not 'Yes'
 msgid "No"
-msgstr ""
-
-msgid "No authority to deliver invitations to user."
-msgstr ""
+msgstr "Nie"
 
 msgid "No calendar content"
 msgstr ""
@@ -703,9 +745,6 @@
 msgid "No collection found at that location."
 msgstr "Nie znaleziono zbioru w lokalizacji"
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -714,7 +753,7 @@
 msgstr "Nr"
 
 msgid "No. of Collections"
-msgstr ""
+msgstr "Nr. kolekcji"
 
 msgid "No. of Principals"
 msgstr ""
@@ -749,16 +788,23 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr ""
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -812,6 +858,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr "Właściwość tylko do odczytu"
 
@@ -846,7 +898,8 @@
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -855,12 +908,18 @@
 msgid "Read/Write"
 msgstr ""
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Zgłoś błąd"
 
@@ -873,7 +932,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Zasób"
 
@@ -901,9 +961,6 @@
 msgid "Schedule Transparency"
 msgstr ""
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr ""
 
@@ -931,10 +988,14 @@
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -946,10 +1007,9 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
-msgstr ""
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -976,7 +1036,8 @@
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -995,7 +1056,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1019,7 +1080,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1028,7 +1090,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1044,10 +1107,13 @@
 msgstr "Ścieżka kalendarza zawiera nieakceptowalne znaki."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1056,13 +1122,19 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1080,6 +1152,10 @@
 msgid "The preferred language for this person."
 msgstr "Preferowany język."
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr "Format daty używany przez tego użytkownika."
 
@@ -1102,22 +1178,32 @@
 msgstr "Wystąpił błąd zapisu do bazy danych."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1127,7 +1213,7 @@
 msgstr ""
 
 msgid "Time"
-msgstr ""
+msgstr "Czas"
 
 msgid "To Collection"
 msgstr ""
@@ -1145,7 +1231,7 @@
 msgstr ""
 
 msgid "URL"
-msgstr ""
+msgstr "URL"
 
 msgid "US Format"
 msgstr ""
@@ -1180,7 +1266,9 @@
 msgid "Upgrade Database"
 msgstr ""
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
 
 msgid "User Calendar Principals"
@@ -1221,11 +1309,11 @@
 
 #, php-format
 msgid "Want: %s, Currently: %s"
-msgstr ""
+msgstr "Potrzebuje: %s, Aktualnie: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1253,19 +1341,19 @@
 msgstr ""
 
 msgid "Yes"
-msgstr ""
+msgstr "Tak"
 
 msgid "You are editing"
-msgstr ""
+msgstr "Edytujesz"
 
 msgid "You are not authorised to use this function."
 msgstr "Nie masz uprawnień aby użyć tej funkcji."
 
 msgid "You are viewing"
-msgstr ""
+msgstr "Przeglądasz"
 
 msgid "You do not have permission to modify this record."
-msgstr ""
+msgstr "Nie posiadasz uprawnień do edycji tych danych"
 
 msgid "You may not PUT to a collection URL"
 msgstr ""
@@ -1274,53 +1362,57 @@
 msgstr "Musisz się zalogować."
 
 msgid "Your configuration produced PHP errors which should be corrected"
-msgstr ""
-
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr ""
+msgstr "Twoja konfiguracja powoduje błędy PHP, które należy poprawić"
 
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
 #, php-format
 msgid "directory %s is not readable"
-msgstr ""
+msgstr "Katalog %s nie jest do odczytu"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
+"drivers_ldap: Nie można uruchomić TLS: ldap_start_tls() spowodowało błąd"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr ""
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
-msgstr ""
+msgstr "drivers_pwauth_pam: Nie można odnaleźć pliku %s "
 
 #, php-format
 msgid "drivers_squid_pam : Unable to find %s file"
-msgstr ""
+msgstr "drivers_squid_pam: Nie można odnaleźć pliku %s "
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "zapamiętaj mnie"
 
@@ -1330,12 +1422,12 @@
 msgid "path to store your ics"
 msgstr ""
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr ""
-
 msgid "unauthenticated"
 msgstr ""
 
-msgid "you should log on with the username and password that have been issued to you."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr "powinieneś zalogować się swoją nazwą użytkownika i hasłem."
+
+
diff -Nru davical-0.9.9.7/po/pt_BR.po davical-1.0.2/po/pt_BR.po
--- davical-0.9.9.7/po/pt_BR.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/pt_BR.po	2012-01-04 23:04:06.000000000 +0000
@@ -1,27 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 #   <aagaio@linwork.com.br>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-08-04 14:25+0000\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-21 05:03+0000\n"
 "Last-Translator: aagaio <aagaio@linwork.com.br>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/davical/team/pt_BR/)\n"
-"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -71,43 +74,49 @@
 msgid "- updating user records : %s"
 msgstr "- Atualizando o registro do usuário: %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
-"<b>ATENÇÃO: todos os eventos neste caminho serão removidos antes de inserir o arquivo allof ics</b>"
+"<b>ATENÇÃO: todos os eventos neste caminho serão removidos antes de inserir "
+"o arquivo allof ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
-"<h1> Ajuda </h1><p>Para obter ajuda inicial você deve visitar a <a href=\"http://www.davical.org/\" "
-"target=\"_blank\">Página Inicial do projeto DAViCal</a> ou dar uma olhada no <a href=\"http://wiki."
-"davical.org/%s\" target=\"_blank\">Wiki do DAViCal</a> . </p><p> Se você não consegue encontrar as "
-"respostas lá, visite-nos no <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank"
-"\">IRC</a> canal <b>#davical</b> em <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</"
-"a> , ou envie uma pergunta para a <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-"
-"general\" target=\"_blank\">Lista de discussão dos usuários do DAViCal</a> . </p><p> Os arquivos da<a "
-"href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"Lista de discussão dos "
-"usuários do DAViCal\" target=\"_blank\">podem ser muito úteis.</a> </p>"
+"<h1> Ajuda </h1><p>Para obter ajuda inicial você deve visitar a <a "
+"href=\"http://www.davical.org/\" target=\"_blank\">Página Inicial do projeto"
+" DAViCal</a> ou dar uma olhada no <a href=\"http://wiki.davical.org/%s\" "
+"target=\"_blank\">Wiki do DAViCal</a> . </p><p> Se você não consegue "
+"encontrar as respostas lá, visite-nos no <a "
+"href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" "
+"target=\"_blank\">IRC</a> canal <b>#davical</b> em <a "
+"href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a> , ou envie "
+"uma pergunta para a <a href=\"http://lists.sourceforge.net/mailman/listinfo"
+"/davical-general\" target=\"_blank\">Lista de discussão dos usuários do "
+"DAViCal</a> . </p><p> Os arquivos da<a "
+"href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" "
+"title=\"Lista de discussão dos usuários do DAViCal\" target=\"_blank\">podem"
+" ser muito úteis.</a> </p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-msgstr ""
-"<h1> Por favor, Registre-se no sistema</h1><p> Para o acesso ao %s você deve registrar-se com o nome "
-"de usuário e senha que foram emitidos para você. </p><p> Se você gostaria de solicitar o acesso, envie "
-"um e-mail para %s. </p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
+msgstr ""
+"<h1> Por favor, Registre-se no sistema</h1><p> Para o acesso ao %s você deve"
+" registrar-se com o nome de usuário e senha que foram emitidos para você. "
+"</p><p> Se você gostaria de solicitar o acesso, envie um e-mail para %s. "
+"</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Uma coleção principal do DAViCal só pode conter coleções"
@@ -152,8 +161,17 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "Todo conjunto de dados serão apagados de forma irrecuperável."
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
-msgstr "Todos os calendários do diretor e eventos serão apagados de forma irrecuperável."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+"Todos os eventos do usuário \"%s\" foram removidos e substituídos pelos do "
+"arquivo %s"
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
+msgstr ""
+"Todos os calendários do diretor e eventos serão apagados de forma "
+"irrecuperável."
 
 msgid "All privileges"
 msgstr "Todos os privilégios"
@@ -161,8 +179,11 @@
 msgid "All requested changes were made."
 msgstr "Todas as alterações solicitadas foram realizadas."
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
-msgstr "Permitir verificações livre / ocupado destinadas ao proprietário deste agendamento"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgstr ""
+"Permitir verificações livre / ocupado destinadas ao proprietário deste "
+"agendamento"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
 msgstr "Um usuário \"Administrador\" tem todos os direitos para o Sistema DAViCal"
@@ -197,6 +218,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr "Ligações para este Coleção do principal"
 
+msgid "Body contains no XML data!"
+msgstr "O Corpo não contém dados XML!"
+
 msgid "Bound As"
 msgstr "Ligado como"
 
@@ -217,7 +241,9 @@
 msgstr "Fuso horário do calendário"
 
 msgid "Can only add tickets for existing collection paths which you own"
-msgstr "Só é possível adicionar tickets para os caminhos de coleção existentes e que você possui"
+msgstr ""
+"Só é possível adicionar tickets para os caminhos de coleção existentes e que"
+" você possui"
 
 msgid "Categories"
 msgstr "Categorias"
@@ -243,8 +269,12 @@
 msgid "Collection deleted"
 msgstr "Coleção excluída"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
-msgstr "Coleções não podem ser ambos os calendários CalDAV e addressbooks CardDAV ao mesmo tempo"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
+msgstr ""
+"Coleções não podem ser ambos os calendários CalDAV e addressbooks CardDAV ao"
+" mesmo tempo"
 
 msgid "Configuring Calendar Clients for DAViCal"
 msgstr "Configurando os clientes de Calendário para DAViCal"
@@ -295,7 +325,8 @@
 msgstr "Criar Principal"
 
 msgid "Create a new principal (i.e. a new user, resource or group)"
-msgstr "Criar um novo principal (ou seja um novo usuário de recursos, ou grupo)"
+msgstr ""
+"Criar um novo principal (ou seja um novo usuário de recursos, ou grupo)"
 
 msgid "Create a resource or collection"
 msgstr "Criar um recurso ou coleção"
@@ -315,8 +346,11 @@
 msgid "DAV Path"
 msgstr "Caminho DAV"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-msgstr "DAV:: resourcetype só pode ser definido como um valor novo, não pode ser removido."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
+msgstr ""
+"DAV:: resourcetype só pode ser definido como um valor novo, não pode ser "
+"removido."
 
 msgid "DAViCal CalDAV Server"
 msgstr "Servidor DAViCal CalDAV"
@@ -349,7 +383,8 @@
 msgstr "validação da assinatura DKIM falhou (Erro de validação KEY)"
 
 msgid "DKIM signature validation failed(Signature verification ERROR)"
-msgstr "validação da assinatura DKIM falhou (erro de verificação de assinatura)"
+msgstr ""
+"validação da assinatura DKIM falhou (erro de verificação de assinatura)"
 
 msgid "Database Error"
 msgstr "Erro de banco de dados"
@@ -385,7 +420,7 @@
 msgstr "Privilégios padrão"
 
 msgid "Default relationships added."
-msgstr ""
+msgstr "Relacionamentos padrão adicionados."
 
 msgid "Delete"
 msgstr "Excluir"
@@ -414,11 +449,16 @@
 msgid "Deleting Ticket:"
 msgstr "Exclusão de Ticket:"
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-msgstr "Entregar convites agendados de um organizador para esta caixa de entrada de agendamento"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgstr ""
+"Entregar convites agendados de um organizador para esta caixa de entrada de "
+"agendamento"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
-msgstr "Entregar respostas de agendamento de um participante a esta caixa de entrada de agendamento"
+msgstr ""
+"Entregar respostas de agendamento de um participante a esta caixa de entrada"
+" de agendamento"
 
 msgid "Dependencies"
 msgstr "Dependências"
@@ -457,7 +497,8 @@
 msgstr "ERRO: A nova senha deve corresponder à senha confirmada."
 
 msgid "ERROR: There was a database error writing the roles information!"
-msgstr "ERRO: Houve um erro de banco de dados ao gravar as informações de regras!"
+msgstr ""
+"ERRO: Houve um erro de banco de dados ao gravar as informações de regras!"
 
 msgid "Edit"
 msgstr "Editar"
@@ -468,10 +509,12 @@
 msgid "Email Address"
 msgstr "Endereço de e-mail"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
-"Digite um nome de usuário, se você conhecer, e clique aqui, para ser enviada por e-mail uma senha "
-"temporária."
+"Digite um nome de usuário, se você conhecer, e clique aqui, para ser enviada"
+" por e-mail uma senha temporária."
 
 msgid "Enter your username and password then click here to log in."
 msgstr "Digite seu nome de usuário e senha, clique aqui para entrar"
@@ -500,7 +543,8 @@
 msgstr "Europeu (d / m / y)"
 
 msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Recurso existente não corresponde ao cabeçalho \"If-Match\"  - não aceito."
+msgstr ""
+"Recurso existente não corresponde ao cabeçalho \"If-Match\"  - não aceito."
 
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
 msgstr "Recurso existente no cabeçalho \"If-None-Match\" - não aceito."
@@ -508,6 +552,12 @@
 msgid "Expires"
 msgstr "Expira"
 
+msgid "External Calendars"
+msgstr "Calendários externos"
+
+msgid "External Url"
+msgstr "Url externa"
+
 msgid "Fail"
 msgstr "Falha"
 
@@ -657,6 +707,9 @@
 msgid "Last used"
 msgstr "Usado pela última vez"
 
+msgid "List External Calendars"
+msgstr "Lista de Calendários Externos"
+
 msgid "List Groups"
 msgstr "Listar grupos"
 
@@ -687,10 +740,12 @@
 msgid "Member deleted from this Group Principal"
 msgstr "Membro excluídos deste Grupo principal"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
-"A maior parte do DAViCal funcionará, mas a atualização para PHP 5.2 ou posterior é fortemente "
-"recomendado."
+"A maior parte do DAViCal funcionará, mas a atualização para PHP 5.2 ou "
+"posterior é fortemente recomendado."
 
 msgid "Name"
 msgstr "Nome"
@@ -708,18 +763,12 @@
 msgid "No"
 msgstr "Não"
 
-msgid "No authority to deliver invitations to user."
-msgstr "Nenhuma autoridade para entregar convites para o usuário."
-
 msgid "No calendar content"
 msgstr "Nenhum conteúdo de calendário"
 
 msgid "No collection found at that location."
 msgstr "Nenhuma coleção encontrada no local."
 
-msgid "No scheduling support for user"
-msgstr "Não há suporte para o agendamento do usuário"
-
 msgid "No summary"
 msgstr "Sem resumo"
 
@@ -763,18 +812,28 @@
 msgid "PHP PDO module available"
 msgstr "Módulo do PHP PDO disponível"
 
-msgid "PHP PostgreSQL available"
-msgstr "PHP PostgreSQL disponível"
-
 msgid "PHP calendar extension available"
-msgstr ""
+msgstr "Extensão PHP calendar disponível"
 
 msgid "PHP iconv support"
 msgstr "Suporte a PHP iconv"
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr "O PHP não está usando o modo de filtragem do Apache"
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+"Colocar em uma coleção só é permitido para texto / conteúdo do calendário em"
+" uma coleção de calendário"
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
-"Colocar em uma coleção só é permitido para texto / conteúdo do calendário em uma coleção de calendário"
+"PUT em uma coleção só é permitido para conteúdos do tipo texto/vcard contra "
+"uma coleção de endereços"
 
 msgid "Passed"
 msgstr "Passou"
@@ -827,6 +886,12 @@
 msgid "Privileges granted to All Users"
 msgstr "Privilégios concedidos a todos os usuários"
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr "Privilégios para permitir a entrega de mensagens de agendamento"
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr "Privilégios para delegar as decisões de agendamento"
+
 msgid "Property is read-only"
 msgstr "Propriedade é somente leitura"
 
@@ -861,8 +926,10 @@
 msgid "Read the content of a resource or collection"
 msgstr "Ler o conteúdo de um recurso ou coleção"
 
-msgid "Read the details of the current user's access control to this resource."
-msgstr "Ler os detalhes de controle de acesso deste recurso para o usuário atual"
+msgid ""
+"Read the details of the current user's access control to this resource."
+msgstr ""
+"Ler os detalhes de controle de acesso deste recurso para o usuário atual"
 
 msgid "Read the free/busy information for a calendar collection"
 msgstr "Ler as informações livre/ocupado para uma coleção de calendário"
@@ -870,12 +937,18 @@
 msgid "Read/Write"
 msgstr "Ler/Gravar"
 
+msgid "References"
+msgstr "Referências"
+
 msgid "Remove"
 msgstr "Remover"
 
 msgid "Remove a lock"
 msgstr "Remover um bloqueio"
 
+msgid "Remove dangling external calendars"
+msgstr "Remover calendários externos pendentes"
+
 msgid "Report Bug"
 msgstr "Relatório de Falhas"
 
@@ -888,7 +961,8 @@
 msgid "Request body is not valid XML data!"
 msgstr "Corpo da requisição não é um dado XML válido!"
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -916,9 +990,6 @@
 msgid "Schedule Transparency"
 msgstr "Transparência da agenda"
 
-msgid "Scheduling invitation delivered successfully"
-msgstr "Convite de agendamento entregue com sucesso"
-
 msgid "Scheduling: Deliver a Reply"
 msgstr "Agendamento: Entregar uma Resposta"
 
@@ -946,14 +1017,19 @@
 msgid "Send free/busy enquiries"
 msgstr "Enviar solicitação de livre/ocupado"
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
-"Enviar convites de agendamento como um organizador do proprietário desta caixa de saída de agendamento."
+"Enviar convites de agendamento como um organizador do proprietário desta "
+"caixa de saída de agendamento."
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
-"Enviar respostas de agendamento como um participante do proprietário desta caixa de saída de "
-"agendamento."
+"Enviar respostas de agendamento como um participante do proprietário desta "
+"caixa de saída de agendamento."
 
 msgid "Set free/busy privileges"
 msgstr "Definir privilégios de Livre/Ocupado"
@@ -964,13 +1040,12 @@
 msgid "Set read+write privileges"
 msgstr "Definir privilégios de leitura+gravação"
 
-msgid "Set schedule-deliver privileges"
-msgstr "Definir privilégios de entrega de agendamento"
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
-"Definir o caminho para armazenar ics,  por exemplo, \"home\" será referenciado como /caldav.php/me/"
-"home/"
+"Definir o caminho para armazenar seu ics, por exemplo 'calendar' será "
+"referenciado como caldav.php/username/calendar/"
 
 msgid "Setup"
 msgstr "Configuração"
@@ -985,7 +1060,8 @@
 msgstr "Estatísticas do site"
 
 msgid "Site Statistics require the database to be available!"
-msgstr "Estatísticas do site requerem o banco de dados para estarem disponíveis!"
+msgstr ""
+"Estatísticas do site requerem o banco de dados para estarem disponíveis!"
 
 msgid "Some properties were not able to be changed."
 msgstr "Algumas propriedades não puderam ser alteradas."
@@ -996,8 +1072,10 @@
 msgid "Source resource does not exist."
 msgstr "Recursos de origem não existem."
 
-msgid "Special collections may not contain a calendar or other special collection."
-msgstr "Coleções especiais não podem conter um calendário ou outra coleção especial."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
+msgstr ""
+"Coleções especiais não podem conter um calendário ou outra coleção especial."
 
 msgid "Specific Privileges"
 msgstr "Privilégios específicos"
@@ -1015,8 +1093,8 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr "Suhosin \"server.strip\" desabilitado"
 
-msgid "Sync LDAP Groups with RSCDS"
-msgstr "Sincronização de grupos LDAP com o RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
+msgstr "Sincronizar Grupos LDAP com DAViCal"
 
 msgid "Sync LDAP with DAViCal"
 msgstr "Sincronizar o LDAP com DAViCal"
@@ -1039,8 +1117,11 @@
 msgid "The BIND method is not allowed at that location."
 msgstr "O método BIND não é permitido naquele local."
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-msgstr "O CalDAV: a propriedade schedule-calendar-transp pode ser definida apenas em calendários."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgstr ""
+"O CalDAV: a propriedade schedule-calendar-transp pode ser definida apenas em"
+" calendários."
 
 msgid "The DAViCal Home Page"
 msgstr "A Home Page do DAViCal"
@@ -1048,11 +1129,16 @@
 msgid "The access ticket will be deleted."
 msgstr "O bilhete de acesso será apagado."
 
-msgid "The addressbook-query report must be run against an addressbook collection"
-msgstr "O relatório de endereços de consulta deve ser executado em uma coleção de endereços"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
+msgstr ""
+"O relatório de endereços de consulta deve ser executado em uma coleção de "
+"endereços"
 
 msgid "The application failed to understand that request."
 msgstr ""
+"O aplicativo não conseguiu entender esta requisição\n"
+"."
 
 msgid "The application program does not understand that request."
 msgstr "O programa da aplicação não entende esta requisição."
@@ -1064,14 +1150,18 @@
 msgstr "O caminho do calendário contém caracteres ilegais."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
-"O calendar-free-busy-set é substituída pela propriedade schedule-transp de uma coleção de calendário."
+"O calendar-free-busy-set é substituída pela propriedade schedule-transp de "
+"uma coleção de calendário."
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
-"O relatório do calendário de consulta deve ser executado em um calendário ou em uma coleção de "
-"calendário"
+"O relatório do calendário de consulta deve ser executado em um calendário ou"
+" em uma coleção de calendário"
 
 msgid "The collection name may not be blank."
 msgstr "O nome da coleção não pode ficar em branco."
@@ -1079,14 +1169,25 @@
 msgid "The destination collection does not exist"
 msgstr "A coleção de destino não existe"
 
-msgid "The displayname may only be set on collections, principals or bindings."
-msgstr "O displayname só pode ser definido em coleções, diretores ou ligações."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
+msgstr ""
+"O displayname só pode ser definido em coleções, diretores ou ligações."
 
 msgid "The email address really should not be blank."
 msgstr "O endereço de e-mail realmente não deve ficar em branco."
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
-msgstr "O arquivo não é codificado UTF-8, por favor, verifique o erro para mais detalhes."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+"O arquivo \"%s\" não está codificado em UTF-8, por favor verifique o log de "
+"erros para mais detalhes"
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
+"O arquivo não é codificado UTF-8, por favor, verifique o erro para mais "
+"detalhes."
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "O nome completo para essa pessoa, grupo ou outro tipo de principal."
@@ -1103,6 +1204,10 @@
 msgid "The preferred language for this person."
 msgstr "O idioma preferido para essa pessoa."
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr "O principal \"%s\" não existe"
+
 msgid "The style of dates used for this person."
 msgstr "O estilo de datas utilizadas para essa pessoa."
 
@@ -1116,7 +1221,8 @@
 msgstr "A senha do usuário para entrada no sistema"
 
 msgid "The username must not be blank, and may not contain a slash"
-msgstr "O nome de usuário não deve ficar em branco, e não pode conter uma barra"
+msgstr ""
+"O nome de usuário não deve ficar em branco, e não pode conter uma barra"
 
 msgid "There was an error reading from the database."
 msgstr "Houve um erro de leitura do banco de dados."
@@ -1125,38 +1231,59 @@
 msgstr "Houve um erro ao gravar no banco de dados."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
-"Esta operação faz o seguinte:<ul><li>verifica grupos válidos no diretório LDAP</li><li>verifica os "
-"grupos no DAViCal</li></ul>então<ul><li>se um grupo está presente no DAViCal, mas não está presente no "
-"LDAP, o mesmo será ajustado como inativo no DAViCal</li><li>se um grupo está presente no LDAP, mas não "
-"está no DAViCal, o mesmo será criado no DAViCal</li><li> se um grupo está presente no LDAP e no "
-"DAViCal, então, suas informações serão atualizadas no DAViCal</li></ul>"
-
-msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
-"Esta operação faz o seguinte:<ul><li> verifica os usuários válidos no diretório LDAP</li><li>verifica "
-"usuários no DAViCal</li></ul>,então,<ul><li>se um usuário está presente no DAViCal, mas não está "
-"presente no LDAP, o mesmo será colocado como inativo no DAViCal</li><li>se um usuário está presente no "
-"LDAP, mas não está presente no DAViCal, o mesmo será criado no DAViCal</li><li> se um usuário estiver "
-"presente no LDAP e presente no DAViCal, então suas informações serão atualizadas no DAViCal</li></ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Esta operação faz o seguinte:<ul><li>verifica grupos válidos no diretório "
+"LDAP</li><li>verifica os grupos no DAViCal</li></ul>então<ul><li>se um grupo"
+" está presente no DAViCal, mas não está presente no LDAP, o mesmo será "
+"ajustado como inativo no DAViCal</li><li>se um grupo está presente no LDAP, "
+"mas não está no DAViCal, o mesmo será criado no DAViCal</li><li> se um grupo"
+" está presente no LDAP e no DAViCal, então, suas informações serão "
+"atualizadas no DAViCal</li></ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Esta operação faz o seguinte:<ul><li> verifica os usuários válidos no "
+"diretório LDAP</li><li>verifica usuários no "
+"DAViCal</li></ul>,então,<ul><li>se um usuário está presente no DAViCal, mas "
+"não está presente no LDAP, o mesmo será colocado como inativo no "
+"DAViCal</li><li>se um usuário está presente no LDAP, mas não está presente "
+"no DAViCal, o mesmo será criado no DAViCal</li><li> se um usuário estiver "
+"presente no LDAP e presente no DAViCal, então suas informações serão "
+"atualizadas no DAViCal</li></ul>"
+
+msgid ""
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
+msgstr ""
+"Esta página primeiramente verifica o ambiente necessário para o DAViCal "
+"funcionar corretamente. Sugestões ou correções para novas funcionalidades "
+"serão gratamente recebidas."
+
+msgid ""
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
-"Esta página primeiramente verifica o ambiente necessário para o DAViCal funcionar corretamente. "
-"Sugestões ou correções para novas funcionalidades serão gratamente recebidas."
+"Este processo irá importar cada arquivo em um diretório chamado "
+"\"username.ics\" e criar um usuário e um calendário para cada arquivo a ser "
+"importado."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
-msgstr "Este servidor só suporta o formato de texto/calendário para URLs livre/ocupado"
+msgstr ""
+"Este servidor só suporta o formato de texto/calendário para URLs "
+"livre/ocupado"
 
 msgid "Ticket ID"
 msgstr "ID do Ticket"
@@ -1215,10 +1342,12 @@
 msgid "Upgrade Database"
 msgstr "Atualização do Banco de dados"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
-"Carregar um arquivo de calendário .ics no formato iCalendar para inicializar ou substituir este "
-"calendário."
+"Carregar um arquivo de calendário .ics no formato iCalendar para inicializar"
+" ou substituir este calendário."
 
 msgid "User Calendar Principals"
 msgstr "Gerente de calendário de usuários"
@@ -1261,11 +1390,11 @@
 msgstr "Deve ser: %s, Atualmente: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
-"Atenção: não há usuários administradores ativos! Você deve corrigir isso antes de sair. Considere usar "
-"a configuração $c->do_not_sync_from_ldap."
+"Atenção: não há usuários administradores ativos! Você deve corrigir isso "
+"antes de sair. Considere usar a configuração $c->do_not_sync_from_ldap."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Quando a conta de email do usuário foi validada."
@@ -1315,44 +1444,53 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr "Sua configuração possui erros de PHP que devem ser corrigido"
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "todos os eventos do usuário %s foram excluídos e substituídos por outros do arquivo %s"
-
 msgid "calendar-timezone property is only valid for a calendar."
-msgstr "a propriedade de fuso horário de calendário, só é válida para um calendário."
+msgstr ""
+"a propriedade de fuso horário de calendário, só é válida para um calendário."
 
 #, php-format
 msgid "directory %s is not readable"
 msgstr "diretório %s não é legível"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_imap_pam: parâmetro imap_url não configurado em /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
+msgstr ""
+"drivers_imap_pam: parâmetro imap_url não configurado em "
+"/etc/davical/*-conf.php"
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap: Não foi possível iniciar TLS: ldap_start_tls () falhou"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-msgstr "drivers_ldap: Falha ao conectar ao host %1$s na porta %2$s com binddn %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap: Falha ao conectar ao host %1$s na porta %2$s com binddn %3$s"
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
-"drivers_ldap: Falha ao tentar acessar a base LDAP utilizando a versão 3 do protocolo, TLS não suportado"
+"drivers_ldap: Falha ao tentar acessar a base LDAP utilizando a versão 3 do "
+"protocolo, TLS não suportado"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap: Não é possível conectar à base LDAP - verifique a configuração dos parâmetros bindDN e "
-"passDN, e se o seu servidor LDAP pode ser alcançado"
+"drivers_ldap: Não é possível conectar à base LDAP - verifique a configuração"
+" dos parâmetros bindDN e passDN, e se o seu servidor LDAP pode ser alcançado"
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
-msgstr "drivers_ldap: Não é possível conectar-se à base LDAP na porta %s no host %s"
+msgstr ""
+"drivers_ldap: Não é possível conectar-se à base LDAP na porta %s no host %s"
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-msgstr "drivers_ldap: função ldap_connect não definida, verifique o módulo php_ldap"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
+"drivers_ldap: função ldap_connect não definida, verifique o módulo php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
@@ -1362,7 +1500,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam: Não é possível encontrar o arquivo %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "não esquecer de mim"
 
@@ -1372,12 +1511,14 @@
 msgid "path to store your ics"
 msgstr "caminho para armazenar seu ics"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "O arquivo %s não está codificado com UTF-8, por favor verifique os erros para mais detalhes"
-
 msgid "unauthenticated"
 msgstr "não autenticado"
 
-msgid "you should log on with the username and password that have been issued to you."
-msgstr "você deve fazer logon com o nome de usuário e senha que foram emitidos para você."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
+msgstr ""
+"você deve fazer logon com o nome de usuário e senha que foram emitidos para "
+"você."
+
+
diff -Nru davical-0.9.9.7/po/pt_PT.po davical-1.0.2/po/pt_PT.po
--- davical-0.9.9.7/po/pt_PT.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/pt_PT.po	2012-01-04 23:04:08.000000000 +0000
@@ -1,27 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # m42 <p.m42.ribeiro@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 22:02+0000\n"
-"Last-Translator: m42 <p.m42.ribeiro@gmail.com>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/davical/team/pt_PT/)\n"
-"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr "%F %T"
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr "%T"
 
@@ -71,44 +74,42 @@
 msgid "- updating user records : %s"
 msgstr "- a actualizar registos de utilizador : %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
-msgstr "<b>AVISO: todos os eventos neste caminho serão apagados antes de inserir o ficheiro ics</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
+msgstr ""
+"<b>AVISO: todos os eventos neste caminho serão apagados antes de inserir o "
+"ficheiro ics</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 "<h1>Ajuda</h1>\n"
-"<p>Para ajuda inicial visite a <a href=\"http://www.davical.org/\" target=\"_blank\">Home Page do "
-"DAViCal</a> ou veja \n"
+"<p>Para ajuda inicial visite a <a href=\"http://www.davical.org/\" target=\"_blank\">Home Page do DAViCal</a> ou veja \n"
 "o <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">Wiki DAViCal</a>.</p>\n"
-"<p>Se não encontrar aí as respostas, visite o canal <b>#davical</b> do <a href=\"http://wikipedia.org/"
-"wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> no\n"
+"<p>Se não encontrar aí as respostas, visite o canal <b>#davical</b> do <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> no\n"
 "servidor <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"ou envie uma questão para <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">Lista de correio dos Utilizadores DAViCal</a>.</p>\n"
-"<p>os arquivos da <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title="
-"\"DAViCal Users Mailing List\" target=\"_blank\">lista de correio</a>\n"
+"ou envie uma questão para <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">Lista de correio dos Utilizadores DAViCal</a>.</p>\n"
+"<p>os arquivos da <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">lista de correio</a>\n"
 "também podem ser úteis.</p>"
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
-"<h1>Entre por favor</h1><p>Para aceder ao %s deve entrar com o nome de utilizador e password que lhe "
-"foram atribuídos.</p><p>Se necessitar de pedir acesso, envie um e-mail para %s.</p>"
+"<h1>Entre por favor</h1><p>Para aceder ao %s deve entrar com o nome de "
+"utilizador e password que lhe foram atribuídos.</p><p>Se necessitar de pedir"
+" acesso, envie um e-mail para %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Uma colecção principal do DAViCal só pode conter colecções"
@@ -153,8 +154,17 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "Todos os dados da colecção serão irremediavelmente apagados"
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
-msgstr "Todos os calendários e eventos do principal serão irremediavelmente apagados."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+"Todos os eventos do utilizador \"%s\" foram apagados e substituídos pelos do"
+" ficheiro %s"
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
+msgstr ""
+"Todos os calendários e eventos do principal serão irremediavelmente "
+"apagados."
 
 msgid "All privileges"
 msgstr "Todos os privilégios"
@@ -162,11 +172,14 @@
 msgid "All requested changes were made."
 msgstr "Todas as alterações pedidas foram efectuadas."
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr "Permitir verificação de disponibilidade do dono deste calendário"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
-msgstr "Um utilizador \"Administrador\" tem todas as permissões para todo o sistema DAViCal"
+msgstr ""
+"Um utilizador \"Administrador\" tem todas as permissões para todo o sistema "
+"DAViCal"
 
 msgid "Anonymous users are not allowed to modify calendars"
 msgstr "Utilizadores anónimos não podem alterar calendários"
@@ -198,6 +211,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr "Ligações às colecções deste Principal"
 
+msgid "Body contains no XML data!"
+msgstr "O corpo não contém dados XML!"
+
 msgid "Bound As"
 msgstr "Ligado Como"
 
@@ -244,8 +260,12 @@
 msgid "Collection deleted"
 msgstr "Colecção apagada"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
-msgstr "As colecções não podem ser calendários CalDAV e livros de endereços CardDAV simultaneamente"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
+msgstr ""
+"As colecções não podem ser calendários CalDAV e livros de endereços CardDAV "
+"simultaneamente"
 
 msgid "Configuring Calendar Clients for DAViCal"
 msgstr "A configurar clientes de calendário para o DAViCal"
@@ -316,8 +336,11 @@
 msgid "DAV Path"
 msgstr "Caminho DAV"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
-msgstr "DAV::resourcetype só pode ser definido para um novo valor, não pode ser removido."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
+msgstr ""
+"DAV::resourcetype só pode ser definido para um novo valor, não pode ser "
+"removido."
 
 msgid "DAViCal CalDAV Server"
 msgstr "Servidor CalDAV DAViCal"
@@ -386,7 +409,7 @@
 msgstr "Privilégios predefinidos"
 
 msgid "Default relationships added."
-msgstr ""
+msgstr "Acrescentados relacionamentos predefinidos"
 
 msgid "Delete"
 msgstr "Eliminar"
@@ -415,11 +438,15 @@
 msgid "Deleting Ticket:"
 msgstr "A eliminar ticket:"
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
-msgstr "Entregar os convites de um organizador a esta caixa de entrada de reuniões"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgstr ""
+"Entregar os convites de um organizador a esta caixa de entrada de reuniões"
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
-msgstr "Entregar as respostas a convites dos participantes a esta caixa de entrada de reuniões"
+msgstr ""
+"Entregar as respostas a convites dos participantes a esta caixa de entrada "
+"de reuniões"
 
 msgid "Dependencies"
 msgstr "Dependências"
@@ -458,7 +485,8 @@
 msgstr "ERRO: A nova password tem que corresponder à password confirmada."
 
 msgid "ERROR: There was a database error writing the roles information!"
-msgstr "ERRO: Houve um erro de base de dados ao escrever informação de papéis!"
+msgstr ""
+"ERRO: Houve um erro de base de dados ao escrever informação de papéis!"
 
 msgid "Edit"
 msgstr "Editar"
@@ -469,13 +497,16 @@
 msgid "Email Address"
 msgstr "Endereço de email"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
-"Indique um nome de utilizador, se o souber, e clique aqui, para que lhe seja enviada uma password "
-"temporária."
+"Indique um nome de utilizador, se o souber, e clique aqui, para que lhe seja"
+" enviada uma password temporária."
 
 msgid "Enter your username and password then click here to log in."
-msgstr "Indique o seu nome de utilizador e password e clique aqui para entrar."
+msgstr ""
+"Indique o seu nome de utilizador e password e clique aqui para entrar."
 
 #, php-format
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
@@ -501,14 +532,22 @@
 msgstr "Europeu(d/m/a)"
 
 msgid "Existing resource does not match \"If-Match\" header - not accepted."
-msgstr "Recurso existente não corresponde com cabeçalho \"If-Match\" - não aceite."
+msgstr ""
+"Recurso existente não corresponde com cabeçalho \"If-Match\" - não aceite."
 
 msgid "Existing resource matches \"If-None-Match\" header - not accepted."
-msgstr "Recurso existente corresponde com cabeçalho \"If-None-Match\" - não aceite."
+msgstr ""
+"Recurso existente corresponde com cabeçalho \"If-None-Match\" - não aceite."
 
 msgid "Expires"
 msgstr "Expira"
 
+msgid "External Calendars"
+msgstr "Calendários Externos"
+
+msgid "External Url"
+msgstr "Url Externo"
+
 msgid "Fail"
 msgstr "Falha"
 
@@ -658,6 +697,9 @@
 msgid "Last used"
 msgstr "Último usado"
 
+msgid "List External Calendars"
+msgstr "Listar Calendários Externos"
+
 msgid "List Groups"
 msgstr "Listar Grupos"
 
@@ -688,10 +730,12 @@
 msgid "Member deleted from this Group Principal"
 msgstr "Membro eliminado deste Principal de Grupo"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
-"A maior parte do DAViCal irá funcionar mas é fortemente recomendado actualizar para o PHP 5.2 ou mais "
-"recente."
+"A maior parte do DAViCal irá funcionar mas é fortemente recomendado "
+"actualizar para o PHP 5.2 ou mais recente."
 
 msgid "Name"
 msgstr "Nome"
@@ -709,24 +753,18 @@
 msgid "No"
 msgstr "Não"
 
-msgid "No authority to deliver invitations to user."
-msgstr "Sem autoridade para entregar convites ao utilizador."
-
 msgid "No calendar content"
 msgstr "Sem conteúdo de calendário"
 
 msgid "No collection found at that location."
 msgstr "Colecção não encontrada nessa localização."
 
-msgid "No scheduling support for user"
-msgstr "Sem suporte de marcações para o utilizador"
-
 msgid "No summary"
 msgstr "Sem sumário"
 
 #. Translators: short for 'Number'
 msgid "No."
-msgstr "Não."
+msgstr "Núm."
 
 msgid "No. of Collections"
 msgstr "Núm. de colecções"
@@ -764,20 +802,29 @@
 msgid "PHP PDO module available"
 msgstr "Módulo PDO do PHP disponível"
 
-msgid "PHP PostgreSQL available"
-msgstr "PHP PostgreSQL disponível"
-
 msgid "PHP calendar extension available"
-msgstr ""
+msgstr "Extensão PHP para calendários disponível"
 
 msgid "PHP iconv support"
 msgstr "Suporte iconv do PHP"
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
 msgstr ""
-"PUT numa colecção é apenas permitido para conteúdo de texto/calendário em face de uma colecção de "
+"PUT de conteúdo text/calendar apenas é permitido numa colecção do tipo "
 "calendário"
 
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
+msgstr ""
+"PUT de conteúdo text/vcard apenas é permitido numa colecção do tipo livro de"
+" endereços"
+
 msgid "Passed"
 msgstr "Passou"
 
@@ -829,6 +876,12 @@
 msgid "Privileges granted to All Users"
 msgstr "Privilégios atribuídos para Todos os utilizadores"
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr "A propriedade é só de leitura"
 
@@ -863,8 +916,10 @@
 msgid "Read the content of a resource or collection"
 msgstr "Ler o conteúdo de um recurso ou colecção"
 
-msgid "Read the details of the current user's access control to this resource."
-msgstr "Ler os detalhes do controlo de acesso do utilizador actual a este recurso"
+msgid ""
+"Read the details of the current user's access control to this resource."
+msgstr ""
+"Ler os detalhes do controlo de acesso do utilizador actual a este recurso"
 
 msgid "Read the free/busy information for a calendar collection"
 msgstr "Ler informação de livre/ocupado para uma colecção de calendários"
@@ -872,12 +927,18 @@
 msgid "Read/Write"
 msgstr "Ler/Escrever"
 
+msgid "References"
+msgstr "Referências"
+
 msgid "Remove"
 msgstr "Remover"
 
 msgid "Remove a lock"
 msgstr "Remover um lock"
 
+msgid "Remove dangling external calendars"
+msgstr "Remover calendários externos com problemas"
+
 msgid "Report Bug"
 msgstr "Relatar um bug"
 
@@ -890,7 +951,8 @@
 msgid "Request body is not valid XML data!"
 msgstr "Corpo do pedido não tem dados XML válidos!"
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -918,9 +980,6 @@
 msgid "Schedule Transparency"
 msgstr "Transparência do horário"
 
-msgid "Scheduling invitation delivered successfully"
-msgstr "Convite enviado com sucesso"
-
 msgid "Scheduling: Deliver a Reply"
 msgstr "Horários: Entregar uma resposta"
 
@@ -948,11 +1007,19 @@
 msgid "Send free/busy enquiries"
 msgstr "Enviar consultas de informação livre/ocupado"
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
-msgstr "Enviar convites de horários como organizador, sendo dono desta caixa de saída."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
+msgstr ""
+"Enviar convites de horários como organizador, sendo dono desta caixa de "
+"saída."
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
-msgstr "Enviar respostas de horários como participante, sendo dono desta caixa de saída."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
+msgstr ""
+"Enviar respostas de horários como participante, sendo dono desta caixa de "
+"saída."
 
 msgid "Set free/busy privileges"
 msgstr "Definir privilégios de livre/ocupado"
@@ -963,11 +1030,12 @@
 msgid "Set read+write privileges"
 msgstr "Definir privilégios de leitura+escrita"
 
-msgid "Set schedule-deliver privileges"
-msgstr "Definir privilégios de marcação-entrega"
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
-msgstr "Definir o caminho para guardar o seu ics e.g. 'home' será referido como /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
+msgstr ""
+"Definir o caminho para guardar o seu ficheiro ics - e.g. 'calendar' será "
+"referido como /caldav.php/nome_de_utilizador/calendar/"
 
 msgid "Setup"
 msgstr "Configurar"
@@ -993,8 +1061,11 @@
 msgid "Source resource does not exist."
 msgstr "Recurso de origem não existe."
 
-msgid "Special collections may not contain a calendar or other special collection."
-msgstr "Colecções especiais não podem conter um calendário ou outra colecção especial."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
+msgstr ""
+"Colecções especiais não podem conter um calendário ou outra colecção "
+"especial."
 
 msgid "Specific Privileges"
 msgstr "Privilégios específicos"
@@ -1012,8 +1083,8 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr "\"server.strip\" do suhosin desabilitado"
 
-msgid "Sync LDAP Groups with RSCDS"
-msgstr "Sincronizar grupos LDAP com RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
+msgstr "Sincronizar Grupos LDAP com o DAViCal"
 
 msgid "Sync LDAP with DAViCal"
 msgstr "Sincronizar LDAP com o DAViCal"
@@ -1036,8 +1107,11 @@
 msgid "The BIND method is not allowed at that location."
 msgstr "O método BIND não é permitido nessa localização."
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
-msgstr "A propriedade CalDAV:schedule-calendar-transp só pode ser definida em calendários."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgstr ""
+"A propriedade CalDAV:schedule-calendar-transp só pode ser definida em "
+"calendários."
 
 msgid "The DAViCal Home Page"
 msgstr "A Home page do DAViCal"
@@ -1045,11 +1119,14 @@
 msgid "The access ticket will be deleted."
 msgstr "O ticket de acesso será apagado."
 
-msgid "The addressbook-query report must be run against an addressbook collection"
-msgstr "O relatório addressbook-query tem que ser executado sobre uma colecção de livros de endereços"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
+msgstr ""
+"O relatório addressbook-query tem que ser executado sobre uma colecção de "
+"livros de endereços"
 
 msgid "The application failed to understand that request."
-msgstr ""
+msgstr "A aplicação não conseguiu entender esse pedido."
 
 msgid "The application program does not understand that request."
 msgstr "O programa não entende esse pedido."
@@ -1061,13 +1138,18 @@
 msgstr "O caminho do calendário contém caracteres ilegais."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
-"A propriedade calendar-free-busy-set é substituída pela propriedade schedule-transp duma colecção de "
-"calendário."
+"A propriedade calendar-free-busy-set é substituída pela propriedade "
+"schedule-transp duma colecção de calendário."
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
-msgstr "O relatório calendar-query tem que ser executado sobre uma colecção de calendário ou horários"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
+msgstr ""
+"O relatório calendar-query tem que ser executado sobre uma colecção de "
+"calendário ou horários"
 
 msgid "The collection name may not be blank."
 msgstr "O nome da colecção não pode ficar em branco."
@@ -1075,15 +1157,25 @@
 msgid "The destination collection does not exist"
 msgstr "A colecção de destino não existe"
 
-msgid "The displayname may only be set on collections, principals or bindings."
-msgstr "O nome a mostrar só pode ser definido em colecções, principais ou ligações."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
+msgstr ""
+"O nome a mostrar só pode ser definido em colecções, principais ou ligações."
 
 msgid "The email address really should not be blank."
 msgstr "O endereço de email não devia, de facto, ficar em branco."
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+"O ficheiro \"%s\" não está codificado como UTF-8, por favor verifique a "
+"mensagem de erro para mais promenores"
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
-"O ficheiro não está codificado em UTF-8, por favor verifique a mensagem de erro para mais detalhes."
+"O ficheiro não está codificado em UTF-8, por favor verifique a mensagem de "
+"erro para mais detalhes."
 
 msgid "The full name for this person, group or other type of principal."
 msgstr "O nome completo desta pessoa, grupo ou outro tipo de principal."
@@ -1100,6 +1192,10 @@
 msgid "The preferred language for this person."
 msgstr "O idioma preferido para esta pessoa."
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr "O principal \"%s\" não existe"
+
 msgid "The style of dates used for this person."
 msgstr "O estilo de datas em uso para esta pessoa."
 
@@ -1113,7 +1209,9 @@
 msgstr "A password do utilizador para entrar."
 
 msgid "The username must not be blank, and may not contain a slash"
-msgstr "O nome de utilizador não pode ficar em branco e não pode conter uma barra \"/\""
+msgstr ""
+"O nome de utilizador não pode ficar em branco e não pode conter uma barra "
+"\"/\""
 
 msgid "There was an error reading from the database."
 msgstr "Ocorreu um erro ao ler da Base de Dados."
@@ -1122,37 +1220,55 @@
 msgstr "Ocorreu um erro ao escrever na Base de Dados."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
-"Esta operação faz o seguinte: <ul><li>verifica grupos válidos no directório LDAP</li> <li>verifica "
-"grupos no DAViCal</li></ul> então <ul><li>se um grupo existe no DAViCal mas não no LDAP, marca-o como "
-"inactivo no DAViCal</li> <li>se um grupo está presente no LDAP mas não no DAViCal, cria o grupo no "
-"DAViCal</li> <li>se um grupo existir no LDAP e no DAViCal, actualiza a informação no DAViCal</li> </ul>"
-
-msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
-msgstr ""
-"Esta operação faz o seguinte: <ul><li>verifica utilizadores válidos no directório LDAP</li> "
-"<li>verifica utilizadores no DAViCal</li></ul> então <ul><li>se um utilizador existe no DAViCal mas "
-"não no LDAP, marca-o como inactivo no DAViCal</li> <li>se um utilizador está presente no LDAP mas não "
-"no DAViCal, cria o utilizador no DAViCal</li> <li>se um utilizador existir no LDAP e no DAViCal, "
-"actualiza a informação no DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+"Esta operação faz o seguinte: <ul><li>verifica grupos válidos no directório "
+"LDAP</li> <li>verifica grupos no DAViCal</li></ul> então <ul><li>se um grupo"
+" existe no DAViCal mas não no LDAP, marca-o como inactivo no DAViCal</li> "
+"<li>se um grupo está presente no LDAP mas não no DAViCal, cria o grupo no "
+"DAViCal</li> <li>se um grupo existir no LDAP e no DAViCal, actualiza a "
+"informação no DAViCal</li> </ul>"
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
-"Esta página verifica o ambiente de execução necessário para que o DAViCal trabalhe correctamente. "
-"Sugestões ou correcções para que faça coisas mais úteis serão recebidos com gratidão."
+"Esta operação faz o seguinte: <ul><li>verifica utilizadores válidos no "
+"directório LDAP</li> <li>verifica utilizadores no DAViCal</li></ul> então "
+"<ul><li>se um utilizador existe no DAViCal mas não no LDAP, marca-o como "
+"inactivo no DAViCal</li> <li>se um utilizador está presente no LDAP mas não "
+"no DAViCal, cria o utilizador no DAViCal</li> <li>se um utilizador existir "
+"no LDAP e no DAViCal, actualiza a informação no DAViCal</li> </ul>"
+
+msgid ""
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
+msgstr ""
+"Esta página verifica o ambiente de execução necessário para que o DAViCal "
+"trabalhe correctamente. Sugestões ou correcções para que faça coisas mais "
+"úteis serão recebidos com gratidão."
+
+msgid ""
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
+msgstr ""
+"Este processo irá importar cada ficheiro chamado \"nome_de_utilizador.ics\" "
+"ecriar um utilizador e calendário para cada ficheiro."
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
-msgstr "Este servidor suporta apenas o formato text/calendar para URLs de livre/ocupado"
+msgstr ""
+"Este servidor suporta apenas o formato text/calendar para URLs de "
+"livre/ocupado"
 
 msgid "Ticket ID"
 msgstr "ID de ticket"
@@ -1211,10 +1327,12 @@
 msgid "Upgrade Database"
 msgstr "Actualizar Base de Dados"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
-"Fazer o upload de um calendário .ics em formato iCalendar para inicializar ou substituir este "
-"calendário."
+"Fazer o upload de um calendário .ics em formato iCalendar para inicializar "
+"ou substituir este calendário."
 
 msgid "User Calendar Principals"
 msgstr "Principais do calendário de utilizador"
@@ -1257,11 +1375,12 @@
 msgstr "Desejado: %s, Actualmente: %s"
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
-"Aviso: não há utilizadores administradores activos! Deve corrigir isto antes de sair. Considere usar a "
-"definição de configuração $c->do_not_sync_from_ldap."
+"Aviso: não há utilizadores administradores activos! Deve corrigir isto antes"
+" de sair. Considere usar a definição de configuração "
+"$c->do_not_sync_from_ldap."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Quando a conta de email do utilizador foi validada."
@@ -1311,10 +1430,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr "A sua configuração criou alguns erros de PHP que devem ser corrigidos"
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "todos os eventos do utilizador %s foram apagados e substituídos pelos do ficheiro %s"
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr "a propriedade calendar-timezone só é válida para um calendário."
 
@@ -1322,32 +1437,46 @@
 msgid "directory %s is not readable"
 msgstr "o directório %s não é legível"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
-msgstr "drivers_imap_pam: o parâmetro imap_url não está configurado em /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
+msgstr ""
+"drivers_imap_pam: o parâmetro imap_url não está configurado em "
+"/etc/davical/*-conf.php"
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : Impossível inicial TLS: falhou ldap_start_tls()"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-msgstr "drivers_ldap : Falhou a ligação ao servidor %1$s no porto %2$s com o bindDN de %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap : Falhou a ligação ao servidor %1$s no porto %2$s com o bindDN "
+"de %3$s"
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-msgstr "drivers_ldap : Falhou a definição do protocolo versão 3 para o LDAP, TLS não suportado"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
+msgstr ""
+"drivers_ldap : Falhou a definição do protocolo versão 3 para o LDAP, TLS não"
+" suportado"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap : Não foi possível ligar ao LDAP - verifique a sua configuração de bindDN e passDN, e que "
-"o seu servidor LDAP está acessível"
+"drivers_ldap : Não foi possível ligar ao LDAP - verifique a sua configuração"
+" de bindDN e passDN, e que o seu servidor LDAP está acessível"
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : Impossível ligar ao LDAP com o porto %s no servidor %s"
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-msgstr "drivers_ldap : a função ldap_connect não está definida, verifique o seu módulo php_ldap"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
+"drivers_ldap : a função ldap_connect não está definida, verifique o seu "
+"módulo php_ldap"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
@@ -1357,7 +1486,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Impossível encontrar o ficheiro %s"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "lembrar este login"
 
@@ -1367,12 +1497,13 @@
 msgid "path to store your ics"
 msgstr "caminho para guardar o seu ics"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "o ficheiro %s não está codificado em UTF-8, por favor verifique os erros para mais detalhes"
-
 msgid "unauthenticated"
 msgstr "não autenticado"
 
-msgid "you should log on with the username and password that have been issued to you."
-msgstr "deve entrar com o nome de utilizador e password que lhe foram atribuídas."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
+msgstr ""
+"deve entrar com o nome de utilizador e password que lhe foram atribuídas."
+
+
diff -Nru davical-0.9.9.7/po/ru.po davical-1.0.2/po/ru.po
--- davical-0.9.9.7/po/ru.po	2011-09-26 22:30:09.000000000 +0000
+++ davical-1.0.2/po/ru.po	2012-01-04 23:04:24.000000000 +0000
@@ -1,28 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n"
-"%100>=20) ? 1 : 2)\n"
+"Language: ru\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -72,29 +74,28 @@
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
 msgstr ""
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -140,7 +141,12 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr ""
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -149,7 +155,8 @@
 msgid "All requested changes were made."
 msgstr ""
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -185,6 +192,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -231,7 +241,9 @@
 msgid "Collection deleted"
 msgstr ""
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -303,7 +315,8 @@
 msgid "DAV Path"
 msgstr ""
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -402,7 +415,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -456,7 +470,9 @@
 msgid "Email Address"
 msgstr ""
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
 msgstr ""
 
 msgid "Enter your username and password then click here to log in."
@@ -494,6 +510,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -596,7 +618,8 @@
 msgstr ""
 
 msgid "If you would like to request access, please e-mail"
-msgstr "Если вы хотите получить доступ, пожалуйста, пошлите электронное письмо"
+msgstr ""
+"Если вы хотите получить доступ, пожалуйста, пошлите электронное письмо"
 
 msgid "Import all .ics files of a directory"
 msgstr ""
@@ -643,6 +666,9 @@
 msgid "Last used"
 msgstr ""
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr ""
 
@@ -673,7 +699,9 @@
 msgid "Member deleted from this Group Principal"
 msgstr ""
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
@@ -692,18 +720,12 @@
 msgid "No"
 msgstr ""
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr ""
 
 msgid "No collection found at that location."
 msgstr ""
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -747,16 +769,23 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr ""
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -810,6 +839,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr ""
 
@@ -844,7 +879,8 @@
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -853,12 +889,18 @@
 msgid "Read/Write"
 msgstr ""
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Сообщить об ошибке"
 
@@ -871,7 +913,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr ""
 
@@ -899,9 +942,6 @@
 msgid "Schedule Transparency"
 msgstr ""
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr ""
 
@@ -929,10 +969,14 @@
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -944,10 +988,9 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
-msgstr ""
-
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -974,7 +1017,8 @@
 msgid "Source resource does not exist."
 msgstr ""
 
-msgid "Special collections may not contain a calendar or other special collection."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
 msgstr ""
 
 msgid "Specific Privileges"
@@ -993,7 +1037,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1017,7 +1061,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1026,7 +1071,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1042,10 +1088,13 @@
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1054,13 +1103,19 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
 msgstr ""
 
 msgid "The full name for this person, group or other type of principal."
@@ -1078,6 +1133,10 @@
 msgid "The preferred language for this person."
 msgstr ""
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr ""
 
@@ -1100,22 +1159,32 @@
 msgstr "Произошла ошибка при записи в базу данных."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1178,7 +1247,9 @@
 msgid "Upgrade Database"
 msgstr ""
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
 
 msgid "User Calendar Principals"
@@ -1222,8 +1293,8 @@
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1274,10 +1345,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr ""
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1285,29 +1352,35 @@
 msgid "directory %s is not readable"
 msgstr ""
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr ""
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 msgstr ""
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 msgstr ""
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr ""
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 msgstr ""
 
 #, php-format
@@ -1318,7 +1391,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr ""
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr ""
 
@@ -1328,12 +1402,14 @@
 msgid "path to store your ics"
 msgstr ""
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
+msgid "unauthenticated"
 msgstr ""
 
-msgid "unauthenticated"
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr ""
+"вы должны войти под тем именем польззователя и паролем, который был вам "
+"выслан."
+
 
-msgid "you should log on with the username and password that have been issued to you."
-msgstr "вы должны войти под тем именем польззователя и паролем, который был вам выслан."
diff -Nru davical-0.9.9.7/po/sv.po davical-1.0.2/po/sv.po
--- davical-0.9.9.7/po/sv.po	2011-09-26 22:30:10.000000000 +0000
+++ davical-1.0.2/po/sv.po	2012-01-04 23:04:34.000000000 +0000
@@ -1,27 +1,30 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-#
+# 
+# Translators:
 # Andrew McMillan <andrew@mcmillan.net.nz>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: DAViCal\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-27 11:30+1300\n"
-"PO-Revision-Date: 2011-03-22 15:19+0000\n"
-"Last-Translator: fmms <mail@felixmoeller.de>\n"
+"Report-Msgid-Bugs-To: http://repo.or.cz/w/davical.git/tree/HEAD:/issues\n"
+"POT-Creation-Date: 2011-11-21 10:59+1300\n"
+"PO-Revision-Date: 2011-11-20 22:15+0000\n"
+"Last-Translator: Andrew McMillan <andrew@mcmillan.net.nz>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#. Translators: this is the formatting of a date with time. See http://php.net/manual/en/function.strftime.php
+#. Translators: this is the formatting of a date with time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%F %T"
 msgstr ""
 
-#. Translators: his is the formatting of just the time. See http://php.net/manual/en/function.strftime.php
+#. Translators: his is the formatting of just the time. See
+#. http://php.net/manual/en/function.strftime.php
 msgid "%T"
 msgstr ""
 
@@ -71,32 +74,34 @@
 msgid "- updating user records : %s"
 msgstr "- uppdaterar användarposter : %s"
 
-msgid "<b>WARNING: all events in this path will be deleted before inserting allof the ics file</b>"
-msgstr "<b>Varning: alla händelser i denna sökväg kommer att raderas innan ics-filen läggs till</b>"
+msgid ""
+"<b>WARNING: all events in this path will be deleted before inserting allof "
+"the ics file</b>"
+msgstr ""
+"<b>Varning: alla händelser i denna sökväg kommer att raderas innan ics-filen"
+" läggs till</b>"
 
 #, php-format
 msgid ""
 "<h1>Help</h1>\n"
-"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal "
-"Home Page</a> or take\n"
+"<p>For initial help you should visit the <a href=\"http://www.davical.org/\" target=\"_blank\">DAViCal Home Page</a> or take\n"
 "a look at the <a href=\"http://wiki.davical.org/%s\" target=\"_blank\">DAViCal Wiki</a>.</p>\n"
-"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/"
-"Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
+"<p>If you can't find the answers there, visit us on <a href=\"http://wikipedia.org/wiki/Internet_Relay_Chat\" target=\"_blank\">IRC</a> in\n"
 "the <b>#davical</b> channel on <a href=\"http://www.oftc.net/\" target=\"_blank\">irc.oftc.net</a>,\n"
-"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" "
-"target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
-"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users "
-"Mailing List\" target=\"_blank\">mailing list\n"
+"or send a question to the <a href=\"http://lists.sourceforge.net/mailman/listinfo/davical-general\" target=\"_blank\">DAViCal Users mailing list</a>.</p>\n"
+"<p>The <a href=\"http://sourceforge.net/mailarchive/forum.php?forum_id=8348\" title=\"DAViCal Users Mailing List\" target=\"_blank\">mailing list\n"
 "archives can be helpful too.</p>"
 msgstr ""
 
 #, php-format
 msgid ""
-"<h1>Log On Please</h1><p>For access to the %s you should log on withthe username and password that "
-"have been issued to you.</p><p>If you would like to request access, please e-mail %s.</p>"
-msgstr ""
-"<h1>Var god logga in</h1><p>För att få tillgång till %s behöver du logga in med det användarnamn och "
-"lösenord som tilldelats dig.</p><p>För att begära ett konto, skicka e-post till %s.</p>"
+"<h1>Log On Please</h1><p>For access to the %s you should log on withthe "
+"username and password that have been issued to you.</p><p>If you would like "
+"to request access, please e-mail %s.</p>"
+msgstr ""
+"<h1>Var god logga in</h1><p>För att få tillgång till %s behöver du logga in "
+"med det användarnamn och lösenord som tilldelats dig.</p><p>För att begära "
+"ett konto, skicka e-post till %s.</p>"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -141,7 +146,12 @@
 msgid "All collection data will be unrecoverably deleted."
 msgstr "All data för samlingen kommer att raderas oåterkallerligen."
 
-msgid "All of the principal's calendars and events will be unrecoverably deleted."
+#, php-format
+msgid "All events of user \"%s\" were deleted and replaced by those from file %s"
+msgstr ""
+
+msgid ""
+"All of the principal's calendars and events will be unrecoverably deleted."
 msgstr ""
 
 msgid "All privileges"
@@ -150,7 +160,8 @@
 msgid "All requested changes were made."
 msgstr "Alla begärda ändringar har utförts."
 
-msgid "Allow free/busy enquiries targeted at the owner of this scheduling inbox"
+msgid ""
+"Allow free/busy enquiries targeted at the owner of this scheduling inbox"
 msgstr ""
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -186,6 +197,9 @@
 msgid "Bindings to this Principal's Collections"
 msgstr ""
 
+msgid "Body contains no XML data!"
+msgstr ""
+
 msgid "Bound As"
 msgstr ""
 
@@ -232,7 +246,9 @@
 msgid "Collection deleted"
 msgstr "Samlingen raderad"
 
-msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgid ""
+"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
+" same time"
 msgstr ""
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -304,7 +320,8 @@
 msgid "DAV Path"
 msgstr "DAV-sökväg"
 
-msgid "DAV::resourcetype may only be set to a new value, it may not be removed."
+msgid ""
+"DAV::resourcetype may only be set to a new value, it may not be removed."
 msgstr ""
 
 msgid "DAViCal CalDAV Server"
@@ -403,7 +420,8 @@
 msgid "Deleting Ticket:"
 msgstr ""
 
-msgid "Deliver scheduling invitations from an organiser to this scheduling inbox"
+msgid ""
+"Deliver scheduling invitations from an organiser to this scheduling inbox"
 msgstr ""
 
 msgid "Deliver scheduling replies from an attendee to this scheduling inbox"
@@ -457,11 +475,17 @@
 msgid "Email Address"
 msgstr "E-postadress"
 
-msgid "Enter a username, if you know it, and click here, to be e-mailed a temporary password."
-msgstr "Mata in ett användarnamn, om du känner till det, för att erhålla e-post med ett engångslösenord"
+msgid ""
+"Enter a username, if you know it, and click here, to be e-mailed a temporary"
+" password."
+msgstr ""
+"Mata in ett användarnamn, om du känner till det, för att erhålla e-post med "
+"ett engångslösenord"
 
 msgid "Enter your username and password then click here to log in."
-msgstr "Mata in ditt användarnamn och lösenord och klicka sedan här för att logga in."
+msgstr ""
+"Mata in ditt användarnamn och lösenord och klicka sedan här för att logga "
+"in."
 
 #, php-format
 msgid "Error NoGroupFound with filter >%s<, attributes >%s< , dn >%s<"
@@ -495,6 +519,12 @@
 msgid "Expires"
 msgstr ""
 
+msgid "External Calendars"
+msgstr ""
+
+msgid "External Url"
+msgstr ""
+
 msgid "Fail"
 msgstr ""
 
@@ -644,6 +674,9 @@
 msgid "Last used"
 msgstr "Senast använd"
 
+msgid "List External Calendars"
+msgstr ""
+
 msgid "List Groups"
 msgstr "Lista grupper"
 
@@ -674,7 +707,9 @@
 msgid "Member deleted from this Group Principal"
 msgstr "Medlem borttagen från detta gruppkonto"
 
-msgid "Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly recommended."
+msgid ""
+"Most of DAViCal will work but upgrading to PHP 5.2 or later is strongly "
+"recommended."
 msgstr ""
 
 msgid "Name"
@@ -693,18 +728,12 @@
 msgid "No"
 msgstr ""
 
-msgid "No authority to deliver invitations to user."
-msgstr ""
-
 msgid "No calendar content"
 msgstr "Inget kalenderinnehåll"
 
 msgid "No collection found at that location."
 msgstr "Ingen samling funnen på denna plats."
 
-msgid "No scheduling support for user"
-msgstr ""
-
 msgid "No summary"
 msgstr ""
 
@@ -748,16 +777,23 @@
 msgid "PHP PDO module available"
 msgstr ""
 
-msgid "PHP PostgreSQL available"
-msgstr ""
-
 msgid "PHP calendar extension available"
 msgstr ""
 
 msgid "PHP iconv support"
 msgstr ""
 
-msgid "PUT on a collection is only allowed for text/calendar content against a calendar collection"
+msgid "PHP not using Apache Filter mode"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/calendar content against a "
+"calendar collection"
+msgstr ""
+
+msgid ""
+"PUT on a collection is only allowed for text/vcard content against an "
+"addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -811,6 +847,12 @@
 msgid "Privileges granted to All Users"
 msgstr ""
 
+msgid "Privileges to allow delivery of scheduling messages"
+msgstr ""
+
+msgid "Privileges to delegate scheduling decisions"
+msgstr ""
+
 msgid "Property is read-only"
 msgstr "Egenskapen är enbart läsbar"
 
@@ -845,7 +887,8 @@
 msgid "Read the content of a resource or collection"
 msgstr ""
 
-msgid "Read the details of the current user's access control to this resource."
+msgid ""
+"Read the details of the current user's access control to this resource."
 msgstr ""
 
 msgid "Read the free/busy information for a calendar collection"
@@ -854,12 +897,18 @@
 msgid "Read/Write"
 msgstr ""
 
+msgid "References"
+msgstr ""
+
 msgid "Remove"
 msgstr ""
 
 msgid "Remove a lock"
 msgstr ""
 
+msgid "Remove dangling external calendars"
+msgstr ""
+
 msgid "Report Bug"
 msgstr "Rapportera fel"
 
@@ -872,7 +921,8 @@
 msgid "Request body is not valid XML data!"
 msgstr ""
 
-#. Translators a thing which might be booked: a room, a carpark, a projector...
+#. Translators a thing which might be booked: a room, a carpark, a
+#. projector...
 msgid "Resource"
 msgstr "Resurs"
 
@@ -900,9 +950,6 @@
 msgid "Schedule Transparency"
 msgstr "Bokningstransparens"
 
-msgid "Scheduling invitation delivered successfully"
-msgstr ""
-
 msgid "Scheduling: Deliver a Reply"
 msgstr "Bokning: leverera ett svar"
 
@@ -930,10 +977,14 @@
 msgid "Send free/busy enquiries"
 msgstr ""
 
-msgid "Send scheduling invitations as an organiser from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling invitations as an organiser from the owner of this "
+"scheduling outbox."
 msgstr ""
 
-msgid "Send scheduling replies as an attendee from the owner of this scheduling outbox."
+msgid ""
+"Send scheduling replies as an attendee from the owner of this scheduling "
+"outbox."
 msgstr ""
 
 msgid "Set free/busy privileges"
@@ -945,12 +996,11 @@
 msgid "Set read+write privileges"
 msgstr ""
 
-msgid "Set schedule-deliver privileges"
+msgid ""
+"Set the path to store your ics e.g. 'calendar' will be referenced as "
+"/caldav.php/username/calendar/"
 msgstr ""
 
-msgid "Set the path to store your ics e.g. 'home' will be referenced as /caldav.php/me/home/"
-msgstr "Ange sökväg till dina ics, t ex 'home' kommer att hänvisa till /caldav.php/me/home/"
-
 msgid "Setup"
 msgstr "Konfigurera"
 
@@ -975,8 +1025,11 @@
 msgid "Source resource does not exist."
 msgstr "Källresursen existerar inte."
 
-msgid "Special collections may not contain a calendar or other special collection."
-msgstr "Speciella samlingar får inte innehålla en kalender eller en annan speciell samling."
+msgid ""
+"Special collections may not contain a calendar or other special collection."
+msgstr ""
+"Speciella samlingar får inte innehålla en kalender eller en annan speciell "
+"samling."
 
 msgid "Specific Privileges"
 msgstr ""
@@ -994,7 +1047,7 @@
 msgid "Suhosin \"server.strip\" disabled"
 msgstr ""
 
-msgid "Sync LDAP Groups with RSCDS"
+msgid "Sync LDAP Groups with DAViCal"
 msgstr ""
 
 msgid "Sync LDAP with DAViCal"
@@ -1018,7 +1071,8 @@
 msgid "The BIND method is not allowed at that location."
 msgstr ""
 
-msgid "The CalDAV:schedule-calendar-transp property may only be set on calendars."
+msgid ""
+"The CalDAV:schedule-calendar-transp property may only be set on calendars."
 msgstr ""
 
 msgid "The DAViCal Home Page"
@@ -1027,7 +1081,8 @@
 msgid "The access ticket will be deleted."
 msgstr ""
 
-msgid "The addressbook-query report must be run against an addressbook collection"
+msgid ""
+"The addressbook-query report must be run against an addressbook collection"
 msgstr ""
 
 msgid "The application failed to understand that request."
@@ -1043,10 +1098,13 @@
 msgstr "Kalendersökvägen inehåller otillåtna tecken."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the schedule-transp property of a calendar collection."
+"The calendar-free-busy-set is superseded by the schedule-transp property of "
+"a calendar collection."
 msgstr ""
 
-msgid "The calendar-query report must be run against a calendar or a scheduling collection"
+msgid ""
+"The calendar-query report must be run against a calendar or a scheduling "
+"collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1055,14 +1113,22 @@
 msgid "The destination collection does not exist"
 msgstr ""
 
-msgid "The displayname may only be set on collections, principals or bindings."
+msgid ""
+"The displayname may only be set on collections, principals or bindings."
 msgstr ""
 
 msgid "The email address really should not be blank."
 msgstr ""
 
-msgid "The file is not UTF-8 encoded, please check the error for more details."
-msgstr "Filen är inte teckenkodad i UTF-8, var god kontrollera felet för fler detaljer."
+#, php-format
+msgid "The file \"%s\" is not UTF-8 encoded, please check error for more details"
+msgstr ""
+
+msgid ""
+"The file is not UTF-8 encoded, please check the error for more details."
+msgstr ""
+"Filen är inte teckenkodad i UTF-8, var god kontrollera felet för fler "
+"detaljer."
 
 msgid "The full name for this person, group or other type of principal."
 msgstr ""
@@ -1079,6 +1145,10 @@
 msgid "The preferred language for this person."
 msgstr "Det föredragna språket för dena person."
 
+#, php-format
+msgid "The principal \"%s\" does not exist"
+msgstr ""
+
 msgid "The style of dates used for this person."
 msgstr "Datumformatet för denna person."
 
@@ -1101,22 +1171,32 @@
 msgstr "Det uppstöd ett fel vid skrivning till databasen."
 
 msgid ""
-"This operation does the following: <ul><li>check valid groups in LDAP directory</li> <li>check groups "
-"in DAViCal</li></ul> then <ul><li>if a group is present in DAViCal but not in LDAP set as inactive in "
-"DAViCal</li> <li>if a group is present in LDAP but not in DAViCal create the group in DAViCal</li> "
-"<li>if a group in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This operation does the following: <ul><li>check valid groups in LDAP "
+"directory</li> <li>check groups in DAViCal</li></ul> then <ul><li>if a group"
+" is present in DAViCal but not in LDAP set as inactive in DAViCal</li> "
+"<li>if a group is present in LDAP but not in DAViCal create the group in "
+"DAViCal</li> <li>if a group in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
+msgstr ""
+
+msgid ""
+"This operation does the following: <ul><li>check valid users in LDAP "
+"directory</li> <li>check users in DAViCal</li></ul> then <ul><li>if a user "
+"is present in DAViCal but not in LDAP set him as inactive in DAViCal</li> "
+"<li>if a user is present in LDAP but not in DAViCal create the user in "
+"DAViCal</li> <li>if a user in present in LDAP and DAViCal then update "
+"information in DAViCal</li> </ul>"
 msgstr ""
 
 msgid ""
-"This operation does the following: <ul><li>check valid users in LDAP directory</li> <li>check users in "
-"DAViCal</li></ul> then <ul><li>if a user is present in DAViCal but not in LDAP set him as inactive in "
-"DAViCal</li> <li>if a user is present in LDAP but not in DAViCal create the user in DAViCal</li> "
-"<li>if a user in present in LDAP and DAViCal then update information in DAViCal</li> </ul>"
+"This page primarily checks the environment needed for DAViCal to work "
+"correctly.  Suggestions or patches to make it do more useful stuff will be "
+"gratefully received."
 msgstr ""
 
 msgid ""
-"This page primarily checks the environment needed for DAViCal to work correctly.  Suggestions or "
-"patches to make it do more useful stuff will be gratefully received."
+"This process will import each file in a directory named \"username.ics\" and"
+" create a user and calendar for each file to import."
 msgstr ""
 
 msgid "This server only supports the text/calendar format for freebusy URLs"
@@ -1179,7 +1259,9 @@
 msgid "Upgrade Database"
 msgstr "Uppgradera databas"
 
-msgid "Upload a .ics calendar in iCalendar format to initialise or replace this calendar."
+msgid ""
+"Upload a .ics calendar in iCalendar format to initialise or replace this "
+"calendar."
 msgstr ""
 
 msgid "User Calendar Principals"
@@ -1223,8 +1305,8 @@
 msgstr ""
 
 msgid ""
-"Warning: there are no active admin users! You should fix this before logging out.  Consider using the "
-"$c->do_not_sync_from_ldap configuration setting."
+"Warning: there are no active admin users! You should fix this before logging"
+" out.  Consider using the $c->do_not_sync_from_ldap configuration setting."
 msgstr ""
 
 msgid "When the user's e-mail account was validated."
@@ -1275,10 +1357,6 @@
 msgid "Your configuration produced PHP errors which should be corrected"
 msgstr ""
 
-#, php-format
-msgid "all events of user %s were deleted and replaced by those from file %s"
-msgstr "Alla händelser för användare %s raderades och ersattes med dem från filen %s"
-
 msgid "calendar-timezone property is only valid for a calendar."
 msgstr ""
 
@@ -1286,32 +1364,42 @@
 msgid "directory %s is not readable"
 msgstr "mappen %s är inte åtkomlig"
 
-msgid "drivers_imap_pam : imap_url parameter not configured in /etc/davical/*-conf.php"
+msgid ""
+"drivers_imap_pam : imap_url parameter not configured in "
+"/etc/davical/*-conf.php"
 msgstr ""
 
 msgid "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 msgstr "drivers_ldap : Could not start TLS: ldap_start_tls() failed"
 
 #, php-format
-msgid "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
-msgstr "drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgid ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
+msgstr ""
+"drivers_ldap : Failed to bind to host %1$s on port %2$s with bindDN of %3$s"
 
-msgid "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
-msgstr "drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not supported"
+msgid ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
+msgstr ""
+"drivers_ldap : Failed to set LDAP to use protocol version 3, TLS not "
+"supported"
 
 msgid ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 msgstr ""
-"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN and passDN, and that your "
-"LDAP server is reachable"
+"drivers_ldap : Unable to bind to LDAP - check your configuration for bindDN "
+"and passDN, and that your LDAP server is reachable"
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 msgstr "drivers_ldap : Unable to connect to LDAP with port %s on host %s"
 
-msgid "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
-msgstr "drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgid ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
+msgstr ""
+"drivers_ldap : function ldap_connect not defined, check your php_ldap module"
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
@@ -1321,7 +1409,8 @@
 msgid "drivers_squid_pam : Unable to find %s file"
 msgstr "drivers_squid_pam : Unable to find %s file"
 
-#. Translators: this is a colloquial phrase in english (the name of a flower) and is an option allowing people to log in automatically in future
+#. Translators: this is a colloquial phrase in english (the name of a flower)
+#. and is an option allowing people to log in automatically in future
 msgid "forget me not"
 msgstr "Kom ihåg mig"
 
@@ -1331,12 +1420,12 @@
 msgid "path to store your ics"
 msgstr "sökväg för att spara din .ics"
 
-#, php-format
-msgid "the file %s is not UTF-8 encoded, please check error for more details"
-msgstr "filen %s är inte UTF-8 kodad, kontrollera fel-loggen för detaljer"
-
 msgid "unauthenticated"
 msgstr ""
 
-msgid "you should log on with the username and password that have been issued to you."
+msgid ""
+"you should log on with the username and password that have been issued to "
+"you."
 msgstr "du behöver logga in med det användarnamn och lösenord du erhållit."
+
+
diff -Nru davical-0.9.9.7/README davical-1.0.2/README
--- davical-0.9.9.7/README	2011-03-30 22:40:13.000000000 +0000
+++ davical-1.0.2/README	2011-11-20 21:50:45.000000000 +0000
@@ -4,12 +4,16 @@
 or to start searching from http://davical.org/ and see where you end
 up.
 
+There's lots of useful information at http://wiki.davical.org/ as well,
+and if you want access to update that contact us on IRC or send an e-mail
+to <wiki-access@davical.org>.
+
 Good luck!
 
 Andrew McMillan
 
 -----------------------------------------------
-Copyright: 2006-2008 Andrew McMillan <andrew@catalyst.net.nz>
+Copyright: 2006-2011 Andrew McMillan <andrew@mcmillan.net.nz>
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff -Nru davical-0.9.9.7/scripts/refresh-alarms.php davical-1.0.2/scripts/refresh-alarms.php
--- davical-0.9.9.7/scripts/refresh-alarms.php	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/scripts/refresh-alarms.php	2011-11-09 02:58:32.000000000 +0000
@@ -1,29 +1,18 @@
-#!/usr/bin/php
+#!/usr/bin/env php
 <?php
+/**
+* Script to refresh the pending alarm times for the next alarm instance.
+*
+* @package   davical
+* @subpackage   alarms
+* @author    Andrew McMillan <andrew@morphoss.com>
+* @copyright Morphoss Ltd
+* @license   http://gnu.org/copyleft/gpl.html GNU GPL v3 or later
+*/
+$script_file = __FILE__;
 
-set_include_path('.');
-
-function add_path_for( $include, $paths ) {
-  foreach( $paths AS $test_path ) {
-    if ( @file_exists($test_path.'/'.$include) ) {
-      set_include_path( $test_path. PATH_SEPARATOR. get_include_path());
-      return;
-    }
-  }
-}
-
-add_path_for('AWLUtilities.php', array( '../../awl/inc' , '../awl/inc'
-      , '../../../awl/inc' , '/usr/share/awl/inc' , '/usr/local/share/awl/inc') );
-add_path_for('caldav-client-v2.php', array( '../../davical/inc' , '../davical/inc'
-      , '../../../davical/inc' , '/usr/share/davical/inc' , '/usr/local/share/davical/inc') );
-add_path_for('always.php', array( 'scripts' ) );
-add_path_for('sync-config.php', array( 'config' ) );
-
-
-require('always.php');
-require_once('AwlQuery.php');
-require_once('RRule-v2.php');
-require_once('vComponent.php');
+chdir(str_replace('/scripts/refresh-alarms.php','/htdocs',$script_file));
+$_SERVER['SERVER_NAME'] = 'localhost';
 
 /**
 * Call with something like e.g.:
@@ -36,20 +25,20 @@
 $args->debug = false;
 $args->set_last = false;
 
-$args->future = 'P2000D';
+$args->future = 'P400D';
 $args->near_past = 'P1D';
-$args->far_past = 'P1200D';
 $debugging = null;
 
+
 function parse_arguments() {
   global $args;
 
-  $opts = getopt( 'f:p:n:d:lh' );
+  $opts = getopt( 'f:p:s:d:lh' );
   foreach( $opts AS $k => $v ) {
     switch( $k ) {
       case 'f':   $args->future = $v;  break;
-      case 'n':   $args->near_past = $v;  break;
-      case 'p':   $args->far_past = $v;  break;
+      case 'p':   $args->near_past = $v;  break;
+      case 's':   $_SERVER['SERVER_NAME'] = $v; break;
       case 'd':   $args->debug = true;  $debugging = explode(',',$v); break;
       case 'l':   $args->set_last = true; break;
       case 'h':   usage();  break;
@@ -59,20 +48,20 @@
 }
 
 function usage() {
-  echo <<<EOUSAGE
+
+  echo <<<USAGE
 Usage:
-   refresh-alarms.php [-d]
+   refresh-alarms.php [-s server.domain.tld] [other options]
 
-  -n <duration>    Near past period to skip for finding last instances: default 1 days ('P1D')
-  -p <duration>    Far past period to examine for finding last instances: default ~3 years ('P1200D')
+  -s <server>      The servername to be used to identify the DAViCal configuration file.
+  -p <duration>    Near past period to review for finding recently last instances: default 1 days ('P1D')
   -f <duration>    Future period to consider for finding future alarms: default ~5 years ('P2000D')
 
   -l               Try to set the 'last' alarm date in historical alarms
 
-  -d               Enable debugging
-
-EOUSAGE;
+  -d xxx           Enable debugging where 'xxx' is a comma-separated list of debug subsystems
 
+USAGE;
   exit(0);
 }
 
@@ -84,7 +73,11 @@
   }
 }
 $args->near_past = '-' .  $args->near_past;
-$args->far_past = '-' . $args->far_past;
+
+require_once("./always.php");
+require_once('AwlQuery.php');
+require_once('RRule-v2.php');
+require_once('vCalendar.php');
 
 
 /**
@@ -112,16 +105,18 @@
 $earliest   = clone($expand_range_start);
 $earliest->modify( $args->near_past );
 
+if ( $args->debug ) printf( "Looking for event instances between '%s' and '%s'\n", $earliest->UTC(), $expand_range_end->UTC() );
+
 $sql = 'SELECT * FROM calendar_alarm JOIN calendar_item USING (dav_id) JOIN caldav_data USING (dav_id) WHERE rrule IS NOT NULL AND next_trigger IS NULL';
 if ( $args->debug ) printf( "%s\n", $sql );
 $qry = new AwlQuery( $sql );
 if ( $qry->Exec() && $qry->rows() ) {
   while( $alarm = $qry->Fetch() ) {
-    if ( $args->debug ) printf( "Processing alarm for '%s' based on '%s','%s', '%s'\n",
+    if ( $args->debug ) printf( "refresh: Processing alarm for '%s' based on '%s','%s', '%s'\n",
                           $alarm->dav_name, $alarm->dtstart, $alarm->rrule, $alarm->trigger );
     $ic = new vComponent( $alarm->caldav_data );
     $expanded = expand_event_instances( $ic, $earliest, $expand_range_end );
-    $expanded->MaskComponents( array( 'VEVENT', 'VTODO', 'VJOURNAL' ) );
+    $expanded->MaskComponents( array( 'VEVENT'=>1, 'VTODO'=>1, 'VJOURNAL'=>1 ) );
     $instances = $expanded->GetComponents();
 
     $trigger = new vProperty( $alarm->trigger );
@@ -133,6 +128,7 @@
     $last = null;
     foreach( $instances AS $k => $component ) {
       $when = new RepeatRuleDateTime( $component->GetPValue('DTSTART') ); // a UTC value
+      if ( $args->debug ) printf( "refresh: Looking at event instance on '%s'\n", $when->UTC() );
       if ( $related == 'END' ) {
         $when->modify( $component->GetPValue('DURATION') );
       }
@@ -144,18 +140,37 @@
         $last = clone($when);
       }
     }
+    $trigger_type = $trigger->GetParameterValue('VALUE');
+    if ( $trigger_type == 'DATE' || $trigger_type == 'DATE-TIME' || preg_match('{^\d{8}T\d{6}Z?$}', $trigger->Value()) ) {
+      $first = new RepeatRuleDateTime($trigger);
+      if ( $first > $expand_range_start && (empty($next) || $first < $next ) )
+        $next = $first;
+      else if ( empty($next) ) {
+        if ( $args->set_last && (empty($last) || $first > $last) )
+          $last = $first;
+      }
+    }
+    if ( $args->set_last && !isset($last) && (!isset($next) || $next < $expand_range_Start) ) {
+      $vc = new vCalendar( $alarm->caldav_data );
+      $range = getVCalendarRange($vc);
+      if ( isset($range->until) && $range->until < $earliest ) $last = $range->until;
+    }
+    
     if ( isset($next) && $next < $expand_range_end ) {
-      if ( $args->debug ) printf( "Found next alarm instance on '%s'\n", $next->UTC() );
+      if ( $args->debug ) printf( "refresh: Found next alarm instance on '%s'\n", $next->UTC() );
       $sql = 'UPDATE calendar_alarm SET next_trigger = :next WHERE dav_id = :id AND component = :component';
       $update = new AwlQuery( $sql, array( ':next' => $next->UTC(), ':id' => $alarm->dav_id, ':component' => $alarm->component ) );
       $update->Exec('refresh-alarms', __LINE__, __FILE__ );
     }
     else if ( $args->set_last && isset($last) && $last < $earliest ) {
-      if ( $args->debug ) printf( "Found past final alarm instance on '%s'\n", $last->UTC() );
+      if ( $args->debug ) printf( "refresh: Found past final alarm instance on '%s'\n", $last->UTC() );
       $sql = 'UPDATE calendar_alarm SET next_trigger = :last WHERE dav_id = :id AND component = :component';
       $update = new AwlQuery( $sql, array( ':last' => $last->UTC(), ':id' => $alarm->dav_id, ':component' => $alarm->component ) );
       $update->Exec('refresh-alarms', __LINE__, __FILE__ );
     }
+    else if ( $args->debug && isset($next) && $next < $expand_range_end ) {
+      printf( "refresh: Found next alarm instance on '%s' after '%s'\n", $next->UTC(), $expand_range_end->UTC() );
+    }
   }
 }
 
diff -Nru davical-0.9.9.7/testing/tests/binding/1014-PUT-bound-fail.result davical-1.0.2/testing/tests/binding/1014-PUT-bound-fail.result
--- davical-0.9.9.7/testing/tests/binding/1014-PUT-bound-fail.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/binding/1014-PUT-bound-fail.result	2011-12-01 23:10:43.000000000 +0000
@@ -2,7 +2,7 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-Content-Length: 0
+Content-Length: 19
 Content-Type: text/plain; charset="utf-8"
 
-
+No write permission
diff -Nru davical-0.9.9.7/testing/tests/binding/1036-REPORT-sync-initial-bound.result davical-1.0.2/testing/tests/binding/1036-REPORT-sync-initial-bound.result
--- davical-0.9.9.7/testing/tests/binding/1036-REPORT-sync-initial-bound.result	2011-10-24 03:45:12.000000000 +0000
+++ davical-1.0.2/testing/tests/binding/1036-REPORT-sync-initial-bound.result	2011-12-14 08:59:54.000000000 +0000
@@ -2,14 +2,14 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "e9729234a084898506d4821483a404c9"
-Content-Length: 2292
+ETag: "7aa94bdf662d6b03f844eaf18239d0a8"
+Content-Length: 2301
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
  <response>
-  <href>/caldav.php/user2/home/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
+  <href>/caldav.php/user4/user2/33169d69-2969-4a96-a3e1-2e312b7614e6.ics</href>
   <propstat>
    <prop>
     <getetag>"f2c974ff51cb52cde0668544deb36380"</getetag>
@@ -18,7 +18,7 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user2/home/047871e3-6b70-4178-9af8-0ceb50f7b092.ics</href>
+  <href>/caldav.php/user4/user2/047871e3-6b70-4178-9af8-0ceb50f7b092.ics</href>
   <propstat>
    <prop>
     <getetag>"58cba7e3fafb6080e85619ea77d08c7a"</getetag>
@@ -27,7 +27,7 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user2/home/9429a973-2b13-4b1a-be09-948d75425c45.ics</href>
+  <href>/caldav.php/user4/user2/9429a973-2b13-4b1a-be09-948d75425c45.ics</href>
   <propstat>
    <prop>
     <getetag>"13249ced6c7527191a003f54f7e3cd25"</getetag>
@@ -36,7 +36,7 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user2/home/7d729xc0-0895-012d-124e-002421a2359e.ics</href>
+  <href>/caldav.php/user4/user2/7d729xc0-0895-012d-124e-002421a2359e.ics</href>
   <propstat>
    <prop>
     <getetag>"848df16c32fc3ce319083ae84c2603a3"</getetag>
@@ -45,7 +45,7 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user2/home/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
+  <href>/caldav.php/user4/user2/bd262d20-1cdb-012d-1264-002421a2359e.ics</href>
   <propstat>
    <prop>
     <getetag>"671d4ee904be6c16dd1be076619fe7c0"</getetag>
@@ -54,7 +54,7 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user2/home/56f0e0e0-f742-012d-680c-002421a2359e.ics</href>
+  <href>/caldav.php/user4/user2/56f0e0e0-f742-012d-680c-002421a2359e.ics</href>
   <propstat>
    <prop>
     <getetag>"e18c0d539b6dcb56df2d266dd4305008"</getetag>
@@ -63,7 +63,7 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user2/home/thiswillworkfine.ics</href>
+  <href>/caldav.php/user4/user2/thiswillworkfine.ics</href>
   <propstat>
    <prop>
     <getetag>"9a8d7696ee2e0a0f1f4170fe4f094a3a"</getetag>
@@ -72,7 +72,7 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user2/home/thiswillalsobegood.ics</href>
+  <href>/caldav.php/user4/user2/thiswillalsobegood.ics</href>
   <propstat>
    <prop>
     <getetag>"1c7895f11787e71fd6dbe3260d72d4a0"</getetag>
@@ -81,7 +81,7 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user2/home/70399cd7-50a4-4be4-a665-af593e19a7fd.ics</href>
+  <href>/caldav.php/user4/user2/70399cd7-50a4-4be4-a665-af593e19a7fd.ics</href>
   <propstat>
    <prop>
     <getetag>"ea6b316ca24db20f5eb37d1abd60f8c1"</getetag>
@@ -89,5 +89,5 @@
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,5</sync-token>
+ <sync-token>data:,6</sync-token>
 </multistatus>
diff -Nru davical-0.9.9.7/testing/tests/binding/Restore-Database.result davical-1.0.2/testing/tests/binding/Restore-Database.result
--- davical-0.9.9.7/testing/tests/binding/Restore-Database.result	2011-10-07 05:30:51.000000000 +0000
+++ davical-1.0.2/testing/tests/binding/Restore-Database.result	2011-12-14 08:58:47.000000000 +0000
@@ -25,12 +25,12 @@
 
  setval 
 --------
-      4
+      5
 (1 row)
 
  setval 
 --------
-     13
+     14
 (1 row)
 
  setval 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2006-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2006-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2006-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2006-PUT-vcard.result	2012-01-13 03:36:46.000000000 +0000
@@ -2,22 +2,21 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "fada70a725708bce8521efb87acfa629"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
         caladruri: >NULL<
            caluri: >NULL<
-         dav_etag: >fada70a725708bce8521efb87acfa629<
          dav_name: >/user1/addressbook/donald_kelly.vcf<
+    etag_not_null: >1<
             fburl: >NULL<
                fn: >Donald Kelly<
                 n: >Kelly;Donald;;;<
          nickname: >NULL<
              note: >NULL<
               org: >Esposo Designs Ltd<
-              uid: >NULL<
+     uid_not_null: >1<
               url: >www.example.co.nz<
           version: >2.1<
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2006-PUT-vcard.test davical-1.0.2/testing/tests/carddav/2006-PUT-vcard.test
--- davical-0.9.9.7/testing/tests/carddav/2006-PUT-vcard.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2006-PUT-vcard.test	2012-01-13 03:21:05.000000000 +0000
@@ -24,8 +24,8 @@
 ENDDATA
 
 QUERY
-SELECT caldav_data.dav_name, caldav_data.dav_etag,
-       version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri
+SELECT caldav_data.dav_name, caldav_data.dav_etag IS NOT NULL AS "etag_not_null",
+       version, uid IS NOT NULL AS "uid_not_null", nickname, fn, n, note, org, url, fburl, caladruri, caluri
   FROM caldav_data LEFT JOIN addressbook_resource USING(dav_id)
   WHERE caldav_data.dav_name ~ '/user1/addressbook/donald_kelly.vcf'
 ENDQUERY
diff -Nru davical-0.9.9.7/testing/tests/carddav/2010-REPORT-sync-initial.result davical-1.0.2/testing/tests/carddav/2010-REPORT-sync-initial.result
--- davical-0.9.9.7/testing/tests/carddav/2010-REPORT-sync-initial.result	2011-10-06 09:14:54.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2010-REPORT-sync-initial.result	2012-01-13 03:39:25.000000000 +0000
@@ -2,7 +2,7 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "3446b8401735be64ec24b3e1af5362db"
+ETag: "a fine looking etag"
 Content-Length: 948
 Content-Type: text/xml; charset="utf-8"
 
@@ -12,7 +12,7 @@
   <href>/caldav.php/user1/addressbook/andrew_mcmillan.vcf</href>
   <propstat>
    <prop>
-    <getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontenttype>text/vcard</getcontenttype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -22,7 +22,7 @@
   <href>/caldav.php/user1/addressbook/donald_kelly.vcf</href>
   <propstat>
    <prop>
-    <getetag>"fada70a725708bce8521efb87acfa629"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontenttype>text/vcard</getcontenttype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -32,11 +32,11 @@
   <href>/caldav.php/user1/addressbook/PHRsMa4mvY.vcf</href>
   <propstat>
    <prop>
-    <getetag>"70da8e376791d07c9fae3dbda0b40314"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getcontenttype>text/vcard</getcontenttype>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,6</sync-token>
+ <sync-token>data:,7</sync-token>
 </multistatus>
diff -Nru davical-0.9.9.7/testing/tests/carddav/2010-REPORT-sync-initial.test davical-1.0.2/testing/tests/carddav/2010-REPORT-sync-initial.test
--- davical-0.9.9.7/testing/tests/carddav/2010-REPORT-sync-initial.test	2010-09-25 04:54:23.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2010-REPORT-sync-initial.test	2012-01-13 03:38:52.000000000 +0000
@@ -18,3 +18,6 @@
 </D:sync-collection>
 ENDDATA
 
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
+REPLACE=/^ETag: "[0-9a-f]+"\s$/ETag: "a fine looking etag"/
+
diff -Nru davical-0.9.9.7/testing/tests/carddav/2011-PROPFIND.result davical-1.0.2/testing/tests/carddav/2011-PROPFIND.result
--- davical-0.9.9.7/testing/tests/carddav/2011-PROPFIND.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2011-PROPFIND.result	2012-01-13 03:39:51.000000000 +0000
@@ -19,7 +19,7 @@
   <href>/caldav.php/user1/addressbook/andrew_mcmillan.vcf</href>
   <propstat>
    <prop>
-    <getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -29,7 +29,7 @@
   <href>/caldav.php/user1/addressbook/donald_kelly.vcf</href>
   <propstat>
    <prop>
-    <getetag>"fada70a725708bce8521efb87acfa629"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -39,7 +39,7 @@
   <href>/caldav.php/user1/addressbook/PHRsMa4mvY.vcf</href>
   <propstat>
    <prop>
-    <getetag>"70da8e376791d07c9fae3dbda0b40314"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -47,9 +47,5 @@
  </response>
 </multistatus>
 
-         dav_etag: >24bae2a7f81c0a79413a656c06d8326b<
-
-         dav_etag: >fada70a725708bce8521efb87acfa629<
-
-         dav_etag: >70da8e376791d07c9fae3dbda0b40314<
+            count: >3<
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2011-PROPFIND.test davical-1.0.2/testing/tests/carddav/2011-PROPFIND.test
--- davical-0.9.9.7/testing/tests/carddav/2011-PROPFIND.test	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2011-PROPFIND.test	2012-01-13 03:39:47.000000000 +0000
@@ -20,11 +20,11 @@
 </propfind>
 ENDDATA
 
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
 
 QUERY
-SELECT caldav_data.dav_etag
+SELECT count(1)
 FROM collection LEFT JOIN caldav_data USING(collection_id)
 WHERE collection.dav_name = '/user1/addressbook/'
-ORDER BY caldav_data.dav_id
 ENDQUERY
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2012-REPORT-addressbook-multiget.result davical-1.0.2/testing/tests/carddav/2012-REPORT-addressbook-multiget.result
--- davical-0.9.9.7/testing/tests/carddav/2012-REPORT-addressbook-multiget.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2012-REPORT-addressbook-multiget.result	2012-01-13 03:40:32.000000000 +0000
@@ -2,8 +2,8 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "87ab9b65008470d67893424808e1c0b4"
-Content-Length: 2266
+ETag: "a fine looking etag"
+Content-Length: 2330
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -12,11 +12,11 @@
   <href>/caldav.php/user1/addressbook/andrew_mcmillan.vcf</href>
   <propstat>
    <prop>
-    <getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:3.0
 REV:2010-03-29T09:23:34Z
-UID:pas-id-4BB0719600000000
+UID:excellent-looking-uid-string
 X-SKYPE;X-EVOLUTION-UI-SLOT=1;TYPE=HOME:karora__
 X-JABBER;X-EVOLUTION-UI-SLOT=3;TYPE=HOME:karora@irc.oftc.net
 TEL;X-EVOLUTION-UI-SLOT=3;TYPE=CELL:+64 22 123 4567
@@ -57,8 +57,8 @@
   <href>/caldav.php/user1/addressbook/donald_kelly.vcf</href>
   <propstat>
    <prop>
-    <getetag>"fada70a725708bce8521efb87acfa629"</getetag>
-    <VC:address-data>begin:vcard
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
+    <VC:address-data>BEGIN:VCARD
 fn:Donald Kelly
 n:Kelly;Donald;;;
 org:Esposo Designs Ltd
@@ -70,7 +70,9 @@
 x-mozilla-html:TRUE
 url:www.example.co.nz
 version:2.1
-end:vcard
+UID:excellent-looking-uid-string
+REV:YYYYMMDDTHHMMSSZ
+END:VCARD
 </VC:address-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
diff -Nru davical-0.9.9.7/testing/tests/carddav/2012-REPORT-addressbook-multiget.test davical-1.0.2/testing/tests/carddav/2012-REPORT-addressbook-multiget.test
--- davical-0.9.9.7/testing/tests/carddav/2012-REPORT-addressbook-multiget.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2012-REPORT-addressbook-multiget.test	2012-01-13 03:40:24.000000000 +0000
@@ -21,4 +21,8 @@
 </C:addressbook-multiget>
 ENDDATA
 
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
+REPLACE=/UID:.+/UID:excellent-looking-uid-string/
+REPLACE=/REV:\d{8}T\d{6}Z/REV:YYYYMMDDTHHMMSSZ/
+REPLACE=/^ETag: "[0-9a-f]+"\s$/ETag: "a fine looking etag"/
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2013-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2013-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2013-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2013-PUT-vcard.result	2012-01-13 04:27:36.000000000 +0000
@@ -32,8 +32,8 @@
           unit_no: >NULL<
 
               tel: >64272332426<
-             type: >pref<
+             type: >WORK~|~pref<
 
             email: >andrew+davical@morphoss.com<
-             type: >pref<
+             type: >INTERNET~|~WORK~|~pref<
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2014-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2014-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2014-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2014-PUT-vcard.result	2012-01-13 04:19:15.000000000 +0000
@@ -34,8 +34,8 @@
           unit_no: >NULL<
 
               tel: >64272332426<
-             type: >pref<
+             type: >WORK~|~pref<
 
             email: >andrew+davical@morphoss.com<
-             type: >pref<
+             type: >INTERNET~|~WORK~|~pref<
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2015-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2015-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2015-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2015-PUT-vcard.result	2012-01-13 03:36:57.000000000 +0000
@@ -2,14 +2,12 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "d43780719361367f2d690f1f966e3da1"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
         caladruri: >NULL<
            caluri: >NULL<
-         dav_etag: >d43780719361367f2d690f1f966e3da1<
          dav_name: >/user1/addressbook/van_houtte.vcf<
             fburl: >NULL<
                fn: >Vincent VAN HOUTTE<
@@ -17,7 +15,6 @@
          nickname: >NULL<
              note: >NULL<
               org: >Advocatenkantoor Suy, Van Baeveghem & Van Houtte;;<
-              uid: >NULL<
               url: >NULL<
           version: >3.0<
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2015-PUT-vcard.test davical-1.0.2/testing/tests/carddav/2015-PUT-vcard.test
--- davical-0.9.9.7/testing/tests/carddav/2015-PUT-vcard.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2015-PUT-vcard.test	2012-01-13 03:32:14.000000000 +0000
@@ -34,8 +34,8 @@
 ENDDATA
 
 QUERY
-SELECT caldav_data.dav_name, caldav_data.dav_etag,
-       version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri
+SELECT caldav_data.dav_name,
+       version, nickname, fn, n, note, org, url, fburl, caladruri, caluri
   FROM caldav_data LEFT JOIN addressbook_resource USING(dav_id)
   WHERE caldav_data.dav_name ~ '/user1/addressbook/van_houtte.vcf'
 ENDQUERY
diff -Nru davical-0.9.9.7/testing/tests/carddav/2016-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2016-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2016-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2016-PUT-vcard.result	2012-01-13 04:21:03.000000000 +0000
@@ -4,14 +4,12 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "e67537e9d473e93911eccd6e63e9ac3a"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
         caladruri: >NULL<
            caluri: >NULL<
-         dav_etag: >e67537e9d473e93911eccd6e63e9ac3a<
          dav_name: >/user1/addressbook/mustrmahn.vcf<
             fburl: >NULL<
                fn: >Überwerbung GmbH<
@@ -19,7 +17,6 @@
          nickname: >Boss<
              note: >Test vCard<
               org: >Überwerbung GmbH;Marketing<
-              uid: >NULL<
               url: >NULL<
           version: >3.0<
 
@@ -37,8 +34,8 @@
              type: >CELL<
 
               tel: >+49 30 1234567<
-             type: >pref<
+             type: >WORK~|~pref<
 
             email: >karl@mustermann.de<
-             type: >pref<
+             type: >INTERNET~|~WORK~|~pref<
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2016-PUT-vcard.test davical-1.0.2/testing/tests/carddav/2016-PUT-vcard.test
--- davical-0.9.9.7/testing/tests/carddav/2016-PUT-vcard.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2016-PUT-vcard.test	2012-01-13 03:32:37.000000000 +0000
@@ -141,8 +141,8 @@
 ENDDATA
 
 QUERY
-SELECT caldav_data.dav_name, caldav_data.dav_etag,
-       version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri
+SELECT caldav_data.dav_name,
+       version, nickname, fn, n, note, org, url, fburl, caladruri, caluri
   FROM caldav_data LEFT JOIN addressbook_resource USING(dav_id)
   WHERE caldav_data.dav_name ~ '/user1/addressbook/mustrmahn.vcf'
 ENDQUERY
diff -Nru davical-0.9.9.7/testing/tests/carddav/2017-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2017-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2017-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2017-PUT-vcard.result	2012-01-13 04:27:49.000000000 +0000
@@ -4,14 +4,12 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "f6ae02ec1b5612fe4737092734d062c7"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
         caladruri: >http://caldav.andresen.local/access<
            caluri: >http://caldav.andresen.local/sja<
-         dav_etag: >f6ae02ec1b5612fe4737092734d062c7<
          dav_name: >/user1/addressbook/andresenesq.vcf<
             fburl: >http://caldav.andresen.local/freebusy<
                fn: >Sven Joseph Klaus Michael Andresen, Esq.<
@@ -19,7 +17,6 @@
          nickname: >Svenny,Sveny<
              note: >Nur so ein Test!<
               org: >andresen AG;R&D;;XXX, 033<
-              uid: >uid=andresenesq.1209158007,ou=Contacts,dc=andresen,dc=de<
               url: >http://www.andresen.de<
           version: >4.0<
 
@@ -37,8 +34,8 @@
           country: >NULL<
          locality: >Irgendwo<
          postcode: >34332<
-         property: >ADR;TYPE=WORK;CHARSET=utf-8:6266 AA\;andresen Holding\, Geschäftsleitung
- \;Weisenstraße 13\;Irgendwo\;Niedersachsen\;34332<
+         property: >ADR;TYPE=WORK;CHARSET=utf-8:6266 AA;andresen Holding\, Geschäftsleitung;
+ Weisenstraße 13;Irgendwo;Niedersachsen;34332<
            region: >Niedersachsen<
    street_address: >Weisenstraße 13<
              type: >WORK<
@@ -48,8 +45,8 @@
           country: >Deutschland<
          locality: >Passau<
          postcode: >94036<
-         property: >ADR;TYPE=WORK;CHARSET=utf-8:PO 373\;Andresen AG\, R&D\;Messegasse 7\;Pas
- sau\;Bayern\;94036\;Deutschland<
+         property: >ADR;TYPE=WORK;CHARSET=utf-8:
+ PO 373;Andresen AG\, R&D;Messegasse 7;Passau;Bayern;94036;Deutschland<
            region: >Bayern<
    street_address: >Messegasse 7<
              type: >WORK<
diff -Nru davical-0.9.9.7/testing/tests/carddav/2017-PUT-vcard.test davical-1.0.2/testing/tests/carddav/2017-PUT-vcard.test
--- davical-0.9.9.7/testing/tests/carddav/2017-PUT-vcard.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2017-PUT-vcard.test	2012-01-13 03:33:15.000000000 +0000
@@ -411,8 +411,8 @@
 ENDDATA
 
 QUERY
-SELECT caldav_data.dav_name, caldav_data.dav_etag,
-       version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri
+SELECT caldav_data.dav_name,
+       version, nickname, fn, n, note, org, url, fburl, caladruri, caluri
   FROM caldav_data LEFT JOIN addressbook_resource USING(dav_id)
   WHERE caldav_data.dav_name ~ '/user1/addressbook/andresenesq.vcf'
 ENDQUERY
diff -Nru davical-0.9.9.7/testing/tests/carddav/2018-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2018-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2018-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2018-PUT-vcard.result	2012-01-13 04:27:56.000000000 +0000
@@ -4,14 +4,12 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "db3e92c0ae37268c647949367e2030cc"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
         caladruri: >http://davical.hadi-schmist.home/access<
            caluri: >http://davical.hadi-schmist.home/hadi<
-         dav_etag: >db3e92c0ae37268c647949367e2030cc<
          dav_name: >/user1/addressbook/hans_dieter.vcf<
             fburl: >http://davical.hadi-schmist.home/freebusy<
                fn: >Hans Dieter Schmidt<
@@ -37,8 +35,8 @@
           country: >Deutschland<
          locality: >Hamburg-Harburg<
          postcode: >21373<
-         property: >ADR;TYPE=WORK;CHARSET=utf-8:\;Uni Harburg\, -\;Innstraße 71\;Hamburg-Har
- burg\;Hamburg\;21373\;Deutschland<
+         property: >ADR;TYPE=WORK;CHARSET=utf-8:
+ ;Uni Harburg\, -;Innstraße 71;Hamburg-Harburg;Hamburg;21373;Deutschland<
            region: >Hamburg<
    street_address: >Innstraße 71<
              type: >WORK<
diff -Nru davical-0.9.9.7/testing/tests/carddav/2018-PUT-vcard.test davical-1.0.2/testing/tests/carddav/2018-PUT-vcard.test
--- davical-0.9.9.7/testing/tests/carddav/2018-PUT-vcard.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2018-PUT-vcard.test	2012-01-13 03:33:54.000000000 +0000
@@ -129,7 +129,7 @@
 ENDDATA
 
 QUERY
-SELECT caldav_data.dav_name, caldav_data.dav_etag,
+SELECT caldav_data.dav_name,
        version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri
   FROM caldav_data LEFT JOIN addressbook_resource USING(dav_id)
   WHERE caldav_data.dav_name ~ '/user1/addressbook/hans_dieter.vcf'
diff -Nru davical-0.9.9.7/testing/tests/carddav/2019-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2019-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2019-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2019-PUT-vcard.result	2012-01-13 03:37:02.000000000 +0000
@@ -2,14 +2,12 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "feaa1a28c9942fc56403e2f97f75171b"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
         caladruri: >NULL<
            caluri: >NULL<
-         dav_etag: >feaa1a28c9942fc56403e2f97f75171b<
          dav_name: >/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf<
             fburl: >NULL<
                fn: >Jörg Test-Roßdeutscher<
@@ -17,7 +15,6 @@
          nickname: >NULL<
              note: >Technik, Web, DTP, SysAdmin, €-Vermögensverwalter<
               org: >Factor Design AG;<
-              uid: >NULL<
               url: >www.gesindel.baz<
           version: >2.1<
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2019-PUT-vcard.test davical-1.0.2/testing/tests/carddav/2019-PUT-vcard.test
--- davical-0.9.9.7/testing/tests/carddav/2019-PUT-vcard.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2019-PUT-vcard.test	2012-01-13 03:34:18.000000000 +0000
@@ -32,8 +32,8 @@
 ENDDATA
 
 QUERY
-SELECT caldav_data.dav_name, caldav_data.dav_etag,
-       version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri
+SELECT caldav_data.dav_name,
+       version, nickname, fn, n, note, org, url, fburl, caladruri, caluri
   FROM caldav_data LEFT JOIN addressbook_resource USING(dav_id)
   WHERE caldav_data.dav_name ~ '/user1/addressbook/Jörg_Test-Roßdeutscher_2_0.vcf'
 ENDQUERY
diff -Nru davical-0.9.9.7/testing/tests/carddav/2020-PUT-vcard.result davical-1.0.2/testing/tests/carddav/2020-PUT-vcard.result
--- davical-0.9.9.7/testing/tests/carddav/2020-PUT-vcard.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2020-PUT-vcard.result	2012-01-13 04:21:11.000000000 +0000
@@ -2,14 +2,12 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "5a32961b9938a7d6a354a757a8a1ea36"
 Content-Length: 0
 Content-Type: text/plain; charset="utf-8"
 
 
         caladruri: >NULL<
            caluri: >NULL<
-         dav_etag: >5a32961b9938a7d6a354a757a8a1ea36<
          dav_name: >/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf<
             fburl: >NULL<
                fn: >Jörg Test-Roßdeutscher<
@@ -17,7 +15,6 @@
          nickname: >NULL<
              note: >Technik, Web, DTP, SysAdmin, €-Vermögensverwalter<
               org: >Factor Design AG;<
-              uid: >NULL<
               url: >NULL<
           version: >3.0<
 
@@ -38,17 +35,17 @@
              type: >HOME<
 
               tel: >040 999999432571-43<
-             type: >pref<
+             type: >WORK~|~pref<
 
             email: >joerg.rossdeutscher@gesindel.foo<
-             type: >HOME<
+             type: >INTERNET~|~HOME<
 
             email: >raettchen@gmail.bar<
-             type: >HOME<
+             type: >INTERNET~|~HOME<
 
             email: >joerg@factordesign.foo<
-             type: >WORK<
+             type: >INTERNET~|~WORK<
 
             email: >joerg.rossdeutscher@factordesign.foo<
-             type: >pref<
+             type: >INTERNET~|~WORK~|~pref<
 
diff -Nru davical-0.9.9.7/testing/tests/carddav/2020-PUT-vcard.test davical-1.0.2/testing/tests/carddav/2020-PUT-vcard.test
--- davical-0.9.9.7/testing/tests/carddav/2020-PUT-vcard.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2020-PUT-vcard.test	2012-01-13 03:34:51.000000000 +0000
@@ -37,8 +37,8 @@
 ENDDATA
 
 QUERY
-SELECT caldav_data.dav_name, caldav_data.dav_etag,
-       version, uid, nickname, fn, n, note, org, url, fburl, caladruri, caluri
+SELECT caldav_data.dav_name,
+       version, nickname, fn, n, note, org, url, fburl, caladruri, caluri
   FROM caldav_data LEFT JOIN addressbook_resource USING(dav_id)
   WHERE caldav_data.dav_name ~ '/user1/addressbook/Jörg_Test-Roßdeutscher_3_0.vcf'
 ENDQUERY
diff -Nru davical-0.9.9.7/testing/tests/carddav/2031-REPORT-addressbook-multiget.result davical-1.0.2/testing/tests/carddav/2031-REPORT-addressbook-multiget.result
--- davical-0.9.9.7/testing/tests/carddav/2031-REPORT-addressbook-multiget.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2031-REPORT-addressbook-multiget.result	2012-01-13 04:28:37.000000000 +0000
@@ -2,8 +2,8 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "6273a9f7da96e95df34e39f9839dc34e"
-Content-Length: 67517
+ETag: "a fine looking etag"
+Content-Length: 67715
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -12,11 +12,11 @@
   <href>/caldav.php/user1/addressbook/andrew_mcmillan.vcf</href>
   <propstat>
    <prop>
-    <getetag>"24bae2a7f81c0a79413a656c06d8326b"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:3.0
 REV:2010-03-29T09:23:34Z
-UID:pas-id-4BB0719600000000
+UID:excellent-looking-uid-string
 X-SKYPE;X-EVOLUTION-UI-SLOT=1;TYPE=HOME:karora__
 X-JABBER;X-EVOLUTION-UI-SLOT=3;TYPE=HOME:karora@irc.oftc.net
 TEL;X-EVOLUTION-UI-SLOT=3;TYPE=CELL:+64 22 123 4567
@@ -57,8 +57,8 @@
   <href>/caldav.php/user1/addressbook/donald_kelly.vcf</href>
   <propstat>
    <prop>
-    <getetag>"fada70a725708bce8521efb87acfa629"</getetag>
-    <VC:address-data>begin:vcard
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
+    <VC:address-data>BEGIN:VCARD
 fn:Donald Kelly
 n:Kelly;Donald;;;
 org:Esposo Designs Ltd
@@ -70,7 +70,9 @@
 x-mozilla-html:TRUE
 url:www.example.co.nz
 version:2.1
-end:vcard
+UID:excellent-looking-uid-string
+REV:YYYYMMDDTHHMMSSZ
+END:VCARD
 </VC:address-data>
    </prop>
    <status>HTTP/1.1 200 OK</status>
@@ -80,7 +82,7 @@
   <href>/caldav.php/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf</href>
   <propstat>
    <prop>
-    <getetag>"0ea4d7759e103090c6494505b5da0f11"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:3.0
 N:McMillan;Andrew;;;
@@ -404,7 +406,7 @@
 X-ABShowAs:COMPANY
 CATEGORIES:My Contacts
 X-ABUID:685FC9B6-8446-45B8-89AF-3F3BC70CA03A\:ABPerson
-UID:F26B8512-45DA-49ED-B285-23E64B0A68D1-ABSPlugin
+UID:excellent-looking-uid-string
 REV:2010-06-23T00:01:37Z
 END:VCARD
 </VC:address-data>
@@ -416,7 +418,7 @@
   <href>/caldav.php/user1/addressbook/van_houtte.vcf</href>
   <propstat>
    <prop>
-    <getetag>"d43780719361367f2d690f1f966e3da1"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:3.0
 PROFILE:VCARD
@@ -436,7 +438,8 @@
 TEL;TYPE=WORK,VOICE:052 11 22 33
 TEL;TYPE=WORK,FAX:052 44 55 66
 EMAIL;TYPE=WORK:vvh@gmail.no
-REV:2010-06-23TZ
+UID:excellent-looking-uid-string
+REV:2010-06-23T000000Z
 END:VCARD
 </VC:address-data>
    </prop>
@@ -447,7 +450,7 @@
   <href>/caldav.php/user1/addressbook/mustrmahn.vcf</href>
   <propstat>
    <prop>
-    <getetag>"e67537e9d473e93911eccd6e63e9ac3a"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:3.0
 N:Mustermann;Anton;Karl;Dr.;
@@ -470,111 +473,119 @@
 BDAY;value=date:1969-08-16
 X-AIM;type=WORK;type=pref:bethel69
 X-JABBER;type=HOME;type=pref:bethel69@foo.com
-PHOTO;BASE64:
-  /9j/4AAQSkZJRgABAQAAAQABAAD/4QBARXhpZgAATU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAA
-  AqACAAQAAAABAAAAS6ADAAQAAAABAAAASwAAAAD/2wBDAAIBAQIBAQICAQICAgICAwUDAwMDAwYE
-  BAMFBwYHBwcGBgYHCAsJBwgKCAYGCQ0JCgsLDAwMBwkNDg0MDgsMDAv/2wBDAQICAgMCAwUDAwUL
-  CAYICwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwv/wAAR
-  CABLAEsDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgED
-  AwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRol
-  JicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWW
-  l5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3
-  +Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3
-  AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5
-  OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaan
-  qKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIR
-  AxEAPwDmrj9qzxB4q8F3MniG/uYdSubhYYxa+U9zJGkYJQQNMpbgKwZV4KeormNe+MXiG90sWN/d
-  6Zql/qN1NcTzRW6EMXAVV2sg3SKwfPHGW5PU/NXgq90/xwJo9KS61eSaGSUyWqMGjKqQs8kxJWDG
-  TydpcEqo5yf11/4Ji/8ABJXw38XP2d9J+In7SN94qkuvFVlLceHdJhvjB/wj1pKCIrre0Yk+0FPm
-  G8lIw6jYWBY/u9XinDYCEXtFaJRtt2SWiPiaeRYjHSc5Xb6uTf66s8//AOCc37dE3wl+P1t4X8Tv
-  byeB/H17a2d5Yr5cENlLegRwyxRgbV/eyRIyqACkgJ6V3f8AwVQ/4Ja+FfjN4Pvrn4F6nL8NdY04
-  Y1WDR1EVjrFsALjDWzHZBOB5bCQFFycMGFfKv/BTD/gnv47/AGEfiLYv8B9Q8ReOfB2qrBa6ZqUM
-  fm6noV1BKk8VrflFwCbdNyXRCBwjZAIWvXfiB+2Pb+A/Duup4N1e9Hh+9n86S7vbybUNQuSURRDD
-  NcO5jDFGG4scbSVTawr53G5vg54qONg2lOPvJdWu6vvbT5I9illmIp0fYJWs9G9jz34JfG/4c/sr
-  fCK60rTtP8Q6x4V0tDfX+vaRYlNaSVUZ3h1C0mI8uQkvP58D7JI7hXhjYJKU8x/Z2+NGvftT/tDe
-  Evhx+zv4LvdMXVtWj1CHSYIpLa00m1VjNc3Ny8iARxKhLPIByzhUBMsYLtX/AGpEstYuLnRLSz0X
-  TnhWeC00yFYINUgMkrlmZcHzlkklIduI2kkwF3kV9V/8Et/+Chvhb4WfEQ+DfFt5frB49lgms9Vu
-  L15okIAWOBQ5xCrO3zgYVnkU45NfL8RY1cQ06dDncYRafLZa+r3Vrnt5Vl0sJX9pJpy73Z+mXwM/
-  Z70T4DaYl0n2bVPEbQeRc6rMu1wDtLRxK2TFFlF+TPJQFsnms342ftC2Fl4ZA0LU9Jg1G6uTp3l3
-  F3DBIrgB8RtK4TOzc4z/AAhvQVyP7Yvxqv8A4S/sv/EDXvCMkQ1TQtEnubFrltsfmgqEMn96PLYG
-  PvHg1/N7+2f8V/iN8UvElhoX7U/j2W40HxVfm8xZwSx2kl0EMRieGVikLR5K7gPujjg15tHC1MNB
-  4ijR54Qdm+idtLndmc4yt9Yn+8lt/wAA/e/9k/8AaB079ofTLjxPptzp17b60S8NzplwbmxvVt2a
-  3MsErcshdJR/tcnoa0PFmiJrniS9uo3nZJJSFZXIDAfKD+IGa+ff+CWvw+8VeAP2Jf2e9d8UXYuU
-  8Q+DLcAmNTsgR5BZJkdSLKO359c19c+HLSFtFgMyxu2DlnQbjyetffYR/u1NrXb7m0fN4iSp1OVb
-  Dda/4KE+Cvgzby2/iTwv4x8EWcL+WG1HwtJptupHQK4TY/XtwK821T/gr94O8R6tFo/geeHVdZ1t
-  nttEgs3+0S6rdDGLYQg8kqpbII2bdx4VhXu/g742Q6hZm3u7hrceXsdCG2jtjJ+U1xHiv9lD4VfF
-  nxveXet+EdE0zxJDaxyWesaXaRw3ce5jsukeJRtuIpVVklTEi4GW8suD+Z4vK8YqfNQraLyV38/0
-  t8z6vA5rhfaf7TR+ab/I8K/4LBfETxl8Hv2LNH0q10wXkPi/XoZfHeq27iT+x7WL/TG2xn5nLPHH
-  CJT8qLETjL1+MfxN/a3tfEDSyST2sUcyNG0JYsgh2/djYHCAAcHGCBuxgMD+qn7VfxOuj8KLjQf2
-  ifF2i23iMajceDdanuRBBp9xcpFG4ZxLlUW5iaGZAoXBkG0jAr4Q1r9j/wCA3wFuoZPFF38OP7Tm
-  uJp0g1e7jmkZFxwyzuwUBgcyEBT0LV81VzqpQfJCm3/wD2MZllV83LHmW91trsfFl/8AHqa+04W+
-  h3s89xYuZbdLUedgNjKsiqdxIC54zwM5IzW9ongr44fE+HzPhR8OPiRqYf8Ae+ZbaHdKquAWcLvj
-  +bh0bAK45wa+x/Cv/BQjUPAHhDVYfhP8KfDsem6JI9jFq6+IZIvC8BkHmRBUsFSA3EuJWSJ503fN
-  txsctleEv+Cy3xE8Z/C69YJ4S0Z7ixuLK+u9K0IvqWkxyq0R+xSXU8qS7Hj3/OjttDfNuZTSp4/F
-  Yl+7C3rJX+655To16TSdO3rp+Vz9DP2s/HvijX/+COuo2d9A3i74iXvgrS9L1fSdMK6jqY1WT7It
-  xBJbW++QOsjsrLw3BJPFfk38ItK0j4p/tIaX8Mfi74bsfEs+tasPDM+ieITJYmz1S7X7PbyRvC6S
-  RYkZIGY4eNt25T5YY/d2h/ts+G/28f8Agmn8SY/HJ0Lwx+0J4R0GTXFufD1vHpOp362ZM/2zSbzA
-  l3GGBkePLSJghlPmHP5L6h+07ZfGeS58U/ErTru18b6vAJrzVNLmWGDU7tSomurm2kjISSZN7yTQ
-  uB56RuIxvOP0jhbF+0o1cPXceWT9Xtb7tjzuJqTqeyrNarsf1N638H7X4T/Afwt4W8H2UVpZfDnT
-  LHT7G3iZpYoobO2S12IWJZlEanBb5iACecivG9N/ap8G2tr5V9rAhmid0eOd3jkQhiCCo6D09sV8
-  Ufsof8HJY8B+B/DGkfto6DqfifRooF0u88V6M3m39gpUIlxc2hbF1G6nLSRFZF8tvlY/KPqnT/ij
-  +zZ8U9OtvENp47+Fetw6vDHcRXw8U2cDXKFRtZ4pXWSN8AbkdVZWDBgCCK+hwcZYJPC1baWaa2af
-  Y+UlONV+0a3Ifhx8Z73+2bO21qeJYbskQNcBm8xPTyVyWf6K2PavWPjR8a9R+G2jaDfeCtEiku70
-  fZDcanqCW1vabyqb5UiQuFPykAn+FsgHIHyr4W+KukaRqrvYiKNvODPJGxEjuQBnJ5PQjPpXpX7Q
-  37Q2if8ADPus/FXVpJLKD4QDb4htVCrDqljcQmS1HLKglFyyIhYhf3kisSHxXysKyjScr7Hvzpvn
-  SaPD/wBrDx7ceA9bk0rQ0sPEVh47sb298RaPdSi4j1+WKSG2uLYLMrIzoL6xntmZVSL7Iof5JmZc
-  r9oK/wBH/Z90vVND+L/wV/4Wdpnifw2tpomuaYotdb0/W7S3EKzSSwyLcfZJIvs8rPbFmgkhbbCw
-  nUJ4N4B8E3Xx3vYr/wCL3j3w9Z3XhXTry41Tw7aak8N5bmQxPPFfagBItohWGJSkaNI27hirZq7o
-  3x60a4+IetXPwqv/AA7JqFxc/Yrq31ia7ub63fzDgNbIvlqjISsbpIjFUOADvFfndZYrB0PrVSNl
-  dq/XXX0/G/kfouWPLc2rPL+a8+VO17fD0v8AoR/tE/GqXwN+wZpWn/GPR10m7EEqabpMWkwxwf2j
-  Kju11LZW4Cm8k3yPNO48w/MGIA2j8rPCvxck8L6VdWejRyWf2u2uIjL5h3qHfaCe4P3yfbiv1Q/a
-  t8XXHxJ+Ekq6Dp0lzqmnea9tE0WdzvFJExHZgwZ1z/EvXOa+Ik/4JLeLfEHhK61Sx1vRNNvo5Jrm
-  4t7vdBHb2qx/PKWTd84JC7SANpB6mufCYunL45auxWeYapFxWFjaMen5/wDBPN/A/wARNVv73wvo
-  fwue2uPEWp6pFFYwblSGN2EkTv8A9MI1IiYvwm1CSMK2ej/aF/Yn+Jnww8c+Nr2y+H+uX/hzQ9dv
-  9NuNY0LTZrjR/tFq8a3DxOqH9yskmFfhDuZR9w12f7EHwoi8PePpPHNpbafFaWDSrayxx74JLeG3
-  eANHuJLG5ncgDPIT3xX2xovxd8VJ4rudQ8O3d7YC2sfIJEsc1wXilEs0kYkYnKiTygf3e7bIVYEH
-  P3mTZdGMY1pSak+lloflOccRSpzlh4wUkut3o/8Agn5geEfFMmoaFcxaYzTTWuJCYlZ5IW+bcCpO
-  fm2sTnjDMuAGxXc6P+zn4Z+IWnprTwTacdQLS/ZorqIpH8xHGITjOM4ycZxX3H4++MnwJ/a+17Wt
-  K+PXw312CfQpEttS+J3h3w+bq9tT5asuozXFmkSyIsqvDLE0VzuePIlRDuT4y+LH7JfxA/Z48fX3
-  hHSfDWv+N9P0wRS2Ov8AhvWjDpesWs8SXEFxDGYWMe+KaNmQklXLA9K+1w+Z0KdNQqrnS8jyaU/r
-  Ert+zdr6tar+vmfX3w++Lnib4n3V8fh1pFzqEenAySu08cNpYKpOGuJ952YHRWxkdOtekfBP9t/Q
-  /hXrl/qHxw0zwx4gi04Rajpk0Wo2c9v4f1C0VpF1N7eWWX7WbeITSxI0RaOSPzIkLqrL1vh/9kC7
-  8TazpsH7Rc+t2vgW5uFt4LTSNItrjT7SRw7LKp0x5LO7iXCgqXQgdlbICW/7Vnw9+AOq3cJ8O6L/
-  AMKt1ELaaR8QfDOmmbUL1ysvmWzaOiGSFN8Uqbg5BG1vvMa/Nfr0cI4xqTS5tubZ9fTp3Pq61ZSf
-  JbX7vz6ng37Vf7ct94/8U69eXlzrZ8OaPaQ3Fva3qSwXWrXl2m23a7LYMzyxb5zPycKWznFfEXw0
-  +OXjr4W6/wCIvGXwk18W+qa9rRtLmJ41ktNRWLOyPyWGAI1kO1h0BIFfbX/BXfwTrXxY8LeFfiB8
-  NZ1uvCdtZJCyWkBhnslnBaGZ967ijJJtww/c8g/eFfJ2i+BrPRvBej6faRSR21szklgPnYtuLMRz
-  tLseD0wAeldTxbziHvWt2X9eR5NXDyyDEOpCT5pWs3vY+hP2RvB3xQ/bD8OTeKvH2rre6fa6nPaX
-  Ftp8T2c0flOu2QtITkEs42r24q5+3Np83h650v4OfD13lu/FbWy+JdQIeSa3sZZPMis1kzwZRG8r
-  EcAKAetfWX/BG/wJbaL+yPpOq/KZ9dmuNRuV+8GdrqVwRnvtUDNfOf7c2v2tj/wUK8eQ6ne6Z4Zj
-  ENhAuoahKkVnYq2nWq72Zm2hiWfgr2rxsDk1CWLVSWy18tD7bNM5rUsnUr/vJJa97/qca1xbXXxX
-  8B/D74fWqwWcV3FdX0UJCLBa2EfmJEB90OZfK5PACe9cb+1t8Stf+CPxVv49C1S1srix0a6WO4lQ
-  YWC5uNsAEX3GJkjJKgYG0N2zWX8evCOlfCGxtdH8IeJTrPirxvbT6asenSC7kMNyYmuJYViAzvRX
-  +Yv/ABAdsDJ8afsMfFT4lXJ8f+M9OjuNNQWmm6XFd3gl3W4EdqkkoQnHyuSwz1znnNfSY3MYYWLi
-  3Z36P/I/NsBlVbMmpU4N730/zPoD9lme3+CHhrw82oa82gazLYAS6e97HLJZRzItxPcvcKdsAWV3
-  cg4bEx5YsFHrHg3/AIK7eFPC/hq1sNC1b4lala2wZUuobOK2inyxJaKOa4WQRkk7d6hiu0kc1u/s
-  /f8ABule6n8Ira/8efEK+t/Eh23Mdvp9pFNpKyhi6vJFOn79gcfeY4IOMcVynif/AIJb/teeHNfu
-  rLwt4F+H/ibT7d8QapBcG0S8U87vJyQjckMAcbgcYHFdVLN3FJSjZdLxcr/cddfg/Ey96VnfopJW
-  9dV+Z+o/hr9n74XfDP4SP4j/AGE4rfNx5cNpY3us3iWVp5j70W5gMgkZVbG1SwxuOSydeC/a+/Yq
-  1r49x2etfCSHTZrnStFXS9Q8Nx6VBptzDH5yTLPpt3bJGruJIm24ffGHbynQuwf4M1f4w+IPBf7S
-  Og+HvDV1bW+kX+qNFcwGwt5DOvkyS/NI8ZcneAck56jOCRX2Z4t+OvjD4O/syazd/DTxDqWkzvf2
-  0QMUm5YldV3eWrZWMnJBZADjjOOK8auoVMP7KrH7nY9TEUFjLxm21030/Fo+a/B0t/4Z+HuoaV8U
-  H1S41S2uLjSpm1m2CXbRoybVuFCIwYIwR3dQXZGbGDXzjrfgnw3+0L4m1b4XWF9p/hPx5ZD+1fCX
-  iCKyilg8Q2iL++sbqLbmTy8krs/eFfKKn91Jn0n4v+MNW8QXF3rPiPU7/U9W1LVpLi7u724e5muX
-  TyUQu0hJYKgCgHgKAAMCvnzwb/pn7T3w7up8+eniGyCsvy7fkc8AcA/Owz1wcdABX59LMHgMV7Gk
-  3ZO2+uuuve1z9MynKaeKyymq9paW1R+m/wDwT6/Z/T4M/s7aJ4fub6O5mtLaNBceWUMgKFshWJKZ
-  3fd7ZxX5Zf8ABfz4V3a/t0XOoaTcxR6d4i0LTLqQTymKKQpB5Dt83y7g0OcgdTk81+tHwZvZbCx8
-  qzby44Y2aNVAwmBxj0HJ46du1fAX/By7otq3hP4Ya00KnVLS9OkxXHO5bWSJZGix0I3ksCRlSzFS
-  Nxz9tRq89BSkjwc4wvuunB2Stb8jwr/gi18KNJ1Xxh4v8SeILV7x9NvLaK2e6mVmDrE0kmGHX59o
-  47AZr9R/jt8V/APhb4I6jpN/fWMF1Fp3mBHOyN9rFo44iQBIwdFO0ZYZ4IHFfnh+yR4ftPBX7M3g
-  PU/Csb2WoeI7ZLzUp45W33cpdgXbJ64AHGOAB0r7Q8N3kknga484iQm3dcyKHIB3ZAJ6Z9q8atiW
-  lJJanpZTho0qUFJtrfsfor+z/wCKLfW/hno1ygB+1WUUyue4dQ3QgEDnof1616IbLzsMZbJcgcPa
-  F2/E7xn8q8D/AGLYwPBvhi3O4wvZQgoSSAAqYAz0HJ4FeH+Pfjl4suPGWotLrd2T5xHAUAAcAAAc
-  AACv0nhTLKvEkZWmoqKW6ueHxPmdLh5Qm4uXO3s7H//Z
+PHOTO;=ASE64: /9j/4AAQSkZJRgABAQAAAQABAAD/4QBARXhpZgAATU0AKgAAAAgAAYdpAA
+ QAAAABAAAAGgAAAAAA AqACAAQAAAABAAAAS6ADAAQAAAABAAAASwAAAAD/2wBDAAIBAQIBA
+ QICAQICAgICAwUDAwMDAwYE BAMFBwYHBwcGBgYHCAsJBwgKCAYGCQ0JCgsLDAwMBwkNDg0M
+ DgsMDAv/2wBDAQICAgMCAwUDAwUL CAYICwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCwsLCws
+ LCwsLCwsLCwsLCwsLCwsLCwsLCwv/wAAR CABLAEsDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQ
+ EAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgED AwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE
+ 1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRol JicoKSo0NTY3ODk6Q0RFRkdISUpT
+ VFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWW l5iZmqKjpKWmp6ipqrKztLW
+ 2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3 +Pn6/8QAHwEAAwEBAQ
+ EBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3 AAECAxEEBSExB
+ hJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5 OkNERUZH
+ SElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaan qKm
+ qsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAI
+ R AxEAPwDmrj9qzxB4q8F3MniG/uYdSubhYYxa+U9zJGkYJQQNMpbgKwZV4KeormNe+MXiG9
+ 0sWN/d 6Zql/qN1NcTzRW6EMXAVV2sg3SKwfPHGW5PU/NXgq90/xwJo9KS61eSaGSUyWqMGj
+ KqQs8kxJWDG TydpcEqo5yf11/4Ji/8ABJXw38XP2d9J+In7SN94qkuvFVlLceHdJhvjB/wj
+ 1pKCIrre0Yk+0FPm G8lIw6jYWBY/u9XinDYCEXtFaJRtt2SWiPiaeRYjHSc5Xb6uTf66s8/
+ /AOCc37dE3wl+P1t4X8Tv byeB/H17a2d5Yr5cENlLegRwyxRgbV/eyRIyqACkgJ6V3f8AwV
+ Q/4Ja+FfjN4Pvrn4F6nL8NdY04 Y1WDR1EVjrFsALjDWzHZBOB5bCQFFycMGFfKv/BTD/gnv
+ 47/AGEfiLYv8B9Q8ReOfB2qrBa6ZqUM fm6noV1BKk8VrflFwCbdNyXRCBwjZAIWvXfiB+2P
+ b+A/Duup4N1e9Hh+9n86S7vbybUNQuSURRDD NcO5jDFGG4scbSVTawr53G5vg54qONg2lOP
+ vJdWu6vvbT5I9illmIp0fYJWs9G9jz34JfG/4c/sr fCK60rTtP8Q6x4V0tDfX+vaRYlNaSV
+ UZ3h1C0mI8uQkvP58D7JI7hXhjYJKU8x/Z2+NGvftT/tDe Evhx+zv4LvdMXVtWj1CHSYIpL
+ a00m1VjNc3Ny8iARxKhLPIByzhUBMsYLtX/AGpEstYuLnRLSz0X TnhWeC00yFYINUgMkrlm
+ ZcHzlkklIduI2kkwF3kV9V/8Et/+Chvhb4WfEQ+DfFt5frB49lgms9Vu L15okIAWOBQ5xCr
+ O3zgYVnkU45NfL8RY1cQ06dDncYRafLZa+r3Vrnt5Vl0sJX9pJpy73Z+mXwM/ Z70T4DaYl0
+ n2bVPEbQeRc6rMu1wDtLRxK2TFFlF+TPJQFsnms342ftC2Fl4ZA0LU9Jg1G6uTp3l3 F3DBI
+ rgB8RtK4TOzc4z/AAhvQVyP7Yvxqv8A4S/sv/EDXvCMkQ1TQtEnubFrltsfmgqEMn96PLYG 
+ PvHg1/N7+2f8V/iN8UvElhoX7U/j2W40HxVfm8xZwSx2kl0EMRieGVikLR5K7gPujjg15tHC
+ 1MNB 4ijR54Qdm+idtLndmc4yt9Yn+8lt/wAA/e/9k/8AaB079ofTLjxPptzp17b60S8Nzpl
+ wbmxvVt2a 3MsErcshdJR/tcnoa0PFmiJrniS9uo3nZJJSFZXIDAfKD+IGa+ff+CWvw+8VeA
+ P2Jf2e9d8UXYuU 8Q+DLcAmNTsgR5BZJkdSLKO359c19c+HLSFtFgMyxu2DlnQbjyetffYR/
+ u1NrXb7m0fN4iSp1OVb Dda/4KE+Cvgzby2/iTwv4x8EWcL+WG1HwtJptupHQK4TY/XtwK82
+ 1T/gr94O8R6tFo/geeHVdZ1t nttEgs3+0S6rdDGLYQg8kqpbII2bdx4VhXu/g742Q6hZm3u
+ 7hrceXsdCG2jtjJ+U1xHiv9lD4VfF nxveXet+EdE0zxJDaxyWesaXaRw3ce5jsukeJRtuIp
+ VVklTEi4GW8suD+Z4vK8YqfNQraLyV38/0 t8z6vA5rhfaf7TR+ab/I8K/4LBfETxl8Hv2LN
+ H0q10wXkPi/XoZfHeq27iT+x7WL/TG2xn5nLPHH CJT8qLETjL1+MfxN/a3tfEDSyST2sUcy
+ NG0JYsgh2/djYHCAAcHGCBuxgMD+qn7VfxOuj8KLjQf2 ifF2i23iMajceDdanuRBBp9xcpF
+ G4ZxLlUW5iaGZAoXBkG0jAr4Q1r9j/wCA3wFuoZPFF38OP7Tm uJp0g1e7jmkZFxwyzuwUBg
+ cyEBT0LV81VzqpQfJCm3/wD2MZllV83LHmW91trsfFl/8AHqa+04W+ h3s89xYuZbdLUedgN
+ jKsiqdxIC54zwM5IzW9ongr44fE+HzPhR8OPiRqYf8Ae+ZbaHdKquAWcLvj +bh0bAK45wa+
+ x/Cv/BQjUPAHhDVYfhP8KfDsem6JI9jFq6+IZIvC8BkHmRBUsFSA3EuJWSJ503fN txsctle
+ Ev+Cy3xE8Z/C69YJ4S0Z7ixuLK+u9K0IvqWkxyq0R+xSXU8qS7Hj3/OjttDfNuZTSp4/F Yl
+ +7C3rJX+655To16TSdO3rp+Vz9DP2s/HvijX/+COuo2d9A3i74iXvgrS9L1fSdMK6jqY1WT7
+ It xBJbW++QOsjsrLw3BJPFfk38ItK0j4p/tIaX8Mfi74bsfEs+tasPDM+ieITJYmz1S7X7P
+ byRvC6S RYkZIGY4eNt25T5YY/d2h/ts+G/28f8Agmn8SY/HJ0Lwx+0J4R0GTXFufD1vHpOp
+ 362ZM/2zSbzA l3GGBkePLSJghlPmHP5L6h+07ZfGeS58U/ErTru18b6vAJrzVNLmWGDU7tS
+ omurm2kjISSZN7yTQ uB56RuIxvOP0jhbF+0o1cPXceWT9Xtb7tjzuJqTqeyrNarsf1N638H
+ 7X4T/Afwt4W8H2UVpZfDnT LHT7G3iZpYoobO2S12IWJZlEanBb5iACecivG9N/ap8G2tr5V
+ 9rAhmid0eOd3jkQhiCCo6D09sV8 Ufsof8HJY8B+B/DGkfto6DqfifRooF0u88V6M3m39gpU
+ Ilxc2hbF1G6nLSRFZF8tvlY/KPqnT/ij +zZ8U9OtvENp47+Fetw6vDHcRXw8U2cDXKFRtZ4
+ pXWSN8AbkdVZWDBgCCK+hwcZYJPC1baWaa2af Y+UlONV+0a3Ifhx8Z73+2bO21qeJYbskQN
+ cBm8xPTyVyWf6K2PavWPjR8a9R+G2jaDfeCtEiku70 fZDcanqCW1vabyqb5UiQuFPykAn+F
+ sgHIHyr4W+KukaRqrvYiKNvODPJGxEjuQBnJ5PQjPpXpX7Q 37Q2if8ADPus/FXVpJLKD4QD
+ b4htVCrDqljcQmS1HLKglFyyIhYhf3kisSHxXysKyjScr7Hvzpvn SaPD/wBrDx7ceA9bk0r
+ Q0sPEVh47sb298RaPdSi4j1+WKSG2uLYLMrIzoL6xntmZVSL7Iof5JmZc r9oK/wBH/Z90vV
+ ND+L/wV/4Wdpnifw2tpomuaYotdb0/W7S3EKzSSwyLcfZJIvs8rPbFmgkhbbCw nUJ4N4B8E
+ 3Xx3vYr/wCL3j3w9Z3XhXTry41Tw7aak8N5bmQxPPFfagBItohWGJSkaNI27hirZq7o 3x60
+ a4+IetXPwqv/AA7JqFxc/Yrq31ia7ub63fzDgNbIvlqjISsbpIjFUOADvFfndZYrB0PrVSNl
+  dq/XXX0/G/kfouWPLc2rPL+a8+VO17fD0v8AoR/tE/GqXwN+wZpWn/GPR10m7EEqabpMWkw
+ xwf2j Kju11LZW4Cm8k3yPNO48w/MGIA2j8rPCvxck8L6VdWejRyWf2u2uIjL5h3qHfaCe4P
+ 3yfbiv1Q/a t8XXHxJ+Ekq6Dp0lzqmnea9tE0WdzvFJExHZgwZ1z/EvXOa+Ik/4JLeLfEHhK
+ 61Sx1vRNNvo5Jrm 4t7vdBHb2qx/PKWTd84JC7SANpB6mufCYunL45auxWeYapFxWFjaMen5
+ /wDBPN/A/wARNVv73wvo fwue2uPEWp6pFFYwblSGN2EkTv8A9MI1IiYvwm1CSMK2ej/aF/Y
+ n+Jnww8c+Nr2y+H+uX/hzQ9dv 9NuNY0LTZrjR/tFq8a3DxOqH9yskmFfhDuZR9w12f7EHwo
+ i8PePpPHNpbafFaWDSrayxx74JLeG3 eANHuJLG5ncgDPIT3xX2xovxd8VJ4rudQ8O3d7YC2
+ sfIJEsc1wXilEs0kYkYnKiTygf3e7bIVYEH P3mTZdGMY1pSak+lloflOccRSpzlh4wUkut3
+ o/8Agn5geEfFMmoaFcxaYzTTWuJCYlZ5IW+bcCpO fm2sTnjDMuAGxXc6P+zn4Z+IWnprTwT
+ acdQLS/ZorqIpH8xHGITjOM4ycZxX3H4++MnwJ/a+17Wt K+PXw312CfQpEttS+J3h3w+bq9
+ tT5asuozXFmkSyIsqvDLE0VzuePIlRDuT4y+LH7JfxA/Z48fX3 hHSfDWv+N9P0wRS2Ov8Ah
+ vWjDpesWs8SXEFxDGYWMe+KaNmQklXLA9K+1w+Z0KdNQqrnS8jyaU/r Ert+zdr6tar+vmfX
+ 3w++Lnib4n3V8fh1pFzqEenAySu08cNpYKpOGuJ952YHRWxkdOtekfBP9t/Q /hXrl/qHxw0
+ zwx4gi04Rajpk0Wo2c9v4f1C0VpF1N7eWWX7WbeITSxI0RaOSPzIkLqrL1vh/9kC7 8Tazps
+ H7Rc+t2vgW5uFt4LTSNItrjT7SRw7LKp0x5LO7iXCgqXQgdlbICW/7Vnw9+AOq3cJ8O6L/ A
+ MKt1ELaaR8QfDOmmbUL1ysvmWzaOiGSFN8Uqbg5BG1vvMa/Nfr0cI4xqTS5tubZ9fTp3Pq61
+ ZSf JbX7vz6ng37Vf7ct94/8U69eXlzrZ8OaPaQ3Fva3qSwXWrXl2m23a7LYMzyxb5zPycKW
+ znFfEXw0 +OXjr4W6/wCIvGXwk18W+qa9rRtLmJ41ktNRWLOyPyWGAI1kO1h0BIFfbX/BXfw
+ TrXxY8LeFfiB8 NZ1uvCdtZJCyWkBhnslnBaGZ967ijJJtww/c8g/eFfJ2i+BrPRvBej6faR
+ SR21szklgPnYtuLMRz tLseD0wAeldTxbziHvWt2X9eR5NXDyyDEOpCT5pWs3vY+hP2RvB3x
+ Q/bD8OTeKvH2rre6fa6nPaX Ftp8T2c0flOu2QtITkEs42r24q5+3Np83h650v4OfD13lu/F
+ bWy+JdQIeSa3sZZPMis1kzwZRG8r EcAKAetfWX/BG/wJbaL+yPpOq/KZ9dmuNRuV+8GdrqV
+ wRnvtUDNfOf7c2v2tj/wUK8eQ6ne6Z4Zj ENhAuoahKkVnYq2nWq72Zm2hiWfgr2rxsDk1CW
+ LVSWy18tD7bNM5rUsnUr/vJJa97/qca1xbXXxX 8B/D74fWqwWcV3FdX0UJCLBa2EfmJEB90
+ OZfK5PACe9cb+1t8Stf+CPxVv49C1S1srix0a6WO4lQ YWC5uNsAEX3GJkjJKgYG0N2zWX8e
+ vCOlfCGxtdH8IeJTrPirxvbT6asenSC7kMNyYmuJYViAzvRX +Yv/ABAdsDJ8afsMfFT4lXJ
+ 8f+M9OjuNNQWmm6XFd3gl3W4EdqkkoQnHyuSwz1znnNfSY3MYYWLi 3Z36P/I/NsBlVbMmpU
+ 4N730/zPoD9lme3+CHhrw82oa82gazLYAS6e97HLJZRzItxPcvcKdsAWV3 cg4bEx5YsFHrH
+ g3/AIK7eFPC/hq1sNC1b4lala2wZUuobOK2inyxJaKOa4WQRkk7d6hiu0kc1u/s /f8ABule
+ 6n8Ira/8efEK+t/Eh23Mdvp9pFNpKyhi6vJFOn79gcfeY4IOMcVynif/AIJb/teeHNfu rLw
+ t4F+H/ibT7d8QapBcG0S8U87vJyQjckMAcbgcYHFdVLN3FJSjZdLxcr/cddfg/Ey96VnfopJ
+ W 9dV+Z+o/hr9n74XfDP4SP4j/AGE4rfNx5cNpY3us3iWVp5j70W5gMgkZVbG1SwxuOSydeC
+ /a+/Yq 1r49x2etfCSHTZrnStFXS9Q8Nx6VBptzDH5yTLPpt3bJGruJIm24ffGHbynQuwf4M
+ 1f4w+IPBf7S Og+HvDV1bW+kX+qNFcwGwt5DOvkyS/NI8ZcneAck56jOCRX2Z4t+OvjD4O/s
+ yazd/DTxDqWkzvf2 0QMUm5YldV3eWrZWMnJBZADjjOOK8auoVMP7KrH7nY9TEUFjLxm2103
+ 0/Fo+a/B0t/4Z+HuoaV8U H1S41S2uLjSpm1m2CXbRoybVuFCIwYIwR3dQXZGbGDXzjrfgnw
+ 3+0L4m1b4XWF9p/hPx5ZD+1fCX iCKyilg8Q2iL++sbqLbmTy8krs/eFfKKn91Jn0n4v+MNW
+ 8QXF3rPiPU7/U9W1LVpLi7u724e5muX TyUQu0hJYKgCgHgKAAMCvnzwb/pn7T3w7up8+eni
+ GyCsvy7fkc8AcA/Owz1wcdABX59LMHgMV7Gk 3ZO2+uuuve1z9MynKaeKyymq9paW1R+m/wD
+ wT6/Z/T4M/s7aJ4fub6O5mtLaNBceWUMgKFshWJKZ 3fd7ZxX5Zf8ABfz4V3a/t0XOoaTcxR
+ 6d4i0LTLqQTymKKQpB5Dt83y7g0OcgdTk81+tHwZvZbCx8 qzby44Y2aNVAwmBxj0HJ46du1
+ fAX/By7otq3hP4Ya00KnVLS9OkxXHO5bWSJZGix0I3ksCRlSzFS Nxz9tRq89BSkjwc4wvuu
+ nB2Stb8jwr/gi18KNJ1Xxh4v8SeILV7x9NvLaK2e6mVmDrE0kmGHX59o 47AZr9R/jt8V/AP
+ hb4I6jpN/fWMF1Fp3mBHOyN9rFo44iQBIwdFO0ZYZ4IHFfnh+yR4ftPBX7M3g PU/Csb2Woe
+ I7ZLzUp45W33cpdgXbJ64AHGOAB0r7Q8N3kknga484iQm3dcyKHIB3ZAJ6Z9q8atiW lJJan
+ pZTho0qUFJtrfsfor+z/wCKLfW/hno1ygB+1WUUyue4dQ3QgEDnof1616IbLzsMZbJcgcPa 
+ F2/E7xn8q8D/AGLYwPBvhi3O4wvZQgoSSAAqYAz0HJ4FeH+Pfjl4suPGWotLrd2T5xHAUAAc
+ AAAc AACv0nhTLKvEkZWmoqKW6ueHxPmdLh5Qm4uXO3s7H//Z
 item3.X-ABDATE;type=pref:2000-12-31
 item3.X-ABLabel:_$!&lt;Anniversary&gt;!$_
 X-ABShowAs:COMPANY
 X-ABUID:73FD0F46-DE18-4F1F-AA2C-59E8738B4249\:ABPerson
+UID:excellent-looking-uid-string
+REV:YYYYMMDDTHHMMSSZ
 END:VCARD
 </VC:address-data>
    </prop>
@@ -585,12 +596,11 @@
   <href>/caldav.php/user1/addressbook/andresenesq.vcf</href>
   <propstat>
    <prop>
-    <getetag>"f6ae02ec1b5612fe4737092734d062c7"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:4.0
 PRODID:-//ALAB//NOSGML Version 0.9//DE
-REV;VALUE=date-time:20100623071522Z
-UID:uid=andresenesq.1209158007\,ou=Contacts\,dc=andresen\,dc=de
+UID:excellent-looking-uid-string
 X-ABUID:ADDEEFEF-162A-260A-DEA3-1DA8-8A913187\:ABPerson
 FN:Sven Joseph Klaus Michael Andresen\, Esq.
 SORT-STRING:Andresen\, Esq.\, Sven Joseph Klaus Michael
@@ -599,264 +609,235 @@
 X-INITIALS:SA
 X-INITIALS:SHA
 NICKNAME:Svenny,Sveny
-PHOTO;ENCODING=b;TYPE=jpeg:
- /9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkS
- Ew8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJ
- CQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIy
- MjIyMjIyMjIyMjIyMjL/wAARCAFQATYDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEA
- AAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh
- MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6
- Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZ
- mqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx
- 8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREA
- AgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV
- YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hp
- anN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPE
- xcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3
- +iiigAooooAKKKKACiiigAooooAKKKKACiiigAoorM17xBpnhnSZdT1a7S2tY/4m
- 6seyqOpJ9BQBp1zuvePPC/hkMNW1q1glXrCrb5f++Fy36V5Hf+L/ABr8SXkj0hz4
- d8PMSFnOfPnX6jn8FwO2TU2i/DfwxpKq89r/AGjc9WluzuBP+7938wfrQBr3X7Q+
- gGRotK0XVr+QdPkVA305J/Ssyb45eKWbdb/D67WI9PMMrE/iIxXXQSQWsKxW8UcM
- S9EjUKB+AqT7b70AeeXP7Q3iGxkUXnhKKDP8MryIT+Yq/Y/tLWDlRf8Ahu5hHcwX
- KyfoVX+ddk9ykiFHCsp6qwyDXJa54B8Ma4Hd7BbS4b/lta/uzn1IHyn8RQB3WgfF
- zwX4iZI7fWI7a4fgQXo8ls+mT8pP0Jrt6+K/FngLUvCxM5YXVgWwtxGMbfQMP4f1
- HvWt4F+LniDwbPDbyTvqGkKcNZzNnav/AEzY8r9OntQB9fUVjeGPFOk+L9Gj1PSL
- kSwsdrqRh4m7qw7H/IyK2aACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooo
- oAKKKKACiiigAooooAKKKKACiiigAooooArahf22l6dcX95KIra3jaWV26KoGSa+
- fbm6n+I2vr4j1pGTSYSRpmnP02Z++47k4z78dgM9b8Ztba6u9L8HwPiO6/0zUMHn
- yUPyr9GYH/vkVzC3SoiomFVRgAcACgDohdhQAMADgAUfbPeue+2+9H2z3oA6H7Z7
- 0fbfeue+2e9H233oA6D7b70fbPeue+2+9H233oA3pp4riF4ZkWSJ1KsjDIYHsRXh
- XjPw6PD+sEQZNlcZeA/3fVfwz+RFer/bPeuW8fKl34d80jLwSqyn0B4P8x+VAHN/
- D7x1feA/ESXsBaSylIS8ts8Sp6j/AGhyQf6E19lWN9banYW99ZyrLbXEayxSL0ZS
- Mg18EV9Gfs7eLWutOvfC91KWe1/0i0DH/lmTh1HsGIP/AAM0Ae50UUUAFFFFABRR
- RQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFVdTvB
- p+lXl62NtvA8pz6KpP8ASgD5h1nXf7a+J/ibUDJuSOX7NDzx5aEqMex25/GpPtvv
- Xneh3rRX8m9iTMDknuev+NdH9t96AOg+2+9H2z3rn/tvvSfbfegDoftnvR9t9657
- 7Z70fbfegDoPtvvR9s965/7b70n233oA6H7Z71ieK7//AIkbxZ/1rqv5HP8ASoft
- nvXNa1qH225VFOY4+B7nuaAMyuq+G+vf8I38QdG1Fn2wicRTHt5b/IxP0Bz+FcrR
- QB9/0VkeFdU/trwlpGpk5a6s4pX/AN4qN365rXoAKKKKACiiigAooooAKKKKACii
- igAooooAKKKKACiiigAooooAKKKKACiiigAooooAK5v4gzeR8OfEj/8AUNnUfihH
- 9a6SuW+JIz8NPEY/6cJT/wCO0AfFSsVYMpwRyDXe+FPCOs+Krf7TCqW9qDt8+bID
- EddoHJ/l71yWhaVLrmu2WmQ53XMyxkj+Edz+Ayfwr6us9PgsLOG0tYljghQJGi9A
- B0oA8P174ea3oto93E0d7BGMv5OQ6j12nqPpmuI+2+9fVvlV85/FLwz/AMI54paW
- 3QJZXwM0QXgK38aj6E5+jCgDnvtnvV3Sba81vUobCxjMk8pwB2A7knsBXN5PrXvH
- wY8OLa+HpNblQG4vWKRseqxKcfqwP5CgDT0T4b6Pp0Ctfp9uuiPmaQkID7L/AI5r
- SvvA/h2+hMbabHCT0eD92w/Lj862NX1jTdCt1n1K6WBHJCDBZnI5OFAJP4Co9D17
- SfEds0+k3sdyiEBwAQyE+qkAii4WPBvHnhbUPCcy7XM1hOcR3IGCD/db0P8AP88c
- NX1p4g0G38QaHd6ZcKNs6EKxH3G/hYfQ4NfKFzbyWl1NbTLtlido3HoQcGgCKiii
- gD7D+DN39r+E+hsTlo1kiPttkYD9MV3leUfs9XJn+GskZ6QahLGP++Ub/wBmr1eg
- AooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiig
- ArmviGhf4ceJAP8AoGzn8kJrpax/FkP2jwbrkGM+Zp9wn5xsKAPlX4Owed8R7I/8
- 84pn/wDHCP61658QdcOn3OmaUszxJd+ZLO0blGKJjChhyAS3OOykd68S+GepJpXx
- F0a4kcJG8xhck4GHUpz+LCvSPj9ZXFtJoerQ7hGvmwMwHCk4I/MbvyqW/eKWxo+C
- /Egj8WDQvOkks72FpLZZHLmKROWUEnO0rzjsRx1qr8ebBT4b0u943xXZiH0dCT/6
- AK4L4aRajd+NdP1UxO9rZMxkkHAGVIwPUnI4r2zXNLTxhFFbahZrJbxSeakQJ4bB
- GTgjPBNctfF06MrPV9kdFHC1KsbrRHyrX1r4HtVg8CaCiAAGxhfj1ZAx/UmsGX4b
- 6ME+fRbcDHURD+lb2m3M2j2VvZQwo9pboI40BO5VAwBn6Vh/adJu0k0bf2fO14tM
- 851HxUs/iTU7ksN0c72sXOdscZ24H1ILfj7VzWi66NL+Ldjc2mFi1B0guUU4VvMO
- 3J/HDfUVieKtE1rRNUvZzBIbGW4eSOZfmADMSM+h571U8EWU+teP9FgAZ2a8jkfH
- ZEO5j+Cqa9CM4zjeLujilCUZWkrH1h5VfKfxGt1tfiHrcaYwbkvx6sAx/U19c+VX
- xz4x1JNX8ZaxfxMGimupDGw7oDhT+QFKDuElYxKKKK0IPp39nB8+AtST01Nz+cUf
- +FexV4v+zdn/AIQ3VvT+0P8A2mle0UAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAF
- FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFU9VTzNHvk/vW8g/8dNXKo61crZaFqF0/
- 3YbaSQ59ApP9KAPg8EggjrX0rpWtQePvhlBYa5ps0l1Igjdn+XcygbZlb36/XI6d
- fLvhf4Og1yeTUr1BJBC+yONhlWYDJJHcDI4759q92htY4Iwsa4FeHmeZqi/Zw+I9
- PCYRSXPPbsVdA8O2um2cVvBEsNvGMBV/z+tdNGUiQKgCqOwqlDJhAvQipPMryqeL
- ivevqzsqJy06Fzzaq3FrDcZONr/3hTfMo8yrli4yVpExi4u6Me709clJVDAjGfUV
- k6P4d07w7rb6vp2nWwunQxsQCuFJycDOAeOuK6WdvNIHYVDsriWNlSk/ZvQ6Wo1I
- ++rmN4/8XX0Hgu9TStPuDqEy+USoz5SEfM47njgYHBOe1fLJGDzX140UU6FTtYdO
- O1eBfFTw9Do+uR3VumxLvcXA6bxjJ9sgg/nX0GWZl7eXsprU8vGYVRXPA4Ciiivb
- PNPpn9m4f8UTqh/6iJ/9FpXs1eIfs13G7w5rdtn/AFd2kmP95Mf+y17fQAUUUUAF
- FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAVyfxOv
- PsHwy8RTZxusniz/AL/yf+zV1leP/tEa0LHwPa6Ur4l1G6GV9Y4/mP8A49soA4f4
- L6vALK5052AljlL4PdWA5/MfqK9XeCS2JkiBeM8tH3HuP8K+TtK1W70bUYr6zk2S
- xnvyGHcEdwa+ofD2rXVz4d07UruAiC6gWQMp3bMjofavlc6wFVTdemrp7o9fCYhS
- goPdGxEUmQPGwZT6VJtNMNpHN+/tZdjNzuXkN9RRm9j4a3SX/aR8foa+Wc9fdf3n
- VzD9ppNnrTfNuj92yI/3pAP5UfZbqb/XTCNf7sX+Jpc7XxMXMRSzxxtsUF5T0ReT
- +PpTBayz83DYX/nmh4/E96vxWsUC7Y0Cjv6moJr63hfy1Jll6BIxk1UKkpvlpK7H
- z9hvlxW8ROFRBycDFfP3xd1lb/xDFYoCPsqlnz6uAQP++Qv519AxWNxfSCS9XyoF
- ORB3P1rxH48aMLPxPY6pGgWO9t9jYH8cfH/oJT8q+uyXL6lKXtau5w4uunDkR5RR
- RRX0h5h7V+zhrItfFGqaO7ALe2wlTPd4z0/75dj+FfStfDfg/wAQy+FPFum63EC3
- 2WYF1H8SH5XH4qSK+37W5hvbSG6tpBJBPGskbr0ZSMgj8DQBLRRRQAUUUUAFFFFA
- BRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABXyR8bvFC+I/iDPB
- bvutNMX7IhB4ZwSXP/fXH/ARX0H8UfGieCfB1xdxOP7QuMwWan++R97Hoo5+uB3r
- 41ZmdyzMWZjkknJJoASvs/wlphtPDGl2U6D/AEeziidSOrBADXyR4U006x4t0qw2
- 7lmukDj/AGAct+gNfZ9owFuPcmpkk9GUtDHu9Lm02U3OnIZIG5kt/T3WnWt7bXY+
- RwH7o3DD8K3d9UbvS7C9YvPbqXP8a/Kf0r5zMuH6WKfPTfLI7KeK0tP7yLYKp3Oo
- 2tsdpffJ0CR8k1N/wjmn9/OI9DIcVetLCzsf+PeBEP8Ae6n8zzXmUOFZ8372eho8
- RTW12ZUOn32qHfclrS2PSNfvt9fStqz0+1sE228Kp6t1J+pqXzKN9fU4TAUMLHlp
- o5alec9NkRXceV8wdR1ry740aOdU8BS3KJul0+VbgYHO37rfhhs/8Br1SR8xOPUG
- sS8tob6yns7hd8M8bRSL6qwwR+Rrr2dzLofF9FXtZ0ybRdavdMn/ANZazNETjrg8
- H8Rz+NUa0ICvpP4A+OxqWlN4Uv5R9qslL2bMf9ZDnlfqpP5H2r5srV8N3OqWXiC0
- u9Fdl1GBjLDt6sVBJGO+RkY79O9AH3VRXM+BfGVl448NQ6pbYjnH7u6t88wyDqPp
- 3B9PxrpqACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAq
- tqF/a6Xp89/fTpBa26GSWV+iqOpqzXgnjbxDN8SvET6Dp07J4W06X/S7iM/8fko/
- hB7qO3b+Ln5aAPLfiR4zvvHPiI6rJFNFpilorCNxgKgPJ9NxyCcZ6gdAK42uj8Z6
- tb6nrQhsESPT7JPs9sqfdIB5b8T+mK5ygD1P4G6P9r8UXequuUsYNqH0kfgf+Oh/
- zr6LtpP3ZHoa83+E2h/2L4GtpJF23F+ftT564P3B/wB8gH8TXeRybG68Goe5XQ0v
- Mo8yqfm0eb70AXPMo8yqfm+9J5tAFzzKPMqn5tHm0AWpJcRtz2qjuokl3DGajzQB
- 4J8cdC+x+I7XWYkxHfRbJCP+eiYH6qV/I15XX1L8RfD/APwkngy9tY03XMI+0W/r
- vXsPqMj8a+WqpCYVPZ3c1hewXdu22aFxIh9wc1BRTEey6V4gl8K6nbeOtEjaTSr4
- BdWsUPvywHqDnn19mNfR+l6nZa1pdtqWnXCXFpcoJIpE6EH+R7EHkEEGvkb4da0k
- VxPod3hra7BKK/I3Y5H4j+XvXe+A/FMnw18U/wBgalMT4Z1KTdbTSHi1kPqf7vQH
- 8G45yAfQ9FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFYHjPx
- Va+DfDNzq9yPMZPkghBwZpT91R/M+wNAHHfFjxfcwJF4P0KXbq2pJm4mX/l1t+jN
- nszcgd8Z6Eqa8p8ValbeEfCsWi6adk8yFAQfmC/xOfc/19q0bR5LCC/8Q67P5mpX
- ZM93Kf4fSNfYcAD8PSvOLlpPED6r4g1FmS2hXy4lB6yNkRxj6csfZT3NAHOVs+FN
- DfxH4msdLXOyaQeaw/hjHLH8gfxxWNXtnwS8P+RZXevzJ885+z25P9wHLH8Tgf8A
- ATQB67GqRRJHGoVEAVVHQAdBTs1Huqzb2NxcgFVwp/ibgVNhke8+tG8+tasWjxKM
- yuzH24FW0sraMcQof94Z/nTsFzn959aN59a6QRRL0jQfRRQYYm6xIfqoosFzm959
- aN59a3pLC1k6wqP93iqk2jqRmGQg+jc0WC5l5ozTp7aa2P7xCB2Yciod1KwXJN1f
- MHxG8P8A/CO+M7yCNNttcH7RBjptY8gfQ5H4V9N7q89+Lvhv+2fC/wDaMCZu9OzJ
- wOWiP3x+GA34H1poDwKxtTfX0FqJooTM4QSTNtRSe5PYUuoafdaXfTWV7A0NxE21
- 0bt/iPeq1drptzH400qPQ77b/bVshGm3THBmUc+Q5/8AQSfp9WI42GaS3njmiYpJ
- GwZWHUEcg165utfGfhZPNwrSL1HWKUf5/EGvI5YpIJnhlRkkRirIwwVI6giuo8D6
- ybHUWsZWxDc/dz2ft+fT8qAPcvgx48uLgP4K15wup2C4tJGPM0QH3fcqOR6r9CT7
- FXyh4jt7mGa21/SpGi1LT2EiunUgHP44/lmvorwJ4utvG3hS11eHakxHl3MQ/wCW
- co+8Pp0I9iKAOlooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACvnfxb4i
- /wCE68ctLE+7Q9FcxW2CCs8/8UnuB29gD3Nei/GDxdJ4c8KCwsXI1XVmNtb4PKKe
- Hf2wDge7A9q8Ykmg8OeHjswRBHhc/wAbn1+pNAGL411abU9Qg0KxDSNvUOqdXkP3
- V/DP5n2rN8YvFpv2TwzaOrRaapNy69Jblsbz744UfQ1d8Gj+zrXVvGV4vmNZqUtd
- 4/1ly/APvjOT9c1xcsjzSvLIxeR2LMxOSSepoAn0+xn1PUbextl3T3EixoPcnFfV
- +jaZFpOk2el2ikx28axrgcsR1P1Jyfxrxr4M+HvtOp3GvTpmO1HlQZHWQj5j+CnH
- /Aq+h9MtRDGJnHzsOPYUAS2WmJEA84Dv/d7D/GtLIqHdRuoAn3Ubqg3UbqAJ91G6
- oN9G+gCfdSbqh30b6AJm2spVgCD1BrIvtMABkth9U/wrR30b6AOYzTXCyIyOoZGG
- GUjII9K0dUtdp+0IOCfnHv61mZosB8v+NPDreGPFF3YbT9nJ8y3Y9426flyPqKwo
- pZIJkmidkkjYMjqcFSOQRXvfxc8OjVfDX9pwpm60/LkgctEfvD8OD+B9a8BoA7rx
- LbR+KPDMPi+0iVbuNhb6rGnA38YlA7A5Gfcj3NcMrMjBlJDA5BHY12fw11iGz199
- Jvfm0/V0+yzITxuPCn8yR/wKuf8AEWjS+H9fvNLmOTA+Fb+8p5U/iCDQB3+j6qNS
- 0uG4ON5G2Qf7Q6/4/jVz4f8AiX/hAPiEtvK4TQ9XISTJwsTZ+VvbaT/3y1cJ4Svj
- Fcy2jH5ZBvX/AHh/9b+VbmuWo1DTXUD97H88ZHXI7fjQB9f0V578HPGJ8W+B4Rcy
- btQ08i2uMnJYAfI5+o4yepU16FQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUVw
- 3xc8S/8ACM/DvUZ4323V2PskH+84IJ9sKGOfUCgDxbxLr48Z/Ea/1hW36fYf6JY+
- hAzlh9SSf+BD0rkfGd80j21gh/6aMPU9B/WtLR4fsWlwRHhiu5vqeaq+GdPPiL4n
- W8bDdDDN5knGRtj5wfYkAfjQBN49jHh/Q9D8KR4DQxfbLvH8Uz5HP0+YfQiuFije
- aVIo1LSOwVVHUk9BXQ+P9QbUvHWrzE8RzmBfonyf0z+Nafwp0P8AtjxtbyyLmCxU
- 3L5/vDhB/wB9EH8DQB7v4O8PRaFomn6SuCY1zKw/ic8sfzz+GK7fNZFiMXIPsa08
- 0ASbqN1R7qN1AEm6jdUe6jdQBJuo3VHuo3UASbqN1R7qN1AEm6jdUe6jdQA6RRLG
- yN0YYrnmQqxU9QcVv7qx7gZuJD/tGi4FSWGOeF4pUDxupVlPQg8EV8seKNFbw94l
- vtLbJWGQ+WT/ABIeVP5EV9Xba8Z+N+h7J9P1yNeHBtpiPUZZP03fkKAPIo5HilSS
- NiroQysOoI6GvTvijbLquh6D4riUA3UCxT46Biu4fjnePwFeX17DYwf2x8ApYtoe
- W0DupPbZIW/9BJFAHk1jOba+hmBxscE/Tv8ApXd+d7155XX21wXtYmJ5KAn8qAOq
- +EniD/hFfigtg7FbHVsQFecB2OYzj/e+X6Ma+pq+H9XkeGe1vYWKSxONrKcEEcj+
- VfZfhrWY/EPhrTdXiK7bu3SUhTkKxHzL+ByPwoA1aKKKACiiigAooooAKKKKACii
- igAooooAK+cf2gdY/tHxnpHh9JAYbSMSyqOzyHof+Aqp/wCBV9HV8Z+KtWbXPijr
- GoM+9TdSLGf9hfkT9AKAL/m+9bfwSsxNq+taiT8yIsQH++xY/wDoArlvNruvgcq/
- Ztex98Txg/TDY/rQB43qc5utVvLg9ZZ3f82Jr234IaT9n8O32psuGu5xGp9UQf4s
- 35V4trVq1lruoWrfehuZIz+DEV9OeAtP/s7wJotvjBNsspHu/wA5/VqTGjo7Y7Z1
- P4Vo5rOAIOR2q6rblBHelcCTNGaZmjNMB+aM0zNGaAH5ozTM0ZoAfmjNMzRmgB2a
- M03NGaAHFsDJrLb5mLepzV6Z8R47mqm2lcCPbXK/EfSv7V8BapEFzJDH9oT2KHcf
- 0BH41122mywpNC8UihkdSrKe4PBouB8a17r4Etnb4OXikcTxXW33GGX+YNeV6r4K
- 8Q6Zd3CNo2oNBFIyrMtuxVlBIByBjnrXukGnt4d+FElo52S2+mSF88YkKFiP++ia
- oR81VvWcuLSIei1g1pxSbYUX0AoAsai3mWbj0IIr6R+AGqG++Gq2rkbrG6khAHXa
- cOP1dvyr5lmk3QuPavcP2Z5v3XiOAsfvW7hf+/gJ/lQB77RRRQAUUUUAFFFFABRR
- RQAUUUUAFFFFAFXU71dO0q8vnGVtoHmI9lUn+lfDFhLnUGkPVtx5r7X8YHb4J18+
- mnXB/wDIbV8P2z7LhG98UAdD5td98FrxYfEOtadgf6RElwp/3SQR/wCP/pXmfm1f
- 0DXH8PeJbDWEBIt5MSqvVozww/ImkBt/Fzw9Jp3jlrmOPEGpgSxkdN/CuPrnB/4F
- X0XDAlvBHDGMJGoRR6ADArnvEGg6f420OyljkVwkkd3azr+Bx9COPy9K6jFS2UkM
- xUkTY+U0m2jFK47E1FMB9aWi4rDqKbRRcLDqKbRRcLDqKbRRcdh1ITgZpM01st9K
- LhYjc7mzSYp+2jbRcLDNtcp4w8f6N4NVI7syT3kg3JbQ4LY/vMT90f5ANdeFrwHw
- 7dQ654u1vxLeATSG5KW2/ny17Y9wu0D8aa1E9DYb45yxMGn8KzRwnoxuj/WPFa0X
- xM8FeL9Pl0rVjPZJcLsdbnKqec8Op4/HFTPqiSIUfayMMFWGQa5PW/CWhasjNDCt
- jcdpIBhT9V6fliqsK5V8TfBu4hg/tHwtcjUrJhvEJcGTHqrDhx+R+teaTCW2meGe
- N4pUO1kdSrKfQg9K6e01jxP8OtR2Wl4fs7HcEOXglH+6eh+mD713yT+HvjJpjwyR
- JpviiCMmNs8OB7/xL7Hle3ubAeKtLlSM17Z+zV5n9u67j/VfZo93+9uOP614vf2N
- zpmoXFjdxmO4t5DHIh7EHFe8/szw/u/Ek5U9bdA3/fwkfypiPfaKKKACiiigAooo
- oAKKKKACiiigAoopGZUUsxAUDJJ7UAUNdW2k0K+gu3CQTQPE5Poylf618/8Ah34Z
- 6XYxK95EL656s0n+rU+gXv8Aj+lem67qz61feTCSLSI/L/tH+9/hVvS9MR4xJKvy
- fwr6+9eHisZUq1PZUXoexh8NCjD2lVanHSeE9LkjKNplgQRjAgUfriuM8RfDO3lj
- aTSSbaYDPkuxZH+hPI/l9K94aytWXaYE/AYrG1LSxEhZctF+q1zXxGH99Suje9Ct
- 7so2PFfh149m8I3p8Oa+HisA5CM45tmJ6H/ZPX8c173DLHPCk0MiSROoZHQ5DA9C
- COorx34g+DhrFk11bJ/xMLdSUIH+tUfw/X0/LvXBeC/iRq/g6QQA/a9NJ+a0kb7v
- uh/hP6e1e1h68cRDmW55WIoOhPlex9R4pcVheF/F+jeLbPz9LuQZFH723f5ZI/qP
- T3GRW+K1MRuKMVJto20XCxHRUm2jbRcZHRUm2jbRcCOipNtG2i4EeKMVJto20XAj
- xTJHSGNpJCFVRkk1PtrC8Q3BAitEP3/mb+lY16vsqbka0KXtJqJQur241J2RCY4B
- 2H9fWvn/AMLXxsY7y1b5XWXJH6f0r6LsLMPhT9xevua+ePiBpMvhbx7foiFbe5Y3
- EPoUc5wPo2R+FceWVp1JSc+p1ZhTjGMVHobn9r/7VJ/a/wDtVwn9qt6mkOqt717B
- 5Z0nibUI7jRnjfBYupT2Of8ADNcxoV9c6Zr1he2bEXEM6MmO5z0/Hp+NVbi6kuXB
- c8DoPSu8+HHgi61W/h1i7QxWNu4eIsOZXHTHsD1P4euMq1aNKDnM0pUpVZKMQ+NE
- cKfEW4MQG5oImlwP4tuP5Ba9u+Auk/2d8M4Llsb7+4kuOnIAOwD/AMcJ/Gs288P2
- d8Wa6tba4ZupliDE/iRXSeHNdGi29vpc0CR2USiOLYuPLUdPqP1+tcNHNKU3yvQ7
- auXVILmi7ne0UisrqGUgqRkEd6WvTPOCiiigAooooAKKKKACimu6xozuQqqMknsK
- 4XVvEl3qMzQWLNFbjjcOGb3z2HtXPiMTChG8jehh51pWidde6xYWGRcXKKw/gHLf
- kK5DWfEsuqqbSzRo4D94nqw/oKyUtFBy5LGtSx08SDew2x+g714lXMatf3IKx61P
- BUqHvz1ZDptgZGC4+Qcu3rXSLhVCjgAYFQoqxqFQAKOwp26nRpqkvMmrN1H5Em6k
- bDKVYZB4INR7qN1auRnynOalZ7HZAOnKH2rwH4keGv7K1X+0raPFpdsSwA4STuPx
- 6/n6V9K6hEJYNwHzJz+FcL4r0SPWtIubJ8DzlyjH+FxyD+f9a5sPV+rV7fZZ01af
- 1ijbqj5303U73R9QhvtPuZLe5ibckiHBH+I9u9fRfw6+KVr4sC6bqQS11dRwAcJc
- D1X0b1X8R6D5tngktriSCZCkkbFHU9QRwRSRSyQSpLC7RyIwZXU4KkdCDX0jSkjw
- LtM+2wKdtrzX4VfEdfFVoNJ1SQLrMC5DHj7Sg/iH+0O4/H1x6aBWL0NFqM20baft
- o20rjGbaNtP20baLgM20bafto20XAZto20/bRtouAzbXJ6k3m69J3CYH5D/Guv21
- xQbzdSuZD3dv515uZztTSPRy6N5tm3aAJbr6nmub8d+CrXxppKwl1hvoMtbzkZxn
- qrf7J/Tr7Ho0OEUegp+6uOlUdOzj0OipBTumfKmreB/Emi3DRXekXRA6SRRmRGHq
- GXI/rS6Z4F8T6vIEtdFu8H+OWMxJ/wB9NgV9V7qXdXof2lK22pxfUY33PLPB/wAG
- LPTpUvfEUkd7OvK2qZ8pT/tE8t9OB9a9GubJIIwYVCxjjYOij2q8DTZzmB8+lefi
- qzrJuZ10YKk/dMkCmTwCWEjHzAZFWAtOC14vtLO53uR0Hg++a50toHbL27bR/unp
- /UfhXRVwnhab7J4glticLMpAHuOR+ma7uvtMBV9rQTPncbT5Kzt11Ciiiu05Qooo
- oAKKKKAOf8YXLW+i7FODM4Qn25J/lXIW6BIV9SMmuq8bJu0iFv7sw/ka5uIboIz6
- qK+ZzibVWzPey2yo38xK30wqKo4AHFYZWtK1m8yIKT8y8GuPCVEm0dGIV0mW91G6
- os0m6u7nOXlJd1JuqPdSbqOYfKSFsjFYd9bYLx491rX3VDcxiZOPvDpWFZcy03Rr
- SfKz55+KHh82eprq8KYhufllwPuyD/ED8wa8+r6c8QaNb6rp89pcoTDMNrY6qexH
- uDXzprmjXOg6rNYXS/Mhyr44dezCvZy7FKrT5Hujzcfh+SfOtmRaVqd3o2q22o2U
- pjubeQSIw9R2PqD0Ir7F8N61D4k8OWGrwABLqIOVBzsboy/gwI/Cvi6vpv4Dec3w
- 6bzc7BfSiLP93C9Px3V3VFpc4oPWx6ZijFSYoxWFzUjxRipMUYouFiPFGKkxRii4
- WI8UYqTFGKLhYjIwCa4KzO55W9TXd3TiKzmkP8EbN+QrhrEfIx9TivJzSWiR6eXL
- 4mbAbil3VCDTwa872ljraJQacDUYp4qXVIaJBUdw3yBfWng1A53vnt2rnrV7RsKK
- 1IgtPC04LTwtedKZo5GdPI1hqdteqMhWBI9cdR+Ir0WCaO4gSaJgyOAykdxXEzW6
- 3ELRv0Pf0p3h3VZNLvP7Nuz+5dvkY9FJ/oa+iyTMIr91I4sZR9rHmjujuKKKK+rP
- GCiiigAooooAxfFcXmeH5zjJQqw/MVyVl89nGfTj9a6/xPMsWgXOerAKB7kiuU06
- MixQnvk/rXy2ftRkmezl7apP1HFaFLRtuXg1OUppSvn41bao7ua5YjlEi5HXuKca
- qAFTkcGpkl3cNwa76eLvozJxtsPNNyacaaa6VWBCbqN1IaaaftENIr3UQYFgOD94
- VwfjTwhF4hsBECsd1HzBMw4Hqrex/wDr16Eao3EIYFCOD0PpSjVdKanA15VUi4SP
- MdD/AGfNSuZ4pdW1e0jszhiLTc7uPQEgAZ9efpXvWkaRZaHpNtpmnxCK1tk2Iv8A
- Mn1JOST6muf8Pao1pP8AYLhvkY/uyex9Poa6zdX0NLEe3gpHiVaHsZcouKXFN3Ub
- q0Mx2KMU3dRuoAdijFN3UbqAHYoxTd1IzhFLMQqgZJPAAoAzPEc/2fRpQDhpCEH4
- 9f0zXMWce2BPfmjU/Elh4im8jS7hbmC3lMbzJyjPgcKe4Geo45q0qAAAdBXz2aVf
- 3nL2PYwceWlfuOFPFNC04CvIdU3Y8U8UwCngVk6xmxWPGKQLTgtOC1zzq3ZN7DQt
- PC04LTgtYSmS5DQtUtVtBNamRR88Yz+HetILUN9KlvZyu5H3SAPU0UaslVi47iUn
- fQ2/DWoNqGjxtI2ZYz5bk9yO/wCWK165rwVC8elSyNkLJKSvuAAM/wCfSulr9Rws
- pSoxct7HjYiKjVko7BRRRW5iFFFBOKAOQ8bTsxs7NT95i5Hv0H8zUUcIjjVB0UYF
- N8V8eILKRvubV5PThjmre2vguIqr+sWZ7VD3aMbFcpTSlWClNKV4SqmqkVylNKVZ
- KU0pWqqlKRCGK8HkU7IPSnFKaVrohiGh3QhFMNP5pCK3WIGiMiopVyKnIpjDNX7a
- 6NEzNvLffHvA+Zf1Fc4PilceD9ZGm+I4pbrTZhvtb2MZkQd1cfxY9euMZyTXZFK8
- v+K2kJP4ekuAP3llIHU/7LEAj9Qfwr1spxNqvI9mYYyHPSbW6PZ9E8SaP4jtftOk
- ahBdx/xeW3zL/vKeV/EVqZr4ctL260+4W4srma2nX7skMhRh9COa7bSfjH400oBW
- 1FL6MdEvIw//AI8MMfzr6d0ux4an3Pq3NGa+d7b9oXWlx9q0Wwl9fKd0/mWqSX9o
- fVD/AKrQbNf9+Zm/oKn2bHzo+g91I8qRozyMqooyWY4AFfMeofHXxheZFsbGxHYw
- wbj/AOPlh+lcVrPinXfEL7tW1W6uhnIR5DsH0UcD8BVKkwc0fSXif4x+FvDoeKC4
- /tS8HSK0YMoP+0/3R+GT7V4X4y+KHiDxkWgml+x6celnbkhT/vnq348e1cVViwtz
- d6hbWw6yyqn5nFWoqKuTdydj6E+H2mCx8OadEVw3k+c/+83P9cfhXahaz9HhVYnK
- gADCgegFaoWvgcdWc60mfRL3YqK6DAtPC04LTwtedKZLkNC04LTgtPC1jKZDkNC0
- 4LTgtPC1lKZDkNC07GKo3uqQWeVB8yX+6p6fU1Uis9U1kgyN5FufXgEew6muzCZd
- XxT91aA1Zc0nZFi71m3t8rF+9k/2TwPxpbDRL/W51uL4tDbA8LjBI9h/U1r6boll
- YEOE82Yf8tH5x9B2rbR6+vy/IaVC0p6s46uMS0pfeSQwx28KQxKFRBhQOwqSmq2a
- dX0KVlZHnN3CiiimAU1qdSEZFAGD4h0k6paDy8CeIkpnv6iubg1eWzP2a/hcMnG7
- HP4+v1rvHWqdzaQ3K7Z4UkHYMucV5OYZVSxmstzsoYrkjySV0c8mq2MnSdQf9oEV
- Os0En3JY2+jA1JN4b0587YWQ/wCy5/rVCTwtb/8ALOeVf94A/wCFfO1OGJr4JHUs
- RQfVovFaaVrKbw/dQ8wXnP4r/LNMKa3a9/NUe4b/AOvXHUyDFQ21NYzpy+GSNYpT
- StZsWuFH2XcBQ9yo/oa1IZ4bld0MiuPY9K8urRrUX76LalHcYVppWrBWmlKzVUFI
- rlKaUqwUppStVVKUiuUrzv4oXCxeF9TzjLCOMe5LL/8AXr0W6mS2haR/wHqa8/8A
- FHhs+K7SO3mu3giEvmvsUEucEDr06mvdyWnKpWUuiFWny0pM+eKK9og+FGhQkGWS
- 8nPcPIAP0ArWtvBOgWePK0q3JHeQeZ/6Fmvt3UR4XKzwGp1srpl3LbTFfURnFfRM
- Wl21v/qbeKP/AHEC/wAqm+y+1T7TyHyHzbJBNF/rInT/AHlIqOvpb7KCCCoIPYiq
- s3hzSrn/AF+mWkhPdoFJ/PFHtPIOQ+c61vDGB4r0jIyPtkX/AKGK9ok+H/hqc5fS
- Yx/uO6fyIp9v8PPDdtcRXEOmlJYnDowuJOGByD96iU04tDgrSTO40gZtG/3z/IVp
- BayNHm2TPbucbuV+tbYWvzfGp06zTPenLW40LTwtOC04LXnymZOQ0LTgtPC07GBk
- 1i5kOQ3GKxLzUZruf7JYAnPBcd/8B70ahfyXs32Ky5B4Zh3/APrVpadpyWUW0cuf
- vN6//Wr6TJ8ndZ+1qrQVSoqMby36Ij07RILbEk2JZevPQfQVtLUaLU6LX3FKlCnH
- lgrHl1KsqjvJkiGrCVEi1Mi1sZkyVKKjRakpiCiiigAooooAQqDUTR1NRQBSeOoW
- irRKg0xoc0rDMtovaoWirVaH2qFoPalYLmNcWUU6bZY1ce46Vjz6E8beZZzMjDoC
- f611jQe1RNB7Vz1sNTqq00b08RUp/CzlBf6pZjFxB5ij+Ij+o4qVPEFuQPMhkU+2
- DXQtb+1VpNOgkJLwRsfUqDXiVuHcPN3jodSxkH8UfuMs65Z4ziQ+22q0uu7vlt4G
- LH+9/gK1jpFqDkW8f/fNOWyjj+5Gq/7oxWNPhulF3kyvrlNbROdNvdXknmXJIHZf
- /rdqmNrgYA4rcNt7Uw23tXu4fCU6EeWCOWriJVXrsYZtvamm19q3Da+1N+y+1dHK
- Y3MQ2vtSfZfatv7L7UfZfajlC5i/ZfanC19q2Ra+1L9l9qLBcyBbe1PW29q1hbe1
- OFt7UWC5g3NlIMTQ53rzx1q/YarFOoSYiOX34BrSFt7VWudEgustgxyH+Je/1FeN
- mWURxS5o6M7aGKSjyVPvLgFPArFGg6hH8sF7he3zMv8AKlGg6nNxPejb/vM36V80
- +HMS5WOjnpfzmhc6ja2YIkkBb+4vJrIe4vdbkMVupjtx94/4n+lalp4YtojumLTH
- 0PA/KtmO1WNQqIFUdABgCvYwHDkKTU6urMZ4qnD4NWZen6XFYx4T5nP3nPU1orF7
- VaWD2qVYPavqIU4wXLFaHBObm+aRWWKpljqwsNSiMCrsQQrHUypingYopiCiiigA
- ooooA//Z
+PHOTO;ENCODING=b;TYPE=jpeg:/9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAgGBgcGBQgHB
+ wcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zN
+ DL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyM
+ jIyMjIyMjIyMjIyMjIyMjL/wAARCAFQATYDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAA
+ AAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxF
+ DKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZW
+ mNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDx
+ MXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAA
+ AAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiM
+ oEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYW
+ VpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6w
+ sPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiig
+ AooooAKKKKACiiigAooooAKKKKACiiigAoorM17xBpnhnSZdT1a7S2tY/4m6seyqOpJ9BQBp
+ 1zuvePPC/hkMNW1q1glXrCrb5f++Fy36V5Hf+L/ABr8SXkj0hz4d8PMSFnOfPnX6jn8FwO2T
+ U2i/DfwxpKq89r/AGjc9WluzuBP+7938wfrQBr3X7Q+gGRotK0XVr+QdPkVA305J/Ssyb45e
+ KWbdb/D67WI9PMMrE/iIxXXQSQWsKxW8UcMS9EjUKB+AqT7b70AeeXP7Q3iGxkUXnhKKDP8M
+ ryIT+Yq/Y/tLWDlRf8Ahu5hHcwXKyfoVX+ddk9ykiFHCsp6qwyDXJa54B8Ma4Hd7BbS4b/lt
+ a/uzn1IHyn8RQB3WgfFzwX4iZI7fWI7a4fgQXo8ls+mT8pP0Jrt6+K/FngLUvCxM5YXVgWwt
+ xGMbfQMP4f1HvWt4F+LniDwbPDbyTvqGkKcNZzNnav/AEzY8r9OntQB9fUVjeGPFOk+L9Gj1
+ PSLkSwsdrqRh4m7qw7H/IyK2aACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKK
+ KACiiigAooooAKKKKACiiigAooooArahf22l6dcX95KIra3jaWV26KoGSa+fbm6n+I2vr4j1
+ pGTSYSRpmnP02Z++47k4z78dgM9b8Ztba6u9L8HwPiO6/0zUMHnyUPyr9GYH/vkVzC3Soiom
+ FVRgAcACgDohdhQAMADgAUfbPeue+2+9H2z3oA6H7Z70fbfeue+2e9H233oA6D7b70fbPeue
+ +2+9H233oA3pp4riF4ZkWSJ1KsjDIYHsRXhXjPw6PD+sEQZNlcZeA/3fVfwz+RFer/bPeuW8
+ fKl34d80jLwSqyn0B4P8x+VAHN/D7x1feA/ESXsBaSylIS8ts8Sp6j/AGhyQf6E19lWN9ban
+ YW99ZyrLbXEayxSL0ZSMg18EV9Gfs7eLWutOvfC91KWe1/0i0DH/lmTh1HsGIP/AAM0Ae50U
+ UUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFVd
+ TvBp+lXl62NtvA8pz6KpP8ASgD5h1nXf7a+J/ibUDJuSOX7NDzx5aEqMex25/GpPtvvXneh3
+ rRX8m9iTMDknuev+NdH9t96AOg+2+9H2z3rn/tvvSfbfegDoftnvR9t96577Z70fbfegDoPt
+ vvR9s965/7b70n233oA6H7Z71ieK7//AIkbxZ/1rqv5HP8ASoftnvXNa1qH225VFOY4+B7nu
+ aAMyuq+G+vf8I38QdG1Fn2wicRTHt5b/IxP0Bz+FcrRQB9/0VkeFdU/trwlpGpk5a6s4pX/A
+ N4qN365rXoAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiiigAoo
+ ooAK5v4gzeR8OfEj/8AUNnUfihH9a6SuW+JIz8NPEY/6cJT/wCO0AfFSsVYMpwRyDXe+FPCO
+ s+Krf7TCqW9qDt8+bIDEddoHJ/l71yWhaVLrmu2WmQ53XMyxkj+Edz+Ayfwr6us9PgsLOG0t
+ YljghQJGi9AB0oA8P174ea3oto93E0d7BGMv5OQ6j12nqPpmuI+2+9fVvlV85/FLwz/AMI54
+ paW3QJZXwM0QXgK38aj6E5+jCgDnvtnvV3Sba81vUobCxjMk8pwB2A7knsBXN5PrXvHwY8OL
+ a+HpNblQG4vWKRseqxKcfqwP5CgDT0T4b6Pp0Ctfp9uuiPmaQkID7L/AI5rSvvA/h2+hMbab
+ HCT0eD92w/Lj862NX1jTdCt1n1K6WBHJCDBZnI5OFAJP4Co9D17SfEds0+k3sdyiEBwAQyE+
+ qkAii4WPBvHnhbUPCcy7XM1hOcR3IGCD/db0P8AP88cNX1p4g0G38QaHd6ZcKNs6EKxH3G/h
+ YfQ4NfKFzbyWl1NbTLtlido3HoQcGgCKiiigD7D+DN39r+E+hsTlo1kiPttkYD9MV3leUfs9
+ XJn+GskZ6QahLGP++Ub/wBmr1egAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACi
+ iigAooooAKKKKACiiigArmviGhf4ceJAP8AoGzn8kJrpax/FkP2jwbrkGM+Zp9wn5xsKAPlX
+ 4Owed8R7I/884pn/wDHCP61658QdcOn3OmaUszxJd+ZLO0blGKJjChhyAS3OOykd68S+GepJ
+ pXxF0a4kcJG8xhck4GHUpz+LCvSPj9ZXFtJoerQ7hGvmwMwHCk4I/MbvyqW/eKWxo+C/Egj8
+ WDQvOkks72FpLZZHLmKROWUEnO0rzjsRx1qr8ebBT4b0u943xXZiH0dCT/6AK4L4aRajd+Nd
+ P1UxO9rZMxkkHAGVIwPUnI4r2zXNLTxhFFbahZrJbxSeakQJ4bBGTgjPBNctfF06MrPV9kdF
+ HC1KsbrRHyrX1r4HtVg8CaCiAAGxhfj1ZAx/UmsGX4b6ME+fRbcDHURD+lb2m3M2j2VvZQwo
+ 9pboI40BO5VAwBn6Vh/adJu0k0bf2fO14tM851HxUs/iTU7ksN0c72sXOdscZ24H1ILfj7Vz
+ Wi66NL+Ldjc2mFi1B0guUU4VvMO3J/HDfUVieKtE1rRNUvZzBIbGW4eSOZfmADMSM+h571U8
+ EWU+teP9FgAZ2a8jkfHZEO5j+Cqa9CM4zjeLujilCUZWkrH1h5VfKfxGt1tfiHrcaYwbkvx6
+ sAx/U19c+VXxz4x1JNX8ZaxfxMGimupDGw7oDhT+QFKDuElYxKKKK0IPp39nB8+AtST01Nz+
+ cUf+FexV4v+zdn/AIQ3VvT+0P8A2mle0UAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFAB
+ RRRQAUUUUAFFFFABRRRQAUUUUAFU9VTzNHvk/vW8g/8dNXKo61crZaFqF0/3YbaSQ59ApP9K
+ APg8EggjrX0rpWtQePvhlBYa5ps0l1Igjdn+XcygbZlb36/XI6dfLvhf4Og1yeTUr1BJBC+y
+ ONhlWYDJJHcDI4759q92htY4Iwsa4FeHmeZqi/Zw+I9PCYRSXPPbsVdA8O2um2cVvBEsNvGM
+ BV/z+tdNGUiQKgCqOwqlDJhAvQipPMryqeLivevqzsqJy06Fzzaq3FrDcZONr/3hTfMo8yrl
+ i4yVpExi4u6Me709clJVDAjGfUVk6P4d07w7rb6vp2nWwunQxsQCuFJycDOAeOuK6WdvNIHY
+ VDsriWNlSk/ZvQ6Wo1I++rmN4/8XX0Hgu9TStPuDqEy+USoz5SEfM47njgYHBOe1fLJGDzX1
+ 40UU6FTtYdOO1eBfFTw9Do+uR3VumxLvcXA6bxjJ9sgg/nX0GWZl7eXsprU8vGYVRXPA4Cii
+ ivbPNPpn9m4f8UTqh/6iJ/9FpXs1eIfs13G7w5rdtn/AFd2kmP95Mf+y17fQAUUUUAFFFFAB
+ RRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQAVyfxOvPsHwy8RTZxusn
+ iz/AL/yf+zV1leP/tEa0LHwPa6Ur4l1G6GV9Y4/mP8A49soA4f4L6vALK5052AljlL4PdWA5
+ /MfqK9XeCS2JkiBeM8tH3HuP8K+TtK1W70bUYr6zk2SxnvyGHcEdwa+ofD2rXVz4d07UruAi
+ C6gWQMp3bMjofavlc6wFVTdemrp7o9fCYhSgoPdGxEUmQPGwZT6VJtNMNpHN+/tZdjNzuXkN
+ 9RRm9j4a3SX/aR8foa+Wc9fdf3nVzD9ppNnrTfNuj92yI/3pAP5UfZbqb/XTCNf7sX+Jpc7X
+ xMXMRSzxxtsUF5T0ReT+PpTBayz83DYX/nmh4/E96vxWsUC7Y0Cjv6moJr63hfy1Jll6BIxk
+ 1UKkpvlpK7Hz9hvlxW8ROFRBycDFfP3xd1lb/xDFYoCPsqlnz6uAQP++Qv519AxWNxfSCS9X
+ yoFORB3P1rxH48aMLPxPY6pGgWO9t9jYH8cfH/oJT8q+uyXL6lKXtau5w4uunDkR5RRRRX0h
+ 5h7V+zhrItfFGqaO7ALe2wlTPd4z0/75dj+FfStfDfg/wAQy+FPFum63EC32WYF1H8SH5XH4
+ qSK+37W5hvbSG6tpBJBPGskbr0ZSMgj8DQBLRRRQAUUUUAFFFFABRRRQAUUUUAFFFFABRRRQ
+ AUUUUAFFFFABRRRQAUUUUAFFFFABXyR8bvFC+I/iDPBbvutNMX7IhB4ZwSXP/fXH/ARX0H8U
+ fGieCfB1xdxOP7QuMwWan++R97Hoo5+uB3r41ZmdyzMWZjkknJJoASvs/wlphtPDGl2U6D/A
+ EeziidSOrBADXyR4U006x4t0qw27lmukDj/AGAct+gNfZ9owFuPcmpkk9GUtDHu9Lm02U3On
+ IZIG5kt/T3WnWt7bXY+RwH7o3DD8K3d9UbvS7C9YvPbqXP8a/Kf0r5zMuH6WKfPTfLI7KeK0
+ tP7yLYKp3Oo2tsdpffJ0CR8k1N/wjmn9/OI9DIcVetLCzsf+PeBEP8Ae6n8zzXmUOFZ8372e
+ ho8RTW12ZUOn32qHfclrS2PSNfvt9fStqz0+1sE228Kp6t1J+pqXzKN9fU4TAUMLHlpo5ale
+ c9NkRXceV8wdR1ry740aOdU8BS3KJul0+VbgYHO37rfhhs/8Br1SR8xOPUGsS8tob6yns7hd
+ 8M8bRSL6qwwR+Rrr2dzLofF9FXtZ0ybRdavdMn/ANZazNETjrg8H8Rz+NUa0ICvpP4A+OxqW
+ lN4Uv5R9qslL2bMf9ZDnlfqpP5H2r5srV8N3OqWXiC0u9Fdl1GBjLDt6sVBJGO+RkY79O9AH
+ 3VRXM+BfGVl448NQ6pbYjnH7u6t88wyDqPp3B9PxrpqACiiigAooooAKKKKACiiigAooooAK
+ KKKACiiigAooooAKKKKACiiigAqtqF/a6Xp89/fTpBa26GSWV+iqOpqzXgnjbxDN8SvET6Dp
+ 07J4W06X/S7iM/8fko/hB7qO3b+Ln5aAPLfiR4zvvHPiI6rJFNFpilorCNxgKgPJ9NxyCcZ6
+ gdAK42uj8Z6tb6nrQhsESPT7JPs9sqfdIB5b8T+mK5ygD1P4G6P9r8UXequuUsYNqH0kfgf+
+ Oh/zr6LtpP3ZHoa83+E2h/2L4GtpJF23F+ftT564P3B/wB8gH8TXeRybG68Goe5XQ0vMo8yq
+ fm0eb70AXPMo8yqfm+9J5tAFzzKPMqn5tHm0AWpJcRtz2qjuokl3DGajzQB4J8cdC+x+I7XW
+ YkxHfRbJCP+eiYH6qV/I15XX1L8RfD/APwkngy9tY03XMI+0W/rvXsPqMj8a+WqpCYVPZ3c1
+ hewXdu22aFxIh9wc1BRTEey6V4gl8K6nbeOtEjaTSr4BdWsUPvywHqDnn19mNfR+l6nZa1pd
+ tqWnXCXFpcoJIpE6EH+R7EHkEEGvkb4da0kVxPod3hra7BKK/I3Y5H4j+XvXe+A/FMnw18U/
+ wBgalMT4Z1KTdbTSHi1kPqf7vQH8G45yAfQ9FFFABRRRQAUUUUAFFFFABRRRQAUUUUAFFFFA
+ BRRRQAUUUUAFFFYHjPxVa+DfDNzq9yPMZPkghBwZpT91R/M+wNAHHfFjxfcwJF4P0KXbq2pJ
+ m4mX/l1t+jNnszcgd8Z6Eqa8p8ValbeEfCsWi6adk8yFAQfmC/xOfc/19q0bR5LCC/8Q67P5
+ mpXZM93Kf4fSNfYcAD8PSvOLlpPED6r4g1FmS2hXy4lB6yNkRxj6csfZT3NAHOVs+FNDfxH4
+ msdLXOyaQeaw/hjHLH8gfxxWNXtnwS8P+RZXevzJ885+z25P9wHLH8Tgf8AATQB67GqRRJHG
+ oVEAVVHQAdBTs1Huqzb2NxcgFVwp/ibgVNhke8+tG8+tasWjxKMyuzH24FW0sraMcQof94Z/
+ nTsFzn959aN59a6QRRL0jQfRRQYYm6xIfqoosFzm959aN59a3pLC1k6wqP93iqk2jqRmGQg+
+ jc0WC5l5ozTp7aa2P7xCB2Yciod1KwXJN1fMHxG8P8A/CO+M7yCNNttcH7RBjptY8gfQ5H4V
+ 9N7q89+Lvhv+2fC/wDaMCZu9OzJwOWiP3x+GA34H1poDwKxtTfX0FqJooTM4QSTNtRSe5PYU
+ uoafdaXfTWV7A0NxE210bt/iPeq1drptzH400qPQ77b/bVshGm3THBmUc+Q5/8AQSfp9WI42
+ GaS3njmiYpJGwZWHUEcg165utfGfhZPNwrSL1HWKUf5/EGvI5YpIJnhlRkkRirIwwVI6giuo
+ 8D6ybHUWsZWxDc/dz2ft+fT8qAPcvgx48uLgP4K15wup2C4tJGPM0QH3fcqOR6r9CT7FXyh4
+ jt7mGa21/SpGi1LT2EiunUgHP44/lmvorwJ4utvG3hS11eHakxHl3MQ/wCWco+8Pp0I9iKAO
+ looooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACvnfxb4i/wCE68ctLE+7Q9FcxW2CC
+ s8/8UnuB29gD3Nei/GDxdJ4c8KCwsXI1XVmNtb4PKKeHf2wDge7A9q8Ykmg8OeHjswRBHhc/
+ wAbn1+pNAGL411abU9Qg0KxDSNvUOqdXkP3V/DP5n2rN8YvFpv2TwzaOrRaapNy69Jblsbz7
+ 44UfQ1d8Gj+zrXVvGV4vmNZqUtd4/1ly/APvjOT9c1xcsjzSvLIxeR2LMxOSSepoAn0+xn1P
+ Ubextl3T3EixoPcnFfV+jaZFpOk2el2ikx28axrgcsR1P1Jyfxrxr4M+HvtOp3GvTpmO1HlQ
+ ZHWQj5j+CnH/Aq+h9MtRDGJnHzsOPYUAS2WmJEA84Dv/d7D/GtLIqHdRuoAn3Ubqg3UbqAJ9
+ 1G6oN9G+gCfdSbqh30b6AJm2spVgCD1BrIvtMABkth9U/wrR30b6AOYzTXCyIyOoZGGGUjII
+ 9K0dUtdp+0IOCfnHv61mZosB8v+NPDreGPFF3YbT9nJ8y3Y9426flyPqKwopZIJkmidkkjYM
+ jqcFSOQRXvfxc8OjVfDX9pwpm60/LkgctEfvD8OD+B9a8BoA7rxLbR+KPDMPi+0iVbuNhb6r
+ GnA38YlA7A5Gfcj3NcMrMjBlJDA5BHY12fw11iGz199Jvfm0/V0+yzITxuPCn8yR/wKuf8AE
+ WjS+H9fvNLmOTA+Fb+8p5U/iCDQB3+j6qNS0uG4ON5G2Qf7Q6/4/jVz4f8AiX/hAPiEtvK4T
+ Q9XISTJwsTZ+VvbaT/3y1cJ4SvjFcy2jH5ZBvX/AHh/9b+VbmuWo1DTXUD97H88ZHXI7fjQB
+ 9f0V578HPGJ8W+B4RcybtQ08i2uMnJYAfI5+o4yepU16FQAUUUUAFFFFABRRRQAUUUUAFFFF
+ ABRRRQAUUVw3xc8S/8ACM/DvUZ4323V2PskH+84IJ9sKGOfUCgDxbxLr48Z/Ea/1hW36fYf6
+ JY+hAzlh9SSf+BD0rkfGd80j21gh/6aMPU9B/WtLR4fsWlwRHhiu5vqeaq+GdPPiL4nW8bDd
+ DDN5knGRtj5wfYkAfjQBN49jHh/Q9D8KR4DQxfbLvH8Uz5HP0+YfQiuFijeaVIo1LSOwVVHU
+ k9BXQ+P9QbUvHWrzE8RzmBfonyf0z+Nafwp0P8AtjxtbyyLmCxU3L5/vDhB/wB9EH8DQB7v4
+ O8PRaFomn6SuCY1zKw/ic8sfzz+GK7fNZFiMXIPsa080ASbqN1R7qN1AEm6jdUe6jdQBJuo3
+ VHuo3UASbqN1R7qN1AEm6jdUe6jdQA6RRLGyN0YYrnmQqxU9QcVv7qx7gZuJD/tGi4FSWGOe
+ F4pUDxupVlPQg8EV8seKNFbw94lvtLbJWGQ+WT/ABIeVP5EV9Xba8Z+N+h7J9P1yNeHBtpiP
+ UZZP03fkKAPIo5HilSSNiroQysOoI6GvTvijbLquh6D4riUA3UCxT46Biu4fjnePwFeX17DY
+ wf2x8ApYtoeW0DupPbZIW/9BJFAHk1jOba+hmBxscE/Tv8ApXd+d7155XX21wXtYmJ5KAn8q
+ AOq+EniD/hFfigtg7FbHVsQFecB2OYzj/e+X6Ma+pq+H9XkeGe1vYWKSxONrKcEEcj+VfZfh
+ rWY/EPhrTdXiK7bu3SUhTkKxHzL+ByPwoA1aKKKACiiigAooooAKKKKACiiigAooooAK+cf2
+ gdY/tHxnpHh9JAYbSMSyqOzyHof+Aqp/wCBV9HV8Z+KtWbXPijrGoM+9TdSLGf9hfkT9AKAL
+ /m+9bfwSsxNq+taiT8yIsQH++xY/wDoArlvNruvgcq/Ztex98Txg/TDY/rQB43qc5utVvLg9
+ ZZ3f82Jr234IaT9n8O32psuGu5xGp9UQf4s35V4trVq1lruoWrfehuZIz+DEV9OeAtP/s7wJ
+ otvjBNsspHu/wA5/VqTGjo7Y7Z1P4Vo5rOAIOR2q6rblBHelcCTNGaZmjNMB+aM0zNGaAH5o
+ zTM0ZoAfmjNMzRmgB2aM03NGaAHFsDJrLb5mLepzV6Z8R47mqm2lcCPbXK/EfSv7V8BapEFz
+ JDH9oT2KHcf0BH41122mywpNC8UihkdSrKe4PBouB8a17r4Etnb4OXikcTxXW33GGX+YNeV6
+ r4K8Q6Zd3CNo2oNBFIyrMtuxVlBIByBjnrXukGnt4d+FElo52S2+mSF88YkKFiP++iaoR81V
+ vWcuLSIei1g1pxSbYUX0AoAsai3mWbj0IIr6R+AGqG++Gq2rkbrG6khAHXacOP1dvyr5lmk3
+ QuPavcP2Z5v3XiOAsfvW7hf+/gJ/lQB77RRRQAUUUUAFFFFABRRRQAUUUUAFFFFAFXU71dO0
+ q8vnGVtoHmI9lUn+lfDFhLnUGkPVtx5r7X8YHb4J18+mnXB/wDIbV8P2z7LhG98UAdD5td98
+ FrxYfEOtadgf6RElwp/3SQR/wCP/pXmfm1f0DXH8PeJbDWEBIt5MSqvVozww/ImkBt/Fzw9J
+ p3jlrmOPEGpgSxkdN/CuPrnB/4FX0XDAlvBHDGMJGoRR6ADArnvEGg6f420OyljkVwkkd3az
+ r+Bx9COPy9K6jFS2UkMxUkTY+U0m2jFK47E1FMB9aWi4rDqKbRRcLDqKbRRcLDqKbRRcdh1I
+ TgZpM01st9KLhYjc7mzSYp+2jbRcLDNtcp4w8f6N4NVI7syT3kg3JbQ4LY/vMT90f5ANdeFr
+ wHw7dQ654u1vxLeATSG5KW2/ny17Y9wu0D8aa1E9DYb45yxMGn8KzRwnoxuj/WPFa0XxM8Fe
+ L9Pl0rVjPZJcLsdbnKqec8Op4/HFTPqiSIUfayMMFWGQa5PW/CWhasjNDCtjcdpIBhT9V6fl
+ iqsK5V8TfBu4hg/tHwtcjUrJhvEJcGTHqrDhx+R+teaTCW2meGeN4pUO1kdSrKfQg9K6e01j
+ xP8OtR2Wl4fs7HcEOXglH+6eh+mD713yT+HvjJpjwyRJpviiCMmNs8OB7/xL7Hle3ubAeKtL
+ lSM17Z+zV5n9u67j/VfZo93+9uOP614vf2NzpmoXFjdxmO4t5DHIh7EHFe8/szw/u/Ek5U9b
+ dA3/fwkfypiPfaKKKACiiigAooooAKKKKACiiigAoopGZUUsxAUDJJ7UAUNdW2k0K+gu3CQT
+ QPE5Poylf618/8Ah34Z6XYxK95EL656s0n+rU+gXv8Aj+lem67qz61feTCSLSI/L/tH+9/hV
+ vS9MR4xJKvyfwr6+9eHisZUq1PZUXoexh8NCjD2lVanHSeE9LkjKNplgQRjAgUfriuM8RfDO
+ 3ljaTSSbaYDPkuxZH+hPI/l9K94aytWXaYE/AYrG1LSxEhZctF+q1zXxGH99Suje9Ct7so2P
+ Ffh149m8I3p8Oa+HisA5CM45tmJ6H/ZPX8c173DLHPCk0MiSROoZHQ5DA9CCOorx34g+DhrF
+ k11bJ/xMLdSUIH+tUfw/X0/LvXBeC/iRq/g6QQA/a9NJ+a0kb7vuh/hP6e1e1h68cRDmW55W
+ IoOhPlex9R4pcVheF/F+jeLbPz9LuQZFH723f5ZI/qPT3GRW+K1MRuKMVJto20XCxHRUm2jb
+ RcZHRUm2jbRcCOipNtG2i4EeKMVJto20XAjxTJHSGNpJCFVRkk1PtrC8Q3BAitEP3/mb+lY1
+ 6vsqbka0KXtJqJQur241J2RCY4B2H9fWvn/AMLXxsY7y1b5XWXJH6f0r6LsLMPhT9xevua+e
+ PiBpMvhbx7foiFbe5Y3EPoUc5wPo2R+FceWVp1JSc+p1ZhTjGMVHobn9r/7VJ/a/wDtVwn9q
+ t6mkOqt717B5Z0nibUI7jRnjfBYupT2Of8ADNcxoV9c6Zr1he2bEXEM6MmO5z0/Hp+NVbi6k
+ uXBc8DoPSu8+HHgi61W/h1i7QxWNu4eIsOZXHTHsD1P4euMq1aNKDnM0pUpVZKMQ+NEcKfEW
+ 4MQG5oImlwP4tuP5Ba9u+Auk/2d8M4Llsb7+4kuOnIAOwD/AMcJ/Gs288P2d8Wa6tba4Zupl
+ iDE/iRXSeHNdGi29vpc0CR2USiOLYuPLUdPqP1+tcNHNKU3yvQ7auXVILmi7ne0UisrqGUgq
+ RkEd6WvTPOCiiigAooooAKKKKACimu6xozuQqqMknsK4XVvEl3qMzQWLNFbjjcOGb3z2HtXP
+ iMTChG8jehh51pWidde6xYWGRcXKKw/gHLfkK5DWfEsuqqbSzRo4D94nqw/oKyUtFBy5LGtS
+ x08SDew2x+g714lXMatf3IKx61PBUqHvz1ZDptgZGC4+Qcu3rXSLhVCjgAYFQoqxqFQAKOwp
+ 26nRpqkvMmrN1H5Em6kbDKVYZB4INR7qN1auRnynOalZ7HZAOnKH2rwH4keGv7K1X+0raPFp
+ dsSwA4STuPx6/n6V9K6hEJYNwHzJz+FcL4r0SPWtIubJ8DzlyjH+FxyD+f9a5sPV+rV7fZZ0
+ 1af1ijbqj5303U73R9QhvtPuZLe5ibckiHBH+I9u9fRfw6+KVr4sC6bqQS11dRwAcJcD1X0b
+ 1X8R6D5tngktriSCZCkkbFHU9QRwRSRSyQSpLC7RyIwZXU4KkdCDX0jSkjwLtM+2wKdtrzX4
+ VfEdfFVoNJ1SQLrMC5DHj7Sg/iH+0O4/H1x6aBWL0NFqM20bafto20rjGbaNtP20baLgM20b
+ afto20XAZto20/bRtouAzbXJ6k3m69J3CYH5D/Guv21xQbzdSuZD3dv515uZztTSPRy6N5tm
+ 3aAJbr6nmub8d+CrXxppKwl1hvoMtbzkZxnqrf7J/Tr7Ho0OEUegp+6uOlUdOzj0OipBTumf
+ KmreB/Emi3DRXekXRA6SRRmRGHqGXI/rS6Z4F8T6vIEtdFu8H+OWMxJ/wB9NgV9V7qXdXof2
+ lK22pxfUY33PLPB/wAGLPTpUvfEUkd7OvK2qZ8pT/tE8t9OB9a9GubJIIwYVCxjjYOij2q8D
+ TZzmB8+lefiqzrJuZ10YKk/dMkCmTwCWEjHzAZFWAtOC14vtLO53uR0Hg++a50toHbL27bR/
+ unp/UfhXRVwnhab7J4glticLMpAHuOR+ma7uvtMBV9rQTPncbT5Kzt11Ciiiu05QooooAKKK
+ KAOf8YXLW+i7FODM4Qn25J/lXIW6BIV9SMmuq8bJu0iFv7sw/ka5uIboIz6qK+ZzibVWzPey
+ 2yo38xK30wqKo4AHFYZWtK1m8yIKT8y8GuPCVEm0dGIV0mW91G6os0m6u7nOXlJd1JuqPdSb
+ qOYfKSFsjFYd9bYLx491rX3VDcxiZOPvDpWFZcy03RrSfKz55+KHh82eprq8KYhufllwPuyD
+ /ED8wa8+r6c8QaNb6rp89pcoTDMNrY6qexHuDXzprmjXOg6rNYXS/Mhyr44dezCvZy7FKrT5
+ Hujzcfh+SfOtmRaVqd3o2q22o2UpjubeQSIw9R2PqD0Ir7F8N61D4k8OWGrwABLqIOVBzsbo
+ y/gwI/Cvi6vpv4Dec3w6bzc7BfSiLP93C9Px3V3VFpc4oPWx6ZijFSYoxWFzUjxRipMUYouF
+ iPFGKkxRii4WI8UYqTFGKLhYjIwCa4KzO55W9TXd3TiKzmkP8EbN+QrhrEfIx9TivJzSWiR6
+ eXL4mbAbil3VCDTwa872ljraJQacDUYp4qXVIaJBUdw3yBfWng1A53vnt2rnrV7RsKK1IgtP
+ C04LTwtedKZo5GdPI1hqdteqMhWBI9cdR+Ir0WCaO4gSaJgyOAykdxXEzW63ELRv0Pf0p3h3
+ VZNLvP7Nuz+5dvkY9FJ/oa+iyTMIr91I4sZR9rHmjujuKKKK+rPGCiiigAooooAxfFcXmeH5
+ zjJQqw/MVyVl89nGfTj9a6/xPMsWgXOerAKB7kiuU06MixQnvk/rXy2ftRkmezl7apP1HFaF
+ LRtuXg1OUppSvn41bao7ua5YjlEi5HXuKcaqAFTkcGpkl3cNwa76eLvozJxtsPNNyacaaa6V
+ WBCbqN1IaaaftENIr3UQYFgOD94VwfjTwhF4hsBECsd1HzBMw4Hqrex/wDr16Eao3EIYFCOD
+ 0PpSjVdKanA15VUi4SPMdD/AGfNSuZ4pdW1e0jszhiLTc7uPQEgAZ9efpXvWkaRZaHpNtpmn
+ xCK1tk2Iv8AMn1JOST6muf8Pao1pP8AYLhvkY/uyex9Poa6zdX0NLEe3gpHiVaHsZcouKXFN
+ 3Ubq0Mx2KMU3dRuoAdijFN3UbqAHYoxTd1IzhFLMQqgZJPAAoAzPEc/2fRpQDhpCEH49f0zX
+ MWce2BPfmjU/Elh4im8jS7hbmC3lMbzJyjPgcKe4Geo45q0qAAAdBXz2aVf3nL2PYwceWlfu
+ OFPFNC04CvIdU3Y8U8UwCngVk6xmxWPGKQLTgtOC1zzq3ZN7DQtPC04LTgtYSmS5DQtUtVtB
+ NamRR88Yz+HetILUN9KlvZyu5H3SAPU0UaslVi47iUnfQ2/DWoNqGjxtI2ZYz5bk9yO/wCWK
+ 165rwVC8elSyNkLJKSvuAAM/wCfSulr9RwspSoxct7HjYiKjVko7BRRRW5iFFFBOKAOQ8bTs
+ xs7NT95i5Hv0H8zUUcIjjVB0UYFN8V8eILKRvubV5PThjmre2vguIqr+sWZ7VD3aMbFcpTSl
+ WClNKV4SqmqkVylNKVZKU0pWqqlKRCGK8HkU7IPSnFKaVrohiGh3QhFMNP5pCK3WIGiMiopV
+ yKnIpjDNX7a6NEzNvLffHvA+Zf1Fc4PilceD9ZGm+I4pbrTZhvtb2MZkQd1cfxY9euMZyTXZ
+ FK8v+K2kJP4ekuAP3llIHU/7LEAj9Qfwr1spxNqvI9mYYyHPSbW6PZ9E8SaP4jtftOkahBdx
+ /xeW3zL/vKeV/EVqZr4ctL260+4W4srma2nX7skMhRh9COa7bSfjH400oBW1FL6MdEvIw//A
+ I8MMfzr6d0ux4an3Pq3NGa+d7b9oXWlx9q0Wwl9fKd0/mWqSX9ofVD/AKrQbNf9+Zm/oKn2b
+ Hzo+g91I8qRozyMqooyWY4AFfMeofHXxheZFsbGxHYwwbj/AOPlh+lcVrPinXfEL7tW1W6uh
+ nIR5DsH0UcD8BVKkwc0fSXif4x+FvDoeKC4/tS8HSK0YMoP+0/3R+GT7V4X4y+KHiDxkWgml
+ +x6celnbkhT/vnq348e1cVViwtzd6hbWw6yyqn5nFWoqKuTdydj6E+H2mCx8OadEVw3k+c/+
+ 83P9cfhXahaz9HhVYnKgADCgegFaoWvgcdWc60mfRL3YqK6DAtPC04LTwtedKZLkNC04LTgt
+ PC1jKZDkNC04LTgtPC1lKZDkNC07GKo3uqQWeVB8yX+6p6fU1Uis9U1kgyN5FufXgEew6muz
+ CZdXxT91aA1Zc0nZFi71m3t8rF+9k/2TwPxpbDRL/W51uL4tDbA8LjBI9h/U1r6bollYEOE8
+ 2Yf8tH5x9B2rbR6+vy/IaVC0p6s46uMS0pfeSQwx28KQxKFRBhQOwqSmq2adX0KVlZHnN3Ci
+ iimAU1qdSEZFAGD4h0k6paDy8CeIkpnv6iubg1eWzP2a/hcMnG7HP4+v1rvHWqdzaQ3K7Z4U
+ kHYMucV5OYZVSxmstzsoYrkjySV0c8mq2MnSdQf9oEVOs0En3JY2+jA1JN4b0587YWQ/wCy5
+ /rVCTwtb/8ALOeVf94A/wCFfO1OGJr4JHUsRQfVovFaaVrKbw/dQ8wXnP4r/LNMKa3a9/NUe
+ 4b/AOvXHUyDFQ21NYzpy+GSNYpTStZsWuFH2XcBQ9yo/oa1IZ4bld0MiuPY9K8urRrUX76La
+ lHcYVppWrBWmlKzVUFIrlKaUqwUppStVVKUiuUrzv4oXCxeF9TzjLCOMe5LL/8AXr0W6mS2h
+ aR/wHqa8/8AFHhs+K7SO3mu3giEvmvsUEucEDr06mvdyWnKpWUuiFWny0pM+eKK9og+FGhQk
+ GWS8nPcPIAP0ArWtvBOgWePK0q3JHeQeZ/6Fmvt3UR4XKzwGp1srpl3LbTFfURnFfRMWl21v
+ /qbeKP/AHEC/wAqm+y+1T7TyHyHzbJBNF/rInT/AHlIqOvpb7KCCCoIPYiqs3hzSrn/AF+mW
+ khPdoFJ/PFHtPIOQ+c61vDGB4r0jIyPtkX/AKGK9ok+H/hqc5fSYx/uO6fyIp9v8PPDdtcRX
+ EOmlJYnDowuJOGByD96iU04tDgrSTO40gZtG/3z/IVpBayNHm2TPbucbuV+tbYWvzfGp06zT
+ PenLW40LTwtOC04LXnymZOQ0LTgtPC07GBk1i5kOQ3GKxLzUZruf7JYAnPBcd/8B70ahfyXs
+ 32Ky5B4Zh3/APrVpadpyWUW0cufvN6//Wr6TJ8ndZ+1qrQVSoqMby36Ij07RILbEk2JZevPQ
+ fQVtLUaLU6LX3FKlCnHlgrHl1KsqjvJkiGrCVEi1Mi1sZkyVKKjRakpiCiiigAooooAQqDUT
+ R1NRQBSeOoWirRKg0xoc0rDMtovaoWirVaH2qFoPalYLmNcWUU6bZY1ce46Vjz6E8beZZzMj
+ DoCf611jQe1RNB7Vz1sNTqq00b08RUp/CzlBf6pZjFxB5ij+Ij+o4qVPEFuQPMhkU+2DXQtb
+ +1VpNOgkJLwRsfUqDXiVuHcPN3jodSxkH8UfuMs65Z4ziQ+22q0uu7vlt4GLH+9/gK1jpFqD
+ kW8f/fNOWyjj+5Gq/7oxWNPhulF3kyvrlNbROdNvdXknmXJIHZf/rdqmNrgYA4rcNt7Uw23t
+ Xu4fCU6EeWCOWriJVXrsYZtvamm19q3Da+1N+y+1dHKY3MQ2vtSfZfatv7L7UfZfajlC5i/Z
+ fanC19q2Ra+1L9l9qLBcyBbe1PW29q1hbe1OFt7UWC5g3NlIMTQ53rzx1q/YarFOoSYiOX34
+ BrSFt7VWudEgustgxyH+Je/1FeNmWURxS5o6M7aGKSjyVPvLgFPArFGg6hH8sF7he3zMv8AK
+ lGg6nNxPejb/vM36V80+HMS5WOjnpfzmhc6ja2YIkkBb+4vJrIe4vdbkMVupjtx94/4n+lal
+ p4YtojumLTH0PA/KtmO1WNQqIFUdABgCvYwHDkKTU6urMZ4qnD4NWZen6XFYx4T5nP3nPU1o
+ rF7VaWD2qVYPavqIU4wXLFaHBObm+aRWWKpljqwsNSiMCrsQQrHUypingYopiCiiigAooooA
+ //Z
 X-SPOUSE:Manuela Graf
 X-EVOLUTION-SPOUSE:Manuela Graf
 item1.X-ABRELATEDNAMES:Manuela Graf
@@ -923,10 +904,10 @@
 TEL;X-EVOLUTION-TTYTDD:+49 3377 37 373
 TEL;X-EVOLUTION-TTYTDD:+49 8378 33
 TEL;X-QUICKDIAL:13355
-ADR;TYPE=WORK;CHARSET=utf-8:PO 373;Andresen AG\, R&amp;D;Messegasse 7;Passau;Ba
- yern;94036;Deutschland
-ADR;TYPE=WORK;CHARSET=utf-8:6266 AA;andresen Holding\, Geschäftsleitung;Wei
- senstraße 13;Irgendwo;Niedersachsen;34332
+ADR;TYPE=WORK;CHARSET=utf-8:
+ PO 373;Andresen AG\, R&amp;D;Messegasse 7;Passau;Bayern;94036;Deutschland
+ADR;TYPE=WORK;CHARSET=utf-8:6266 AA;andresen Holding\, Geschäftsleitung;
+ Weisenstraße 13;Irgendwo;Niedersachsen;34332
 ADR;TYPE=HOME;CHARSET=utf-8:;;Weisenstraße 13\r;Irgendwo;;34332
 ADR;TYPE=X-OTHER:;;Irgendwo;Nirgendwo;Sonstwo;0000;Antarktis
 ORG:andresen AG;R&amp;D;;XXX\, 033
@@ -945,36 +926,32 @@
 item10.X-ABLabel:_$!&lt;HomePage&gt;!$_
 X-BUSINESS-CATEGORY:IT
 X-BUSINESS-CATEGORY:Development
-KEY;ENCODING=b;TYPE=X-CERT:
- LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR2RENDQXlXZ0F3SUJBZ0lK
- QUpUeXNHNDV0V3BZTUEwR0NTcUdTSWIzRFFFQkJRVUFNSUdiTVFzd0NRWUQKVlFR
- R0V3SkJWVEVUTUJFR0ExVUVDQk1LVTI5dFpTMVRkR0YwWlRFTk1Bc0dBMVVFQnhN
- RVEybDBlVEVoTUI4RwpBMVVFQ2hNWVNXNTBaWEp1WlhRZ1YybGtaMmwwY3lCUWRI
- a2dUSFJrTVF3d0NnWURWUVFMRkFOU0prUXhGakFVCkJnTlZCQU1URFZOMlpXNGdR
- VzVrY21WelpXNHhIekFkQmdrcWhraUc5dzBCQ1FFV0VITjJaVzVBWVc1a2NtVnoK
- Wlc0dVpHVXdIaGNOTVRBd05qSXpNRGd5T0RFNFdoY05NVEV3TmpJek1EZ3lPREU0
- V2pDQm16RUxNQWtHQTFVRQpCaE1DUVZVeEV6QVJCZ05WQkFnVENsTnZiV1V0VTNS
- aGRHVXhEVEFMQmdOVkJBY1RCRU5wZEhreElUQWZCZ05WCkJBb1RHRWx1ZEdWeWJt
- VjBJRmRwWkdkcGRITWdVSFI1SUV4MFpERU1NQW9HQTFVRUN4UURVaVpFTVJZd0ZB
- WUQKVlFRREV3MVRkbVZ1SUVGdVpISmxjMlZ1TVI4d0hRWUpLb1pJaHZjTkFRa0JG
- aEJ6ZG1WdVFHRnVaSEpsYzJWdQpMbVJsTUlHZk1BMEdDU3FHU0liM0RRRUJBUVVB
- QTRHTkFEQ0JpUUtCZ1FDdEtPWnJBOXBjdjJWUVpkSEg4YmhhCmZqMlZWMW9Hakxj
- Tkt3MktWVkJ6anphQVlyaU9HcnBNWDdhcW1oL3pjNHhBMTVDc1JJYjJoQXpPcDlT
- eldvQ00KbXhZcFN5eG8rbUJHUGRYOVcvTStYcStSYUtGSURpdHZyL0xBb2I5N0ov
- eWp5R0JDYU4vdExvdG9ZN3F5TjAxUQpWTkRYNkJkcS9GZTFjcUdhcnFvdzNRSURB
- UUFCbzRJQkJEQ0NBUUF3SFFZRFZSME9CQllFRkhNaFBPR255aENtCmxWcHlCZHhC
- TVczZ2drbS9NSUhRQmdOVkhTTUVnY2d3Z2NXQUZITWhQT0dueWhDbWxWcHlCZHhC
- TVczZ2drbS8Kb1lHaHBJR2VNSUdiTVFzd0NRWURWUVFHRXdKQlZURVRNQkVHQTFV
- RUNCTUtVMjl0WlMxVGRHRjBaVEVOTUFzRwpBMVVFQnhNRVEybDBlVEVoTUI4R0Ex
- VUVDaE1ZU1c1MFpYSnVaWFFnVjJsa1oybDBjeUJRZEhrZ1RIUmtNUXd3CkNnWURW
- UVFMRkFOU0prUXhGakFVQmdOVkJBTVREVk4yWlc0Z1FXNWtjbVZ6Wlc0eEh6QWRC
- Z2txaGtpRzl3MEIKQ1FFV0VITjJaVzVBWVc1a2NtVnpaVzR1WkdXQ0NRQ1U4ckJ1
- T2JWcVdEQU1CZ05WSFJNRUJUQURBUUgvTUEwRwpDU3FHU0liM0RRRUJCUVVBQTRH
- QkFGcnVidGpoWVB1RERHVVpQRTQraUo2a3FmdEtXWDFJVzdmTXdtc3BRUWt5CitX
- UThSL3AxbURrc3ZEQ3hDYWp2YVduSVI2dGIwbmtCMTFFNmQ0dDhkMkxWTTE4M3dD
- UWJtMDRJS05mdkRKOXQKUE4vdHBVTkJrc0VkaXBlMEM1SEgyMnY0RitSSzVUK1lq
- M1J6VHZmOTdROVMzTzF3eE5lZkt0NXVUNFFxNUZtdAotLS0tLUVORCBDRVJUSUZJ
- Q0FURS0tLS0tCg==
+KEY;ENCODING=b;TYPE=X-CERT:LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUR2R
+ ENDQXlXZ0F3SUJBZ0lKQUpUeXNHNDV0V3BZTUEwR0NTcUdTSWIzRFFFQkJRVUFNSUdiTVFzd
+ 0NRWUQKVlFRR0V3SkJWVEVUTUJFR0ExVUVDQk1LVTI5dFpTMVRkR0YwWlRFTk1Bc0dBMVVFQ
+ nhNRVEybDBlVEVoTUI4RwpBMVVFQ2hNWVNXNTBaWEp1WlhRZ1YybGtaMmwwY3lCUWRIa2dUS
+ FJrTVF3d0NnWURWUVFMRkFOU0prUXhGakFVCkJnTlZCQU1URFZOMlpXNGdRVzVrY21WelpXN
+ HhIekFkQmdrcWhraUc5dzBCQ1FFV0VITjJaVzVBWVc1a2NtVnoKWlc0dVpHVXdIaGNOTVRBd
+ 05qSXpNRGd5T0RFNFdoY05NVEV3TmpJek1EZ3lPREU0V2pDQm16RUxNQWtHQTFVRQpCaE1DU
+ VZVeEV6QVJCZ05WQkFnVENsTnZiV1V0VTNSaGRHVXhEVEFMQmdOVkJBY1RCRU5wZEhreElUQ
+ WZCZ05WCkJBb1RHRWx1ZEdWeWJtVjBJRmRwWkdkcGRITWdVSFI1SUV4MFpERU1NQW9HQTFVR
+ UN4UURVaVpFTVJZd0ZBWUQKVlFRREV3MVRkbVZ1SUVGdVpISmxjMlZ1TVI4d0hRWUpLb1pJa
+ HZjTkFRa0JGaEJ6ZG1WdVFHRnVaSEpsYzJWdQpMbVJsTUlHZk1BMEdDU3FHU0liM0RRRUJBU
+ VVBQTRHTkFEQ0JpUUtCZ1FDdEtPWnJBOXBjdjJWUVpkSEg4YmhhCmZqMlZWMW9HakxjTkt3M
+ ktWVkJ6anphQVlyaU9HcnBNWDdhcW1oL3pjNHhBMTVDc1JJYjJoQXpPcDlTeldvQ00KbXhZc
+ FN5eG8rbUJHUGRYOVcvTStYcStSYUtGSURpdHZyL0xBb2I5N0oveWp5R0JDYU4vdExvdG9ZN
+ 3F5TjAxUQpWTkRYNkJkcS9GZTFjcUdhcnFvdzNRSURBUUFCbzRJQkJEQ0NBUUF3SFFZRFZSM
+ E9CQllFRkhNaFBPR255aENtCmxWcHlCZHhCTVczZ2drbS9NSUhRQmdOVkhTTUVnY2d3Z2NXQ
+ UZITWhQT0dueWhDbWxWcHlCZHhCTVczZ2drbS8Kb1lHaHBJR2VNSUdiTVFzd0NRWURWUVFHR
+ XdKQlZURVRNQkVHQTFVRUNCTUtVMjl0WlMxVGRHRjBaVEVOTUFzRwpBMVVFQnhNRVEybDBlV
+ EVoTUI4R0ExVUVDaE1ZU1c1MFpYSnVaWFFnVjJsa1oybDBjeUJRZEhrZ1RIUmtNUXd3CkNnW
+ URWUVFMRkFOU0prUXhGakFVQmdOVkJBTVREVk4yWlc0Z1FXNWtjbVZ6Wlc0eEh6QWRCZ2txa
+ GtpRzl3MEIKQ1FFV0VITjJaVzVBWVc1a2NtVnpaVzR1WkdXQ0NRQ1U4ckJ1T2JWcVdEQU1CZ
+ 05WSFJNRUJUQURBUUgvTUEwRwpDU3FHU0liM0RRRUJCUVVBQTRHQkFGcnVidGpoWVB1RERHV
+ VpQRTQraUo2a3FmdEtXWDFJVzdmTXdtc3BRUWt5CitXUThSL3AxbURrc3ZEQ3hDYWp2YVduS
+ VI2dGIwbmtCMTFFNmQ0dDhkMkxWTTE4M3dDUWJtMDRJS05mdkRKOXQKUE4vdHBVTkJrc0Vka
+ XBlMEM1SEgyMnY0RitSSzVUK1lqM1J6VHZmOTdROVMzTzF3eE5lZkt0NXVUNFFxNUZtdAotL
+ S0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
 CALURI:http://caldav.andresen.local/sja
 FBURL:http://caldav.andresen.local/freebusy
 CAPURI:http://caldav.andresen.local/access
@@ -983,6 +960,7 @@
 X-DESCRIPTION;CHARSET=utf-8:außerdem
 NOTE:Nur so ein Test!
 CATEGORIES:bla,blubb,test,hihi,oops
+REV:YYYYMMDDTHHMMSSZ
 END:VCARD
 </VC:address-data>
    </prop>
@@ -993,12 +971,11 @@
   <href>/caldav.php/user1/addressbook/hans_dieter.vcf</href>
   <propstat>
    <prop>
-    <getetag>"db3e92c0ae37268c647949367e2030cc"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:4.0
 PRODID:-//ALAB//NOSGML Version 0.9//DE
-REV;VALUE=date-time:20090124123353Z
-UID:uid=schmidt.1208717693\,ou=Contacts\,dc=andresen\,dc=de
+UID:excellent-looking-uid-string
 X-ABUID:A93F52CB-C15F-1F34-2C49-7A67-0971277F\:ABPerson
 FN:Hans Dieter Schmidt
 SORT-STRING:Schmidt\, Hans Dieter
@@ -1086,14 +1063,14 @@
 TEL;TYPE=X-EVOLUTION-RADIO:+49 9872 394 872 34
 TEL;TYPE=X-EVOLUTION-TELEX:+49 38 288 228 82
 TEL;TYPE=X-EVOLUTION-TELEX:+49 7722 88 28 282
-TEL;TYPE=MAIN:+49 6237 623 723 84 76

+TEL;TYPE=MAIN:+49 6237 623 723 84 76
 TEL;TYPE=MAIN:+49 9324 32 479 234234
 TEL;X-EVOLUTION-CALLBACK:+49 8383 73 723
 TEL;TYPE=MODEM:+49 8383 73 723
 TEL;X-EVOLUTION-TTYTDD:+49 7373 73
 TEL;X-EVOLUTION-TTYTDD:+49 8378 33
-ADR;TYPE=WORK;CHARSET=utf-8:;Uni Harburg\, -;Innstraße 71;Hamburg-Harburg;
- Hamburg;21373;Deutschland
+ADR;TYPE=WORK;CHARSET=utf-8:
+ ;Uni Harburg\, -;Innstraße 71;Hamburg-Harburg;Hamburg;21373;Deutschland
 ADR;TYPE=HOME;CHARSET=utf-8:;;Weisestraße 13\r;Irgendwo;;33443
 ADR;TYPE=X-OTHER:;;Nirgendwo
 ORG:Uni Harburg;;;033
@@ -1109,6 +1086,7 @@
 X-DESCRIPTION:Beschreibung
 X-DESCRIPTION;CHARSET=utf-8:außerdem
 CATEGORIES:uni
+REV:YYYYMMDDTHHMMSSZ
 END:VCARD
 </VC:address-data>
    </prop>
@@ -1119,7 +1097,7 @@
   <href>/caldav.php/user1/addressbook/J%C3%B6rg_Test-Ro%C3%9Fdeutscher_2_0.vcf</href>
   <propstat>
    <prop>
-    <getetag>"feaa1a28c9942fc56403e2f97f75171b"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:2.1
 N;CHARSET=UTF-8:Test-Roßdeutscher;Jörg;;;
@@ -1134,10 +1112,13 @@
 TEL;HOME:040999999793017
 ADR;WORK;CHARSET=UTF-8:;;abcStraße 58;Hamburg;;20357;Deutschland
 ADR;HOME:;;Gayens Weg 9;Hamburg;;22761;Deutschland
-NOTE;CHARSET=UTF-8:Technik\, Web\, DTP\, SysAdmin\, €-Vermögensverwalter
+NOTE;CHARSET=UTF-8:
+ Technik\, Web\, DTP\, SysAdmin\, €-Vermögensverwalter
 URL;type=pref:www.gesindel.baz
 URL:www.factordesign.foo
 BDAY;value=date:1969-06-20
+UID:excellent-looking-uid-string
+REV:YYYYMMDDTHHMMSSZ
 END:VCARD
 </VC:address-data>
    </prop>
@@ -1148,13 +1129,14 @@
   <href>/caldav.php/user1/addressbook/J%C3%B6rg_Test-Ro%C3%9Fdeutscher_3_0.vcf</href>
   <propstat>
    <prop>
-    <getetag>"5a32961b9938a7d6a354a757a8a1ea36"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
     <VC:address-data>BEGIN:VCARD
 VERSION:3.0
 N:Test-Roßdeutscher;Jörg;;;
 FN:Jörg Test-Roßdeutscher
 ORG:Factor Design AG;
-EMAIL;type=INTERNET;type=WORK;type=pref:joerg.rossdeutscher@factordesign.foo
+EMAIL;TYPE=INTERNET;TYPE=WORK;TYPE=pref:
+ joerg.rossdeutscher@factordesign.foo
 EMAIL;type=INTERNET;type=WORK:joerg@factordesign.foo
 EMAIL;type=INTERNET;type=HOME:joerg.rossdeutscher@gesindel.foo
 EMAIL;type=INTERNET;type=HOME:raettchen@gmail.bar
@@ -1172,6 +1154,8 @@
 item4.X-ABLabel:_$!&lt;HomePage&gt;!$_
 BDAY;value=date:1969-06-20
 X-ABUID:58AB933D-81D3-4095-8CB5-A63431AC934D\:ABPerson
+UID:excellent-looking-uid-string
+REV:YYYYMMDDTHHMMSSZ
 END:VCARD
 </VC:address-data>
    </prop>
diff -Nru davical-0.9.9.7/testing/tests/carddav/2031-REPORT-addressbook-multiget.test davical-1.0.2/testing/tests/carddav/2031-REPORT-addressbook-multiget.test
--- davical-0.9.9.7/testing/tests/carddav/2031-REPORT-addressbook-multiget.test	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2031-REPORT-addressbook-multiget.test	2012-01-13 03:42:06.000000000 +0000
@@ -23,3 +23,7 @@
 ENDDATA
 
 
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
+REPLACE=/^UID:.+/UID:excellent-looking-uid-string/
+REPLACE=/^REV:\d{8}T\d{6}Z/REV:YYYYMMDDTHHMMSSZ/
+REPLACE=/^ETag: "[0-9a-f]+"\s$/ETag: "a fine looking etag"/
diff -Nru davical-0.9.9.7/testing/tests/carddav/2034-REPORT-addressbook-query.result davical-1.0.2/testing/tests/carddav/2034-REPORT-addressbook-query.result
--- davical-0.9.9.7/testing/tests/carddav/2034-REPORT-addressbook-query.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2034-REPORT-addressbook-query.result	2011-11-01 21:14:08.000000000 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:" xmlns:VC="urn:ietf:params:xml:ns:carddav">
+ <response>
+  <href>/caldav.php/user1/addressbook/andrew_mcmillan.vcf</href>
+  <propstat>
+   <prop>
+    <VC:address-data>BEGIN:VCARD
+VERSION:3.0
+REV:2010-03-29T09:23:34Z
+UID:pas-id-4BB0719600000000
+X-SKYPE;X-EVOLUTION-UI-SLOT=1;TYPE=HOME:karora__
+X-JABBER;X-EVOLUTION-UI-SLOT=3;TYPE=HOME:karora@irc.oftc.net
+TEL;X-EVOLUTION-UI-SLOT=3;TYPE=CELL:+64 22 123 4567
+TEL;X-EVOLUTION-UI-SLOT=2;TYPE=HOME,VOICE:+64 4 123 4567
+TEL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK,VOICE:+64 22 123 4567
+EMAIL;X-EVOLUTION-UI-SLOT=2;TYPE=HOME:andrew@mcmillan.net.nz
+EMAIL;X-EVOLUTION-UI-SLOT=1;TYPE=WORK:andrew@morphoss.com
+LABEL;TYPE=HOME:16 Kaka Place\nPorikana\n4173\nNew Zealand
+ADR;TYPE=HOME:;;16 Kaka Place;Porikana;;4173;New Zealand
+X-MOZILLA-HTML:FALSE
+X-EVOLUTION-VIDEO-URL:
+FBURL:https://davical.morphoss.com/freebusy.php/andrew@morphoss.com
+CALADRURI:mailto:andrew@morphoss.com
+CALURI:https://dotcal.com/karora
+X-EVOLUTION-BLOG-URL:http://andrew.mcmillan.net.nz/
+CATEGORIES:Developer,Personal,Debian,
+X-EVOLUTION-FILE-AS:McMillan\, Andrew
+N:McMillan;Andrew;Watson;;
+FN:Andrew Watson McMillan
+NOTE:Primary author of DAViCal CalDAV Server.
+X-EVOLUTION-SPOUSE:Heather Buchanan
+X-EVOLUTION-ANNIVERSARY:1989-04-22
+BDAY:1958-07-26
+NICKNAME:karora
+X-EVOLUTION-ASSISTANT:
+X-EVOLUTION-MANAGER:
+ROLE:Geek
+ORG:dotCal;;Porirua
+TITLE:Chief Technology Officer
+URL:http://andrew.mcmillan.net.nz/
+END:VCARD
+</VC:address-data>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+</multistatus>
diff -Nru davical-0.9.9.7/testing/tests/carddav/2034-REPORT-addressbook-query.test davical-1.0.2/testing/tests/carddav/2034-REPORT-addressbook-query.test
--- davical-0.9.9.7/testing/tests/carddav/2034-REPORT-addressbook-query.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2034-REPORT-addressbook-query.test	2011-11-01 21:10:34.000000000 +0000
@@ -0,0 +1,28 @@
+#
+# Request a REPORT 
+#
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/user1/addressbook/
+
+HEADER=Accept: text/xml,application/xml
+HEADER=Content-Type: text/xml
+HEADER=Depth: 1
+
+# HEAD
+
+BEGINDATA
+<?xml version="1.0" encoding="utf-8" ?>
+<C:addressbook-query xmlns:D="DAV:"
+                  xmlns:C="urn:ietf:params:xml:ns:carddav">
+  <D:prop>
+    <C:address-data/>
+  </D:prop>
+  <C:filter>
+    <C:prop-filter name="NICKNAME">
+      <C:text-match collation="i;unicode-casemap"
+                    match-type="equals"
+      >karora</C:text-match>
+    </C:prop-filter>
+  </C:filter>
+</C:addressbook-query>
+ENDDATA
diff -Nru davical-0.9.9.7/testing/tests/carddav/2039-REPORT-sync-changed.result davical-1.0.2/testing/tests/carddav/2039-REPORT-sync-changed.result
--- davical-0.9.9.7/testing/tests/carddav/2039-REPORT-sync-changed.result	2011-10-06 09:14:54.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2039-REPORT-sync-changed.result	2012-01-13 04:28:41.000000000 +0000
@@ -2,7 +2,7 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "f0c7bfe2540087faa968b4a4321f8953"
+ETag: "a fine looking etag"
 Content-Length: 1794
 Content-Type: text/xml; charset="utf-8"
 
@@ -12,7 +12,7 @@
   <href>/caldav.php/user1/addressbook/andresenesq.vcf</href>
   <propstat>
    <prop>
-    <getetag>"f6ae02ec1b5612fe4737092734d062c7"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -21,7 +21,7 @@
   <href>/caldav.php/user1/addressbook/F06EC844-EACD-4ADF-8823-588603991E04-ABSPlugin.vcf</href>
   <propstat>
    <prop>
-    <getetag>"0ea4d7759e103090c6494505b5da0f11"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -30,7 +30,7 @@
   <href>/caldav.php/user1/addressbook/hans_dieter.vcf</href>
   <propstat>
    <prop>
-    <getetag>"db3e92c0ae37268c647949367e2030cc"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -39,7 +39,7 @@
   <href>/caldav.php/user1/addressbook/J%C3%B6rg_Test-Ro%C3%9Fdeutscher_2_0.vcf</href>
   <propstat>
    <prop>
-    <getetag>"feaa1a28c9942fc56403e2f97f75171b"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -48,7 +48,7 @@
   <href>/caldav.php/user1/addressbook/J%C3%B6rg_Test-Ro%C3%9Fdeutscher_3_0.vcf</href>
   <propstat>
    <prop>
-    <getetag>"5a32961b9938a7d6a354a757a8a1ea36"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -57,7 +57,7 @@
   <href>/caldav.php/user1/addressbook/mustrmahn.vcf</href>
   <propstat>
    <prop>
-    <getetag>"e67537e9d473e93911eccd6e63e9ac3a"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
@@ -66,10 +66,10 @@
   <href>/caldav.php/user1/addressbook/van_houtte.vcf</href>
   <propstat>
    <prop>
-    <getetag>"d43780719361367f2d690f1f966e3da1"</getetag>
+    <get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>
    </prop>
    <status>HTTP/1.1 200 OK</status>
   </propstat>
  </response>
- <sync-token>data:,7</sync-token>
+ <sync-token>data:,8</sync-token>
 </multistatus>
diff -Nru davical-0.9.9.7/testing/tests/carddav/2039-REPORT-sync-changed.test davical-1.0.2/testing/tests/carddav/2039-REPORT-sync-changed.test
--- davical-0.9.9.7/testing/tests/carddav/2039-REPORT-sync-changed.test	2010-09-23 10:52:40.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/2039-REPORT-sync-changed.test	2012-01-13 03:55:36.000000000 +0000
@@ -17,3 +17,5 @@
 </D:sync-collection>
 ENDDATA
 
+REPLACE=/<get.tag>"[0-9a-f]{32}"<.get.tag>/<get?tag>"deadbeefcafef00ddeadbeefcafefeed"<.get?tag>/
+REPLACE=/^ETag: "[0-9a-f]+"\s$/ETag: "a fine looking etag"/
diff -Nru davical-0.9.9.7/testing/tests/carddav/Restore-Database.result davical-1.0.2/testing/tests/carddav/Restore-Database.result
--- davical-0.9.9.7/testing/tests/carddav/Restore-Database.result	2011-10-07 05:31:16.000000000 +0000
+++ davical-1.0.2/testing/tests/carddav/Restore-Database.result	2011-12-14 09:00:25.000000000 +0000
@@ -25,12 +25,12 @@
 
  setval 
 --------
-      5
+      6
 (1 row)
 
  setval 
 --------
-     13
+     14
 (1 row)
 
  setval 
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0218-Moz-REPORT.result davical-1.0.2/testing/tests/regression-suite/0218-Moz-REPORT.result
--- davical-0.9.9.7/testing/tests/regression-suite/0218-Moz-REPORT.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0218-Moz-REPORT.result	2011-10-31 00:01:55.000000000 +0000
@@ -2,8 +2,8 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "452f45250e12e66d9f6db823b4615a48"
-Content-Length: 3503
+ETag: "987fc68a44b7bc99bdf6fe3ab2d0b0ad"
+Content-Length: 3587
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -60,6 +60,16 @@
     <C:calendar-data>BEGIN:VCALENDAR
 PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
 VERSION:2.0
+BEGIN:VEVENT
+CREATED:20061223T032350Z
+LAST-MODIFIED:20061223T033144Z
+DTSTAMP:20061223T033144Z
+UID:9d050be7-8a02-4355-8ed3-02a9fc5f473f
+CLASS:CONFIDENTIAL
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
+SUMMARY:Busy
+END:VEVENT
 BEGIN:VTIMEZONE
 TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
 X-LIC-LOCATION:Antarctica/McMurdo
@@ -78,13 +88,6 @@
 RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
-DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
-UID:9d050be7-8a02-4355-8ed3-02a9fc5f473f
-END:VEVENT
 END:VCALENDAR
 </C:calendar-data>
    </prop>
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0219-Moz-REPORT.result davical-1.0.2/testing/tests/regression-suite/0219-Moz-REPORT.result
--- davical-0.9.9.7/testing/tests/regression-suite/0219-Moz-REPORT.result	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0219-Moz-REPORT.result	2011-10-31 00:02:02.000000000 +0000
@@ -2,8 +2,8 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-ETag: "452f45250e12e66d9f6db823b4615a48"
-Content-Length: 3503
+ETag: "987fc68a44b7bc99bdf6fe3ab2d0b0ad"
+Content-Length: 3587
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -60,6 +60,16 @@
     <C:calendar-data>BEGIN:VCALENDAR
 PRODID:-//Mozilla Calendar//NONSGML Sunbird//EN
 VERSION:2.0
+BEGIN:VEVENT
+CREATED:20061223T032350Z
+LAST-MODIFIED:20061223T033144Z
+DTSTAMP:20061223T033144Z
+UID:9d050be7-8a02-4355-8ed3-02a9fc5f473f
+CLASS:CONFIDENTIAL
+DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
+DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
+SUMMARY:Busy
+END:VEVENT
 BEGIN:VTIMEZONE
 TZID:/mozilla.org/20050126_1/Antarctica/McMurdo
 X-LIC-LOCATION:Antarctica/McMurdo
@@ -78,13 +88,6 @@
 RRULE:FREQ=YEARLY;INTERVAL=1;BYDAY=1SU;BYMONTH=10
 END:DAYLIGHT
 END:VTIMEZONE
-BEGIN:VEVENT
-SUMMARY:Busy
-CLASS:CONFIDENTIAL
-DTSTART;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T160000
-DTEND;TZID=/mozilla.org/20050126_1/Antarctica/McMurdo:20061223T180000
-UID:9d050be7-8a02-4355-8ed3-02a9fc5f473f
-END:VEVENT
 END:VCALENDAR
 </C:calendar-data>
    </prop>
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0599-REPORT-sync-changed.test davical-1.0.2/testing/tests/regression-suite/0599-REPORT-sync-changed.test
--- davical-0.9.9.7/testing/tests/regression-suite/0599-REPORT-sync-changed.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0599-REPORT-sync-changed.test	2011-11-03 07:01:32.000000000 +0000
@@ -10,7 +10,7 @@
 BEGINDATA
 <?xml version="1.0" encoding="utf-8" ?>
 <D:sync-collection xmlns:D="DAV:">
-  <D:sync-token>1</D:sync-token>
+  <D:sync-token>data:,1</D:sync-token>
   <D:prop>
     <D:getetag/>
   </D:prop>
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0949-MKTICKET.result davical-1.0.2/testing/tests/regression-suite/0949-MKTICKET.result
--- davical-0.9.9.7/testing/tests/regression-suite/0949-MKTICKET.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0949-MKTICKET.result	2011-12-13 21:22:55.000000000 +0000
@@ -2,13 +2,13 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "7bc3d8a76fb705dfff8a6654bb8d7fb8"
-Content-Length: 155
+ETag: "4ec54351d43b4404acdf28263d694a2b"
+Content-Length: 86
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
-<error xmlns="DAV:" xmlns:T="http://www.xythos.com/namespaces/StorageServer">
- <missing-xml-for-request/>
+<error xmlns="DAV:">
+ <missing-xml/>
 </error>
 
      dav_owner_id: >1002<
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0962-REPORT-expanded.result davical-1.0.2/testing/tests/regression-suite/0962-REPORT-expanded.result
--- davical-0.9.9.7/testing/tests/regression-suite/0962-REPORT-expanded.result	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0962-REPORT-expanded.result	2011-11-29 20:16:45.000000000 +0000
@@ -2,14 +2,14 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "a538e222b914a4030381e360ac974a27"
-Content-Length: 2463
+ETag: "6049c2ed7383e7a84ccf7f019f8e07f5"
+Content-Length: 2460
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
-  <href>/caldav.php/user5/home/naltpirh2vfjfmplmsivuo30t8%40google.com.ics</href>
+  <href>/caldav.php/user5/home/naltpirh2vfjfmplmsivuo30t8google.com.ics</href>
   <propstat>
    <prop>
     <C:calendar-data>BEGIN:VCALENDAR
@@ -92,12 +92,12 @@
  </response>
 </multistatus>
 
-         dav_name: >/user5/home/naltpirh2vfjfmplmsivuo30t8@google.com.ics<
+         dav_name: >/user5/home/naltpirh2vfjfmplmsivuo30t8google.com.ics<
           dtstart: >2010-08-16 15:00:00+12<
       dtstart_utc: >2010-08-16 03:00:00<
             rrule: >FREQ=MONTHLY;WKST=MO;BYDAY=3SU<
 
-         dav_name: >/user5/home/v3f2otajsto18em4rom3jd4238@google.com.ics<
+         dav_name: >/user5/home/v3f2otajsto18em4rom3jd4238google.com.ics<
           dtstart: >2009-07-08 12:00:00+12<
       dtstart_utc: >2009-07-08 00:00:00<
             rrule: >FREQ=WEEKLY;WKST=SU;INTERVAL=2;UNTIL=20090921T065959Z;BYDAY=MO<
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0963-POST-freebusy-private.result davical-1.0.2/testing/tests/regression-suite/0963-POST-freebusy-private.result
--- davical-0.9.9.7/testing/tests/regression-suite/0963-POST-freebusy-private.result	2011-09-18 02:25:27.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0963-POST-freebusy-private.result	2011-11-29 20:16:50.000000000 +0000
@@ -57,7 +57,7 @@
             start: >20060101T220000Z<
 
             class: >PRIVATE<
-         dav_name: >/user1/anotherone/20060803T084628Z-6040-1000-1-6@lamb.ics<
+         dav_name: >/user1/anotherone/20060803T084628Z-6040-1000-1-6lamb.ics<
            finish: >20060802T003456Z<
             rrule: >FREQ=YEARLY;INTERVAL=1<
             start: >20060801T003456Z<
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0964-REPORT-calquery-private.result davical-1.0.2/testing/tests/regression-suite/0964-REPORT-calquery-private.result
--- davical-0.9.9.7/testing/tests/regression-suite/0964-REPORT-calquery-private.result	2011-09-18 02:36:25.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0964-REPORT-calquery-private.result	2011-11-29 20:16:52.000000000 +0000
@@ -2,14 +2,14 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook
-ETag: "38a9a5f68b0d1510588fb3456181b129"
-Content-Length: 1037
+ETag: "cdb4786ea5b91bf38b8f332da104965d"
+Content-Length: 1034
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:" xmlns:C="urn:ietf:params:xml:ns:caldav">
  <response>
-  <href>/caldav.php/user1/anotherone/86203AFD481A6C42892013E6E0C4845D039A2543%40AKEXBE02.telecom.tcnz.net.ics</href>
+  <href>/caldav.php/user1/anotherone/86203AFD481A6C42892013E6E0C4845D039A2543AKEXBE02.telecom.tcnz.net.ics</href>
   <propstat>
    <prop>
     <getetag>"621885941033781f3462950c9bc2844b"</getetag>
@@ -39,7 +39,7 @@
 </multistatus>
 
             class: >PUBLIC<
-         dav_name: >/user1/anotherone/86203AFD481A6C42892013E6E0C4845D039A2543@AKEXBE02.telecom.tcnz.net.ics<
+         dav_name: >/user1/anotherone/86203AFD481A6C42892013E6E0C4845D039A2543AKEXBE02.telecom.tcnz.net.ics<
            finish: >20070119T203000Z<
             rrule: >NULL<
             start: >20070119T203000Z<
@@ -47,7 +47,7 @@
             tz_id: >NULL<
 
             class: >PRIVATE<
-         dav_name: >/user1/anotherone/20060803T084628Z-6040-1000-1-6@lamb.ics<
+         dav_name: >/user1/anotherone/20060803T084628Z-6040-1000-1-6lamb.ics<
            finish: >20060802T003456Z<
             rrule: >FREQ=YEARLY;INTERVAL=1<
             start: >20060801T003456Z<
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0996-PUT-odd-characters.result davical-1.0.2/testing/tests/regression-suite/0996-PUT-odd-characters.result
--- davical-0.9.9.7/testing/tests/regression-suite/0996-PUT-odd-characters.result	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0996-PUT-odd-characters.result	2011-12-13 21:23:07.000000000 +0000
@@ -51,8 +51,9 @@
 LOCATION:Chamisal Vineyards\\, Oregon
 X-VENUE:Chamisal Vineyards
 END:VEVENT
+END:VCALENDAR
 <
-         dav_etag: >4d7d14bee6ce017c086e6f1de56f1641<
+         dav_etag: >82d83a8c540d8fa53d5ad843b6456558<
          dav_name: >/User Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics<
       description: >2nd Annual Lobsterfest
 Saturday, August 7
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0996-PUT-odd-characters.test davical-1.0.2/testing/tests/regression-suite/0996-PUT-odd-characters.test
--- davical-0.9.9.7/testing/tests/regression-suite/0996-PUT-odd-characters.test	2010-09-21 01:40:44.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0996-PUT-odd-characters.test	2011-12-06 00:40:17.000000000 +0000
@@ -60,6 +60,7 @@
 LOCATION:Chamisal Vineyards\\, Oregon
 X-VENUE:Chamisal Vineyards
 END:VEVENT
+END:VCALENDAR
 ENDDATA
 
 QUERY
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0997-PUT-many-overrides.result davical-1.0.2/testing/tests/regression-suite/0997-PUT-many-overrides.result
--- davical-0.9.9.7/testing/tests/regression-suite/0997-PUT-many-overrides.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0997-PUT-many-overrides.result	2011-12-14 07:55:56.000000000 +0000
@@ -0,0 +1,478 @@
+
+       Event Data: >BEGIN:VCALENDAR
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/Zagreb
+X-LIC-LOCATION:Europe/Zagreb
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20101126T133639Z
+LAST-MODIFIED:20101126T133639Z
+DTSTAMP:20101126T133640Z
+UID:KOrganizer-1348288421.174
+SUMMARY:Kosarkaska utakmica
+DTSTART;TZID=Europe/Zagreb:20101128T110000
+DTEND;TZID=Europe/Zagreb:20101128T130000
+LOCATION:Zagrebacki velesajam
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110402T095510Z
+LAST-MODIFIED:20110402T095533Z
+DTSTAMP:20110402T095533Z
+UID:9fc3d340-fd02-4198-9b7f-bd9b339fdf01
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110329T193000
+DTEND;TZID=Europe/Zagreb:20110329T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110406T222101Z
+LAST-MODIFIED:20110406T222129Z
+DTSTAMP:20110406T222129Z
+UID:b5185f5f-c60d-43e2-8727-d73b05f0b403
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110408T180000
+DTEND;TZID=Europe/Zagreb:20110408T210000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110405T141057Z
+LAST-MODIFIED:20110410T105121Z
+DTSTAMP:20110410T105121Z
+UID:ad2e3d46-338c-4123-bfed-edf0d06a3f5d
+SUMMARY:Vaterpolo PMF
+DTSTART;TZID=Europe/Zagreb:20110411T120000
+DTEND;TZID=Europe/Zagreb:20110411T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110406T222101Z
+LAST-MODIFIED:20110412T145952Z
+DTSTAMP:20110412T145952Z
+UID:97f37cf2-a89a-4eb9-aff7-024e21d4ac63
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110413T200000
+DTEND;TZID=Europe/Zagreb:20110413T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110417T133012Z
+LAST-MODIFIED:20110417T133033Z
+DTSTAMP:20110417T133033Z
+UID:d98993b2-3fc1-4f40-a3b7-1744f2eff118
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110419T193000
+DTEND;TZID=Europe/Zagreb:20110419T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110509T075204Z
+DTSTAMP:20110509T075204Z
+UID:d9600248-ff59-45aa-a08b-d16d09f7443c
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110509T150000
+DTEND;TZID=Europe/Zagreb:20110509T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103420Z
+LAST-MODIFIED:20110320T103436Z
+DTSTAMP:20110320T103436Z
+UID:bf913c7d-8e42-4d30-989b-3f86c3e7f130
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110322T200000
+DTEND;TZID=Europe/Zagreb:20110322T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110414T134428Z
+LAST-MODIFIED:20110414T134446Z
+DTSTAMP:20110414T134446Z
+UID:6d870107-9251-4eb1-baff-9cc9c9d995a0
+SUMMARY:Vaterpolo
+DTSTART;TZID=Europe/Zagreb:20110415T120000
+DTEND;TZID=Europe/Zagreb:20110415T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110320T103513Z
+DTSTAMP:20110320T103513Z
+UID:b79f6edf-3b11-439f-85af-7eca5d5e7d6e
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110321T150000
+DTEND;TZID=Europe/Zagreb:20110321T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110405T141057Z
+LAST-MODIFIED:20110405T141143Z
+DTSTAMP:20110405T141143Z
+UID:3bc03dfc-c7e1-4500-ae67-a17c309025e8
+SUMMARY:Vaterpolo PMF
+DTSTART;TZID=Europe/Zagreb:20110406T133000
+DTEND;TZID=Europe/Zagreb:20110406T143000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110430T093717Z
+LAST-MODIFIED:20110430T093741Z
+DTSTAMP:20110430T093741Z
+UID:d0fe1e24-25c9-4f1a-a1a5-7e4c38b2a4bd
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110427T193000
+DTEND;TZID=Europe/Zagreb:20110427T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110430T093903Z
+LAST-MODIFIED:20110503T141014Z
+DTSTAMP:20110503T141014Z
+UID:e8835dcb-9c58-446c-8020-1d14e299994b
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110506T190000
+DTEND;TZID=Europe/Zagreb:20110506T220000
+DESCRIPTION:protiv VIDRE\; dvorana u podsusedu
+TRANSP:OPAQUE
+SEQUENCE:2
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110503T141104Z
+DTSTAMP:20110503T141104Z
+UID:631e6b38-c41c-49c6-8902-357650d1332c
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110502T150000
+DTEND;TZID=Europe/Zagreb:20110502T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110412T145824Z
+DTSTAMP:20110412T145824Z
+UID:2f32a2e1-f739-4c1a-920b-a605cc969e25
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110411T150000
+DTEND;TZID=Europe/Zagreb:20110411T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110414T134428Z
+LAST-MODIFIED:20110416T203013Z
+DTSTAMP:20110416T203013Z
+UID:63d93f32-aa1d-4aaf-b0c6-f332689c395b
+SUMMARY:Vaterpolo
+DTSTART;TZID=Europe/Zagreb:20110415T140000
+DTEND;TZID=Europe/Zagreb:20110415T150000
+TRANSP:OPAQUE
+SEQUENCE:1
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110417T195943Z
+DTSTAMP:20110417T195943Z
+UID:96d9a904-21da-44cf-a818-ace2e24117f3
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110418T150000
+DTEND;TZID=Europe/Zagreb:20110418T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110513T180125Z
+LAST-MODIFIED:20110513T180150Z
+DTSTAMP:20110513T180150Z
+UID:6541bbc5-5054-4482-9656-781fccb1c9c0
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110513T160000
+DTEND;TZID=Europe/Zagreb:20110513T170000
+DESCRIPTION:s filom u dvorani Precko
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110520T201034Z
+LAST-MODIFIED:20110520T201057Z
+DTSTAMP:20110520T201057Z
+UID:585e23cf-ef43-459a-9ad7-f05ceadc369e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110524T190000
+DTEND;TZID=Europe/Zagreb:20110524T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110311T213444Z
+LAST-MODIFIED:20110311T213526Z
+DTSTAMP:20110311T213526Z
+UID:abe35ff2-22ca-4abc-84ed-75cd594f152a
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110311T190000
+DTEND;TZID=Europe/Zagreb:20110311T220000
+LOCATION:Rugvica
+DESCRIPTION:igramo protiv STK Rugvice
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110314T195438Z
+LAST-MODIFIED:20110314T195500Z
+DTSTAMP:20110314T195500Z
+UID:f1a6d3ca-6070-453f-ae7d-10e204569461
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110317T200000
+DTEND;TZID=Europe/Zagreb:20110317T210000
+DESCRIPTION:protiv Mladih purgera
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110328T181956Z
+DTSTAMP:20110328T181956Z
+UID:db31907b-1b8a-4f70-aa8e-e2c86ffc125a
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110328T150000
+DTEND;TZID=Europe/Zagreb:20110328T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110602T091841Z
+LAST-MODIFIED:20110602T091933Z
+DTSTAMP:20110602T091933Z
+UID:158bce95-0f67-4cfc-9cc0-df42603a7497
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110606T193000
+DTEND;TZID=Europe/Zagreb:20110606T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110603T144349Z
+LAST-MODIFIED:20110603T144405Z
+DTSTAMP:20110603T144405Z
+UID:e0b1fbe6-885e-447b-8811-0d0dafc7cc9a
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110603T100000
+DTEND;TZID=Europe/Zagreb:20110603T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110605T191628Z
+LAST-MODIFIED:20110605T191643Z
+DTSTAMP:20110605T191643Z
+UID:d59ca055-4396-442c-af99-5c45cfd8e75d
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110604T180000
+DTEND;TZID=Europe/Zagreb:20110604T210000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110607T222032Z
+LAST-MODIFIED:20110607T222045Z
+DTSTAMP:20110607T222045Z
+UID:6ec29b6e-c8f3-40b3-87d3-d7ebe742a8cc
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110606T150000
+DTEND;TZID=Europe/Zagreb:20110606T160000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111007T155910Z
+LAST-MODIFIED:20111007T155930Z
+DTSTAMP:20111007T155930Z
+UID:807b2e3b-6bc1-4fd4-8002-6a4a3d6ab210
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111010T200000
+DTEND;TZID=Europe/Zagreb:20111010T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111009T102456Z
+LAST-MODIFIED:20111009T102524Z
+DTSTAMP:20111009T102524Z
+UID:17848910-224e-4b2e-82a1-880e7579fc09
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111009T190000
+DTEND;TZID=Europe/Zagreb:20111009T210000
+LOCATION:faks
+DESCRIPTION:trening s najmanom na faksu
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111010T141132Z
+LAST-MODIFIED:20111010T141158Z
+DTSTAMP:20111010T141158Z
+UID:1dc66abb-d265-4115-bed1-8647076b6a6e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111014T203000
+DTEND;TZID=Europe/Zagreb:20111014T230000
+DESCRIPTION:Odra Vex dizajn
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111014T073351Z
+LAST-MODIFIED:20111014T073406Z
+DTSTAMP:20111014T073406Z
+UID:40881d4c-03b1-4bd6-9486-47c88e42d4a9
+SUMMARY:Girje
+DTSTART;TZID=Europe/Zagreb:20111011T190000
+DTEND;TZID=Europe/Zagreb:20111011T200000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111015T174624Z
+LAST-MODIFIED:20111015T174705Z
+DTSTAMP:20111015T174705Z
+UID:9d8b6e90-6ba9-4bec-8000-e1f9609b84a7
+SUMMARY:Stolni
+DTSTART;TZID=Europe/Zagreb:20111015T170000
+DTEND;TZID=Europe/Zagreb:20111015T190000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111016T111311Z
+LAST-MODIFIED:20111016T111339Z
+DTSTAMP:20111016T111339Z
+UID:8f2601db-6537-40aa-91b5-3bff62c6aaeb
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111018T193000
+DTEND;TZID=Europe/Zagreb:20111018T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111022T125946Z
+LAST-MODIFIED:20111022T130003Z
+DTSTAMP:20111022T130003Z
+UID:c606f5b2-4519-4b4c-9010-96ca6d301e70
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111022T100000
+DTEND;TZID=Europe/Zagreb:20111022T120000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111022T125946Z
+LAST-MODIFIED:20111022T130030Z
+DTSTAMP:20111022T130030Z
+UID:178d87de-d399-422f-955c-3d8867a7f384
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111023T100000
+DTEND;TZID=Europe/Zagreb:20111023T120000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111007T155910Z
+LAST-MODIFIED:20111026T212929Z
+DTSTAMP:20111026T212929Z
+UID:104e403e-9639-4316-813f-e843520901a5
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111028T203000
+DTEND;TZID=Europe/Zagreb:20111028T233000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111111T094915Z
+LAST-MODIFIED:20111111T094932Z
+DTSTAMP:20111111T094932Z
+UID:64804e8e-fef5-46e3-b2a2-b494d9120dc1
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111111T190000
+DTEND;TZID=Europe/Zagreb:20111111T213000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111113T175921Z
+LAST-MODIFIED:20111113T175937Z
+DTSTAMP:20111113T175937Z
+UID:72181664-03b7-4789-90a0-8bbec9300b5c
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111116T193000
+DTEND;TZID=Europe/Zagreb:20111116T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T133916Z
+LAST-MODIFIED:20111126T133937Z
+DTSTAMP:20111126T133937Z
+UID:f3f56428-d648-4d8a-9174-57927d74e346
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111124T193000
+DTEND;TZID=Europe/Zagreb:20111124T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T133916Z
+LAST-MODIFIED:20111126T134122Z
+DTSTAMP:20111126T134122Z
+UID:548df49b-2451-4224-bd7b-5780dd93a19e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111201T193000
+DTEND;TZID=Europe/Zagreb:20111201T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111014T073351Z
+LAST-MODIFIED:20111127T154401Z
+DTSTAMP:20111127T154401Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RRULE:FREQ=WEEKLY;UNTIL=20111220T180000Z;BYDAY=MO,TH
+DTSTART;TZID=Europe/Zagreb:20111013T190000
+DTEND;TZID=Europe/Zagreb:20111013T200000
+TRANSP:OPAQUE
+SEQUENCE:1
+X-MOZ-GENERATION:3
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T134122Z
+LAST-MODIFIED:20111126T134129Z
+DTSTAMP:20111126T134129Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RECURRENCE-ID;TZID=Europe/Zagreb:20111201T190000
+DTSTART;TZID=Europe/Zagreb:20111130T190000
+DTEND;TZID=Europe/Zagreb:20111130T200000
+SEQUENCE:2
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111127T154352Z
+LAST-MODIFIED:20111127T154401Z
+DTSTAMP:20111127T154401Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RECURRENCE-ID;TZID=Europe/Zagreb:20111205T190000
+DTSTART;TZID=Europe/Zagreb:20111206T190000
+DTEND;TZID=Europe/Zagreb:20111206T200000
+SEQUENCE:2
+TRANSP:OPAQUE
+X-MOZ-GENERATION:3
+END:VEVENT
+END:VCALENDAR
+<
+         dav_etag: >76e05bffe4f06d622b02cc0095b5eb25<
+         dav_name: >/User Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics<
+      description: >NULL<
+          dtstart: >2010-11-28 23:00:00+13<
+          summary: >Kosarkaska utakmica<
+
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/0997-PUT-many-overrides.test davical-1.0.2/testing/tests/regression-suite/0997-PUT-many-overrides.test
--- davical-0.9.9.7/testing/tests/regression-suite/0997-PUT-many-overrides.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/0997-PUT-many-overrides.test	2011-12-14 07:55:37.000000000 +0000
@@ -0,0 +1,489 @@
+#
+# Attempt to put an event containing many overrides
+#
+TYPE=PUT
+URL=http://regression.host/caldav.php/User%20Six/home/c0f7c860-1345-012d-125f-002421a2359e.ics
+
+HEADER=Content-Type: text/calendar; charset=utf-8
+AUTH=User Six:user6
+
+BEGINDATA
+BEGIN:VCALENDAR
+PRODID:-//Mozilla.org/NONSGML Mozilla Calendar V1.1//EN
+VERSION:2.0
+BEGIN:VTIMEZONE
+TZID:Europe/Zagreb
+X-LIC-LOCATION:Europe/Zagreb
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+0100
+TZOFFSETTO:+0200
+TZNAME:CEST
+DTSTART:19700329T020000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=3
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+0200
+TZOFFSETTO:+0100
+TZNAME:CET
+DTSTART:19701025T030000
+RRULE:FREQ=YEARLY;BYDAY=-1SU;BYMONTH=10
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20101126T133639Z
+LAST-MODIFIED:20101126T133639Z
+DTSTAMP:20101126T133640Z
+UID:KOrganizer-1348288421.174
+SUMMARY:Kosarkaska utakmica
+DTSTART;TZID=Europe/Zagreb:20101128T110000
+DTEND;TZID=Europe/Zagreb:20101128T130000
+LOCATION:Zagrebacki velesajam
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110402T095510Z
+LAST-MODIFIED:20110402T095533Z
+DTSTAMP:20110402T095533Z
+UID:9fc3d340-fd02-4198-9b7f-bd9b339fdf01
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110329T193000
+DTEND;TZID=Europe/Zagreb:20110329T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110406T222101Z
+LAST-MODIFIED:20110406T222129Z
+DTSTAMP:20110406T222129Z
+UID:b5185f5f-c60d-43e2-8727-d73b05f0b403
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110408T180000
+DTEND;TZID=Europe/Zagreb:20110408T210000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110405T141057Z
+LAST-MODIFIED:20110410T105121Z
+DTSTAMP:20110410T105121Z
+UID:ad2e3d46-338c-4123-bfed-edf0d06a3f5d
+SUMMARY:Vaterpolo PMF
+DTSTART;TZID=Europe/Zagreb:20110411T120000
+DTEND;TZID=Europe/Zagreb:20110411T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110406T222101Z
+LAST-MODIFIED:20110412T145952Z
+DTSTAMP:20110412T145952Z
+UID:97f37cf2-a89a-4eb9-aff7-024e21d4ac63
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110413T200000
+DTEND;TZID=Europe/Zagreb:20110413T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110417T133012Z
+LAST-MODIFIED:20110417T133033Z
+DTSTAMP:20110417T133033Z
+UID:d98993b2-3fc1-4f40-a3b7-1744f2eff118
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110419T193000
+DTEND;TZID=Europe/Zagreb:20110419T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110509T075204Z
+DTSTAMP:20110509T075204Z
+UID:d9600248-ff59-45aa-a08b-d16d09f7443c
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110509T150000
+DTEND;TZID=Europe/Zagreb:20110509T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103420Z
+LAST-MODIFIED:20110320T103436Z
+DTSTAMP:20110320T103436Z
+UID:bf913c7d-8e42-4d30-989b-3f86c3e7f130
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110322T200000
+DTEND;TZID=Europe/Zagreb:20110322T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110414T134428Z
+LAST-MODIFIED:20110414T134446Z
+DTSTAMP:20110414T134446Z
+UID:6d870107-9251-4eb1-baff-9cc9c9d995a0
+SUMMARY:Vaterpolo
+DTSTART;TZID=Europe/Zagreb:20110415T120000
+DTEND;TZID=Europe/Zagreb:20110415T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110320T103513Z
+DTSTAMP:20110320T103513Z
+UID:b79f6edf-3b11-439f-85af-7eca5d5e7d6e
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110321T150000
+DTEND;TZID=Europe/Zagreb:20110321T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110405T141057Z
+LAST-MODIFIED:20110405T141143Z
+DTSTAMP:20110405T141143Z
+UID:3bc03dfc-c7e1-4500-ae67-a17c309025e8
+SUMMARY:Vaterpolo PMF
+DTSTART;TZID=Europe/Zagreb:20110406T133000
+DTEND;TZID=Europe/Zagreb:20110406T143000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110430T093717Z
+LAST-MODIFIED:20110430T093741Z
+DTSTAMP:20110430T093741Z
+UID:d0fe1e24-25c9-4f1a-a1a5-7e4c38b2a4bd
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110427T193000
+DTEND;TZID=Europe/Zagreb:20110427T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110430T093903Z
+LAST-MODIFIED:20110503T141014Z
+DTSTAMP:20110503T141014Z
+UID:e8835dcb-9c58-446c-8020-1d14e299994b
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110506T190000
+DTEND;TZID=Europe/Zagreb:20110506T220000
+DESCRIPTION:protiv VIDRE\; dvorana u podsusedu
+TRANSP:OPAQUE
+SEQUENCE:2
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110503T141104Z
+DTSTAMP:20110503T141104Z
+UID:631e6b38-c41c-49c6-8902-357650d1332c
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110502T150000
+DTEND;TZID=Europe/Zagreb:20110502T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110412T145824Z
+DTSTAMP:20110412T145824Z
+UID:2f32a2e1-f739-4c1a-920b-a605cc969e25
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110411T150000
+DTEND;TZID=Europe/Zagreb:20110411T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110414T134428Z
+LAST-MODIFIED:20110416T203013Z
+DTSTAMP:20110416T203013Z
+UID:63d93f32-aa1d-4aaf-b0c6-f332689c395b
+SUMMARY:Vaterpolo
+DTSTART;TZID=Europe/Zagreb:20110415T140000
+DTEND;TZID=Europe/Zagreb:20110415T150000
+TRANSP:OPAQUE
+SEQUENCE:1
+X-MOZ-GENERATION:1
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110417T195943Z
+DTSTAMP:20110417T195943Z
+UID:96d9a904-21da-44cf-a818-ace2e24117f3
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110418T150000
+DTEND;TZID=Europe/Zagreb:20110418T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110513T180125Z
+LAST-MODIFIED:20110513T180150Z
+DTSTAMP:20110513T180150Z
+UID:6541bbc5-5054-4482-9656-781fccb1c9c0
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110513T160000
+DTEND;TZID=Europe/Zagreb:20110513T170000
+DESCRIPTION:s filom u dvorani Precko
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110520T201034Z
+LAST-MODIFIED:20110520T201057Z
+DTSTAMP:20110520T201057Z
+UID:585e23cf-ef43-459a-9ad7-f05ceadc369e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110524T190000
+DTEND;TZID=Europe/Zagreb:20110524T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110311T213444Z
+LAST-MODIFIED:20110311T213526Z
+DTSTAMP:20110311T213526Z
+UID:abe35ff2-22ca-4abc-84ed-75cd594f152a
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110311T190000
+DTEND;TZID=Europe/Zagreb:20110311T220000
+LOCATION:Rugvica
+DESCRIPTION:igramo protiv STK Rugvice
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110314T195438Z
+LAST-MODIFIED:20110314T195500Z
+DTSTAMP:20110314T195500Z
+UID:f1a6d3ca-6070-453f-ae7d-10e204569461
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110317T200000
+DTEND;TZID=Europe/Zagreb:20110317T210000
+DESCRIPTION:protiv Mladih purgera
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110320T103444Z
+LAST-MODIFIED:20110328T181956Z
+DTSTAMP:20110328T181956Z
+UID:db31907b-1b8a-4f70-aa8e-e2c86ffc125a
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110328T150000
+DTEND;TZID=Europe/Zagreb:20110328T160000
+LOCATION:PBF
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110602T091841Z
+LAST-MODIFIED:20110602T091933Z
+DTSTAMP:20110602T091933Z
+UID:158bce95-0f67-4cfc-9cc0-df42603a7497
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20110606T193000
+DTEND;TZID=Europe/Zagreb:20110606T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110603T144349Z
+LAST-MODIFIED:20110603T144405Z
+DTSTAMP:20110603T144405Z
+UID:e0b1fbe6-885e-447b-8811-0d0dafc7cc9a
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110603T100000
+DTEND;TZID=Europe/Zagreb:20110603T130000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110605T191628Z
+LAST-MODIFIED:20110605T191643Z
+DTSTAMP:20110605T191643Z
+UID:d59ca055-4396-442c-af99-5c45cfd8e75d
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110604T180000
+DTEND;TZID=Europe/Zagreb:20110604T210000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20110607T222032Z
+LAST-MODIFIED:20110607T222045Z
+DTSTAMP:20110607T222045Z
+UID:6ec29b6e-c8f3-40b3-87d3-d7ebe742a8cc
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20110606T150000
+DTEND;TZID=Europe/Zagreb:20110606T160000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111007T155910Z
+LAST-MODIFIED:20111007T155930Z
+DTSTAMP:20111007T155930Z
+UID:807b2e3b-6bc1-4fd4-8002-6a4a3d6ab210
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111010T200000
+DTEND;TZID=Europe/Zagreb:20111010T230000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111009T102456Z
+LAST-MODIFIED:20111009T102524Z
+DTSTAMP:20111009T102524Z
+UID:17848910-224e-4b2e-82a1-880e7579fc09
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111009T190000
+DTEND;TZID=Europe/Zagreb:20111009T210000
+LOCATION:faks
+DESCRIPTION:trening s najmanom na faksu
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111010T141132Z
+LAST-MODIFIED:20111010T141158Z
+DTSTAMP:20111010T141158Z
+UID:1dc66abb-d265-4115-bed1-8647076b6a6e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111014T203000
+DTEND;TZID=Europe/Zagreb:20111014T230000
+DESCRIPTION:Odra Vex dizajn
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111014T073351Z
+LAST-MODIFIED:20111014T073406Z
+DTSTAMP:20111014T073406Z
+UID:40881d4c-03b1-4bd6-9486-47c88e42d4a9
+SUMMARY:Girje
+DTSTART;TZID=Europe/Zagreb:20111011T190000
+DTEND;TZID=Europe/Zagreb:20111011T200000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111015T174624Z
+LAST-MODIFIED:20111015T174705Z
+DTSTAMP:20111015T174705Z
+UID:9d8b6e90-6ba9-4bec-8000-e1f9609b84a7
+SUMMARY:Stolni
+DTSTART;TZID=Europe/Zagreb:20111015T170000
+DTEND;TZID=Europe/Zagreb:20111015T190000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111016T111311Z
+LAST-MODIFIED:20111016T111339Z
+DTSTAMP:20111016T111339Z
+UID:8f2601db-6537-40aa-91b5-3bff62c6aaeb
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111018T193000
+DTEND;TZID=Europe/Zagreb:20111018T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111022T125946Z
+LAST-MODIFIED:20111022T130003Z
+DTSTAMP:20111022T130003Z
+UID:c606f5b2-4519-4b4c-9010-96ca6d301e70
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111022T100000
+DTEND;TZID=Europe/Zagreb:20111022T120000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111022T125946Z
+LAST-MODIFIED:20111022T130030Z
+DTSTAMP:20111022T130030Z
+UID:178d87de-d399-422f-955c-3d8867a7f384
+SUMMARY:Stolni tenis
+DTSTART;TZID=Europe/Zagreb:20111023T100000
+DTEND;TZID=Europe/Zagreb:20111023T120000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111007T155910Z
+LAST-MODIFIED:20111026T212929Z
+DTSTAMP:20111026T212929Z
+UID:104e403e-9639-4316-813f-e843520901a5
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111028T203000
+DTEND;TZID=Europe/Zagreb:20111028T233000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111111T094915Z
+LAST-MODIFIED:20111111T094932Z
+DTSTAMP:20111111T094932Z
+UID:64804e8e-fef5-46e3-b2a2-b494d9120dc1
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111111T190000
+DTEND;TZID=Europe/Zagreb:20111111T213000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111113T175921Z
+LAST-MODIFIED:20111113T175937Z
+DTSTAMP:20111113T175937Z
+UID:72181664-03b7-4789-90a0-8bbec9300b5c
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111116T193000
+DTEND;TZID=Europe/Zagreb:20111116T220000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T133916Z
+LAST-MODIFIED:20111126T133937Z
+DTSTAMP:20111126T133937Z
+UID:f3f56428-d648-4d8a-9174-57927d74e346
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111124T193000
+DTEND;TZID=Europe/Zagreb:20111124T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T133916Z
+LAST-MODIFIED:20111126T134122Z
+DTSTAMP:20111126T134122Z
+UID:548df49b-2451-4224-bd7b-5780dd93a19e
+SUMMARY:SOKAZ
+DTSTART;TZID=Europe/Zagreb:20111201T193000
+DTEND;TZID=Europe/Zagreb:20111201T223000
+TRANSP:OPAQUE
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111014T073351Z
+LAST-MODIFIED:20111127T154401Z
+DTSTAMP:20111127T154401Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RRULE:FREQ=WEEKLY;UNTIL=20111220T180000Z;BYDAY=MO,TH
+DTSTART;TZID=Europe/Zagreb:20111013T190000
+DTEND;TZID=Europe/Zagreb:20111013T200000
+TRANSP:OPAQUE
+SEQUENCE:1
+X-MOZ-GENERATION:3
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111126T134122Z
+LAST-MODIFIED:20111126T134129Z
+DTSTAMP:20111126T134129Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RECURRENCE-ID;TZID=Europe/Zagreb:20111201T190000
+DTSTART;TZID=Europe/Zagreb:20111130T190000
+DTEND;TZID=Europe/Zagreb:20111130T200000
+SEQUENCE:2
+TRANSP:OPAQUE
+X-MOZ-GENERATION:2
+END:VEVENT
+BEGIN:VEVENT
+CREATED:20111127T154352Z
+LAST-MODIFIED:20111127T154401Z
+DTSTAMP:20111127T154401Z
+UID:154529bd-dcd2-43ad-900e-050a4d22f3a1
+SUMMARY:Girje
+RECURRENCE-ID;TZID=Europe/Zagreb:20111205T190000
+DTSTART;TZID=Europe/Zagreb:20111206T190000
+DTEND;TZID=Europe/Zagreb:20111206T200000
+SEQUENCE:2
+TRANSP:OPAQUE
+X-MOZ-GENERATION:3
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+QUERY
+SELECT caldav_data.caldav_data AS "Event Data", caldav_data.dav_name, caldav_data.dav_etag, dtstart, summary, description
+  FROM caldav_data JOIN calendar_item USING(dav_name)
+  WHERE caldav_data.dav_name ~ 'c0f7c860-1345-012d-125f-002421a2359e.ics'
+ENDQUERY
+
+
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/1100-REPORT-sync-changed.result davical-1.0.2/testing/tests/regression-suite/1100-REPORT-sync-changed.result
--- davical-0.9.9.7/testing/tests/regression-suite/1100-REPORT-sync-changed.result	2011-10-07 05:30:43.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/1100-REPORT-sync-changed.result	2011-11-26 10:18:59.000000000 +0000
@@ -2,153 +2,13 @@
 Date: Dow, 01 Jan 2000 00:00:00 GMT
 DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
 DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
-ETag: "6d416d900e71bc416b72a7f97e779ed3"
-Content-Length: 6466
+ETag: "2d197c430c4f9d245aa7f4ee1f14e435"
+Content-Length: 1164
 Content-Type: text/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
 <multistatus xmlns="DAV:">
  <response>
-  <href>/caldav.php/user1/home/0544-gzip-PUT.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"6ddd18264a9d40c1c9d37a005eeb7e4f"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/0545-deflate-PUT.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"4a3aa58a3e11487e87d87024465d4182"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"00ad5eb1eb5507884710b0b66aa5d5c4"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"5def8ae2b20893a1c7f4dbaeb008f2f1"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"bcc402382688cb3e8e57379c757dbcb0"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"509b0f0d8a3363379f9f5727f5dd74a0"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"257b9df4aaf573a578af4aadd033abf4"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"55f02f66966ee150320383803d1e0d34"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"cb3d9dc3e8c157f53eba3ea0e1e0f146"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"08a435c2abaf38f4a50a997343c098a7"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"efd0257efbc898d059c200d1391af060"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"a2990674708634a311bb98a59865ca50"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"6f16959eee5c920b45548840b1e9ea19"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
   <href>/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics</href>
   <propstat>
    <prop>
@@ -159,39 +19,9 @@
   </propstat>
  </response>
  <response>
-  <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <response>
-  <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
-  <propstat>
-   <prop>
-    <getetag>"ac90acd649c25070b1a2a17fb31a105a"</getetag>
-    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
-   </prop>
-   <status>HTTP/1.1 200 OK</status>
-  </propstat>
- </response>
- <sync-response>
   <href>/caldav.php/user1/home/i1278618276.ics</href>
   <status>HTTP/1.1 404 Not Found</status>
- </sync-response>
+ </response>
  <response>
   <href>/caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics</href>
   <propstat>
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/1100-REPORT-sync-changed.test davical-1.0.2/testing/tests/regression-suite/1100-REPORT-sync-changed.test
--- davical-0.9.9.7/testing/tests/regression-suite/1100-REPORT-sync-changed.test	2011-09-11 11:46:40.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/1100-REPORT-sync-changed.test	2011-11-03 07:02:23.000000000 +0000
@@ -15,7 +15,7 @@
     <getetag/>
     <getlastmodified/>
   </prop>
-  <sync-token>1</sync-token>
+  <sync-token>data:,3</sync-token>
 </sync-collection>
 ENDDATA
 
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/1101-REPORT-sync-changed.result davical-1.0.2/testing/tests/regression-suite/1101-REPORT-sync-changed.result
--- davical-0.9.9.7/testing/tests/regression-suite/1101-REPORT-sync-changed.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/1101-REPORT-sync-changed.result	2011-11-08 20:59:29.000000000 +0000
@@ -0,0 +1,12 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "83c715ba363de5f13629c9aded7c5d41"
+Content-Length: 116
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <sync-token>data:,4</sync-token>
+</multistatus>
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/1101-REPORT-sync-changed.test davical-1.0.2/testing/tests/regression-suite/1101-REPORT-sync-changed.test
--- davical-0.9.9.7/testing/tests/regression-suite/1101-REPORT-sync-changed.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/1101-REPORT-sync-changed.test	2011-11-03 07:05:18.000000000 +0000
@@ -0,0 +1,23 @@
+#
+# Check for support of REPORT sync-collection with no sync-token
+#
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/user1/home/
+HEADER=User-agent: sync-collection changes REPORT
+HEADER=Content-type: text/xml
+HEAD
+
+# Should be no changes - we just requested this, after all.
+
+# <calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
+BEGINDATA
+<?xml version="1.0" encoding="utf-8" ?>
+<sync-collection xmlns="DAV:">
+  <prop>
+    <getetag/>
+    <getlastmodified/>
+  </prop>
+  <sync-token>data:,4</sync-token>
+</sync-collection>
+ENDDATA
+
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/1102-REPORT-sync-changed.result davical-1.0.2/testing/tests/regression-suite/1102-REPORT-sync-changed.result
--- davical-0.9.9.7/testing/tests/regression-suite/1102-REPORT-sync-changed.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/1102-REPORT-sync-changed.result	2011-11-08 21:02:44.000000000 +0000
@@ -0,0 +1,12 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "83c715ba363de5f13629c9aded7c5d41"
+Content-Length: 116
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <sync-token>data:,4</sync-token>
+</multistatus>
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/1102-REPORT-sync-changed.test davical-1.0.2/testing/tests/regression-suite/1102-REPORT-sync-changed.test
--- davical-0.9.9.7/testing/tests/regression-suite/1102-REPORT-sync-changed.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/1102-REPORT-sync-changed.test	2011-11-08 21:01:14.000000000 +0000
@@ -0,0 +1,23 @@
+#
+# Check for support of REPORT sync-collection with no sync-token
+#
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/user1/home/
+HEADER=User-agent: sync-collection changes REPORT
+HEADER=Content-type: text/xml
+HEAD
+
+# Should be no changes - we just requested this, after all.
+
+# <calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
+BEGINDATA
+<?xml version="1.0" encoding="utf-8" ?>
+<sync-collection xmlns="DAV:">
+  <prop>
+    <getetag/>
+    <getlastmodified/>
+  </prop>
+  <sync-token>data:,4</sync-token>
+</sync-collection>
+ENDDATA
+
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/1103-REPORT-sync-changed.result davical-1.0.2/testing/tests/regression-suite/1103-REPORT-sync-changed.result
--- davical-0.9.9.7/testing/tests/regression-suite/1103-REPORT-sync-changed.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/1103-REPORT-sync-changed.result	2011-11-08 21:02:47.000000000 +0000
@@ -0,0 +1,222 @@
+HTTP/1.1 207 Multi-Status
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+ETag: "d83c49ce3cf0c0afe823248336c35521"
+Content-Length: 6648
+Content-Type: text/xml; charset="utf-8"
+
+<?xml version="1.0" encoding="utf-8" ?>
+<multistatus xmlns="DAV:">
+ <response>
+  <href>/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"2c32a2f8aba853654eb17fe037a4db4d"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/20061101T073004Z.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"bcc402382688cb3e8e57379c757dbcb0"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"a1c6404d61190f9574e2bfd69383f144"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"08a435c2abaf38f4a50a997343c098a7"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"5def8ae2b20893a1c7f4dbaeb008f2f1"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"ac90acd649c25070b1a2a17fb31a105a"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"509b0f0d8a3363379f9f5727f5dd74a0"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"cb3d9dc3e8c157f53eba3ea0e1e0f146"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"00ad5eb1eb5507884710b0b66aa5d5c4"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"a2990674708634a311bb98a59865ca50"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"e8060931f30c1798ac58ffbe4ec0bffc"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"8f581a053df6d833254756dfd7553d37"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"55f02f66966ee150320383803d1e0d34"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"6f16959eee5c920b45548840b1e9ea19"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"efd0257efbc898d059c200d1391af060"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/70D23799-4A68-4905-AB9F-4D47BA693CFD.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"257b9df4aaf573a578af4aadd033abf4"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/0544-gzip-PUT.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"6ddd18264a9d40c1c9d37a005eeb7e4f"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/0545-deflate-PUT.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"4a3aa58a3e11487e87d87024465d4182"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"165746adbab8bc0c8336a63cc5332ff2"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"2a09ef8c6a9e0b6bc16228359b99d8e7"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <response>
+  <href>/caldav.php/user1/home/PUT-eastern-time.ics</href>
+  <propstat>
+   <prop>
+    <getetag>"0b17d5f4102e63037d2ae732e4ca563d"</getetag>
+    <getlastmodified>Dow, 01 Jan 2000 00:00:00 GMT</getlastmodified>
+   </prop>
+   <status>HTTP/1.1 200 OK</status>
+  </propstat>
+ </response>
+ <sync-token>data:,5</sync-token>
+</multistatus>
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/1103-REPORT-sync-changed.test davical-1.0.2/testing/tests/regression-suite/1103-REPORT-sync-changed.test
--- davical-0.9.9.7/testing/tests/regression-suite/1103-REPORT-sync-changed.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/1103-REPORT-sync-changed.test	2011-11-08 21:01:55.000000000 +0000
@@ -0,0 +1,23 @@
+#
+# Check for support of REPORT sync-collection with no sync-token
+#
+TYPE=REPORT
+URL=http://mycaldav/caldav.php/user1/home/
+HEADER=User-agent: sync-collection changes REPORT
+HEADER=Content-type: text/xml
+HEAD
+
+# Should be everything changes - this tag does not exist, after all.
+
+# <calendar-data xmlns="urn:ietf:params:xml:ns:caldav"/>
+BEGINDATA
+<?xml version="1.0" encoding="utf-8" ?>
+<sync-collection xmlns="DAV:">
+  <prop>
+    <getetag/>
+    <getlastmodified/>
+  </prop>
+  <sync-token>data:,5</sync-token>
+</sync-collection>
+ENDDATA
+
diff -Nru davical-0.9.9.7/testing/tests/regression-suite/Really-Upgrade-Database.result davical-1.0.2/testing/tests/regression-suite/Really-Upgrade-Database.result
--- davical-0.9.9.7/testing/tests/regression-suite/Really-Upgrade-Database.result	2011-10-06 09:14:54.000000000 +0000
+++ davical-1.0.2/testing/tests/regression-suite/Really-Upgrade-Database.result	2011-11-26 09:42:33.000000000 +0000
@@ -1,4 +1,4 @@
-The database is version 8.4 currently at revision 1.2.11.
+The database is version 9.1 currently at revision 1.2.11.
 No patches were applied.
 Supported locales updated.
 Updated view: dav_principal.sql applied.
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3026-PUT-Accept.result davical-1.0.2/testing/tests/scheduling/3026-PUT-Accept.result
--- davical-0.9.9.7/testing/tests/scheduling/3026-PUT-Accept.result	2011-10-24 03:16:23.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3026-PUT-Accept.result	2011-11-01 11:18:45.000000000 +0000
@@ -29,16 +29,16 @@
 CREATED:20111018T195845Z
 UID:E1A13F04-iCal-schedule
 DTEND;TZID=Pacific/Auckland:20111019T110000
-ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
- mailto:manager1@example.net
-ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
- PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
 TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T100000
 DTSTAMP:20111018T200107Z
 ORGANIZER;CN="Manager 1":mailto:manager1@example.net
 SEQUENCE:5
+ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
+ mailto:manager1@example.net
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
 END:VEVENT
 END:VCALENDAR
 <
@@ -118,16 +118,16 @@
 CREATED:20111018T195845Z
 UID:E1A13F04-iCal-schedule
 DTEND;TZID=Pacific/Auckland:20111019T110000
-ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
- mailto:manager1@example.net
-ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
- PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
 TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T100000
 DTSTAMP:20111018T200107Z
 ORGANIZER;CN="Manager 1":mailto:manager1@example.net
 SEQUENCE:5
+ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
+ mailto:manager1@example.net
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
 END:VEVENT
 END:VCALENDAR
 <
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result davical-1.0.2/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result
--- davical-0.9.9.7/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result	2011-10-24 04:26:20.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3027-PUT-iCal-with-attendees.result	2011-11-01 12:01:04.000000000 +0000
@@ -127,16 +127,16 @@
 CREATED:20111018T195845Z
 UID:E1A13F04-iCal-schedule
 DTEND;TZID=Pacific/Auckland:20111019T110000
-ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
- mailto:manager1@example.net
-ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
- PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
 TRANSP:OPAQUE
 SUMMARY:Meeting with User1
 DTSTART;TZID=Pacific/Auckland:20111019T100000
 DTSTAMP:20111018T200107Z
 ORGANIZER;CN="Manager 1":mailto:manager1@example.net
 SEQUENCE:5
+ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
+ mailto:manager1@example.net
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=ACCEPTED;ROLE=REQ-PARTICIPANT:mailto:user1@example.net
 END:VEVENT
 END:VCALENDAR
 <
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test davical-1.0.2/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test
--- davical-0.9.9.7/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test	2011-10-24 04:09:11.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3027-PUT-iCal-with-attendees.test	2011-11-01 12:00:54.000000000 +0000
@@ -5,7 +5,7 @@
 URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics
 HEADER=Content-Type: text/calendar
 HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
-HEADER=If-Match: "87421a4ff0b84a95a31db428ee6d11d9"
+HEADER=If-Match: "d60f8959edc5eee6e949a2e5b81dd746"
 HEAD
 
 AUTH=manager1:manager1
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3028-DELETE-reply.result davical-1.0.2/testing/tests/scheduling/3028-DELETE-reply.result
--- davical-0.9.9.7/testing/tests/scheduling/3028-DELETE-reply.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3028-DELETE-reply.result	2011-10-31 19:43:31.000000000 +0000
@@ -0,0 +1,14 @@
+HTTP/1.1 204 No Content
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+
+         dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
+
+         dav_name: >/user1/home/E1A13F04-iCal-schedule.ics<
+
+         dav_name: >/manager1/.in/user1E1A13F04-iCal-schedule.ics<
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3028-DELETE-reply.test davical-1.0.2/testing/tests/scheduling/3028-DELETE-reply.test
--- davical-0.9.9.7/testing/tests/scheduling/3028-DELETE-reply.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3028-DELETE-reply.test	2011-10-31 10:50:09.000000000 +0000
@@ -0,0 +1,18 @@
+#
+# iCal DELETE's the invitation in the .in
+#
+TYPE=DELETE
+URL=http://regression.host/user1/.in/E1A13F04-iCal-schedule.ics
+
+HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
+HEAD
+
+#
+# Query to confirm we got rid of it. There should be two now.
+QUERY
+SELECT dav_name
+  FROM calendar_item
+ WHERE uid = 'E1A13F04-iCal-schedule'
+ ORDER BY dav_id
+ENDQUERY
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3029-DELETE-reply.result davical-1.0.2/testing/tests/scheduling/3029-DELETE-reply.result
--- davical-0.9.9.7/testing/tests/scheduling/3029-DELETE-reply.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3029-DELETE-reply.result	2011-10-31 21:06:45.000000000 +0000
@@ -0,0 +1,12 @@
+HTTP/1.1 204 No Content
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+
+         dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
+
+         dav_name: >/user1/home/E1A13F04-iCal-schedule.ics<
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3029-DELETE-reply.test davical-1.0.2/testing/tests/scheduling/3029-DELETE-reply.test
--- davical-0.9.9.7/testing/tests/scheduling/3029-DELETE-reply.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3029-DELETE-reply.test	2011-10-31 10:52:17.000000000 +0000
@@ -0,0 +1,20 @@
+#
+# iCal DELETE's the invitation in the .in
+#
+TYPE=DELETE
+URL=http://regression.host/manager1/.in/user1E1A13F04-iCal-schedule.ics
+
+HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
+HEAD
+
+AUTH=manager1:manager1
+
+#
+# Query to confirm we got rid of it. There should be two now.
+QUERY
+SELECT dav_name
+  FROM calendar_item
+ WHERE uid = 'E1A13F04-iCal-schedule'
+ ORDER BY dav_id
+ENDQUERY
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3030-DELETE-attendee-event.result davical-1.0.2/testing/tests/scheduling/3030-DELETE-attendee-event.result
--- davical-0.9.9.7/testing/tests/scheduling/3030-DELETE-attendee-event.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3030-DELETE-attendee-event.result	2011-11-02 04:50:30.000000000 +0000
@@ -0,0 +1,70 @@
+HTTP/1.1 204 No Content
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+
+         dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:looks good
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:6
+ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
+ mailto:manager1@example.net
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=DECLINED;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=2.0:mai
+ lto:user1@example.net
+END:VEVENT
+END:VCALENDAR
+<
+
+         dav_name: >/manager1/.in/user1E1A13F04-iCal-schedule.ics<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+METHOD:REPLY
+REQUEST-STATUS:2.0
+BEGIN:VEVENT
+UID:E1A13F04-iCal-schedule
+DTEND:20111019T010000Z
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user1@example.net
+DTSTART:20111019T000000Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+DTSTAMP:looks good
+END:VEVENT
+END:VCALENDAR
+<
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3030-DELETE-attendee-event.test davical-1.0.2/testing/tests/scheduling/3030-DELETE-attendee-event.test
--- davical-0.9.9.7/testing/tests/scheduling/3030-DELETE-attendee-event.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3030-DELETE-attendee-event.test	2011-11-02 04:24:37.000000000 +0000
@@ -0,0 +1,23 @@
+#
+# We now DELETE the ATTENDEE's copy of the actual event.
+#  - This should send a CANCEL reply and update the manager's
+#    event copy with the PARTSTAT=DECLINED 
+#
+TYPE=DELETE
+URL=http://regression.host/user1/home/E1A13F04-iCal-schedule.ics
+
+HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
+HEAD
+
+#
+# Query to confirm we got rid of it. There should be two now:
+#   - An event in the manager's calendar, with a PARTSTART=DECLINED for user 1
+#   - An iTIP message in the managers's inbox.
+QUERY
+SELECT calendar_item.dav_name,
+       regexp_replace(caldav_data,'DTSTAMP:[0-9T]{15}Z','DTSTAMP:looks good') AS vcalendar
+  FROM calendar_item JOIN caldav_data USING(dav_id, dav_name)
+ WHERE uid = 'E1A13F04-iCal-schedule'
+ ORDER BY dav_id
+ENDQUERY
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3031-DELETE-reply.result davical-1.0.2/testing/tests/scheduling/3031-DELETE-reply.result
--- davical-0.9.9.7/testing/tests/scheduling/3031-DELETE-reply.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3031-DELETE-reply.result	2011-11-01 01:47:59.000000000 +0000
@@ -0,0 +1,10 @@
+HTTP/1.1 204 No Content
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+
+         dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3031-DELETE-reply.test davical-1.0.2/testing/tests/scheduling/3031-DELETE-reply.test
--- davical-0.9.9.7/testing/tests/scheduling/3031-DELETE-reply.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3031-DELETE-reply.test	2011-10-31 21:19:39.000000000 +0000
@@ -0,0 +1,21 @@
+#
+# Now DELETE's the cancelation reply in the Manager's .in
+#
+TYPE=DELETE
+URL=http://regression.host/manager1/.in/user1E1A13F04-iCal-schedule.ics
+
+HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
+HEAD
+
+AUTH=manager1:manager1
+
+#
+# Query to confirm we got rid of it. There should only be one
+# lonely meeting in the manager's calendar (which has been declined).
+QUERY
+SELECT dav_name
+  FROM calendar_item
+ WHERE uid = 'E1A13F04-iCal-schedule'
+ ORDER BY dav_id
+ENDQUERY
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result davical-1.0.2/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result
--- davical-0.9.9.7/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3032-PUT-iCal-with-attendees.result	2011-11-01 01:48:25.000000000 +0000
@@ -0,0 +1,370 @@
+HTTP/1.1 100 Continue
+
+HTTP/1.1 204 No Content
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+
+      caldav_type: >VEVENT<
+         dav_name: >/manager1/home/E1A13F04-iCal-schedule.ics<
+      logged_user: >20<
+          summary: >Meeting with User1<
+          user_no: >20<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
+ mailto:manager1@example.net
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user1@example.net
+ATTENDEE;CN=user2@example.net;CUTYPE=INDIVIDUAL;EMAIL=user2@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user2@example.net
+ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user3@example.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+
+      caldav_type: >VEVENT<
+         dav_name: >/user1/.in/E1A13F04-iCal-schedule.ics<
+      logged_user: >20<
+          summary: >Meeting with User1<
+          user_no: >10<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+METHOD:REQUEST
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+
+      caldav_type: >VEVENT<
+         dav_name: >/user1/home/E1A13F04-iCal-schedule.ics<
+      logged_user: >20<
+          summary: >Meeting with User1<
+          user_no: >10<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+
+      caldav_type: >VEVENT<
+         dav_name: >/user2/.in/E1A13F04-iCal-schedule.ics<
+      logged_user: >20<
+          summary: >Meeting with User1<
+          user_no: >11<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+METHOD:REQUEST
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+
+      caldav_type: >VEVENT<
+         dav_name: >/user2/home/E1A13F04-iCal-schedule.ics<
+      logged_user: >20<
+          summary: >Meeting with User1<
+          user_no: >11<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+
+      caldav_type: >VEVENT<
+         dav_name: >/user3/.in/E1A13F04-iCal-schedule.ics<
+      logged_user: >20<
+          summary: >Meeting with User1<
+          user_no: >12<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+METHOD:REQUEST
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+
+      caldav_type: >VEVENT<
+         dav_name: >/user3/home/E1A13F04-iCal-schedule.ics<
+      logged_user: >20<
+          summary: >Meeting with User1<
+          user_no: >12<
+        vcalendar: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test davical-1.0.2/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test
--- davical-0.9.9.7/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3032-PUT-iCal-with-attendees.test	2011-11-02 05:14:06.000000000 +0000
@@ -0,0 +1,72 @@
+#
+# PUT an event with several attendees - so we can delete the organizer
+# copy in the next request.
+#
+# After this we should see 7 events: 1 manager, 3 attendees, 3 attendee iTIP
+#
+TYPE=PUT
+URL=http://regression.host/caldav.php/manager1/home/E1A13F04-iCal-schedule.ics
+HEADER=Content-Type: text/calendar
+HEADER=DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
+HEAD
+
+AUTH=manager1:manager1
+
+BEGINDATA
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+BEGIN:VTIMEZONE
+TZID:Pacific/Auckland
+BEGIN:DAYLIGHT
+TZOFFSETFROM:+1200
+RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=-1SU
+DTSTART:20070930T020000
+TZNAME:GMT+13:00
+TZOFFSETTO:+1300
+END:DAYLIGHT
+BEGIN:STANDARD
+TZOFFSETFROM:+1300
+RRULE:FREQ=YEARLY;BYMONTH=4;BYDAY=1SU
+DTSTART:20080406T030000
+TZNAME:GMT+12:00
+TZOFFSETTO:+1200
+END:STANDARD
+END:VTIMEZONE
+BEGIN:VEVENT
+CREATED:20111018T195845Z
+UID:E1A13F04-iCal-schedule
+DTEND;TZID=Pacific/Auckland:20111019T140000
+ATTENDEE;CN="Manager 1";CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:mailto:manag
+ er1@example.net
+ATTENDEE;CN="user1@example.net";CUTYPE=INDIVIDUAL;EMAIL="user1@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user1@ex
+ ample.net
+ATTENDEE;CN="user2@example.net";CUTYPE=INDIVIDUAL;EMAIL="user2@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user2@ex
+ ample.net
+ATTENDEE;CN="user3@example.net";CUTYPE=INDIVIDUAL;EMAIL="user3@example.n
+ et";PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE:mailto:user3@ex
+ ample.net
+TRANSP:OPAQUE
+SUMMARY:Meeting with User1
+DTSTART;TZID=Pacific/Auckland:20111019T130000
+DTSTAMP:20111024T035702Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+ENDDATA
+
+
+
+QUERY
+SELECT caldav_data.user_no, caldav_data.dav_name,
+       caldav_type, logged_user, caldav_data.caldav_data AS "vcalendar",
+       summary
+FROM caldav_data JOIN calendar_item USING(dav_name) LEFT JOIN timezones ON (tz_id=tzid)
+WHERE calendar_item.uid = 'E1A13F04-iCal-schedule'
+ORDER BY caldav_data.dav_id
+ENDQUERY
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3033-DELETE-organizer-event.result davical-1.0.2/testing/tests/scheduling/3033-DELETE-organizer-event.result
--- davical-0.9.9.7/testing/tests/scheduling/3033-DELETE-organizer-event.result	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3033-DELETE-organizer-event.result	2011-11-01 10:17:39.000000000 +0000
@@ -0,0 +1,95 @@
+SQL executed successfully.
+DELETE FROM caldav_data WHERE dav_name ~ E'/\\.in/.*E1A13F04-iCal-schedule\\.ics'
+
+HTTP/1.1 204 No Content
+Date: Dow, 01 Jan 2000 00:00:00 GMT
+DAV: 1, 2, 3, access-control, calendar-access, calendar-schedule
+DAV: extended-mkcol, calendar-proxy, bind, addressbook, calendar-auto-schedule
+Content-Length: 0
+Content-Type: text/plain; charset="utf-8"
+
+
+      caldav_data: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+METHOD:CANCEL
+REQUEST-STATUS:2.0
+BEGIN:VEVENT
+UID:E1A13F04-iCal-schedule
+DTEND:20111019T010000Z
+ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
+ mailto:manager1@example.net
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user1@example.net
+ATTENDEE;CN=user2@example.net;CUTYPE=INDIVIDUAL;EMAIL=user2@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user2@example.net
+ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user3@example.net
+DTSTART:20111019T000000Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+         dav_name: >/user1/.in/E1A13F04-iCal-schedule.ics<
+
+      caldav_data: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+METHOD:CANCEL
+REQUEST-STATUS:2.0
+BEGIN:VEVENT
+UID:E1A13F04-iCal-schedule
+DTEND:20111019T010000Z
+ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
+ mailto:manager1@example.net
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user1@example.net
+ATTENDEE;CN=user2@example.net;CUTYPE=INDIVIDUAL;EMAIL=user2@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user2@example.net
+ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user3@example.net
+DTSTART:20111019T000000Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+         dav_name: >/user2/.in/E1A13F04-iCal-schedule.ics<
+
+      caldav_data: >BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Apple Inc.//iCal 4.0.4//EN
+CALSCALE:GREGORIAN
+METHOD:CANCEL
+REQUEST-STATUS:2.0
+BEGIN:VEVENT
+UID:E1A13F04-iCal-schedule
+DTEND:20111019T010000Z
+ATTENDEE;CN=Manager 1;CUTYPE=INDIVIDUAL;PARTSTAT=ACCEPTED:
+ mailto:manager1@example.net
+ATTENDEE;CN=user1@example.net;CUTYPE=INDIVIDUAL;EMAIL=user1@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user1@example.net
+ATTENDEE;CN=user2@example.net;CUTYPE=INDIVIDUAL;EMAIL=user2@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user2@example.net
+ATTENDEE;CN=user3@example.net;CUTYPE=INDIVIDUAL;EMAIL=user3@example.net;
+ PARTSTAT=NEEDS-ACTION;ROLE=REQ-PARTICIPANT;RSVP=TRUE;SCHEDULE-STATUS=1.2
+ :mailto:user3@example.net
+DTSTART:20111019T000000Z
+ORGANIZER;CN="Manager 1":mailto:manager1@example.net
+SEQUENCE:7
+END:VEVENT
+END:VCALENDAR
+<
+         dav_name: >/user3/.in/E1A13F04-iCal-schedule.ics<
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/3033-DELETE-organizer-event.test davical-1.0.2/testing/tests/scheduling/3033-DELETE-organizer-event.test
--- davical-0.9.9.7/testing/tests/scheduling/3033-DELETE-organizer-event.test	1970-01-01 00:00:00.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/3033-DELETE-organizer-event.test	2011-11-01 01:45:44.000000000 +0000
@@ -0,0 +1,31 @@
+#
+# We now DELETE the ORGANIZER's copy of the actual event.
+#  - This should send a CANCEL reply and remove each attendee's
+#    copy of the event
+#
+TYPE=DELETE
+URL=http://regression.host/manager1/home/E1A13F04-iCal-schedule.ics
+
+HEADER=User-Agent: DAVKit/4.0.3 (732.2); CalendarStore/4.0.4 (997.7); iCal/4.0.4 (1395.7); Mac OS X/10.6.8 (10K549)
+HEAD
+
+AUTH=manager1:manager1
+
+# Before we run, this time we'll assume everyone has read their inbox
+# and all existing iTIP messages are deleted.
+DOSQL
+DELETE FROM caldav_data WHERE dav_name ~ E'/\\.in/.*E1A13F04-iCal-schedule\\.ics'
+ENDDOSQL
+
+#
+# Query to confirm we got rid of it. There should be two now:
+#   - An event in the manager's calendar, with a PARTSTART=DECLINED for user 1
+#   - An iTIP message in the managers's inbox.
+QUERY
+SELECT calendar_item.dav_name,
+       caldav_data.caldav_data
+  FROM calendar_item JOIN caldav_data USING(dav_id, dav_name)
+ WHERE uid = 'E1A13F04-iCal-schedule'
+ ORDER BY dav_id
+ENDQUERY
+
diff -Nru davical-0.9.9.7/testing/tests/scheduling/Restore-Database.result davical-1.0.2/testing/tests/scheduling/Restore-Database.result
--- davical-0.9.9.7/testing/tests/scheduling/Restore-Database.result	2011-10-07 05:31:28.000000000 +0000
+++ davical-1.0.2/testing/tests/scheduling/Restore-Database.result	2011-12-14 09:01:11.000000000 +0000
@@ -25,12 +25,12 @@
 
  setval 
 --------
-      7
+      8
 (1 row)
 
  setval 
 --------
-     13
+     14
 (1 row)
 
  setval 
diff -Nru davical-0.9.9.7/testing/tests/timezone/5010-list.result davical-1.0.2/testing/tests/timezone/5010-list.result
--- davical-0.9.9.7/testing/tests/timezone/5010-list.result	2011-10-07 05:31:35.000000000 +0000
+++ davical-1.0.2/testing/tests/timezone/5010-list.result	2011-12-14 09:02:05.000000000 +0000
@@ -1,6 +1,6 @@
 HTTP/1.1 200 OK
 Date: Dow, 01 Jan 2000 00:00:00 GMT
-Content-Length: 3064
+Content-Length: 3238
 Content-Type: application/xml; charset="utf-8"
 
 <?xml version="1.0" encoding="utf-8" ?>
@@ -31,6 +31,12 @@
   <local-name lang="en_US">Europe/Prague</local-name>
  </summary>
  <summary>
+  <tzid>Europe/Zagreb</tzid>
+  <last-modified>all good</last-modified>
+  <inactive/>
+  <local-name lang="en_US">Europe/Zagreb</local-name>
+ </summary>
+ <summary>
   <tzid>/mozilla.org/20050126_1/Antarctica/McMurdo</tzid>
   <last-modified>all good</last-modified>
   <inactive/>
diff -Nru davical-0.9.9.7/testing/tests/timezone/5020-updatecheck.result davical-1.0.2/testing/tests/timezone/5020-updatecheck.result
--- davical-0.9.9.7/testing/tests/timezone/5020-updatecheck.result	2011-09-22 11:46:35.000000000 +0000
+++ davical-1.0.2/testing/tests/timezone/5020-updatecheck.result	2011-12-14 09:02:40.000000000 +0000
@@ -46,7 +46,7 @@
 Writing new zone for 'Europe/Vilnius'
 Writing new zone for 'Europe/Skopje'
 Writing new zone for 'Europe/Vaduz'
-Writing new zone for 'Europe/Zagreb'
+Writing updated zone for 'Europe/Zagreb'
 Writing new zone for 'Europe/Paris'
 Writing new zone for 'Europe/Luxembourg'
 Writing new zone for 'Europe/Kaliningrad'
@@ -365,4 +365,4 @@
 Writing new zone for 'Asia/Jakarta'
 Writing new zone for 'Asia/Baghdad'
 Writing new zone for 'Asia/Rangoon'
-Added 362 new zones, updated data for 5 zones and added 0 new aliases
+Added 361 new zones, updated data for 6 zones and added 0 new aliases
diff -Nru davical-0.9.9.7/testing/tests/timezone/Restore-Database.result davical-1.0.2/testing/tests/timezone/Restore-Database.result
--- davical-0.9.9.7/testing/tests/timezone/Restore-Database.result	2011-10-24 04:49:17.000000000 +0000
+++ davical-1.0.2/testing/tests/timezone/Restore-Database.result	2011-12-14 09:01:59.000000000 +0000
@@ -1,6 +1,6 @@
  setval 
 --------
-   1657
+   1667
 (1 row)
 
  setval 
@@ -25,12 +25,12 @@
 
  setval 
 --------
-      7
+      8
 (1 row)
 
  setval 
 --------
-     13
+     14
 (1 row)
 
  setval 
diff -Nru davical-0.9.9.7/VERSION davical-1.0.2/VERSION
--- davical-0.9.9.7/VERSION	2011-10-19 23:13:31.000000000 +0000
+++ davical-1.0.2/VERSION	2012-01-13 10:43:57.000000000 +0000
@@ -1 +1 @@
-0.9.9.7
+1.0.2