Bump version to 2.1.1c

Conflicts:
	NEWS
	UI/Templates/MailerUI/UIxMailEditor.wox
	UI/WebServerResources/UIxMailEditor.js

ChangeLog

@@ -1,3 +1,237 @@
+commit 0ce90d1707fa990e53f08781834ec07c65e5d657
+Author: Jean Raby <jraby@inverse.ca>
+Date:   Wed Dec 4 11:11:10 2013 -0500
+
+    Update NEWS CKEditor is in 2.1.1b
+
+M	NEWS
+
+commit ed6a2a6a88c59f93a0be0fa0b754b599ee2a3f32
+Author: Jean Raby <jraby@inverse.ca>
+Date:   Wed Dec 4 10:33:48 2013 -0500
+
+    Bump version to 2.1.1b + adjust NEWS
+
+M	NEWS
+M	Version
+
+commit 9b312f8b0ad3226e71a4fc559433515ab51c7c11
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Dec 2 13:41:39 2013 -0500
+
+    CKEditor: don't filter tags
+
+M	UI/WebServerResources/ckeditor/config.js
+
+commit 1b3304c19376ddb1ab0f001657c34be160444de7
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Dec 2 11:58:28 2013 -0500
+
+    Add 'div' plugin to CKEditor
+
+M	UI/WebServerResources/ckeditor/build-config.js
+M	UI/WebServerResources/ckeditor/ckeditor.js
+M	UI/WebServerResources/ckeditor/config.js
+M	UI/WebServerResources/ckeditor/lang/ar.js
+M	UI/WebServerResources/ckeditor/lang/ca.js
+M	UI/WebServerResources/ckeditor/lang/cs.js
+M	UI/WebServerResources/ckeditor/lang/cy.js
+M	UI/WebServerResources/ckeditor/lang/da.js
+M	UI/WebServerResources/ckeditor/lang/de.js
+M	UI/WebServerResources/ckeditor/lang/en.js
+M	UI/WebServerResources/ckeditor/lang/es.js
+M	UI/WebServerResources/ckeditor/lang/fi.js
+M	UI/WebServerResources/ckeditor/lang/fr.js
+M	UI/WebServerResources/ckeditor/lang/hu.js
+M	UI/WebServerResources/ckeditor/lang/is.js
+M	UI/WebServerResources/ckeditor/lang/it.js
+M	UI/WebServerResources/ckeditor/lang/nb.js
+M	UI/WebServerResources/ckeditor/lang/nl.js
+M	UI/WebServerResources/ckeditor/lang/no.js
+M	UI/WebServerResources/ckeditor/lang/pl.js
+M	UI/WebServerResources/ckeditor/lang/pt-br.js
+M	UI/WebServerResources/ckeditor/lang/ru.js
+M	UI/WebServerResources/ckeditor/lang/sk.js
+M	UI/WebServerResources/ckeditor/lang/sv.js
+M	UI/WebServerResources/ckeditor/lang/uk.js
+A	UI/WebServerResources/ckeditor/plugins/div/dialogs/div.js
+M	UI/WebServerResources/ckeditor/plugins/icons.png
+M	UI/WebServerResources/ckeditor/plugins/icons_hidpi.png
+M	UI/WebServerResources/ckeditor/skins/moono/editor.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_gecko.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_ie.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_ie7.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_ie8.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_iequirks.css
+M	UI/WebServerResources/ckeditor/skins/moono/icons.png
+M	UI/WebServerResources/ckeditor/skins/moono/icons_hidpi.png
+
+commit 5f04b065cd50ce6615074da0d0ca47e25798b24c
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Mon Nov 25 09:52:18 2013 -0500
+
+    Mail composition: add text part before html part
+    
+    Fixes #2512
+
+M	SoObjects/Mailer/SOGoDraftObject.m
+
+commit 3e1cd079a863d3dfac3de2e9e56ef06ccae29573
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Wed Nov 20 11:17:42 2013 -0500
+
+    Update CKEditor to version 4.3.0
+
+M	UI/WebServerResources/UIxMailEditor.js
+M	UI/WebServerResources/ckeditor/build-config.js
+M	UI/WebServerResources/ckeditor/ckeditor.js
+M	UI/WebServerResources/ckeditor/config.js
+M	UI/WebServerResources/ckeditor/contents.css
+M	UI/WebServerResources/ckeditor/plugins/image/dialogs/image.js
+M	UI/WebServerResources/ckeditor/plugins/link/dialogs/link.js
+M	UI/WebServerResources/ckeditor/plugins/table/dialogs/table.js
+M	UI/WebServerResources/ckeditor/skins/moono/dialog.css
+M	UI/WebServerResources/ckeditor/skins/moono/dialog_ie.css
+M	UI/WebServerResources/ckeditor/skins/moono/dialog_ie7.css
+M	UI/WebServerResources/ckeditor/skins/moono/dialog_ie8.css
+M	UI/WebServerResources/ckeditor/skins/moono/dialog_iequirks.css
+M	UI/WebServerResources/ckeditor/skins/moono/dialog_opera.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_gecko.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_ie.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_ie7.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_ie8.css
+M	UI/WebServerResources/ckeditor/skins/moono/editor_iequirks.css
+
+commit b5e77ad86c9c3939470c47669c413b4b3a0f9e72
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Fri Nov 22 15:16:20 2013 -0500
+
+    Bump version to 2.1.1a
+
+M	ChangeLog
+M	Version
+
+commit 5bc0a0a932e55ce6e1d02885501198e3b725551e
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Fri Nov 22 15:03:57 2013 -0500
+
+    Update NEWS file
+
+M	NEWS
+
+commit 582af53af0e3cb8619e61d72d622fae94382a047
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Fri Nov 22 14:42:16 2013 -0500
+
+    Cleanup wox templates
+
+M	UI/Templates/MailerUI/UIxMailWindowCloser.wox
+M	UI/Templates/PreferencesUI/UIxFilterEditor.wox
+
+commit 13f01b512b182069edcf11c0d2bb33ad08b43fca
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Fri Nov 22 14:39:24 2013 -0500
+
+    Move mail tags strings to UI/Common
+
+M	SoObjects/Mailer/SOGoMailLabel.m
+M	UI/Common/Arabic.lproj/Localizable.strings
+M	UI/Common/BrazilianPortuguese.lproj/Localizable.strings
+M	UI/Common/Catalan.lproj/Localizable.strings
+M	UI/Common/Czech.lproj/Localizable.strings
+M	UI/Common/Danish.lproj/Localizable.strings
+M	UI/Common/Dutch.lproj/Localizable.strings
+M	UI/Common/English.lproj/Localizable.strings
+M	UI/Common/Finnish.lproj/Localizable.strings
+M	UI/Common/French.lproj/Localizable.strings
+M	UI/Common/German.lproj/Localizable.strings
+M	UI/Common/Hungarian.lproj/Localizable.strings
+M	UI/Common/Icelandic.lproj/Localizable.strings
+M	UI/Common/Italian.lproj/Localizable.strings
+M	UI/Common/NorwegianBokmal.lproj/Localizable.strings
+M	UI/Common/NorwegianNynorsk.lproj/Localizable.strings
+M	UI/Common/Polish.lproj/Localizable.strings
+M	UI/Common/Russian.lproj/Localizable.strings
+M	UI/Common/Slovak.lproj/Localizable.strings
+M	UI/Common/SpanishArgentina.lproj/Localizable.strings
+M	UI/Common/SpanishSpain.lproj/Localizable.strings
+M	UI/Common/Swedish.lproj/Localizable.strings
+M	UI/Common/Ukrainian.lproj/Localizable.strings
+M	UI/Common/Welsh.lproj/Localizable.strings
+M	UI/MailerUI/Arabic.lproj/Localizable.strings
+M	UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
+M	UI/MailerUI/Catalan.lproj/Localizable.strings
+M	UI/MailerUI/Czech.lproj/Localizable.strings
+M	UI/MailerUI/Danish.lproj/Localizable.strings
+M	UI/MailerUI/Dutch.lproj/Localizable.strings
+M	UI/MailerUI/English.lproj/Localizable.strings
+M	UI/MailerUI/Finnish.lproj/Localizable.strings
+M	UI/MailerUI/French.lproj/Localizable.strings
+M	UI/MailerUI/German.lproj/Localizable.strings
+M	UI/MailerUI/Hungarian.lproj/Localizable.strings
+M	UI/MailerUI/Icelandic.lproj/Localizable.strings
+M	UI/MailerUI/Italian.lproj/Localizable.strings
+M	UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
+M	UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
+M	UI/MailerUI/Polish.lproj/Localizable.strings
+M	UI/MailerUI/Russian.lproj/Localizable.strings
+M	UI/MailerUI/Slovak.lproj/Localizable.strings
+M	UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
+M	UI/MailerUI/SpanishSpain.lproj/Localizable.strings
+M	UI/MailerUI/Swedish.lproj/Localizable.strings
+M	UI/MailerUI/Ukrainian.lproj/Localizable.strings
+M	UI/MailerUI/Welsh.lproj/Localizable.strings
+M	UI/PreferencesUI/Arabic.lproj/Localizable.strings
+M	UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
+M	UI/PreferencesUI/Catalan.lproj/Localizable.strings
+M	UI/PreferencesUI/Czech.lproj/Localizable.strings
+M	UI/PreferencesUI/Danish.lproj/Localizable.strings
+M	UI/PreferencesUI/Dutch.lproj/Localizable.strings
+M	UI/PreferencesUI/English.lproj/Localizable.strings
+M	UI/PreferencesUI/Finnish.lproj/Localizable.strings
+M	UI/PreferencesUI/French.lproj/Localizable.strings
+M	UI/PreferencesUI/German.lproj/Localizable.strings
+M	UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+M	UI/PreferencesUI/Icelandic.lproj/Localizable.strings
+M	UI/PreferencesUI/Italian.lproj/Localizable.strings
+M	UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
+M	UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
+M	UI/PreferencesUI/Polish.lproj/Localizable.strings
+M	UI/PreferencesUI/Russian.lproj/Localizable.strings
+M	UI/PreferencesUI/Slovak.lproj/Localizable.strings
+M	UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
+M	UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
+M	UI/PreferencesUI/Swedish.lproj/Localizable.strings
+M	UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
+M	UI/PreferencesUI/Welsh.lproj/Localizable.strings
+M	UI/WebServerResources/MailerUI.js
+
+commit cdb25b141ddd056f16be49fc738ec44782eb252b
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Fri Nov 22 11:29:24 2013 -0500
+
+    Init local variable to avoid potential crasher.
+
+M	OpenChange/MAPIStoreGCSBaseContext.m
+
+commit a9868b1c93e9b7fe77c52f1ef52a28206858f563
+Author: Francis Lachapelle <flachapelle@inverse.ca>
+Date:   Thu Nov 21 08:50:24 2013 -0500
+
+    Fix the Sieve filters editor with new mail flags
+
+M	UI/Templates/PreferencesUI/UIxFilterEditor.wox
+M	UI/WebServerResources/UIxFilterEditor.js
+
+commit 6587f4f19319aea549ffdd8b4e6a8752c1b3095d
+Author: Jean Raby <jraby@inverse.ca>
+Date:   Tue Nov 19 13:59:20 2013 -0500
+
+    Update ChangeLog
+
+M	ChangeLog
+
 commit c8a4ea5548e06de1341312a1cabb00fb0ef232e8
 Author: Francis Lachapelle <flachapelle@inverse.ca>
 Date:   Tue Nov 19 13:57:18 2013 -0500
