From 03d5975be357b6cce4d74e90d4fb1069b9ff92ae Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Fri, 28 Mar 2014 10:28:33 -0400
Subject: [PATCH] Changed strings in french and change the instanciation of
 dictionary(addressBooksIDWithDisplayName) to release it manually

---
 .gitignore                                          | 1 +
 SoObjects/Contacts/French.lproj/Localizable.strings | 2 +-
 UI/PreferencesUI/French.lproj/Localizable.strings   | 2 +-
 UI/PreferencesUI/UIxPreferences.m                   | 7 ++++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 88becdaa6..16bc03de4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 config.make
 tags
+*._*
 */obj/
 */*/obj/
 */*/*/obj/
diff --git a/SoObjects/Contacts/French.lproj/Localizable.strings b/SoObjects/Contacts/French.lproj/Localizable.strings
index 8a5848a76..2b0358694 100644
--- a/SoObjects/Contacts/French.lproj/Localizable.strings
+++ b/SoObjects/Contacts/French.lproj/Localizable.strings
@@ -1,2 +1,2 @@
 "Personal Address Book" = "Carnet d'adresses personnel";
-"Collected Address Book" = "Carnet d'adresses recueilli";
+"Collected Address Book" = "Carnet d'adresses collectés";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index b65a727f1..774199a7b 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -159,7 +159,7 @@
 
 /* Contact */
 "Personal Address Book" = "Carnet d'adresses personnel";
-"Collected Address Book" = "Carnet d'adresses recueilli";
+"Collected Address Book" = "Carnet d'adresses collectés";
 
 /* IMAP Accounts */
 "New Mail Account" = "Nouveau compte";
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index 9e9adb1e2..02adf2ff6 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -177,6 +177,7 @@ static NSArray *reminderValues = nil;
   [contactsCategories release];
   [forwardOptions release];
   [daysOfWeek release];
+  [addressBooksIDWithDisplayName release];
   [super dealloc];
 }
 
@@ -704,7 +705,7 @@ static NSArray *reminderValues = nil;
   count = [folders count]-1;
   
   // Inside this loop we remove all the public or shared addressbooks
-  for(count; count>=0; count--)
+  for (count; count >= 0; count--)
   {
     if (![[folders objectAtIndex: count] isKindOfClass: [SOGoContactGCSFolder class]])
       [folders removeObjectAtIndex: count];
@@ -725,8 +726,8 @@ static NSArray *reminderValues = nil;
   }
   // Create the dictionary for the next function : itemAddressBookText.
   if (!addressBooksIDWithDisplayName)
-    addressBooksIDWithDisplayName = [NSMutableDictionary dictionaryWithObjects:availableAddressBooksName
-                                                                       forKeys:availableAddressBooksID];
+    addressBooksIDWithDisplayName = [[NSMutableDictionary alloc] initWithObjects:availableAddressBooksName
+                                                                         forKeys:availableAddressBooksID];
     if (!collectedAlreadyExist)
     {
       [availableAddressBooksID addObject: @"collected"];