Bump version to 2.1.1a

Update NEWS file
Cleanup wox templates
2013-11-22 15:16:20 -05:00 · 2013-11-22 15:11:13 -05:00 · 2013-11-22 15:10:39 -05:00 · 2013-11-22 15:10:31 -05:00 · 2013-11-22 15:10:16 -05:00 · 2013-11-22 15:09:49 -05:00
78 changed files with 603 additions and 399 deletions
@@ -1,3 +1,123 @@
+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 +1482,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 +1502,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 +2045,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 +7428,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
@@ -1,3 +1,11 @@
+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)
 ------------------

@@ -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://%@@%@/%@/",
@@ -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
@@ -101,6 +101,14 @@
 "Due Date:" = "تاريخ الاستحقاق:";
 "Location:" = "الموقع:";

+/* Mail labels */
+"Important" = "مهم";
+"Work" = "عمل";
+"Work" = "عمل";
+"Personal" = "شخصي";
+"To Do" = "تفعل";
+"Later" = "لاحقا";
+
 "a2_Sunday" = "ح";
 "a2_Monday" = "ن";
 "a2_Tuesday" = "ث";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -101,6 +101,14 @@
 "Due Date:" = "Дата начала:";
 "Location:" = "Место:";

+/* Mail labels */
+"Important" = "Важно";
+"Work" = "Работа";
+"Work" = "Работа";
+"Personal" = "Личное";
+"To Do" = "К исполнению";
+"Later" = "Позже";
+
 "a2_Sunday" = "Вс";
 "a2_Monday" = "Пн";
 "a2_Tuesday" = "Вт";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -100,6 +100,14 @@
 "Due Date:" = "Дата початку:";
 "Location:" = "Місце:";

+/* Mail labels */
+"Important" = "Важливе";
+"Work" = "Робоче";
+"Work" = "Робоче";
+"Personal" = "Особисте";
+"To Do" = "До виконання";
+"Later" = "Відсунуте";
+
 "a2_Sunday" = "Нд";
 "a2_Monday" = "Пн";
 "a2_Tuesday" = "Вт";
@@ -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";
@@ -227,11 +227,6 @@

 /* Label popup menu */
 "None" = "لا شيء";
-"Important" = "مهم";
-"Work" = "عمل";
-"Personal" = "شخصي";
-"To Do" = "تفعل";
-"Later" = "لاحقا";

 /* Mark popup menu */
 "As Read" = "مقروء";
@@ -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";
@@ -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";
@@ -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é";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -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ð";
@@ -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";
@@ -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";
@@ -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";
@@ -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";
@@ -227,11 +227,6 @@

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

 /* Mark popup menu */
 "As Read" = "как прочтанное";
@@ -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é";
@@ -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";
@@ -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";
@@ -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";
@@ -227,11 +227,6 @@

 /* Label popup menu */
 "None" = "Вилучити всі позначки";
-"Important" = "Важливе";
-"Work" = "Робоче";
-"Personal" = "Особисте";
-"To Do" = "До виконання";
-"Later" = "Відсунуте";

 /* Mark popup menu */
 "As Read" = "Прочитаним";
@@ -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";
@@ -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:" = "تحقق من وجود بريد جديد:";
@@ -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:";
@@ -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: ";
@@ -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:";
@@ -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:";
@@ -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:";
@@ -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.";
@@ -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";
@@ -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 :";
@@ -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:";
@@ -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:";
@@ -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";
@@ -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:";
@@ -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:";
@@ -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:";
@@ -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:";
@@ -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:" = "Проверять новую почту:";
@@ -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:";
@@ -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: ";
@@ -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: ";
@@ -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:";
@@ -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:" = "Перевіряти нову пошту:";
@@ -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:";
@@ -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>
@@ -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">
@@ -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;
@@ -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] );
    }
 }

@@ -4,4 +4,4 @@

 MAJOR_VERSION=2
 MINOR_VERSION=1
-SUBMINOR_VERSION=1
+SUBMINOR_VERSION=1a
Author	SHA1	Message	Date
Francis Lachapelle	b5e77ad86c	Bump version to 2.1.1a	2013-11-22 15:16:20 -05:00
Francis Lachapelle	5bc0a0a932	Update NEWS file	2013-11-22 15:11:13 -05:00
Francis Lachapelle	582af53af0	Cleanup wox templates	2013-11-22 15:10:39 -05:00
Francis Lachapelle	13f01b512b	Move mail tags strings to UI/Common	2013-11-22 15:10:31 -05:00
Ludovic Marcotte	cdb25b141d	Init local variable to avoid potential crasher.	2013-11-22 15:10:16 -05:00
Francis Lachapelle	a9868b1c93	Fix the Sieve filters editor with new mail flags	2013-11-22 15:09:49 -05:00
Jean Raby	2cf66e037d	Merge to 2.1.1	2013-11-19 14:00:22 -05:00
Francis Lachapelle	449d838dc2	Merge to 2.1.0	2013-11-07 14:43:19 -05:00
Francis Lachapelle	c4bc215a47	Merge to 2.0.7	2013-07-23 10:02:39 -04:00
Francis Lachapelle	c9936d7ecf	Merge to 2.0.7	2013-07-23 08:38:44 -04:00
Francis Lachapelle	885e59a2af	Merge to 2.0.7	2013-07-19 13:46:37 -04:00
Jean Raby	bf398889bf	Merge to 2.0.6b	2013-06-27 11:36:30 -04:00
Ludovic Marcotte	e26e3d7307	Revert "Properly escape the foldername to avoid XSS issues" This reverts commit `045b275b27`.	2013-06-27 11:15:41 -04:00
Ludovic Marcotte	045b275b27	Properly escape the foldername to avoid XSS issues	2013-06-27 11:06:07 -04:00
Jean Raby	7ec1973e0f	Merge to 2.0.6a	2013-06-25 09:22:35 -04:00
Ludovic Marcotte	a79a9c4eff	Merge to 2.0.6 Conflicts: Documentation/SOGo Installation Guide.odt	2013-06-21 12:44:35 -04:00
Jean Raby	f049e2430a	Added ldap attribute mapping table	2013-04-22 12:25:22 -04:00
Jean Raby	59b3219f2d	Merge to 2.05a	2013-04-16 15:20:19 -04:00
Francis Lachapelle	e9eb8bdc86	Merge to 2.0.5	2013-04-11 12:56:34 -04:00
Francis Lachapelle	5e0c7ae4f2	Merge to 2.0.4b	2013-02-04 14:24:46 -05:00
Francis Lachapelle	c1c0c1ab44	Merge to 2.0.4a	2013-01-30 08:54:00 -05:00
Francis Lachapelle	a59fff785b	Merge to 2.0.4	2013-01-25 14:01:10 -05:00
Francis Lachapelle	6a70db80e6	Merge to 2.0.3a	2012-12-07 09:35:03 -05:00
Francis Lachapelle	d610630c8d	Merge to 2.0.3 (again)	2012-12-06 13:08:47 -05:00
Francis Lachapelle	4dc7790015	Merge to 2.0.3	2012-12-06 10:40:33 -05:00
Francis Lachapelle	9dd000a2ca	Merge to 2.0.2 Merge commit '1080bee3ba9749aad0dc28625081fc6a496f7280' into maint Conflicts: OpenChange/MAPIStoreContext.h OpenChange/MAPIStoreContext.m	2012-11-15 10:10:48 -05:00
Wolfgang Sourdeau	ce4084e528	getNewChangeNumbers: new wrapper for openchangedb_get_new_changeNumbers	2012-10-12 16:55:27 -04:00