diff --git a/debian/changelog b/debian/changelog index fbd25284..55a56149 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,7 @@ davical (1.1.2-1) unstable; urgency=low canonical git upstream repository. * Removed README.Debian which didn’t contain any useful information. - -- Andrew McMillan Wed, 06 Mar 2013 20:27:17 +1300 + -- Andrew McMillan Wed, 01 May 2013 10:05:33 +1200 davical (1.1.1-1) unstable; urgency=high diff --git a/debian/control b/debian/control index 4ea7d381..f5ab02cd 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Homepage: http://davical.org/ Package: davical Architecture: all -Depends: ${misc:Depends}, debconf (>= 1.0.32), php5-pgsql, postgresql-client (>= 8.1), libawl-php (>= 0.53-1~), libawl-php (<< 0.55), libdbd-pg-perl, libyaml-perl +Depends: ${misc:Depends}, debconf (>= 1.0.32), php5-pgsql, postgresql-client (>= 8.1), libawl-php (>= 0.54-1~), libawl-php (<< 0.55), libdbd-pg-perl, libyaml-perl Recommends: postgresql (>= 8.3) Description: The DAViCal CalDAV & CardDAV Server The DAViCal CalDAV Server is designed to store CalDAV calendars and diff --git a/docs/api/awl/CalDAVSyncCalendar.html b/docs/api/awl/CalDAVSyncCalendar.html new file mode 100644 index 00000000..a8a4ad51 --- /dev/null +++ b/docs/api/awl/CalDAVSyncCalendar.html @@ -0,0 +1,396 @@ + + + + + + Docs For Class CalDAVSyncCalendar + + + + +
+

Class CalDAVSyncCalendar

+ + +
+
Description
+
+ Description | + Vars (details) + | Methods (details) + +
+
+ +

A class for holding basic information about a calendar we shall synchronize

+

+ Located in /inc/CalDAVSyncCalendar.php (line 8) +

+ + + 

+	
+			

+

+
+
+
+	
+	

+		
Variable Summary

+		

+			Description |
+						Vars (details)
+							| 
+									Methods (details)
+							
+								

+		

+			

+																																

+					 
+					mixed
+					$sync_client
+				

+																

+					 
+					mixed
+					$url
+				

+											

+		

+	

+
+	
+	

+		
Method Summary

+		

+			Description |
+																		Vars (details)
+				 
+				|
+						Methods (details)
+		

+		
			
+			

+																																																																								

+					 
+											CalDAVSyncCalendar
+										__construct
+											( $sync_client,  $url)
+									

+																

+					 
+											void
+										Get
+											( $key)
+									

+																

+					 
+											void
+										GetToken
+										()
+									

+																

+					 
+											void
+										hasSyncReport
+										()
+									

+																

+					 
+											void
+										Set
+											( $key,  $value)
+									

+																

+					 
+											void
+										whatChangedSince
+											( $old_remote_token)
+									

+																

+					 
+											void
+										__toString
+										()
+									

+											

+		

+	
		
+
+	
+	

+		
Variables

+		

+			Description |
+										Vars (details)
+						
+			
+										| 
+									Methods (details)
+							
+					

+		

+			
+Strict Standards: Only variables should be passed by reference in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 712
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+

+
+	

+		
+		
+			mixed
+			$sync_client
+						(line 9)
+		
+	

+
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$url
+						(line 10)
+		
+	

+
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+						
+		

+	

+	
+	
+	

+		
Methods

+		

+			Description |
+															Vars (details)
+														Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		Constructor __construct (line 14)
+	
 
+	
+	
+	
+	

+		CalDAVSyncCalendar
+		
+			__construct
+		
+					( $sync_client,  $url)
+			

+	
+			
    
+					
  • 
+				
+				$sync_client			
    • 
+					
  • 
+				
+				$url			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		Get (line 28)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			Get
+		
+					( $key)
+			

+	
+			
    
+					
  • 
+				
+				$key			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetToken (line 33)
+	
 
+	
+	
+	
+	

+		void
+		
+			GetToken
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		hasSyncReport (line 45)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			hasSyncReport
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		Set (line 24)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			Set
+		
+					( $key,  $value)
+			

+	
+			
    
+					
  • 
+				
+				$key			
    • 
+					
  • 
+				
+				$value			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		whatChangedSince (line 52)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			whatChangedSince
+		
+					( $old_remote_token)
+			

+	
+			
    
+					
  • 
+				
+				$old_remote_token			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		__toString (line 20)
+	
 
+	
+	
+	
+	

+		void
+		
+			__toString
+		
+				()
+			

+	
+		
+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:47 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/awl/_inc---CalDAVSyncCalendar.php.html b/docs/api/awl/_inc---CalDAVSyncCalendar.php.html
new file mode 100644
index 00000000..46a25228
--- /dev/null
+++ b/docs/api/awl/_inc---CalDAVSyncCalendar.php.html
@@ -0,0 +1,64 @@
+
+
+  
+		
+			
+			Docs for page CalDAVSyncCalendar.php
+			
+			
+		
+		
+			
			
+
File/inc/CalDAVSyncCalendar.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+														

+	
	
+		
+
A class for holding basic information about a calendar we shall synchronize

+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+																	

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						CalDAVSyncCalendar
+					
+											A class for holding basic information about a calendar we shall synchronize
+										

+		

+	

+
+	
+	
+	
+	
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:47 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/awl/caldav/CalDAVSyncClient.html b/docs/api/awl/caldav/CalDAVSyncClient.html
new file mode 100644
index 00000000..a8959419
--- /dev/null
+++ b/docs/api/awl/caldav/CalDAVSyncClient.html
@@ -0,0 +1,2237 @@
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+  
+		
+			
+			Docs For Class CalDAVSyncClient
+			
+			
+		
+		
+			
			
+
 Class CalDAVSyncClient

+
+
+

+	
Description

+	

+					Description |
+													Vars (details)
+						|											Methods (details)
+						
+					

+	

+        		
+
A class for accessing DAViCal via CalDAV, as a client

+		

+			Located in /inc/CalDAVSyncClient.php (line 25)
+		

+		
+				
+		

+	
+			

+

+
+
+
+	
+	

+		
Variable Summary

+		

+			Description |
+						Vars (details)
+							| 
+									Methods (details)
+							
+								

+		

+			

+																																																																																																																																																																																																								

+					 
+					string
+					$base_url
+				

+																

+					 
+					mixed
+					$body
+				

+																

+					 
+					mixed
+					$calendar_home_set
+				

+																

+					 
+					mixed
+					$calendar_url
+				

+																

+					 
+					mixed
+					$calendar_urls
+				

+																

+					 
+					mixed
+					$entry
+				

+																

+					 
+					mixed
+					$headers
+				

+																

+					 
+					mixed
+					$httpParsedHeaders
+				

+																

+					 
+					mixed
+					$httpRequest
+				

+																

+					 
+					mixed
+					$httpResponseBody
+				

+																

+					 
+					mixed
+					$httpResponseCode
+				

+																

+					 
+					mixed
+					$httpResponseHeaders
+				

+																

+					 
+					mixed
+					$parser
+				

+																

+					 
+					mixed
+					$pass
+				

+																

+					 
+					mixed
+					$port
+				

+																

+					 
+					mixed
+					$principal_url
+				

+																

+					 
+					mixed
+					$protocol
+				

+																

+					 
+					mixed
+					$requestMethod
+				

+																

+					 
+					mixed
+					$server
+				

+																

+					 
+					mixed
+					$user
+				

+																

+					 
+					string
+					$user_agent
+				

+																

+					 
+					mixed
+					$xmlRequest
+				

+																

+					 
+					mixed
+					$xmlResponse
+				

+											

+		

+	

+
+	
+	

+		
Method Summary

+		

+			Description |
+																		Vars (details)
+				 
+				|
+						Methods (details)
+		

+		
			
+			

+																																																																																																																																																																																																																																																																																																																																																																

+					 
+											CalDAVSyncClient
+										__construct
+											(string $base_url, string $user, string $pass)
+									

+																

+					 
+											void
+										CalendarHomeSet
+											([$url $urls = null])
+									

+																

+					 
+											void
+										CalendarMultiget
+											( $event_hrefs, [ $url = null])
+									

+																

+					 
+											void
+										CalendarUrls
+											([$urls $urls = null])
+									

+																

+					 
+											array
+										DoCalendarQuery
+											(string $filter, [string $url = ''])
+									

+																

+					 
+											int
+										DoDELETERequest
+											(string $url, [string $etag = null])
+									

+																

+					 
+											void
+										DoGETRequest
+											(string $url)
+									

+																

+					 
+											void
+										DoHEADRequest
+											(string $url)
+									

+																

+					 
+											array
+										DoOptionsRequest
+											([string $url = null])
+									

+																

+					 
+											void
+										DoPROPFINDRequest
+											(string $url,  $props, [ $depth = 0])
+									

+																

+					 
+											string
+										DoPUTRequest
+											(string $url, string $icalendar, [string $etag = null])
+									

+																

+					 
+											string
+										DoRequest
+											([string $url = null])
+									

+																

+					 
+											void
+										doSyncReport
+											([ $previous_token = null], [ $url = null])
+									

+																

+					 
+											array
+										DoXMLRequest
+											( $request_method, string $xml, [string $url = null], string $method)
+									

+																

+					 
+											void
+										FindCalendarHome
+											([ $recursed = false], string $url)
+									

+																

+					 
+											void
+										FindCalendars
+											([ $recursed = false])
+									

+																

+					 
+											void
+										FindPrincipal
+											([string $url = null])
+									

+																

+					 
+											void
+										GetCalendarDetails
+											([ $url = null])
+									

+																

+					 
+											void
+										GetCollectionETags
+											([ $url = null])
+									

+																

+					 
+											string
+										GetEntryByHref
+											(string $href)
+									

+																

+					 
+											array
+										GetEntryByUid
+											(uid $uid, [string $relative_url = ''], [string $component_type = 'VEVENT'])
+									

+																

+					 
+											array
+										GetEvents
+											([timestamp $start = null], [timestamp $finish = null], [string $relative_url = ''])
+									

+																

+					 
+											HTTP
+										GetHttpRequest
+										()
+									

+																

+					 
+											void
+										GetOKProps
+											(string $nodenum)
+									

+																

+					 
+											HTTP
+										GetResponseBody
+										()
+									

+																

+					 
+											HTTP
+										GetResponseHeaders
+										()
+									

+																

+					 
+											array
+										GetTodos
+											(timestamp $start, timestamp $finish, [boolean $completed = false], [boolean $cancelled = false], [string $relative_url = ""])
+									

+																

+					 
+											raw
+										GetXmlRequest
+										()
+									

+																

+					 
+											raw
+										GetXmlResponse
+										()
+									

+																

+					 
+											void
+										HrefForProp
+											(string $tagname, [ $i = 0], integer $which)
+									

+																

+					 
+											void
+										HrefForResourcetype
+											(string $tagname, [ $i = 0], integer $which)
+									

+																

+					 
+											void
+										HrefValueInside
+											(string $tagname)
+									

+																

+					 
+											void
+										ParseResponse
+											(string $response)
+									

+																

+					 
+											array
+										ParseResponseHeaders
+										()
+									

+																

+					 
+											void
+										PrincipalURL
+											([$url $url = null])
+									

+																

+					 
+											void
+										SetCalendar
+											(string $url)
+									

+																

+					 
+											void
+										SetContentType
+											(string $type)
+									

+																

+					 
+											boolean
+										SetDebug
+											(boolean $new_value)
+									

+																

+					 
+											void
+										SetDepth
+											([int $depth = '0'])
+									

+																

+					 
+											void
+										SetMatch
+											(bool $match, [string $etag = '*'])
+									

+																

+					 
+											void
+										SetUserAgent
+											([ $user_agent = null], int $depth)
+									

+																

+					 
+											void
+										Unchunk
+										()
+									

+											

+		

+	
		
+
+	
+	

+		
Variables

+		

+			Description |
+										Vars (details)
+						
+			
+										| 
+									Methods (details)
+							
+					

+		

+			
+Strict Standards: Only variables should be passed by reference in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 712
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+

+
+	

+		
+		
+			string
+			$base_url
+						(line 31)
+		
+	

+
+	
+
Server, username, password, calendar

+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$body
+			 =  ""			(line 61)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$calendar_home_set
+						(line 46)
+		
+	

+
+	
+
The calendar-home-set we're using

+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$calendar_url
+						(line 41)
+		
+	

+
+	
+
The calendar-URL we're using

+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$calendar_urls
+						(line 51)
+		
+	

+
+	
+
The calendar_urls we have discovered

+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$entry
+						(line 31)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$headers
+			 = array()			(line 60)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$httpParsedHeaders
+						(line 68)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$httpRequest
+			 =  ""			(line 63)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$httpResponseBody
+			 =  ""			(line 69)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$httpResponseCode
+			 =  0			(line 66)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$httpResponseHeaders
+			 =  ""			(line 67)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$parser
+						(line 71)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$pass
+						(line 31)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$port
+						(line 31)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$principal_url
+						(line 36)
+		
+	

+
+	
+
The principal-URL we're using

+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$protocol
+						(line 31)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$requestMethod
+			 =  "GET"			(line 62)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$server
+						(line 31)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$user
+						(line 31)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			string
+			$user_agent
+			 =  'DAViCalClient'			(line 58)
+		
+	

+
+	
+
The useragent which is send to the caldav server

+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$xmlRequest
+			 =  ""			(line 64)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$xmlResponse
+			 =  ""			(line 65)
+		
+	

+
+	
+	
    
+				
  • access: protected
    • 
+			

+	
+	
+		
+		
+
+

+						
+		

+	

+	
+	
+	

+		
Methods

+		

+			Description |
+															Vars (details)
+														Methods (details)
+						
+		

+		

+			
+Strict Standards: Only variables should be passed by reference in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 712
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+

+	
+	

+		
+		Constructor __construct (line 85)
+	
 
+	
+	
+
Constructor, initialises the class

+	
+	

+		CalDAVSyncClient
+		
+			__construct
+		
+					(string $base_url, string $user, string $pass)
+			

+	
+			
    
+					
  • 
+				string
+				$base_url: The URL for the calendar server			
    • 
+					
  • 
+				string
+				$user: The name of the user logging in			
    • 
+					
  • 
+				string
+				$pass: The password for that user			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		CalendarHomeSet (line 528)
+	
 
+	
+	
+
Get/Set the calendar-home-set URL

+	
+	

+		void
+		
+			CalendarHomeSet
+		
+					([$url $urls = null])
+			

+	
+			
    
+					
  • 
+				$url
+				$urls: array of string The calendar-home-set URLs to set			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		CalendarMultiget (line 798)
+	
 
+	
+	
+
Get a bunch of events for a calendar with a calendar-multiget report

+	
+	

+		void
+		
+			CalendarMultiget
+		
+					( $event_hrefs, [ $url = null])
+			

+	
+			
    
+					
  • 
+				
+				$event_hrefs			
    • 
+					
  • 
+				
+				$url			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		CalendarUrls (line 542)
+	
 
+	
+	
+
Get/Set the calendar-home-set URL

+	
+	

+		void
+		
+			CalendarUrls
+		
+					([$urls $urls = null])
+			

+	
+			
    
+					
  • 
+				$urls
+				$urls: array of string The calendar URLs to set			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoCalendarQuery (line 885)
+	
 
+	
+	
+
Given XML for a calendar query, return an array of the events (/todos) in the  response.  Each event in the array will have a 'href', 'etag' and '$response_type'  part, where the 'href' is relative to the calendar and the '$response_type' contains the  definition of the calendar data in iCalendar format.

+	
    
+				
  • return: An array of the relative URLs, etags, and events from the server.  Each element of the array will                be an array with 'href', 'etag' and 'data' elements, corresponding to the URL, the server-supplied                etag (which only varies when the data changes) and the calendar data in iCalendar format.
    • 
+			

+	
+	

+		array
+		
+			DoCalendarQuery
+		
+					(string $filter, [string $url = ''])
+			

+	
+			
    
+					
  • 
+				string
+				$filter: XML fragment which is the <filter> element of a calendar-query			
    • 
+					
  • 
+				string
+				$url: The URL of the calendar, or empty/null to use the 'current' calendar_url			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoDELETERequest (line 476)
+	
 
+	
+	
+
DELETE a text/icalendar resource

+	
    
+				
  • return: The HTTP Result Code for the DELETE
    • 
+			

+	
+	

+		int
+		
+			DoDELETERequest
+		
+					(string $url, [string $etag = null])
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to make the request to			
    • 
+					
  • 
+				string
+				$etag: The etag of an existing resource to be deleted, or '*' for any resource at that URL.			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoGETRequest (line 412)
+	
 
+	
+	
+
Get a single item from the server.

+	
+	

+		void
+		
+			DoGETRequest
+		
+					(string $url)
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to GET			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoHEADRequest (line 424)
+	
 
+	
+	
+
Get the HEAD of a single item from the server.

+	
+	

+		void
+		
+			DoHEADRequest
+		
+					(string $url)
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to HEAD			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoOptionsRequest (line 374)
+	
 
+	
+	
+
Send an OPTIONS request to the server

+	
    
+				
  • return: The allowed options
    • 
+			

+	
+	

+		array
+		
+			DoOptionsRequest
+		
+					([string $url = null])
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to make the request to			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoPROPFINDRequest (line 493)
+	
 
+	
+	
+
Get a single item from the server.

+	
+	

+		void
+		
+			DoPROPFINDRequest
+		
+					(string $url,  $props, [ $depth = 0])
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to PROPFIND on			
    • 
+					
  • 
+				
+				$props			
    • 
+					
  • 
+				
+				$depth			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoPUTRequest (line 440)
+	
 
+	
+	
+
PUT a text/icalendar resource, returning the etag

+	
    
+				
  • return: The content of the response from the server
    • 
+			

+	
+	

+		string
+		
+			DoPUTRequest
+		
+					(string $url, string $icalendar, [string $etag = null])
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to make the request to			
    • 
+					
  • 
+				string
+				$icalendar: The iCalendar resource to send to the server			
    • 
+					
  • 
+				string
+				$etag: The etag of an existing resource to be overwritten, or '*' for a new resource.			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoRequest (line 273)
+	
 
+	
+	
+
Send a request to the server

+	
    
+				
  • return: The content of the response from the server
    • 
+			

+	
+	

+		string
+		
+			DoRequest
+		
+					([string $url = null])
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to make the request to			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		doSyncReport (line 838)
+	
 
+	
+	
+	
+	

+		void
+		
+			doSyncReport
+		
+					([ $previous_token = null], [ $url = null])
+			

+	
+			
    
+					
  • 
+				
+				$previous_token			
    • 
+					
  • 
+				
+				$url			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		DoXMLRequest (line 398)
+	
 
+	
+	
+
Send an XML request to the server (e.g. PROPFIND, REPORT, MKCALENDAR)

+	
    
+				
  • return: An array of the allowed methods
    • 
+			

+	
+	

+		array
+		
+			DoXMLRequest
+		
+					( $request_method, string $xml, [string $url = null], string $method)
+			

+	
+			
    
+					
  • 
+				string
+				$method: The method (PROPFIND, REPORT, etc) to use with the request			
    • 
+					
  • 
+				string
+				$xml: The XML to send along with the request			
    • 
+					
  • 
+				string
+				$url: The URL to make the request to			
    • 
+					
  • 
+				
+				$request_method			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		FindCalendarHome (line 675)
+	
 
+	
+	
+
Attack the given URL in an attempt to find a principal URL

+	
+	

+		void
+		
+			FindCalendarHome
+		
+					([ $recursed = false], string $url)
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to find the calendar-home-set from			
    • 
+					
  • 
+				
+				$recursed			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		FindCalendars (line 704)
+	
 
+	
+	
+
Find the calendars, from the calendar_home_set

+	
+	

+		void
+		
+			FindCalendars
+		
+					([ $recursed = false])
+			

+	
+			
    
+					
  • 
+				
+				$recursed			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		FindPrincipal (line 652)
+	
 
+	
+	
+
Attack the given URL in an attempt to find a principal URL

+	
+	

+		void
+		
+			FindPrincipal
+		
+					([string $url = null])
+			

+	
+			
    
+					
  • 
+				string
+				$url: The URL to find the principal-URL from			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetCalendarDetails (line 748)
+	
 
+	
+	
+
Find the calendars, from the calendar_home_set

+	
+	

+		void
+		
+			GetCalendarDetails
+		
+					([ $url = null])
+			

+	
+			
    
+					
  • 
+				
+				$url			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetCollectionETags (line 778)
+	
 
+	
+	
+
Get all etags for a calendar

+	
+	

+		void
+		
+			GetCollectionETags
+		
+					([ $url = null])
+			

+	
+			
    
+					
  • 
+				
+				$url			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetEntryByHref (line 1045)
+	
 
+	
+	
+
Get the calendar entry by HREF

+	
    
+				
  • return: The iCalendar of the calendar entry
    • 
+			

+	
+	

+		string
+		
+			GetEntryByHref
+		
+					(string $href)
+			

+	
+			
    
+					
  • 
+				string
+				$href: The href from a call to GetEvents or GetTodos etc.			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetEntryByUid (line 1018)
+	
 
+	
+	
+
Get the calendar entry by UID

+	
    
+				
  • return: An array of the relative URL, etag, and calendar data returned from DoCalendarQuery() @see DoCalendarQuery()
    • 
+			

+	
+	

+		array
+		
+			GetEntryByUid
+		
+					(uid $uid, [string $relative_url = ''], [string $component_type = 'VEVENT'])
+			

+	
+			
    
+					
  • 
+				string
+				$relative_url: The URL relative to the base_url specified when the calendar was opened.  Default ''.			
    • 
+					
  • 
+				string
+				$component_type: The component type inside the VCALENDAR.  Default 'VEVENT'.			
    • 
+					
  • 
+				uid
+				$uid			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetEvents (line 942)
+	
 
+	
+	
+
Get the events in a range from $start to $finish.  The dates should be in the

+
format yyyymmddThhmmssZ and should be in GMT.  The events are returned as an  array of event arrays.  Each event array will have a 'href', 'etag' and 'event'  part, where the 'href' is relative to the calendar and the event contains the  definition of the event in iCalendar format.

+	
    
+				
  • return: An array of the relative URLs, etags, and events, returned from DoCalendarQuery() @see DoCalendarQuery()
    • 
+			

+	
+	

+		array
+		
+			GetEvents
+		
+					([timestamp $start = null], [timestamp $finish = null], [string $relative_url = ''])
+			

+	
+			
    
+					
  • 
+				timestamp
+				$start: The start time for the period			
    • 
+					
  • 
+				timestamp
+				$finish: The finish time for the period			
    • 
+					
  • 
+				string
+				$relative_url: The URL relative to the base_url specified when the calendar was opened.  Default ''.			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetHttpRequest (line 230)
+	
 
+	
+	
+
Output http request headers

+	
    
+				
  • return: headers
    • 
+			

+	
+	

+		HTTP
+		
+			GetHttpRequest
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		GetOKProps (line 619)
+	
 
+	
+	
+
Return the <prop> ... </prop> of a propstat where the status is OK

+	
+	

+		void
+		
+			GetOKProps
+		
+					(string $nodenum)
+			

+	
+			
    
+					
  • 
+				string
+				$nodenum: The node number in the xmlnodes which is the href			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetResponseBody (line 246)
+	
 
+	
+	
+
Output http response body

+	
    
+				
  • return: body
    • 
+			

+	
+	

+		HTTP
+		
+			GetResponseBody
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		GetResponseHeaders (line 238)
+	
 
+	
+	
+
Output http response headers

+	
    
+				
  • return: headers
    • 
+			

+	
+	

+		HTTP
+		
+			GetResponseHeaders
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		GetTodos (line 978)
+	
 
+	
+	
+
Get the todo's in a range from $start to $finish.  The dates should be in the

+
format yyyymmddThhmmssZ and should be in GMT.  The events are returned as an  array of event arrays.  Each event array will have a 'href', 'etag' and 'event'  part, where the 'href' is relative to the calendar and the event contains the  definition of the event in iCalendar format.

+	
    
+				
  • return: An array of the relative URLs, etags, and events, returned from DoCalendarQuery() @see DoCalendarQuery()
    • 
+			

+	
+	

+		array
+		
+			GetTodos
+		
+					(timestamp $start, timestamp $finish, [boolean $completed = false], [boolean $cancelled = false], [string $relative_url = ""])
+			

+	
+			
    
+					
  • 
+				timestamp
+				$start: The start time for the period			
    • 
+					
  • 
+				timestamp
+				$finish: The finish time for the period			
    • 
+					
  • 
+				boolean
+				$completed: Whether to include completed tasks			
    • 
+					
  • 
+				boolean
+				$cancelled: Whether to include cancelled tasks			
    • 
+					
  • 
+				string
+				$relative_url: The URL relative to the base_url specified when the calendar was opened.  Default ''.			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		GetXmlRequest (line 254)
+	
 
+	
+	
+
Output xml request

+	
    
+				
  • return: xml
    • 
+			

+	
+	

+		raw
+		
+			GetXmlRequest
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		GetXmlResponse (line 262)
+	
 
+	
+	
+
Output xml response

+	
    
+				
  • return: xml
    • 
+			

+	
+	

+		raw
+		
+			GetXmlResponse
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		HrefForProp (line 573)
+	
 
+	
+	
+
Return the href containing this property.  Except only if it's inside a status != 200

+	
+	

+		void
+		
+			HrefForProp
+		
+					(string $tagname, [ $i = 0], integer $which)
+			

+	
+			
    
+					
  • 
+				string
+				$tagname: The tag name of the property to find the href for			
    • 
+					
  • 
+				integer
+				$which: Which instance of the tag should we use			
    • 
+					
  • 
+				
+				$i			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		HrefForResourcetype (line 599)
+	
 
+	
+	
+
Return the href which has a resourcetype of the specified type

+	
+	

+		void
+		
+			HrefForResourcetype
+		
+					(string $tagname, [ $i = 0], integer $which)
+			

+	
+			
    
+					
  • 
+				string
+				$tagname: The tag name of the resourcetype to find the href for			
    • 
+					
  • 
+				integer
+				$which: Which instance of the tag should we use			
    • 
+					
  • 
+				
+				$i			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		HrefValueInside (line 556)
+	
 
+	
+	
+
Return the first occurrence of an href inside the named tag.

+	
+	

+		void
+		
+			HrefValueInside
+		
+					(string $tagname)
+			

+	
+			
    
+					
  • 
+				string
+				$tagname: The tag name to find the href inside of			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		ParseResponse (line 179)
+	
 
+	
+	
+
Split response into httpResponse and xmlResponse

+	
+	

+		void
+		
+			ParseResponse
+		
+					(string $response)
+			

+	
+			
    
+					
  • 
+				string
+				$response: Response from server			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		ParseResponseHeaders (line 205)
+	
 
+	
+	
+
Split httpResponseHeaders into an array of headers

+	
    
+				
  • return: of arrays of header lines
    • 
+			

+	
+	

+		array
+		
+			ParseResponseHeaders
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		PrincipalURL (line 515)
+	
 
+	
+	
+
Get/Set the Principal URL

+	
+	

+		void
+		
+			PrincipalURL
+		
+					([$url $url = null])
+			

+	
+			
    
+					
  • 
+				$url
+				$url: string The Principal URL to set			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		SetCalendar (line 170)
+	
 
+	
+	
+
Set the calendar_url we will be using for a while.

+	
+	

+		void
+		
+			SetCalendar
+		
+					(string $url)
+			

+	
+			
    
+					
  • 
+				string
+				$url: The calendar_url			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		SetContentType (line 161)
+	
 
+	
+	
+
Add a Content-type: header.

+	
+	

+		void
+		
+			SetContentType
+		
+					(string $type)
+			

+	
+			
    
+					
  • 
+				string
+				$type: The content type			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		SetDebug (line 116)
+	
 
+	
+	
+
Call this to enable / disable debugging.  It will return the prior value of the debugging flag.

+	
    
+				
  • return: The previous value, in case you want to restore it later.
    • 
+			

+	
+	

+		boolean
+		
+			SetDebug
+		
+					(boolean $new_value)
+			

+	
+			
    
+					
  • 
+				boolean
+				$new_value: The new value for debugging.			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		SetDepth (line 142)
+	
 
+	
+	
+
Add a Depth: header.  Valid values are 0, 1 or infinity

+	
+	

+		void
+		
+			SetDepth
+		
+					([int $depth = '0'])
+			

+	
+			
    
+					
  • 
+				int
+				$depth: The depth, default to infinity			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		SetMatch (line 133)
+	
 
+	
+	
+
Adds an If-Match or If-None-Match header

+	
+	

+		void
+		
+			SetMatch
+		
+					(bool $match, [string $etag = '*'])
+			

+	
+			
    
+					
  • 
+				bool
+				$match: to Match or Not to Match, that is the question!			
    • 
+					
  • 
+				string
+				$etag: The etag to match / not match against.			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		SetUserAgent (line 151)
+	
 
+	
+	
+
Add a Depth: header.  Valid values are 1 or infinity

+	
+	

+		void
+		
+			SetUserAgent
+		
+					([ $user_agent = null], int $depth)
+			

+	
+			
    
+					
  • 
+				int
+				$depth: The depth, default to infinity			
    • 
+					
  • 
+				
+				$user_agent			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		Unchunk (line 339)
+	
 
+	
+	
+
Unchunk a chunked response

+	
+	

+		void
+		
+			Unchunk
+		
+				()
+			

+	
+		
+			
+	

+						
+		

+	

+
+	
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:47 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/awl/caldav/_inc---CalDAVSyncClient.php.html b/docs/api/awl/caldav/_inc---CalDAVSyncClient.php.html
new file mode 100644
index 00000000..93663a5e
--- /dev/null
+++ b/docs/api/awl/caldav/_inc---CalDAVSyncClient.php.html
@@ -0,0 +1,124 @@
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+  
+		
+			
+			Docs for page CalDAVSyncClient.php
+			
+			
+		
+		
+			
			
+
File/inc/CalDAVSyncClient.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+			|							Includes
+												

+	
	
+		
+
A Class for connecting to a caldav server

+	
+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+			|							Includes
+																		

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						CalDAVSyncClient
+					
+											A class for accessing DAViCal via CalDAV, as a client
+										

+		

+	

+
+		
+	

+		
Includes

+		

+			Description |
+							Classes
+				|						Includes
+														

+		
	
+			
+Strict Standards: Only variables should be passed by reference in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 712
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+

+	
+	

+		 
+		
+			require_once
+			('XMLDocument.php')
+			(line 13)
+		
+	

+
+	
+
A Class for connecting to a caldav server

+	
+	
+

+
+

+	
+	

+		 
+		
+			require_once
+			('CalDAVSyncCalendar.php')
+			(line 14)
+		
+	

+
+	
+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:47 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/davical/CalDAVSyncCache.html b/docs/api/davical/CalDAVSyncCache.html
new file mode 100644
index 00000000..9f5118f8
--- /dev/null
+++ b/docs/api/davical/CalDAVSyncCache.html
@@ -0,0 +1,418 @@
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+  
+		
+			
+			Docs For Class CalDAVSyncCache
+			
+			
+		
+		
+			
			
+
 Class CalDAVSyncCache

+
+
+

+	
Description

+	

+					Description |
+															Methods (details)
+						
+					

+	

+        		
+
Our SyncCache holds

+		

+			Located in /inc/CalDAVSyncCache.php (line 11)
+		

+		
+				
+		

+	
+			

+

+
+
+
+
+	
+	

+		
Method Summary

+		

+			Description |
+												Methods (details)
+		

+		
			
+			

+																																																																																																								

+					 
+											CalDAVSyncCache
+										__construct
+											( $cache_dir,  $username,  $caldav,  $remote_calendar, WritableCollection $local_calendar)
+									

+																

+					 
+											void
+										applyLocalChangesToRemote
+										()
+									

+																

+					 
+											void
+										applyRemoteChangesToLocal
+										()
+									

+																

+					 
+											void
+										deleteRemote
+											( $change)
+									

+																

+					 
+											void
+										finish
+										()
+									

+																

+					 
+											void
+										localChanges
+										()
+									

+																

+					 
+											void
+										needsSync
+											( $new_local_token,  $new_remote_token)
+									

+																

+					 
+											void
+										putRemote
+											( $change)
+									

+																

+					 
+											void
+										remoteChanges
+										()
+									

+																

+					 
+											void
+										resolveConflicts
+										()
+									

+																

+					 
+											void
+										updateETags
+										()
+									

+											

