Merge remote-tracking branch 'upstream/master' into contribute-back

Conflicts:
	NEWS

SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings

@@ -56,7 +56,7 @@ vtodo_class2 = "(Tarefa Confidencial)";
 "%{Attendee} %{SentByText}has accepted your event invitation."
 = "%{Attendee} %{SentByText}foi aceitado seu convite ao evento.";
 "%{Attendee} %{SentByText}has declined your event invitation."
-= "%{Attendee} %{SentByText}foi declinado seu convite ao evento.";
+= "%{Attendee} %{SentByText}recusou seu convite para o evento.";
 "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
 = "%{Attendee} %{SentByText} delegou o convite para %{Delegate}.";
 "%{Attendee} %{SentByText}has not yet decided upon your event invitation."

SoObjects/Appointments/MSExchangeFreeBusySOAPRequest.m

@@ -70,11 +70,27 @@
                  to: (NSCalendarDate *) newEndDate
 {
   ASSIGN(address, newAddress);
-  ASSIGN(startDate, newStartDate);
-  ASSIGN(endDate, newEndDate);
+
+  startDate = [NSCalendarDate dateWithYear: [newStartDate yearOfCommonEra]
+                                     month: [newStartDate monthOfYear]
+                                       day: [newStartDate dayOfMonth]
+                                      hour: [newStartDate hourOfDay]
+                                    minute: [newStartDate minuteOfHour]
+                                    second: [newStartDate secondOfMinute]
+                                  timeZone: [newStartDate timeZone]];
+  endDate = [NSCalendarDate dateWithYear: [newEndDate yearOfCommonEra]
+                                   month: [newEndDate monthOfYear]
+                                     day: [newEndDate dayOfMonth]
+                                    hour: [newEndDate hourOfDay]
+                                  minute: [newEndDate minuteOfHour]
+                                  second: [newEndDate secondOfMinute]
+                                timeZone: [newEndDate timeZone]];
 
   [startDate setTimeZone: timeZone];
   [endDate setTimeZone: timeZone];
+
+  [startDate retain];
+  [endDate retain];
 }
 
 - (NSString *) serverVersion

SoObjects/Contacts/BrazilianPortuguese.lproj/Localizable.strings

@@ -1,2 +1,2 @@
-"Personal Address Book" = "Livro de Endereços Pessoais";
+"Personal Address Book" = "Livro de Endereço Pessoal";
 "Collected Address Book" = "Catálogos Coletados";