Add aria attributes in Preferences module

UI/PreferencesUI/English.lproj/Localizable.strings

@@ -139,6 +139,7 @@
 "Show subscribed mailboxes only" = "Show subscribed mailboxes only";
 "Sort messages by threads" = "Sort messages by threads";
 "When sending mail, add unknown recipients to my" = "When sending mail, add unknown recipients to my";
+"Address Book" = "Address Book";
 
 "Forward messages:" = "Forward messages:";
 "messageforward_inline" = "Inline";
@@ -165,6 +166,7 @@
 "Collected Address Book" = "Collected Address Book";
 
 /* IMAP Accounts */
+"Mail Account" = "Mail Account";
 "New Mail Account" = "New Mail Account";
 
 "Server Name:" = "Server Name:";
@@ -202,6 +204,12 @@
 "PRIVATE_item" = "Private";
 
 /* Event+task categories */
+"Calendar Category" = "Calendar Category";
+"Add Calendar Category" = "Add Calendar Category";
+"Remove Calendar Category" = "Remove Calendar Category";
+"Contact Category" = "Contact Category";
+"Add Contact Category" = "Add Contact Category";
+"Remove Contact Category" = "Remove Contact Category";
 "category_none" = "None";
 "calendar_category_labels" = "Anniversary,Birthday,Business,Calls,Clients,Competition,Customer,Favorites,Follow up,Gifts,Holidays,Ideas,Meeting,Issues,Miscellaneous,Personal,Projects,Public Holiday,Status,Suppliers,Travel,Vacation";
 

UI/PreferencesUI/UIxPreferences.h

@@ -26,7 +26,6 @@
 
 @class NSString;
 
-@class SOGoMailLabel;
 @class SOGoUser;
 
 @interface UIxPreferences : UIxComponent
@@ -46,10 +45,6 @@
   NSArray *contactsCategories;
   NSCalendarDate *today;
 
-  // Mail labels/tags
-  SOGoMailLabel *label;
-  NSArray *mailLabels;
-  
   // Sieve filtering
   NSArray *daysOfWeek, *daysBetweenResponsesList;
   NSArray *sieveFilters;

UI/PreferencesUI/UIxPreferences.m

@@ -73,12 +73,10 @@ static NSArray *reminderValues = nil;
 			       @"15_MINUTES_BEFORE",
 			       @"30_MINUTES_BEFORE",
 			       @"45_MINUTES_BEFORE",
-			       @"-",
 			       @"1_HOUR_BEFORE",
 			       @"2_HOURS_BEFORE",
 			       @"5_HOURS_BEFORE",
 			       @"15_HOURS_BEFORE",
-			       @"-",
 			       @"1_DAY_BEFORE",
 			       @"2_DAYS_BEFORE",
 			       @"1_WEEK_BEFORE",
@@ -90,12 +88,10 @@ static NSArray *reminderValues = nil;
 				@"-PT15M",
 				@"-PT30M",
 				@"-PT45M",
-				@"",
 				@"-PT1H",
 				@"-PT2H",
 				@"-PT5H",
 				@"-PT15H",
-				@"",
 				@"-P1D",
 				@"-P2D",
 				@"-P1W",
@@ -123,9 +119,6 @@ static NSArray *reminderValues = nil;
       calendarCategoriesColors = nil;
       category = nil;
 
-      label = nil;
-      mailLabels = nil;
-
       ASSIGN (daysOfWeek, [locale objectForKey: NSWeekDayNameArray]);
 
       dd = [user domainDefaults];
@@ -168,8 +161,6 @@ static NSArray *reminderValues = nil;
   [calendarCategories release];
   [calendarCategoriesColors release];
   [category release];
-  [label release];
-  [mailLabels release];
   [contactsCategories release];
   [forwardOptions release];
   [daysOfWeek release];
@@ -1715,8 +1706,7 @@ static NSArray *reminderValues = nil;
 //
 - (NSArray *) languages
 {
-  return [[SOGoSystemDefaults sharedSystemDefaults]
-           supportedLanguages];
+  return [[SOGoSystemDefaults sharedSystemDefaults] supportedLanguages];
 }
 
 // - (NSString *) language