+		

+	
		
+
+	
+	
+	

+		
Methods

+		

+			Description |
+													Methods (details)
+						
+		

+		

+			
+Strict Standards: Only variables should be passed by reference in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 712
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+

+	
+	

+		
+		Constructor __construct (line 23)
+	
 
+	
+	
+	
+	

+		CalDAVSyncCache
+		
+			__construct
+		
+					( $cache_dir,  $username,  $caldav,  $remote_calendar, WritableCollection $local_calendar)
+			

+	
+			
+		
+			
+	

+
+

+	
+	

+		
+		applyLocalChangesToRemote (line 89)
+	
 
+	
+	
+
Put/Delete to the remote server as appropriate

+	
+	

+		void
+		
+			applyLocalChangesToRemote
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		applyRemoteChangesToLocal (line 112)
+	
 
+	
+	
+
Apply remote changes to local database

+	
+	

+		void
+		
+			applyRemoteChangesToLocal
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		deleteRemote (line 80)
+	
 
+	
+	
+
Delete this from the remote server

+	
+	

+		void
+		
+			deleteRemote
+		
+					( $change)
+			

+	
+			
    
+					
  • 
+				
+				$change			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		finish (line 41)
+	
 
+	
+	
+	
+	

+		void
+		
+			finish
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		localChanges (line 52)
+	
 
+	
+	
+	
+	

+		void
+		
+			localChanges
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		needsSync (line 56)
+	
 
+	
+	
+	
+	

+		void
+		
+			needsSync
+		
+					( $new_local_token,  $new_remote_token)
+			

+	
+			
    
+					
  • 
+				
+				$new_local_token			
    • 
+					
  • 
+				
+				$new_remote_token			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		putRemote (line 66)
+	
 
+	
+	
+
Write this change to the remote server

+	
+	

+		void
+		
+			putRemote
+		
+					( $change)
+			

+	
+			
    
+					
  • 
+				
+				$change			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		remoteChanges (line 48)
+	
 
+	
+	
+	
+	

+		void
+		
+			remoteChanges
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		resolveConflicts (line 121)
+	
 
+	
+	
+	
+	

+		void
+		
+			resolveConflicts
+		
+				()
+			

+	
+		
+			
+	

+
+

+	
+	

+		
+		updateETags (line 126)
+	
 
+	
+	
+	
+	

+		void
+		
+			updateETags
+		
+				()
+			

+	
+		
+			
+	

+						
+		

+	

+
+	
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:47 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/davical/CalDAVSyncState.html b/docs/api/davical/CalDAVSyncState.html
new file mode 100644
index 00000000..e87bfbe3
--- /dev/null
+++ b/docs/api/davical/CalDAVSyncState.html
@@ -0,0 +1,340 @@
+
+
+  
+		
+			
+			Docs For Class CalDAVSyncState
+			
+			
+		
+		
+			
			
+
 Class CalDAVSyncState

+
+
+

+	
Description

+	

+					Description |
+													Vars (details)
+						|											Methods (details)
+						
+					

+	

+                

+            Implements interfaces:
+            
    
+                
  • Serializable (internal interface)
    •             

+        

+        		
+
The CalDAVSyncState is a very lightweight object holding the data from the last sync process.

+		

+			Located in /inc/CalDAVSyncState.php (line 5)
+		

+		
+				
+		

+	
+			

+

+
+
+
+	
+	

+		
Variable Summary

+		

+			Description |
+						Vars (details)
+							| 
+									Methods (details)
+							
+								

+		

+			

+																																																

+					 
+					mixed
+					$local_etags
+				

+																

+					 
+					mixed
+					$local_token
+				

+																

+					 
+					mixed
+					$remote_etags
+				

+																

+					 
+					mixed
+					$remote_token
+				

+											

+		

+	

+
+	
+	

+		
Method Summary

+		

+			Description |
+																		Vars (details)
+				 
+				|
+						Methods (details)
+		

+		
			
+			

+																																								

+					 
+											CalDAVSyncState
+										__construct
+											( $rtoken,  $retags,  $ltoken,  $letags)
+									

+																

+					 
+											void
+										serialize
+										()
+									

+																

+					 
+											void
+										unserialize
+											( $data)
+									

+											

+		

+	
		
+
+	
+	

+		
Variables

+		

+			Description |
+										Vars (details)
+						
+			
+										| 
+									Methods (details)
+							
+					

+		

+			
+
+

+
+	

+		
+		
+			mixed
+			$local_etags
+						(line 9)
+		
+	

+
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$local_token
+						(line 8)
+		
+	

+
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$remote_etags
+						(line 7)
+		
+	

+
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+
+

+
+	

+		
+		
+			mixed
+			$remote_token
+						(line 6)
+		
+	

+
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	
+		
+		
+
+

+						
+		

+	

+	
+	
+	

+		
Methods

+		

+			Description |
+															Vars (details)
+														Methods (details)
+						
+		

+		

+			
+
+

+	
+	

+		
+		Constructor __construct (line 11)
+	
 
+	
+	
+	
+	

+		CalDAVSyncState
+		
+			__construct
+		
+					( $rtoken,  $retags,  $ltoken,  $letags)
+			

+	
+			
    
+					
  • 
+				
+				$rtoken			
    • 
+					
  • 
+				
+				$retags			
    • 
+					
  • 
+				
+				$ltoken			
    • 
+					
  • 
+				
+				$letags			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		serialize (line 18)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			serialize
+		
+				()
+			

+	
+		
+				

+		
Implementation of:

+			

+			
Serializable::serialize

+					

+			
+	

+
+

+	
+	

+		
+		unserialize (line 22)
+	
 
+	
+	
+	
    
+				
  • access: public
    • 
+			

+	
+	

+		void
+		
+			unserialize
+		
+					( $data)
+			

+	
+			
    
+					
  • 
+				
+				$data			
    • 
+				

+		
+				

+		
Implementation of:

+			

+			
Serializable::unserialize

+					

+			
+	

+						
+		

+	

+
+	
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:48 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/davical/FakeSession.html b/docs/api/davical/FakeSession.html
new file mode 100644
index 00000000..ed1dedf9
--- /dev/null
+++ b/docs/api/davical/FakeSession.html
@@ -0,0 +1,150 @@
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+  
+		
+			
+			Docs For Class FakeSession
+			
+			
+		
+		
+			
			
+
 Class FakeSession

+
+
+

+	
Description

+	

+					Description |
+															Methods (details)
+						
+					

+	

+        		
+
Sometimes we need a fake session when we are using the DAViCal libraries from a script POV.

+
This FakeSession grants complete privileges and access - normally what you want, in a script  context - so you should know what you're doing and why you're using it.

+	
    
+				
  • author: karora
    • 
+			

+		

+			Located in /inc/FakeSession.php (line 12)
+		

+		
+				
+		

+	
+			

+

+
+
+
+
+	
+	

+		
Method Summary

+		

+			Description |
+												Methods (details)
+		

+		
			
+			

+																																

+					 
+											FakeSession
+										__construct
+											( $user_no)
+									

+																

+					 
+											void
+										AllowedTo
+											( $do_something)
+									

+											

+		

+	
		
+
+	
+	
+	

+		
Methods

+		

+			Description |
+													Methods (details)
+						
+		

+		

+			
+Strict Standards: Only variables should be passed by reference in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 712
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+

+	
+	

+		
+		Constructor __construct (line 14)
+	
 
+	
+	
+	
+	

+		FakeSession
+		
+			__construct
+		
+					( $user_no)
+			

+	
+			
    
+					
  • 
+				
+				$user_no			
    • 
+				

+		
+			
+	

+
+

+	
+	

+		
+		AllowedTo (line 35)
+	
 
+	
+	
+	
+	

+		void
+		
+			AllowedTo
+		
+					( $do_something)
+			

+	
+			
    
+					
  • 
+				
+				$do_something			
    • 
+				

+		
+			
+	

+						
+		

+	

+
+	
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:49 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/davical/_inc---CalDAVSyncCache.php.html b/docs/api/davical/_inc---CalDAVSyncCache.php.html
new file mode 100644
index 00000000..701b8f25
--- /dev/null
+++ b/docs/api/davical/_inc---CalDAVSyncCache.php.html
@@ -0,0 +1,142 @@
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+  
+		
+			
+			Docs for page CalDAVSyncCache.php
+			
+			
+		
+		
+			
			
+
File/inc/CalDAVSyncCache.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+			|							Includes
+												

+	
	
+		
+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+			|							Includes
+																		

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						CalDAVSyncCache
+					
+											Our SyncCache holds
+										

+		

+	

+
+		
+	

+		
Includes

+		

+			Description |
+							Classes
+				|						Includes
+														

+		
	
+			
+Strict Standards: Only variables should be passed by reference in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 712
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+

+	
+	

+		 
+		
+			require_once
+			('CalDAVSyncClient.php')
+			(line 3)
+		
+	

+
+	
+	
+

+
+

+	
+	

+		 
+		
+			require_once
+			('CalDAVSyncState.php')
+			(line 4)
+		
+	

+
+	
+	
+

+
+

+	
+	

+		 
+		
+			require_once
+			('CalDAVSyncCalendar.php')
+			(line 5)
+		
+	

+
+	
+	
+

+
+

+	
+	

+		 
+		
+			require_once
+			('WritableCollection.php')
+			(line 6)
+		
+	

+
+	
+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:47 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/davical/_inc---CalDAVSyncState.php.html b/docs/api/davical/_inc---CalDAVSyncState.php.html
new file mode 100644
index 00000000..7916bf84
--- /dev/null
+++ b/docs/api/davical/_inc---CalDAVSyncState.php.html
@@ -0,0 +1,63 @@
+
+
+  
+		
+			
+			Docs for page CalDAVSyncState.php
+			
+			
+		
+		
+			
			
+
File/inc/CalDAVSyncState.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+														

+	
	
+		
+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+																	

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						CalDAVSyncState
+					
+											The CalDAVSyncState is a very lightweight object holding the data from the last sync process.
+										

+		

+	

+
+	
+	
+	
+	
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:48 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/docs/api/davical/_inc---FakeSession.php.html b/docs/api/davical/_inc---FakeSession.php.html
new file mode 100644
index 00000000..ac6a8955
--- /dev/null
+++ b/docs/api/davical/_inc---FakeSession.php.html
@@ -0,0 +1,97 @@
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+
+  
+		
+			
+			Docs for page FakeSession.php
+			
+			
+		
+		
+			
			
+
File/inc/FakeSession.php

+
+
+

+	
Description

+	

+					Description |
+							Classes
+			|							Includes
+												

+	
	
+		
+		
+			

+

+		
+		
+	

+		
Classes

+		

+			Description |
+			Classes
+			|							Includes
+																		

+		
	
+			
+				
+					
+					
+				
+								
+					
+					
+				
+							
ClassDescription

+						 class
+						FakeSession
+					
+											Sometimes we need a fake session when we are using the DAViCal libraries from a script POV.
+										

+		

+	

+
+		
+	

+		
Includes

+		

+			Description |
+							Classes
+				|						Includes
+														

+		
	
+			
+Strict Standards: Only variables should be passed by reference in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 712
+
+Warning: strftime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected the timezone 'UTC' for now, but please set date.timezone to select your timezone. in /usr/share/php/PhpDocumentor/phpDocumentor/Smarty-2.6.0/libs/Smarty_Compiler.class.php on line 370
+
+

+	
+	

+		 
+		
+			require_once
+			('Principal.php')
+			(line 2)
+		
+	

+
+	
+	
+

+		

+	

+	
+	
+	
+	
+	

+		Documentation generated on Sun, 08 Jul 2012 12:53:49 +0000 by phpDocumentor 1.4.3
+	

+	