@@ -1362,6 +1596,17 @@ Date:   Thu Jun 27 11:33:44 2013 -0400
 
 M	NEWS
 
+commit e26e3d73079890c037e3a1adb267b47d40f74b86
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Thu Jun 27 11:15:41 2013 -0400
+
+    Revert "Properly escape the foldername to avoid XSS issues"
+    
+    This reverts commit 045b275b270ec8bc0a82c7d881336db30db274f3.
+
+M	UI/WebServerResources/SchedulerUI.js
+M	UI/WebServerResources/UIxContactsUserFolders.js
+
 commit 25dbd4849de23b9ceb747ff061dffd0f1cf98cde
 Author: Ludovic Marcotte <lmarcotte@inverse.ca>
 Date:   Thu Jun 27 11:06:07 2013 -0400
@@ -1371,6 +1616,15 @@ Date:   Thu Jun 27 11:06:07 2013 -0400
 M	UI/WebServerResources/SchedulerUI.js
 M	UI/WebServerResources/UIxContactsUserFolders.js
 
+commit 045b275b270ec8bc0a82c7d881336db30db274f3
+Author: Ludovic Marcotte <lmarcotte@inverse.ca>
+Date:   Thu Jun 27 11:06:07 2013 -0400
+
+    Properly escape the foldername to avoid XSS issues
+
+M	UI/WebServerResources/SchedulerUI.js
+M	UI/WebServerResources/UIxContactsUserFolders.js
+
 commit a2a89e8720cfd44f885c34d5626d78b6b20a6b3b
 Author: Jean Raby <jraby@inverse.ca>
 Date:   Wed Jun 26 16:55:39 2013 -0400
@@ -1905,6 +2159,14 @@ Date:   Mon Apr 22 12:31:18 2013 -0400
 
 M	Documentation/SOGo Installation Guide.odt
 
+commit f049e2430a2a61c67f1a0e2ba27eb34d9e540e1b
+Author: Jean Raby <jraby@inverse.ca>
+Date:   Mon Apr 22 12:25:22 2013 -0400
+
+    Added ldap attribute mapping table
+
+M	Documentation/SOGo Installation Guide.odt
+
 commit a53c66e8a449d17f4f4484ef299b7500a8a5612b
 Author: Jean Raby <jraby@inverse.ca>
 Date:   Thu Apr 18 14:35:56 2013 -0400
@@ -7280,6 +7542,15 @@ M	Documentation/SOGo Mobile Devices Configuration.odt
 M	Documentation/SOGo Mozilla Thunderbird Configuration.odt
 M	Documentation/SOGo Native Microsoft Outlook Configuration.odt
 
+commit ce4084e5285b353afa9fc81e47389f9927364d17
+Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+Date:   Fri Oct 12 16:55:27 2012 -0400
+
+    getNewChangeNumbers: new wrapper for openchangedb_get_new_changeNumbers
+
+M	OpenChange/MAPIStoreContext.h
+M	OpenChange/MAPIStoreContext.m
+
 commit b1547d7212dfeb23a8d6c936db0a46cad77f8b23
 Author: Luc Charland <lcharland@inverse.ca>
 Date:   Fri Oct 12 13:34:38 2012 -0400

NEWS