+
\ No newline at end of file
diff --git a/htdocs/always.php b/htdocs/always.php
index f20725ae..ca23ad95 100644
--- a/htdocs/always.php
+++ b/htdocs/always.php
@@ -200,8 +200,8 @@ if ( function_exists('awl_set_locale') ) {
 *
 */
 $c->code_version = 0;
-$c->want_awl_version = '0.53';
-$c->version_string = '1.1.1'; // The actual version # is replaced into that during the build /release process
+$c->want_awl_version = '0.54';
+$c->version_string = '1.1.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 --git a/inc/DAVResource.php b/inc/DAVResource.php
index 36cebf92..8ed84357 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -1803,7 +1803,7 @@ EOQRY;
         break;
 
       default:
-        $property_value = $this->GetProperty(preg_replace('{^.*:}', '', $tag));
+        $property_value = $this->GetProperty(preg_replace('{^(DAV:|urn:ietf:params:xml:ns:ca(rd|l)dav):}', '', $tag));
         if ( isset($property_value) ) {
           $reply->NSElement($prop, $tag, $property_value );
         }
diff --git a/inc/Principal.php b/inc/Principal.php
index fabc328b..dbbce240 100644
--- a/inc/Principal.php
+++ b/inc/Principal.php
@@ -194,7 +194,7 @@ class Principal {
     }
 
     $sql = 'SELECT *, ';
-    if ( isset($session->principal_id) ) {
+    if ( isset($session->principal_id) && $session->principal_id !== false ) {
       $sql .= 'pprivs(:session_principal::int8,principal_id,:scan_depth::int) AS privileges ';
       $params = array( ':session_principal' => $session->principal_id, ':scan_depth' => $c->permission_scan_depth );
     }
diff --git a/inc/RRule-v2.php b/inc/RRule-v2.php
index 6e8647cd..1b837474 100644
--- a/inc/RRule-v2.php
+++ b/inc/RRule-v2.php
@@ -115,20 +115,24 @@ class Rfc5545Duration {
    */
   function asSeconds() {
     if ( !isset($this->epoch_seconds) ) {
-      if ( preg_match('{^(-?)P(\d+W)|((\d+D)?(T(\d+H)?(\d+M)?(\d+S)?)?)$}i', $this->as_text, $matches) ) {
-        if ( isset($matches[2]) ) $this->days = ($matches[2] * 7);
+      if ( preg_match('{^(-?)P(\d+W)|(?:(\d+)D?(?:T(\d+)H?(\d+)M?(\d+)S?)?)$}i', $this->as_text, $matches) ) {
+        // @printf("%s - %s - %s - %s - %s - %s\n", $matches[1], $matches[2], $matches[3], $matches[4], $matches[5], $matches[6]);
+        $this->secs = 0;
+        if ( !empty($matches[2]) ) {
+          $this->days = (intval($matches[2]) * 7);
+        }
         else {
-          if ( isset($matches[4]) ) $this->days = $matches[4];
-          $this->secs = 0;
-          if ( isset($matches[6]) ) $this->secs += $matches[6] * 3600;
-          if ( isset($matches[7]) ) $this->days += $matches[7] * 60;
-          if ( isset($matches[8]) ) $this->days += $matches[8];
+          if ( !empty($matches[3]) ) $this->days = intval($matches[3]);
+          if ( !empty($matches[4]) ) $this->secs += intval($matches[4]) * 3600;
+          if ( !empty($matches[5]) ) $this->secs += intval($matches[5]) * 60;
+          if ( !empty($matches[6]) ) $this->secs += intval($matches[6]);
         }
         if ( $matches[1] == '-' ) {
           $this->days *= -1;
           $this->secs *= -1;
         }
         $this->epoch_seconds = ($this->days * 86400) + $this->secs;
+        // printf("Duration: %d days & %d seconds (%d epoch seconds)\n", $this->days, $this->secs, $this->epoch_seconds);
       }
       else {
         throw new Exception('Invalid epoch: "'+$this->as_text+"'");
diff --git a/inc/caldav-PUT-functions.php b/inc/caldav-PUT-functions.php
index db9e376c..09f7c5c4 100644
--- a/inc/caldav-PUT-functions.php
+++ b/inc/caldav-PUT-functions.php
@@ -782,6 +782,22 @@ function import_calendar_collection( $ics_content, $user_no, $path, $caldav_cont
   $timezones = $calendar->GetComponents('VTIMEZONE',true);
   $components = $calendar->GetComponents('VTIMEZONE',false);
 
+  // Add a parameter to calendars on import so it will only load events 'after' @author karora
+  // date, or an RFC5545 duration format offset from the current date.
+  $after = null;
+  if ( isset($_GET['after']) ) {
+    $after = $_GET['after'];
+    if ( strtoupper(substr($after, 0, 1)) == 'P' || strtoupper(substr($after, 0, 1)) == '-P' ) {
+      $duration = new Rfc5545Duration($after);
+      $duration = $duration->asSeconds();
+      $after = time() - (abs($duration));
+    }
+    else {
+      $after = new RepeatRuleDateTime($after);
+      $after = $after->epoch();
+    }
+  }
+  
   $displayname = $calendar->GetPValue('X-WR-CALNAME');
   if ( !$appending && isset($displayname) ) {
     $sql = 'UPDATE collection SET dav_displayname = :displayname WHERE dav_name = :dav_name';
@@ -902,18 +918,46 @@ EOSQL;
     $dav_data_params[':dav_data'] = $icalendar;
     $dav_data_params[':caldav_type'] = $first->GetType();
     $dav_data_params[':session_user'] = $session->user_no;
-    if ( !$qry->QDo( ($inserting ? $dav_data_insert : $dav_data_update), $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;
-    }
 
     $dtstart = $first->GetPValue('DTSTART');
     $calitem_params[':dtstart'] = $dtstart;
     if ( (!isset($dtstart) || $dtstart == '') && $first->GetPValue('DUE') != '' ) {
       $dtstart = $first->GetPValue('DUE');
+      if ( isset($after) ) $dtstart_date = new RepeatRuleDateTime($first->GetProperty('DUE'));
+    }
+    else if ( isset($after) ) {
+      $dtstart_date = new RepeatRuleDateTime($first->GetProperty('DTSTART'));
+    }
+
+    $calitem_params[':rrule'] = $first->GetPValue('RRULE');
+
+    // Skip it if it's after our start date for this import.
+    if ( isset($after) && empty($calitem_params[':rrule']) && $dtstart_date->epoch() < $after ) continue;
+
+    // Do we actually need to do anything?
+    $inserting = true;
+    if ( isset($current_data[$dav_name]) ) {
+      if ( $icalendar == $current_data[$dav_name] ) {
+        if ( $after == null ) {
+          unset($current_data[$dav_name]);
+          continue;
+        }
+      }
+      $sync_change = 200;
+      unset($current_data[$dav_name]);
+      $inserting = false;
+    }
+    else
+      $sync_change = 201;
+
+    // Write to the caldav_data table
+    if ( !$qry->QDo( ($inserting ? $dav_data_insert : $dav_data_update), $dav_data_params) )
+      rollback_on_error( $caldav_context, $user_no, $path );
+
+    // Get the dav_id for this row
+    $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;
     }
 
     $dtend = $first->GetPValue('DTEND');
@@ -1006,7 +1050,6 @@ EOSQL;
     $calitem_params[':location'] = $first->GetPValue('LOCATION');
     $calitem_params[':transp'] = $first->GetPValue('TRANSP');
     $calitem_params[':description'] = $first->GetPValue('DESCRIPTION');
-    $calitem_params[':rrule'] = $first->GetPValue('RRULE');
     $calitem_params[':url'] = $first->GetPValue('URL');
     $calitem_params[':priority'] = $first->GetPValue('PRIORITY');
     $calitem_params[':due'] = $first->GetPValue('DUE');
@@ -1019,6 +1062,7 @@ EOSQL;
       $calitem_params[':created'] = $created;
     }
 
+    // Write the calendar_item row for this entry
     if ( !$qry->QDo($sql,$calitem_params) ) rollback_on_error( $caldav_context, $user_no, $path);
 
     write_alarms($dav_id, $first);
diff --git a/po/de.po b/po/de.po
index 8874bd09..deee92f0 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 # fmms , 2011.
@@ -16,19 +16,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: German (http://www.transifex.net/projects/p/davical/language/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"
 
@@ -78,29 +76,48 @@ msgstr "- aktualisiere Gruppen: %s"
 msgid "- updating user records : %s"
 msgstr "- aktualisiere Benutzereinträge: %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
-msgstr "WARNUNG: Vor dem Einfügen der ICS-Kalenderdatei werden alle Termine in diesem Pfad gelöscht"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
+msgstr ""
+"WARNUNG: Vor dem Einfügen der ICS-Kalenderdatei werden alle Termine in diesem Pfad gelöscht"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
Hilfe
\n
Besuchen Sie die DAViCal-Homepage oder schauen Sie \nin das DAViCal-Wiki um Hilfe zu erhalten.
\n
Falls Sie dort nicht die gesuchten Informationen finden, können Sie uns über IRC im\nChannel #davical auf irc.oftc.net besuchen\noder Ihre Frage an die DAViCal-Users-Mailingliste schicken.
\n
Das Archiv der Mailingliste\nkönnte ebenfalls interessant sein.
"
+msgstr ""
+"
Hilfe
\n"
+"
Besuchen Sie die DAViCal-Homepage oder "
+"schauen Sie \n"
+"in das DAViCal-Wiki um Hilfe zu erhalten."
+"
\n"
+"
Falls Sie dort nicht die gesuchten Informationen finden, können Sie uns über IRC im\n"
+"Channel #davical auf irc.oftc.net "
+"besuchen\n"
+"oder Ihre Frage an die DAViCal-Users-Mailingliste schicken.
\n"
+"
Das Archiv der Mailingliste\n"
+"könnte ebenfalls interessant sein.
"
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Bitte anmelden
Um auf %s zuzugreifen, müssen Sie sich mit demBenutzernamen und dem Passwort anmelden, die ihnen zugeteilt wurden.
Um einen Zugang zu beantragen, schreiben Sie eine E-Mail an %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Bitte anmelden
Um auf %s zuzugreifen, müssen Sie sich mit demBenutzernamen und dem Passwort "
+"anmelden, die ihnen zugeteilt wurden.
Um einen Zugang zu beantragen, schreiben Sie eine E-Mail "
+"an %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Eine DAViCal-Prinzipalen-Sammlung darf nur andere Sammlungen enthalten"
@@ -152,8 +169,7 @@ msgstr "Sämtliche Daten der Sammlung werden unwiderruflich gelöscht."
 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."
+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"
@@ -162,8 +178,7 @@ msgstr "Alle Rechte"
 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"
+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"
@@ -254,9 +269,7 @@ msgstr "Sammlungs-ID"
 msgid "Collection deleted"
 msgstr "Sammlung gelöscht"
 
-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 "Sammlungen können nicht gleichzeitig CalDAV-Kalender und -Adressbuch sein"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -328,8 +341,7 @@ msgstr "aktuelle DAViCal-Version"
 msgid "DAV Path"
 msgstr "DAV-Pfad"
 
-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 darf nur auf einen neuen Wert gesetzt, nicht aber gelöscht werden."
 
 msgid "DAViCal CalDAV Server"
@@ -428,8 +440,7 @@ msgstr "Lösche Prinzipalen:"
 msgid "Deleting Ticket:"
 msgstr "Lösche Ticket:"
 
-msgid ""
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
+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"
@@ -486,10 +497,10 @@ msgstr "Benutzereintrag bearbeiten"
 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."
-msgstr "Geben Sie Ihren Benutzernamen ein (falls bekannt) und klicken Sie hier, um ein temporäres Passwort per E-Mail zu erhalten."
+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."
 
 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."
@@ -705,9 +716,7 @@ msgstr "Abmelden"
 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."
+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"
@@ -796,14 +805,11 @@ msgstr "PHP benutzt nicht den Apache Filter-Modus"
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/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"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -897,8 +903,7 @@ msgstr "Verfügbarkeitsinformationen lesen"
 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"
@@ -931,8 +936,7 @@ msgstr "Feature beantragen"
 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"
 
@@ -990,14 +994,10 @@ msgstr "Terminverarbeitung: Senden..."
 msgid "Send free/busy enquiries"
 msgstr "Verfügbarkeitsanfrage senden"
 
-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 "Einladungen als Organisator vom Besitzer dieser Terminausgangsbox verschicken."
 
-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 "Einladungsantworten als Teilnehmer vom Besitzer dieser Terminausgangsbox versenden."
 
 msgid "Set free/busy privileges"
@@ -1010,8 +1010,7 @@ msgid "Set read+write privileges"
 msgstr "Schreib-/Leserechte setzen"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1041,13 +1040,16 @@ msgstr "Einige Eigenschaften konnten nicht gesetzt werden."
 msgid "Source resource does not exist."
 msgstr "Quellressource existiert nicht."
 
-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 "Spezialsammlungen dürfen keine Kalender oder andere Spezialsammlungen enthalten."
 
 msgid "Specific Privileges"
 msgstr "Sonderrechte"
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "Status"
 
@@ -1085,8 +1087,7 @@ msgstr "Die URI der BIND-Anfrage MUSS eine Sammlung bezeichnen."
 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."
+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"
@@ -1095,8 +1096,7 @@ msgstr "Die DAViCal-Startseite"
 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."
@@ -1112,13 +1112,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Der Kalenderpfad enthält ungültige Zeichen."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+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."
@@ -1127,8 +1128,7 @@ msgstr "Der Name für die Sammlung darf nicht leer sein."
 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."
+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."
@@ -1138,8 +1138,7 @@ msgstr "Das Feld für die E-Mail-Adresse sollte auf keinen Fall leer bleiben."
 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."
+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."
@@ -1183,33 +1182,57 @@ msgid "There was an error writing to the database."
 msgstr "Beim Schreiben in die Datenbank ist ein Fehler aufgetreten."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Diese Funktion erledigt die folgenden Aufgaben:\n
    \n  
  • überprüfen der gültigen Gruppen im LDAP-Verzeichnis
    • \n  
  • überprüfen der Gruppen in DAViCal
    • \n
 danach\n
    \n  
  • falls eine Gruppe in DAViCal vorhanden ist, nicht aber im LDAP, diese in DAViCal als inaktiv markieren
    • \n  
  • falls eine Gruppe im LDAP vorhanden ist, nicht aber in DAViCal, diese in DAViCal anlegen
    • \n  
  • falls eine Gruppe im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren
    • \n
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Diese Funktion erledigt die folgenden Aufgaben:\n"
+"
    \n"
+"  
  • überprüfen der gültigen Gruppen im LDAP-Verzeichnis
    • \n"
+"  
  • überprüfen der Gruppen in DAViCal
    • \n"
+"
 danach\n"
+"
    \n"
+"  
  • falls eine Gruppe in DAViCal vorhanden ist, nicht aber im LDAP, diese in DAViCal als inaktiv "
+"markieren
    • \n"
+"  
  • falls eine Gruppe im LDAP vorhanden ist, nicht aber in DAViCal, diese in DAViCal anlegen
    • \n"
+"  
  • falls eine Gruppe im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren\n"
+"
"
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Diese Funktion erledigt die folgenden Aufgaben:\n
    \n  
  • überprüfen der gültigen Benutzer im LDAP-Verzeichnis
    • \n  
  • überprüfen der Benutzer in DAViCal
    • \n
 danach\n
    \n  
  • falls ein Benutzer in DAViCal vorhanden ist, nicht aber im LDAP, diesen in DAViCal als inaktiv markieren
    • \n  
  • falls ein Benutzer im LDAP vorhanden ist, nicht aber in DAViCal, diesen in DAViCal anlegen
    • \n  
  • falls ein Benutzer im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal aktualisieren
    • \n
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Diese Funktion erledigt die folgenden Aufgaben:\n"
+"
    \n"
+"  
  • überprüfen der gültigen Benutzer im LDAP-Verzeichnis
    • \n"
+"  
  • überprüfen der Benutzer in DAViCal
    • \n"
+"
 danach\n"
+"
    \n"
+"  
  • falls ein Benutzer in DAViCal vorhanden ist, nicht aber im LDAP, diesen in DAViCal als inaktiv "
+"markieren
    • \n"
+"  
  • falls ein Benutzer im LDAP vorhanden ist, nicht aber in DAViCal, diesen in DAViCal anlegen
    • \n"
+"  
  • falls ein Benutzer im LDAP und DAViCal vorhanden ist, die Informationen in DAViCal "
+"aktualisieren
    • \n"
+"
"
 
 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 "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."
+"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."
 
 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."
+"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"
@@ -1318,9 +1341,12 @@ msgid "Want: %s, Currently: %s"
 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."
-msgstr "Warnung: Es sind keine aktiven Admin-Benutzer. Sie sollten dies vor dem Abmelden beheben. \n\nZiehen sie die Option $c->do_not_sync_from_ldap in Erwägung."
+"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"
+"Ziehen sie die Option $c->do_not_sync_from_ldap in Erwägung."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Sobald das E-Mail-Konto des Benutzers bestätigt wurde."
@@ -1377,35 +1403,31 @@ msgstr "Die Eigenschaft \"calendar-timezone\" ist nur für einen Kalender gülti
 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"
+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"
 
 #, 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: 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"
+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"
-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 : 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"
 
 #, 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"
+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
@@ -1416,8 +1438,7 @@ msgstr "drivers_pwauth_pam: Kann Datei %s nicht finden"
 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"
 
@@ -1442,7 +1463,5 @@ msgstr ""
 msgid "unauthenticated"
 msgstr "Nicht angemeldet"
 
-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 "Melden Sie sich mit dem Ihnen zugeteilten Benutzernamen und Passwort an."
diff --git a/po/es_AR.po b/po/es_AR.po
index b8df86d6..0d6f2a39 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 msgid ""
@@ -12,19 +12,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: LANGUAGE \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 ""
 
@@ -74,29 +72,32 @@ msgstr ""
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr ""
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
 msgstr ""
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Por favor, iniciar sesión
Para acceder al %s debe conectarse con el nombre de usuario y contraseña que le han sido asignado.
Si desea solicitar el acceso, por favor, e-mail %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Por favor, iniciar sesión
Para acceder al %s debe conectarse con el nombre de usuario y "
+"contraseña que le han sido asignado.
Si desea solicitar el acceso, por favor, e-mail %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -148,8 +149,7 @@ msgstr ""
 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"
@@ -158,8 +158,7 @@ msgstr ""
 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"
@@ -250,9 +249,7 @@ msgstr ""
 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"
@@ -324,8 +321,7 @@ msgstr ""
 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"
@@ -424,8 +420,7 @@ msgstr ""
 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"
@@ -482,9 +477,7 @@ msgstr "Mostrar el registro de éste usuario"
 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."
@@ -701,9 +694,7 @@ msgstr "Desconectarse"
 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"
@@ -792,14 +783,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -893,8 +880,7 @@ msgstr ""
 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"
@@ -927,8 +913,7 @@ msgstr ""
 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"
 
@@ -986,14 +971,10 @@ msgstr ""
 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"
@@ -1006,8 +987,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1037,13 +1017,16 @@ msgstr ""
 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"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1081,8 +1064,7 @@ msgstr ""
 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"
@@ -1091,8 +1073,7 @@ msgstr ""
 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."
@@ -1108,13 +1089,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1123,8 +1105,7 @@ msgstr ""
 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."
@@ -1134,8 +1115,7 @@ msgstr ""
 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."
+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."
@@ -1179,32 +1159,27 @@ msgid "There was an error writing to the database."
 msgstr "Hubo un error al grabar en la base de datos."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1314,8 +1289,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1373,35 +1348,29 @@ msgstr ""
 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"
 msgstr ""
 
 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
@@ -1412,8 +1381,7 @@ msgstr ""
 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 ""
 
@@ -1438,7 +1406,5 @@ 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 "Para conectarse debe utilizar el nombre de usuario y contraseña que le ha sido asignado."
diff --git a/po/es_ES.po b/po/es_ES.po
index d502e361..7471ec7f 100644
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 # Jorge López , 2011, 2012.
@@ -14,19 +14,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Spanish (Spain) (http://www.transifex.net/projects/p/davical/language/es_ES/)\n"
+"Language: 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
+#. 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"
 
@@ -76,29 +74,44 @@ msgstr "- actualizando los grupos:  %s"
 msgid "- updating user records : %s"
 msgstr "- actualizando los registros de usuario:  %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
-msgstr "ADVERTENCIA:  todos los eventos en este contenedor serán eliminados antes de insertar el archivo ics"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
+msgstr ""
+"ADVERTENCIA:  todos los eventos en este contenedor serán eliminados antes de insertar el archivo "
+"ics"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
Ayuda\n
Visita la Página Principal de DAViCal para ayuda inicial, o consultael Wiki de DAViCal.
Si no encuentras la respuesta a tus dudas, visítanos en IRC enel canal #davical en irc.oftc.net,\no envía tus preguntas a la lista de correo de Usuarios de DAViCal.
\n
El archivo de la lista de correotambien te será útil."
+msgstr ""
+"
Ayuda\n"
+"
Visita la Página Principal de DAViCal para "
+"ayuda inicial, o consultael Wiki de DAViCal.
Si no encuentras la respuesta a tus dudas, visítanos en IRC enel canal #davical en irc.oftc.net,\n"
+"o envía tus preguntas a la lista de correo de Usuarios de DAViCal.
\n"
+"
El archivo de la lista de correotambien te será útil."
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Por favor, autentíquese
Para acceder a %s debe identificarse con su nombre de usuario y su clave de acceso.
Escriba a %s si desea solicitar acceso."
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Por favor, autentíquese
Para acceder a %s debe identificarse con su nombre de usuario y su "
+"clave de acceso.
Escriba a %s si desea solicitar acceso."
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Una colección de un Principal de DAViCal solo puede contener otras colecciones"
@@ -148,10 +161,11 @@ 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"
+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."
+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"
@@ -160,8 +174,7 @@ 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"
+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"
@@ -252,9 +265,7 @@ 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"
+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"
@@ -326,8 +337,7 @@ 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."
+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"
@@ -426,8 +436,7 @@ msgstr "Eliminando Principal:"
 msgid "Deleting Ticket:"
 msgstr "Eliminando ticket:"
 
-msgid ""
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
+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"
@@ -484,10 +493,9 @@ 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 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."
@@ -703,10 +711,10 @@ 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 "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"
@@ -794,15 +802,14 @@ msgstr "PHP sin usar el modo filtro de Apache"
 msgid "PHP5 curl support is required for external binds"
 msgstr "El soporte cURL para PHP5 se necesita para binds externos"
 
-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/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 "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"
@@ -895,8 +902,7 @@ 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."
+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"
@@ -929,8 +935,7 @@ 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...
+#. Translators a thing which might be booked: a room, a carpark, a projector...
 msgid "Resource"
 msgstr "Recurso"
 
@@ -988,15 +993,15 @@ 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 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 "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"
@@ -1008,9 +1013,10 @@ 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/'"
+"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"
@@ -1039,13 +1045,16 @@ 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."
+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."
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "Estado"
 
@@ -1083,8 +1092,7 @@ 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."
+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"
@@ -1093,9 +1101,9 @@ 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 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"
@@ -1110,14 +1118,16 @@ 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-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
+"collection."
 msgstr ""
 
-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 calendar-query report may not be run against that URL."
+msgstr ""
+
+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."
@@ -1125,8 +1135,7 @@ 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."
+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."
@@ -1134,11 +1143,13 @@ 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"
+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 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"
@@ -1181,33 +1192,40 @@ 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: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Esta operación hace lo siguiente: 
     
  • comprobar los grupos válidos en LDAP
    •  
  • comprobar los grupos en DAViCal
    •  
, tras esto: 
     
  • si un grupo está en DAViCal pero no en LDAP, marcarlo como inactivo
    •  
  • si un grupo está en LDAP pero no en DAViCal, crearlo en DAViCal
    •  
  • si está en ambos, actualizar la información en DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Esta operación hace lo siguiente: 
     
  • comprobar los grupos válidos en LDAP
    •  
  • comprobar los "
+"grupos en DAViCal
    •  
, tras esto: 
     
  • si un grupo está en DAViCal pero no en LDAP, "
+"marcarlo como inactivo
    •  
  • si un grupo está en LDAP pero no en DAViCal, crearlo en DAViCal
    •  "
+"
  • si está en ambos, actualizar la información en DAViCal
    •  
"
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Esta operación hace lo siguiente: 
     
  • comprobar los usuarios válidos en LDAP
    •  
  • comprobar los usuarios en DAViCal
    •  
, tras esto: 
     
  • si un usuario está en DAViCal pero no en LDAP, marcarlo como inactivo
    •  
  • si un usuario está en LDAP pero no en DAViCal, crearlo en DAViCal
    •  
  • si está en ambos, actualizar la información en DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Esta operación hace lo siguiente: 
     
  • comprobar los usuarios válidos en LDAP
    •  
  • comprobar "
+"los usuarios en DAViCal
    •  
, tras esto: 
     
  • si un usuario está en DAViCal pero no en LDAP, "
+"marcarlo como inactivo
    •  
  • si un usuario está en LDAP pero no en DAViCal, crearlo en DAViCal
    •  "
+"
  • si está en ambos, actualizar la información en DAViCal
    •  
"
 
 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."
+"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."
+"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"
@@ -1316,9 +1334,11 @@ 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."
+"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."
@@ -1375,36 +1395,34 @@ msgstr "La propiedad calendar-timezone sólo es válida en calendarios."
 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_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"
+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"
+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."
+"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"
+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"
@@ -1414,8 +1432,7 @@ msgstr "drivers_pwauth_pam : no se encontró el fichero %s"
 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
+#. 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"
 
@@ -1440,7 +1457,5 @@ msgstr "el remitente debe ser organizador o asistente al evento"
 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 "deberá autenticarse con el nombre de usuario y contraseña que se le comunicaron."
diff --git a/po/es_MX.po b/po/es_MX.po
index 7dfc1cb6..80ad15c9 100644
--- a/po/es_MX.po
+++ b/po/es_MX.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 # pr3d4t0r , 2011.
@@ -13,19 +13,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.net/projects/p/davical/language/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"
 
@@ -75,29 +73,44 @@ msgstr "- actualizando los grupos:  %s"
 msgid "- updating user records : %s"
 msgstr "- actualizando los registros de usuario:  %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
-msgstr "ADVERTENCIA:  todos los eventos en este repositorio serán eliminados antes de insertar el archivo ics"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
+msgstr ""
+"ADVERTENCIA:  todos los eventos en este repositorio serán eliminados antes de insertar el archivo "
+"ics"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
Ayuda\n
Visita la Página Principal de DAViCal para ayuda inicial, o consultael Wiki de DAViCal.
Si no encuentras la respuesta a tus dudas, visítanos en IRC enel canal #davical en irc.oftc.net,\no envía tus preguntas a la lista de correo de Usuarios de DAViCal.
\n
El archivo de la lista de correotambien te será útil."
+msgstr ""
+"
Ayuda\n"
+"
Visita la Página Principal de DAViCal para "
+"ayuda inicial, o consultael Wiki de DAViCal.
Si no encuentras la respuesta a tus dudas, visítanos en IRC enel canal #davical en irc.oftc.net,\n"
+"o envía tus preguntas a la lista de correo de Usuarios de DAViCal.
\n"
+"
El archivo de la lista de correotambien te será útil."
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Por Favor Entra Identifícate
Debes para entrar a %s debes identificarte con tu nombre de usuario y tu clave de acceso.
Notifica a %s si deseas solicitar acceso."
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Por Favor Entra Identifícate
Debes para entrar a %s debes identificarte con tu nombre de "
+"usuario y tu clave de acceso.
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"
@@ -149,8 +162,7 @@ msgstr "Todos los datos de esta colección serán eliminados."
 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 "Todos los calendarios y eventos de este principal serán eliminados permanentemente."
 
 msgid "All privileges"
@@ -159,8 +171,7 @@ msgstr "Todos los privilegios"
 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"
+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"
@@ -251,9 +262,7 @@ msgstr "ID de Colección"
 msgid "Collection deleted"
 msgstr "Colección eliminada"
 
-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 "Las colecciones no pueden ser calendarios CalDAV y agendas de teléfono CardDAV al mismo tiempo"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -325,8 +334,7 @@ msgstr "Versión actual de DAViCal "
 msgid "DAV Path"
 msgstr "Camino 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 solo puede tener un valor nuevo, y no puede ser eliminado."
 
 msgid "DAViCal CalDAV Server"
@@ -425,8 +433,7 @@ msgstr "Eliminando Principal:"
 msgid "Deleting Ticket:"
 msgstr "Eliminando Boleto:"
 
-msgid ""
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
+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"
@@ -483,10 +490,10 @@ msgstr "Editar este registro de 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 clave de acceso temporal."
+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."
 
 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."
@@ -702,10 +709,10 @@ msgstr "Salida"
 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."
-msgstr "La mayoría de las funciones de DAViCal funcionarán, pero es muy recomendable actualizar a PHP 5.2 o mas reciente."
+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."
 
 msgid "Name"
 msgstr "Nombre"
@@ -793,14 +800,12 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 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/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"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -894,8 +899,7 @@ msgstr "Leer 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."
+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"
@@ -928,8 +932,7 @@ msgstr "Solicitar una Prestación"
 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"
 
@@ -987,14 +990,11 @@ msgstr "Itinerario:  Enviando"
 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."
-msgstr "Enviar invitaciones de itinerario como el organizador desde el dueño de  este buzón de itinerario."
+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."
 
-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 "Enviando respuestas como participante desde el dueño de este buzón de salida para itinerarios."
 
 msgid "Set free/busy privileges"
@@ -1007,8 +1007,7 @@ msgid "Set read+write privileges"
 msgstr "Activar privilegios de lectura+escritura"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1038,13 +1037,16 @@ msgstr "No fue posible configurar algunas propiedades."
 msgid "Source resource does not exist."
 msgstr "El recurso fuente no existe."
 
-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 "Las colecciones especiales no pueden contener un calendario u otra colección especial."
 
 msgid "Specific Privileges"
 msgstr "Privilegios Específicos"
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "Estado"
 
@@ -1082,8 +1084,7 @@ msgstr "El URI de la Solicitud BIND DEBE identificar una colección."
 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."
+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"
@@ -1092,9 +1093,10 @@ msgstr "La Página Principal de DAViCal"
 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"
-msgstr "El reporte de solicitud-lista-de-direcciones debe ejecutarse con respecto a una colección de lista de direcciones."
+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."
 
 msgid "The application failed to understand that request."
 msgstr ""
@@ -1109,13 +1111,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "La trayectoria del calendario contiene caracteres ilegales."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+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."
@@ -1124,8 +1127,7 @@ 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."
+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."
@@ -1135,9 +1137,9 @@ msgstr "La dirección de correo electrónico no deberá estar en blanco."
 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 "Ë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."
@@ -1180,32 +1182,39 @@ 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: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Esta operación hace lo sigiente: 
  • verificar los grupos en el directorio LDAP
  • checar los grupos en DAViCal
 luego 
  • si un grupo existe en DAViCal mas no en LDAP, asignarlo como inactivo en DAViCal
    •  
  • si un grupo está presente en LDAP pero no ed DAViCal, crear el grupo en DAViCal
    •  
  • si un grupo está presente en ambos LDAP y DAViCal, actualizar la información en DAViCal
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Esta operación hace lo sigiente: 
  • verificar los grupos en el directorio LDAP
  • checar los "
+"grupos en DAViCal
 luego 
  • si un grupo existe en DAViCal mas no en LDAP, asignarlo como "
+"inactivo en DAViCal
    •  
  • si un grupo está presente en LDAP pero no ed DAViCal, crear el grupo en "
+"DAViCal
    •  
  • si un grupo está presente en ambos LDAP y DAViCal, actualizar la información en "
+"DAViCal
"
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Esta operación hace lo siguiente:  
  • verificar que los usuarios son válidos en el directorio LDAP
  • checar los usuarios en DAViCal
 luego 
  • si un usuario está presente en DAViCal pero no en LDAP, assignarlo como inactivo en DAViCal
    •  
  • si un usuario está presente en LDAP mas no en DAViCal, crear al usuario en DAViCal
  • si un usuario está presente en LDAP y en DAViCal, actualizar la información en DAViCal
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Esta operación hace lo siguiente:  
  • verificar que los usuarios son válidos en el directorio "
+"LDAP
  • checar los usuarios en DAViCal
 luego 
  • si un usuario está presente en "
+"DAViCal pero no en LDAP, assignarlo como inactivo en DAViCal
    •  
  • si un usuario está presente en "
+"LDAP mas no en DAViCal, crear al usuario en DAViCal
  • si un usuario está presente en LDAP y en "
+"DAViCal, actualizar la información en DAViCal
"
 
 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 valida el ambiente operativo necesario para que DAViCal funcione correctamente.  Sugestiones o parches para hacerla mas útil o efectiva serán graciosamente recibidas."
+"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 process will import each file in a directory named \"username.ics\" and"
-" create a user and calendar for each file to import."
+"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"
@@ -1315,9 +1324,11 @@ 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 administrativos activos!  Debe reparar esto antes de salirdel sistema.  Considere utilizar el parámetro $c->do_not_sync_from_ldap de configuración."
+"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."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Cuando la dirección de correo electrónico del usuario fue validada."
@@ -1374,35 +1385,32 @@ msgstr "calendar-timezone es una propiedad válida solamente para un calendario.
 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 "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"
+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"
-msgstr "drivers_ldap : Falló en establecer que LDAP utilice la versión 3 del protocol, TLS no es soportada"
+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"
 
 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 : Incapaz de atar a LDAP - verifique su configuración de bindDN y passDN, y que su servidor LDAP sea accesible"
+"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"
 
 #, 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"
 
-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 función ldap_connect no fue definida; cheque su módulo php_ldap"
 
 #, php-format
@@ -1413,8 +1421,7 @@ msgstr "drivers_pwauth_pam : Incapz de encontrar al archivo %s"
 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"
 
@@ -1439,7 +1446,5 @@ msgstr ""
 msgid "unauthenticated"
 msgstr "Desautenticado"
 
-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 "deberá identificarse con el nombre de usuario y clave de acceso que le fueron otorgados."
diff --git a/po/es_VE.po b/po/es_VE.po
index 4054031d..523cda8d 100644
--- a/po/es_VE.po
+++ b/po/es_VE.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 msgid ""
@@ -12,19 +12,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Spanish (Venezuela) (http://www.transifex.net/projects/p/davical/language/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 ""
 
@@ -74,28 +72,29 @@ msgstr "- actualizando grupos: %s"
 msgid "- updating user records : %s"
 msgstr "- actualizando registros de usuario: %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr ""
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
 msgstr ""
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -148,8 +147,7 @@ msgstr ""
 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"
@@ -158,8 +156,7 @@ msgstr "Todos los privilegios"
 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"
@@ -250,9 +247,7 @@ msgstr ""
 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"
@@ -324,8 +319,7 @@ msgstr ""
 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"
@@ -424,8 +418,7 @@ msgstr ""
 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"
@@ -482,9 +475,7 @@ msgstr ""
 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."
@@ -701,9 +692,7 @@ msgstr "Deconectar"
 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"
@@ -792,14 +781,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -893,8 +878,7 @@ msgstr ""
 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"
@@ -927,8 +911,7 @@ msgstr ""
 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 ""
 
@@ -986,14 +969,10 @@ msgstr ""
 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"
@@ -1006,8 +985,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1037,13 +1015,16 @@ msgstr ""
 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"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1081,8 +1062,7 @@ msgstr ""
 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"
@@ -1091,8 +1071,7 @@ msgstr ""
 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."
@@ -1108,13 +1087,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1123,8 +1103,7 @@ msgstr ""
 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."
@@ -1134,8 +1113,7 @@ msgstr ""
 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."
+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."
@@ -1179,32 +1157,27 @@ msgid "There was an error writing to the database."
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1314,8 +1287,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1373,35 +1346,29 @@ msgstr ""
 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"
 msgstr ""
 
 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
@@ -1412,8 +1379,7 @@ msgstr ""
 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"
 
@@ -1438,7 +1404,5 @@ msgstr ""
 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 --git a/po/et.po b/po/et.po
index 21dcda00..5de25582 100644
--- a/po/et.po
+++ b/po/et.po
@@ -1,7 +1,7 @@
 # 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 ""
@@ -11,19 +11,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Estonian (http://www.transifex.net/projects/p/davical/language/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 ""
 
@@ -73,28 +71,29 @@ msgstr ""
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr ""
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
 msgstr ""
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
 msgstr ""
 
 msgid "A DAViCal principal collection may only contain collections"
@@ -147,8 +146,7 @@ msgstr ""
 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"
@@ -157,8 +155,7 @@ msgstr ""
 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"
@@ -249,9 +246,7 @@ msgstr ""
 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"
@@ -323,8 +318,7 @@ msgstr ""
 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"
@@ -423,8 +417,7 @@ msgstr ""
 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"
@@ -481,9 +474,7 @@ msgstr ""
 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."
@@ -700,9 +691,7 @@ msgstr ""
 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"
@@ -791,14 +780,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -892,8 +877,7 @@ msgstr ""
 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"
@@ -926,8 +910,7 @@ msgstr ""
 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 ""
 
@@ -985,14 +968,10 @@ msgstr ""
 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"
@@ -1005,8 +984,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1036,13 +1014,16 @@ msgstr ""
 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"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1080,8 +1061,7 @@ msgstr ""
 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"
@@ -1090,8 +1070,7 @@ msgstr ""
 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."
@@ -1107,13 +1086,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1122,8 +1102,7 @@ msgstr ""
 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."
@@ -1133,8 +1112,7 @@ msgstr ""
 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."
+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."
@@ -1178,32 +1156,27 @@ msgid "There was an error writing to the database."
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1313,8 +1286,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1372,35 +1345,29 @@ msgstr ""
 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"
 msgstr ""
 
 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
@@ -1411,8 +1378,7 @@ msgstr ""
 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 ""
 
@@ -1437,7 +1403,5 @@ 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 --git a/po/fr.po b/po/fr.po
index 4873d5cb..7234a540 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 #   , 2011.
@@ -15,19 +15,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: French (http://www.transifex.net/projects/p/davical/language/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"
 
@@ -77,29 +75,46 @@ msgstr "- mise à jour des groupes : %s"
 msgid "- updating user records : %s"
 msgstr "- mise à jour des enregistrements de l'utilisateur : %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
-msgstr "Attention : tous les événements de ce chemin seront supprimés avant l'insertion de tous ceux du fichier ics"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
+msgstr ""
+"Attention : tous les événements de ce chemin seront supprimés avant l'insertion de tous ceux du "
+"fichier ics"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
Aide
\n
Pour obtenir de l'aide, vous devez commencer par aller voir sur le site DAViCal Home Page (en anglais) ou sur le Wiki DAViCal (presque complètement traduit en français).
\n
Si vous n'y trouvez pas ce que vous cherchez, prenez contact avec nous en anglais par IRC sur le canal #davical du serveur irc.oftc.net,\nou envoyez une question en anglais sur DAViCal Users mailing list.
\n
Les archives  peuvent également vous être utiles.
"
+msgstr ""
+"
Aide
\n"
+"
Pour obtenir de l'aide, vous devez commencer par aller voir sur le site DAViCal Home Page (en anglais) ou sur le Wiki DAViCal (presque complètement traduit en français).
\n"
+"
Si vous n'y trouvez pas ce que vous cherchez, prenez contact avec nous en anglais par IRC sur le canal #davical du serveur irc.oftc.net,\n"
+"ou envoyez une question en anglais sur DAViCal Users mailing list.
\n"
+"
Les archives  peuvent également vous être utiles.
"
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Veuillez vous connecter
Pour accéder à %s vous devez vous connecter avec le nom d'utilisateur et le mot de passe qui vous ont été fournis.
Si vous voulez demander un accès, envoyez un courriel à %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Veuillez vous connecter
Pour accéder à %s vous devez vous connecter avec le nom "
+"d'utilisateur et le mot de passe qui vous ont été fournis.
Si vous voulez demander un accès, "
+"envoyez un courriel à %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Un compte collection DAViCal ne peut contenir que des collections"
@@ -149,10 +164,10 @@ msgstr "Toutes les données de la collection 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"
+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."
+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"
@@ -161,9 +176,9 @@ msgstr "Tous les Privilèges"
 msgid "All requested changes were made."
 msgstr "Toutes les modifications demandées ont été effectuées"
 
-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 "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 "Mise à jour d'enregistrement de principal."
@@ -253,10 +268,9 @@ msgstr "Id. de la collection"
 msgid "Collection deleted"
 msgstr "Collection supprimée"
 
-msgid ""
-"Collections may not be both CalDAV calendars and CardDAV addressbooks at the"
-" same time"
-msgstr "Les collections ne peuvent pas être des agendas CalDAV et des carnets d'adresses CardDAV en même temps"
+msgid "Collections may not be both CalDAV calendars and CardDAV addressbooks at the same time"
+msgstr ""
+"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 les clients d'agendas pour DAViCal"
@@ -327,8 +341,7 @@ msgstr "Version DAViCal courante "
 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"
@@ -427,9 +440,9 @@ msgstr "Suppression du compte :"
 msgid "Deleting Ticket:"
 msgstr "Suppression du Ticket:"
 
-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 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)"
@@ -474,7 +487,9 @@ 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é."
 
 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 !"
+msgstr ""
+"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"
@@ -485,10 +500,10 @@ msgstr "Modifier l'enregistrement de cet utilisateur"
 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."
-msgstr "Indiquez un nom d'utilisateur, si vous le connaissez et cliquez ici pour recevoir un mot de passe temporaire."
+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."
 
 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"
@@ -704,10 +719,10 @@ msgstr "Déconnexion"
 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."
-msgstr "La plupart des fonctions DAViCal fonctionneront, mais une mise à jour vers PHP 5.2 ou ultérieure est fortement recommandé."
+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é."
 
 msgid "Name"
 msgstr "Nom"
@@ -795,14 +810,10 @@ msgstr "PHP n'utilise pas le mode Apache Filter"
 msgid "PHP5 curl support is required for external binds"
 msgstr "Le support de PHP5 curl est requis pour les liaisons externes"
 
-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/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"
+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"
@@ -896,8 +907,7 @@ msgstr "Lire les informations Libre/Occupé"
 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"
@@ -930,8 +940,7 @@ msgstr "Demander une amélioration"
 msgid "Request body is not valid XML data!"
 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"
 
@@ -989,15 +998,14 @@ 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."
-msgstr "Envoyer des invitations en tant qu'organisateur depuis cette boîte d’envoi planification (délégation)."
+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."
-msgstr "Envoyer des réponses aux invitations en tant que participant depuis cette boîte d’envoi planification (délégation)"
+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é"
@@ -1009,9 +1017,10 @@ msgid "Set read+write privileges"
 msgstr "Définir des privilèges de lecture + écriture"
 
 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/"
+"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"
@@ -1040,13 +1049,16 @@ msgstr "Des propriétés n'ont pu être établies."
 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 agenda ou une autre collection spéciale."
 
 msgid "Specific Privileges"
 msgstr "Privilèges spécifiques"
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "Statut"
 
@@ -1084,8 +1096,7 @@ 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"
@@ -1094,8 +1105,7 @@ msgstr "Page d'accueil DAViCal"
 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."
@@ -1111,13 +1121,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Le chemin vers l'agenda contient des caractères interdits."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+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."
@@ -1126,8 +1137,7 @@ msgstr "Le nom de la collection ne devrait pas être vide."
 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."
+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."
@@ -1137,8 +1147,7 @@ msgstr "L'adresse courriel ne devrait vraiment pas être vide."
 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."
+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."
@@ -1182,33 +1191,43 @@ msgid "There was an error writing to the database."
 msgstr "Il s'est produit une erreur lors de l'écriture des données."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Cette action: 
  • regarde les groupes valides dans l'annuaire LDAP
    •  
  • regarde les groupes dans DAViCal
 puis 
  • si un groupe est présent dans DAViCal et pas dans l'annuaire LDAP, le positionne inactif dans DAViCal
    •  
  • si un groupe est présent dans l'annuaire LDAP et pas dans DAViCal, crée le groupe dans DAViCal
    •  
  • si un groupe est présent dans l'annuaire LDAP et dans DAViCal, le met à jour dans DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Cette action: 
  • regarde les groupes valides dans l'annuaire LDAP
    •  
  • regarde les groupes "
+"dans DAViCal
 puis 
  • si un groupe est présent dans DAViCal et pas dans l'annuaire LDAP, "
+"le positionne inactif dans DAViCal
    •  
  • si un groupe est présent dans l'annuaire LDAP et pas dans "
+"DAViCal, crée le groupe dans DAViCal
    •  
  • si un groupe est présent dans l'annuaire LDAP et dans "
+"DAViCal, le met à jour dans DAViCal
    •  
"
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Cette action: 
  • regarde des comptes utilisateurs valides dans l'annuaire LDAP
    •  
  • regarde les comptes utilisateurs dans DAViCal
 puis 
  • si un compte est présent dans DAViCal et pas dans l'annuaire LDAP, le rend inactif dans DAViCal
    •  
  • si un compte est présent dans l'annuaire LDAP mais pas dans DAViCal, le crée dans DAViCal
    •  
  • si un compte est présent dans LDAP et dans DAViCal, le met à jour dans DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Cette action: 
  • regarde des comptes utilisateurs valides dans l'annuaire LDAP
    •  
  • regarde "
+"les comptes utilisateurs dans DAViCal
 puis 
  • si un compte est présent dans DAViCal et "
+"pas dans l'annuaire LDAP, le rend inactif dans DAViCal
    •  
  • si un compte est présent dans "
+"l'annuaire LDAP mais pas dans DAViCal, le crée dans DAViCal
    •  
  • si un compte est présent dans "
+"LDAP et dans DAViCal, le met à jour dans DAViCal
    •  
"
 
 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."
+"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 process will import each file in a directory named \"username.ics\" and"
-" create a user and calendar for each file to import."
-msgstr "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."
+"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 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é"
@@ -1317,9 +1336,11 @@ msgid "Want: %s, Currently: %s"
 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."
-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."
+"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."
@@ -1376,36 +1397,33 @@ msgstr "La propriété fuseau horaire n'est valide que pour un agenda."
 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é."
 
 #, 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 : 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"
+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"
-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 : 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."
 
 #, php-format
 msgid "drivers_ldap : Unable to connect to LDAP with port %s on host %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"
-msgstr "drivers_ldap : la fonction ldap_connect n'est pas définie, vérifiez que vous avez l'extension php_ldap."
+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."
 
 #, php-format
 msgid "drivers_pwauth_pam : Unable to find %s file"
@@ -1415,8 +1433,7 @@ msgstr "drivers_pwauth_pam : fichier %s introuvable"
 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"
 
@@ -1441,7 +1458,5 @@ msgstr ""
 msgid "unauthenticated"
 msgstr "non authentifié"
 
-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 "Vous devez vous connecter avec le nom d'utilisateur et le mot de passe qui vous ont été fournis."
diff --git a/po/hu.po b/po/hu.po
index d1e2fbc2..01894c85 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 msgid ""
@@ -12,19 +12,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: LANGUAGE \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 ""
 
@@ -74,29 +72,32 @@ msgstr ""
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr ""
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
 msgstr ""
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Lépjen be
'%s' - hozzáféréshez lépjen befelhasználónevével és jelszavával
Ha hozzáférést szeretne kapni, írjon ide: %s
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Lépjen be
'%s' - hozzáféréshez lépjen befelhasználónevével és jelszavával
Ha "
+"hozzáférést szeretne kapni, írjon ide: %s
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -148,8 +149,7 @@ msgstr ""
 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"
@@ -158,8 +158,7 @@ msgstr ""
 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"
@@ -250,9 +249,7 @@ msgstr ""
 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"
@@ -324,8 +321,7 @@ msgstr ""
 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"
@@ -424,8 +420,7 @@ msgstr ""
 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"
@@ -482,9 +477,7 @@ msgstr "Felhasználó szerkesztése"
 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 "Í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."
@@ -701,9 +694,7 @@ msgstr "Kilépés"
 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"
@@ -792,14 +783,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -893,8 +880,7 @@ msgstr ""
 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"
@@ -927,8 +913,7 @@ msgstr ""
 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"
 
@@ -986,14 +971,10 @@ msgstr ""
 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"
@@ -1006,8 +987,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1037,13 +1017,16 @@ msgstr ""
 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"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1081,8 +1064,7 @@ msgstr ""
 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"
@@ -1091,8 +1073,7 @@ msgstr ""
 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."
@@ -1108,13 +1089,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "A naptár elérési útja érvénytelen karaktert tartalmaz."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1123,8 +1105,7 @@ msgstr ""
 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."
@@ -1134,8 +1115,7 @@ msgstr ""
 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."
+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."
@@ -1179,32 +1159,27 @@ msgid "There was an error writing to the database."
 msgstr "Adatbázis-hiba történt íráskor."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1314,8 +1289,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1373,35 +1348,29 @@ msgstr ""
 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"
 msgstr ""
 
 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
@@ -1412,8 +1381,7 @@ msgstr ""
 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"
 
@@ -1438,7 +1406,5 @@ 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 --git a/po/it.po b/po/it.po
index a387d297..20cc247b 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 msgid ""
@@ -12,19 +12,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: LANGUAGE \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 ""
 
@@ -74,29 +72,33 @@ msgstr ""
 msgid "- updating user records : %s"
 msgstr ""
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
-msgstr "ATTENZIONE: tutti gli eventi in questo path saranno cancellati dall'inserimento del file ics"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
+msgstr ""
+"ATTENZIONE: tutti gli eventi in questo path saranno cancellati dall'inserimento del file ics"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
 msgstr ""
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Log On
Per accedere a %s devi autenticarti con le credenziali username e password che ti sono state assegnate.
Se desideri ottenere un accesso, invia una richiesta e-mail a %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Log On
Per accedere a %s devi autenticarti con le credenziali username e password che ti "
+"sono state assegnate.
Se desideri ottenere un accesso, invia una richiesta e-mail a %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -148,8 +150,7 @@ msgstr ""
 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"
@@ -158,8 +159,7 @@ msgstr ""
 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"
@@ -250,9 +250,7 @@ msgstr ""
 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"
@@ -324,8 +322,7 @@ msgstr ""
 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"
@@ -424,8 +421,7 @@ msgstr ""
 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"
@@ -482,9 +478,7 @@ msgstr "Modifica questo record utente"
 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."
@@ -701,9 +695,7 @@ msgstr "Esci"
 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"
@@ -792,14 +784,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -893,8 +881,7 @@ msgstr ""
 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"
@@ -927,8 +914,7 @@ msgstr ""
 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 ""
 
@@ -986,14 +972,10 @@ msgstr ""
 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"
@@ -1006,8 +988,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1037,13 +1018,16 @@ msgstr ""
 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"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1081,8 +1065,7 @@ msgstr ""
 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"
@@ -1091,8 +1074,7 @@ msgstr ""
 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."
@@ -1108,13 +1090,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1123,8 +1106,7 @@ msgstr ""
 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."
@@ -1134,8 +1116,7 @@ msgstr ""
 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."
+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."
@@ -1179,32 +1160,27 @@ msgid "There was an error writing to the database."
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1314,8 +1290,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1373,35 +1349,29 @@ msgstr ""
 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"
 msgstr ""
 
 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
@@ -1412,8 +1382,7 @@ msgstr ""
 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"
 
@@ -1438,7 +1407,5 @@ 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 --git a/po/ja.po b/po/ja.po
index 1fcb9d3b..3fa93cd1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 msgid ""
@@ -12,19 +12,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: LANGUAGE \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 ""
 
@@ -74,29 +72,32 @@ msgstr ""
 msgid "- updating user records : %s"
 msgstr "- ユーザー情報を更新中: %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr "警告：このパス内の全てのイベントは、icsファイルの挿入の前に削除されます。"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
 msgstr ""
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
ログオンして下さい
%sにアクセスするには、あなたに対して発行されたユーザー名およびパスワードでログオンして下さい。
アクセスをリクエストしたい場合は、%sにメールを送ってください。
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
ログオンして下さい
%sにアクセスするには、あなたに対して発行されたユーザー名およびパスワード"
+"でログオンして下さい。
アクセスをリクエストしたい場合は、%sにメールを送ってください。
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -148,8 +149,7 @@ msgstr "全てのコレクションデータが回復不能な方法で削除さ
 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"
@@ -158,8 +158,7 @@ msgstr ""
 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"
@@ -250,9 +249,7 @@ msgstr "コレクションID"
 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"
@@ -324,8 +321,7 @@ msgstr "現在のDAViCalバージョン"
 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"
@@ -424,8 +420,7 @@ msgstr "プリンシパルを削除中:"
 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"
@@ -482,10 +477,9 @@ msgstr "このユーザー情報を編集"
 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 "あなたのユーザー名とパスワードを入力してから、ここをクリックしてログインして下さい。"
@@ -701,9 +695,7 @@ msgstr "ログアウト"
 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"
@@ -792,14 +784,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -893,8 +881,7 @@ msgstr "予定有無情報を読み取る"
 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"
@@ -927,8 +914,7 @@ msgstr "機能をリクエストする"
 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 "資源"
 
@@ -986,14 +972,10 @@ msgstr ""
 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"
@@ -1006,8 +988,7 @@ msgid "Set read+write privileges"
 msgstr "読み書き権限を設定する"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1037,13 +1018,16 @@ msgstr "いくつかの特性は設定できませんでした。"
 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"
 msgstr "特定の権限"
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "状態"
 
@@ -1081,8 +1065,7 @@ msgstr ""
 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"
@@ -1091,8 +1074,7 @@ msgstr "DAViCal Home Page"
 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."
@@ -1108,13 +1090,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "カレンダーパスに不正な文字が使用されています。"
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1123,8 +1106,7 @@ msgstr ""
 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."
@@ -1134,9 +1116,9 @@ msgstr ""
 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 "そのファイル%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 ""
@@ -1179,32 +1161,27 @@ msgid "There was an error writing to the database."
 msgstr "データベースへの書き込み中にエラーがありました。"
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1314,8 +1291,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1373,35 +1350,31 @@ msgstr ""
 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"
-msgstr "drivers_ldap : LDAPにバインドできません - bindDNとpassDNの設定を確認し、LDAPサーバーに到達可能であること確認して下さい。"
+"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サーバーに到達可能であるこ"
+"と確認して下さい。"
 
 #, 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
@@ -1412,8 +1385,7 @@ msgstr ""
 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 "私を忘れないで"
 
@@ -1438,7 +1410,5 @@ 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 --git a/po/messages.pot b/po/messages.pot
index f6ec04f6..d4cc0f47 100644
--- a/po/messages.pot
+++ b/po/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-28 21:24+1200\n"
+"POT-Creation-Date: 2013-05-01 10:03+1200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: LANGUAGE \n"
@@ -1048,6 +1048,10 @@ msgstr ""
 msgid "Specific Privileges"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1116,6 +1120,9 @@ msgid ""
 "property of a calendar collection."
 msgstr ""
 
+msgid "The calendar-query report may not be run against that URL."
+msgstr ""
+
 msgid ""
 "The calendar-query report must be run against a calendar or a scheduling "
 "collection"
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 327ec066..88750cfd 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   , 2011.
 # Daniel  , 2011.
@@ -13,20 +13,19 @@ msgstr ""
 "POT-Creation-Date: 2012-05-28 21:24+1200\n"
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
-"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/davical/language/nb_NO/)\n"
+"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/davical/language/"
+"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"
 
@@ -76,29 +75,43 @@ msgstr "- oppdaterer grupper : %s"
 msgid "- updating user records : %s"
 msgstr "- oppdaterer brukerdata : %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr "ADVARSEL: alle hendelser i denne banen vil bli slettet ved innsetting av ics-filen"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
Hjelp
\n
For oppstartshjelp bør du besøke DAViCal-hjemmesiden eller ta en titt på DAViCal wikien.
\n
Kan du ikke finne svaret der, kom innom vår IRC-kanal #davical på irc.oftc.net-nettverket,\neller send spørsmålet til DAViCal epostlisten for brukere.
\n
Epostlistearkivene kan også være nyttige.
"
+msgstr ""
+"
Hjelp
\n"
+"
For oppstartshjelp bør du besøke DAViCal-"
+"hjemmesiden eller ta en titt på DAViCal "
+"wikien.
\n"
+"
Kan du ikke finne svaret der, kom innom vår IRC-kanal #davical på irc.oftc.net-nettverket,\n"
+"eller send spørsmålet til DAViCal epostlisten for brukere.
\n"
+"
Epostlistearkivene kan også være nyttige.
"
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Logg deg inn
For tilgang til %s skal du oppgi brukernavnet og passordet du fikk
Vil du be om tilgang, kontakt %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Logg deg inn
For tilgang til %s skal du oppgi brukernavnet og passordet du fikk
Vil "
+"du be om tilgang, kontakt %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "En DAViCal kontosamling kan bare inneholde samlinger"
@@ -150,8 +163,7 @@ msgstr "Alle data til samlingen vil ugjenopprettelig bli slettet"
 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."
+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"
@@ -160,8 +172,7 @@ msgstr "Alle privilegier"
 msgid "All requested changes were made."
 msgstr "Alle forespurte endringer ble utført"
 
-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 "Tillat ledig/opptatt-forespørsler rettet til eieren av denne innboksen"
 
 msgid "An \"Administrator\" user has full rights to the whole DAViCal System"
@@ -252,9 +263,7 @@ 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"
@@ -326,8 +335,7 @@ msgstr "Gjeldende DAViCal versjon"
 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"
@@ -426,8 +434,7 @@ msgstr "Sletter konto:"
 msgid "Deleting Ticket:"
 msgstr "Sletter tilgang"
 
-msgid ""
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
+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"
@@ -484,9 +491,7 @@ 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."
+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."
@@ -703,10 +708,10 @@ msgstr "Logg ut"
 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."
-msgstr "De fleste funksjoner av DAViCal vil fungere, men å oppgradere til PHP 5.2 eller nyere er anbefalt på det sterkeste."
+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."
 
 msgid "Name"
 msgstr "Navn"
@@ -794,14 +799,10 @@ msgstr "PHP er ikke satt til å bruke Apache Filter-modus."
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/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"
+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"
@@ -895,8 +896,7 @@ msgstr "Les Ledig/Opptatt informasjon"
 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"
@@ -929,8 +929,7 @@ msgstr "Be om funksjonalitet"
 msgid "Request body is not valid 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"
 
@@ -988,14 +987,10 @@ msgstr "Hendelse: Sender"
 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."
+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"
@@ -1008,9 +1003,10 @@ msgid "Set read+write privileges"
 msgstr "Sett lese+skriverettigheter"
 
 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/"
+"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"
@@ -1039,13 +1035,16 @@ msgstr "Noen egenskaper kunne ikke settes"
 msgid "Source resource does not exist."
 msgstr "Ressurskilde finnes ikke"
 
-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 "Spesielle samlinger kan ikke inneholde kalendre eller andre spesialsamlinger"
 
 msgid "Specific Privileges"
 msgstr "Spesifikke privilegier"
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "Status"
 
@@ -1083,8 +1082,7 @@ msgstr "BIND Request-URI MÅ identifisere en samling."
 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"
@@ -1093,8 +1091,7 @@ msgstr "DAViCal Hjemmeside"
 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."
@@ -1110,13 +1107,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Kalenderbanen inneholder ulovlige karakterer"
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+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."
@@ -1125,8 +1123,7 @@ msgstr "Samlingens navn kan ikke være tom"
 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."
@@ -1136,8 +1133,7 @@ msgstr "Epostadressen bør absolutt ikke være tom"
 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."
+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."
@@ -1181,33 +1177,41 @@ msgid "There was an error writing to the database."
 msgstr "Det oppsto en feil under skriving til databasen"
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Denne operasjonen gjør følgende: 
  • sjekker gyldige grupper i LDAP katalogen
    •  
  • sjekker grupper i DAViCal
 deretter 
  • hvis en gruppe finnes i DAViCal men ikke i LDAP setter som inaktiv i DAViCal
    •  
  • hvis en gruppe finnnes i LDAP men ikke i DAViCal oppretter en gruppe i DAViCal
    •  
  • hvis en gruppe finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Denne operasjonen gjør følgende: 
  • sjekker gyldige grupper i LDAP katalogen
    •  
  • sjekker "
+"grupper i DAViCal
 deretter 
  • hvis en gruppe finnes i DAViCal men ikke i LDAP setter "
+"som inaktiv i DAViCal
    •  
  • hvis en gruppe finnnes i LDAP men ikke i DAViCal oppretter en gruppe i "
+"DAViCal
    •  
  • hvis en gruppe finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal
    •  
"
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Denne operasjonen gjør følgende: 
  • sjekker gyldige gruppe i LDAP katalogen
    •  
  • sjekker brukere i DAViCal
 deretter 
  • hvis en bruker finnes i DAViCal men ikke i LDAP setter denne sim inaktiv i DAViCal
    •  
  • hvis en bruker finnes i LDAP men ikke i DAViCal oppretter brukeren i DAViCal
    •  
  • hvis brukeren finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Denne operasjonen gjør følgende: 
  • sjekker gyldige gruppe i LDAP katalogen
    •  
  • sjekker "
+"brukere i DAViCal
 deretter 
  • hvis en bruker finnes i DAViCal men ikke i LDAP setter "
+"denne sim inaktiv i DAViCal
    •  
  • hvis en bruker finnes i LDAP men ikke i DAViCal oppretter "
+"brukeren i DAViCal
    •  
  • hvis brukeren finnes i LDAP og DAViCal oppdaterer informasjonen i DAViCal 
"
 
 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."
+"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."
+"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-formatet for freebusy-adresser."
@@ -1316,9 +1320,11 @@ msgid "Want: %s, Currently: %s"
 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."
-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."
+"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."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Da brukerens epost ble kontrollert"
@@ -1375,35 +1381,31 @@ msgstr "kalender-tidssone egenskap er kun gyldig for en kalender"
 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"
+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"
+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"
+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"
-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 : 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"
 
 #, 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"
 
-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 : function ldap_connect ikke definert, sjekk din php_ldap modul"
 
 #, php-format
@@ -1414,8 +1416,7 @@ msgstr "drivers_pwauth_pam : Unable to find %s file"
 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"
 
@@ -1440,7 +1441,5 @@ msgstr ""
 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 --git a/po/nl.po b/po/nl.po
index 504e7491..509d6c13 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 #   , 2011, 2012.
@@ -13,19 +13,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/davical/language/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 "%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"
 
@@ -75,29 +73,44 @@ msgstr "- bijwerken van groepen: %s"
 msgid "- updating user records : %s"
 msgstr "- wijzigen van gebruikers: %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
-msgstr "OPGELET: Alle afspraken in deze map zullen verwijderd worden vooraleer het ics-bestand wordt ingevoegd"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
+msgstr ""
+"OPGELET: Alle afspraken in deze map zullen verwijderd worden vooraleer het ics-bestand wordt "
+"ingevoegd"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
Help
Voor de eerste hulp kunt u terecht op deDAViCal Home Page of neem een kijkje op de DAViCal Wiki . 
 Als u daar de antwoorden niet kan vinden, bezoek ons op IRC in het #davical kanaal op irc.oftc.net , of stuur een vraag aan de DAViCal Gebruikers mailing list.
Demailing list archieven kunnen ook nuttig zijn. 
"
+msgstr ""
+"
Help
Voor de eerste hulp kunt u terecht op deDAViCal Home Page of neem een kijkje op de DAViCal Wiki . 
 Als u daar de antwoorden niet kan vinden, bezoek ons op "
+"IRC in het "
+"#davical kanaal op irc.oftc.net , of "
+"stuur een vraag aan de DAViCal Gebruikers mailing list.
Demailing "
+"list archieven kunnen ook nuttig zijn. 
"
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Meld u alstublieft aan
Om toegang te krijgen tot de %s moet u zich aanmelden met de gebruikersnaam en het wachtwoord dat u heeft gekregen.
Om toegang aan te vragen, dient u %s te contacteren.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Meld u alstublieft aan
Om toegang te krijgen tot de %s moet u zich aanmelden met de "
+"gebruikersnaam en het wachtwoord dat u heeft gekregen.
Om toegang aan te vragen, dient u %s te "
+"contacteren.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Een DAViCal principaalcollectie kan alleen collecties bevatten"
@@ -149,8 +162,7 @@ msgstr "Alle gegevens van de collectie worden onherroepelijk verwijderd."
 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 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 "Alle agenda's en afspraken van de Principaal worden onherroepelijk verwijderd."
 
 msgid "All privileges"
@@ -159,8 +171,7 @@ 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"
@@ -251,9 +262,7 @@ msgstr "ID van de Collectie"
 msgid "Collection deleted"
 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"
@@ -325,9 +334,9 @@ msgstr "Huidige DAViCal versie"
 msgid "DAV Path"
 msgstr "DAV Pad"
 
-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 "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"
@@ -425,8 +434,7 @@ msgstr "Verwijderen Principaal:"
 msgid "Deleting Ticket:"
 msgstr "Verwijderen Ticket:"
 
-msgid ""
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
+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"
@@ -483,10 +491,10 @@ msgstr "Wijzig deze gebruiker"
 msgid "Email Address"
 msgstr "E-mailadres"
 
-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"
+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"
 
 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"
@@ -702,10 +710,9 @@ msgstr "Afmelden"
 msgid "Member deleted from this Group Principal"
 msgstr "Lid verwijderd van deze groep-Principaal"
 
-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 "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"
@@ -793,14 +800,10 @@ msgstr "PHP gebruikt geen 'Apache Filter'-modus"
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/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/vcard content against an "
-"addressbook 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"
@@ -894,8 +897,7 @@ msgstr "Bevraag de Vrij/Bezet-informatie"
 msgid "Read the content of a resource or collection"
 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"
@@ -928,8 +930,7 @@ msgstr "Vraag een feature aan"
 msgid "Request body is not valid XML data!"
 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"
 
@@ -987,14 +988,10 @@ msgstr "Planning: Verzenden"
 msgid "Send free/busy enquiries"
 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"
@@ -1007,9 +1004,10 @@ msgid "Set read+write privileges"
 msgstr "'Lees+Schrijf'-bevoegdheden instellen"
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
-msgstr "Configureer het pad waar uw ics zal worden bewaard, bijvoorbeeld 'kalender' zal worden verwezen als /caldav.php/gebruikersnaam/kalender/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
+msgstr ""
+"Configureer het pad waar uw ics zal worden bewaard, bijvoorbeeld 'kalender' zal worden verwezen als /"
+"caldav.php/gebruikersnaam/kalender/"
 
 msgid "Setup"
 msgstr "Configureren"
@@ -1038,13 +1036,16 @@ msgstr "Sommige eigenschappen konden niet ingesteld worden."
 msgid "Source resource does not exist."
 msgstr "Oorspronkelijke bron bestaat niet"
 
-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 "Bijzondere collecties kunnen geen Agenda of andere bijzondere collectie bevatten."
 
 msgid "Specific Privileges"
 msgstr "Specifieke bevoegdheden"
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "Status"
 
@@ -1082,8 +1083,7 @@ msgstr "De 'BIND request-URI' MOET een collectie identificeren"
 msgid "The BIND method is not allowed at that location."
 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"
@@ -1092,8 +1092,7 @@ msgstr "De DAViCal website"
 msgid "The access ticket will be deleted."
 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."
@@ -1109,13 +1108,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Het agenda-pad bevat niet-toegestane tekens."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+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."
@@ -1124,8 +1124,7 @@ msgstr "De naam van de collectie kan niet leeg gelaten worden"
 msgid "The destination collection does not exist"
 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."
@@ -1135,8 +1134,7 @@ msgstr "Het emailadres kan echt niet leeg gelaten worden"
 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."
+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."
@@ -1180,33 +1178,43 @@ 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: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Deze actie doet het volgende:
  • controleer op geldige groepen in de LDAP-directory
  • controleer op groepen in DAViCal
dan
  • als er een groep aanwezig is in DAViCal maar niet in LDAP: als inactief markeren in DAViCal
  • als er een groep bestaat in LDAP, maar niet in DAViCal: de groep in DAViCal aanmaken
  • als een groep in LDAP en DAViCal bestaat: de informatie in DAViCal bijwerken
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Deze actie doet het volgende:
  • controleer op geldige groepen in de LDAP-directory
  • controleer op groepen in DAViCal
dan
  • als er een groep aanwezig is in DAViCal "
+"maar niet in LDAP: als inactief markeren in DAViCal
  • als er een groep bestaat in LDAP, maar "
+"niet in DAViCal: de groep in DAViCal aanmaken
  • als een groep in LDAP en DAViCal bestaat: de "
+"informatie in DAViCal bijwerken
"
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Deze actie doet het volgende:
  • controleer op geldige gebruikers in de LDAP-directory
  • controleer op gebruikers in DAViCal
dan
  • als een gebruiker aanwezig is in DAViCal maar niet in LDAP: markeer hem als inactief in DAViCal
  • als een gebruiker aanwezig is in LDAP, maar niet in DAViCal: de gebruiker in DAViCal aanmaken
  • als een gebruiker aanwezig is in LDAP en DAViCal: de informatie in DAViCal bijwerken
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Deze actie doet het volgende:
  • controleer op geldige gebruikers in de LDAP-directory
  • controleer op gebruikers in DAViCal
dan
  • als een gebruiker aanwezig is in "
+"DAViCal maar niet in LDAP: markeer hem als inactief in DAViCal
  • als een gebruiker aanwezig is "
+"in LDAP, maar niet in DAViCal: de gebruiker in DAViCal aanmaken
  • als een gebruiker aanwezig is "
+"in LDAP en DAViCal: de informatie in DAViCal bijwerken
"
 
 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 "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."
+"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."
+"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"
@@ -1315,9 +1323,11 @@ msgid "Want: %s, Currently: %s"
 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."
-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."
+"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-mailadres van de gebruiker bevestigd is."
@@ -1374,35 +1384,31 @@ msgstr "De 'calendar-timezone'-eigenschap is enkel geldig voor een agenda."
 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"
+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"
+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"
-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 : 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"
 
 #, 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"
 
-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 : functie ldap_connect niet ingesteld, kijk Uw php_ldap module na"
 
 #, php-format
@@ -1413,8 +1419,7 @@ msgstr "drivers_pwauth_pam : Kan bestand %s niet vinden"
 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"
 
@@ -1439,7 +1444,5 @@ msgstr ""
 msgid "unauthenticated"
 msgstr "niet geverifieerd"
 
-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 "U moet zich aanmelden met de gebruikersnaam en het wachtwoord die U zijn toegewezen."
diff --git a/po/pl.po b/po/pl.po
index 63c7253d..62b102a4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 #   , 2011.
@@ -15,19 +15,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Polish (http://www.transifex.net/projects/p/davical/language/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 "%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"
 
@@ -77,29 +75,43 @@ msgstr "- aktualizacja grup: %s"
 msgid "- updating user records : %s"
 msgstr "- aktualizacja rekordów użytkownika: %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
-msgstr "OSTRZEŻENIE: wszystkie zdarzenia z tej ścieżki zostaną usunięte przed wstawieniem plików ICS"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
+msgstr ""
+"OSTRZEŻENIE: wszystkie zdarzenia z tej ścieżki zostaną usunięte przed wstawieniem plików ICS"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
Pomoc
\n
Aby uzyskać pomoc, odwiedź DAViCal Home Page lub przeczytaj DAViCal Wiki.
\n
Jeżeli nie znalazłeś odpowiedzi, odwiedź nas na IRCu na kanale #davical na stronie irc.oftc.net,\nlub wyślij zapytanie na DAViCal lista dyskusyjna Użytkowników.
\n
Pomocną może też się okazać archiwum listy dyskusyjnej .
"
+msgstr ""
+"
Pomoc
\n"
+"
Aby uzyskać pomoc, odwiedź DAViCal Home Page lub przeczytaj DAViCal Wiki.
\n"
+"
Jeżeli nie znalazłeś odpowiedzi, odwiedź nas na IRCu na kanale #davical na stronie irc.oftc.net,\n"
+"lub wyślij zapytanie na DAViCal lista dyskusyjna Użytkowników.
\n"
+"
Pomocną może też się okazać archiwum listy dyskusyjnej .
"
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Zaloguj się
Aby uzyskać dostęp do %s powinieneś zalogować się swoją nazwą użytkownika i hasłem.
Jeśli chcesz uzyskać dostęp, wyślij e-mail do %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Zaloguj się
Aby uzyskać dostęp do %s powinieneś zalogować się swoją nazwą użytkownika i "
+"hasłem.
Jeśli chcesz uzyskać dostęp, wyślij e-mail do %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -151,8 +163,7 @@ msgstr "Wszystkie dane kolekcji zostaną nieodwracalnie usunięte."
 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"
@@ -161,8 +172,7 @@ 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"
@@ -253,9 +263,7 @@ msgstr "ID kolekcji"
 msgid "Collection deleted"
 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"
@@ -327,8 +335,7 @@ msgstr "Atkualna wersja DAViCal"
 msgid "DAV Path"
 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"
@@ -427,8 +434,7 @@ msgstr ""
 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"
@@ -485,9 +491,7 @@ msgstr "Zmień dane tego użytkownika "
 msgid "Email Address"
 msgstr "Adres 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 "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."
@@ -704,9 +708,7 @@ msgstr "Wyloguj się"
 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"
@@ -795,14 +797,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -896,8 +894,7 @@ msgstr ""
 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"
@@ -930,8 +927,7 @@ msgstr ""
 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"
 
@@ -989,14 +985,10 @@ msgstr ""
 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"
@@ -1009,8 +1001,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1040,13 +1031,16 @@ msgstr ""
 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"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1084,8 +1078,7 @@ msgstr ""
 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"
@@ -1094,8 +1087,7 @@ msgstr ""
 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."
@@ -1111,13 +1103,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Ścieżka kalendarza zawiera nieakceptowalne znaki."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1126,8 +1119,7 @@ msgstr ""
 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."
@@ -1137,8 +1129,7 @@ msgstr ""
 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."
+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."
@@ -1182,32 +1173,27 @@ msgid "There was an error writing to the database."
 msgstr "Wystąpił błąd zapisu do bazy danych."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1317,8 +1303,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1376,35 +1362,29 @@ msgstr ""
 msgid "directory %s is not readable"
 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"
 msgstr ""
 
 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
@@ -1415,8 +1395,7 @@ msgstr "drivers_pwauth_pam: Nie można odnaleźć pliku %s "
 msgid "drivers_squid_pam : Unable to find %s file"
 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"
 
@@ -1441,7 +1420,5 @@ 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 --git a/po/pt_BR.po b/po/pt_BR.po
index 8525abfb..38e93d24 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1,7 +1,7 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# 
+#
 # Translators:
 #   , 2011.
 #   , 2012.
@@ -13,19 +13,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.net/projects/p/davical/language/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"
 
@@ -75,29 +73,43 @@ msgstr "- Atualizando os grupos: %s"
 msgid "- updating user records : %s"
 msgstr "- Atualizando o registro do usuário: %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
-msgstr "ATENÇÃO: todos os eventos neste caminho serão removidos antes de inserir o arquivo allof ics"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
+msgstr ""
+"ATENÇÃO: todos os eventos neste caminho serão removidos antes de inserir o arquivo allof ics"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
 Ajuda 
Para obter ajuda inicial você deve visitar a Página Inicial do projeto DAViCal ou dar uma olhada no Wiki do DAViCal . 
 Se você não consegue encontrar as respostas lá, visite-nos no IRC canal #davical em irc.oftc.net , ou envie uma pergunta para a Lista de discussão dos usuários do DAViCal . 
 Os arquivos dapodem ser muito úteis. 
"
+msgstr ""
+"
 Ajuda 
Para obter ajuda inicial você deve visitar a Página Inicial do projeto DAViCal ou dar uma olhada no Wiki do DAViCal . 
 Se você não consegue encontrar as "
+"respostas lá, visite-nos no IRC canal #davical em irc.oftc.net , ou envie uma pergunta para a Lista de discussão dos usuários do DAViCal . 
 Os arquivos dapodem ser muito úteis. 
"
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
 Por favor, Registre-se no sistema
 Para o acesso ao %s você deve registrar-se com o nome de usuário e senha que foram emitidos para você. 
 Se você gostaria de solicitar o acesso, envie um e-mail para %s. 
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
 Por favor, Registre-se no sistema
 Para o acesso ao %s você deve registrar-se com o nome "
+"de usuário e senha que foram emitidos para você. 
 Se você gostaria de solicitar o acesso, envie "
+"um e-mail para %s. 
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Uma coleção principal do DAViCal só pode conter coleções"
@@ -149,8 +161,7 @@ msgstr "Todo conjunto de dados serão apagados de forma irrecuperável."
 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."
+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"
@@ -159,8 +170,7 @@ msgstr "Todos os privilégios"
 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"
+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"
@@ -251,9 +261,7 @@ msgstr "ID da coleção"
 msgid "Collection deleted"
 msgstr "Coleção excluída"
 
-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 "Coleções não podem ser ambos os calendários CalDAV e addressbooks CardDAV ao mesmo tempo"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -325,8 +333,7 @@ msgstr "DAViCal versão atual"
 msgid "DAV Path"
 msgstr "Caminho 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 só pode ser definido como um valor novo, não pode ser removido."
 
 msgid "DAViCal CalDAV Server"
@@ -425,8 +432,7 @@ msgstr "Excluindo Principal:"
 msgid "Deleting Ticket:"
 msgstr "Exclusão de Ticket:"
 
-msgid ""
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
+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"
@@ -483,10 +489,10 @@ msgstr "Editar registro de usuário"
 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."
-msgstr "Digite um nome de usuário, se você conhecer, e clique aqui, para ser enviada por e-mail uma senha temporária."
+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."
 
 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"
@@ -702,10 +708,10 @@ msgstr "Sair"
 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."
-msgstr "A maior parte do DAViCal funcionará, mas a atualização para PHP 5.2 ou posterior é fortemente recomendado."
+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."
 
 msgid "Name"
 msgstr "Nome"
@@ -793,15 +799,13 @@ msgstr "O PHP não está usando o modo de filtragem do Apache"
 msgid "PHP5 curl support is required for external binds"
 msgstr "Suporte do curl PHP5 é requerido para ligações externas"
 
-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/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 "PUT em uma coleção só é permitido para conteúdos do tipo texto/vcard contra uma coleção de endereços"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
+msgstr ""
+"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"
@@ -894,8 +898,7 @@ msgstr "Ler informação de Livre / Ocupado"
 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."
+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"
@@ -928,8 +931,7 @@ msgstr "Solicitar uma funcionalidade"
 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"
 
@@ -987,15 +989,14 @@ msgstr "Agendamento: Enviando"
 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."
-msgstr "Enviar convites de agendamento como um organizador do proprietário desta caixa de saída de agendamento."
+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."
 
-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."
+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."
 
 msgid "Set free/busy privileges"
 msgstr "Definir privilégios de Livre/Ocupado"
@@ -1007,9 +1008,10 @@ msgid "Set read+write privileges"
 msgstr "Definir privilégios de leitura+gravação"
 
 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 seu ics, por exemplo 'calendar' será referenciado como caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
+msgstr ""
+"Definir o caminho para armazenar seu ics, por exemplo 'calendar' será referenciado como caldav.php/"
+"username/calendar/"
 
 msgid "Setup"
 msgstr "Configuração"
@@ -1038,13 +1040,16 @@ msgstr "Algumas propriedades não puderam ser definidas."
 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."
+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"
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "Estado"
 
@@ -1082,8 +1087,7 @@ msgstr "A requisição BIND Request-URI deve identificar uma coleção."
 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."
+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"
@@ -1092,12 +1096,13 @@ msgstr "A Home Page do DAViCal"
 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"
+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."
+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."
@@ -1109,14 +1114,17 @@ msgid "The calendar path contains illegal characters."
 msgstr "O caminho do calendário contém caracteres ilegais."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-transp property of a calendar "
+"collection."
 msgstr ""
 
-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"
+msgid "The calendar-query report may not be run against that URL."
+msgstr ""
+
+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"
 
 msgid "The collection name may not be blank."
 msgstr "O nome da coleção não pode ficar em branco."
@@ -1124,8 +1132,7 @@ msgstr "O nome da coleção não pode ficar em branco."
 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."
+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."
@@ -1133,10 +1140,10 @@ msgstr "O endereço de e-mail realmente não deve ficar em branco."
 
 #, 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"
+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."
+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."
@@ -1180,33 +1187,42 @@ msgid "There was an error writing to the database."
 msgstr "Houve um erro ao gravar no banco de dados."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Esta operação faz o seguinte:
  • verifica grupos válidos no diretório LDAP
  • verifica os grupos no DAViCal
então
  • se um grupo está presente no DAViCal, mas não está presente no LDAP, o mesmo será ajustado como inativo no DAViCal
  • se um grupo está presente no LDAP, mas não está no DAViCal, o mesmo será criado no DAViCal
  •  se um grupo está presente no LDAP e no DAViCal, então, suas informações serão atualizadas no DAViCal
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Esta operação faz o seguinte:
  • verifica grupos válidos no diretório LDAP
  • verifica os "
+"grupos no DAViCal
então
  • se um grupo está presente no DAViCal, mas não está presente no "
+"LDAP, o mesmo será ajustado como inativo no DAViCal
  • se um grupo está presente no LDAP, mas não "
+"está no DAViCal, o mesmo será criado no DAViCal
  •  se um grupo está presente no LDAP e no "
+"DAViCal, então, suas informações serão atualizadas no DAViCal
"
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Esta operação faz o seguinte:
  •  verifica os usuários válidos no diretório LDAP
  • verifica usuários no DAViCal
,então,
  • se um usuário está presente no DAViCal, mas não está presente no LDAP, o mesmo será colocado como inativo no DAViCal
  • se um usuário está presente no LDAP, mas não está presente no DAViCal, o mesmo será criado no DAViCal
  •  se um usuário estiver presente no LDAP e presente no DAViCal, então suas informações serão atualizadas no DAViCal
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Esta operação faz o seguinte:
  •  verifica os usuários válidos no diretório LDAP
  • verifica "
+"usuários no DAViCal
,então,
  • se um usuário está presente no DAViCal, mas não está "
+"presente no LDAP, o mesmo será colocado como inativo no DAViCal
  • se um usuário está presente no "
+"LDAP, mas não está presente no DAViCal, o mesmo será criado no DAViCal
  •  se um usuário estiver "
+"presente no LDAP e presente no DAViCal, então suas informações serão atualizadas no DAViCal
"
 
 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."
+"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 "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."
+"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 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"
@@ -1315,9 +1331,11 @@ msgid "Want: %s, Currently: %s"
 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."
-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."
+"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."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Quando a conta de email do usuário foi validada."
@@ -1374,35 +1392,32 @@ msgstr "a propriedade de fuso horário de calendário, só é válida para um ca
 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"
+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"
+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"
-msgstr "drivers_ldap: Falha ao tentar acessar a base LDAP utilizando a versão 3 do protocolo, TLS não suportado"
+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"
 
 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: 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 : 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"
 
 #, 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"
 
-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: função ldap_connect não definida, verifique o módulo php_ldap"
 
 #, php-format
@@ -1413,8 +1428,7 @@ msgstr "drivers_pwauth_pam: Não é possível encontrar o arquivo %s"
 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"
 
@@ -1439,7 +1453,5 @@ msgstr "remetente precisa ser organizador ou participante do evento"
 msgid "unauthenticated"
 msgstr "não 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 "você deve fazer logon com o nome de usuário e senha que foram emitidos para você."
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 092a1179..e2363dce 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 #   , 2012.
@@ -13,19 +13,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.net/projects/p/davical/language/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"
 
@@ -75,29 +73,44 @@ msgstr "- a actualizar grupos : %s"
 msgid "- updating user records : %s"
 msgstr "- a actualizar registos de utilizador : %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr "AVISO: todos os eventos neste caminho serão apagados antes de inserir o ficheiro ics"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
-msgstr "
Ajuda
\n
Para ajuda inicial visite a Home Page do DAViCal ou veja \no Wiki DAViCal.
\n
Se não encontrar aí as respostas, visite o canal #davical do IRC no\nservidor irc.oftc.net,\nou envie uma questão para Lista de correio dos Utilizadores DAViCal.
\n
os arquivos da lista de correio\ntambém podem ser úteis.
"
+msgstr ""
+"
Ajuda
\n"
+"
Para ajuda inicial visite a Home Page do "
+"DAViCal ou veja \n"
+"o Wiki DAViCal.
\n"
+"
Se não encontrar aí as respostas, visite o canal #davical do IRC no\n"
+"servidor irc.oftc.net,\n"
+"ou envie uma questão para Lista de correio dos Utilizadores DAViCal.
\n"
+"
os arquivos da lista de correio\n"
+"também podem ser úteis.
"
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Entre por favor
Para aceder ao %s deve entrar com o nome de utilizador e password que lhe foram atribuídos.
Se necessitar de pedir acesso, envie um e-mail para %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Entre por favor
Para aceder ao %s deve entrar com o nome de utilizador e password que lhe "
+"foram atribuídos.
Se necessitar de pedir acesso, envie um e-mail para %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr "Uma colecção principal do DAViCal só pode conter colecções"
@@ -149,8 +162,7 @@ msgstr "Todos os dados da colecção serão irremediavelmente apagados"
 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."
+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"
@@ -159,8 +171,7 @@ msgstr "Todos os privilégios"
 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"
@@ -251,9 +262,7 @@ msgstr "ID da colecção"
 msgid "Collection deleted"
 msgstr "Colecção apagada"
 
-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 "As colecções não podem ser calendários CalDAV e livros de endereços CardDAV simultaneamente"
 
 msgid "Configuring Calendar Clients for DAViCal"
@@ -325,8 +334,7 @@ msgstr "Versão DAViCal actual "
 msgid "DAV Path"
 msgstr "Caminho 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 só pode ser definido para um novo valor, não pode ser removido."
 
 msgid "DAViCal CalDAV Server"
@@ -425,8 +433,7 @@ msgstr "A eliminar principal:"
 msgid "Deleting Ticket:"
 msgstr "A eliminar ticket:"
 
-msgid ""
-"Deliver scheduling invitations from an organiser to this scheduling inbox"
+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"
@@ -483,10 +490,10 @@ msgstr "Editar este registo de utilizador"
 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."
-msgstr "Indique um nome de utilizador, se o souber, e clique aqui, para que lhe seja enviada uma password temporária."
+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."
 
 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."
@@ -702,10 +709,10 @@ msgstr "Sair"
 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."
-msgstr "A maior parte do DAViCal irá funcionar mas é fortemente recomendado actualizar para o PHP 5.2 ou mais recente."
+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."
 
 msgid "Name"
 msgstr "Nome"
@@ -793,14 +800,10 @@ msgstr "O PHP não está a usar o modo Apache Filter"
 msgid "PHP5 curl support is required for external binds"
 msgstr "O suporte curl do PHP5 é necessário para ligações externas"
 
-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/calendar content against a calendar collection"
 msgstr "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"
+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"
@@ -894,8 +897,7 @@ msgstr "Ler informação de livre/ocupado"
 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."
+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"
@@ -928,8 +930,7 @@ msgstr "Pedir Funcionalidade"
 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"
 
@@ -987,14 +988,10 @@ msgstr "Horários: A enviar"
 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."
+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."
+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"
@@ -1007,9 +1004,10 @@ msgid "Set read+write privileges"
 msgstr "Definir privilégios de leitura+escrita"
 
 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/"
+"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"
@@ -1038,13 +1036,16 @@ msgstr "Algumas propriedades não puderam ser definidas."
 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."
+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"
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr "Estado"
 
@@ -1082,8 +1083,7 @@ msgstr "O URI do pedido BIND, TEM QUE identificar uma colecção."
 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."
+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"
@@ -1092,8 +1092,7 @@ msgstr "A Home page do DAViCal"
 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"
+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."
@@ -1109,13 +1108,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "O caminho do calendário contém caracteres ilegais."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+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."
@@ -1124,8 +1124,7 @@ msgstr "O nome da colecção não pode ficar em branco."
 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."
+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."
@@ -1133,11 +1132,13 @@ msgstr "O endereço de email não devia, de facto, ficar em branco."
 
 #, 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"
+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."
+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."
 
 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."
@@ -1180,33 +1181,41 @@ msgid "There was an error writing to the database."
 msgstr "Ocorreu um erro ao escrever na Base de Dados."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Esta operação faz o seguinte: 
  • verifica grupos válidos no directório LDAP
    •  
  • verifica grupos no DAViCal
 então 
  • se um grupo existe no DAViCal mas não no LDAP, marca-o como inactivo no DAViCal
    •  
  • se um grupo está presente no LDAP mas não no DAViCal, cria o grupo no DAViCal
    •  
  • se um grupo existir no LDAP e no DAViCal, actualiza a informação no DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Esta operação faz o seguinte: 
  • verifica grupos válidos no directório LDAP
    •  
  • verifica "
+"grupos no DAViCal
 então 
  • se um grupo existe no DAViCal mas não no LDAP, marca-o como "
+"inactivo no DAViCal
    •  
  • se um grupo está presente no LDAP mas não no DAViCal, cria o grupo no "
+"DAViCal
    •  
  • se um grupo existir no LDAP e no DAViCal, actualiza a informação no DAViCal
    •  
"
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
-msgstr "Esta operação faz o seguinte: 
  • verifica utilizadores válidos no directório LDAP
    •  
  • verifica utilizadores no DAViCal
 então 
  • se um utilizador existe no DAViCal mas não no LDAP, marca-o como inactivo no DAViCal
    •  
  • se um utilizador está presente no LDAP mas não no DAViCal, cria o utilizador no DAViCal
    •  
  • se um utilizador existir no LDAP e no DAViCal, actualiza a informação no DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
+msgstr ""
+"Esta operação faz o seguinte: 
  • verifica utilizadores válidos no directório LDAP
    •  "
+"
  • verifica utilizadores no DAViCal
 então 
  • se um utilizador existe no DAViCal mas "
+"não no LDAP, marca-o como inactivo no DAViCal
    •  
  • se um utilizador está presente no LDAP mas não "
+"no DAViCal, cria o utilizador no DAViCal
    •  
  • se um utilizador existir no LDAP e no DAViCal, "
+"actualiza a informação no DAViCal
    •  
"
 
 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."
+"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."
+"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"
@@ -1315,9 +1324,11 @@ msgid "Want: %s, Currently: %s"
 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."
-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."
+"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."
 
 msgid "When the user's e-mail account was validated."
 msgstr "Quando a conta de email do utilizador foi validada."
@@ -1374,35 +1385,31 @@ msgstr "a propriedade calendar-timezone só é válida para um calendário."
 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"
+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"
+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"
+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"
-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 : 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"
 
 #, 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"
+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
@@ -1413,8 +1420,7 @@ msgstr "drivers_pwauth_pam : Impossível encontrar o ficheiro %s"
 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"
 
@@ -1439,7 +1445,5 @@ msgstr "O remetente deve ser o organizador ou estar presente no evento"
 msgid "unauthenticated"
 msgstr "não 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 "deve entrar com o nome de utilizador e password que lhe foram atribuídas."
diff --git a/po/ru.po b/po/ru.po
index ff1be80d..fe8c1b63 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 # Yaroslav Petrov , 2012.
@@ -14,19 +14,18 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: Russian (http://www.transifex.net/projects/p/davical/language/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\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"
+"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 ""
 
@@ -76,29 +75,32 @@ msgstr "- обновляю группу : %s"
 msgid "- updating user records : %s"
 msgstr "- обновляю запись пользователя : %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr "Внимание: все события по этому пути будут удалены перед загрузкой файла"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
 msgstr ""
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Авторизация
Для доступа к %s вы должны войти со своими логином и паролем
Для получения доступа пишите по адресу %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Авторизация
Для доступа к %s вы должны войти со своими логином и паролем
Для "
+"получения доступа пишите по адресу %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -150,8 +152,7 @@ msgstr "Все данные будут удалены без возможнос
 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"
@@ -160,8 +161,7 @@ msgstr "Все привилегии"
 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"
@@ -252,9 +252,7 @@ msgstr "ID коллекции"
 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"
@@ -326,8 +324,7 @@ msgstr "Версия DAViCal"
 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 "DAV::resourcetype не может быть удален."
 
 msgid "DAViCal CalDAV Server"
@@ -426,8 +423,7 @@ msgstr "Удаление владельца:"
 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"
@@ -484,9 +480,7 @@ msgstr ""
 msgid "Email Address"
 msgstr "Адрес 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 "Введите имя пользователя и нажмите здесь, чтобы получить временный пароль."
 
 msgid "Enter your username and password then click here to log in."
@@ -703,9 +697,7 @@ msgstr "Отключиться"
 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"
@@ -794,14 +786,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -895,8 +883,7 @@ msgstr ""
 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"
@@ -929,8 +916,7 @@ msgstr ""
 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 "Ресурс"
 
@@ -988,14 +974,10 @@ msgstr ""
 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"
@@ -1008,8 +990,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1039,13 +1020,16 @@ msgstr ""
 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"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1083,8 +1067,7 @@ msgstr ""
 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"
@@ -1093,8 +1076,7 @@ msgstr ""
 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."
@@ -1110,13 +1092,14 @@ msgid "The calendar path contains illegal characters."
 msgstr ""
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1125,8 +1108,7 @@ msgstr "Имя коллекции не может быть пустым."
 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."
@@ -1136,8 +1118,7 @@ msgstr "Адрес Email не может быть пустым."
 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."
+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."
@@ -1181,32 +1162,27 @@ msgid "There was an error writing to the database."
 msgstr "Произошла ошибка при записи в базу данных."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1316,8 +1292,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1375,35 +1351,29 @@ msgstr ""
 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"
 msgstr ""
 
 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
@@ -1414,8 +1384,7 @@ msgstr ""
 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 "запомнить меня"
 
@@ -1440,7 +1409,5 @@ 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 --git a/po/sv.po b/po/sv.po
index ff942d4e..98682c50 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,7 +1,7 @@
 # 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 , 2011.
 msgid ""
@@ -12,19 +12,17 @@ msgstr ""
 "PO-Revision-Date: 2012-05-28 09:26+0000\n"
 "Last-Translator: Andrew McMillan \n"
 "Language-Team: LANGUAGE \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 ""
 
@@ -74,29 +72,32 @@ msgstr ""
 msgid "- updating user records : %s"
 msgstr "- uppdaterar användarposter : %s"
 
-msgid ""
-"WARNING: all events in this path will be deleted before inserting allof "
-"the ics file"
+msgid "WARNING: all events in this path will be deleted before inserting allof the ics file"
 msgstr "Varning: alla händelser i denna sökväg kommer att raderas innan ics-filen läggs till"
 
 #, php-format
 msgid ""
 "
Help
\n"
-"
For initial help you should visit the DAViCal Home Page or take\n"
+"
For initial help you should visit the DAViCal "
+"Home Page or take\n"
 "a look at the DAViCal Wiki.
\n"
-"
If you can't find the answers there, visit us on IRC in\n"
+"
If you can't find the answers there, visit us on IRC in\n"
 "the #davical channel on irc.oftc.net,\n"
-"or send a question to the DAViCal Users mailing list.
\n"
-"
The mailing list\n"
+"or send a question to the DAViCal Users mailing list.
\n"
+"
The mailing list\n"
 "archives can be helpful too.
"
 msgstr ""
 
 #, php-format
 msgid ""
-"
Log On Please
For access to the %s you should log on withthe "
-"username and password that have been issued to you.
If you would like "
-"to request access, please e-mail %s.
"
-msgstr "
Var god logga in
För att få tillgång till %s behöver du logga in med det användarnamn och lösenord som tilldelats dig.
För att begära ett konto, skicka e-post till %s.
"
+"
Log On Please
For access to the %s you should log on withthe username and password that "
+"have been issued to you.
If you would like to request access, please e-mail %s.
"
+msgstr ""
+"
Var god logga in
För att få tillgång till %s behöver du logga in med det användarnamn och "
+"lösenord som tilldelats dig.
För att begära ett konto, skicka e-post till %s.
"
 
 msgid "A DAViCal principal collection may only contain collections"
 msgstr ""
@@ -148,8 +149,7 @@ msgstr "All data för samlingen kommer att raderas oåterkallerligen."
 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"
@@ -158,8 +158,7 @@ msgstr ""
 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"
@@ -250,9 +249,7 @@ msgstr "Samlingens ID"
 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"
@@ -324,8 +321,7 @@ msgstr ""
 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"
@@ -424,8 +420,7 @@ msgstr ""
 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"
@@ -482,9 +477,7 @@ msgstr "Ändra denna användarpost"
 msgid "Email Address"
 msgstr "E-postadress"
 
-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 "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."
@@ -701,9 +694,7 @@ msgstr "Logga ur"
 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"
@@ -792,14 +783,10 @@ msgstr ""
 msgid "PHP5 curl support is required for external binds"
 msgstr ""
 
-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/calendar content against a calendar collection"
 msgstr ""
 
-msgid ""
-"PUT on a collection is only allowed for text/vcard content against an "
-"addressbook collection"
+msgid "PUT on a collection is only allowed for text/vcard content against an addressbook collection"
 msgstr ""
 
 msgid "Passed"
@@ -893,8 +880,7 @@ msgstr "Läs in tillgänglighetsinformation"
 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"
@@ -927,8 +913,7 @@ msgstr "Begär funktionsförbättring"
 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"
 
@@ -986,14 +971,10 @@ msgstr ""
 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"
@@ -1006,8 +987,7 @@ msgid "Set read+write privileges"
 msgstr ""
 
 msgid ""
-"Set the path to store your ics e.g. 'calendar' will be referenced as "
-"/caldav.php/username/calendar/"
+"Set the path to store your ics e.g. 'calendar' will be referenced as /caldav.php/username/calendar/"
 msgstr ""
 
 msgid "Setup"
@@ -1037,13 +1017,16 @@ msgstr "Vissa egenskaper kunde inte ställas in."
 msgid "Source resource does not exist."
 msgstr "Källresursen existerar inte."
 
-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 "Speciella samlingar får inte innehålla en kalender eller en annan speciell samling."
 
 msgid "Specific Privileges"
 msgstr ""
 
+#, php-format
+msgid "Stable: %s, We have: %s !"
+msgstr ""
+
 msgid "Status"
 msgstr ""
 
@@ -1081,8 +1064,7 @@ msgstr ""
 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"
@@ -1091,8 +1073,7 @@ msgstr "DAViCals hemsida"
 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."
@@ -1108,13 +1089,14 @@ msgid "The calendar path contains illegal characters."
 msgstr "Kalendersökvägen inehåller otillåtna tecken."
 
 msgid ""
-"The calendar-free-busy-set is superseded by the  schedule-calendar-transp "
-"property of a calendar collection."
+"The calendar-free-busy-set is superseded by the  schedule-calendar-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 may not be run against that URL."
+msgstr ""
+
+msgid "The calendar-query report must be run against a calendar or a scheduling collection"
 msgstr ""
 
 msgid "The collection name may not be blank."
@@ -1123,8 +1105,7 @@ msgstr ""
 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."
@@ -1134,8 +1115,7 @@ msgstr ""
 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."
+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."
@@ -1179,32 +1159,27 @@ msgid "There was an error writing to the database."
 msgstr "Det uppstöd ett fel vid skrivning till databasen."
 
 msgid ""
-"This operation does the following: 
  • check valid groups in LDAP "
-"directory
    •  
  • check groups in DAViCal
 then 
  • if a group"
-" is present in DAViCal but not in LDAP set as inactive in DAViCal
    •  "
-"
  • if a group is present in LDAP but not in DAViCal create the group in "
-"DAViCal
    •  
  • if a group in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid groups in LDAP directory
    •  
  • check groups "
+"in DAViCal
 then 
  • if a group is present in DAViCal but not in LDAP set as inactive in "
+"DAViCal
    •  
  • if a group is present in LDAP but not in DAViCal create the group in DAViCal
    •  "
+"
  • if a group in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 msgstr ""
 
 msgid ""
-"This operation does the following: 
  • check valid users in LDAP "
-"directory
    •  
  • check users in DAViCal
 then 
  • if a user "
-"is present in DAViCal but not in LDAP set him as inactive in DAViCal
    •  "
-"
  • if a user is present in LDAP but not in DAViCal create the user in "
-"DAViCal
    •  
  • if a user in present in LDAP and DAViCal then update "
-"information in DAViCal
    •  
"
+"This operation does the following: 
  • check valid users in LDAP directory
    •  
  • check users in "
+"DAViCal
 then 
  • if a user is present in DAViCal but not in LDAP set him as inactive in "
+"DAViCal
    •  
  • if a user is present in LDAP but not in DAViCal create the user in DAViCal
    •  "
+"
  • if a user in present in LDAP and DAViCal then update information in DAViCal
    •  
"
 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."
+"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"
@@ -1314,8 +1289,8 @@ msgid "Want: %s, Currently: %s"
 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."
@@ -1373,35 +1348,31 @@ msgstr ""
 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"
+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"
+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"
-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"
+msgstr ""
+"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"
+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
@@ -1412,8 +1383,7 @@ msgstr ""
 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"
 
@@ -1438,7 +1408,5 @@ 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 "du behöver logga in med det användarnamn och lösenord du erhållit."
diff --git a/testing/tests/binding/1034-DELETE-admin-bind.test b/testing/tests/binding/1034-DELETE-admin-bind.test
index fd063dd1..0df60719 100644
--- a/testing/tests/binding/1034-DELETE-admin-bind.test
+++ b/testing/tests/binding/1034-DELETE-admin-bind.test
@@ -1,7 +1,7 @@
 #
 # Do a DELETE on a BIND
 TYPE=DELETE
-URL=http://mycaldav/caldav.php/user4/base/user3/
+URL=http://regression.host/caldav.php/user4/base/user3/
 AUTH=user4:user4
 HEAD
 
diff --git a/testing/tests/binding/1036-REPORT-sync-initial-bound.test b/testing/tests/binding/1036-REPORT-sync-initial-bound.test
index 07065618..1c16ab98 100644
--- a/testing/tests/binding/1036-REPORT-sync-initial-bound.test
+++ b/testing/tests/binding/1036-REPORT-sync-initial-bound.test
@@ -3,7 +3,7 @@
 # on a bound resource
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user4/user2/
+URL=http://regression.host/caldav.php/user4/user2/
 HEADER=User-agent: sync-collection initial REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/carddav/2000-MKCOL-addressbook.test b/testing/tests/carddav/2000-MKCOL-addressbook.test
index 90438021..470623ec 100644
--- a/testing/tests/carddav/2000-MKCOL-addressbook.test
+++ b/testing/tests/carddav/2000-MKCOL-addressbook.test
@@ -2,7 +2,7 @@
 # Extended MKCOL test - create an addressbook
 #
 TYPE=MKCOL
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml
 HEADER=X-DAViCal-Flush-Cache: true
diff --git a/testing/tests/carddav/2010-PROPFIND.test b/testing/tests/carddav/2010-PROPFIND.test
index 62d2abb8..01403c73 100644
--- a/testing/tests/carddav/2010-PROPFIND.test
+++ b/testing/tests/carddav/2010-PROPFIND.test
@@ -2,7 +2,7 @@
 # PROPFIND on addressbook resource
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml
 HEADER=Depth: 0
diff --git a/testing/tests/carddav/2010-REPORT-sync-initial.test b/testing/tests/carddav/2010-REPORT-sync-initial.test
index b0ce22c8..411f819f 100644
--- a/testing/tests/carddav/2010-REPORT-sync-initial.test
+++ b/testing/tests/carddav/2010-REPORT-sync-initial.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT sync-collection with no sync-token
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 HEADER=User-agent: sync-collection initial REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/carddav/2011-PROPFIND.test b/testing/tests/carddav/2011-PROPFIND.test
index a5f8f1f2..074f0e51 100644
--- a/testing/tests/carddav/2011-PROPFIND.test
+++ b/testing/tests/carddav/2011-PROPFIND.test
@@ -3,7 +3,7 @@
 # Depth 1 this time, and looking for getetag
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml
 HEADER=Depth: 1
diff --git a/testing/tests/carddav/2012-REPORT-addressbook-multiget.test b/testing/tests/carddav/2012-REPORT-addressbook-multiget.test
index 91fc19f4..83403f3b 100644
--- a/testing/tests/carddav/2012-REPORT-addressbook-multiget.test
+++ b/testing/tests/carddav/2012-REPORT-addressbook-multiget.test
@@ -2,7 +2,7 @@
 # addressbook-multiget REPORT on addressbook resource
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml
 HEAD
diff --git a/testing/tests/carddav/2021-OPTIONS_well-known_carddav.test b/testing/tests/carddav/2021-OPTIONS_well-known_carddav.test
index a631ee01..1f48b0c3 100644
--- a/testing/tests/carddav/2021-OPTIONS_well-known_carddav.test
+++ b/testing/tests/carddav/2021-OPTIONS_well-known_carddav.test
@@ -1,7 +1,7 @@
 #
 # Do an OPTIONS request on a /.well-known URL for CardDAV
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/.well-known/carddav
+URL=http://regression.host/caldav.php/.well-known/carddav
 
 HEADER=User-Agent: DataAccess/1.0 (8A293)
 
diff --git a/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.test b/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.test
index 3bce6067..b9de338d 100644
--- a/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.test
+++ b/testing/tests/carddav/2022-OPTIONS_well-known_carddav_noauth.test
@@ -1,7 +1,7 @@
 #
 # Do an OPTIONS request on a /.well-known URL for CardDAV
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/.well-known/carddav
+URL=http://regression.host/caldav.php/.well-known/carddav
 
 HEADER=User-Agent: DataAccess/1.0 (8A293)
 
diff --git a/testing/tests/carddav/2023-PROPFIND.test b/testing/tests/carddav/2023-PROPFIND.test
index 86152139..8aa4a9b8 100644
--- a/testing/tests/carddav/2023-PROPFIND.test
+++ b/testing/tests/carddav/2023-PROPFIND.test
@@ -2,7 +2,7 @@
 # PROPFIND on addressbook resource
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml
 HEADER=Depth: 0
diff --git a/testing/tests/carddav/2024-MKCOL-addressbook.test b/testing/tests/carddav/2024-MKCOL-addressbook.test
index 7a085c7b..016db2c1 100644
--- a/testing/tests/carddav/2024-MKCOL-addressbook.test
+++ b/testing/tests/carddav/2024-MKCOL-addressbook.test
@@ -2,7 +2,7 @@
 # Extended MKCOL test - create an addressbook
 #
 TYPE=MKCOL
-URL=http://mycaldav/caldav.php/user2/addressbook/
+URL=http://regression.host/caldav.php/user2/addressbook/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml
 HEAD
diff --git a/testing/tests/carddav/2030-REPORT-addressbook-query.test b/testing/tests/carddav/2030-REPORT-addressbook-query.test
index 3726706a..ccc5e94d 100644
--- a/testing/tests/carddav/2030-REPORT-addressbook-query.test
+++ b/testing/tests/carddav/2030-REPORT-addressbook-query.test
@@ -2,7 +2,7 @@
 # Request a REPORT 
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 
 HEADER=Accept: text/xml,application/xml
 HEADER=Content-Type: text/xml
diff --git a/testing/tests/carddav/2031-REPORT-addressbook-multiget.test b/testing/tests/carddav/2031-REPORT-addressbook-multiget.test
index b6013a75..4b51032e 100644
--- a/testing/tests/carddav/2031-REPORT-addressbook-multiget.test
+++ b/testing/tests/carddav/2031-REPORT-addressbook-multiget.test
@@ -2,7 +2,7 @@
 # addressbook-multiget REPORT on addressbook resource
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml
 HEAD
diff --git a/testing/tests/carddav/2032-REPORT-addressbook-query.test b/testing/tests/carddav/2032-REPORT-addressbook-query.test
index 11fc1e40..857f5ed6 100644
--- a/testing/tests/carddav/2032-REPORT-addressbook-query.test
+++ b/testing/tests/carddav/2032-REPORT-addressbook-query.test
@@ -2,7 +2,7 @@
 # Request a REPORT 
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 
 HEADER=Accept: text/xml,application/xml
 HEADER=Content-Type: text/xml
diff --git a/testing/tests/carddav/2033-REPORT-addressbook-query.test b/testing/tests/carddav/2033-REPORT-addressbook-query.test
index 3726706a..ccc5e94d 100644
--- a/testing/tests/carddav/2033-REPORT-addressbook-query.test
+++ b/testing/tests/carddav/2033-REPORT-addressbook-query.test
@@ -2,7 +2,7 @@
 # Request a REPORT 
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 
 HEADER=Accept: text/xml,application/xml
 HEADER=Content-Type: text/xml
diff --git a/testing/tests/carddav/2034-REPORT-addressbook-query.test b/testing/tests/carddav/2034-REPORT-addressbook-query.test
index b802eb93..4bd9f6c7 100644
--- a/testing/tests/carddav/2034-REPORT-addressbook-query.test
+++ b/testing/tests/carddav/2034-REPORT-addressbook-query.test
@@ -2,7 +2,7 @@
 # Request a REPORT 
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 
 HEADER=Accept: text/xml,application/xml
 HEADER=Content-Type: text/xml
diff --git a/testing/tests/carddav/2039-REPORT-sync-changed.test b/testing/tests/carddav/2039-REPORT-sync-changed.test
index 02d0390b..53eb5f51 100644
--- a/testing/tests/carddav/2039-REPORT-sync-changed.test
+++ b/testing/tests/carddav/2039-REPORT-sync-changed.test
@@ -2,7 +2,7 @@
 # We should see an updated sync token here.
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/addressbook/
+URL=http://regression.host/caldav.php/user1/addressbook/
 HEADER=User-agent: sync-collection changes REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.test
index 30cc2bad..339bd156 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-nz_holidays.test
@@ -3,7 +3,7 @@
 #
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user4/nz_holidays/
+URL=http://regression.host/caldav.php/user4/nz_holidays/
 HEADER=User-Agent: RSCDS Testing/0.9.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=user4:user4
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test
index e79ce2b9..3d8fccd3 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-us_holidays.test
@@ -4,7 +4,7 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user4/us_holidays/
+URL=http://regression.host/caldav.php/user4/us_holidays/
 HEADER=User-Agent: RSCDS Testing/0.9.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=user4:user4
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test
index a7e2cacb..349654ca 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3-utf8.test
@@ -2,7 +2,7 @@
 # PUT a calendar collection to user3 to test UTF-8 processing
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user3/utf8/
+URL=http://regression.host/caldav.php/user3/utf8/
 HEADER=User-Agent: RSCDS Testing/0.9.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=user3:user3
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test
index 618986c3..a38073ca 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user3.test
@@ -4,7 +4,7 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user3/home/
+URL=http://regression.host/caldav.php/user3/home/
 HEADER=User-Agent: RSCDS Testing/0.9.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=user3:user3
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.test
index 55415a24..3b3c27c7 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user4.test
@@ -4,7 +4,7 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user4/home/
+URL=http://regression.host/caldav.php/user4/home/
 HEADER=User-Agent: RSCDS Testing/0.9.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=user4:user4
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test
index 81d30b87..999f73a7 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user5.test
@@ -4,7 +4,7 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user5/home/
+URL=http://regression.host/caldav.php/user5/home/
 HEADER=User-Agent: RSCDS Testing/0.9.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=user5:user5
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test
index 0017b225..794ce1eb 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection-user6.test
@@ -4,7 +4,7 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/User%20Six/home/
+URL=http://regression.host/caldav.php/User%20Six/home/
 HEADER=User-Agent: RSCDS Testing/0.9.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=User Six:user6
diff --git a/testing/tests/regression-suite/0000-Setup-PUT-collection.test b/testing/tests/regression-suite/0000-Setup-PUT-collection.test
index 3fd30031..650e7aa5 100644
--- a/testing/tests/regression-suite/0000-Setup-PUT-collection.test
+++ b/testing/tests/regression-suite/0000-Setup-PUT-collection.test
@@ -4,7 +4,7 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user2/home/
+URL=http://regression.host/caldav.php/user2/home/
 HEADER=User-Agent: RSCDS Testing/0.7.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEADER=X-DAViCal-Flush-Cache: now
diff --git a/testing/tests/regression-suite/0001-Mulberry-1.test b/testing/tests/regression-suite/0001-Mulberry-1.test
index 2bdbd73f..09b0871c 100644
--- a/testing/tests/regression-suite/0001-Mulberry-1.test
+++ b/testing/tests/regression-suite/0001-Mulberry-1.test
@@ -1,5 +1,5 @@
 #
 # Do an initial OPTIONS request
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 HEAD
diff --git a/testing/tests/regression-suite/0002-Mulberry-1.test b/testing/tests/regression-suite/0002-Mulberry-1.test
index 7a9f830f..362acb49 100644
--- a/testing/tests/regression-suite/0002-Mulberry-1.test
+++ b/testing/tests/regression-suite/0002-Mulberry-1.test
@@ -2,7 +2,7 @@
 # After creating a calendar in Mulberry, we should be able
 # to do a PROPFIND and discover it.
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0003-Mulberry-1.test b/testing/tests/regression-suite/0003-Mulberry-1.test
index 627bc96a..4454e68f 100644
--- a/testing/tests/regression-suite/0003-Mulberry-1.test
+++ b/testing/tests/regression-suite/0003-Mulberry-1.test
@@ -2,7 +2,7 @@
 # Before creating a calendar in Mulberry, we should be able
 # to do a PROPFIND and it should not be there.
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0004-Mulberry-1.test b/testing/tests/regression-suite/0004-Mulberry-1.test
index 7aa090e8..69067e98 100644
--- a/testing/tests/regression-suite/0004-Mulberry-1.test
+++ b/testing/tests/regression-suite/0004-Mulberry-1.test
@@ -2,5 +2,5 @@
 # So we should now make a calendar that we will use for some
 # testing.
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/user1/created/
+URL=http://regression.host/caldav.php/user1/created/
 HEAD
diff --git a/testing/tests/regression-suite/0005-Mulberry-1.test b/testing/tests/regression-suite/0005-Mulberry-1.test
index 3dfec526..4c25ecce 100644
--- a/testing/tests/regression-suite/0005-Mulberry-1.test
+++ b/testing/tests/regression-suite/0005-Mulberry-1.test
@@ -2,7 +2,7 @@
 # Before creating a calendar in Mulberry, we should be able
 # to do a PROPFIND and it should not be there.
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0006-Mulberry-1.test b/testing/tests/regression-suite/0006-Mulberry-1.test
index 9a242c91..7c4a5994 100644
--- a/testing/tests/regression-suite/0006-Mulberry-1.test
+++ b/testing/tests/regression-suite/0006-Mulberry-1.test
@@ -1,7 +1,7 @@
 #
 # After creating the calendar we should be able to get any URLs
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0007-Mulberry-1.test b/testing/tests/regression-suite/0007-Mulberry-1.test
index 9f454079..521936ac 100644
--- a/testing/tests/regression-suite/0007-Mulberry-1.test
+++ b/testing/tests/regression-suite/0007-Mulberry-1.test
@@ -2,5 +2,5 @@
 # So we should now make a calendar that we will use for some
 # testing.
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
diff --git a/testing/tests/regression-suite/0010-Mulberry-PUT-1.test b/testing/tests/regression-suite/0010-Mulberry-PUT-1.test
index 45eea98d..63565088 100644
--- a/testing/tests/regression-suite/0010-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/0010-Mulberry-PUT-1.test
@@ -1,7 +1,7 @@
 #
 # We now have a calendar so we can PUT an event into it...
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
+URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
 
diff --git a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test
index 2a50f15a..f6fa3296 100644
--- a/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test
+++ b/testing/tests/regression-suite/0011-Mulberry-PUT-1b.test
@@ -1,7 +1,7 @@
 #
 # We now have a calendar so we can PUT an event into it...
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
+URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEADER=If-Match: "b000d7defa19ccb7cd21e546b54155ee"
 HEAD
diff --git a/testing/tests/regression-suite/0012-Mulberry-PUT-2.test b/testing/tests/regression-suite/0012-Mulberry-PUT-2.test
index 0f2b14fd..3a028db6 100644
--- a/testing/tests/regression-suite/0012-Mulberry-PUT-2.test
+++ b/testing/tests/regression-suite/0012-Mulberry-PUT-2.test
@@ -1,7 +1,7 @@
 #
 # We now have a calendar so we can PUT an event into it...
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
+URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
 
diff --git a/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.test b/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.test
index e76ffee7..c2bdaa4d 100644
--- a/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.test
+++ b/testing/tests/regression-suite/0013-Mulberry-PROPFIND-5.test
@@ -2,7 +2,7 @@
 # Before creating a calendar in Mulberry, we should be able
 # to do a PROPFIND and it should not be there.
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0014-Mulberry-PUT-3.test b/testing/tests/regression-suite/0014-Mulberry-PUT-3.test
index c8b072af..e546bd70 100644
--- a/testing/tests/regression-suite/0014-Mulberry-PUT-3.test
+++ b/testing/tests/regression-suite/0014-Mulberry-PUT-3.test
@@ -1,7 +1,7 @@
 #
 # We now have a calendar so we can PUT an event into it...
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
+URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
 
diff --git a/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.test b/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.test
index f499697c..0d23020c 100644
--- a/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.test
+++ b/testing/tests/regression-suite/0015-Mulberry-PROPFIND-6.test
@@ -2,7 +2,7 @@
 # Before creating a calendar in Mulberry, we should be able
 # to do a PROPFIND and it should not be there.
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Depth: 1
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.test b/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.test
index ba1a0811..63a850de 100644
--- a/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.test
+++ b/testing/tests/regression-suite/0016-Mulberry-MKCALENDAR-3.test
@@ -1,5 +1,5 @@
 #
 # Make a calendar for someone else who we are allowed to write to
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/resource2/mulberry/
+URL=http://regression.host/caldav.php/resource2/mulberry/
 HEAD
diff --git a/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.test b/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.test
index d87bcad8..6ccc2b39 100644
--- a/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.test
+++ b/testing/tests/regression-suite/0017-Mulberry-MKCALENDAR-4.test
@@ -1,5 +1,5 @@
 #
 # Make a calendar for someone else who we are *NOT* allowed to write to
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/admin/home/
+URL=http://regression.host/caldav.php/admin/home/
 HEAD
diff --git a/testing/tests/regression-suite/0018-Mulberry-PUT-4.test b/testing/tests/regression-suite/0018-Mulberry-PUT-4.test
index 423527f6..7376b860 100644
--- a/testing/tests/regression-suite/0018-Mulberry-PUT-4.test
+++ b/testing/tests/regression-suite/0018-Mulberry-PUT-4.test
@@ -1,7 +1,7 @@
 #
 # We now have a calendar so we can PUT an event into it...
 TYPE=PUT
-URL=http://mycaldav/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics
+URL=http://regression.host/caldav.php/resource2/home/0A5EA1F0F2691A03E917E85F9F255448-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
 
diff --git a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.test b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.test
index 3e9f3430..1ff78f0f 100644
--- a/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.test
+++ b/testing/tests/regression-suite/0019-Mulberry-OPTIONS-3.test
@@ -1,5 +1,5 @@
 #
 # Do an OPTIONS request for an illegal path
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/(admin|user1)/
+URL=http://regression.host/caldav.php/(admin|user1)/
 HEAD
diff --git a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.test b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.test
index a18f2c1c..9cc5d804 100644
--- a/testing/tests/regression-suite/0020-Mulberry-DELETE-1.test
+++ b/testing/tests/regression-suite/0020-Mulberry-DELETE-1.test
@@ -1,7 +1,7 @@
 #
 # Do a DELETE with a bogus etag so it will fail.
 TYPE=DELETE
-URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
+URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
 HEADER=If-Match: "bogus-etag-b000d7defa19ccb7cd21e546b54155ee"
 HEAD
 
diff --git a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test
index 45cc8705..31dbb7cb 100644
--- a/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test
+++ b/testing/tests/regression-suite/0021-Mulberry-DELETE-2.test
@@ -1,7 +1,7 @@
 #
 # Do a DELETE with a correct etag which will succeed.
 TYPE=DELETE
-URL=http://mycaldav/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
+URL=http://regression.host/caldav.php/user1/home/F56B49B10FC923D20FE2DC92D6580340-0.ics
 HEADER=If-Match: "6cff373f55c3e8318ad1c0db93205d08"
 HEAD
 
diff --git a/testing/tests/regression-suite/0022-Mulberry-PUT-5.test b/testing/tests/regression-suite/0022-Mulberry-PUT-5.test
index a9904f5b..928c0c84 100644
--- a/testing/tests/regression-suite/0022-Mulberry-PUT-5.test
+++ b/testing/tests/regression-suite/0022-Mulberry-PUT-5.test
@@ -2,7 +2,7 @@
 # PUT another event into the resource2 calendar so we can DELETE it
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics
+URL=http://regression.host/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
 
diff --git a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.test b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.test
index 074ac8c3..3cc8eca3 100644
--- a/testing/tests/regression-suite/0023-Mulberry-DELETE-3.test
+++ b/testing/tests/regression-suite/0023-Mulberry-DELETE-3.test
@@ -1,7 +1,7 @@
 #
 # Do a DELETE with a correct etag which will succeed.
 TYPE=DELETE
-URL=http://mycaldav/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics
+URL=http://regression.host/caldav.php/resource2/home/27D2201A83F0CD2EA9ECEBB588F796A7-0.ics
 HEAD
 
 QUERY
diff --git a/testing/tests/regression-suite/0099-REPORT-sync-initial.test b/testing/tests/regression-suite/0099-REPORT-sync-initial.test
index e161d7bd..a2fc7809 100644
--- a/testing/tests/regression-suite/0099-REPORT-sync-initial.test
+++ b/testing/tests/regression-suite/0099-REPORT-sync-initial.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT sync-collection with no sync-token
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: sync-collection initial REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/0100-Evo-OPTIONS-1.test b/testing/tests/regression-suite/0100-Evo-OPTIONS-1.test
index fd07a511..7756e5c9 100644
--- a/testing/tests/regression-suite/0100-Evo-OPTIONS-1.test
+++ b/testing/tests/regression-suite/0100-Evo-OPTIONS-1.test
@@ -1,6 +1,6 @@
 #
 # Do an initial OPTIONS request
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 NOAUTH
 HEAD
diff --git a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.test b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.test
index c7fa2409..04693221 100644
--- a/testing/tests/regression-suite/0101-Evo-OPTIONS-1.test
+++ b/testing/tests/regression-suite/0101-Evo-OPTIONS-1.test
@@ -1,6 +1,6 @@
 #
 # Do another OPTIONS request, this time with credentials
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 AUTH=user1:user1
 HEAD
diff --git a/testing/tests/regression-suite/0102-Evo-REPORT-1.test b/testing/tests/regression-suite/0102-Evo-REPORT-1.test
index 2c0ef352..791f6940 100644
--- a/testing/tests/regression-suite/0102-Evo-REPORT-1.test
+++ b/testing/tests/regression-suite/0102-Evo-REPORT-1.test
@@ -1,7 +1,7 @@
 #
 # Do a REPORT request
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 HEADER=Depth: 1
 HEADER=User-Agent: Evolution/1.8.1
diff --git a/testing/tests/regression-suite/0103-Evo-GET-1.test b/testing/tests/regression-suite/0103-Evo-GET-1.test
index 9d7289c3..ffd6ece9 100644
--- a/testing/tests/regression-suite/0103-Evo-GET-1.test
+++ b/testing/tests/regression-suite/0103-Evo-GET-1.test
@@ -2,6 +2,6 @@
 # Now we GET the entry that was in the report.
 #
 TYPE=GET
-URL=http://mycaldav/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
+URL=http://regression.host/caldav.php/user1/home/3F4CF6227300FD062D9EF3CDFB30D32D-0.ics
 HEADER=User-Agent: Evolution/1.8.1
 HEAD
diff --git a/testing/tests/regression-suite/0104-Evo-PUT-1.test b/testing/tests/regression-suite/0104-Evo-PUT-1.test
index 3f962446..b1b65da4 100644
--- a/testing/tests/regression-suite/0104-Evo-PUT-1.test
+++ b/testing/tests/regression-suite/0104-Evo-PUT-1.test
@@ -1,7 +1,7 @@
 #
 # We PUT an appointment with Evolution
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics
+URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics
 HEADER=If-None-Match: *
 HEADER=User-Agent: Evolution/1.8.1
 HEADER=Content-Type: text/calendar
@@ -21,7 +21,7 @@ DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
  20061101T110000
 SUMMARY:A Meeting
 X-EVOLUTION-CALDAV-HREF:http:
- //user1@mycaldav/caldav.php/user1/home/20061101T073004Z.ics
+ //user1@regression.host/caldav.php/user1/home/20061101T073004Z.ics
 BEGIN:VALARM
 X-EVOLUTION-ALARM-UID:20061101T073000Z-10480-1000-1-5@ubu
 ACTION:DISPLAY
diff --git a/testing/tests/regression-suite/0105-Evo-REPORT-1.test b/testing/tests/regression-suite/0105-Evo-REPORT-1.test
index 2c0ef352..791f6940 100644
--- a/testing/tests/regression-suite/0105-Evo-REPORT-1.test
+++ b/testing/tests/regression-suite/0105-Evo-REPORT-1.test
@@ -1,7 +1,7 @@
 #
 # Do a REPORT request
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 HEADER=Depth: 1
 HEADER=User-Agent: Evolution/1.8.1
diff --git a/testing/tests/regression-suite/0106-Evo-GET-1.test b/testing/tests/regression-suite/0106-Evo-GET-1.test
index b50bd28f..f69c3de2 100644
--- a/testing/tests/regression-suite/0106-Evo-GET-1.test
+++ b/testing/tests/regression-suite/0106-Evo-GET-1.test
@@ -2,6 +2,6 @@
 # Now we GET the entry that was in the report.
 #
 TYPE=GET
-URL=http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics
+URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics
 HEADER=User-Agent: Evolution/1.8.1
 HEAD
diff --git a/testing/tests/regression-suite/0107-Evo-REPORT-1.test b/testing/tests/regression-suite/0107-Evo-REPORT-1.test
index 820ae583..a06fc9c0 100644
--- a/testing/tests/regression-suite/0107-Evo-REPORT-1.test
+++ b/testing/tests/regression-suite/0107-Evo-REPORT-1.test
@@ -2,7 +2,7 @@
 # Do a REPORT request (test RewriteRule support)
 #
 TYPE=REPORT
-URL=http://mycaldav/user1/home/
+URL=http://regression.host/user1/home/
 HEAD
 HEADER=Depth: 1
 HEADER=User-Agent: Evolution/1.8.1
diff --git a/testing/tests/regression-suite/0200-Moz-OPTIONS-1.test b/testing/tests/regression-suite/0200-Moz-OPTIONS-1.test
index 3b893144..0e7aac56 100644
--- a/testing/tests/regression-suite/0200-Moz-OPTIONS-1.test
+++ b/testing/tests/regression-suite/0200-Moz-OPTIONS-1.test
@@ -2,7 +2,7 @@
 # Do an initial OPTIONS request (unauthenticated)
 # ... actually, Mozilla Calendar doesn't do this, but no doubt they will.
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 NOAUTH
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.test b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.test
index 86e3a332..6dae95ec 100644
--- a/testing/tests/regression-suite/0201-Moz-OPTIONS-2.test
+++ b/testing/tests/regression-suite/0201-Moz-OPTIONS-2.test
@@ -2,7 +2,7 @@
 # Do an initial OPTIONS request (authenticated)
 # ... actually, Mozilla Calendar doesn't do this, but no doubt they will.
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
diff --git a/testing/tests/regression-suite/0202-Moz-REPORT-1.test b/testing/tests/regression-suite/0202-Moz-REPORT-1.test
index 37cfd665..f4c6f2d4 100644
--- a/testing/tests/regression-suite/0202-Moz-REPORT-1.test
+++ b/testing/tests/regression-suite/0202-Moz-REPORT-1.test
@@ -1,7 +1,7 @@
 #
 # Do a REPORT request (unauthenticated)
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 NOAUTH
 
diff --git a/testing/tests/regression-suite/0203-Moz-REPORT-2.test b/testing/tests/regression-suite/0203-Moz-REPORT-2.test
index e8c43667..75a05929 100644
--- a/testing/tests/regression-suite/0203-Moz-REPORT-2.test
+++ b/testing/tests/regression-suite/0203-Moz-REPORT-2.test
@@ -1,7 +1,7 @@
 #
 # Do a REPORT request (authenticated)
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0204-Moz-REPORT-3.test b/testing/tests/regression-suite/0204-Moz-REPORT-3.test
index 891d0a70..eeb09cf2 100644
--- a/testing/tests/regression-suite/0204-Moz-REPORT-3.test
+++ b/testing/tests/regression-suite/0204-Moz-REPORT-3.test
@@ -1,7 +1,7 @@
 #
 # Do a REPORT request for another user's calendar
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/resource2/home/
+URL=http://regression.host/caldav.php/resource2/home/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0205-Moz-PROPFIND-1.test b/testing/tests/regression-suite/0205-Moz-PROPFIND-1.test
index 73a5acac..a8ed6ab9 100644
--- a/testing/tests/regression-suite/0205-Moz-PROPFIND-1.test
+++ b/testing/tests/regression-suite/0205-Moz-PROPFIND-1.test
@@ -1,7 +1,7 @@
 #
 # Do a PROPFIND request
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0206-Moz-PUT-1.test b/testing/tests/regression-suite/0206-Moz-PUT-1.test
index 4a6e3c61..5c9a614b 100644
--- a/testing/tests/regression-suite/0206-Moz-PUT-1.test
+++ b/testing/tests/regression-suite/0206-Moz-PUT-1.test
@@ -2,7 +2,7 @@
 # PUT a recurring event that we can check we can/can't see at appropriate dates
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics HTTP/1.1
+URL=http://regression.host/caldav.php/user1/home/4aaf8f37-f232-4c8e-a72e-e171d4c4fe54.ics HTTP/1.1
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101108 Calendar/0.4a1
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0207-Moz-REPORT-4.test b/testing/tests/regression-suite/0207-Moz-REPORT-4.test
index 95df9d27..becff423 100644
--- a/testing/tests/regression-suite/0207-Moz-REPORT-4.test
+++ b/testing/tests/regression-suite/0207-Moz-REPORT-4.test
@@ -2,7 +2,7 @@
 # Request a REPORT which should only include an instance of the repeating event we just added
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101108 Calendar/0.4a1
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0208-Moz-REPORT-5.test b/testing/tests/regression-suite/0208-Moz-REPORT-5.test
index a690084a..63e4b9e8 100644
--- a/testing/tests/regression-suite/0208-Moz-REPORT-5.test
+++ b/testing/tests/regression-suite/0208-Moz-REPORT-5.test
@@ -3,7 +3,7 @@
 # others.
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20061108 Calendar/0.4a1
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.test b/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.test
index 64c51231..06800f08 100644
--- a/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.test
+++ b/testing/tests/regression-suite/0209-Moz-PUT-CONFIDENTIAL.test
@@ -3,7 +3,7 @@
 # as a different user (later).
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
+URL=http://regression.host/caldav.php/user1/home/9d050be7-8a02-4355-8ed3-02a9fc5f473f.ics
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a2pre) Gecko/20061222 Calendar/3.0a1
 HEADER=Accept: text/html,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.test b/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.test
index 79949431..6194dec8 100644
--- a/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.test
+++ b/testing/tests/regression-suite/0210-Moz-PUT-PRIVATE.test
@@ -3,7 +3,7 @@
 # as a different user (later).
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics
+URL=http://regression.host/caldav.php/user1/home/1906b3ca-4890-468a-9b58-1de74bf2c716.ics
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a2pre) Gecko/20061222 Calendar/3.0a1
 HEADER=Accept: text/html,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.test b/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.test
index 08ec855e..d9e5376f 100644
--- a/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.test
+++ b/testing/tests/regression-suite/0211-Moz-PUT-TENTATIVE.test
@@ -3,7 +3,7 @@
 # as a different user (later).
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics
+URL=http://regression.host/caldav.php/user1/home/fbd57454-d966-4a14-8341-abe1edb1ae66.ics
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a2pre) Gecko/20061222 Calendar/3.0a1
 HEADER=Accept: text/html,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0212-Moz-PROPFIND.test b/testing/tests/regression-suite/0212-Moz-PROPFIND.test
index 0507025d..11db23fd 100644
--- a/testing/tests/regression-suite/0212-Moz-PROPFIND.test
+++ b/testing/tests/regression-suite/0212-Moz-PROPFIND.test
@@ -3,7 +3,7 @@
 # we continue to see this as a collection...
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home
+URL=http://regression.host/caldav.php/user1/home
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0213-Moz-MKCALENDAR.test b/testing/tests/regression-suite/0213-Moz-MKCALENDAR.test
index 9dc6860e..60818173 100644
--- a/testing/tests/regression-suite/0213-Moz-MKCALENDAR.test
+++ b/testing/tests/regression-suite/0213-Moz-MKCALENDAR.test
@@ -1,7 +1,7 @@
 #
 # Make a calendar, with XML attached, for someone who we are allowed to write to
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/resource1/mozilla/
+URL=http://regression.host/caldav.php/resource1/mozilla/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0214-Moz-PUT-New-Task.test b/testing/tests/regression-suite/0214-Moz-PUT-New-Task.test
index 5467c4b4..549f3ea6 100644
--- a/testing/tests/regression-suite/0214-Moz-PUT-New-Task.test
+++ b/testing/tests/regression-suite/0214-Moz-PUT-New-Task.test
@@ -2,7 +2,7 @@
 # PUT a new task in the calendar
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics
+URL=http://regression.host/caldav.php/user1/home/2178279a-aec2-471f-832d-1f6df6203f2f.ics
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7pre) Gecko/20070805 Calendar/0.7pre
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
diff --git a/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.test b/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.test
index 845a2083..3fc764d8 100644
--- a/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.test
+++ b/testing/tests/regression-suite/0215-Moz-PUT-InProgress-Task.test
@@ -2,7 +2,7 @@
 # PUT an "In Progress" task in the calendar
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics
+URL=http://regression.host/caldav.php/user1/home/917b9e47-b748-4550-a566-657fbe672447.ics
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7pre) Gecko/20070805 Calendar/0.7pre
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
diff --git a/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.test b/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.test
index 957ff1c8..aa502fc4 100644
--- a/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.test
+++ b/testing/tests/regression-suite/0216-Moz-PUT-Completed-Task.test
@@ -2,7 +2,7 @@
 # PUT a completed task in the calendar
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
+URL=http://regression.host/caldav.php/user1/home/0575d895-a006-4ed8-9be6-0d1b6b6b1f96.ics
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7pre) Gecko/20070805 Calendar/0.7pre
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
diff --git a/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.test b/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.test
index 81052eb2..cc3e571e 100644
--- a/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.test
+++ b/testing/tests/regression-suite/0217-Moz-PUT-Cancelled-Task.test
@@ -2,7 +2,7 @@
 # PUT a new task in the calendar
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics
+URL=http://regression.host/caldav.php/user1/home/b1679f77-673d-4f46-b3eb-2420e1bba301.ics
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.7pre) Gecko/20070805 Calendar/0.7pre
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
diff --git a/testing/tests/regression-suite/0218-Moz-REPORT.test b/testing/tests/regression-suite/0218-Moz-REPORT.test
index 0349e58d..d3d9c337 100644
--- a/testing/tests/regression-suite/0218-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0218-Moz-REPORT.test
@@ -3,7 +3,7 @@
 #
 TYPE=REPORT
 AUTH=manager1:manager1
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101108 Calendar/0.4a1
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0219-Moz-REPORT.test b/testing/tests/regression-suite/0219-Moz-REPORT.test
index e593e086..0fffa322 100644
--- a/testing/tests/regression-suite/0219-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0219-Moz-REPORT.test
@@ -3,7 +3,7 @@
 #
 TYPE=REPORT
 AUTH=assistant1:assistant1
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20061108 Calendar/0.4a1
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0220-Moz-REPORT.test b/testing/tests/regression-suite/0220-Moz-REPORT.test
index bc23ded1..9fe4498a 100644
--- a/testing/tests/regression-suite/0220-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0220-Moz-REPORT.test
@@ -2,7 +2,7 @@
 # Request a REPORT but don't send any actual valid XML data(!)
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20061108 Calendar/0.4a1
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0221-Moz-PROPFIND.test b/testing/tests/regression-suite/0221-Moz-PROPFIND.test
index d1b5d7ee..a0c614ca 100644
--- a/testing/tests/regression-suite/0221-Moz-PROPFIND.test
+++ b/testing/tests/regression-suite/0221-Moz-PROPFIND.test
@@ -1,7 +1,7 @@
 #
 # Do a PROPFIND request
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user5/home/
+URL=http://regression.host/caldav.php/user5/home/
 HEAD
 AUTH=user5:user5
 
diff --git a/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.test b/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.test
index 318bcf5f..b9f82c44 100644
--- a/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.test
+++ b/testing/tests/regression-suite/0222-Moz-OPTIONS-allowed.test
@@ -3,7 +3,7 @@
 # have read access to.
 #
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/manager1/
+URL=http://regression.host/caldav.php/manager1/
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20111013 Thunderbird/1.5.0.7
 
diff --git a/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.test b/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.test
index 48a79238..779a319c 100644
--- a/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.test
+++ b/testing/tests/regression-suite/0223-Moz-OPTIONS-denied.test
@@ -3,7 +3,7 @@
 # do not have read access to.
 #
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user3/
+URL=http://regression.host/caldav.php/user3/
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20111013 Thunderbird/1.5.0.7
 
diff --git a/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.test b/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.test
index 03be9f38..576c3953 100644
--- a/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.test
+++ b/testing/tests/regression-suite/0224-Moz-OPTIONS-principal.test
@@ -2,7 +2,7 @@
 # Do an OPTIONS request against our own principal-URL
 #
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 
 HEADER=User-Agent: DAViCalTester/1.0
 
diff --git a/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.test b/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.test
index 73e4a75e..0627a610 100644
--- a/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.test
+++ b/testing/tests/regression-suite/0225-Moz-OPTIONS-group-principal.test
@@ -2,7 +2,7 @@
 # Do an OPTIONS request against the principal-URL of a group we are a member of
 #
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/teamclient1/
+URL=http://regression.host/caldav.php/teamclient1/
 
 HEADER=User-Agent: DAViCalTester/1.0
 
diff --git a/testing/tests/regression-suite/0232-Moz-PROPFIND.test b/testing/tests/regression-suite/0232-Moz-PROPFIND.test
index 9c88891d..981b80e9 100644
--- a/testing/tests/regression-suite/0232-Moz-PROPFIND.test
+++ b/testing/tests/regression-suite/0232-Moz-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to Mozilla Sunbird 0.7
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
diff --git a/testing/tests/regression-suite/0233-Moz-PUT.test b/testing/tests/regression-suite/0233-Moz-PUT.test
index b85bf749..a878fa2a 100644
--- a/testing/tests/regression-suite/0233-Moz-PUT.test
+++ b/testing/tests/regression-suite/0233-Moz-PUT.test
@@ -2,7 +2,7 @@
 # PUT a Mozilla style event into the database
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics
+URL=http://regression.host/caldav.php/user1/home/e70576e9-c1e0-431e-a507-0386fd82f223.ics
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0234-Moz-PUT.test b/testing/tests/regression-suite/0234-Moz-PUT.test
index 9d488ece..bd84594d 100644
--- a/testing/tests/regression-suite/0234-Moz-PUT.test
+++ b/testing/tests/regression-suite/0234-Moz-PUT.test
@@ -2,7 +2,7 @@
 # PUT a Mozilla style event into the database
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics
+URL=http://regression.host/caldav.php/user1/home/e6eb5bc9-f7f9-4a0a-94e8-8e90eefc7d08.ics
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
 HEADER=Accept: text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0235-Moz-REPORT.test b/testing/tests/regression-suite/0235-Moz-REPORT.test
index 54df207c..256c38f8 100644
--- a/testing/tests/regression-suite/0235-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0235-Moz-REPORT.test
@@ -2,7 +2,7 @@
 # Check for REPORT calendar-query of VEVENT within time range
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0236-Moz-REPORT.test b/testing/tests/regression-suite/0236-Moz-REPORT.test
index b96efa19..0671f760 100644
--- a/testing/tests/regression-suite/0236-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0236-Moz-REPORT.test
@@ -2,7 +2,7 @@
 # Check for REPORT calendar-query of VTODO within time range
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8pre) Gecko/20071023 Sunbird/0.7
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0237-Moz-REPORT.test b/testing/tests/regression-suite/0237-Moz-REPORT.test
index bb72200b..55dd0e3e 100644
--- a/testing/tests/regression-suite/0237-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0237-Moz-REPORT.test
@@ -2,7 +2,7 @@
 # Check for REPORT calendar-query of VTODO within time range
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.13pre) Gecko/20080916 Debian/unstable (Codename:sid) Iceowl/0.8
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0240-Moz-PROPFIND.test b/testing/tests/regression-suite/0240-Moz-PROPFIND.test
index 0bf7af04..8b425929 100644
--- a/testing/tests/regression-suite/0240-Moz-PROPFIND.test
+++ b/testing/tests/regression-suite/0240-Moz-PROPFIND.test
@@ -2,7 +2,7 @@
 # Check for PROPFIND for scheduing inbox/outbox
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20100917 Sunbird/1.0
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0241-Moz-REPORT.test b/testing/tests/regression-suite/0241-Moz-REPORT.test
index 7b226d34..2cbbf2b7 100644
--- a/testing/tests/regression-suite/0241-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0241-Moz-REPORT.test
@@ -2,7 +2,7 @@
 # REPORT on scheduling inbox for pending VTODO on startup
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/.in/
+URL=http://regression.host/caldav.php/user1/.in/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0242-Moz-REPORT.test b/testing/tests/regression-suite/0242-Moz-REPORT.test
index 56ffc89f..6364b988 100644
--- a/testing/tests/regression-suite/0242-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0242-Moz-REPORT.test
@@ -2,7 +2,7 @@
 # REPORT on scheduling inbox for pending VEVENT on startup
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/.in/
+URL=http://regression.host/caldav.php/user1/.in/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0243-Moz-POST-FB.test b/testing/tests/regression-suite/0243-Moz-POST-FB.test
index 82f7b720..6690bc8d 100644
--- a/testing/tests/regression-suite/0243-Moz-POST-FB.test
+++ b/testing/tests/regression-suite/0243-Moz-POST-FB.test
@@ -2,7 +2,7 @@
 # POST to scheduling outbox for freebusy query on user2
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0244-Moz-POST-FB.test b/testing/tests/regression-suite/0244-Moz-POST-FB.test
index 01955e4c..3d7aa2b7 100644
--- a/testing/tests/regression-suite/0244-Moz-POST-FB.test
+++ b/testing/tests/regression-suite/0244-Moz-POST-FB.test
@@ -2,7 +2,7 @@
 # POST to scheduling outbox for freebusy query on user2
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0245-Moz-POST-FB.test b/testing/tests/regression-suite/0245-Moz-POST-FB.test
index 7dc107a8..c1b5d94f 100644
--- a/testing/tests/regression-suite/0245-Moz-POST-FB.test
+++ b/testing/tests/regression-suite/0245-Moz-POST-FB.test
@@ -2,7 +2,7 @@
 # POST to scheduling outbox for freebusy query on user2
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0246-Moz-POST-FB.test b/testing/tests/regression-suite/0246-Moz-POST-FB.test
index 2f7b0672..291917b0 100644
--- a/testing/tests/regression-suite/0246-Moz-POST-FB.test
+++ b/testing/tests/regression-suite/0246-Moz-POST-FB.test
@@ -2,7 +2,7 @@
 # POST to scheduling outbox for freebusy query on user2
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0247-Moz-PROPFIND.test b/testing/tests/regression-suite/0247-Moz-PROPFIND.test
index 21f40eb4..dafeee01 100644
--- a/testing/tests/regression-suite/0247-Moz-PROPFIND.test
+++ b/testing/tests/regression-suite/0247-Moz-PROPFIND.test
@@ -2,7 +2,7 @@
 # Check for PROPFIND for scheduing inbox/outbox
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9
 HEADER=Accept: text/xml
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0248-Bad-PROPFIND.test b/testing/tests/regression-suite/0248-Bad-PROPFIND.test
index 7a8d706d..5b804da6 100644
--- a/testing/tests/regression-suite/0248-Bad-PROPFIND.test
+++ b/testing/tests/regression-suite/0248-Bad-PROPFIND.test
@@ -2,7 +2,7 @@
 # Do a PROPFIND request with junk in the request
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home
+URL=http://regression.host/caldav.php/user1/home
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0249-Empty-PROPFIND.test b/testing/tests/regression-suite/0249-Empty-PROPFIND.test
index 7365837c..03a0f411 100644
--- a/testing/tests/regression-suite/0249-Empty-PROPFIND.test
+++ b/testing/tests/regression-suite/0249-Empty-PROPFIND.test
@@ -3,7 +3,7 @@
 # we continue to see this as a collection...
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home
+URL=http://regression.host/caldav.php/user1/home
 # HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20061013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.test b/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.test
index 2e89fa63..fe3e2bb9 100644
--- a/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.test
+++ b/testing/tests/regression-suite/0300-Chandler-OPTIONS-1.test
@@ -1,7 +1,7 @@
 #
 # Do an initial OPTIONS request (unauthenticated)
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 NOAUTH
 
 HEADER=User-Agent: Chandler/0.7alpha4 (Linux)
diff --git a/testing/tests/regression-suite/0301-Chandler-HEAD-1.test b/testing/tests/regression-suite/0301-Chandler-HEAD-1.test
index 4f3f575d..91255f10 100644
--- a/testing/tests/regression-suite/0301-Chandler-HEAD-1.test
+++ b/testing/tests/regression-suite/0301-Chandler-HEAD-1.test
@@ -1,7 +1,7 @@
 #
 # Do an initial HEAD request (unauthenticated)
 TYPE=HEAD
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 NOAUTH
 
 HEADER=User-Agent: Chandler/0.7alpha4 (Linux)
diff --git a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.test b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.test
index f11dd592..c3b12b3d 100644
--- a/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.test
+++ b/testing/tests/regression-suite/0302-Chandler-OPTIONS-2.test
@@ -1,7 +1,7 @@
 #
 # Do an initial OPTIONS request (authenticated)
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 
 HEADER=Chandler/0.7alpha4 (Linux)
 HEAD
diff --git a/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.test b/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.test
index 59cbccd9..1da6b953 100644
--- a/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.test
+++ b/testing/tests/regression-suite/0303-Chandler-PROPFIND-1.test
@@ -3,7 +3,7 @@
 # that it actually is one.
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Depth: 0
 HEADER=Content-Type: text/xml; charset=utf-8
 HEADER=Chandler/0.7alpha4 (Linux)
diff --git a/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.test b/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.test
index 91389b55..c2523bd1 100644
--- a/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.test
+++ b/testing/tests/regression-suite/0304-Chandler-PROPFIND-2.test
@@ -3,7 +3,7 @@
 # that it wants to find out what privileges are available.
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Depth: 0
 HEADER=Content-Type: text/xml; charset=utf-8
 HEADER=Chandler/0.7alpha4 (Linux)
diff --git a/testing/tests/regression-suite/0305-Chandler-MKCOL-1.test b/testing/tests/regression-suite/0305-Chandler-MKCOL-1.test
index 6769c326..a63d52b4 100644
--- a/testing/tests/regression-suite/0305-Chandler-MKCOL-1.test
+++ b/testing/tests/regression-suite/0305-Chandler-MKCOL-1.test
@@ -3,7 +3,7 @@
 # search for understanding
 #
 TYPE=MKCOL
-URL=http://mycaldav/caldav.php/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/
+URL=http://regression.host/caldav.php/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/
 
 HEADER=Chandler/0.7alpha4 (Linux)
 HEAD
diff --git a/testing/tests/regression-suite/0306-Chandler-DELETE-1.test b/testing/tests/regression-suite/0306-Chandler-DELETE-1.test
index df26eb15..cfcb7e90 100644
--- a/testing/tests/regression-suite/0306-Chandler-DELETE-1.test
+++ b/testing/tests/regression-suite/0306-Chandler-DELETE-1.test
@@ -3,7 +3,7 @@
 # this point in it's search for understanding
 #
 TYPE=DELETE
-URL=http://mycaldav/caldav.php/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/
+URL=http://regression.host/caldav.php/user1/home/.ce7ad224-8288-11db-ec28-b49a13ab0e46.tmp/
 
 HEADER=Chandler/0.7alpha4 (Linux)
 HEAD
diff --git a/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.test b/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.test
index 285d02ea..cb34b4e7 100644
--- a/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.test
+++ b/testing/tests/regression-suite/0308-Chandler-OPTIONS-3.test
@@ -1,7 +1,7 @@
 #
 # Now do an OPTIONS request on ~/.chandler/
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/home/.chandler/
+URL=http://regression.host/caldav.php/user1/home/.chandler/
 
 HEADER=Chandler/0.7alpha4 (Linux)
 HEAD
diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.test b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.test
index f3864cf5..a2caa9a0 100644
--- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.test
+++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-3.test
@@ -4,7 +4,7 @@
 # Still Depth: 0 at this point...
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/.chandler/
+URL=http://regression.host/caldav.php/user1/home/.chandler/
 HEADER=Depth: 0
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.test b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.test
index 7ae19eac..42493e49 100644
--- a/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.test
+++ b/testing/tests/regression-suite/0309-Chandler-PROPFIND-4.test
@@ -4,7 +4,7 @@
 # Still Depth: 0 at this point...
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Depth: infinity
 HEADER=Content-Type: text/xml; charset=utf-8
 HEADER=Chandler/0.7alpha4 (Linux)
diff --git a/testing/tests/regression-suite/0310-Chandler-PUT-1.test b/testing/tests/regression-suite/0310-Chandler-PUT-1.test
index d307ed3a..04292f61 100644
--- a/testing/tests/regression-suite/0310-Chandler-PUT-1.test
+++ b/testing/tests/regression-suite/0310-Chandler-PUT-1.test
@@ -2,7 +2,7 @@
 # PUT request like Chandler does it.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics
+URL=http://regression.host/caldav.php/user1/home/71e2ae82-7870-11db-c6d6-f6927c144649.ics
 HEADER=Content-Type: text/calendar
 HEAD
 
diff --git a/testing/tests/regression-suite/0311-Chandler-PUT-2.test b/testing/tests/regression-suite/0311-Chandler-PUT-2.test
index 80cfb94c..86e848c0 100644
--- a/testing/tests/regression-suite/0311-Chandler-PUT-2.test
+++ b/testing/tests/regression-suite/0311-Chandler-PUT-2.test
@@ -2,7 +2,7 @@
 # PUT request like Chandler does it.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics
+URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics
 HEADER=Content-Type: text/calendar
 HEAD
 
diff --git a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.test b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.test
index 849f651e..d4bcfea5 100644
--- a/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.test
+++ b/testing/tests/regression-suite/0400-Cadaver-OPTIONS-1.test
@@ -2,6 +2,6 @@
 # Basic testing with Cadaver DAV client
 #
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: cadaver/0.22.3 neon/0.25.5
 HEAD
diff --git a/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.test b/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.test
index 7fd5a92d..97427f6f 100644
--- a/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.test
+++ b/testing/tests/regression-suite/0401-Cadaver-PROPFIND-1.test
@@ -2,7 +2,7 @@
 # Using CADAVER to do a PROPFIND
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: cadaver/0.22.3 neon/0.25.5
 HEADER=Connection: TE
 HEADER=TE: trailers
diff --git a/testing/tests/regression-suite/0402-Cadaver-GET-1.test b/testing/tests/regression-suite/0402-Cadaver-GET-1.test
index 13d195eb..3350867e 100644
--- a/testing/tests/regression-suite/0402-Cadaver-GET-1.test
+++ b/testing/tests/regression-suite/0402-Cadaver-GET-1.test
@@ -2,7 +2,7 @@
 # Doing a GET with cadaver
 #
 TYPE=GET
-URL=http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics
+URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics
 HEADER=User-Agent: cadaver/0.22.3 neon/0.25.5
 HEADER=Connection: TE
 HEADER=TE: trailers
diff --git a/testing/tests/regression-suite/0403-Cadaver-LOCK-1.test b/testing/tests/regression-suite/0403-Cadaver-LOCK-1.test
index 2e039acf..9cf51aee 100644
--- a/testing/tests/regression-suite/0403-Cadaver-LOCK-1.test
+++ b/testing/tests/regression-suite/0403-Cadaver-LOCK-1.test
@@ -2,7 +2,7 @@
 # Basic testing with Cadaver DAV client
 #
 TYPE=LOCK
-URL=http://mycaldav/caldav.php/user1/home/20061101T073004Z.ics
+URL=http://regression.host/caldav.php/user1/home/20061101T073004Z.ics
 HEADER=User-Agent: cadaver/0.23.3 neon/0.29.6
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0501-iCal-PROPFIND.test b/testing/tests/regression-suite/0501-iCal-PROPFIND.test
index 761dadea..003f3ef4 100644
--- a/testing/tests/regression-suite/0501-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0501-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 3 (preferably 3.0.1+)
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEAD
 
 HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
diff --git a/testing/tests/regression-suite/0502-iCal-PROPFIND.test b/testing/tests/regression-suite/0502-iCal-PROPFIND.test
index 98ba7a33..03c6fd28 100644
--- a/testing/tests/regression-suite/0502-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0502-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEAD
 
 HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
diff --git a/testing/tests/regression-suite/0503-iCal-PROPFIND.test b/testing/tests/regression-suite/0503-iCal-PROPFIND.test
index 758efcdb..2eaf1fbf 100644
--- a/testing/tests/regression-suite/0503-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0503-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
diff --git a/testing/tests/regression-suite/0504-iCal-PROPFIND.test b/testing/tests/regression-suite/0504-iCal-PROPFIND.test
index 7215639a..590b4ed5 100644
--- a/testing/tests/regression-suite/0504-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0504-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
diff --git a/testing/tests/regression-suite/0505-iCal-PUT.test b/testing/tests/regression-suite/0505-iCal-PUT.test
index e120d10d..d49d65ec 100644
--- a/testing/tests/regression-suite/0505-iCal-PUT.test
+++ b/testing/tests/regression-suite/0505-iCal-PUT.test
@@ -2,7 +2,7 @@
 # PUT an iCal style event into the database
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
+URL=http://regression.host/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEAD
diff --git a/testing/tests/regression-suite/0506-iCal-PUT.test b/testing/tests/regression-suite/0506-iCal-PUT.test
index 0c7dad53..8253eff1 100644
--- a/testing/tests/regression-suite/0506-iCal-PUT.test
+++ b/testing/tests/regression-suite/0506-iCal-PUT.test
@@ -2,7 +2,7 @@
 # PUT a newer version of the event into the calendar.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
+URL=http://regression.host/caldav.php/user1/home/AAA9318E-37D9-4319-8626-95ECD3D3B243.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEADER=If-Match: "b3e66a461ef178bd4791b2b6509bbb9d"
diff --git a/testing/tests/regression-suite/0507-iCal-MKCALENDAR.test b/testing/tests/regression-suite/0507-iCal-MKCALENDAR.test
index 8f73ce10..c332007f 100644
--- a/testing/tests/regression-suite/0507-iCal-MKCALENDAR.test
+++ b/testing/tests/regression-suite/0507-iCal-MKCALENDAR.test
@@ -2,7 +2,7 @@
 # MKCALENDAR test for iCal
 #
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/
+URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/
 HEADER=Content-Type: text/xml
 HEAD
 
diff --git a/testing/tests/regression-suite/0508-iCal-REPORT.test b/testing/tests/regression-suite/0508-iCal-REPORT.test
index 58f20699..7beb1aef 100644
--- a/testing/tests/regression-suite/0508-iCal-REPORT.test
+++ b/testing/tests/regression-suite/0508-iCal-REPORT.test
@@ -2,7 +2,7 @@
 # iCal does a calendar-multiget REPORT to fetch new events
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Content-Type: text/xml
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEAD
diff --git a/testing/tests/regression-suite/0509-iCal-PROPPATCH.test b/testing/tests/regression-suite/0509-iCal-PROPPATCH.test
index 3685698c..7aaec63e 100644
--- a/testing/tests/regression-suite/0509-iCal-PROPPATCH.test
+++ b/testing/tests/regression-suite/0509-iCal-PROPPATCH.test
@@ -2,7 +2,7 @@
 # iCal does a PROPPATCH to change the name of a calendar
 #
 TYPE=PROPPATCH
-URL=http://mycaldav/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/
+URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/
 HEADER=Content-Type: text/xml
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEAD
diff --git a/testing/tests/regression-suite/0510-iCal-PROPFIND.test b/testing/tests/regression-suite/0510-iCal-PROPFIND.test
index a4fcf29b..0b132b04 100644
--- a/testing/tests/regression-suite/0510-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0510-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
diff --git a/testing/tests/regression-suite/0511-iCal-PROPFIND.test b/testing/tests/regression-suite/0511-iCal-PROPFIND.test
index f027cafe..6fccd8a5 100644
--- a/testing/tests/regression-suite/0511-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0511-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/
+URL=http://regression.host/
 HEAD
 
 HEADER=User-Agent: DAVKit/2.0 (10.5; wrbt) iCal 3.0
diff --git a/testing/tests/regression-suite/0512-iCal-PUT.test b/testing/tests/regression-suite/0512-iCal-PUT.test
index 44a4d6b9..01bc0be4 100644
--- a/testing/tests/regression-suite/0512-iCal-PUT.test
+++ b/testing/tests/regression-suite/0512-iCal-PUT.test
@@ -2,7 +2,7 @@
 # PUT an iCal style event into the database
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics
+URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEAD
diff --git a/testing/tests/regression-suite/0513-iCal-PUT.test b/testing/tests/regression-suite/0513-iCal-PUT.test
index ffa1b4e7..61f08de3 100644
--- a/testing/tests/regression-suite/0513-iCal-PUT.test
+++ b/testing/tests/regression-suite/0513-iCal-PUT.test
@@ -2,7 +2,7 @@
 # Overwrite iCal event with another one
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics
+URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/6C8A0D88-E1F9-4FC1-9EDD-DA258ABF2CFA.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEADER=If-Match: "b7cfb403232dc83f936c15a179901d50"
diff --git a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test
index 2cafaa82..81317bf9 100644
--- a/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test
+++ b/testing/tests/regression-suite/0514-iCal-PUT-VTODO.test
@@ -2,7 +2,7 @@
 # PUT an iCal style event into the database
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics
+URL=http://regression.host/caldav.php/user1/6E20BB7C-EFD9-4F0F-9BDC-5335E04D47E0/E6BC62F3-77C6-4FB7-BDD3-6882E2F1BE74.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEAD
diff --git a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test
index 6e2cb212..47b70077 100644
--- a/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test
+++ b/testing/tests/regression-suite/0515-iCal-PUT-VEVENT.test
@@ -2,7 +2,7 @@
 # PUT an iCal style event with repeats and alarms
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/resource2/home/3C1BF85D-3F28-413F-844F-80EBD33B8EE6.ics
+URL=http://regression.host/caldav.php/resource2/home/3C1BF85D-3F28-413F-844F-80EBD33B8EE6.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEAD
diff --git a/testing/tests/regression-suite/0516-iCal-POST.test b/testing/tests/regression-suite/0516-iCal-POST.test
index 588c3ee2..2c607b6f 100644
--- a/testing/tests/regression-suite/0516-iCal-POST.test
+++ b/testing/tests/regression-suite/0516-iCal-POST.test
@@ -2,7 +2,7 @@
 # Testing for how iCal does a POST for free/busy
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33)
 HEADER=Recipient: mailto:user2@example.net
 HEADER=Content-Type: text/calendar
diff --git a/testing/tests/regression-suite/0517-iCal-POST.test b/testing/tests/regression-suite/0517-iCal-POST.test
index 40acbb62..7204ed9a 100644
--- a/testing/tests/regression-suite/0517-iCal-POST.test
+++ b/testing/tests/regression-suite/0517-iCal-POST.test
@@ -2,7 +2,7 @@
 # Testing for how iCal does a POST for free/busy
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33)
 HEADER=Recipient: mailto:user2@example.net
 HEADER=Content-Type: text/calendar
diff --git a/testing/tests/regression-suite/0520-iCal-PROPFIND.test b/testing/tests/regression-suite/0520-iCal-PROPFIND.test
index 1424c1f0..436e8946 100644
--- a/testing/tests/regression-suite/0520-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0520-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user2/.in/
+URL=http://regression.host/caldav.php/user2/.in/
 HEAD
 
 AUTH=user2:user2
diff --git a/testing/tests/regression-suite/0521-iCal-PROPFIND.test b/testing/tests/regression-suite/0521-iCal-PROPFIND.test
index c3557b2f..25178c09 100644
--- a/testing/tests/regression-suite/0521-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0521-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user2/.out/
+URL=http://regression.host/caldav.php/user2/.out/
 HEAD
 
 AUTH=user2:user2
diff --git a/testing/tests/regression-suite/0522-iCal-PROPFIND.test b/testing/tests/regression-suite/0522-iCal-PROPFIND.test
index a8577af3..819fca52 100644
--- a/testing/tests/regression-suite/0522-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0522-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user2/
+URL=http://regression.host/caldav.php/user2/
 HEAD
 
 AUTH=user2:user2
diff --git a/testing/tests/regression-suite/0523-iCal-PROPFIND.test b/testing/tests/regression-suite/0523-iCal-PROPFIND.test
index 0a783dd3..19e84de8 100644
--- a/testing/tests/regression-suite/0523-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0523-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user2
+URL=http://regression.host/caldav.php/user2
 HEAD
 
 AUTH=user2:user2
diff --git a/testing/tests/regression-suite/0524-iCal-PROPFIND.test b/testing/tests/regression-suite/0524-iCal-PROPFIND.test
index 031dc526..d826ec84 100644
--- a/testing/tests/regression-suite/0524-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0524-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/manager1/
+URL=http://regression.host/caldav.php/manager1/
 HEAD
 
 AUTH=assistant1:assistant1
diff --git a/testing/tests/regression-suite/0525-iCal-PROPFIND.test b/testing/tests/regression-suite/0525-iCal-PROPFIND.test
index f31762c5..be0986ba 100644
--- a/testing/tests/regression-suite/0525-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0525-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/manager1/calendar-proxy-read/
+URL=http://regression.host/caldav.php/manager1/calendar-proxy-read/
 HEAD
 
 AUTH=assistant1:assistant1
diff --git a/testing/tests/regression-suite/0526-iCal-PROPFIND.test b/testing/tests/regression-suite/0526-iCal-PROPFIND.test
index f7e8647b..a769784e 100644
--- a/testing/tests/regression-suite/0526-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0526-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEAD
 
 HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33)
diff --git a/testing/tests/regression-suite/0527-iCal-PROPFIND.test b/testing/tests/regression-suite/0527-iCal-PROPFIND.test
index e9a1d145..1d3a7e23 100644
--- a/testing/tests/regression-suite/0527-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0527-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/resmgr1/
+URL=http://regression.host/caldav.php/resmgr1/
 HEAD
 
 HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33)
diff --git a/testing/tests/regression-suite/0528-iCal-PROPFIND.test b/testing/tests/regression-suite/0528-iCal-PROPFIND.test
index e9a1d145..1d3a7e23 100644
--- a/testing/tests/regression-suite/0528-iCal-PROPFIND.test
+++ b/testing/tests/regression-suite/0528-iCal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/resmgr1/
+URL=http://regression.host/caldav.php/resmgr1/
 HEAD
 
 HEADER=User-Agent: DAVKit/3.0.4 (652); CalendarStore/3.0.5 (841); iCal/3.0.5 (1270); Mac OS X/10.5.5 (9F33)
diff --git a/testing/tests/regression-suite/0550-iPhone-REPORT.test b/testing/tests/regression-suite/0550-iPhone-REPORT.test
index 16146953..e0a21133 100644
--- a/testing/tests/regression-suite/0550-iPhone-REPORT.test
+++ b/testing/tests/regression-suite/0550-iPhone-REPORT.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 3
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0551-iPhone-REPORT.test b/testing/tests/regression-suite/0551-iPhone-REPORT.test
index 7db261b5..038bc761 100644
--- a/testing/tests/regression-suite/0551-iPhone-REPORT.test
+++ b/testing/tests/regression-suite/0551-iPhone-REPORT.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 3
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0552-iPhone-PROPFIND.test b/testing/tests/regression-suite/0552-iPhone-PROPFIND.test
index 1d997924..2093c881 100644
--- a/testing/tests/regression-suite/0552-iPhone-PROPFIND.test
+++ b/testing/tests/regression-suite/0552-iPhone-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 3
 #
 TYPE=PROPFIND
-URL=http://mycaldav/principals/users/user1/
+URL=http://regression.host/principals/users/user1/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0553-iPhone-PROPFIND.test b/testing/tests/regression-suite/0553-iPhone-PROPFIND.test
index d12e2cbb..4c5db4ed 100644
--- a/testing/tests/regression-suite/0553-iPhone-PROPFIND.test
+++ b/testing/tests/regression-suite/0553-iPhone-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 3.1
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0554-iPhone-PROPFIND.test b/testing/tests/regression-suite/0554-iPhone-PROPFIND.test
index 6b8855e0..c9029731 100644
--- a/testing/tests/regression-suite/0554-iPhone-PROPFIND.test
+++ b/testing/tests/regression-suite/0554-iPhone-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 3
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0555-iPhone-REPORT.test b/testing/tests/regression-suite/0555-iPhone-REPORT.test
index eb1d674d..2c358465 100644
--- a/testing/tests/regression-suite/0555-iPhone-REPORT.test
+++ b/testing/tests/regression-suite/0555-iPhone-REPORT.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 3.1
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0556-iPhone-REPORT.test b/testing/tests/regression-suite/0556-iPhone-REPORT.test
index f5fd446c..acf013e0 100644
--- a/testing/tests/regression-suite/0556-iPhone-REPORT.test
+++ b/testing/tests/regression-suite/0556-iPhone-REPORT.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 5
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.test b/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.test
index 1e93120c..8f7967ff 100644
--- a/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.test
+++ b/testing/tests/regression-suite/0557-iPhone-MKCALENDAR.test
@@ -2,7 +2,7 @@
 # MKCALENDAR test for iCal
 #
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/
+URL=http://regression.host/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/
 HEADER=Content-Type: text/xml
 HEAD
 
diff --git a/testing/tests/regression-suite/0558-iPhone-PROPFIND.test b/testing/tests/regression-suite/0558-iPhone-PROPFIND.test
index 13cc7c8c..330ae0bf 100644
--- a/testing/tests/regression-suite/0558-iPhone-PROPFIND.test
+++ b/testing/tests/regression-suite/0558-iPhone-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 3.1
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0559-iOS-REPORT.test b/testing/tests/regression-suite/0559-iOS-REPORT.test
index c8bf923c..61113f11 100644
--- a/testing/tests/regression-suite/0559-iOS-REPORT.test
+++ b/testing/tests/regression-suite/0559-iOS-REPORT.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 5
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0560-iPhone-PROPFIND.test b/testing/tests/regression-suite/0560-iPhone-PROPFIND.test
index bd003ca8..409479c0 100644
--- a/testing/tests/regression-suite/0560-iPhone-PROPFIND.test
+++ b/testing/tests/regression-suite/0560-iPhone-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a process similar to iPhone 3.1
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/
+URL=http://regression.host/caldav.php/user1/VTODO-EFD9-4F0F-9BDC-5335E04D47E0/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0562-iOS-PROPFIND.test b/testing/tests/regression-suite/0562-iOS-PROPFIND.test
index 6dea395f..5bde0400 100644
--- a/testing/tests/regression-suite/0562-iOS-PROPFIND.test
+++ b/testing/tests/regression-suite/0562-iOS-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing retrieval of the wierd properties we just set
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0598-REPORT-sync-initial.test b/testing/tests/regression-suite/0598-REPORT-sync-initial.test
index e161d7bd..a2fc7809 100644
--- a/testing/tests/regression-suite/0598-REPORT-sync-initial.test
+++ b/testing/tests/regression-suite/0598-REPORT-sync-initial.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT sync-collection with no sync-token
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: sync-collection initial REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/0599-REPORT-sync-changed.test b/testing/tests/regression-suite/0599-REPORT-sync-changed.test
index 5dfe98a5..1646f2aa 100644
--- a/testing/tests/regression-suite/0599-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/0599-REPORT-sync-changed.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT sync-collection with sync-token
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: sync-collection changes REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/0600-Soho-OPTIONS.test b/testing/tests/regression-suite/0600-Soho-OPTIONS.test
index 64bab6c1..50edee66 100644
--- a/testing/tests/regression-suite/0600-Soho-OPTIONS.test
+++ b/testing/tests/regression-suite/0600-Soho-OPTIONS.test
@@ -1,7 +1,7 @@
 #
 # Do an initial OPTIONS request (unauthenticated)
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 NOAUTH
 
 HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17
diff --git a/testing/tests/regression-suite/0601-Soho-OPTIONS.test b/testing/tests/regression-suite/0601-Soho-OPTIONS.test
index d2e5145a..11996c5c 100644
--- a/testing/tests/regression-suite/0601-Soho-OPTIONS.test
+++ b/testing/tests/regression-suite/0601-Soho-OPTIONS.test
@@ -1,7 +1,7 @@
 #
 # Do an initial OPTIONS request (authenticated)
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 
 HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17
 HEAD
diff --git a/testing/tests/regression-suite/0602-Soho-PROPFIND.test b/testing/tests/regression-suite/0602-Soho-PROPFIND.test
index c81ff147..4e9010d3 100644
--- a/testing/tests/regression-suite/0602-Soho-PROPFIND.test
+++ b/testing/tests/regression-suite/0602-Soho-PROPFIND.test
@@ -2,7 +2,7 @@
 # SOHO Organizer works best looking at the person
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17
 HEADER=Content-Type: text/xml; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0603-Soho-PROPFIND.test b/testing/tests/regression-suite/0603-Soho-PROPFIND.test
index c9b73abf..9c0f7412 100644
--- a/testing/tests/regression-suite/0603-Soho-PROPFIND.test
+++ b/testing/tests/regression-suite/0603-Soho-PROPFIND.test
@@ -4,7 +4,7 @@
 # Now imagine what would happen if they supplied a 'Depth: 1' header!
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17
 HEADER=Content-Type: text/xml; charset=utf-8
 HEADER=Depth: 1
diff --git a/testing/tests/regression-suite/0604-Soho-PROPFIND.test b/testing/tests/regression-suite/0604-Soho-PROPFIND.test
index afb9af48..bbb5c646 100644
--- a/testing/tests/regression-suite/0604-Soho-PROPFIND.test
+++ b/testing/tests/regression-suite/0604-Soho-PROPFIND.test
@@ -4,7 +4,7 @@
 # Suppose there were a Depth: 0 header?
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17
 HEADER=Content-Type: text/xml; charset=utf-8
 HEADER=Depth: 0
diff --git a/testing/tests/regression-suite/0605-Soho-MKCALENDAR.test b/testing/tests/regression-suite/0605-Soho-MKCALENDAR.test
index 6f6a3719..e1242661 100644
--- a/testing/tests/regression-suite/0605-Soho-MKCALENDAR.test
+++ b/testing/tests/regression-suite/0605-Soho-MKCALENDAR.test
@@ -4,7 +4,7 @@
 # Make a new calendar for the user
 #
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 
 HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17
 HEADER=Content-Type: text/xml; charset=utf-8
diff --git a/testing/tests/regression-suite/0606-Soho-PROPPATCH.test b/testing/tests/regression-suite/0606-Soho-PROPPATCH.test
index 9eaabf2e..c87235d3 100644
--- a/testing/tests/regression-suite/0606-Soho-PROPPATCH.test
+++ b/testing/tests/regression-suite/0606-Soho-PROPPATCH.test
@@ -6,7 +6,7 @@
 TYPE=PROPPATCH
 
 # Note the URL doesn't have a trailling '/'
-URL=http://mycaldav/caldav.php/user1/SOHO%20collection
+URL=http://regression.host/caldav.php/user1/SOHO%20collection
 
 HEADER=User-Agent: SOHO Organizer/6.5.2 libcurl/7.17.0 OpenSSL/0.9.7l zlib/1.2.3 libssh2/0.17
 HEADER=Content-Type: text/xml; charset=utf-8
diff --git a/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.test b/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.test
index e2460f18..fc043538 100644
--- a/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.test
+++ b/testing/tests/regression-suite/0700-caldav4j-MKCALENDAR.test
@@ -2,7 +2,7 @@
 # MKCALENDAR test for caldav4j
 #
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/user1/collection/
+URL=http://regression.host/caldav.php/user1/collection/
 HEADER=Content-Type: text/xml
 HEAD
 
diff --git a/testing/tests/regression-suite/0701-caldav4j-PUT.test b/testing/tests/regression-suite/0701-caldav4j-PUT.test
index b2602309..5e367759 100644
--- a/testing/tests/regression-suite/0701-caldav4j-PUT.test
+++ b/testing/tests/regression-suite/0701-caldav4j-PUT.test
@@ -2,7 +2,7 @@
 # PUT an caldav4j regression testing event into the database
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/collection/Daily_NY_5pm.ics
+URL=http://regression.host/caldav.php/user1/collection/Daily_NY_5pm.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: Jakarta Commons-HttpClient/3.0
 HEAD
diff --git a/testing/tests/regression-suite/0702-caldav4j-PUT.test b/testing/tests/regression-suite/0702-caldav4j-PUT.test
index a603088c..32629bca 100644
--- a/testing/tests/regression-suite/0702-caldav4j-PUT.test
+++ b/testing/tests/regression-suite/0702-caldav4j-PUT.test
@@ -6,7 +6,7 @@
 # which may not reference a timezone.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/collection/All_Day_NY_JAN1.ics
+URL=http://regression.host/caldav.php/user1/collection/All_Day_NY_JAN1.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: Jakarta Commons-HttpClient/3.0
 HEAD
diff --git a/testing/tests/regression-suite/0800-Spec-LOCK-1.test b/testing/tests/regression-suite/0800-Spec-LOCK-1.test
index 8b947aeb..64cbd67e 100644
--- a/testing/tests/regression-suite/0800-Spec-LOCK-1.test
+++ b/testing/tests/regression-suite/0800-Spec-LOCK-1.test
@@ -2,7 +2,7 @@
 # Test specification compliance for LOCK request
 #
 TYPE=LOCK
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 HEADER=Depth: 0
 HEADER=Timeout: Infinite,Second-4100000000
 HEADER=Content-type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0801-Spec-LOCK-1.test b/testing/tests/regression-suite/0801-Spec-LOCK-1.test
index b60f5d92..9cab9370 100644
--- a/testing/tests/regression-suite/0801-Spec-LOCK-1.test
+++ b/testing/tests/regression-suite/0801-Spec-LOCK-1.test
@@ -4,7 +4,7 @@
 # No data is needed for a refresh
 #
 TYPE=LOCK
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 
 # Save the original lock time for later use
 GETSQL=oldlocktime
diff --git a/testing/tests/regression-suite/0802-Spec-LOCK-1.test b/testing/tests/regression-suite/0802-Spec-LOCK-1.test
index 25a128cc..231ea20d 100644
--- a/testing/tests/regression-suite/0802-Spec-LOCK-1.test
+++ b/testing/tests/regression-suite/0802-Spec-LOCK-1.test
@@ -4,7 +4,7 @@
 #    and should fail.
 #
 TYPE=LOCK
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 HEADER=Depth: 0
 HEADER=Timeout: Infinite,Second-4100000000
 HEADER=Content-type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0803-Mulberry-PUT-1.test b/testing/tests/regression-suite/0803-Mulberry-PUT-1.test
index cd1d535e..e1cfd154 100644
--- a/testing/tests/regression-suite/0803-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/0803-Mulberry-PUT-1.test
@@ -2,7 +2,7 @@
 # Attempt to put this event into a location that is locked.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
diff --git a/testing/tests/regression-suite/0804-Mulberry-PUT-1.test b/testing/tests/regression-suite/0804-Mulberry-PUT-1.test
index 1627c830..3cc9af4e 100644
--- a/testing/tests/regression-suite/0804-Mulberry-PUT-1.test
+++ b/testing/tests/regression-suite/0804-Mulberry-PUT-1.test
@@ -3,7 +3,7 @@
 #  - but this time supply the token so it succeeds
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 
 # Get the lock token from the earlier lock
 GETSQL=locktoken
diff --git a/testing/tests/regression-suite/0805-Mulberry-DELETE-1.test b/testing/tests/regression-suite/0805-Mulberry-DELETE-1.test
index e3d2c39e..fcb74a7a 100644
--- a/testing/tests/regression-suite/0805-Mulberry-DELETE-1.test
+++ b/testing/tests/regression-suite/0805-Mulberry-DELETE-1.test
@@ -2,7 +2,7 @@
 # Attempt to DELETE an event from a location that is locked.
 #
 TYPE=DELETE
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 HEADER=Content-Type: text/calendar; charset=utf-8
 HEAD
 
diff --git a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.test b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.test
index bba11055..af61cd14 100644
--- a/testing/tests/regression-suite/0806-Mulberry-DELETE-1.test
+++ b/testing/tests/regression-suite/0806-Mulberry-DELETE-1.test
@@ -3,7 +3,7 @@
 #  - but this time supply the token so it succeeds
 #
 TYPE=DELETE
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 
 # Get the lock token from the earlier lock
 GETSQL=locktoken
diff --git a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.test
index d60a63b1..4dea6c54 100644
--- a/testing/tests/regression-suite/0808-Spec-UNLOCK-1.test
+++ b/testing/tests/regression-suite/0808-Spec-UNLOCK-1.test
@@ -8,7 +8,7 @@
 # failed 'lock-token-matches-request-uri'
 #
 TYPE=UNLOCK
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 
 HEADER=Lock-Token: 
 HEAD
diff --git a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.test
index c8297f8a..2fc49f5e 100644
--- a/testing/tests/regression-suite/0809-Spec-UNLOCK-1.test
+++ b/testing/tests/regression-suite/0809-Spec-UNLOCK-1.test
@@ -2,7 +2,7 @@
 # Test specification compliance for LOCK/UNLOCK request
 #
 TYPE=UNLOCK
-URL=http://mycaldav/caldav.php/user1/home/i1278618276.ics
+URL=http://regression.host/caldav.php/user1/home/i1278618276.ics
 
 # Get the lock token from the earlier lock
 GETSQL=locktoken
diff --git a/testing/tests/regression-suite/0810-Spec-LOCK-1.test b/testing/tests/regression-suite/0810-Spec-LOCK-1.test
index 1ef595cd..8484305e 100644
--- a/testing/tests/regression-suite/0810-Spec-LOCK-1.test
+++ b/testing/tests/regression-suite/0810-Spec-LOCK-1.test
@@ -2,7 +2,7 @@
 # Test specification compliance for LOCK request on a collection
 #
 TYPE=LOCK
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Depth: 0
 HEADER=Timeout: Infinite,Second-4100000000
 HEADER=Content-type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0811-Spec-LOCK-1.test b/testing/tests/regression-suite/0811-Spec-LOCK-1.test
index 0ee841b2..93f297f9 100644
--- a/testing/tests/regression-suite/0811-Spec-LOCK-1.test
+++ b/testing/tests/regression-suite/0811-Spec-LOCK-1.test
@@ -4,7 +4,7 @@
 # No data is needed for a refresh
 #
 TYPE=LOCK
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 
 # Save the original lock time for later use
 GETSQL=oldlocktime
diff --git a/testing/tests/regression-suite/0812-Spec-LOCK-1.test b/testing/tests/regression-suite/0812-Spec-LOCK-1.test
index 9e20d747..f8a85c94 100644
--- a/testing/tests/regression-suite/0812-Spec-LOCK-1.test
+++ b/testing/tests/regression-suite/0812-Spec-LOCK-1.test
@@ -4,7 +4,7 @@
 #    and should fail.
 #
 TYPE=LOCK
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=Depth: 0
 HEADER=Timeout: Infinite,Second-4100000000
 HEADER=Content-type: text/xml; charset="utf-8"
diff --git a/testing/tests/regression-suite/0815-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0815-Spec-UNLOCK-1.test
index fb5f154e..a8b1add9 100644
--- a/testing/tests/regression-suite/0815-Spec-UNLOCK-1.test
+++ b/testing/tests/regression-suite/0815-Spec-UNLOCK-1.test
@@ -3,7 +3,7 @@
 #  - This should fail because we provide an invalid lock token
 #
 TYPE=UNLOCK
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 
 HEADER=Lock-Token: 
 HEAD
diff --git a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.test b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.test
index 2047e5e0..4cff921f 100644
--- a/testing/tests/regression-suite/0816-Spec-UNLOCK-1.test
+++ b/testing/tests/regression-suite/0816-Spec-UNLOCK-1.test
@@ -2,7 +2,7 @@
 # Test specification compliance for LOCK/UNLOCK request
 #
 TYPE=UNLOCK
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 
 # Get the lock token from the earlier lock
 GETSQL=locktoken
diff --git a/testing/tests/regression-suite/0817-Spec-PUT.test b/testing/tests/regression-suite/0817-Spec-PUT.test
index 40b7939d..2a2f9843 100644
--- a/testing/tests/regression-suite/0817-Spec-PUT.test
+++ b/testing/tests/regression-suite/0817-Spec-PUT.test
@@ -2,7 +2,7 @@
 # PUT an iCal style event into the database
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
+URL=http://regression.host/caldav.php/user1/home/DAYPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: RFC2518 Spec Tests
 HEAD
diff --git a/testing/tests/regression-suite/0818-Spec-PUT.test b/testing/tests/regression-suite/0818-Spec-PUT.test
index ece6a165..4fcb3056 100644
--- a/testing/tests/regression-suite/0818-Spec-PUT.test
+++ b/testing/tests/regression-suite/0818-Spec-PUT.test
@@ -2,7 +2,7 @@
 # PUT an iCal style event into the database
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
+URL=http://regression.host/caldav.php/user1/home/MICROPARTY-77C6-4FB7-BDD3-6882E2F1BE74.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: RFC2518 Spec Tests
 HEAD
diff --git a/testing/tests/regression-suite/0820-Spec-PROPFIND-1.test b/testing/tests/regression-suite/0820-Spec-PROPFIND-1.test
index 9ded9a14..a01295bf 100644
--- a/testing/tests/regression-suite/0820-Spec-PROPFIND-1.test
+++ b/testing/tests/regression-suite/0820-Spec-PROPFIND-1.test
@@ -2,7 +2,7 @@
 # Testing for Spec compliance.  PROPFIND on a calendar collection.
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0821-Spec-PROPFIND-2.test b/testing/tests/regression-suite/0821-Spec-PROPFIND-2.test
index 88fe7913..77aaf954 100644
--- a/testing/tests/regression-suite/0821-Spec-PROPFIND-2.test
+++ b/testing/tests/regression-suite/0821-Spec-PROPFIND-2.test
@@ -3,7 +3,7 @@
 # couple of bogus ones as well to ensure we fail(!)
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test
index be417e43..2c7613a8 100644
--- a/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test
+++ b/testing/tests/regression-suite/0822-Spec-PROPFIND-3.test
@@ -2,7 +2,7 @@
 # Spec compliant test for all properties.  Depth infinity this time
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: infinity
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.test b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.test
index e76fbed2..0a5dfcbe 100644
--- a/testing/tests/regression-suite/0823-Spec-PROPFIND-4.test
+++ b/testing/tests/regression-suite/0823-Spec-PROPFIND-4.test
@@ -2,7 +2,7 @@
 # PROPFIND based on RFC2518 Spec against an iCalendar resource
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics
+URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0824-Spec-PROPFIND-5.test b/testing/tests/regression-suite/0824-Spec-PROPFIND-5.test
index 55f59c66..7ea7f5d5 100644
--- a/testing/tests/regression-suite/0824-Spec-PROPFIND-5.test
+++ b/testing/tests/regression-suite/0824-Spec-PROPFIND-5.test
@@ -2,7 +2,7 @@
 # Testing for Spec compliance.  PROPFIND on a calendar collection.
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0825-Spec-PROPFIND-6.test b/testing/tests/regression-suite/0825-Spec-PROPFIND-6.test
index 463dabeb..7c180dda 100644
--- a/testing/tests/regression-suite/0825-Spec-PROPFIND-6.test
+++ b/testing/tests/regression-suite/0825-Spec-PROPFIND-6.test
@@ -2,7 +2,7 @@
 # PROPFIND based on RFC2518 Spec against an iCalendar resource
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics
+URL=http://regression.host/caldav.php/user1/home/da81c0ee-7871-11db-c6d6-f6927c144649.ics
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0826-Spec-PROPFIND.test b/testing/tests/regression-suite/0826-Spec-PROPFIND.test
index 289d6468..d2950347 100644
--- a/testing/tests/regression-suite/0826-Spec-PROPFIND.test
+++ b/testing/tests/regression-suite/0826-Spec-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing for Spec compliance.  PROPFIND on the root
 #
 TYPE=PROPFIND
-URL=http://mycaldav/
+URL=http://regression.host/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0827-Spec-PROPFIND.test b/testing/tests/regression-suite/0827-Spec-PROPFIND.test
index 4596f1d4..6bab553d 100644
--- a/testing/tests/regression-suite/0827-Spec-PROPFIND.test
+++ b/testing/tests/regression-suite/0827-Spec-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing for Spec compliance.  PROPFIND on the root
 #
 TYPE=PROPFIND
-URL=http://mycaldav/
+URL=http://regression.host/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 1
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0828-Spec-PROPFIND-5.test b/testing/tests/regression-suite/0828-Spec-PROPFIND-5.test
index 6d6d2c70..3a01c396 100644
--- a/testing/tests/regression-suite/0828-Spec-PROPFIND-5.test
+++ b/testing/tests/regression-suite/0828-Spec-PROPFIND-5.test
@@ -2,7 +2,7 @@
 # Testing for Spec compliance.  PROPFIND on a calendar collection.
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test
index a94d8149..5982884a 100644
--- a/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test
+++ b/testing/tests/regression-suite/0830-Spec-FREEBUSY-1.test
@@ -2,7 +2,7 @@
 # Request a REPORT which should report only freebusy
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: CALDAV compliance testing
 HEADER=Accept: text/calendar
 HEADER=Content-Type: text/xml
diff --git a/testing/tests/regression-suite/0831-Spec-RRULE-1.test b/testing/tests/regression-suite/0831-Spec-RRULE-1.test
index 79a42c77..3f2a919d 100644
--- a/testing/tests/regression-suite/0831-Spec-RRULE-1.test
+++ b/testing/tests/regression-suite/0831-Spec-RRULE-1.test
@@ -3,7 +3,7 @@
 #
 #
 TYPE=TESTRRULE
-URL=http://mycaldav/caldav.php
+URL=http://regression.host/caldav.php
 
 HEAD
 
diff --git a/testing/tests/regression-suite/0832-freebusy.test b/testing/tests/regression-suite/0832-freebusy.test
index c89e4c15..0cf1b268 100644
--- a/testing/tests/regression-suite/0832-freebusy.test
+++ b/testing/tests/regression-suite/0832-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=GET
-URL=http://mycaldav/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959
+URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959
 HEAD
 
 REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
diff --git a/testing/tests/regression-suite/0833-freebusy.test b/testing/tests/regression-suite/0833-freebusy.test
index d10dbea6..6d972c7e 100644
--- a/testing/tests/regression-suite/0833-freebusy.test
+++ b/testing/tests/regression-suite/0833-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=GET
-URL=http://mycaldav/freebusy.php/user1/home/?start=20061001T000000Z&end=20070630T235959Z
+URL=http://regression.host/freebusy.php/user1/home/?start=20061001T000000Z&end=20070630T235959Z
 HEAD
 
 REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
diff --git a/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.test b/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.test
index a5f6d27e..2258ae4c 100644
--- a/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.test
+++ b/testing/tests/regression-suite/0834-Spec-FREEBUSY-1.test
@@ -2,7 +2,7 @@
 # Request a REPORT which should report only freebusy
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: CALDAV compliance testing
 HEADER=Accept: text/calendar
 HEADER=Content-Type: text/xml
diff --git a/testing/tests/regression-suite/0835-freebusy.test b/testing/tests/regression-suite/0835-freebusy.test
index 3856d734..3ab3fc9b 100644
--- a/testing/tests/regression-suite/0835-freebusy.test
+++ b/testing/tests/regression-suite/0835-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=GET
-URL=http://mycaldav/freebusy.php/user1/home/?start=20061001T000000&period=P4WT12H
+URL=http://regression.host/freebusy.php/user1/home/?start=20061001T000000&period=P4WT12H
 HEAD
 
 AUTH=manager1:manager1
diff --git a/testing/tests/regression-suite/0836-freebusy.test b/testing/tests/regression-suite/0836-freebusy.test
index adf53ce8..de525568 100644
--- a/testing/tests/regression-suite/0836-freebusy.test
+++ b/testing/tests/regression-suite/0836-freebusy.test
@@ -4,7 +4,7 @@
 #
 TYPE=GET
 AUTH=user2:user2
-URL=http://mycaldav/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959
+URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959
 HEAD
 
 REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
diff --git a/testing/tests/regression-suite/0837-freebusy.test b/testing/tests/regression-suite/0837-freebusy.test
index 1d37a018..aa73a89c 100644
--- a/testing/tests/regression-suite/0837-freebusy.test
+++ b/testing/tests/regression-suite/0837-freebusy.test
@@ -4,7 +4,7 @@
 #
 TYPE=GET
 AUTH=user3:user3
-URL=http://mycaldav/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959
+URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&finish=20070630T235959
 HEAD
 
 REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
diff --git a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.test b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.test
index cd6584cb..f4b73640 100644
--- a/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.test
+++ b/testing/tests/regression-suite/0844-Spec-PROPPATCH-principal.test
@@ -4,7 +4,7 @@
 # An attempt to set an arbitrary property on a principal
 #
 TYPE=PROPPATCH
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=User-agent: SpecTest PROPPATCH
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.test b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.test
index b08d5d01..d7ea545c 100644
--- a/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.test
+++ b/testing/tests/regression-suite/0845-Spec-PROPPATCH-principal.test
@@ -4,7 +4,7 @@
 # An attempt to set an arbitrary property on a principal
 #
 TYPE=PROPPATCH
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=User-agent: SpecTest PROPPATCH
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.test b/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.test
index 96170446..60bb7afe 100644
--- a/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.test
+++ b/testing/tests/regression-suite/0847-Spec-PROPFIND-slash.test
@@ -2,7 +2,7 @@
 # Testing for Spec compliance.  PROPFIND on /
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0850-Spec-REPORT-1.test b/testing/tests/regression-suite/0850-Spec-REPORT-1.test
index 25be12db..ffac8d59 100644
--- a/testing/tests/regression-suite/0850-Spec-REPORT-1.test
+++ b/testing/tests/regression-suite/0850-Spec-REPORT-1.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT calendar-query with text-match on UID
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: SpecTest REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/0851-Spec-REPORT-1.test b/testing/tests/regression-suite/0851-Spec-REPORT-1.test
index cbaac5f4..2f8b7eb0 100644
--- a/testing/tests/regression-suite/0851-Spec-REPORT-1.test
+++ b/testing/tests/regression-suite/0851-Spec-REPORT-1.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT calendar-multiget
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: SpecTest REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/0860-Spec-REPORT-principal.test b/testing/tests/regression-suite/0860-Spec-REPORT-principal.test
index 7948cfea..abdf2064 100644
--- a/testing/tests/regression-suite/0860-Spec-REPORT-principal.test
+++ b/testing/tests/regression-suite/0860-Spec-REPORT-principal.test
@@ -1,7 +1,7 @@
 #
 # Do a REPORT request
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0861-Spec-REPORT-principal.test b/testing/tests/regression-suite/0861-Spec-REPORT-principal.test
index 0732b602..4d3be54f 100644
--- a/testing/tests/regression-suite/0861-Spec-REPORT-principal.test
+++ b/testing/tests/regression-suite/0861-Spec-REPORT-principal.test
@@ -3,7 +3,7 @@
 # - in this case we look for all principals
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0862-Spec-REPORT-principal.test b/testing/tests/regression-suite/0862-Spec-REPORT-principal.test
index dd62ff6f..a60e7bb2 100644
--- a/testing/tests/regression-suite/0862-Spec-REPORT-principal.test
+++ b/testing/tests/regression-suite/0862-Spec-REPORT-principal.test
@@ -1,7 +1,7 @@
 #
 # Do a REPORT request
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0863-Spec-REPORT-principal.test b/testing/tests/regression-suite/0863-Spec-REPORT-principal.test
index 4a7074d4..1ff74182 100644
--- a/testing/tests/regression-suite/0863-Spec-REPORT-principal.test
+++ b/testing/tests/regression-suite/0863-Spec-REPORT-principal.test
@@ -1,7 +1,7 @@
 #
 # Do a REPORT request
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 HEAD
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.0.7) Gecko/20101013 Thunderbird/1.5.0.7
diff --git a/testing/tests/regression-suite/0870-Principal-PROPFIND.test b/testing/tests/regression-suite/0870-Principal-PROPFIND.test
index ab385b83..e1ca9f22 100644
--- a/testing/tests/regression-suite/0870-Principal-PROPFIND.test
+++ b/testing/tests/regression-suite/0870-Principal-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing for Spec compliance.  PROPFIND on the root
 #
 TYPE=PROPFIND
-URL=http://mycaldav/~user1/
+URL=http://regression.host/~user1/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0871-PROPFIND.test b/testing/tests/regression-suite/0871-PROPFIND.test
index 260c6001..14f7077c 100644
--- a/testing/tests/regression-suite/0871-PROPFIND.test
+++ b/testing/tests/regression-suite/0871-PROPFIND.test
@@ -4,7 +4,7 @@
 #
 TYPE=PROPFIND
 AUTH=user2:user2
-URL=http://mycaldav/caldav.php/user2/home/
+URL=http://regression.host/caldav.php/user2/home/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0872-PROPFIND.test b/testing/tests/regression-suite/0872-PROPFIND.test
index d1c1b121..515950bd 100644
--- a/testing/tests/regression-suite/0872-PROPFIND.test
+++ b/testing/tests/regression-suite/0872-PROPFIND.test
@@ -4,7 +4,7 @@
 #
 TYPE=PROPFIND
 AUTH=user2:user2
-URL=http://mycaldav/caldav.php/user2/home/
+URL=http://regression.host/caldav.php/user2/home/
 HEADER=User-Agent: RFC2518 Spec Tests
 HEADER=Depth: 1
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.test b/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.test
index 953bb19e..5fd7a58c 100644
--- a/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.test
+++ b/testing/tests/regression-suite/0873-GroupDAV-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing with a GroupDAV style request for a PROPFIND on the root with a Depth 1
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 HEAD
 
 AUTH=user1:user1