@@ -1,3 +1,21 @@
+2.1.1b (2013-12-04)
+-------------------
+
+Enhancements
+ - updated CKEditor to version 4.3.0 and added tab module
+
+Bug fixes
+ - HTML formatting is now retained when forwarding/replying to a mail using the HTML editor.
+ - put the text part before the HTML part when composing mail to fix a display issue with Thunderbird (#2512)
+
+2.1.1a (2013-11-22)
+-------------------
+
+Bug fixes
+ - fixed Sieve filters editor (#2504)
+ - moved missing translation to UI/Common (#2499)
+ - fixed potential crasher in OpenChange
+
 2.1.1 (2013-11-19)
 ------------------
 

OpenChange/MAPIStoreGCSBaseContext.m

@@ -122,6 +122,8 @@
   [MAPIApp setUserContext: userContext];
   moduleName = [self MAPIModuleName];
   parentFolder = [[userContext rootFolders] objectForKey: moduleName];
+  nameInContainer = nil;
+
   if (![parentFolder newFolderWithName: folderName
                        nameInContainer: &nameInContainer])
     mapistoreURI = [NSString stringWithFormat: @"sogo://%@@%@/%@/",

SoObjects/Appointments/SOGoCalendarComponent.m

@@ -219,29 +219,13 @@
 
 - (NSString *) secureContentAsString
 {
-  iCalCalendar *tmpCalendar;
   iCalRepeatableEntityObject *tmpComponent;
-//   NSArray *roles;
+  iCalCalendar *tmpCalendar;
+  NSArray *allComponents;
   SoSecurityManager *sm;
   NSString *iCalString;
 
-//       uid = [[context activeUser] login];
-//       roles = [self aclsForUser: uid];
-//       if ([roles containsObject: SOGoCalendarRole_Organizer]
-// 	  || [roles containsObject: SOGoCalendarRole_Participant]
-// 	  || [roles containsObject: SOGoCalendarRole_ComponentViewer])
-// 	calContent = content;
-//       else if ([roles containsObject: SOGoCalendarRole_ComponentDAndTViewer])
-// 	{
-// 	  tmpCalendar = [[self calendar: NO] copy];
-// 	  tmpComponent = (iCalRepeatableEntityObject *)
-// 	    [tmpCalendar firstChildWithTag: [self componentTag]];
-// 	  [self _filterComponent: tmpComponent];
-// 	  calContent = [tmpCalendar versitString];
-// 	  [tmpCalendar release];
-// 	}
-//       else
-// 	calContent = nil;
+  int i;
 
   sm = [SoSecurityManager sharedSecurityManager];
   if (activeUserIsOwner
@@ -253,14 +237,21 @@
 		onObject: self inContext: context])
     {
       tmpCalendar = [[self calendar: NO secure: NO] mutableCopy];
-      tmpComponent = (iCalRepeatableEntityObject *)
-	[tmpCalendar firstChildWithTag: [self componentTag]];
-      [self _filterComponent: tmpComponent];
+
+      // We filter all components, in case we have RECURRENCE-ID
+      allComponents = [tmpCalendar childrenWithTag: [self componentTag]];
+
+      for (i = 0; i < [allComponents count]; i++)
+        {
+          tmpComponent = (iCalRepeatableEntityObject *)[allComponents objectAtIndex:i];
+          [self _filterComponent: tmpComponent];
       
-      // We add an additional header here to inform clients (if necessary) that
-      // we churned the content of the calendar.
-      [tmpComponent addChild: [CardElement simpleElementWithTag: @"X-SOGo-Secure"
-					   value: @"YES"]];
+          // We add an additional header here to inform clients (if necessary) that
+          // we churned the content of the calendar.
+          [tmpComponent addChild: [CardElement simpleElementWithTag: @"X-SOGo-Secure"
+                                                              value: @"YES"]];
+        }
+
       iCalString = [tmpCalendar versitString];
       [tmpCalendar release];
     }

SoObjects/Mailer/SOGoDraftObject.m

@@ -1081,11 +1081,11 @@ static NSString    *userAgent      = nil;
       body = [[[NGMimeMultipartBody alloc] initWithPart: message] autorelease];
       [map addObject: MultiAlternativeType forKey: @"content-type"];
 
+      // Get the text part from it and add it
+      [body addBodyPart: [self plainTextBodyPartForText]];
+
       // Add the HTML part
       [body addBodyPart: [self bodyPartForText]];
-      
-      // Get the text part from it and add it too
-      [body addBodyPart: [self plainTextBodyPartForText]];
     }
   
   [message setBody: body];
@@ -1289,11 +1289,11 @@ static NSString    *userAgent      = nil;
   
   textParts = [[NGMimeMultipartBody alloc] initWithPart: part];
   
+  // Get the text part from it and add it
+  [textParts addBodyPart: [self plainTextBodyPartForText]];
+
   // Add the HTML part
   [textParts addBodyPart: [self bodyPartForText]];
-  
-  // Get the text part from it and add it too
-  [textParts addBodyPart: [self plainTextBodyPartForText]];
 
   [part setBody: textParts];
   RELEASE(textParts);

SoObjects/Mailer/SOGoMailLabel.m

@@ -68,7 +68,6 @@
                        component: (UIxComponent *) theComponent
 {
   NSMutableArray *allLabels, *allKeys;
-  NSDictionary *mailLabelsColors;
   NSString *key, *name;
   SOGoMailLabel *label;
   NSArray *values;
@@ -81,7 +80,7 @@
     {
       key = [allKeys objectAtIndex: i];
       values = [theDefaults objectForKey: key];
-      name = [theComponent labelForKey: [values objectAtIndex: 0]];
+      name = [theComponent commonLabelForKey: [values objectAtIndex: 0]];
 
       label = [[self alloc] initWithName: key
                                    label: name

UI/Common/Arabic.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "تاريخ الاستحقاق:";
 "Location:" = "الموقع:";
 
+/* Mail labels */
+"Important" = "مهم";
+"Work" = "عمل";
+"Work" = "عمل";
+"Personal" = "شخصي";
+"To Do" = "تفعل";
+"Later" = "لاحقا";
+
 "a2_Sunday" = "ح";
 "a2_Monday" = "ن";
 "a2_Tuesday" = "ث";

UI/Common/BrazilianPortuguese.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Data:";
 "Location:" = "Localização:";
 
+/* Mail labels */
+"Important" = "Importante";
+"Work" = "Trabalho";
+"Work" = "Trabalho";
+"Personal" = "Pessoal";
+"To Do" = "Tarefa";
+"Later" = "Adiar";
+
 "a2_Sunday" = "Do";
 "a2_Monday" = "Se";
 "a2_Tuesday" = "Te";

UI/Common/Catalan.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Data límit:";
 "Location:" = "Lloc:";
 
+/* Mail labels */
+"Important" = "Important";
+"Work" = "Feina";
+"Work" = "Feina";
+"Personal" = "Personal";
+"To Do" = "Per fer";
+"Later" = "Més tard";
+
 "a2_Sunday" = "dg";
 "a2_Monday" = "dl";
 "a2_Tuesday" = "dm";

UI/Common/Czech.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Do dne:";
 "Location:" = "Místo:";
 
+/* Mail labels */
+"Important" = "Důležitý";
+"Work" = "Pracovní";
+"Work" = "Pracovní";
+"Personal" = "Osobní";
+"To Do" = "Třeba udělat";
+"Later" = "Později";
+
 "a2_Sunday" = "Ne";
 "a2_Monday" = "Po";
 "a2_Tuesday" = "Út";

UI/Common/Danish.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Forfaldsdato:";
 "Location:" = "Sted:";
 
+/* Mail labels */
+"Important" = "Vigtigt";
+"Work" = "Arbejde";
+"Work" = "Arbejde";
+"Personal" = "Privat";
+"To Do" = "To Do";
+"Later" = "Senere";
+
 "a2_Sunday" = "Sø";
 "a2_Monday" = "Ma";
 "a2_Tuesday" = "Ti";

UI/Common/Dutch.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Verloopdatum:";
 "Location:" = "Plaats:";
 
+/* Mail labels */
+"Important" = "Belangrijk";
+"Work" = "Werk";
+"Work" = "Werk";
+"Personal" = "Persoonlijk";
+"To Do" = "Te doen";
+"Later" = "Later";
+
 "a2_Sunday" = "Zo";
 "a2_Monday" = "Ma";
 "a2_Tuesday" = "Di";

UI/Common/English.lproj/Localizable.strings

@@ -101,6 +101,15 @@
 "Due Date:" = "Due Date:";
 "Location:" = "Location:";
 
+/* mail labels */
+/* Mail labels */
+"Important" = "Important";
+"Work" = "Work";
+"Work" = "Work";
+"Personal" = "Personal";
+"To Do" = "To Do";
+"Later" = "Later";
+
 "a2_Sunday" = "Su";
 "a2_Monday" = "Mo";
 "a2_Tuesday" = "Tu";

UI/Common/Finnish.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Päättyy:";
 "Location:" = "Sijainti:";
 
+/* Mail labels */
+"Important" = "Tärkeä";
+"Work" = "Työ";
+"Work" = "Työ";
+"Personal" = "Henkilökohtainen";
+"To Do" = "Tehtävä";
+"Later" = "Myöhemmin";
+
 "a2_Sunday" = "Su";
 "a2_Monday" = "Ma";
 "a2_Tuesday" = "Ti";

UI/Common/French.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Échéance :";
 "Location:" = "Lieu :";
 
+/* Mail labels */
+"Important" = "Important";
+"Work" = "Travail";
+"Work" = "Travail";
+"Personal" = "Personnel";
+"To Do" = "À faire";
+"Later" = "Peut attendre";
+
 "a2_Sunday" = "Di";
 "a2_Monday" = "Lu";
 "a2_Tuesday" = "Ma";

UI/Common/German.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Fällig:";
 "Location:" = "Ort:";
 
+/* Mail labels */
+"Important" = "Wichtig";
+"Work" = "Geschäftlich";
+"Work" = "Geschäftlich";
+"Personal" = "Persönlich";
+"To Do" = "To-Do";
+"Later" = "Später";
+
 "a2_Sunday" = "So";
 "a2_Monday" = "Mo";
 "a2_Tuesday" = "Di";

UI/Common/Hungarian.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Lejárat dátuma:";
 "Location:" = "Hely:";
 
+/* Mail labels */
+"Important" = "Fontos";
+"Work" = "Hivatalos";
+"Work" = "Hivatalos";
+"Personal" = "Személyes";
+"To Do" = "Teendő";
+"Later" = "Később";
+
 "a2_Sunday" = "Va";
 "a2_Monday" = "Hé";
 "a2_Tuesday" = "Ke";

UI/Common/Icelandic.lproj/Localizable.strings

@@ -78,6 +78,14 @@
 "Due Date:" = "Lokadagur:";
 "Location:" = "Staðsetning:";
 
+/* Mail labels */
+"Important" = "Mikilvægt";
+"Work" = "Vinna";
+"Work" = "Vinna";
+"Personal" = "Persónulegt";
+"To Do" = "Verkþáttur";
+"Later" = "Seinna";
+
 "a2_Sunday" = "Su";
 "a2_Monday" = "Má";
 "a2_Tuesday" = "Þr";

UI/Common/Italian.lproj/Localizable.strings

@@ -100,6 +100,14 @@
 "Due Date:" = "Scadenza:";
 "Location:" = "Luogo:";
 
+/* Mail labels */
+"Important" = "Importante";
+"Work" = "Lavoro";
+"Work" = "Lavoro";
+"Personal" = "Personale";
+"To Do" = "Da fare";
+"Later" = "Posponi";
+
 "a2_Sunday" = "Do";
 "a2_Monday" = "Lu";
 "a2_Tuesday" = "Ma";

UI/Common/NorwegianBokmal.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Forfallsdato:";
 "Location:" = "Lokasjon:";
 
+/* Mail labels */
+"Important" = "Viktig";
+"Work" = "Arbeid";
+"Work" = "Arbeid";
+"Personal" = "Personlig";
+"To Do" = "Gjøremål";
+"Later" = "Senere";
+
 "a2_Sunday" = "Sø";
 "a2_Monday" = "Ma";
 "a2_Tuesday" = "Ti";

UI/Common/NorwegianNynorsk.lproj/Localizable.strings

@@ -78,6 +78,14 @@
 "Due Date:" = "Forfallsdato:";
 "Location:" = "Lokasjon:";
 
+/* Mail labels */
+"Important" = "Viktig";
+"Work" = "Arbeid";
+"Work" = "Arbeid";
+"Personal" = "Personlig";
+"To Do" = "Gjøremål";
+"Later" = "Senere";
+
 "a2_Sunday" = "Sø";
 "a2_Monday" = "Ma";
 "a2_Tuesday" = "Ti";

UI/Common/Polish.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Termin:";
 "Location:" = "Miejsce:";
 
+/* Mail labels */
+"Important" = "Ważne";
+"Work" = "Praca";
+"Work" = "Praca";
+"Personal" = "Osobiste";
+"To Do" = "Do zrobienia";
+"Later" = "Później";
+
 "a2_Sunday" = "Ni";
 "a2_Monday" = "Pn";
 "a2_Tuesday" = "Wt";

UI/Common/Russian.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Дата начала:";
 "Location:" = "Место:";
 
+/* Mail labels */
+"Important" = "Важно";
+"Work" = "Работа";
+"Work" = "Работа";
+"Personal" = "Личное";
+"To Do" = "К исполнению";
+"Later" = "Позже";
+
 "a2_Sunday" = "Вс";
 "a2_Monday" = "Пн";
 "a2_Tuesday" = "Вт";

UI/Common/Slovak.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Splatnosť:";
 "Location:" = "Umiestnenie:";
 
+/* Mail labels */
+"Important" = "Dôležité";
+"Work" = "Pracovné";
+"Work" = "Pracovné";
+"Personal" = "Osobné";
+"To Do" = "Treba urobiť";
+"Later" = "Neskôr";
+
 "a2_Sunday" = "Ne";
 "a2_Monday" = "Po";
 "a2_Tuesday" = "Ut";

UI/Common/SpanishArgentina.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Vencimiento:";
 "Location:" = "Lugar:";
 
+/* Mail labels */
+"Important" = "Importante";
+"Work" = "Trabajo";
+"Work" = "Trabajo";
+"Personal" = "Personal";
+"To Do" = "Por hacer";
+"Later" = "Más tarde";
+
 "a2_Sunday" = "Do";
 "a2_Monday" = "Lu";
 "a2_Tuesday" = "Ma";

UI/Common/SpanishSpain.lproj/Localizable.strings

@@ -101,6 +101,14 @@
 "Due Date:" = "Vencimiento:";
 "Location:" = "Lugar:";
 
+/* Mail labels */
+"Important" = "Importante";
+"Work" = "Trabajo";
+"Work" = "Trabajo";
+"Personal" = "Personal";
+"To Do" = "Por hacer";
+"Later" = "Más tarde";
+
 "a2_Sunday" = "Do";
 "a2_Monday" = "Lu";
 "a2_Tuesday" = "Ma";

UI/Common/Swedish.lproj/Localizable.strings

@@ -78,6 +78,14 @@
 "Due Date:" = "Förfallodag:";
 "Location:" = "Plats:";
 
+/* Mail labels */
+"Important" = "Viktigt";
+"Work" = "Arbete";
+"Work" = "Arbete";
+"Personal" = "Personligt";
+"To Do" = "Att göra";
+"Later" = "Senare";
+
 "a2_Sunday" = "Sö";
 "a2_Monday" = "Må";
 "a2_Tuesday" = "Ti";

UI/Common/Ukrainian.lproj/Localizable.strings

@@ -100,6 +100,14 @@
 "Due Date:" = "Дата початку:";
 "Location:" = "Місце:";
 
+/* Mail labels */
+"Important" = "Важливе";
+"Work" = "Робоче";
+"Work" = "Робоче";
+"Personal" = "Особисте";
+"To Do" = "До виконання";
+"Later" = "Відсунуте";
+
 "a2_Sunday" = "Нд";
 "a2_Monday" = "Пн";
 "a2_Tuesday" = "Вт";

UI/Common/Welsh.lproj/Localizable.strings

@@ -78,6 +78,14 @@
 "Due Date:" = "Dyddiad dyledus:";
 "Location:" = "Lleoliad:";
 
+/* Mail labels */
+"Important" = "Pwysig";
+"Work" = "gwaith";
+"Work" = "gwaith";
+"Personal" = "Personol";
+"To Do" = "I'w wneud";
+"Later" = "Hwyrach";
+
 "a2_Sunday" = "Su";
 "a2_Monday" = "Ll";
 "a2_Tuesday" = "Ma";

UI/MailerUI/Arabic.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "لا شيء";
-"Important" = "مهم";
-"Work" = "عمل";
-"Personal" = "شخصي";
-"To Do" = "تفعل";
-"Later" = "لاحقا";
 
 /* Mark popup menu */
 "As Read" = "مقروء";

UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Nenhum";
-"Important" = "Importante";
-"Work" = "Trabalho";
-"Personal" = "Pessoal";
-"To Do" = "Tarefa";
-"Later" = "Adiar";
 
 /* Mark popup menu */
 "As Read" = "Como Lido";

UI/MailerUI/Catalan.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Cap";
-"Important" = "Important";
-"Work" = "Feina";
-"Personal" = "Personal";
-"To Do" = "Per fer";
-"Later" = "Més tard";
 
 /* Mark popup menu */
 "As Read" = "Com a llegits";

UI/MailerUI/Czech.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Žádný";
-"Important" = "Důležitý";
-"Work" = "Pracovní";
-"Personal" = "Osobní";
-"To Do" = "Třeba udělat";
-"Later" = "Později";
 
 /* Mark popup menu */
 "As Read" = "Jako přečtené";

UI/MailerUI/Danish.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Ingen";
-"Important" = "Vigtigt";
-"Work" = "Arbejde";
-"Personal" = "Privat";
-"To Do" = "To Do";
-"Later" = "Senere";
 
 /* Mark popup menu */
 "As Read" = "Som læst";

UI/MailerUI/Dutch.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Geen label";
-"Important" = "Belangrijk";
-"Work" = "Werk";
-"Personal" = "Persoonlijk";
-"To Do" = "Te doen";
-"Later" = "Later";
 
 /* Mark popup menu */
 "As Read" = "Als gelezen";

UI/MailerUI/English.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "None";
-"Important" = "Important";
-"Work" = "Work";
-"Personal" = "Personal";
-"To Do" = "To Do";
-"Later" = "Later";
 
 /* Mark popup menu */
 "As Read" = "As Read";

UI/MailerUI/Finnish.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Ei mitään";
-"Important" = "Tärkeä";
-"Work" = "Työ";
-"Personal" = "Henkilökohtainen";
-"To Do" = "Tehtävä";
-"Later" = "Myöhemmin";
 
 /* Mark popup menu */
 "As Read" = "Luetuksi";

UI/MailerUI/French.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Aucune";
-"Important" = "Important";
-"Work" = "Travail";
-"Personal" = "Personnel";
-"To Do" = "À faire";
-"Later" = "Peut attendre";
 
 /* Mark popup menu */
 "As Read" = "Comme lu";

UI/MailerUI/German.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Kein";
-"Important" = "Wichtig";
-"Work" = "Geschäftlich";
-"Personal" = "Persönlich";
-"To Do" = "To-Do";
-"Later" = "Später";
 
 /* Mark popup menu */
 "As Read" = "Gelesen";

UI/MailerUI/Hungarian.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Nincs cimke";
-"Important" = "Fontos";
-"Work" = "Hivatalos";
-"Personal" = "Személyes";
-"To Do" = "Teendő";
-"Later" = "Később";
 
 /* Mark popup menu */
 "As Read" = "Olvasottként";

UI/MailerUI/Icelandic.lproj/Localizable.strings

@@ -225,11 +225,6 @@
 
 /* Label popup menu */
 "None" = "Engin";
-"Important" = "Mikilvægt";
-"Work" = "Vinna";
-"Personal" = "Persónulegt";
-"To Do" = "Verkþáttur";
-"Later" = "Seinna";
 
 /* Mark popup menu */
 "As Read" = "Sem lesið";

UI/MailerUI/Italian.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Nessuno";
-"Important" = "Importante";
-"Work" = "Lavoro";
-"Personal" = "Personale";
-"To Do" = "Da fare";
-"Later" = "Posponi";
 
 /* Mark popup menu */
 "As Read" = "Già letto";

UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Ingen";
-"Important" = "Viktig";
-"Work" = "Arbeid";
-"Personal" = "Personlig";
-"To Do" = "Gjøremål";
-"Later" = "Senere";
 
 /* Mark popup menu */
 "As Read" = "Som lest";

UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings

@@ -225,11 +225,6 @@
 
 /* Label popup menu */
 "None" = "Ingen";
-"Important" = "Viktig";
-"Work" = "Arbeid";
-"Personal" = "Personlig";
-"To Do" = "Gjøremål";
-"Later" = "Senere";
 
 /* Mark popup menu */
 "As Read" = "Som lest";

UI/MailerUI/Polish.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Brak";
-"Important" = "Ważne";
-"Work" = "Praca";
-"Personal" = "Osobiste";
-"To Do" = "Do zrobienia";
-"Later" = "Później";
 
 /* Mark popup menu */
 "As Read" = "Jako przeczytane";

UI/MailerUI/Russian.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Удалить все метки";
-"Important" = "Важно";
-"Work" = "Работа";
-"Personal" = "Личное";
-"To Do" = "К исполнению";
-"Later" = "Позже";
 
 /* Mark popup menu */
 "As Read" = "как прочтанное";

UI/MailerUI/Slovak.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Žiaden";
-"Important" = "Dôležité";
-"Work" = "Pracovné";
-"Personal" = "Osobné";
-"To Do" = "Treba urobiť";
-"Later" = "Neskôr";
 
 /* Mark popup menu */
 "As Read" = "Prečítané";

UI/MailerUI/SpanishArgentina.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Ninguna";
-"Important" = "Importante";
-"Work" = "Trabajo";
-"Personal" = "Personal";
-"To Do" = "Por hacer";
-"Later" = "Más tarde";
 
 /* Mark popup menu */
 "As Read" = "Como leídos";

UI/MailerUI/SpanishSpain.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Ninguna";
-"Important" = "Importante";
-"Work" = "Trabajo";
-"Personal" = "Personal";
-"To Do" = "Por hacer";
-"Later" = "Más tarde";
 
 /* Mark popup menu */
 "As Read" = "Como leídos";

UI/MailerUI/Swedish.lproj/Localizable.strings

@@ -225,11 +225,6 @@
 
 /* Label popup menu */
 "None" = "Inget";
-"Important" = "Viktigt";
-"Work" = "Arbete";
-"Personal" = "Personligt";
-"To Do" = "Att göra";
-"Later" = "Senare";
 
 /* Mark popup menu */
 "As Read" = "Som läst";

UI/MailerUI/Ukrainian.lproj/Localizable.strings

@@ -227,11 +227,6 @@
 
 /* Label popup menu */
 "None" = "Вилучити всі позначки";
-"Important" = "Важливе";
-"Work" = "Робоче";
-"Personal" = "Особисте";
-"To Do" = "До виконання";
-"Later" = "Відсунуте";
 
 /* Mark popup menu */
 "As Read" = "Прочитаним";

UI/MailerUI/Welsh.lproj/Localizable.strings

@@ -225,11 +225,6 @@
 
 /* Label popup menu */
 "None" = "Dim";
-"Important" = "Pwysig";
-"Work" = "gwaith";
-"Personal" = "Personol";
-"To Do" = "I'w wneud";
-"Later" = "Hwyrach";
 
 /* Mark popup menu */
 "As Read" = "Darllenwyd";

UI/PreferencesUI/Arabic.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "التقويم الشخصي";
 "firstCalendar" = "أول تقويم ممكن";
 
-"reminderTime_0000" = "0 دقيقة";
-"reminderTime_0005" = "5 دقائق";
-"reminderTime_0010" = "10 دقائق";
-"reminderTime_0015" = "15 دقيقة";
-"reminderTime_0030" = "30 دقيقة";
-"reminderTime_0100" = "1 ساعة";
-"reminderTime_0200" = "2 ساعة";
-"reminderTime_0400" = "4 ساعات";
-"reminderTime_0800" = "8 ساعات";
-"reminderTime_1200" = "1/2 يوم";
-"reminderTime_2400" = "1 يوم";
-"reminderTime_4800" = "2 يوم";
+"reminder_5_MINUTES_BEFORE" = "5 دقائق";
+"reminder_10_MINUTES_BEFORE" = "10 دقائق";
+"reminder_15_MINUTES_BEFORE" = "15 دقيقة";
+"reminder_30_MINUTES_BEFORE" = "30 دقيقة";
+"reminder_1_HOUR_BEFORE" = "1 ساعة";
+"reminder_2_HOURS_BEFORE" = "2 ساعة";
+"reminder_5_HOURS_BEFORE"= "5 ساعات";
+"reminder_15_HOURS_BEFORE"= "15 ساعات";
+"reminder_1_DAY_BEFORE" = "1 يوم";
+"reminder_2_DAYS_BEFORE" = "2 يوم";
 
 /* Mailer */
+"Label" = "ملصق";
 "Show subscribed mailboxes only" = "عرض صناديق البريد المشترك بها فقط";
 "Sort messages by threads" = "رتب الرسائل حسب المواضيع";
 "Check for new mail:" = "تحقق من وجود بريد جديد:";

UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Calendário pessoal";
 "firstCalendar" = "Calendário habilizado pela primeira vez";
 
-"reminderTime_0000" = "0 minutos";
-"reminderTime_0005" = "5 minutos";
-"reminderTime_0010" = "10 minutos";
-"reminderTime_0015" = "15 minutos";
-"reminderTime_0030" = "30 minutos";
-"reminderTime_0100" = "1 hora";
-"reminderTime_0200" = "2 horas";
-"reminderTime_0400" = "4 horas";
-"reminderTime_0800" = "8 horas";
-"reminderTime_1200" = "1/2 dia";
-"reminderTime_2400" = "1 dia";
-"reminderTime_4800" = "2 dias";
+"reminder_5_MINUTES_BEFORE" = "5 minutos";
+"reminder_10_MINUTES_BEFORE" = "10 minutos";
+"reminder_15_MINUTES_BEFORE" = "15 minutos";
+"reminder_30_MINUTES_BEFORE" = "30 minutos";
+"reminder_1_HOUR_BEFORE" = "1 hora";
+"reminder_2_HOURS_BEFORE" = "2 horas";
+"reminder_5_HOURS_BEFORE"= "5 horas";
+"reminder_15_HOURS_BEFORE"= "15 horas";
+"reminder_1_DAY_BEFORE" = "1 dia";
+"reminder_2_DAYS_BEFORE" = "2 dias";
 
 /* Mailer */
+"Label" = "Etiqueta";
 "Show subscribed mailboxes only" = "Exibir somente caixas de correio inscritas";
 "Sort messages by threads" = "Ordenar mensagens por tópicos";
 "Check for new mail:" = "Checar novos emails:";

UI/PreferencesUI/Catalan.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Calendari personal";
 "firstCalendar" = "Primer calendari habilitat";
 
-"reminderTime_0000" = "0 minuts";
-"reminderTime_0005" = "5 minuts";
-"reminderTime_0010" = "10 minuts";
-"reminderTime_0015" = "15 minuts";
-"reminderTime_0030" = "30 minuts";
-"reminderTime_0100" = "1 hora";
-"reminderTime_0200" = "2 hores";
-"reminderTime_0400" = "4 hores";
-"reminderTime_0800" = "8 hores";
-"reminderTime_1200" = "1/2 dia";
-"reminderTime_2400" = "1 dia";
-"reminderTime_4800" = "2 dies";
+"reminder_5_MINUTES_BEFORE" = "5 minuts";
+"reminder_10_MINUTES_BEFORE" = "10 minuts";
+"reminder_15_MINUTES_BEFORE" = "15 minuts";
+"reminder_30_MINUTES_BEFORE" = "30 minuts";
+"reminder_1_HOUR_BEFORE" = "1 hora";
+"reminder_2_HOURS_BEFORE" = "2 hores";
+"reminder_5_HOURS_BEFORE"= "5 hores";
+"reminder_15_HOURS_BEFORE"= "15 hores";
+"reminder_1_DAY_BEFORE" = "1 dia";
+"reminder_2_DAYS_BEFORE" = "2 dies";
 
 /* Mailer */
+"Label" = "Etiquetar";
 "Show subscribed mailboxes only" = "Mostrar només les bústies subscrites";
 "Sort messages by threads" = "Ordenar els missatges per temes";
 "Check for new mail:" = "Comprovar nou correu: ";

UI/PreferencesUI/Czech.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Osobní kalendář";
 "firstCalendar" = "První kalendář";
 
-"reminderTime_0000" = "0 minut";
-"reminderTime_0005" = "5 minut";
-"reminderTime_0010" = "10 minut";
-"reminderTime_0015" = "15 minut";
-"reminderTime_0030" = "30 minut";
-"reminderTime_0100" = "1 hodina";
-"reminderTime_0200" = "2 hodiny";
-"reminderTime_0400" = "4 hodiny";
-"reminderTime_0800" = "8 hodin";
-"reminderTime_1200" = "1/2 dne";
-"reminderTime_2400" = "1 den";
-"reminderTime_4800" = "2 dny";
+"reminder_5_MINUTES_BEFORE" = "5 minut";
+"reminder_10_MINUTES_BEFORE" = "10 minut";
+"reminder_15_MINUTES_BEFORE" = "15 minut";
+"reminder_30_MINUTES_BEFORE" = "30 minut";
+"reminder_1_HOUR_BEFORE" = "1 hodina";
+"reminder_2_HOURS_BEFORE" = "2 hodiny";
+"reminder_5_HOURS_BEFORE"= "5 hodiny";
+"reminder_15_HOURS_BEFORE"= "15 hodin";
+"reminder_1_DAY_BEFORE" = "1 den";
+"reminder_2_DAYS_BEFORE" = "2 dny";
 
 /* Mailer */
+"Label" = "Označkovat";
 "Show subscribed mailboxes only" = "Ukázat pouze odebírané mailové schránky";
 "Sort messages by threads" = "Třídit zprávy podle souvislostí";
 "Check for new mail:" = "Zkontrolovat novou poštu:";

UI/PreferencesUI/Danish.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Personlig kalender";
 "firstCalendar" = "Første aktiveret kalender";
 
-"reminderTime_0000" = "0 minutter";
-"reminderTime_0005" = "5 minutter";
-"reminderTime_0010" = "10 minutter";
-"reminderTime_0015" = "15 minutter";
-"reminderTime_0030" = "30 minutter";
-"reminderTime_0100" = "1 time";
-"reminderTime_0200" = "2 timer";
-"reminderTime_0400" = "4 timer";
-"reminderTime_0800" = "8 timer";
-"reminderTime_1200" = "1/2 dag";
-"reminderTime_2400" = "1 dag";
-"reminderTime_4800" = "2 dage";
+"reminder_5_MINUTES_BEFORE" = "5 minutter";
+"reminder_10_MINUTES_BEFORE" = "10 minutter";
+"reminder_15_MINUTES_BEFORE" = "15 minutter";
+"reminder_30_MINUTES_BEFORE" = "30 minutter";
+"reminder_1_HOUR_BEFORE" = "1 time";
+"reminder_2_HOURS_BEFORE" = "2 timer";
+"reminder_5_HOURS_BEFORE"= "5 timer";
+"reminder_15_HOURS_BEFORE"= "15 timer";
+"reminder_1_DAY_BEFORE" = "1 dag";
+"reminder_2_DAYS_BEFORE" = "2 dage";
 
 /* Mailer */
+"Label" = "Mærke";
 "Show subscribed mailboxes only" = "Vis kun abonnerede postkasser";
 "Sort messages by threads" = "Sortér beskeder efter tråd";
 "Check for new mail:" = "Tjek for ny post:";

UI/PreferencesUI/Dutch.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Persoonlijke agenda";
 "firstCalendar" = "Eerste ingeschakelde agenda";
 
-"reminderTime_0000" = "0 minuten";
-"reminderTime_0005" = "5 minuten";
-"reminderTime_0010" = "10 minuten";
-"reminderTime_0015" = "15 minuten";
-"reminderTime_0030" = "30 minuten";
-"reminderTime_0100" = "1 uur";
-"reminderTime_0200" = "2 uren";
-"reminderTime_0400" = "4 uren";
-"reminderTime_0800" = "8 uren";
-"reminderTime_1200" = "1/2 dag";
-"reminderTime_2400" = "1 dag";
-"reminderTime_4800" = "2 dagen";
+"reminder_5_MINUTES_BEFORE" = "5 minuten";
+"reminder_10_MINUTES_BEFORE" = "10 minuten";
+"reminder_15_MINUTES_BEFORE" = "15 minuten";
+"reminder_30_MINUTES_BEFORE" = "30 minuten";
+"reminder_1_HOUR_BEFORE" = "1 uur";
+"reminder_2_HOURS_BEFORE" = "2 uren";
+"reminder_5_HOURS_BEFORE"= "5 uren";
+"reminder_15_HOURS_BEFORE"= "15 uren";
+"reminder_1_DAY_BEFORE" = "1 dag";
+"reminder_2_DAYS_BEFORE" = "2 dagen";
 
 /* Mailer */
+"Label" = "Labelen";
 "Show subscribed mailboxes only" = "Toon alleen geabonneerde postvakken";
 "Sort messages by threads" = "Berichten sorteren op threads";
 "Check for new mail:" = "Controleren op nieuwe mail:";

UI/PreferencesUI/English.lproj/Localizable.strings

@@ -125,6 +125,8 @@
 "reminderTime_4800" = "2 days";
 
 /* Mailer */
+"Labels" = "Labels";
+"Label" = "Label";
 "Show subscribed mailboxes only" = "Show subscribed mailboxes only";
 "Sort messages by threads" = "Sort messages by threads";
 "Check for new mail:" = "Check for new mail:";
@@ -288,11 +290,6 @@
 "Flagged" = "Flagged";
 "Junk" = "Junk";
 "Not Junk" = "Not Junk";
-"Important" = "Important";
-"Work" = "Work";
-"Personal" = "Personal";
-"To Do" = "To Do";
-"Later" = "Later";
 
 /* Password policy */
 "The password was changed successfully." = "The password was changed successfully.";

UI/PreferencesUI/Finnish.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Henkilökohtainen kalenteri";
 "firstCalendar" = "Ensimmäinen käyttöönotettu kalenteri";
 
-"reminderTime_0000" = "0 minuuttia";
-"reminderTime_0005" = "5 minuuttia";
-"reminderTime_0010" = "10 minuuttia";
-"reminderTime_0015" = "15 minuuttia";
-"reminderTime_0030" = "30 minuuttia";
-"reminderTime_0100" = "1 tunti";
-"reminderTime_0200" = "2 tuntia";
-"reminderTime_0400" = "4 tuntia";
-"reminderTime_0800" = "8 tuntia";
-"reminderTime_1200" = "puoli päivää";
-"reminderTime_2400" = "1 päivä";
-"reminderTime_4800" = "2 päivää";
+"reminder_5_MINUTES_BEFORE" = "5 minuuttia";
+"reminder_10_MINUTES_BEFORE" = "10 minuuttia";
+"reminder_15_MINUTES_BEFORE" = "15 minuuttia";
+"reminder_30_MINUTES_BEFORE" = "30 minuuttia";
+"reminder_1_HOUR_BEFORE" = "1 tunti";
+"reminder_2_HOURS_BEFORE" = "2 tuntia";
+"reminder_5_HOURS_BEFORE"= "5 tuntia";
+"reminder_15_HOURS_BEFORE"= "15 tuntia";
+"reminder_1_DAY_BEFORE" = "1 päivä";
+"reminder_2_DAYS_BEFORE" = "2 päivää";
 
 /* Mailer */
+"Label" = "Otsikoi";
 "Show subscribed mailboxes only" = "Näytä vain tilatut sähköpostikansiot";
 "Sort messages by threads" = "Järjestä viestit ketjuiksi";
 "Check for new mail:" = "Hae uudet sähköpostit";

UI/PreferencesUI/French.lproj/Localizable.strings

@@ -111,20 +111,20 @@
 "personalCalendar" = "le calendrier personnel";
 "firstCalendar" = "le premier calendrier actif";
 
-"reminderTime_0000" = "0 minutes";
-"reminderTime_0005" = "5 minutes";
-"reminderTime_0010" = "10 minutes";
-"reminderTime_0015" = "15 minutes";
-"reminderTime_0030" = "30 minutes";
-"reminderTime_0100" = "1 heure";
-"reminderTime_0200" = "2 heures";
-"reminderTime_0400" = "4 heures";
-"reminderTime_0800" = "8 heures";
-"reminderTime_1200" = "1/2 journée";
-"reminderTime_2400" = "1 journée";
-"reminderTime_4800" = "2 journées";
+"reminder_5_MINUTES_BEFORE" = "5 minutes";
+"reminder_10_MINUTES_BEFORE" = "10 minutes";
+"reminder_15_MINUTES_BEFORE" = "15 minutes";
+"reminder_30_MINUTES_BEFORE" = "30 minutes";
+"reminder_1_HOUR_BEFORE" = "1 heure";
+"reminder_2_HOURS_BEFORE" = "2 heures";
+"reminder_5_HOURS_BEFORE"= "5 heures";
+"reminder_15_HOURS_BEFORE"= "15 heures";
+"reminder_1_DAY_BEFORE" = "1 journée";
+"reminder_2_DAYS_BEFORE" = "2 journées";
 
 /* Mailer */
+"Labels" = "Étiquettes";
+"Label" = "Étiquette";
 "Show subscribed mailboxes only" = "Afficher seulement les abonnements";
 "Sort messages by threads" = "Grouper les discussions";
 "Check for new mail:" = "Vérifier l'arrivée de messages :";

UI/PreferencesUI/German.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Persönlicher Kalender";
 "firstCalendar" = "Erster eingeschalteter Kalender";
 
-"reminderTime_0000" = "0 Minuten";
-"reminderTime_0005" = "5 Minuten";
-"reminderTime_0010" = "10 Minuten";
-"reminderTime_0015" = "15 Minuten";
-"reminderTime_0030" = "30 Minuten";
-"reminderTime_0100" = "1 Stunde";
-"reminderTime_0200" = "2 Stunden";
-"reminderTime_0400" = "4 Stunden";
-"reminderTime_0800" = "8 Stunden";
-"reminderTime_1200" = "1/2 Tag";
-"reminderTime_2400" = "1 Tag";
-"reminderTime_4800" = "2 Tage";
+"reminder_5_MINUTES_BEFORE" = "5 Minuten";
+"reminder_10_MINUTES_BEFORE" = "10 Minuten";
+"reminder_15_MINUTES_BEFORE" = "15 Minuten";
+"reminder_30_MINUTES_BEFORE" = "30 Minuten";
+"reminder_1_HOUR_BEFORE" = "1 Stunde";
+"reminder_2_HOURS_BEFORE" = "2 Stunden";
+"reminder_5_HOURS_BEFORE"= "5 Stunden";
+"reminder_15_HOURS_BEFORE"= "15 Stunden";
+"reminder_1_DAY_BEFORE" = "1 Tag";
+"reminder_2_DAYS_BEFORE" = "2 Tage";
 
 /* Mailer */
+"Label" = "Schlagwörter";
 "Show subscribed mailboxes only" = "Nur abonnierte Ordner anzeigen";
 "Sort messages by threads" = "Nachrichten nach Thema sortieren";
 "Check for new mail:" = "Auf neue Nachrichten prüfen:";

UI/PreferencesUI/Hungarian.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Személyes naptár";
 "firstCalendar" = "Első engedélyezett naptár";
 
-"reminderTime_0000" = "0 perc";
-"reminderTime_0005" = "5 perc";
-"reminderTime_0010" = "10 perc";
-"reminderTime_0015" = "15 perc";
-"reminderTime_0030" = "30 perc";
-"reminderTime_0100" = "1 óra";
-"reminderTime_0200" = "2 óra";
-"reminderTime_0400" = "4 óra";
-"reminderTime_0800" = "8 óra";
-"reminderTime_1200" = "1/2 nap";
-"reminderTime_2400" = "1 nap";
-"reminderTime_4800" = "2 nap";
+"reminder_5_MINUTES_BEFORE" = "5 perc";
+"reminder_10_MINUTES_BEFORE" = "10 perc";
+"reminder_15_MINUTES_BEFORE" = "15 perc";
+"reminder_30_MINUTES_BEFORE" = "30 perc";
+"reminder_1_HOUR_BEFORE" = "1 óra";
+"reminder_2_HOURS_BEFORE" = "2 óra";
+"reminder_5_HOURS_BEFORE"= "5 óra";
+"reminder_15_HOURS_BEFORE"= "15 óra";
+"reminder_1_DAY_BEFORE" = "1 nap";
+"reminder_2_DAYS_BEFORE" = "2 nap";
 
 /* Mailer */
+"Label" = "Cimke";
 "Show subscribed mailboxes only" = "Csak azok a fiókok mutatása, amelyre feliratkozott";
 "Sort messages by threads" = "Üzenetek beszélgetések szerinti rendezése ";
 "Check for new mail:" = "Új üzenetek letöltése:";

UI/PreferencesUI/Icelandic.lproj/Localizable.strings

@@ -92,20 +92,19 @@
 "firstWeekOfYear_First4DayWeek" = "Fyrstu 4 dagar viku";
 "firstWeekOfYear_FirstFullWeek" = "Fyrsta heila vika";
 
-"reminderTime_0000" = "0 mínútur";
-"reminderTime_0005" = "5 mínútur";
-"reminderTime_0010" = "10 mínútur";
-"reminderTime_0015" = "15 mínútur";
-"reminderTime_0030" = "30 mínútur";
-"reminderTime_0100" = "1 klst.";
-"reminderTime_0200" = "2 klst.";
-"reminderTime_0400" = "4 klst.";
-"reminderTime_0800" = "8 klst.";
-"reminderTime_1200" = "1/2 dagur";
-"reminderTime_2400" = "1 dagur";
-"reminderTime_4800" = "2 dagar";
+"reminder_5_MINUTES_BEFORE" = "5 mínútur";
+"reminder_10_MINUTES_BEFORE" = "10 mínútur";
+"reminder_15_MINUTES_BEFORE" = "15 mínútur";
+"reminder_30_MINUTES_BEFORE" = "30 mínútur";
+"reminder_1_HOUR_BEFORE" = "1 klst.";
+"reminder_2_HOURS_BEFORE" = "2 klst.";
+"reminder_5_HOURS_BEFORE"= "5 klst.";
+"reminder_15_HOURS_BEFORE"= "15 klst.";
+"reminder_1_DAY_BEFORE" = "1 dagur";
+"reminder_2_DAYS_BEFORE" = "2 dagar";
 
 /* Mailer */
+"Label" = "Merki";
 "Show subscribed mailboxes only" = "Sýna aðeins pósthólf sem eru í áskrift";
 "Check for new mail:" = "Sækja nýjan póst:";
 "messagecheck_manually" = "Handvirkt";

UI/PreferencesUI/Italian.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Calendario personale";
 "firstCalendar" = "Primo calendario abilitato";
 
-"reminderTime_0000" = "0 minuti";
-"reminderTime_0005" = "5 minuti";
-"reminderTime_0010" = "10 minuti";
-"reminderTime_0015" = "15 minuti";
-"reminderTime_0030" = "30 minuti";
-"reminderTime_0100" = "1 ora";
-"reminderTime_0200" = "2 ore";
-"reminderTime_0400" = "4 ore";
-"reminderTime_0800" = "8 ore";
-"reminderTime_1200" = "1/2 giornata";
-"reminderTime_2400" = "1 giorno";
-"reminderTime_4800" = "2 giorni";
+"reminder_5_MINUTES_BEFORE" = "5 minuti";
+"reminder_10_MINUTES_BEFORE" = "10 minuti";
+"reminder_15_MINUTES_BEFORE" = "15 minuti";
+"reminder_30_MINUTES_BEFORE" = "30 minuti";
+"reminder_1_HOUR_BEFORE" = "1 ora";
+"reminder_2_HOURS_BEFORE" = "2 ore";
+"reminder_5_HOURS_BEFORE"= "5 ore";
+"reminder_15_HOURS_BEFORE"= "15 ore";
+"reminder_1_DAY_BEFORE" = "1 giorno";
+"reminder_2_DAYS_BEFORE" = "2 giorni";
 
 /* Mailer */
+"Label" = "Etichetta";
 "Show subscribed mailboxes only" = "Mostra solo le cartelle sottoscritte";
 "Sort messages by threads" = "Ordina i messaggi per conversazione";
 "Check for new mail:" = "Controlla la posta in arrivo:";

UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Personlig kalender";
 "firstCalendar" = "Første aktiverte kalender";
 
-"reminderTime_0000" = "0 minutter";
-"reminderTime_0005" = "5 minutter";
-"reminderTime_0010" = "10 minutter";
-"reminderTime_0015" = "15 minutter";
-"reminderTime_0030" = "30 minutter";
-"reminderTime_0100" = "1 time";
-"reminderTime_0200" = "2 timer";
-"reminderTime_0400" = "4 timer";
-"reminderTime_0800" = "8 timer";
-"reminderTime_1200" = "1/2 dag";
-"reminderTime_2400" = "1 dag";
-"reminderTime_4800" = "2 dager";
+"reminder_5_MINUTES_BEFORE" = "5 minutter";
+"reminder_10_MINUTES_BEFORE" = "10 minutter";
+"reminder_15_MINUTES_BEFORE" = "15 minutter";
+"reminder_30_MINUTES_BEFORE" = "30 minutter";
+"reminder_1_HOUR_BEFORE" = "1 time";
+"reminder_2_HOURS_BEFORE" = "2 timer";
+"reminder_5_HOURS_BEFORE"= "5 timer";
+"reminder_15_HOURS_BEFORE"= "15 timer";
+"reminder_1_DAY_BEFORE" = "1 dag";
+"reminder_2_DAYS_BEFORE" = "2 dager";
 
 /* Mailer */
+"Label" = "Etikett";
 "Show subscribed mailboxes only" = "Vis bare abonnerte postbokser";
 "Sort messages by threads" = "Sorter meldinger etter tråder";
 "Check for new mail:" = "Hent ny post:";

UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings

@@ -98,20 +98,19 @@
 "personalCalendar" = "Personal calendar";
 "firstCalendar" = "First enabled calendar";
 
-"reminderTime_0000" = "0 minutter";
-"reminderTime_0005" = "5 minutter";
-"reminderTime_0010" = "10 minutter";
-"reminderTime_0015" = "15 minutter";
-"reminderTime_0030" = "30 minutter";
-"reminderTime_0100" = "1 time";
-"reminderTime_0200" = "2 timer";
-"reminderTime_0400" = "4 timer";
-"reminderTime_0800" = "8 timer";
-"reminderTime_1200" = "1/2 dag";
-"reminderTime_2400" = "1 dag";
-"reminderTime_4800" = "2 dager";
+"reminder_5_MINUTES_BEFORE" = "5 minutter";
+"reminder_10_MINUTES_BEFORE" = "10 minutter";
+"reminder_15_MINUTES_BEFORE" = "15 minutter";
+"reminder_30_MINUTES_BEFORE" = "30 minutter";
+"reminder_1_HOUR_BEFORE" = "1 time";
+"reminder_2_HOURS_BEFORE" = "2 timer";
+"reminder_5_HOURS_BEFORE"= "5 timer";
+"reminder_15_HOURS_BEFORE"= "15 timer";
+"reminder_1_DAY_BEFORE" = "1 dag";
+"reminder_2_DAYS_BEFORE" = "2 dager";
 
 /* Mailer */
+"Label" = "Etikett";
 "Show subscribed mailboxes only" = "Vis bare abonnerte postbokser";
 "Sort messages by threads" = "Sort messages by threads";
 "Check for new mail:" = "Hent ny post:";

UI/PreferencesUI/Polish.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Kalendarz osobisty";
 "firstCalendar" = "Pierwszy kalendarz";
 
-"reminderTime_0000" = "0 minut";
-"reminderTime_0005" = "5 minut";
-"reminderTime_0010" = "10 minut";
-"reminderTime_0015" = "15 minut";
-"reminderTime_0030" = "30 minut";
-"reminderTime_0100" = "1 godzina";
-"reminderTime_0200" = "2 godziny";
-"reminderTime_0400" = "4 godziny";
-"reminderTime_0800" = "8 godzin";
-"reminderTime_1200" = "1/2 dnia";
-"reminderTime_2400" = "1 dzień";
-"reminderTime_4800" = "2 dni";
+"reminder_5_MINUTES_BEFORE" = "5 minut";
+"reminder_10_MINUTES_BEFORE" = "10 minut";
+"reminder_15_MINUTES_BEFORE" = "15 minut";
+"reminder_30_MINUTES_BEFORE" = "30 minut";
+"reminder_1_HOUR_BEFORE" = "1 godzina";
+"reminder_2_HOURS_BEFORE" = "2 godziny";
+"reminder_5_HOURS_BEFORE"= "5 godziny";
+"reminder_15_HOURS_BEFORE"= "15 godzin";
+"reminder_1_DAY_BEFORE" = "1 dzień";
+"reminder_2_DAYS_BEFORE" = "2 dni";
 
 /* Mailer */
+"Label" = "Etykieta";
 "Show subscribed mailboxes only" = "Pokaż tylko subskrybowane konta pocztowe";
 "Sort messages by threads" = "Sortuj wiadomości według wątków";
 "Check for new mail:" = "Sprawdzaj nowe wiadomości:";

UI/PreferencesUI/Russian.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Персональный календарь";
 "firstCalendar" = "Первый разрешенный календарь";
 
-"reminderTime_0000" = "0 минут";
-"reminderTime_0005" = "5 минут";
-"reminderTime_0010" = "10 минут";
-"reminderTime_0015" = "15 минут";
-"reminderTime_0030" = "30 минут";
-"reminderTime_0100" = "1 час";
-"reminderTime_0200" = "2 часа";
-"reminderTime_0400" = "4 часа";
-"reminderTime_0800" = "8 часов";
-"reminderTime_1200" = "1/2дня";
-"reminderTime_2400" = "1 день";
-"reminderTime_4800" = "2 дня";
+"reminder_5_MINUTES_BEFORE" = "5 минут";
+"reminder_10_MINUTES_BEFORE" = "10 минут";
+"reminder_15_MINUTES_BEFORE" = "15 минут";
+"reminder_30_MINUTES_BEFORE" = "30 минут";
+"reminder_1_HOUR_BEFORE" = "1 час";
+"reminder_2_HOURS_BEFORE" = "2 часа";
+"reminder_5_HOURS_BEFORE"= "5 часа";
+"reminder_15_HOURS_BEFORE"= "15 часов";
+"reminder_1_DAY_BEFORE" = "1 день";
+"reminder_2_DAYS_BEFORE" = "2 дня";
 
 /* Mailer */
+"Label" = "Метка";
 "Show subscribed mailboxes only" = "Показывать только почтовые ящики, на которые подписан";
 "Sort messages by threads" = "Сортировать сообщения по нитям";
 "Check for new mail:" = "Проверять новую почту:";

UI/PreferencesUI/Slovak.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Osobný kalendár";
 "firstCalendar" = "Prvý zapnutý kalendár";
 
-"reminderTime_0000" = "0 minút";
-"reminderTime_0005" = "5 minút";
-"reminderTime_0010" = "10 minút";
-"reminderTime_0015" = "15 minút";
-"reminderTime_0030" = "30 minút";
-"reminderTime_0100" = "1 hodina";
-"reminderTime_0200" = "2 hodiny";
-"reminderTime_0400" = "4 hodiny";
-"reminderTime_0800" = "8 hodín";
-"reminderTime_1200" = "1/2 dňa";
-"reminderTime_2400" = "1 deň";
-"reminderTime_4800" = "2 dni";
+"reminder_5_MINUTES_BEFORE" = "5 minút";
+"reminder_10_MINUTES_BEFORE" = "10 minút";
+"reminder_15_MINUTES_BEFORE" = "15 minút";
+"reminder_30_MINUTES_BEFORE" = "30 minút";
+"reminder_1_HOUR_BEFORE" = "1 hodina";
+"reminder_2_HOURS_BEFORE" = "2 hodiny";
+"reminder_5_HOURS_BEFORE"= "5 hodiny";
+"reminder_15_HOURS_BEFORE"= "15 hodín";
+"reminder_1_DAY_BEFORE" = "1 deň";
+"reminder_2_DAYS_BEFORE" = "2 dni";
 
 /* Mailer */
+"Label" = "Štítok";
 "Show subscribed mailboxes only" = "Ukazuj iba odoberané účty";
 "Sort messages by threads" = "Zoraď správy do konverzácií";
 "Check for new mail:" = "Kontrola nových mailov:";

UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Calendario personal";
 "firstCalendar" = "Primer calendario habilitado";
 
-"reminderTime_0000" = "0 minutos";
-"reminderTime_0005" = "5 minutos";
-"reminderTime_0010" = "10 minutos";
-"reminderTime_0015" = "15 minutos";
-"reminderTime_0030" = "30 minutos";
-"reminderTime_0100" = "1 hora";
-"reminderTime_0200" = "2 horas";
-"reminderTime_0400" = "4 horas";
-"reminderTime_0800" = "8 horas";
-"reminderTime_1200" = "1/2 día";
-"reminderTime_2400" = "1 día";
-"reminderTime_4800" = "2 días";
+"reminder_5_MINUTES_BEFORE" = "5 minutos";
+"reminder_10_MINUTES_BEFORE" = "10 minutos";
+"reminder_15_MINUTES_BEFORE" = "15 minutos";
+"reminder_30_MINUTES_BEFORE" = "30 minutos";
+"reminder_1_HOUR_BEFORE" = "1 hora";
+"reminder_2_HOURS_BEFORE" = "2 horas";
+"reminder_5_HOURS_BEFORE"= "5 horas";
+"reminder_15_HOURS_BEFORE"= "15 horas";
+"reminder_1_DAY_BEFORE" = "1 día";
+"reminder_2_DAYS_BEFORE" = "2 días";
 
 /* Mailer */
+"Label" = "Etiquetar";
 "Show subscribed mailboxes only" = "Mostrar sólo buzones suscritos";
 "Sort messages by threads" = "Ordenar mensajes por conversaciones";
 "Check for new mail:" = "Comprobar si hay nuevos correos: ";

UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings

@@ -111,20 +111,19 @@
 "personalCalendar" = "Calendario personal";
 "firstCalendar" = "Primer calendario disponible";
 
-"reminderTime_0000" = "0 minutos";
-"reminderTime_0005" = "5 minutos";
-"reminderTime_0010" = "10 minutos";
-"reminderTime_0015" = "15 minutos";
-"reminderTime_0030" = "30 minutos";
-"reminderTime_0100" = "1 hora";
-"reminderTime_0200" = "2 horas";
-"reminderTime_0400" = "4 horas";
-"reminderTime_0800" = "8 horas";
-"reminderTime_1200" = "1/2 día";
-"reminderTime_2400" = "1 día";
-"reminderTime_4800" = "2 días";
+"reminder_5_MINUTES_BEFORE" = "5 minutos";
+"reminder_10_MINUTES_BEFORE" = "10 minutos";
+"reminder_15_MINUTES_BEFORE" = "15 minutos";
+"reminder_30_MINUTES_BEFORE" = "30 minutos";
+"reminder_1_HOUR_BEFORE" = "1 hora";
+"reminder_2_HOURS_BEFORE" = "2 horas";
+"reminder_5_HOURS_BEFORE"= "5 horas";
+"reminder_15_HOURS_BEFORE"= "15 horas";
+"reminder_1_DAY_BEFORE" = "1 día";
+"reminder_2_DAYS_BEFORE" = "2 días";
 
 /* Mailer */
+"Label" = "Etiquetar";
 "Show subscribed mailboxes only" = "Mostrar sólo buzones suscritos";
 "Sort messages by threads" = "Ordenar mensajes por temas";
 "Check for new mail:" = "Comprobar correo nuevo: ";

UI/PreferencesUI/Swedish.lproj/Localizable.strings

@@ -98,20 +98,19 @@
 "personalCalendar" = "Personal calendar";
 "firstCalendar" = "First enabled calendar";
 
-"reminderTime_0000" = "0 minuter";
-"reminderTime_0005" = "5 minuter";
-"reminderTime_0010" = "10 minuter";
-"reminderTime_0015" = "15 minuter";
-"reminderTime_0030" = "30 minuter";
-"reminderTime_0100" = "1 timme";
-"reminderTime_0200" = "2 timmar";
-"reminderTime_0400" = "4 timmar";
-"reminderTime_0800" = "8 timmar";
-"reminderTime_1200" = "1/2 dag";
-"reminderTime_2400" = "1 dag";
-"reminderTime_4800" = "2 dagar";
+"reminder_5_MINUTES_BEFORE" = "5 minuter";
+"reminder_10_MINUTES_BEFORE" = "10 minuter";
+"reminder_15_MINUTES_BEFORE" = "15 minuter";
+"reminder_30_MINUTES_BEFORE" = "30 minuter";
+"reminder_1_HOUR_BEFORE" = "1 timme";
+"reminder_2_HOURS_BEFORE" = "2 timmar";
+"reminder_5_HOURS_BEFORE"= "5 timmar";
+"reminder_15_HOURS_BEFORE"= "15 timmar";
+"reminder_1_DAY_BEFORE" = "1 dag";
+"reminder_2_DAYS_BEFORE" = "2 dagar";
 
 /* Mailer */
+"Label" = "Etikett";
 "Show subscribed mailboxes only" = "Visa endast prenumrerade postlådor";
 "Sort messages by threads" = "Sort messages by threads";
 "Check for new mail:" = "Hämta ny post:";

UI/PreferencesUI/Ukrainian.lproj/Localizable.strings

@@ -110,20 +110,19 @@
 "personalCalendar" = "Особистий календар";
 "firstCalendar" = "Перший активний календар";
 
-"reminderTime_0000" = "0 хвилин";
-"reminderTime_0005" = "5 хвилин";
-"reminderTime_0010" = "10 хвилин";
-"reminderTime_0015" = "15 хвилин";
-"reminderTime_0030" = "30 хвилин";
-"reminderTime_0100" = "1 година";
-"reminderTime_0200" = "2 години";
-"reminderTime_0400" = "4 години";
-"reminderTime_0800" = "8 годин";
-"reminderTime_1200" = "пів дня";
-"reminderTime_2400" = "1 день";
-"reminderTime_4800" = "2 дні";
+"reminder_5_MINUTES_BEFORE" = "5 хвилин";
+"reminder_10_MINUTES_BEFORE" = "10 хвилин";
+"reminder_15_MINUTES_BEFORE" = "15 хвилин";
+"reminder_30_MINUTES_BEFORE" = "30 хвилин";
+"reminder_1_HOUR_BEFORE" = "1 година";
+"reminder_2_HOURS_BEFORE" = "2 години";
+"reminder_5_HOURS_BEFORE"= "5 години";
+"reminder_15_HOURS_BEFORE"= "15 годин";
+"reminder_1_DAY_BEFORE" = "1 день";
+"reminder_2_DAYS_BEFORE" = "2 дні";
 
 /* Mailer */
+"Label" = "Позначка";
 "Show subscribed mailboxes only" = "Показувати лише поштові скриньки, на які я підписаний";
 "Sort messages by threads" = "Сортувати повідомлення за гілками";
 "Check for new mail:" = "Перевіряти нову пошту:";

UI/PreferencesUI/Welsh.lproj/Localizable.strings

@@ -98,20 +98,19 @@
 "personalCalendar" = "Personal calendar";
 "firstCalendar" = "First enabled calendar";
 
-"reminderTime_0000" = "0 munud";
-"reminderTime_0005" = "5 munud";
-"reminderTime_0010" = "10 munud";
-"reminderTime_0015" = "15 munud";
-"reminderTime_0030" = "30 munud";
-"reminderTime_0100" = "1 awr";
-"reminderTime_0200" = "2 awr";
-"reminderTime_0400" = "4 awr";
-"reminderTime_0800" = "8 awr";
-"reminderTime_1200" = "1/2 diwrnod";
-"reminderTime_2400" = "1 diwrnod";
-"reminderTime_4800" = "2 ddiwrnod";
+"reminder_5_MINUTES_BEFORE" = "5 munud";
+"reminder_10_MINUTES_BEFORE" = "10 munud";
+"reminder_15_MINUTES_BEFORE" = "15 munud";
+"reminder_30_MINUTES_BEFORE" = "30 munud";
+"reminder_1_HOUR_BEFORE" = "1 awr";
+"reminder_2_HOURS_BEFORE" = "2 awr";
+"reminder_5_HOURS_BEFORE"= "5 awr";
+"reminder_15_HOURS_BEFORE"= "15 awr";
+"reminder_1_DAY_BEFORE" = "1 diwrnod";
+"reminder_2_DAYS_BEFORE" = "2 ddiwrnod";
 
 /* Mailer */
+"Label" = "Label";
 "Show subscribed mailboxes only" = "Show subscribed mailboxes only";
 "Sort messages by threads" = "Sort messages by threads";
 "Check for new mail:" = "Chwilio am ebost newydd:";

UI/Templates/MailerUI/UIxMailEditor.wox

@@ -137,7 +137,7 @@
 	  /></div>
       <!-- separator line --><hr class="fieldSeparator"/>
     </div>
-    <textarea id="text" name="text" rows="30" var:value="text"></textarea>
+    <textarea id="text" name="text" rows="25" style="display:none" var:value="text"/>
     <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
   </form>
   </div>

UI/Templates/MailerUI/UIxMailWindowCloser.wox

@@ -8,17 +8,14 @@
 >
   <head>
     <title><var:string label:value="Closing Window ..."/></title>
-    <meta name="description" content="SOGo Web Interface"/>
-    <meta name="author"      content="SKYRIX Software AG"/>
     <meta name="robots"      content="stop"/>
-    <link href="mailto:info@skyrix.com" rev="made"/>
   </head>
 
   <body>
     <var:if condition="refreshOpener">
       <script language="JavaScript"
         ><var:string value="refreshOpenerScript" 
-                     const:escapeHTML="0" /></script>
+                     const:escapeHTML="NO" /></script>
     </var:if>
 
     <script language="JavaScript">window.close();</script>

UI/Templates/PreferencesUI/UIxFilterEditor.wox

@@ -13,7 +13,7 @@
   >
   <script type="text/javascript">
     var filterId = '<var:string value="filterId"/>';
-    var labels = <var:string value="labels"/>;
+    var mailTags = <var:string value="labels" const:escapeHTML="NO"/>;
   </script>
   <form id="mainForm" var:href="ownPath">
     <div id="filterNameContainer" class="container">

UI/WebServerResources/MailerUI.js

@@ -2849,11 +2849,6 @@ function getMenus() {
         labelMenu.prepareVisibility = onLabelMenuPrepareVisibility;
     }
 
-    var labelMenu = $("label-menu");
-    if (labelMenu) {
-        labelMenu.prepareVisibility = onLabelMenuPrepareVisibility;
-    }
-
     var markMenu = $("mark-menu");
     if (markMenu) {
         markMenu.prepareVisibility = onMarkMenuPrepareVisibility;

UI/WebServerResources/UIxFilterEditor.js

@@ -92,8 +92,8 @@ function setupConstants() {
                    "not_junk": _("Not Junk") };
 
 
-    for (var name in labels) {
-        flagLabels[name] = _( labels[name][0] );
+    for (var name in mailTags) {
+        flagLabels[name] = _( mailTags[name][0] );
     }
 }
 

UI/WebServerResources/UIxMailEditor.css

@@ -173,8 +173,7 @@ UL#attachments LI IMG
 { width: 99%; }
 
 TEXTAREA#text
-{ display: none;
-  background: #fff; }
+{ background: #fff; }
 
 /* Contacts search pane */
 

UI/WebServerResources/UIxMailEditor.js

@@ -283,18 +283,20 @@ function clickedEditorSave() {
     return false;
 }
 
+/**
+ * On first focus of textarea, position the caret with respect to user's preferences
+ */
 function onTextFocus(event) {
     if (MailEditor.textFirstFocus) {
-        // On first focus, position the caret at the proper position
         var content = this.getValue();
         var replyPlacement = UserDefaults["SOGoMailReplyPlacement"];
-        if (replyPlacement == "above" || !mailIsReply) { // for forwards, place caret at top unconditionally
+        if (replyPlacement == "above" || !mailIsReply) {
+            // For forwards, place caret at top unconditionally
             this.setCaretTo(0);
         }
         else {
             var caretPosition = this.getValue().length - MailEditor.signatureLength;
-            if (Prototype.Browser.IE)
-                caretPosition -= lineBreakCount(this.getValue().substring(0, caretPosition));
+            caretPosition = adjustOffset(this, caretPosition);
             if (hasSignature())
                 caretPosition -= 2;
             this.setCaretTo(caretPosition);
@@ -307,10 +309,13 @@ function onTextFocus(event) {
         input.parentNode.removeChild(input);
 }
 
+/**
+ * Change behavior of tab key in textarea (plain-text mail)
+ */
 function onTextKeyDown(event) {
     if (event.keyCode == Event.KEY_TAB) {
-        // Change behavior of tab key in textarea
         if (event.shiftKey) {
+            // Shift-tab goes back to subject field
             var subjectField = $$("div#subjectRow input").first();
             subjectField.focus();
             subjectField.selectText(0, subjectField.value.length);
@@ -318,22 +323,20 @@ function onTextKeyDown(event) {
         }
         else {
             if (!(event.shiftKey || event.metaKey || event.ctrlKey)) {
-                if (typeof(this.selectionStart)
-                    != "undefined") { // For Mozilla and Safari
+                // Convert a tab to 4 spaces
+                if (typeof(this.selectionStart) != "undefined") { // Mozilla and Safari
                     var cursor = this.selectionStart;
                     var startText = ((cursor > 0)
                                      ? this.value.substr(0, cursor)
                                      : "");
                     var endText = this.value.substr(cursor);
-                    var newText = startText + "   " + endText;
+                    var newText = startText + "    " + endText;
                     this.value = newText;
-                    cursor += 3;
+                    cursor += 4;
                     this.setSelectionRange(cursor, cursor);
                 }
                 else if (this.selectionRange) // IE
-                    this.selectionRange.text = "   ";
-                else { // others ?
-                }
+                    this.selectionRange.text = "    ";
                 preventDefault(event);
             }
         }
@@ -344,13 +347,6 @@ function onTextIEUpdateCursorPos(event) {
     this.selectionRange = document.selection.createRange().duplicate();
 }
 
-function onTextMouseDown(event) {
-    if (event.button == 0) {
-        event.returnValue = false;
-        event.cancelBubble = false;
-    }
-}
-
 function onHTMLFocus(event) {
     if (MailEditor.textFirstFocus) {
         var s = event.editor.getSelection();
@@ -424,8 +420,10 @@ function configureDragHandle() {
 }
 
 function initMailEditor() {
+    var textarea = $("text");
+
     if (composeMode != "html" && $("text"))
-        $("text").style.display = "block";
+        textarea.show();
 
     var list = $("attachments");
     if (!list) return;
@@ -488,10 +486,10 @@ function initMailEditor() {
             textarea.scrollTop = textarea.scrollHeight;
         }
         textarea.observe("focus", onTextFocus);
-        //textarea.observe("mousedown", onTextMouseDown);
         textarea.observe("keydown", onTextKeyDown);
 
         if (Prototype.Browser.IE) {
+            // Hack to allow to replace the tab by spaces in IE < 9
             var ieEvents = [ "click", "select", "keyup" ];
             for (var i = 0; i < ieEvents.length; i++)
                 textarea.observe(ieEvents[i], onTextIEUpdateCursorPos, false);
@@ -503,10 +501,7 @@ function initMailEditor() {
 
     $("contactFolder").observe("change", onContactFolderChange);
     
-    Event.observe(window, "resize", onWindowResize);
     Event.observe(window, "beforeunload", onMailEditorClose);
-    
-    onWindowResize.defer();
 }
 
 function initializePriorityMenu() {
@@ -592,13 +587,16 @@ function attachmentDeleteCallback(http) {
     }
 }
 
-function lineBreakCount(str){
-    /* counts \n */
-    try {
-        return((str.match(/[^\n]*\n[^\n]*/gi).length));
-    } catch(e) {
-        return 0;
+/**
+ * Adjust offset when the browser uses two characters for line feeds.
+ */
+function adjustOffset(element, offset) {
+    var val = element.value, newOffset = offset;
+    if (val.indexOf("\r\n") > -1) {
+        var matches = val.replace(/\r\n/g, "\n").slice(0, offset).match(/\n/g);
+        newOffset -= matches ? matches.length - 1 : 0;
     }
+    return newOffset;
 }
 
 function hasSignature() {
@@ -636,6 +634,9 @@ function onSelectOptions(event) {
     }
 }
 
+/**
+ * Overwrite definition of MailerUI.js
+ */
 function onWindowResize(event) {
     if (!document.pageform)
       return;

UI/WebServerResources/ckeditor/build-config.js

@@ -32,7 +32,6 @@ var CKBUILDER_CONFIG = {
 		'entities' : 1,
 		'floatingspace' : 1,
 		'wysiwygarea' : 1,
-		'indent' : 1,
 		'link' : 1,
 		'list' : 1,
 		'pastetext' : 1,
@@ -61,7 +60,9 @@ var CKBUILDER_CONFIG = {
 		'indentlist' : 1,
 		'table' : 1,
 		'tabletools' : 1,
-		'tableresize' : 1
+		'tableresize' : 1,
+		'tab' : 1,
+		'div' : 1
 	},
 	languages : {
 		'ar' : 1,

UI/WebServerResources/ckeditor/config.js

@@ -4,27 +4,23 @@
  */
 
 CKEDITOR.editorConfig = function( config ) {
-    config.toolbar = [
-        { name: 'basicstyles', items: [ 'Bold', 'Italic', 'Underline', 'TextColor' ] },
-        { name: 'paragraph', items: [ 'NumberedList', 'BulletedList',
-                                      '-',
-                                      'Blockquote', 'Outdent', 'Indent',
-                                      '-',
-                                      'JustifyLeft', 'JustifyCenter', 'JustifyRight' ] },
-        { name: 'links', items: [ 'Link', 'Unlink' ] },
-        { name: 'insert', items: [ 'Image', 'Table' ] },
-        { name: 'editing', items: [ 'Font', 'FontSize', 'Scayt' ] }
-    ];
+    // For the complete reference:
+    // http://docs.ckeditor.com/#!/api/CKEDITOR.config
     config.toolbarGroups = [
-        { name: 'basicstyles' },
-	{ name: 'paragraph' },
+        { name: 'basicstyles', groups: [ 'basicstyles' ] },
+        { name: 'colors' },
+	{ name: 'paragraph', groups: [ 'list', 'indent', 'blocks', 'align' ] },
 	{ name: 'links' },
 	{ name: 'insert' },
-        { name: 'editing' }
+        { name: 'editing', groups: [ 'spellchecker' ] },
+        { name: 'styles' }
     ];
 
+    config.removeButtons = 'Strike,Subscript,Superscript,BGColor,Anchor,Format';
     config.removeDialogTabs = 'link:advanced;image:advanced';
     config.enterMode = CKEDITOR.ENTER_BR;
+    config.tabSpaces = 4;
+    config.allowedContent = true; // don't filter tags
 
     // Disables the built-in words spell checker if browser provides one. Defaults to true.
     // http://docs.ckeditor.com/#!/api/CKEDITOR.config-cfg-disableNativeSpellChecker

UI/WebServerResources/ckeditor/contents.css

@@ -89,13 +89,6 @@ img.left
 	padding: 5px;
 }
 
-/* #10868: We use :not() selector to exclude IE8, which crashes on img:hover style. */
-:not(.ie8) img:hover
-{
-	opacity: .9;
-	filter: alpha(opacity = 90);
-}
-
 pre
 {
 	white-space: pre-wrap; /* CSS 2.1 */
@@ -106,3 +99,8 @@ pre
 {
 	background-color: Yellow;
 }
+
+span[lang]
+{
+   font-style: italic;
+}