diff --git a/testing/tests/regression-suite/0874-PROPFIND.test b/testing/tests/regression-suite/0874-PROPFIND.test
index 1ea727d1..72107630 100644
--- a/testing/tests/regression-suite/0874-PROPFIND.test
+++ b/testing/tests/regression-suite/0874-PROPFIND.test
@@ -3,7 +3,7 @@
 # Depth: 0, looking for the supported-privilege-set response
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/user1/
+URL=http://regression.host/caldav.php/user1/
 HEADER=User-Agent: RFC3744 Spec Tests
 HEADER=Depth: 0
 HEADER=Content-Type: application/xml
diff --git a/testing/tests/regression-suite/0880-Freebusy-POST.test b/testing/tests/regression-suite/0880-Freebusy-POST.test
index 80485449..30218a31 100644
--- a/testing/tests/regression-suite/0880-Freebusy-POST.test
+++ b/testing/tests/regression-suite/0880-Freebusy-POST.test
@@ -3,7 +3,7 @@
 # free/busy information
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 HEADER=User-Agent: draft-schedule-05 Spec Tests
 HEADER=Content-Type: text/calendar
 
diff --git a/testing/tests/regression-suite/0885-GET-freebusy.test b/testing/tests/regression-suite/0885-GET-freebusy.test
index 2c3159ff..ba358228 100644
--- a/testing/tests/regression-suite/0885-GET-freebusy.test
+++ b/testing/tests/regression-suite/0885-GET-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=GET
-URL=http://mycaldav/freebusy.php?user=user1@example.net&start=20061001T000000&end=20070630T235959
+URL=http://regression.host/freebusy.php?user=user1@example.net&start=20061001T000000&end=20070630T235959
 HEAD
 
 REPLACE=/^DTSTAMP:\d{8}T\d{6}Z\r?$/DTSTAMP:yyyymmddThhmmssZ/
diff --git a/testing/tests/regression-suite/0886-REPORT-freebusy.test b/testing/tests/regression-suite/0886-REPORT-freebusy.test
index 24a1c460..49a12949 100644
--- a/testing/tests/regression-suite/0886-REPORT-freebusy.test
+++ b/testing/tests/regression-suite/0886-REPORT-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: DAViCalTester/public
 HEADER=Content-Type: text/xml; charset="UTF-8"
 HEAD
diff --git a/testing/tests/regression-suite/0887-POST-freebusy.test b/testing/tests/regression-suite/0887-POST-freebusy.test
index 131e147c..5f8c5a6e 100644
--- a/testing/tests/regression-suite/0887-POST-freebusy.test
+++ b/testing/tests/regression-suite/0887-POST-freebusy.test
@@ -4,7 +4,7 @@
 #
 TYPE=POST
 
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 
 HEADER=User-Agent: DAViCal Regression Testing
 HEADER=Accept: text/xml
diff --git a/testing/tests/regression-suite/0888-GET-freebusy.test b/testing/tests/regression-suite/0888-GET-freebusy.test
index 81382307..cd7e593f 100644
--- a/testing/tests/regression-suite/0888-GET-freebusy.test
+++ b/testing/tests/regression-suite/0888-GET-freebusy.test
@@ -2,7 +2,7 @@
 # Request a freebusy report by URL
 #
 TYPE=GET
-URL=http://mycaldav/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959
+URL=http://regression.host/freebusy.php/user1@example.net?start=20061001T000000&end=20070630T235959
 HEAD
 
 
diff --git a/testing/tests/regression-suite/0889-POST-freebusy.test b/testing/tests/regression-suite/0889-POST-freebusy.test
index 421f49c8..e6c5e763 100644
--- a/testing/tests/regression-suite/0889-POST-freebusy.test
+++ b/testing/tests/regression-suite/0889-POST-freebusy.test
@@ -4,7 +4,7 @@
 # events included in the processing as possible
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 HEADER=User-Agent: draft-schedule-05 Spec Tests
 HEADER=Content-Type: text/calendar
 
diff --git a/testing/tests/regression-suite/0900-Moz-REPORT.test b/testing/tests/regression-suite/0900-Moz-REPORT.test
index 799d08cf..ca9e5ca6 100644
--- a/testing/tests/regression-suite/0900-Moz-REPORT.test
+++ b/testing/tests/regression-suite/0900-Moz-REPORT.test
@@ -3,7 +3,7 @@
 # events from other calendars in the database.
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9a1) Gecko/20101130 Calendar/0.4a1
 HEADER=Accept: text/html,application/xhtml+xml;q=0.9,application/xml;q=0.8,*/*;q=0.7
 HEADER=Accept-Language: en-us,en;q=0.5
diff --git a/testing/tests/regression-suite/0901-GET-Collection.test b/testing/tests/regression-suite/0901-GET-Collection.test
index 73643626..1386a845 100644
--- a/testing/tests/regression-suite/0901-GET-Collection.test
+++ b/testing/tests/regression-suite/0901-GET-Collection.test
@@ -2,5 +2,5 @@
 # Doing a GET on an entire collection.
 #
 TYPE=GET
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEAD
diff --git a/testing/tests/regression-suite/0902-PUT-collection.test b/testing/tests/regression-suite/0902-PUT-collection.test
index a0420677..d9b37c5d 100644
--- a/testing/tests/regression-suite/0902-PUT-collection.test
+++ b/testing/tests/regression-suite/0902-PUT-collection.test
@@ -4,7 +4,7 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/anotherone/
+URL=http://regression.host/caldav.php/user1/anotherone/
 HEADER=User-Agent: RSCDS Testing/0.7.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 AUTH=admin:nimda
@@ -292,7 +292,7 @@ DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
 DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
  20060918T150000
 SUMMARY:Donovan
-X-EVOLUTION-CALDAV-HREF:http://mycaldav:
+X-EVOLUTION-CALDAV-HREF:http://regression.host:
  80/caldav.php/andrew/20060914T212516Z.ics
 X-EVOLUTION-CALDAV-ETAG:"004c7b3de49835f714ae7962e8d06d3c"
 X-EVOLUTION-MOVE-CALENDAR:1
@@ -313,7 +313,7 @@ DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
 DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
  20060911T120000
 SUMMARY:NGOP by-election readiness.
-X-EVOLUTION-CALDAV-HREF:http://mycaldav:
+X-EVOLUTION-CALDAV-HREF:http://regression.host:
  80/caldav.php/andrew/20060906T123515Z.ics
 X-EVOLUTION-CALDAV-ETAG:"9a39bedee743f397ebeeda78a4233c8b"
 X-EVOLUTION-MOVE-CALENDAR:1
@@ -352,7 +352,7 @@ DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
  20060921T170000
 SUMMARY:Really Geeky Thoughts
 X-EVOLUTION-CALDAV-HREF:http:
- //andrew@mycaldav/caldav.php/andrew/20060920T052710Z.ics
+ //andrew@regression.host/caldav.php/andrew/20060920T052710Z.ics
 X-EVOLUTION-CALDAV-ETAG:"d9a4a80a3dbc76b947a3bf0f0672359c"
 X-EVOLUTION-MOVE-CALENDAR:1
 CREATED:20060920T052722
@@ -390,7 +390,7 @@ TRANSP:OPAQUE
 SEQUENCE:5
 SUMMARY:9:am - 2:30pm in Helsinki
 CLASS:PUBLIC
-X-EVOLUTION-CALDAV-HREF:http://mycaldav:
+X-EVOLUTION-CALDAV-HREF:http://regression.host:
  80/caldav.php/andrew/20060912T233500Z.ics
 X-EVOLUTION-CALDAV-ETAG:"8d8ca5e838b7e088bf17d9916032eec6"
 X-EVOLUTION-MOVE-CALENDAR:1
@@ -488,7 +488,7 @@ DTSTART;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
 DTEND;TZID=/softwarestudio.org/Olson_20011030_5/Pacific/Auckland:
  20060919T120000
 SUMMARY:NGOP Meeting
-X-EVOLUTION-CALDAV-HREF:http://mycaldav:
+X-EVOLUTION-CALDAV-HREF:http://regression.host:
  80/caldav.php/andrew/20060905T231053Z.ics
 X-EVOLUTION-CALDAV-ETAG:"4d37ed48425acb9f4245539e2d2b726b"
 X-EVOLUTION-MOVE-CALENDAR:1
diff --git a/testing/tests/regression-suite/0903-GET-Collection.test b/testing/tests/regression-suite/0903-GET-Collection.test
index 58558cc4..5ad9194d 100644
--- a/testing/tests/regression-suite/0903-GET-Collection.test
+++ b/testing/tests/regression-suite/0903-GET-Collection.test
@@ -3,5 +3,5 @@
 # just added with a PUT.
 #
 TYPE=GET
-URL=http://mycaldav/caldav.php/user1/anotherone/
+URL=http://regression.host/caldav.php/user1/anotherone/
 HEAD
diff --git a/testing/tests/regression-suite/0904-PUT-bad-timezone.test b/testing/tests/regression-suite/0904-PUT-bad-timezone.test
index 45f81b53..535061e9 100644
--- a/testing/tests/regression-suite/0904-PUT-bad-timezone.test
+++ b/testing/tests/regression-suite/0904-PUT-bad-timezone.test
@@ -4,7 +4,7 @@
 # There is no CalDAV defined behaviour for this.
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/PUT-eastern-time.ics
+URL=http://regression.host/caldav.php/user1/home/PUT-eastern-time.ics
 HEADER=User-Agent: DAViCal Testing/0.9.x
 HEADER=Content-Type: text/calendar; charset=utf-8
 
diff --git a/testing/tests/regression-suite/0910-Space-OPTIONS.test b/testing/tests/regression-suite/0910-Space-OPTIONS.test
index b1cd5e76..7ad2f701 100644
--- a/testing/tests/regression-suite/0910-Space-OPTIONS.test
+++ b/testing/tests/regression-suite/0910-Space-OPTIONS.test
@@ -1,6 +1,6 @@
 #
 # Do an OPTIONS request on a URL with a space
 TYPE=OPTIONS
-URL=http://mycaldav/caldav.php/User%20Six/home/
+URL=http://regression.host/caldav.php/User%20Six/home/
 AUTH=User Six:user6
 HEAD
diff --git a/testing/tests/regression-suite/0911-Space-MKCALENDAR.test b/testing/tests/regression-suite/0911-Space-MKCALENDAR.test
index a97fd57a..b26630c8 100644
--- a/testing/tests/regression-suite/0911-Space-MKCALENDAR.test
+++ b/testing/tests/regression-suite/0911-Space-MKCALENDAR.test
@@ -2,7 +2,7 @@
 # MKCALENDAR test for username with a space
 #
 TYPE=MKCALENDAR
-URL=http://mycaldav/caldav.php/User%20Six/DEADBEEF-EFD9-4F0F-9BDC-5335E04D47E0/
+URL=http://regression.host/caldav.php/User%20Six/DEADBEEF-EFD9-4F0F-9BDC-5335E04D47E0/
 HEADER=Content-Type: text/xml
 AUTH=User Six:user6
 HEAD
diff --git a/testing/tests/regression-suite/0912-Space-PROPFIND.test b/testing/tests/regression-suite/0912-Space-PROPFIND.test
index 5060485c..604aead5 100644
--- a/testing/tests/regression-suite/0912-Space-PROPFIND.test
+++ b/testing/tests/regression-suite/0912-Space-PROPFIND.test
@@ -2,7 +2,7 @@
 # Testing username with a space, similar to iCal 10.5
 #
 TYPE=PROPFIND
-URL=http://mycaldav/caldav.php/User%20Six/
+URL=http://regression.host/caldav.php/User%20Six/
 AUTH=User Six:user6
 HEAD
 
diff --git a/testing/tests/regression-suite/0913-extended-MKCOL.test b/testing/tests/regression-suite/0913-extended-MKCOL.test
index c36f1637..c0068f87 100644
--- a/testing/tests/regression-suite/0913-extended-MKCOL.test
+++ b/testing/tests/regression-suite/0913-extended-MKCOL.test
@@ -2,7 +2,7 @@
 # Extended MKCOL test - basic test
 #
 TYPE=MKCOL
-URL=http://mycaldav/caldav.php/User%20Six/basic%20%22Extended%20MKCOL%22/
+URL=http://regression.host/caldav.php/User%20Six/basic%20%22Extended%20MKCOL%22/
 HEADER=Content-Type: text/xml
 AUTH=User Six:user6
 HEAD
diff --git a/testing/tests/regression-suite/0914-extended-MKCOL.test b/testing/tests/regression-suite/0914-extended-MKCOL.test
index 7e803d39..14d3ac27 100644
--- a/testing/tests/regression-suite/0914-extended-MKCOL.test
+++ b/testing/tests/regression-suite/0914-extended-MKCOL.test
@@ -2,7 +2,7 @@
 # Extended MKCOL test - create an addressbook
 #
 TYPE=MKCOL
-URL=http://mycaldav/caldav.php/User%20Six/addressbook%20%22Extended%20MKCOL%22/
+URL=http://regression.host/caldav.php/User%20Six/addressbook%20%22Extended%20MKCOL%22/
 HEADER=Content-Type: text/xml
 AUTH=User Six:user6
 HEAD
diff --git a/testing/tests/regression-suite/0915-extended-MKCOL.test b/testing/tests/regression-suite/0915-extended-MKCOL.test
index 9b993c9a..1961f8d6 100644
--- a/testing/tests/regression-suite/0915-extended-MKCOL.test
+++ b/testing/tests/regression-suite/0915-extended-MKCOL.test
@@ -2,7 +2,7 @@
 # Extended MKCOL test - Test failure
 #
 TYPE=MKCOL
-URL=http://mycaldav/caldav.php/User%20Six/failure%20%39Extended%20MKCOL%39/
+URL=http://regression.host/caldav.php/User%20Six/failure%20%39Extended%20MKCOL%39/
 HEADER=Content-Type: text/xml
 AUTH=User Six:user6
 HEAD
diff --git a/testing/tests/regression-suite/0963-POST-freebusy-private.test b/testing/tests/regression-suite/0963-POST-freebusy-private.test
index f17e70d7..4bd69b96 100644
--- a/testing/tests/regression-suite/0963-POST-freebusy-private.test
+++ b/testing/tests/regression-suite/0963-POST-freebusy-private.test
@@ -2,7 +2,7 @@
 # POST to scheduling outbox for freebusy query of user4 for user1
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user4/.out/
+URL=http://regression.host/caldav.php/user4/.out/
 AUTH=user4:user4
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20100917 Sunbird/0.9
diff --git a/testing/tests/regression-suite/0964-REPORT-calquery-private.test b/testing/tests/regression-suite/0964-REPORT-calquery-private.test
index 0024edd5..0e36b0b0 100644
--- a/testing/tests/regression-suite/0964-REPORT-calquery-private.test
+++ b/testing/tests/regression-suite/0964-REPORT-calquery-private.test
@@ -2,7 +2,7 @@
 # REPORT on user1's calendar as a less privileged user
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/anotherone/
+URL=http://regression.host/caldav.php/user1/anotherone/
 AUTH=user4:user4
 
 HEADER=User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.18pre) Gecko/20080917 Sunbird/0.9
diff --git a/testing/tests/regression-suite/0970-REPORT-principal-match-self.test b/testing/tests/regression-suite/0970-REPORT-principal-match-self.test
index 0cea589f..c09a3d40 100644
--- a/testing/tests/regression-suite/0970-REPORT-principal-match-self.test
+++ b/testing/tests/regression-suite/0970-REPORT-principal-match-self.test
@@ -2,7 +2,7 @@
 # principal-match REPORT on self as user1
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 AUTH=user1:user1
 
 HEADER=User-Agent: DAViCal Testing
diff --git a/testing/tests/regression-suite/0971-REPORT-principal-match-prop.test b/testing/tests/regression-suite/0971-REPORT-principal-match-prop.test
index 2e509312..3fcf2e3c 100644
--- a/testing/tests/regression-suite/0971-REPORT-principal-match-prop.test
+++ b/testing/tests/regression-suite/0971-REPORT-principal-match-prop.test
@@ -2,7 +2,7 @@
 # principal-match REPORT on a principal-property (displayname)
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/
+URL=http://regression.host/caldav.php/
 AUTH=user1:user1
 
 HEADER=User-Agent: DAViCal Testing
diff --git a/testing/tests/regression-suite/1100-REPORT-sync-changed.test b/testing/tests/regression-suite/1100-REPORT-sync-changed.test
index e2020ec7..dcf65c76 100644
--- a/testing/tests/regression-suite/1100-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/1100-REPORT-sync-changed.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT sync-collection with no sync-token
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: sync-collection changes REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/1101-REPORT-sync-changed.test b/testing/tests/regression-suite/1101-REPORT-sync-changed.test
index 5f469b70..148cb757 100644
--- a/testing/tests/regression-suite/1101-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/1101-REPORT-sync-changed.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT sync-collection with no sync-token
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: sync-collection changes REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/1102-REPORT-sync-changed.test b/testing/tests/regression-suite/1102-REPORT-sync-changed.test
index 5f469b70..148cb757 100644
--- a/testing/tests/regression-suite/1102-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/1102-REPORT-sync-changed.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT sync-collection with no sync-token
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: sync-collection changes REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/1103-REPORT-sync-changed.test b/testing/tests/regression-suite/1103-REPORT-sync-changed.test
index c05d3871..32af89cf 100644
--- a/testing/tests/regression-suite/1103-REPORT-sync-changed.test
+++ b/testing/tests/regression-suite/1103-REPORT-sync-changed.test
@@ -2,7 +2,7 @@
 # Check for support of REPORT sync-collection with no sync-token
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-agent: sync-collection changes REPORT
 HEADER=Content-type: text/xml
 HEAD
diff --git a/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.test b/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.test
index bd8f7aba..53315b19 100644
--- a/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.test
+++ b/testing/tests/regression-suite/2100-REPORT-calquery-no-prop.test
@@ -3,7 +3,7 @@
 # events from other calendars in the database.
 #
 TYPE=REPORT
-URL=http://mycaldav/caldav.php/user1/home/
+URL=http://regression.host/caldav.php/user1/home/
 HEADER=User-Agent: DAViCal/RegressionTest
 HEADER=Content-Type: text/xml
 HEADER=Depth: 1
diff --git a/testing/tests/scheduling/3001-POST-CANCEL.test b/testing/tests/scheduling/3001-POST-CANCEL.test
index d1862dc5..37925908 100644
--- a/testing/tests/scheduling/3001-POST-CANCEL.test
+++ b/testing/tests/scheduling/3001-POST-CANCEL.test
@@ -2,7 +2,7 @@
 # Testing for how iCal does a POST for free/busy
 #
 TYPE=POST
-URL=http://mycaldav/caldav.php/user1/.out/
+URL=http://regression.host/caldav.php/user1/.out/
 
 HEADER=X-DAViCal-Flush-Cache: true
 HEADER=User-Agent: DAVKit/4.0.3 (732); CalendarStore/4.0.4 (997); iCal/4.0.4 (1395); Mac OS X/10.6.5 (10H574)
diff --git a/testing/tests/scheduling/3010-PUT-with-attendees.test b/testing/tests/scheduling/3010-PUT-with-attendees.test
index 1d0cd9a5..3e0f4fe4 100644
--- a/testing/tests/scheduling/3010-PUT-with-attendees.test
+++ b/testing/tests/scheduling/3010-PUT-with-attendees.test
@@ -2,7 +2,7 @@
 # PUT an event with attendees
 #
 TYPE=PUT
-URL=http://mycaldav/caldav.php/user1/home/PUT-attendees.ics
+URL=http://regression.host/caldav.php/user1/home/PUT-attendees.ics
 HEADER=Content-Type: text/calendar
 HEADER=User-Agent: DAVKit/2.0 (10.5.1; wrbt) iCal 3.0.1
 HEAD