From 2d33b01f31c95004c8cb72ec7b01add95e0418eb Mon Sep 17 00:00:00 2001
From: Luc Charland <lcharland@inverse.ca>
Date: Fri, 31 Jul 2015 13:54:03 -0400
Subject: [PATCH] Removing colons

Conflicts:

	UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
	UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
	UI/Templates/MailerUI/UIxMailMainFrame.wox
	UI/Templates/MainUI/SOGoRootPage.wox
	UI/Templates/PreferencesUI/UIxAccountEditor.wox
	UI/Templates/PreferencesUI/UIxPreferences.wox
	UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
	UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
	UI/Templates/SchedulerUI/UIxCalMainView.wox
	UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
	UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
	UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox
	UI/WebServerResources/angular-material
---
 Scripts/verify_translations.py                |  24 +-
 .../Arabic.lproj/Localizable.strings          |  14 +-
 .../Basque.lproj/Localizable.strings          |  12 +-
 .../Localizable.strings                       |  14 +-
 .../Catalan.lproj/Localizable.strings         |  14 +-
 .../ChineseTaiwan.lproj/Localizable.strings   |  14 +-
 .../Czech.lproj/Localizable.strings           |  14 +-
 .../Danish.lproj/Localizable.strings          |  14 +-
 .../Dutch.lproj/Localizable.strings           |  14 +-
 .../English.lproj/Localizable.strings         |  14 +-
 .../Finnish.lproj/Localizable.strings         |  14 +-
 .../French.lproj/Localizable.strings          |  14 +-
 .../German.lproj/Localizable.strings          |  14 +-
 .../Hungarian.lproj/Localizable.strings       |  14 +-
 .../Icelandic.lproj/Localizable.strings       |   6 +-
 .../Italian.lproj/Localizable.strings         |   6 +-
 .../NorwegianBokmal.lproj/Localizable.strings |  14 +-
 .../Localizable.strings                       |   6 +-
 .../Polish.lproj/Localizable.strings          |  14 +-
 .../Russian.lproj/Localizable.strings         |  14 +-
 .../Slovak.lproj/Localizable.strings          |  14 +-
 .../Slovenian.lproj/Localizable.strings       |  14 +-
 .../Localizable.strings                       |  14 +-
 .../SpanishSpain.lproj/Localizable.strings    |  14 +-
 .../Swedish.lproj/Localizable.strings         |   6 +-
 .../Ukrainian.lproj/Localizable.strings       |   6 +-
 .../Welsh.lproj/Localizable.strings           |   6 +-
 UI/Contacts/Arabic.lproj/Localizable.strings  |  26 +-
 UI/Contacts/Basque.lproj/Localizable.strings  |  26 +-
 .../Localizable.strings                       |  26 +-
 UI/Contacts/Catalan.lproj/Localizable.strings |  26 +-
 .../ChineseTaiwan.lproj/Localizable.strings   |  26 +-
 UI/Contacts/Czech.lproj/Localizable.strings   |  26 +-
 UI/Contacts/Danish.lproj/Localizable.strings  |  26 +-
 UI/Contacts/Dutch.lproj/Localizable.strings   |  26 +-
 UI/Contacts/English.lproj/Localizable.strings |  26 +-
 UI/Contacts/Finnish.lproj/Localizable.strings |  26 +-
 UI/Contacts/French.lproj/Localizable.strings  |  26 +-
 UI/Contacts/German.lproj/Localizable.strings  |  26 +-
 .../Hungarian.lproj/Localizable.strings       |  26 +-
 .../Icelandic.lproj/Localizable.strings       |  26 +-
 UI/Contacts/Italian.lproj/Localizable.strings |  26 +-
 .../NorwegianBokmal.lproj/Localizable.strings |  26 +-
 .../Localizable.strings                       |  26 +-
 UI/Contacts/Polish.lproj/Localizable.strings  |  26 +-
 UI/Contacts/Russian.lproj/Localizable.strings |  26 +-
 UI/Contacts/Slovak.lproj/Localizable.strings  |  26 +-
 .../Slovenian.lproj/Localizable.strings       |  26 +-
 .../Localizable.strings                       |  26 +-
 .../SpanishSpain.lproj/Localizable.strings    |  26 +-
 UI/Contacts/Swedish.lproj/Localizable.strings |  26 +-
 .../Ukrainian.lproj/Localizable.strings       |  26 +-
 UI/Contacts/Welsh.lproj/Localizable.strings   |  22 +-
 UI/MailerUI/Arabic.lproj/Localizable.strings  |   4 +-
 UI/MailerUI/Basque.lproj/Localizable.strings  |   6 +-
 .../Localizable.strings                       |   6 +-
 UI/MailerUI/Catalan.lproj/Localizable.strings |   4 +-
 .../ChineseTaiwan.lproj/Localizable.strings   |   6 +-
 UI/MailerUI/Czech.lproj/Localizable.strings   |   6 +-
 UI/MailerUI/Danish.lproj/Localizable.strings  |   4 +-
 UI/MailerUI/Dutch.lproj/Localizable.strings   |   6 +-
 UI/MailerUI/English.lproj/Localizable.strings |   6 +-
 UI/MailerUI/Finnish.lproj/Localizable.strings |   6 +-
 UI/MailerUI/French.lproj/Localizable.strings  |   6 +-
 UI/MailerUI/German.lproj/Localizable.strings  |   6 +-
 .../Hungarian.lproj/Localizable.strings       |   6 +-
 .../Icelandic.lproj/Localizable.strings       |   4 +-
 UI/MailerUI/Italian.lproj/Localizable.strings |   4 +-
 .../NorwegianBokmal.lproj/Localizable.strings |   6 +-
 .../Localizable.strings                       |   4 +-
 UI/MailerUI/Polish.lproj/Localizable.strings  |   6 +-
 UI/MailerUI/Russian.lproj/Localizable.strings |   6 +-
 UI/MailerUI/Slovak.lproj/Localizable.strings  |   4 +-
 .../Slovenian.lproj/Localizable.strings       |   6 +-
 .../Localizable.strings                       |   6 +-
 .../SpanishSpain.lproj/Localizable.strings    |   6 +-
 UI/MailerUI/Swedish.lproj/Localizable.strings |   4 +-
 .../Ukrainian.lproj/Localizable.strings       |   4 +-
 UI/MailerUI/Welsh.lproj/Localizable.strings   |   4 +-
 UI/MainUI/Arabic.lproj/Localizable.strings    |   8 +-
 UI/MainUI/Basque.lproj/Localizable.strings    |   8 +-
 .../Localizable.strings                       |   8 +-
 UI/MainUI/Catalan.lproj/Localizable.strings   |   8 +-
 .../ChineseTaiwan.lproj/Localizable.strings   |   8 +-
 UI/MainUI/Czech.lproj/Localizable.strings     |   8 +-
 UI/MainUI/Danish.lproj/Localizable.strings    |   8 +-
 UI/MainUI/Dutch.lproj/Localizable.strings     |   8 +-
 UI/MainUI/English.lproj/Localizable.strings   |   8 +-
 UI/MainUI/Finnish.lproj/Localizable.strings   |   8 +-
 UI/MainUI/French.lproj/Localizable.strings    |   8 +-
 UI/MainUI/German.lproj/Localizable.strings    |   8 +-
 UI/MainUI/Hungarian.lproj/Localizable.strings |   8 +-
 UI/MainUI/Icelandic.lproj/Localizable.strings |   8 +-
 UI/MainUI/Italian.lproj/Localizable.strings   |   8 +-
 .../NorwegianBokmal.lproj/Localizable.strings |   8 +-
 .../Localizable.strings                       |   8 +-
 UI/MainUI/Polish.lproj/Localizable.strings    |   8 +-
 UI/MainUI/Russian.lproj/Localizable.strings   |   8 +-
 UI/MainUI/Slovak.lproj/Localizable.strings    |   8 +-
 UI/MainUI/Slovenian.lproj/Localizable.strings |   8 +-
 .../Localizable.strings                       |   8 +-
 .../SpanishSpain.lproj/Localizable.strings    |   8 +-
 UI/MainUI/Swedish.lproj/Localizable.strings   |   8 +-
 UI/MainUI/Ukrainian.lproj/Localizable.strings |   8 +-
 UI/MainUI/Welsh.lproj/Localizable.strings     |   8 +-
 .../Arabic.lproj/Localizable.strings          |  68 ++--
 .../Basque.lproj/Localizable.strings          |  74 ++--
 .../Localizable.strings                       |  74 ++--
 .../Catalan.lproj/Localizable.strings         |  72 ++--
 .../ChineseTaiwan.lproj/Localizable.strings   |  74 ++--
 .../Czech.lproj/Localizable.strings           |  74 ++--
 .../Danish.lproj/Localizable.strings          |  70 ++--
 .../Dutch.lproj/Localizable.strings           |  74 ++--
 .../English.lproj/Localizable.strings         |  74 ++--
 .../Finnish.lproj/Localizable.strings         |  74 ++--
 .../French.lproj/Localizable.strings          |  74 ++--
 .../German.lproj/Localizable.strings          |  74 ++--
 .../Hungarian.lproj/Localizable.strings       |  74 ++--
 .../Icelandic.lproj/Localizable.strings       |  68 ++--
 .../Italian.lproj/Localizable.strings         |  64 ++--
 .../NorwegianBokmal.lproj/Localizable.strings |  74 ++--
 .../Localizable.strings                       |  74 ++--
 .../Polish.lproj/Localizable.strings          |  74 ++--
 .../Russian.lproj/Localizable.strings         |  74 ++--
 .../Slovak.lproj/Localizable.strings          |  70 ++--
 .../Slovenian.lproj/Localizable.strings       |  74 ++--
 .../Localizable.strings                       |  74 ++--
 .../SpanishSpain.lproj/Localizable.strings    |  74 ++--
 .../Swedish.lproj/Localizable.strings         |  74 ++--
 .../Ukrainian.lproj/Localizable.strings       |  72 ++--
 .../Welsh.lproj/Localizable.strings           |  74 ++--
 UI/Scheduler/Arabic.lproj/Localizable.strings |  42 +--
 UI/Scheduler/Basque.lproj/Localizable.strings |  56 +--
 .../Localizable.strings                       |  50 +--
 .../Catalan.lproj/Localizable.strings         |  52 +--
 .../ChineseTaiwan.lproj/Localizable.strings   |  52 +--
 UI/Scheduler/Czech.lproj/Localizable.strings  |  50 +--
 UI/Scheduler/Danish.lproj/Localizable.strings |  42 +--
 UI/Scheduler/Dutch.lproj/Localizable.strings  |  50 +--
 .../English.lproj/Localizable.strings         |  50 +--
 .../Finnish.lproj/Localizable.strings         |  50 +--
 UI/Scheduler/French.lproj/Localizable.strings |  50 +--
 UI/Scheduler/German.lproj/Localizable.strings |  50 +--
 .../Hungarian.lproj/Localizable.strings       |  52 +--
 .../Icelandic.lproj/Localizable.strings       |  40 +-
 .../Italian.lproj/Localizable.strings         |  42 +--
 .../NorwegianBokmal.lproj/Localizable.strings |  50 +--
 .../Localizable.strings                       |  40 +-
 UI/Scheduler/Polish.lproj/Localizable.strings |  50 +--
 .../Russian.lproj/Localizable.strings         |  50 +--
 UI/Scheduler/Slovak.lproj/Localizable.strings |  50 +--
 .../Slovenian.lproj/Localizable.strings       |  50 +--
 .../Localizable.strings                       |  52 +--
 .../SpanishSpain.lproj/Localizable.strings    |  52 +--
 .../Swedish.lproj/Localizable.strings         |  40 +-
 .../Ukrainian.lproj/Localizable.strings       |  40 +-
 UI/Scheduler/Welsh.lproj/Localizable.strings  |  40 +-
 .../Appointments/SOGoAptMailReceipt.wox       |   6 +-
 .../ContactsUI/UIxContactEditorTemplate.wox   | 345 ++++++++++++++++++
 .../UIxContactFolderLinksTemplate.wox         |  42 +++
 UI/Templates/ContactsUI/UIxListEditor.wox     |   6 +-
 UI/Templates/MailerUI/UIxMailSearch.wox       |   2 +-
 UI/Templates/MainUI/SOGoRootPage.wox          |   8 +-
 .../PreferencesUI/UIxAccountEditor.wox        | 121 ++++++
 UI/Templates/PreferencesUI/UIxPreferences.wox |  77 ++--
 .../SchedulerUI/UIxAppointmentEditor.wox      |  14 +-
 .../UIxAppointmentEditorTemplate.wox          | 252 +++++++++++++
 .../UIxAppointmentViewTemplate.wox            | 129 +++++++
 .../SchedulerUI/UIxCalFilterPanel.wox         |   2 +-
 UI/Templates/SchedulerUI/UIxCalMainView.wox   |   6 +-
 UI/Templates/SchedulerUI/UIxCalViewPrint.wox  |   8 +-
 .../UIxCalendarFolderLinksTemplate.wox        |  76 ++++
 .../SchedulerUI/UIxComponentEditor.wox        |  50 +--
 UI/Templates/SchedulerUI/UIxTaskEditor.wox    |  12 +-
 .../SchedulerUI/UIxTaskEditorTemplate.wox     | 215 +++++++++++
 .../SchedulerUI/UIxTaskViewTemplate.wox       | 103 ++++++
 176 files changed, 3625 insertions(+), 2335 deletions(-)
 create mode 100644 UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
 create mode 100644 UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
 create mode 100644 UI/Templates/PreferencesUI/UIxAccountEditor.wox
 create mode 100644 UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
 create mode 100644 UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
 create mode 100644 UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
 create mode 100644 UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
 create mode 100644 UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox

diff --git a/Scripts/verify_translations.py b/Scripts/verify_translations.py
index f5ca644f1..cf06585b7 100755
--- a/Scripts/verify_translations.py
+++ b/Scripts/verify_translations.py
@@ -21,11 +21,12 @@ def get_translations(path):
     try:
         transpath = dir_mappings.get(path, path)
         transname = transpath + '/English.lproj/Localizable.strings'
-        transall = open(transname).read().split('\n')
-        transgood = [l.strip() for l in transall if len(l.strip()) and l.strip()[0] != '#']
+        #transall = open(transname).read().split('\n')
+        #transgood = [l.strip() for l in transall if len(l.strip()) and l.strip()[0] != '#']
+        transall = open(transname).read()
     except:
-        transgood = ()
-    return transgood
+        transall = ""
+    return transall
 
 
 def find_missing_translations(rootdir='.', extention='', recomp=None, greylist=()):
@@ -38,8 +39,7 @@ def find_missing_translations(rootdir='.', extention='', recomp=None, greylist=(
                     continue
                 pathname = path + '/' + filename
                 lines = open(pathname).read().split("\n")
-                regex_results = [recomp.search(l) for l in lines]
-                values = [r.groups()[0] for r in regex_results if r]
+                values = [r.groups()[0] for r in [recomp.search(l) for l in lines] if r]
                 if values:
                     #- Get the current english translations for the path
                     transgood = get_translations(path)
@@ -50,9 +50,15 @@ def find_missing_translations(rootdir='.', extention='', recomp=None, greylist=(
                     if DEBUG:print pathname
                     for value in values:
                         #- Try to find the value from the source file in the translation file
-                        found = [line for line in transgood if value in line]
+                        #compvalue = re.compile('"(%s)"\s=\s"(.*?)";' % value)
+                        escaped_value = re.escape(value)
+                        found = re.search('(%s|"%s")\s*=\s*"(.*?)";' % (escaped_value, escaped_value), transgood)
+                        #for line in transgood:
+                        #    found = compvalue.search(line)
+                        #    if found:
+                        #        break
                         if found:
-                            if DEBUG: print "\t", "[%s] FOUND --" % value, found[0].split("=")[0]
+                            if DEBUG: print "\t", '[%s] FOUND -- "%s"' % found.groups()
                         else:
                             notfound.append("-->\t[%s] ==== Not Found ====" % value)
                     if notfound:
@@ -73,7 +79,7 @@ def main():
     greylist = ('UIxFilterEditor.wox')
 
     #- Get only the label:value from all lines
-    recomp = re.compile('<var:string label:value="(.*?)"')
+    recomp = re.compile(' label:[^=]*="(.*?)"')
     find_missing_translations('../UI', 'wox', recomp, greylist)
 
     #- [self labelForKey: @"Issuer"]
diff --git a/SoObjects/Appointments/Arabic.lproj/Localizable.strings b/SoObjects/Appointments/Arabic.lproj/Localizable.strings
index 23754f510..e24c72e44 100644
--- a/SoObjects/Appointments/Arabic.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Arabic.lproj/Localizable.strings
@@ -11,16 +11,16 @@ vtodo_class2 = "(مهمة سرية)";
 "The event \"%{Summary}\" was created" = "أُنشِئ الحدث \"%{Summary}\"";
 "The event \"%{Summary}\" was deleted" = "حُذِفَ الحدث \"%{Summary}\"";
 "The event \"%{Summary}\" was updated" = "حُدِّث الحدث \"%{Summary}\"";
-"The following attendees(s) were notified:" = "تم ابلاغ المدعو (المدعويين)  الأتي أسماءهم:";
-"The following attendees(s) were added:" = "تم أضافة المدعو (المدعويين) الأتي أسماءهم:";
-"The following attendees(s) were removed:" = "تم مسح المدعو (المدعويين) الأتي أسماءهم:";
+"The following attendees(s) were notified" = "تم ابلاغ المدعو (المدعويين)  الأتي أسماءهم";
+"The following attendees(s) were added" = "تم أضافة المدعو (المدعويين) الأتي أسماءهم";
+"The following attendees(s) were removed" = "تم مسح المدعو (المدعويين) الأتي أسماءهم";
 
 /* IMIP messages */
-"calendar_label" = "التقويم:";
-"startDate_label" = "البداية:";
-"endDate_label" = "النهاية:";
+"calendar_label" = "التقويم";
+"startDate_label" = "البداية";
+"endDate_label" = "النهاية";
 "due_label" = "تاريخ الاستحقاق:";
-"location_label" = "المكان:";
+"location_label" = "المكان";
 "summary_label" = "الملخص:";
 "comment_label" = "التعليق:";
 
diff --git a/SoObjects/Appointments/Basque.lproj/Localizable.strings b/SoObjects/Appointments/Basque.lproj/Localizable.strings
index 316b6371f..a4574b684 100644
--- a/SoObjects/Appointments/Basque.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Basque.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Isilpeko egitekoa)";
 "The event \"%{Summary}\" was created" = "\"%{Summary}\" ekitaldia sortu da";
 "The event \"%{Summary}\" was deleted" = "\"%{Summary}\" ekitaldia ezabatu da";
 "The event \"%{Summary}\" was updated" = "\"%{Summary}\" ekitaldia eguneratu da";
-"The following attendees(s) were notified:" = "Ondorengo partaidea(k) jakinarazi d(ir)a:";
-"The following attendees(s) were added:" = "Ondorengo partaidea(k) gehitu d(ir)a:";
-"The following attendees(s) were removed:" = "Ondorengo partaidea(k) ezabatu d(ir)a:";
+"The following attendees(s) were notified" = "Ondorengo partaidea(k) jakinarazi d(ir)a";
+"The following attendees(s) were added" = "Ondorengo partaidea(k) gehitu d(ir)a";
+"The following attendees(s) were removed" = "Ondorengo partaidea(k) ezabatu d(ir)a";
 
 /* IMIP messages */
 "calendar_label" = "Egutegia";
-"startDate_label" = "Hasi:";
-"endDate_label" = "Amaitu:";
+"startDate_label" = "Hasi";
+"endDate_label" = "Amaitu";
 "due_label" = "Epemuga:";
-"location_label" = "Kokapena:";
+"location_label" = "Kokapena";
 "summary_label" = "Laburpena:";
 "comment_label" = "Iruzkina:";
 
diff --git a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
index 5fcb33090..78a77f482 100644
--- a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
+++ b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Tarefa Confidencial)";
 "The event \"%{Summary}\" was created" = "O evento \"%{Summary}\" foi criado";
 "The event \"%{Summary}\" was deleted" = "O evento \"%{Summary}\" foi removido";
 "The event \"%{Summary}\" was updated" = "O evento \"%{Summary}\" foi atualizado";
-"The following attendees(s) were notified:" = "Estes participantes foram notificados:";
-"The following attendees(s) were added:" = "Estes participantes foram adicionados:";
-"The following attendees(s) were removed:" = "Estes participantes foram removidos:";
+"The following attendees(s) were notified" = "Estes participantes foram notificados";
+"The following attendees(s) were added" = "Estes participantes foram adicionados";
+"The following attendees(s) were removed" = "Estes participantes foram removidos";
 
 /* IMIP messages */
-"calendar_label" = "Calendário:";
-"startDate_label" = "Início:";
-"endDate_label" = "Fim:";
+"calendar_label" = "Calendário";
+"startDate_label" = "Início";
+"endDate_label" = "Fim";
 "due_label" = "Data de Vencimento:";
-"location_label" = "Local:";
+"location_label" = "Local";
 "summary_label" = "Resumo:";
 "comment_label" = "Comentário:";
 
diff --git a/SoObjects/Appointments/Catalan.lproj/Localizable.strings b/SoObjects/Appointments/Catalan.lproj/Localizable.strings
index 33861d079..9dcf2ed29 100644
--- a/SoObjects/Appointments/Catalan.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Catalan.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Tasca confidencial)";
 "The event \"%{Summary}\" was created" = "Es va crear l'esdeveniment \"%{Summary}\" ";
 "The event \"%{Summary}\" was deleted" = "Es va esborrar l'esdeveniment \"%{Summary}\" ";
 "The event \"%{Summary}\" was updated" = "Es va modificar l'esdeveniment \"%{Summary}\" ";
-"The following attendees(s) were notified:" = "I va notificar als següents participants: ";
-"The following attendees(s) were added:" = "Es van agregar els següents participants: ";
-"The following attendees(s) were removed:" = "Heu suprimit els assistents següents:";
+"The following attendees(s) were notified" = "I va notificar als següents participants ";
+"The following attendees(s) were added" = "Es van agregar els següents participants ";
+"The following attendees(s) were removed" = "Heu suprimit els assistents següents";
 
 /* IMIP messages */
-"calendar_label" = "Calendari:";
-"startDate_label" = "Inici:";
-"endDate_label" = "Final:";
+"calendar_label" = "Calendari";
+"startDate_label" = "Inici";
+"endDate_label" = "Final";
 "due_label" = "Data límit:";
-"location_label" = "Lloc:";
+"location_label" = "Lloc";
 "summary_label" = "Resum:";
 "comment_label" = "Comentari:";
 
diff --git a/SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings b/SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings
index b51c99ad8..3c3e59b55 100644
--- a/SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings
+++ b/SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(機密任務)";
 "The event \"%{Summary}\" was created" = "事件 \"%{Summary}\" 已建立";
 "The event \"%{Summary}\" was deleted" = "事件\"%{Summary}\" 已刪除";
 "The event \"%{Summary}\" was updated" = "事件\"%{Summary}\" 已異動";
-"The following attendees(s) were notified:" = "已通知下列出席者:";
-"The following attendees(s) were added:" = "已增加下列出席者:";
-"The following attendees(s) were removed:" = "已移除下列出席者:";
+"The following attendees(s) were notified" = "已通知下列出席者";
+"The following attendees(s) were added" = "已增加下列出席者";
+"The following attendees(s) were removed" = "已移除下列出席者";
 
 /* IMIP messages */
-"calendar_label" = "行事曆:";
-"startDate_label" = "開始:";
-"endDate_label" = "結束:";
+"calendar_label" = "行事曆";
+"startDate_label" = "開始";
+"endDate_label" = "結束";
 "due_label" = "截止日期:";
-"location_label" = "地點:";
+"location_label" = "地點";
 "summary_label" = "事件主題:";
 "comment_label" = "備註:";
 
diff --git a/SoObjects/Appointments/Czech.lproj/Localizable.strings b/SoObjects/Appointments/Czech.lproj/Localizable.strings
index fde0f1775..720a2de98 100644
--- a/SoObjects/Appointments/Czech.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Czech.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Skrytý úkol)";
 "The event \"%{Summary}\" was created" = "Událost \"%{Summary}\" byla vytvořena";
 "The event \"%{Summary}\" was deleted" = "Událost \"%{Summary}\" byla smazána";
 "The event \"%{Summary}\" was updated" = "Událost \"%{Summary}\" byla upravena";
-"The following attendees(s) were notified:" = "Následující účastníci byli upozorněni:";
-"The following attendees(s) were added:" = "Následující účastníci byli přidáni:";
-"The following attendees(s) were removed:" = "Následující účastníci byli odebráni:";
+"The following attendees(s) were notified" = "Následující účastníci byli upozorněni";
+"The following attendees(s) were added" = "Následující účastníci byli přidáni";
+"The following attendees(s) were removed" = "Následující účastníci byli odebráni";
 
 /* IMIP messages */
-"calendar_label" = "Kalendář:";
-"startDate_label" = "Začátek:";
-"endDate_label" = "Konec:";
+"calendar_label" = "Kalendář";
+"startDate_label" = "Začátek";
+"endDate_label" = "Konec";
 "due_label" = "Termín:";
-"location_label" = "Místo:";
+"location_label" = "Místo";
 "summary_label" = "Název:";
 "comment_label" = "Komentář:";
 
diff --git a/SoObjects/Appointments/Danish.lproj/Localizable.strings b/SoObjects/Appointments/Danish.lproj/Localizable.strings
index 8718169b7..c7c8ed662 100644
--- a/SoObjects/Appointments/Danish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Danish.lproj/Localizable.strings
@@ -11,16 +11,16 @@ vtodo_class2 = "(Hemmelig opgave)";
 "The event \"%{Summary}\" was created" = "Begivenheden \"%{Summary}\" blev oprettet";
 "The event \"%{Summary}\" was deleted" = "Begivenheden \"%{Summary}\" blev slettet";
 "The event \"%{Summary}\" was updated" = "Begivenheden \"%{Summary}\" blev opdateret";
-"The following attendees(s) were notified:" = "Følgende deltager(e) blev underrettet:";
-"The following attendees(s) were added:" = "Følgende deltager(e) blev tilføjet:";
-"The following attendees(s) were removed:" = "Følgende deltager(e) blev fjernet:";
+"The following attendees(s) were notified" = "Følgende deltager(e) blev underrettet";
+"The following attendees(s) were added" = "Følgende deltager(e) blev tilføjet";
+"The following attendees(s) were removed" = "Følgende deltager(e) blev fjernet";
 
 /* IMIP messages */
-"calendar_label" = "Kalender:";
-"startDate_label" = "Start:";
-"endDate_label" = "Slut:";
+"calendar_label" = "Kalender";
+"startDate_label" = "Start";
+"endDate_label" = "Slut";
 "due_label" = "Forfaldsdato:";
-"location_label" = "Sted:";
+"location_label" = "Sted";
 "summary_label" = "Resumé:";
 "comment_label" = "Kommentér:";
 
diff --git a/SoObjects/Appointments/Dutch.lproj/Localizable.strings b/SoObjects/Appointments/Dutch.lproj/Localizable.strings
index f554e976e..1a422fa39 100644
--- a/SoObjects/Appointments/Dutch.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Dutch.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Vertrouwelijke taak)";
 "The event \"%{Summary}\" was created" = "De gebeurtenis \"%{Summary}\" is aangemaakt";
 "The event \"%{Summary}\" was deleted" = "De gebeurtenis \"%{Summary}\" is verwijderd";
 "The event \"%{Summary}\" was updated" = "De gebeurtenis \"%{Summary}\" is gewijzigd";
-"The following attendees(s) were notified:" = "De volgende deelnemers zijn in kennis gesteld:";
-"The following attendees(s) were added:" = "De volgende deelnemers zijn toegevoegd:";
-"The following attendees(s) were removed:" = "De volgende deelnemers zijn verwijderd:";
+"The following attendees(s) were notified" = "De volgende deelnemers zijn in kennis gesteld";
+"The following attendees(s) were added" = "De volgende deelnemers zijn toegevoegd";
+"The following attendees(s) were removed" = "De volgende deelnemers zijn verwijderd";
 
 /* IMIP messages */
-"calendar_label" = "Agenda:";
-"startDate_label" = "Start:";
-"endDate_label" = "Einde:";
+"calendar_label" = "Agenda";
+"startDate_label" = "Start";
+"endDate_label" = "Einde";
 "due_label" = "Vervaldag:";
-"location_label" = "Locatie:";
+"location_label" = "Locatie";
 "summary_label" = "Samenvatting:";
 "comment_label" = "Commentaar:";
 
diff --git a/SoObjects/Appointments/English.lproj/Localizable.strings b/SoObjects/Appointments/English.lproj/Localizable.strings
index 45a038dfa..1ca687e1c 100644
--- a/SoObjects/Appointments/English.lproj/Localizable.strings
+++ b/SoObjects/Appointments/English.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Confidential task)";
 "The event \"%{Summary}\" was created" = "The event \"%{Summary}\" was created";
 "The event \"%{Summary}\" was deleted" = "The event \"%{Summary}\" was deleted";
 "The event \"%{Summary}\" was updated" = "The event \"%{Summary}\" was updated";
-"The following attendees(s) were notified:" = "The following attendee(s) were notified:";
-"The following attendees(s) were added:" = "The following attendee(s) were added:";
-"The following attendees(s) were removed:" = "The following attendee(s) were removed:";
+"The following attendees(s) were notified" = "The following attendee(s) were notified";
+"The following attendees(s) were added" = "The following attendee(s) were added";
+"The following attendees(s) were removed" = "The following attendee(s) were removed";
 
 /* IMIP messages */
-"calendar_label" = "Calendar:";
-"startDate_label" = "Start:";
-"endDate_label" = "End:";
+"calendar_label" = "Calendar";
+"startDate_label" = "Start";
+"endDate_label" = "End";
 "due_label" = "Due Date:";
-"location_label" = "Location:";
+"location_label" = "Location";
 "summary_label" = "Summary:";
 "comment_label" = "Comment:";
 
diff --git a/SoObjects/Appointments/Finnish.lproj/Localizable.strings b/SoObjects/Appointments/Finnish.lproj/Localizable.strings
index 2574c7110..2aecd3b29 100644
--- a/SoObjects/Appointments/Finnish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Finnish.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Luottamuksellinen tehtävä)";
 "The event \"%{Summary}\" was created" = "Tapahtuma \"%{Summary}\" luotiin";
 "The event \"%{Summary}\" was deleted" = "Tapahtuma \"%{Summary}\" poistettiin";
 "The event \"%{Summary}\" was updated" = "Tapahtuma \"%{Summary}\" päivitettiin";
-"The following attendees(s) were notified:" = "Seuraava(t) osallistuja(t) on informoitu:";
-"The following attendees(s) were added:" = "Seuraava(t) osalllistuja(t) on lisätty:";
-"The following attendees(s) were removed:" = "Seuraava(t) osalllistuja(t) poistettiin:";
+"The following attendees(s) were notified" = "Seuraava(t) osallistuja(t) on informoitu";
+"The following attendees(s) were added" = "Seuraava(t) osalllistuja(t) on lisätty";
+"The following attendees(s) were removed" = "Seuraava(t) osalllistuja(t) poistettiin";
 
 /* IMIP messages */
-"calendar_label" = "Kalenteri:";
-"startDate_label" = "Alkaa:";
-"endDate_label" = "Päättyy:";
+"calendar_label" = "Kalenteri";
+"startDate_label" = "Alkaa";
+"endDate_label" = "Päättyy";
 "due_label" = "Määräpäivä:";
-"location_label" = "Sijainti:";
+"location_label" = "Sijainti";
 "summary_label" = "Yhteenveto:";
 "comment_label" = "Kommentti:";
 
diff --git a/SoObjects/Appointments/French.lproj/Localizable.strings b/SoObjects/Appointments/French.lproj/Localizable.strings
index 690738b77..db765b83b 100644
--- a/SoObjects/Appointments/French.lproj/Localizable.strings
+++ b/SoObjects/Appointments/French.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Tâche confidentielle)";
 "The event \"%{Summary}\" was created" = "L'événement «%{Summary}» a été créé";
 "The event \"%{Summary}\" was deleted" = "L'événement «%{Summary}» a été effacé";
 "The event \"%{Summary}\" was updated" = "L'événement «%{Summary}» a été modifié";
-"The following attendees(s) were notified:" = "Les invités suivants ont été avisés :";
-"The following attendees(s) were added:" = "Les invités suivants ont été ajoutés :";
-"The following attendees(s) were removed:" = "Les invités suivants ont été supprimés :";
+"The following attendees(s) were notified" = "Les invités suivants ont été avisés ";
+"The following attendees(s) were added" = "Les invités suivants ont été ajoutés ";
+"The following attendees(s) were removed" = "Les invités suivants ont été supprimés ";
 
 /* IMIP messages */
-"calendar_label" = "Agenda :";
-"startDate_label" = "Début :";
-"endDate_label" = "Fin :";
+"calendar_label" = "Agenda ";
+"startDate_label" = "Début ";
+"endDate_label" = "Fin ";
 "due_label" = "Fin prévue :";
-"location_label" = "Lieu :";
+"location_label" = "Lieu ";
 "summary_label" = "Titre :";
 "comment_label" = "Description :";
 
diff --git a/SoObjects/Appointments/German.lproj/Localizable.strings b/SoObjects/Appointments/German.lproj/Localizable.strings
index a9e975288..1857c9560 100644
--- a/SoObjects/Appointments/German.lproj/Localizable.strings
+++ b/SoObjects/Appointments/German.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 "The event \"%{Summary}\" was created" = "Der Termin \"%{Summary}\" wurde angelegt";
 "The event \"%{Summary}\" was deleted" = "Der Termin \"%{Summary}\" wurde gelöscht";
 "The event \"%{Summary}\" was updated" = "Der Termin \"%{Summary}\" wurde geändert";
-"The following attendees(s) were notified:" = "Die folgenden Teilnehmer wurden benachrichtigt:";
-"The following attendees(s) were added:" = "Die folgenden Teilnehmer wurden hinzugefügt:";
-"The following attendees(s) were removed:" = "Die folgenden Teilnehmer wurden entfernt:";
+"The following attendees(s) were notified" = "Die folgenden Teilnehmer wurden benachrichtigt";
+"The following attendees(s) were added" = "Die folgenden Teilnehmer wurden hinzugefügt";
+"The following attendees(s) were removed" = "Die folgenden Teilnehmer wurden entfernt";
 
 /* IMIP messages */
-"calendar_label" = "Kalender:";
-"startDate_label" = "Beginn:";
-"endDate_label" = "Ende:";
+"calendar_label" = "Kalender";
+"startDate_label" = "Beginn";
+"endDate_label" = "Ende";
 "due_label" = "Fälligkeit:";
-"location_label" = "Ort:";
+"location_label" = "Ort";
 "summary_label" = "Zusammenfassung:";
 "comment_label" = "Kommentar:";
 
diff --git a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
index ab163b121..5669e189e 100644
--- a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Bizalmas feladat)";
 "The event \"%{Summary}\" was created" = "A \"%{Summary}\" esemény létre lett hozva";
 "The event \"%{Summary}\" was deleted" = "A \"%{Summary}\" esemény törölve lett";
 "The event \"%{Summary}\" was updated" = "A \"%{Summary}\" esemény módosítva lett";
-"The following attendees(s) were notified:" = "Az alábbi résztvevők lettek értesítve:";
-"The following attendees(s) were added:" = "Az alábbi résztvevők lettek hozzáadva:";
-"The following attendees(s) were removed:" = "Az alábbi résztvevők lettek eltávolítva:";
+"The following attendees(s) were notified" = "Az alábbi résztvevők lettek értesítve";
+"The following attendees(s) were added" = "Az alábbi résztvevők lettek hozzáadva";
+"The following attendees(s) were removed" = "Az alábbi résztvevők lettek eltávolítva";
 
 /* IMIP messages */
-"calendar_label" = "Naptár:";
-"startDate_label" = "Kezdete:";
-"endDate_label" = "Vége:";
+"calendar_label" = "Naptár";
+"startDate_label" = "Kezdete";
+"endDate_label" = "Vége";
 "due_label" = "Lejárat napja:";
-"location_label" = "Hely:";
+"location_label" = "Hely";
 "summary_label" = "Összegzés:";
 "comment_label" = "Megjegyzés:";
 
diff --git a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
index 5b6a20af2..07c6696f4 100644
--- a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
@@ -25,10 +25,10 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)";
 "... from the following event:" = "... af eftirfarandi viðburði:";
 
 /* IMIP messages */
-"startDate_label" = "Byrjun:";
-"endDate_label" = "Endir:";
+"startDate_label" = "Byrjun";
+"endDate_label" = "Endir";
 "due_label" = "Lokadagur:";
-"location_label" = "Staðsetning:";
+"location_label" = "Staðsetning";
 "summary_label" = "Samantekt:";
 "comment_label" = "Athugasemd:";
 
diff --git a/SoObjects/Appointments/Italian.lproj/Localizable.strings b/SoObjects/Appointments/Italian.lproj/Localizable.strings
index 8903c354b..ae1c290d3 100644
--- a/SoObjects/Appointments/Italian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Italian.lproj/Localizable.strings
@@ -25,10 +25,10 @@ vtodo_class2 = "(Attività confidenziale)";
 "... from the following event:" = "... dal seguente evento:";
 
 /* IMIP messages */
-"startDate_label" = "Inizio:";
-"endDate_label" = "Fine:";
+"startDate_label" = "Inizio";
+"endDate_label" = "Fine";
 "due_label" = "Scadenza:";
-"location_label" = "Luogo:";
+"location_label" = "Luogo";
 "summary_label" = "Summario:";
 "comment_label" = "Commento:";
 
diff --git a/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings b/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings
index 61a60befd..20f143fbe 100644
--- a/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings
+++ b/SoObjects/Appointments/NorwegianBokmal.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "The event \"%{Summary}\" was created" = "Hendelsen \"%{Summary}\" ble opprettet";
 "The event \"%{Summary}\" was deleted" = "Hendelsen \"%{Summary}\" ble slettet";
 "The event \"%{Summary}\" was updated" = "Hendelsen \"%{Summary}\" ble oppdatert";
-"The following attendees(s) were notified:" = "Følgende deltaker(e) ble varslet:";
-"The following attendees(s) were added:" = "Følgende deltaker(e) ble lagt til:";
-"The following attendees(s) were removed:" = "Følgende deltaker(e) ble fjernet:";
+"The following attendees(s) were notified" = "Følgende deltaker(e) ble varslet";
+"The following attendees(s) were added" = "Følgende deltaker(e) ble lagt til";
+"The following attendees(s) were removed" = "Følgende deltaker(e) ble fjernet";
 
 /* IMIP messages */
-"calendar_label" = "Kalender:";
-"startDate_label" = "Start:";
-"endDate_label" = "Slutt:";
+"calendar_label" = "Kalender";
+"startDate_label" = "Start";
+"endDate_label" = "Slutt";
 "due_label" = "Forfallsdato:";
-"location_label" = "Sted:";
+"location_label" = "Sted";
 "summary_label" = "Sammendrag:";
 "comment_label" = "Kommentar:";
 
diff --git a/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings b/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings
index 6fbb599a6..21807b6ea 100644
--- a/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings
+++ b/SoObjects/Appointments/NorwegianNynorsk.lproj/Localizable.strings
@@ -25,10 +25,10 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "... from the following event:" = "... fra følgende hendelse:";
 
 /* IMIP messages */
-"startDate_label" = "Start:";
-"endDate_label" = "End:";
+"startDate_label" = "Start";
+"endDate_label" = "End";
 "due_label" = "Due Date:";
-"location_label" = "Location:";
+"location_label" = "Location";
 "summary_label" = "Summary:";
 "comment_label" = "Comment:";
 
diff --git a/SoObjects/Appointments/Polish.lproj/Localizable.strings b/SoObjects/Appointments/Polish.lproj/Localizable.strings
index 092525208..a8c00b8b9 100644
--- a/SoObjects/Appointments/Polish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Polish.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Zadanie poufne)";
 "The event \"%{Summary}\" was created" = "Utworzono wydarzenie \"%{Summary}\"";
 "The event \"%{Summary}\" was deleted" = "Skasowano wydarzenie \"%{Summary}\"";
 "The event \"%{Summary}\" was updated" = "Zaktualizowano wydarzenie \"%{Summary}\"";
-"The following attendees(s) were notified:" = "Następujący uczestnicy zostali powiadomieni:";
-"The following attendees(s) were added:" = "Następujący uczestnicy zostali dodani:";
-"The following attendees(s) were removed:" = "Następujący uczestnicy zostali usunięci:";
+"The following attendees(s) were notified" = "Następujący uczestnicy zostali powiadomieni";
+"The following attendees(s) were added" = "Następujący uczestnicy zostali dodani";
+"The following attendees(s) were removed" = "Następujący uczestnicy zostali usunięci";
 
 /* IMIP messages */
-"calendar_label" = "Kalendarz:";
-"startDate_label" = "Początek:";
-"endDate_label" = "Koniec:";
+"calendar_label" = "Kalendarz";
+"startDate_label" = "Początek";
+"endDate_label" = "Koniec";
 "due_label" = "Termin:";
-"location_label" = "Miejsce:";
+"location_label" = "Miejsce";
 "summary_label" = "Podsumowanie:";
 "comment_label" = "Komentarz:";
 
diff --git a/SoObjects/Appointments/Russian.lproj/Localizable.strings b/SoObjects/Appointments/Russian.lproj/Localizable.strings
index ae3700007..190edffc4 100644
--- a/SoObjects/Appointments/Russian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Russian.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Конфиденциальная задача)";
 "The event \"%{Summary}\" was created" = "Было создано мероприятие \"%{Summary}\"";
 "The event \"%{Summary}\" was deleted" = "Мероприятие \"%{Summary}\" было удалено";
 "The event \"%{Summary}\" was updated" = "Мероприятие \"%{Summary}\" было обновлено";
-"The following attendees(s) were notified:" = "Следующие приглашенные были оповещены:";
-"The following attendees(s) were added:" = "Следующие люди были добавлены в список приглашенных:";
-"The following attendees(s) were removed:" = "Следующие люди были исключены из списка приглашенных:";
+"The following attendees(s) were notified" = "Следующие приглашенные были оповещены";
+"The following attendees(s) were added" = "Следующие люди были добавлены в список приглашенных";
+"The following attendees(s) were removed" = "Следующие люди были исключены из списка приглашенных";
 
 /* IMIP messages */
-"calendar_label" = "Календарь:";
-"startDate_label" = "Начало:";
-"endDate_label" = "Конец:";
+"calendar_label" = "Календарь";
+"startDate_label" = "Начало";
+"endDate_label" = "Конец";
 "due_label" = "Должно быть готово к:";
-"location_label" = "Местонахождение:";
+"location_label" = "Местонахождение";
 "summary_label" = "Краткое содержание:";
 "comment_label" = "Комментарий:";
 
diff --git a/SoObjects/Appointments/Slovak.lproj/Localizable.strings b/SoObjects/Appointments/Slovak.lproj/Localizable.strings
index 37d697647..6c0325935 100644
--- a/SoObjects/Appointments/Slovak.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Slovak.lproj/Localizable.strings
@@ -11,16 +11,16 @@ vtodo_class2 = "(Dôverná úloha)";
 "The event \"%{Summary}\" was created" = "Udalosť \"%{Summary}\" bola vytvorená";
 "The event \"%{Summary}\" was deleted" = "Udalosť \"%{Summary}\" bola vymazaná";
 "The event \"%{Summary}\" was updated" = "Udalosť \"%{Summary}\" bola aktualizovaná";
-"The following attendees(s) were notified:" = "Nasledujúci účastník(ci) bol upozornený:";
-"The following attendees(s) were added:" = "Nasledujúci účastník(ci) bol pridaný:";
-"The following attendees(s) were removed:" = "Nasledujúci účastník(ci) bol odstránený:";
+"The following attendees(s) were notified" = "Nasledujúci účastník(ci) bol upozornený";
+"The following attendees(s) were added" = "Nasledujúci účastník(ci) bol pridaný";
+"The following attendees(s) were removed" = "Nasledujúci účastník(ci) bol odstránený";
 
 /* IMIP messages */
-"calendar_label" = "Kalendár:";
-"startDate_label" = "Začiatok:";
-"endDate_label" = "Koniec:";
+"calendar_label" = "Kalendár";
+"startDate_label" = "Začiatok";
+"endDate_label" = "Koniec";
 "due_label" = "Platnosť:";
-"location_label" = "Miesto:";
+"location_label" = "Miesto";
 "summary_label" = "Zhrnutie:";
 "comment_label" = "Komentár:";
 
diff --git a/SoObjects/Appointments/Slovenian.lproj/Localizable.strings b/SoObjects/Appointments/Slovenian.lproj/Localizable.strings
index 49f02e172..7fb7389fc 100644
--- a/SoObjects/Appointments/Slovenian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Slovenian.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Zaupno opravilo)";
 "The event \"%{Summary}\" was created" = "Dogodek \"%{Summary}\" je bil ustvarjen";
 "The event \"%{Summary}\" was deleted" = "Dogodek \"%{Summary}\" je bil izbrisan";
 "The event \"%{Summary}\" was updated" = "Dogodek \"%{Summary}\" je bil posodobljen";
-"The following attendees(s) were notified:" = "Naslednji udeleženci so bili obveščeni:";
-"The following attendees(s) were added:" = "Naslednji udeleženci so bili dodani:";
-"The following attendees(s) were removed:" = "Naslednji udeleženci so bili odstranjeni:";
+"The following attendees(s) were notified" = "Naslednji udeleženci so bili obveščeni";
+"The following attendees(s) were added" = "Naslednji udeleženci so bili dodani";
+"The following attendees(s) were removed" = "Naslednji udeleženci so bili odstranjeni";
 
 /* IMIP messages */
-"calendar_label" = "Koledar:";
-"startDate_label" = "Začetek:";
-"endDate_label" = "Konec:";
+"calendar_label" = "Koledar";
+"startDate_label" = "Začetek";
+"endDate_label" = "Konec";
 "due_label" = "Datum zapadlosti:";
-"location_label" = "Mesto:";
+"location_label" = "Mesto";
 "summary_label" = "Povzetek:";
 "comment_label" = "Komentar:";
 
diff --git a/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings b/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings
index cdc39f607..8bf5fde71 100644
--- a/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings
+++ b/SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Tarea confidencial)";
 "The event \"%{Summary}\" was created" = "Se creó el evento \"%{Summary}\"";
 "The event \"%{Summary}\" was deleted" = "Se borró el evento \"%{Summary}\"";
 "The event \"%{Summary}\" was updated" = "Se actualizó la información del evento \"%{Summary}\"";
-"The following attendees(s) were notified:" = "Se notificó a los siguientes participantes:";
-"The following attendees(s) were added:" = "Se agregaron los siguientes participantes:";
-"The following attendees(s) were removed:" = "Se removieron los siguientes participantes:";
+"The following attendees(s) were notified" = "Se notificó a los siguientes participantes";
+"The following attendees(s) were added" = "Se agregaron los siguientes participantes";
+"The following attendees(s) were removed" = "Se removieron los siguientes participantes";
 
 /* IMIP messages */
-"calendar_label" = "Calendario:";
-"startDate_label" = "Inicio:";
-"endDate_label" = "Fin:";
+"calendar_label" = "Calendario";
+"startDate_label" = "Inicio";
+"endDate_label" = "Fin";
 "due_label" = "Fecha de finalización:";
-"location_label" = "Lugar:";
+"location_label" = "Lugar";
 "summary_label" = "Resumen:";
 "comment_label" = "Comentario:";
 
diff --git a/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings b/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings
index 5add824eb..c323e1cd6 100644
--- a/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings
+++ b/SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings
@@ -12,16 +12,16 @@ vtodo_class2 = "(Tarea confidencial)";
 "The event \"%{Summary}\" was created" = "El evento \"%{Summary}\" ha sido creado";
 "The event \"%{Summary}\" was deleted" = "El evento \"%{Summary}\" ha sido borrado";
 "The event \"%{Summary}\" was updated" = "El evento \"%{Summary}\" ha sido actualizado";
-"The following attendees(s) were notified:" = "Los invitados siguientes han sido notificado:";
-"The following attendees(s) were added:" = "Los invitados siguientes han sido añadido:";
-"The following attendees(s) were removed:" = "Los invitados siguientes han sido quitado:";
+"The following attendees(s) were notified" = "Los invitados siguientes han sido notificado";
+"The following attendees(s) were added" = "Los invitados siguientes han sido añadido";
+"The following attendees(s) were removed" = "Los invitados siguientes han sido quitado";
 
 /* IMIP messages */
-"calendar_label" = "Calendario:";
-"startDate_label" = "Inicio:";
-"endDate_label" = "Fin:";
+"calendar_label" = "Calendario";
+"startDate_label" = "Inicio";
+"endDate_label" = "Fin";
 "due_label" = "Fecha Fin:";
-"location_label" = "Localización:";
+"location_label" = "Localización";
 "summary_label" = "Resumen:";
 "comment_label" = "Comentario:";
 
diff --git a/SoObjects/Appointments/Swedish.lproj/Localizable.strings b/SoObjects/Appointments/Swedish.lproj/Localizable.strings
index de76dca55..2abee8bbc 100644
--- a/SoObjects/Appointments/Swedish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Swedish.lproj/Localizable.strings
@@ -25,10 +25,10 @@ vtodo_class2 = "(Konfidentiell uppgift)";
 "... from the following event:" = "... från följande händelse:";
 
 /* IMIP messages */
-"startDate_label" = "Startdatum:";
-"endDate_label" = "Slutdatum:";
+"startDate_label" = "Startdatum";
+"endDate_label" = "Slutdatum";
 "due_label" = "Datum:";
-"location_label" = "Plats:";
+"location_label" = "Plats";
 "summary_label" = "Sammanfattning:";
 "comment_label" = "Kommentar:";
 
diff --git a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
index f56b5a28e..e9d1d3583 100644
--- a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
@@ -25,10 +25,10 @@ vtodo_class2 = "(Конфіденційне завдання)";
 "... from the following event:" = "... з участі в події:";
 
 /* IMIP messages */
-"startDate_label" = "Початок:";
-"endDate_label" = "Кінець:";
+"startDate_label" = "Початок";
+"endDate_label" = "Кінець";
 "due_label" = "Триватиме до:";
-"location_label" = "Місце:";
+"location_label" = "Місце";
 "summary_label" = "Резюме:";
 "comment_label" = "Коментар:";
 
diff --git a/SoObjects/Appointments/Welsh.lproj/Localizable.strings b/SoObjects/Appointments/Welsh.lproj/Localizable.strings
index 924e04f9a..a1974de7d 100644
--- a/SoObjects/Appointments/Welsh.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Welsh.lproj/Localizable.strings
@@ -25,10 +25,10 @@ vtodo_class2 = "(Tasg gyfrinachol)";
 "... from the following event:" = "... from the following event:";
 
 /* IMIP messages */
-"startDate_label" = "Start:";
-"endDate_label" = "End:";
+"startDate_label" = "Start";
+"endDate_label" = "End";
 "due_label" = "Due Date:";
-"location_label" = "Location:";
+"location_label" = "Location";
 "summary_label" = "Summary:";
 "comment_label" = "Comment:";
 
diff --git a/UI/Contacts/Arabic.lproj/Localizable.strings b/UI/Contacts/Arabic.lproj/Localizable.strings
index 004bd95ca..8c0c3229d 100644
--- a/UI/Contacts/Arabic.lproj/Localizable.strings
+++ b/UI/Contacts/Arabic.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "لا يوجد إشتراك";
 
 "Preferred" = "المفضل";
-"Display:" = "عرض:";
-"Display Name:" = "الاسم المعروض:";
+"Display" = "عرض";
+"Display Name" = "الاسم المعروض";
 "Email:" = "البريد الالكتروني:";
 "Additional Email:" = "بريد إلكتروني إضافي";
 
-"Phone Number:" = "رقم الهاتف:";
+"Phone Number" = "رقم الهاتف";
 "Prefers to receive messages formatted as:" = "يفضل تلقي رسائل منسقة على النحو التالي:";
 "Screen Name:" = "أسم التعريف:";
 "Categories:" = "الفئات:";
 
 "First:" = "الاول:";
 "Last:" = "الاخير:";
-"Nickname:" = "الاسم الرمزي:";
+"Nickname" = "الاسم الرمزي";
 
 "Telephone" = "رقم الهاتف:";
 "Work:" = "العمل:";
@@ -103,25 +103,25 @@
 "New category" = "فئة جديدة";
 
 /* adresses */
-"Title:" = "اللقب:";
+"Title" = "اللقب";
 "Service:" = "الخدمة:";
 "Company:" = "الشركة:";
 "Department:" = "الادارة:";
 "Organization:" = "الجهة";
 "Address:" = "العنوان:";
-"City:" = "المدينة:";
+"City" = "المدينة";
 "State_Province:" = "الولاية / الاقليم / المحافظة:";
 "ZIP_Postal Code:" = "الرمز البريدي:";
-"Country:" = "الدولة:";
+"Country" = "الدولة";
 "Web Page:" = "صفحة الانترنت:";
 
 "Work" = "العمل";
 "Other Infos" = "معلومات أخرى";
 
-"Note:" = "ملاحظة:";
+"Note" = "ملاحظة";
 "Timezone:" = "المنطقة الزمنية:";
-"Birthday:" = "تاريخ الميلاد:";
-"Birthday (yyyy-mm-dd):" = "تاريخ الميلاد (يوم-شهر-سنة):";
+"Birthday" = "تاريخ الميلاد";
+"Birthday (yyyy-mm-dd)" = "تاريخ الميلاد (يوم-شهر-سنة)";
 "Freebusy URL:" = "موقع مشغول /حر:";
 
 "Add as..." = "إضافة إلى ...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "تفاصيل القائمة";
-"List name:" = "اسم القائمة/";
-"List nickname:" = "اسم القائمة الرمزي:";
-"List description:" = "وصف القائمة:";
+"List name" = "اسم القائمة/";
+"List nickname" = "اسم القائمة الرمزي";
+"List description" = "وصف القائمة";
 "Members" = "أعضاء";
 "Contacts" = "جهات إتصال";
 "Add" = "إضافة";
diff --git a/UI/Contacts/Basque.lproj/Localizable.strings b/UI/Contacts/Basque.lproj/Localizable.strings
index 9a9b7fd18..b89196d2c 100644
--- a/UI/Contacts/Basque.lproj/Localizable.strings
+++ b/UI/Contacts/Basque.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Ez dago harpidetzarako aukerarik";
 
 "Preferred" = "Hobetsitakoa";
-"Display:" = "Bistaratzea:";
-"Display Name:" = "Erakusteko izena:";
+"Display" = "Bistaratzea";
+"Display Name" = "Erakusteko izena";
 "Email:" = "Emaila:";
 "Additional Email:" = "Beste emaila:";
 
-"Phone Number:" = "Telefono zenbakia";
+"Phone Number" = "Telefono zenbakia";
 "Prefers to receive messages formatted as:" = "Nahiago du mezuak honako formatuan jasotzea:";
 "Screen Name:" = "Pantailaren izena";
 "Categories:" = "Kategoriak:";
 
 "First:" = "Lehenengoa:";
 "Last:" = "Azkena:";
-"Nickname:" = "Goitizena:";
+"Nickname" = "Goitizena";
 
 "Telephone" = "Telefonoa:";
 "Work:" = "Lana:";
@@ -103,25 +103,25 @@
 "New category" = "Kategoria berria";
 
 /* adresses */
-"Title:" = "Izenburua";
+"Title" = "Izenburua";
 "Service:" = "Zerbitzua:";
 "Company:" = "Enpresa";
 "Department:" = "Saila";
 "Organization:" = "Saila:";
 "Address:" = "Helbidea";
-"City:" = "Herria";
+"City" = "Herria";
 "State_Province:" = "Estatua / Probintzia";
 "ZIP_Postal Code:" = "Posta kodea";
-"Country:" = "Herrialdea";
+"Country" = "Herrialdea";
 "Web Page:" = "Web orria";
 
 "Work" = "Lana";
 "Other Infos" = "Bestelako informazioak";
 
-"Note:" = "Ohar:";
+"Note" = "Ohar";
 "Timezone:" = "Ordu-zona:";
-"Birthday:" = "Jaiotze data:";
-"Birthday (yyyy-mm-dd):" = "Jaiotze data (uuuu-hh-ee):";
+"Birthday" = "Jaiotze data";
+"Birthday (yyyy-mm-dd)" = "Jaiotze data (uuuu-hh-ee)";
 "Freebusy URL:" = "LibreLanpetu URL-a:";
 
 "Add as..." = "Gehitu honela...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Zerrendaren xehetasunak";
-"List name:" = "Zerrendaren izena:";
-"List nickname:" = "Zerrendaren goitizena:";
-"List description:" = "Zerrendaren deskribapena:";
+"List name" = "Zerrendaren izena";
+"List nickname" = "Zerrendaren goitizena";
+"List description" = "Zerrendaren deskribapena";
 "Members" = "Kideak";
 "Contacts" = "Kontaktuak";
 "Add" = "Gehitu";
diff --git a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings
index 4a09eae65..530e3ba27 100644
--- a/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/Contacts/BrazilianPortuguese.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Sem possibilidades de inscrição";
 
 "Preferred" = "Preferido";
-"Display:" = "Exibição:";
-"Display Name:" = "Exibir Nome:";
+"Display" = "Exibição";
+"Display Name" = "Exibir Nome";
 "Email:" = "Endereço de Email:";
 "Additional Email:" = "Email Adicional:";
 
-"Phone Number:" = "Telefone:";
+"Phone Number" = "Telefone";
 "Prefers to receive messages formatted as:" = "Prefere receber mensagens formatadas como:";
 "Screen Name:" = "Nome de Exibição:";
 "Categories:" = "Categorias:";
 
 "First:" = "Primeiro Nome:";
 "Last:" = "Último Nome:";
-"Nickname:" = "Apelido:";
+"Nickname" = "Apelido";
 
 "Telephone" = "Telefone";
 "Work:" = "Comercial:";
@@ -103,25 +103,25 @@
 "New category" = "Nova categoria";
 
 /* adresses */
-"Title:" = "Título:";
+"Title" = "Título";
 "Service:" = "Serviço:";
 "Company:" = "Empresa:";
 "Department:" = "Departamento";
 "Organization:" = "Organização";
 "Address:" = "Endereço:";
-"City:" = "Cidade:";
+"City" = "Cidade";
 "State_Province:" = "Estado:";
 "ZIP_Postal Code:" = "CEP:";
-"Country:" = "País:";
+"Country" = "País";
 "Web Page:" = "Página Web:";
 
 "Work" = "Comercial";
 "Other Infos" = "Outras Informações";
 
-"Note:" = "Notas:";
+"Note" = "Notas";
 "Timezone:" = "Fuso Horário:";
-"Birthday:" = "Aniversário:";
-"Birthday (yyyy-mm-dd):" = "Aniversário (yyyy-mm-dd):";
+"Birthday" = "Aniversário";
+"Birthday (yyyy-mm-dd)" = "Aniversário (yyyy-mm-dd)";
 "Freebusy URL:" = "URL Livre/Ocupado:";
 
 "Add as..." = "Adicionar como...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Detalhes da lista";
-"List name:" = "Lista nome:";
-"List nickname:" = "Lista Apelido:";
-"List description:" = "Lista descrição:";
+"List name" = "Lista nome";
+"List nickname" = "Lista Apelido";
+"List description" = "Lista descrição";
 "Members" = "Membros";
 "Contacts" = "Contatos";
 "Add" = "Adicionar";
diff --git a/UI/Contacts/Catalan.lproj/Localizable.strings b/UI/Contacts/Catalan.lproj/Localizable.strings
index 0371cfe93..9d776abc9 100644
--- a/UI/Contacts/Catalan.lproj/Localizable.strings
+++ b/UI/Contacts/Catalan.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "La subscripció no és possible";
 
 "Preferred" = "Preferit";
-"Display:" = "Nom mostrat:";
-"Display Name:" = "Nom:";
+"Display" = "Nom mostrat";
+"Display Name" = "Nom";
 "Email:" = "Correu electrònic:";
 "Additional Email:" = "Un altre correu electrònic:";
 
-"Phone Number:" = "Número de telèfon:";
+"Phone Number" = "Número de telèfon";
 "Prefers to receive messages formatted as:" = "Prefereix rebre missatges amb format:";
 "Screen Name:" = "Nom d'usuari:";
 "Categories:" = "Categories:";
 
 "First:" = "Nom:";
 "Last:" = "Cognoms:";
-"Nickname:" = "Àlies:";
+"Nickname" = "Àlies";
 
 "Telephone" = "Telèfon";
 "Work:" = "Feina:";
@@ -103,25 +103,25 @@
 "New category" = "New category";
 
 /* adresses */
-"Title:" = "Títol:";
+"Title" = "Títol";
 "Service:" = "Servei:";
 "Company:" = "Companyia:";
 "Department:" = "Departament:";
 "Organization:" = "Organització:";
 "Address:" = "Domicili:";
-"City:" = "Ciutat:";
+"City" = "Ciutat";
 "State_Province:" = "Estat/província/comarca:";
 "ZIP_Postal Code:" = "Codi postal:";
-"Country:" = "País:";
+"Country" = "País";
 "Web Page:" = "Web:";
 
 "Work" = "Treball";
 "Other Infos" = "Altres dades";
 
-"Note:" = "Nota:";
+"Note" = "Nota";
 "Timezone:" = "Zona hor.:";
-"Birthday:" = "Data de naixement:";
-"Birthday (yyyy-mm-dd):" = "Data naixement (yyyy-mm-dd):";
+"Birthday" = "Data de naixement";
+"Birthday (yyyy-mm-dd)" = "Data naixement (yyyy-mm-dd)";
 "Freebusy URL:" = "URL disponibilitat:";
 
 "Add as..." = "Afegir com a...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Detalls de la llista";
-"List name:" = "Nom de la llista:";
-"List nickname:" = "Àlies de la llista:";
-"List description:" = "Descripcció de la llista:";
+"List name" = "Nom de la llista";
+"List nickname" = "Àlies de la llista";
+"List description" = "Descripcció de la llista";
 "Members" = "Membres";
 "Contacts" = "Contactes";
 "Add" = "Afegir";
diff --git a/UI/Contacts/ChineseTaiwan.lproj/Localizable.strings b/UI/Contacts/ChineseTaiwan.lproj/Localizable.strings
index 52f36ae88..0d55095e9 100644
--- a/UI/Contacts/ChineseTaiwan.lproj/Localizable.strings
+++ b/UI/Contacts/ChineseTaiwan.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "不可訂閱";
 
 "Preferred" = "首選";
-"Display:" = "顯示:";
-"Display Name:" = "顯示名稱:";
+"Display" = "顯示";
+"Display Name" = "顯示名稱";
 "Email:" = "郵件:";
 "Additional Email:" = "添加的郵件:";
 
-"Phone Number:" = "電話號碼:";
+"Phone Number" = "電話號碼";
 "Prefers to receive messages formatted as:" = "喜愛的接收訊息格式為:";
 "Screen Name:" = "顯示名稱:";
 "Categories:" = "類别:";
 
 "First:" = "名:";
 "Last:" = "姓:";
-"Nickname:" = "暱稱:";
+"Nickname" = "暱稱";
 
 "Telephone" = "電話";
 "Work:" = "辦公:";
@@ -103,25 +103,25 @@
 "New category" = "新類別";
 
 /* adresses */
-"Title:" = "頭銜:";
+"Title" = "頭銜";
 "Service:" = "服務:";
 "Company:" = "公司:";
 "Department:" = "部門:";
 "Organization:" = "组織:";
 "Address:" = "地址:";
-"City:" = "城市:";
+"City" = "城市";
 "State_Province:" = "州/省:";
 "ZIP_Postal Code:" = "ZIP/郵遞區號:";
-"Country:" = "國家:";
+"Country" = "國家";
 "Web Page:" = "網页:";
 
 "Work" = "辦公";
 "Other Infos" = "其他資訊";
 
-"Note:" = "備註:";
+"Note" = "備註";
 "Timezone:" = "時區:";
-"Birthday:" = "生日:";
-"Birthday (yyyy-mm-dd):" = "生日 (yyyy-mm-dd):";
+"Birthday" = "生日";
+"Birthday (yyyy-mm-dd)" = "生日 (yyyy-mm-dd)";
 "Freebusy URL:" = "Freebusy URL:";
 
 "Add as..." = "新增為...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "列出明细";
-"List name:" = "列出名字:";
-"List nickname:" = "列出暱稱:";
-"List description:" = "列出說明:";
+"List name" = "列出名字";
+"List nickname" = "列出暱稱";
+"List description" = "列出說明";
 "Members" = "成員";
 "Contacts" = "連絡人";
 "Add" = "新增";
diff --git a/UI/Contacts/Czech.lproj/Localizable.strings b/UI/Contacts/Czech.lproj/Localizable.strings
index d420fbf84..ebd06b732 100644
--- a/UI/Contacts/Czech.lproj/Localizable.strings
+++ b/UI/Contacts/Czech.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Žádné možné odebírání";
 
 "Preferred" = "Upřednostňovaný";
-"Display:" = "Zobrazované jméno:";
-"Display Name:" = "Zobrazované jméno:";
+"Display" = "Zobrazované jméno";
+"Display Name" = "Zobrazované jméno";
 "Email:" = "E-mail:";
 "Additional Email:" = "Další e-mail:";
 
-"Phone Number:" = "Telefonní číslo:";
+"Phone Number" = "Telefonní číslo";
 "Prefers to receive messages formatted as:" = "Upřednostňovaný formát zpráv:";
 "Screen Name:" = "Zobrazované jméno:";
 "Categories:" = "Kategorie:";
 
 "First:" = "Křestní jméno:";
 "Last:" = "Příjmení:";
-"Nickname:" = "Přezdívka:";
+"Nickname" = "Přezdívka";
 
 "Telephone" = "Telefon";
 "Work:" = "Zaměstnání:";
@@ -103,25 +103,25 @@
 "New category" = "Nová kategorie";
 
 /* adresses */
-"Title:" = "Pozice:";
+"Title" = "Pozice";
 "Service:" = "Služba:";
 "Company:" = "Společnost:";
 "Department:" = "Oddělení:";
 "Organization:" = "Organizace:";
 "Address:" = "Adresa:";
-"City:" = "Město:";
+"City" = "Město";
 "State_Province:" = "Stát/Provincie:";
 "ZIP_Postal Code:" = "PSČ:";
-"Country:" = "Země:";
+"Country" = "Země";
 "Web Page:" = "Web:";
 
 "Work" = "Zaměstnání";
 "Other Infos" = "Ostatní informace";
 
-"Note:" = "Poznámka:";
+"Note" = "Poznámka";
 "Timezone:" = "Časové pásmo:";
-"Birthday:" = "Datum narození";
-"Birthday (yyyy-mm-dd):" = "Datum narození (yyyy-mm-dd):";
+"Birthday" = "Datum narození";
+"Birthday (yyyy-mm-dd)" = "Datum narození (yyyy-mm-dd)";
 "Freebusy URL:" = "Freebusy URL:";
 
 "Add as..." = "Přidat jako...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Skupina";
-"List name:" = "Název:";
-"List nickname:" = "Zkratka:";
-"List description:" = "Popis:";
+"List name" = "Název";
+"List nickname" = "Zkratka";
+"List description" = "Popis";
 "Members" = "Členové skupiny";
 "Contacts" = "Kontakty";
 "Add" = "Přidat";
diff --git a/UI/Contacts/Danish.lproj/Localizable.strings b/UI/Contacts/Danish.lproj/Localizable.strings
index 2f8cd2602..4ee4f90f8 100644
--- a/UI/Contacts/Danish.lproj/Localizable.strings
+++ b/UI/Contacts/Danish.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Intet muligt abonnement";
 
 "Preferred" = "Foretrukket";
-"Display:" = "Vis:";
-"Display Name:" = "Vist navn:";
+"Display" = "Vis";
+"Display Name" = "Vist navn";
 "Email:" = "E-mail:";
 "Additional Email:" = "ekstra e-mails:";
 
-"Phone Number:" = "Telefonnummer:";
+"Phone Number" = "Telefonnummer";
 "Prefers to receive messages formatted as:" = "Foretrækker at modtage beskeder formateret som:";
 "Screen Name:" = "Skærmnavn:";
 "Categories:" = "Kategorier:";
 
 "First:" = "Først:";
 "Last:" = "Sidst:";
-"Nickname:" = "Kaldenavn:";
+"Nickname" = "Kaldenavn";
 
 "Telephone" = "Telefon";
 "Work:" = "Arbejde:";
@@ -103,25 +103,25 @@
 "New category" = "Ny kategori";
 
 /* adresses */
-"Title:" = "Titel:";
+"Title" = "Titel";
 "Service:" = "Service:";
 "Company:" = "Firma:";
 "Department:" = "Afdeling:";
 "Organization:" = "Organisation:";
 "Address:" = "Adresse:";
-"City:" = "By:";
+"City" = "By";
 "State_Province:" = "Stat / provins:";
 "ZIP_Postal Code:" = "ZIP/Postnr.:";
-"Country:" = "Land:";
+"Country" = "Land";
 "Web Page:" = "Hjemmeside:";
 
 "Work" = "Arbejde";
 "Other Infos" = "Andet info";
 
-"Note:" = "Bemærk:";
+"Note" = "Bemærk";
 "Timezone:" = "Tidszone:";
-"Birthday:" = "Fødselsdag:";
-"Birthday (yyyy-mm-dd):" = "Fødselsdag (dd-mm-åååå):";
+"Birthday" = "Fødselsdag";
+"Birthday (yyyy-mm-dd)" = "Fødselsdag (dd-mm-åååå)";
 "Freebusy URL:" = "Ledig/optaget URL:";
 
 "Add as..." = "Tilføj som ...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Liste detaljer";
-"List name:" = "Liste navn:";
-"List nickname:" = "Liste kaldenavn:";
-"List description:" = "Liste beskrivelse:";
+"List name" = "Liste navn";
+"List nickname" = "Liste kaldenavn";
+"List description" = "Liste beskrivelse";
 "Members" = "Medlemmer";
 "Contacts" = "Kontaktpersoner";
 "Add" = "Tilføj";
diff --git a/UI/Contacts/Dutch.lproj/Localizable.strings b/UI/Contacts/Dutch.lproj/Localizable.strings
index 442c11b08..79476728c 100644
--- a/UI/Contacts/Dutch.lproj/Localizable.strings
+++ b/UI/Contacts/Dutch.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Abonnement niet mogelijk";
 
 "Preferred" = "Voorkeurs-";
-"Display:" = "Weergave:";
-"Display Name:" = "Weergavenaam:";
+"Display" = "Weergave";
+"Display Name" = "Weergavenaam";
 "Email:" = "E-mail:";
 "Additional Email:" = "Alternatieve e-mail:";
 
-"Phone Number:" = "Telefoon:";
+"Phone Number" = "Telefoon";
 "Prefers to receive messages formatted as:" = "Geeft voorkeur aan berichten geformatteerd als:";
 "Screen Name:" = "Weergavenaam:";
 "Categories:" = "Categorieën:";
 
 "First:" = "Voornaam:";
 "Last:" = "Achternaam:";
-"Nickname:" = "Nickname:";
+"Nickname" = "Nickname";
 
 "Telephone" = "Telefoon:";
 "Work:" = "Werk:";
@@ -103,25 +103,25 @@
 "New category" = "Niewe categorie";
 
 /* adresses */
-"Title:" = "Titel:";
+"Title" = "Titel";
 "Service:" = "Service:";
 "Company:" = "Bedrijf:";
 "Department:" = "Afdeling:";
 "Organization:" = "Organisatie:";
 "Address:" = "Adres:";
-"City:" = "Plaats:";
+"City" = "Plaats";
 "State_Province:" = "Provincie:";
 "ZIP_Postal Code:" = "Postcode:";
-"Country:" = "Land:";
+"Country" = "Land";
 "Web Page:" = "Website:";
 
 "Work" = "Werk";
 "Other Infos" = "Overige";
 
-"Note:" = "Notitie:";
+"Note" = "Notitie";
 "Timezone:" = "Tijdzone:";
-"Birthday:" = "Geboortedatum:";
-"Birthday (yyyy-mm-dd):" = "Geboortedatum (yyyy-mm-dd):";
+"Birthday" = "Geboortedatum";
+"Birthday (yyyy-mm-dd)" = "Geboortedatum (yyyy-mm-dd)";
 "Freebusy URL:" = "Beschikbaarheids-URL (Free/Busy):";
 
 "Add as..." = "Toevoegen als ...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Toon details";
-"List name:" = "Lijst-naam:";
-"List nickname:" = "Lijst-bijnaam:";
-"List description:" = "Beschrijving:";
+"List name" = "Lijst-naam";
+"List nickname" = "Lijst-bijnaam";
+"List description" = "Beschrijving";
 "Members" = "Leden";
 "Contacts" = "Contactpersonen";
 "Add" = "Toevoegen";
diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index 39da819e1..e1a671c7e 100644
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "No possible subscription";
 
 "Preferred" = "Preferred";
-"Display:" = "Display:";
-"Display Name:" = "Display Name:";
+"Display" = "Display";
+"Display Name" = "Display Name";
 "Email:" = "Email:";
 "Additional Email:" = "Additional Email:";
 
-"Phone Number:" = "Phone Number:";
+"Phone Number" = "Phone Number";
 "Prefers to receive messages formatted as:" = "Prefers to receive messages formatted as:";
 "Screen Name:" = "Screen Name:";
 "Categories:" = "Categories:";
 
 "First:" = "First:";
 "Last:" = "Last:";
-"Nickname:" = "Nickname:";
+"Nickname" = "Nickname";
 
 "Telephone" = "Telephone";
 "Work:" = "Work:";
@@ -103,25 +103,25 @@
 "New category" = "New category";
 
 /* adresses */
-"Title:" = "Title:";
+"Title" = "Title";
 "Service:" = "Service:";
 "Company:" = "Company:";
 "Department:" = "Department:";
 "Organization:" = "Organization:";
 "Address:" = "Address:";
-"City:" = "City: ";
+"City" = "City ";
 "State_Province:" = "State/Province:";
 "ZIP_Postal Code:" = "ZIP/Postal Code:";
-"Country:" = "Country:";
+"Country" = "Country";
 "Web Page:" = "Web Page:";
 
 "Work" = "Work";
 "Other Infos" = "Other Infos";
 
-"Note:" = "Note:";
+"Note" = "Note";
 "Timezone:" = "Timezone:";
-"Birthday:" = "Birthday:";
-"Birthday (yyyy-mm-dd):" = "Birthday (yyyy-mm-dd):";
+"Birthday" = "Birthday";
+"Birthday (yyyy-mm-dd)" = "Birthday (yyyy-mm-dd)";
 "Freebusy URL:" = "Freebusy URL:";
 
 "Add as..." = "Add as...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "List details";
-"List name:" = "List name:";
-"List nickname:" = "List nickname:";
-"List description:" = "List description:";
+"List name" = "List name";
+"List nickname" = "List nickname";
+"List description" = "List description";
 "Members" = "Members";
 "Contacts" = "Contacts";
 "Add" = "Add";
diff --git a/UI/Contacts/Finnish.lproj/Localizable.strings b/UI/Contacts/Finnish.lproj/Localizable.strings
index 2d4d7a310..c0e1bb4b3 100644
--- a/UI/Contacts/Finnish.lproj/Localizable.strings
+++ b/UI/Contacts/Finnish.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Tilaus ei mahdollinen";
 
 "Preferred" = "Ensisijainen";
-"Display:" = "Näyttö:";
-"Display Name:" = "Näyttönimi:";
+"Display" = "Näyttö";
+"Display Name" = "Näyttönimi";
 "Email:" = "Email:";
 "Additional Email:" = "Lisäsähköpostiosoite:";
 
-"Phone Number:" = "Puhelinnumero:";
+"Phone Number" = "Puhelinnumero";
 "Prefers to receive messages formatted as:" = "Vastaanottaa viestejä muotoiltuna ensisijaisesti:";
 "Screen Name:" = "Näytettävä nimi:";
 "Categories:" = "Kategoriat:";
 
 "First:" = "Etunimi:";
 "Last:" = "Sukunimi:";
-"Nickname:" = "Lempinimi:";
+"Nickname" = "Lempinimi";
 
 "Telephone" = "Puhelin";
 "Work:" = "Työ:";
@@ -103,25 +103,25 @@
 "New category" = "Uusi kategoria";
 
 /* adresses */
-"Title:" = "Titteli:";
+"Title" = "Titteli";
 "Service:" = "Palvelu:";
 "Company:" = "Yritys:";
 "Department:" = "Osasto:";
 "Organization:" = "Organisaatio:";
 "Address:" = "Osoite:";
-"City:" = "Kaupunki: ";
+"City" = "Kaupunki ";
 "State_Province:" = "Maakunta:";
 "ZIP_Postal Code:" = "Postinumero:";
-"Country:" = "Maa:";
+"Country" = "Maa";
 "Web Page:" = "Web sivu:";
 
 "Work" = "Työ";
 "Other Infos" = "Muuta tietoa";
 
-"Note:" = "Huomautus:";
+"Note" = "Huomautus";
 "Timezone:" = "Aikavyöhyke:";
-"Birthday:" = "Syntymäpäivä:";
-"Birthday (yyyy-mm-dd):" = "Syntymäpäivä (vvvv-kk-pp):";
+"Birthday" = "Syntymäpäivä";
+"Birthday (yyyy-mm-dd)" = "Syntymäpäivä (vvvv-kk-pp)";
 "Freebusy URL:" = "Freebusy URL:";
 
 "Add as..." = "Lisää nimellä...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Luettelon tiedot";
-"List name:" = "Luettelon nimi:";
-"List nickname:" = "Luettelon lempinimi:";
-"List description:" = "Luettelon kuvaus:";
+"List name" = "Luettelon nimi";
+"List nickname" = "Luettelon lempinimi";
+"List description" = "Luettelon kuvaus";
 "Members" = "Jäsenet";
 "Contacts" = "Yhteystiedot";
 "Add" = "Lisää";
diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings
index f321d9b56..0825bb81f 100644
--- a/UI/Contacts/French.lproj/Localizable.strings
+++ b/UI/Contacts/French.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Aucune inscription possible";
 
 "Preferred" = "Préféré";
-"Display:" = "Nom à afficher :";
-"Display Name:" = "Nom à afficher :";
+"Display" = "Nom à afficher ";
+"Display Name" = "Nom à afficher ";
 "Email:" = "Adresse électronique :";
 "Additional Email:" = "Adresse alternative :";
 
-"Phone Number:" = "Numéro de téléphone :";
+"Phone Number" = "Numéro de téléphone ";
 "Prefers to receive messages formatted as:" = "Préfère recevoir les messages au format :";
 "Screen Name:" = "Pseudo :";
 "Categories:" = "Catégories :";
 
 "First:" = "Prénom :";
 "Last:" = "Nom :";
-"Nickname:" = "Surnom :";
+"Nickname" = "Surnom ";
 
 "Telephone" = "Téléphone";
 "Work:" = "Travail :";
@@ -103,25 +103,25 @@
 "New category" = "Nouvelle catégorie";
 
 /* adresses */
-"Title:" = "Fonction :";
+"Title" = "Fonction ";
 "Service:" = "Service:";
 "Company:" = "Company:";
 "Department:" = "Service :";
 "Organization:" = "Société :";
 "Address:" = "Adresse :";
-"City:" = "Ville/Localité :";
+"City" = "Ville/Localité ";
 "State_Province:" = "État/Prov. :";
 "ZIP_Postal Code:" = "Code postal :";
-"Country:" = "Pays :";
+"Country" = "Pays ";
 "Web Page:" = "Page Web:";
 
 "Work" = "Professionnelle";
 "Other Infos" = "Informations complémentaires";
 
-"Note:" = "Remarques :";
+"Note" = "Remarques ";
 "Timezone:" = "Fuseau horaire :";
-"Birthday:" = "D. naissance:";
-"Birthday (yyyy-mm-dd):" = "D. naissance (aaaa-mm-jj):";
+"Birthday" = "D. naissance";
+"Birthday (yyyy-mm-dd)" = "D. naissance (aaaa-mm-jj)";
 "Freebusy URL:" = "Adresse du FreeBusy :";
 
 "Add as..." = "Ajouter...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Détails";
-"List name:" = "Liste:";
-"List nickname:" = "Surnom:";
-"List description:" = "Description:";
+"List name" = "Liste";
+"List nickname" = "Surnom";
+"List description" = "Description";
 "Members" = "Membres";
 "Contacts" = "Contacts";
 "Add" = "Ajouter";
diff --git a/UI/Contacts/German.lproj/Localizable.strings b/UI/Contacts/German.lproj/Localizable.strings
index 4e18cb96a..c71fdd017 100644
--- a/UI/Contacts/German.lproj/Localizable.strings
+++ b/UI/Contacts/German.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Kein Abonnieren möglich";
 
 "Preferred" = "Bevorzugt";
-"Display:" = "Anzeige:";
-"Display Name:" = "Anzeigename:";
+"Display" = "Anzeige";
+"Display Name" = "Anzeigename";
 "Email:" = "E-Mail:";
 "Additional Email:" = "Zusätzliche E-Mail:";
 
-"Phone Number:" = "Telefon:";
+"Phone Number" = "Telefon";
 "Prefers to receive messages formatted as:" = "Bevorzugt folgendes Nachrichten-Format:";
 "Screen Name:" = "Messenger-Name:";
 "Categories:" = "Kategorien:";
 
 "First:" = "Vorname:";
 "Last:" = "Nachname:";
-"Nickname:" = "Spitzname:";
+"Nickname" = "Spitzname";
 
 "Telephone" = "Telefon";
 "Work:" = "Dienstlich:";
@@ -103,25 +103,25 @@
 "New category" = "Neue Kategorie";
 
 /* adresses */
-"Title:" = "Titel:";
+"Title" = "Titel";
 "Service:" = "Dienst:";
 "Company:" = "Firma:";
 "Department:" = "Abteilung:";
 "Organization:" = "Organisation:";
 "Address:" = "Adresse:";
-"City:" = "Stadt:";
+"City" = "Stadt";
 "State_Province:" = "Bundesland:";
 "ZIP_Postal Code:" = "PLZ:";
-"Country:" = "Land:";
+"Country" = "Land";
 "Web Page:" = "Webseite:";
 
 "Work" = "Dienstlich";
 "Other Infos" = "Andere Informationen";
 
-"Note:" = "Notizen:";
+"Note" = "Notizen";
 "Timezone:" = "Zeitzone:";
-"Birthday:" = "Geburtsdatum:";
-"Birthday (yyyy-mm-dd):" = "Geburtsdatum (JJJJ-MM-TT):";
+"Birthday" = "Geburtsdatum";
+"Birthday (yyyy-mm-dd)" = "Geburtsdatum (JJJJ-MM-TT)";
 "Freebusy URL:" = "Frei/Gebucht URL:";
 
 "Add as..." = "Hinzufügen als ...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Details";
-"List name:" = "Listenname:";
-"List nickname:" = "Listen-Spitzname:";
-"List description:" = "Beschreibung:";
+"List name" = "Listenname";
+"List nickname" = "Listen-Spitzname";
+"List description" = "Beschreibung";
 "Members" = "Mitglieder";
 "Contacts" = "Kontakte";
 "Add" = "Hinzufügen";
diff --git a/UI/Contacts/Hungarian.lproj/Localizable.strings b/UI/Contacts/Hungarian.lproj/Localizable.strings
index 89e73d499..59234e883 100644
--- a/UI/Contacts/Hungarian.lproj/Localizable.strings
+++ b/UI/Contacts/Hungarian.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Nincs mappa, melyre feliratkozhat";
 
 "Preferred" = "Preferált";
-"Display:" = "Megjelenítendő név:";
-"Display Name:" = "Megjelenítendő név:";
+"Display" = "Megjelenítendő név";
+"Display Name" = "Megjelenítendő név";
 "Email:" = "Email cím:";
 "Additional Email:" = "További email:";
 
-"Phone Number:" = "Telefon:";
+"Phone Number" = "Telefon";
 "Prefers to receive messages formatted as:" = "Előnyben részesített üzenet formátum:";
 "Screen Name:" = "Fedőnév:";
 "Categories:" = "Kategóriák:";
 
 "First:" = "Keresztnév:";
 "Last:" = "Vezetéknév:";
-"Nickname:" = "Becenév:";
+"Nickname" = "Becenév";
 
 "Telephone" = "Telefon";
 "Work:" = "Munkahely:";
@@ -103,25 +103,25 @@
 "New category" = "Új kategória";
 
 /* adresses */
-"Title:" = "Cím:";
+"Title" = "Cím";
 "Service:" = "Szolgáltatás:";
 "Company:" = "Vállalat:";
 "Department:" = "Részleg:";
 "Organization:" = "Szervezet:";
 "Address:" = "Cím:";
-"City:" = "Város:";
+"City" = "Város";
 "State_Province:" = "Állam/tartomány:";
 "ZIP_Postal Code:" = "Irányítószám:";
-"Country:" = "Ország:";
+"Country" = "Ország";
 "Web Page:" = "Web:";
 
 "Work" = "Munkahely";
 "Other Infos" = "Egyéb";
 
-"Note:" = "Megjegyzés:";
+"Note" = "Megjegyzés";
 "Timezone:" = "Időzóna:";
-"Birthday:" = "Születésnap:";
-"Birthday (yyyy-mm-dd):" = "Születésnap (éééé-hh-nn):";
+"Birthday" = "Születésnap";
+"Birthday (yyyy-mm-dd)" = "Születésnap (éééé-hh-nn)";
 "Freebusy URL:" = "Foglaltság URL:";
 
 "Add as..." = "Hozzáadás mint...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Lista részletek";
-"List name:" = "Lista név:";
-"List nickname:" = "Lista becenév:";
-"List description:" = "Lista leírás:";
+"List name" = "Lista név";
+"List nickname" = "Lista becenév";
+"List description" = "Lista leírás";
 "Members" = "Tagok";
 "Contacts" = "Kapcsolatok";
 "Add" = "Hozzáad";
diff --git a/UI/Contacts/Icelandic.lproj/Localizable.strings b/UI/Contacts/Icelandic.lproj/Localizable.strings
index 04f3d5de9..fc0acc56a 100644
--- a/UI/Contacts/Icelandic.lproj/Localizable.strings
+++ b/UI/Contacts/Icelandic.lproj/Localizable.strings
@@ -77,19 +77,19 @@
 
 "Preferred" = "Sjálfgefið";
 "Card for %@" = "Nafnspjald fyrir %@";
-"Display:" = "Birtingarnafn:";
-"Display Name:" = "Birt nafn:";
+"Display" = "Birtingarnafn";
+"Display Name" = "Birt nafn";
 "Email:" = "Tölvupóstfang:";
 "Additional Email:" = "Auka tölvupóstfang:";
 
-"Phone Number:" = "Símanúmer:";
+"Phone Number" = "Símanúmer";
 "Prefers to receive messages formatted as:" = "Kýs að taka á móti pósti með sniði:";
 "Screen Name:" = "Skjánafn:";
 "Categories:" = "Flokkar:";
 
 "First:" = "Fornafn:";
 "Last:" = "Eftirnafn:";
-"Nickname:" = "Gælunafn:";
+"Nickname" = "Gælunafn";
 
 "Telephone" = "Sími";
 "Work:" = "Vinnusími:";
@@ -104,25 +104,25 @@
 "New category" = "Nýr flokkur";
 
 /* adresses */
-"Title:" = "Titill:";
+"Title" = "Titill";
 "Service:" = "Þjónusta:";
 "Company:" = "Fyrirtæki:";
 "Department:" = "Deild:";
 "Organization:" = "Fyrirtæki/Stofnun:";
 "Address:" = "Heimilisfang:";
-"City:" = "Borg: ";
+"City" = "Borg ";
 "State_Province:" = "Hérað/Fylki:";
 "ZIP_Postal Code:" = "Póstnúmer:";
-"Country:" = "Land:";
+"Country" = "Land";
 "Web Page:" = "Vefsíða:";
 
 "Work" = "Vinna";
 "Other Infos" = "Aðrar upplýsingar";
 
-"Note:" = "Athugasemd:";
+"Note" = "Athugasemd";
 "Timezone:" = "Tímabelti:";
-"Birthday:" = "Afmælisdagur:";
-"Birthday (yyyy-mm-dd):" = "Afmælisdagur (yyyy-mm-dd):";
+"Birthday" = "Afmælisdagur";
+"Birthday (yyyy-mm-dd)" = "Afmælisdagur (yyyy-mm-dd)";
 "Freebusy URL:" = "LaustUpptekið URL";
 
 "Add as..." = "Bæta við sem...";
@@ -185,9 +185,9 @@
 
 /* Lists */
 "List details" = "Ítarleg lýsing á lista:";
-"List name:" = "Nafn lista:";
-"List nickname:" = "Gælunafn lista:";
-"List description:" = "Lýsing lista:";
+"List name" = "Nafn lista";
+"List nickname" = "Gælunafn lista";
+"List description" = "Lýsing lista";
 "Members" = "Meðlimir";
 "Contacts" = "Tengiliðir";
 "Add" = "Bæta við";
diff --git a/UI/Contacts/Italian.lproj/Localizable.strings b/UI/Contacts/Italian.lproj/Localizable.strings
index 2fa456f3f..4779d5714 100644
--- a/UI/Contacts/Italian.lproj/Localizable.strings
+++ b/UI/Contacts/Italian.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Nessuna sottoscrizione possibile";
 
 "Preferred" = "Predefinito";
-"Display:" = "Nome visualizzato:";
-"Display Name:" = "Nome visualizzato:";
+"Display" = "Nome visualizzato";
+"Display Name" = "Nome visualizzato";
 "Email:" = "Email:";
 "Additional Email:" = "Email aggiuntiva:";
 
-"Phone Number:" = "Numero di telefono:";
+"Phone Number" = "Numero di telefono";
 "Prefers to receive messages formatted as:" = "Formato preferito per i messaggi di posta:";
 "Screen Name:" = "Nome Instant Messenger:";
 "Categories:" = "Categorie:";
 
 "First:" = "Nome:";
 "Last:" = "Cognome";
-"Nickname:" = "Soprannome:";
+"Nickname" = "Soprannome";
 
 "Telephone" = "Telefono";
 "Work:" = "Lavoro:";
@@ -103,25 +103,25 @@
 "New category" = "Nuova categoria";
 
 /* adresses */
-"Title:" = "Titolo:";
+"Title" = "Titolo";
 "Service:" = "Service:";
 "Company:" = "Società:";
 "Department:" = "Reparto:";
 "Organization:" = "Società:";
 "Address:" = "Indirizzo:";
-"City:" = "Città:";
+"City" = "Città";
 "State_Province:" = "Provincia:";
 "ZIP_Postal Code:" = "CAP:";
-"Country:" = "Nazione:";
+"Country" = "Nazione";
 "Web Page:" = "Pagina Web:";
 
 "Work" = "Lavoro";
 "Other Infos" = "Altre informazioni";
 
-"Note:" = "Note:";
+"Note" = "Note";
 "Timezone:" = "Fuso orario:";
-"Birthday:" = "Data di Nascita:";
-"Birthday (yyyy-mm-dd):" = "Data di Nascita (yyyy-mm-dd):";
+"Birthday" = "Data di Nascita";
+"Birthday (yyyy-mm-dd)" = "Data di Nascita (yyyy-mm-dd)";
 "Freebusy URL:" = "Libero-occupato URL:";
 
 "Add as..." = "Aggiungi come...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Dettagli lista";
-"List name:" = "Nome lista:";
-"List nickname:" = "Soprannome lista:";
-"List description:" = "Descrizione lista:";
+"List name" = "Nome lista";
+"List nickname" = "Soprannome lista";
+"List description" = "Descrizione lista";
 "Members" = "Membri";
 "Contacts" = "Contatti";
 "Add" = "Aggiungi";
diff --git a/UI/Contacts/NorwegianBokmal.lproj/Localizable.strings b/UI/Contacts/NorwegianBokmal.lproj/Localizable.strings
index c8405b9aa..2d60860a2 100644
--- a/UI/Contacts/NorwegianBokmal.lproj/Localizable.strings
+++ b/UI/Contacts/NorwegianBokmal.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Abonnering er ikke mulig";
 
 "Preferred" = "Foretrukket";
-"Display:" = "Vise:";
-"Display Name:" = "Visningsnavn:";
+"Display" = "Vise";
+"Display Name" = "Visningsnavn";
 "Email:" = "E-post:";
 "Additional Email:" = "Ytterlige e-post:";
 
-"Phone Number:" = "Telefonnummer:";
+"Phone Number" = "Telefonnummer";
 "Prefers to receive messages formatted as:" = "Foretrekker å motta melding formatert som:";
 "Screen Name:" = "Skjermnavn:";
 "Categories:" = "Kategorier:";
 
 "First:" = "Fornavn:";
 "Last:" = "Etternavn:";
-"Nickname:" = "Kallenavn:";
+"Nickname" = "Kallenavn";
 
 "Telephone" = "Telefonnummer";
 "Work:" = "Arbeid:";
@@ -103,25 +103,25 @@
 "New category" = "Ny kategori";
 
 /* adresses */
-"Title:" = "Tittel:";
+"Title" = "Tittel";
 "Service:" = "Funksjon:";
 "Company:" = "Foretak:";
 "Department:" = "Avdeling:";
 "Organization:" = "Organisasjon:";
 "Address:" = "Adresse:";
-"City:" = "Poststed: ";
+"City" = "Poststed ";
 "State_Province:" = "Landsdel:";
 "ZIP_Postal Code:" = "Postnummer:";
-"Country:" = "Land:";
+"Country" = "Land";
 "Web Page:" = "Nettside:";
 
 "Work" = "Arbeid";
 "Other Infos" = "Øvrig informasjon";
 
-"Note:" = "Anmerkning:";
+"Note" = "Anmerkning";
 "Timezone:" = "Tidssone:";
-"Birthday:" = "Fødselsdag:";
-"Birthday (yyyy-mm-dd):" = "Fødselsdag (åååå-mm-dd):";
+"Birthday" = "Fødselsdag";
+"Birthday (yyyy-mm-dd)" = "Fødselsdag (åååå-mm-dd)";
 "Freebusy URL:" = "Ledigopptatt URL:";
 
 "Add as..." = "Legg til som...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Informasjon om mailinglisten";
-"List name:" = "Navn på mailingliste:";
-"List nickname:" = "Kallenavn til mailingliste:";
-"List description:" = "Beskrivelse av mailingliste:";
+"List name" = "Navn på mailingliste";
+"List nickname" = "Kallenavn til mailingliste";
+"List description" = "Beskrivelse av mailingliste";
 "Members" = "Medlemmer";
 "Contacts" = "Kontakter";
 "Add" = "Legg til";
diff --git a/UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings b/UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings
index 7d2c1e3ca..af27560af 100644
--- a/UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings
+++ b/UI/Contacts/NorwegianNynorsk.lproj/Localizable.strings
@@ -77,19 +77,19 @@
 
 "Preferred" = "Foretrukket";
 "Card for %@" = "Adressekort for %@";
-"Display:" = "Vise:";
-"Display Name:" = "Visningsnamn:";
+"Display" = "Vise";
+"Display Name" = "Visningsnamn";
 "Email:" = "E-post:";
 "Additional Email:" = "Ytterlige e-post:";
 
-"Phone Number:" = "Telefonnummer:";
+"Phone Number" = "Telefonnummer";
 "Prefers to receive messages formatted as:" = "Foretrekker å motta melding formatert som:";
 "Screen Name:" = "Skjermnavn:";
 "Categories:" = "Katagorier:";
 
 "First:" = "Fornavn:";
 "Last:" = "Etternavn:";
-"Nickname:" = "Kallenavn:";
+"Nickname" = "Kallenavn";
 
 "Telephone" = "Telefonnummer";
 "Work:" = "Arbeid:";
@@ -104,25 +104,25 @@
 "New category" = "Ny katagori";
 
 /* adresses */
-"Title:" = "Tittel:";
+"Title" = "Tittel";
 "Service:" = "Funksjon:";
 "Company:" = "Foretak:";
 "Department:" = "Avdelning:";
 "Organization:" = "Organisation:";
 "Address:" = "Adresse:";
-"City:" = "Poststed: ";
+"City" = "Poststed ";
 "State_Province:" = "Landsdel:";
 "ZIP_Postal Code:" = "Postnummer:";
-"Country:" = "Land:";
+"Country" = "Land";
 "Web Page:" = "Webside:";
 
 "Work" = "Arbeid";
 "Other Infos" = "Øvrig";
 
-"Note:" = "Anmerkning:";
+"Note" = "Anmerkning";
 "Timezone:" = "Tidssone:";
-"Birthday:" = "Fødselsdag:";
-"Birthday (yyyy-mm-dd):" = "Fødselsdag (yyyy-mm-dd):";
+"Birthday" = "Fødselsdag";
+"Birthday (yyyy-mm-dd)" = "Fødselsdag (yyyy-mm-dd)";
 "Freebusy URL:" = "Freebusy URL:";
 
 "Add as..." = "Legg til som...";
@@ -185,9 +185,9 @@
 
 /* Lists */
 "List details" = "Informasjon om mailinglisten";
-"List name:" = "Navn på mailingliste:";
-"List nickname:" = "Kallenavn til mailingliste:";
-"List description:" = "Beskrivelse:";
+"List name" = "Navn på mailingliste";
+"List nickname" = "Kallenavn til mailingliste";
+"List description" = "Beskrivelse";
 "Members" = "Medlemmer";
 "Contacts" = "Kontakter";
 "Add" = "Legg til";
diff --git a/UI/Contacts/Polish.lproj/Localizable.strings b/UI/Contacts/Polish.lproj/Localizable.strings
index 012134657..0849291cd 100644
--- a/UI/Contacts/Polish.lproj/Localizable.strings
+++ b/UI/Contacts/Polish.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Brak możliwej subskrypcji";
 
 "Preferred" = "Preferowane";
-"Display:" = "Wyświetl:";
-"Display Name:" = "Nazwa wyświetlana:";
+"Display" = "Wyświetl";
+"Display Name" = "Nazwa wyświetlana";
 "Email:" = "E-mail:";
 "Additional Email:" = "Dodatkowy E-mail:";
 
-"Phone Number:" = "Numer telefonu:";
+"Phone Number" = "Numer telefonu";
 "Prefers to receive messages formatted as:" = "Preferuje wiadomości w formacie:";
 "Screen Name:" = "Nazwa ekranowa:";
 "Categories:" = "Kategorie:";
 
 "First:" = "Imię:";
 "Last:" = "Nazwisko:";
-"Nickname:" = "Pseudonim:";
+"Nickname" = "Pseudonim";
 
 "Telephone" = "Telefon";
 "Work:" = "Praca:";
@@ -103,25 +103,25 @@
 "New category" = "Nowa kategoria";
 
 /* adresses */
-"Title:" = "Tytuł:";
+"Title" = "Tytuł";
 "Service:" = "Usługa:";
 "Company:" = "Firma:";
 "Department:" = "Oddział:";
 "Organization:" = "Organizacja:";
 "Address:" = "Adres:";
-"City:" = "Miejscowość:";
+"City" = "Miejscowość";
 "State_Province:" = "Województwo:";
 "ZIP_Postal Code:" = "Kod pocztowy:";
-"Country:" = "Kraj:";
+"Country" = "Kraj";
 "Web Page:" = "Strona WWW:";
 
 "Work" = "Praca";
 "Other Infos" = "Inne informacje";
 
-"Note:" = "Uwagi:";
+"Note" = "Uwagi";
 "Timezone:" = "Strefa czasowa:";
-"Birthday:" = "Urodziny:";
-"Birthday (yyyy-mm-dd):" = "Urodziny (yyyy-mm-dd):";
+"Birthday" = "Urodziny";
+"Birthday (yyyy-mm-dd)" = "Urodziny (yyyy-mm-dd)";
 "Freebusy URL:" = "URL statusu wolny-zajęty:";
 
 "Add as..." = "Dodaj jako";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Szczegóły listy";
-"List name:" = "Nazwa listy:";
-"List nickname:" = "Nick listy:";
-"List description:" = "Opis listy:";
+"List name" = "Nazwa listy";
+"List nickname" = "Nick listy";
+"List description" = "Opis listy";
 "Members" = "Członkowie";
 "Contacts" = "Kontakty";
 "Add" = "Dodaj";
diff --git a/UI/Contacts/Russian.lproj/Localizable.strings b/UI/Contacts/Russian.lproj/Localizable.strings
index 8653d9cab..b5e9c69b2 100644
--- a/UI/Contacts/Russian.lproj/Localizable.strings
+++ b/UI/Contacts/Russian.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Нет возможных подписок";
 
 "Preferred" = "Избранные";
-"Display:" = "Показывать:";
-"Display Name:" = "Отображаемое имя:";
+"Display" = "Показывать";
+"Display Name" = "Отображаемое имя";
 "Email:" = "E-mail:";
 "Additional Email:" = "Дополнительный E-mail:";
 
-"Phone Number:" = "Номер телефона:";
+"Phone Number" = "Номер телефона";
 "Prefers to receive messages formatted as:" = "Предпочитает принимать сообщения, отформатированные следующим образом:";
 "Screen Name:" = "Имя показа:";
 "Categories:" = "Категории:";
 
 "First:" = "Имя:";
 "Last:" = "Последнее:";
-"Nickname:" = "Ник:";
+"Nickname" = "Ник";
 
 "Telephone" = "Телефон";
 "Work:" = "Рабочий телефон:";
@@ -103,25 +103,25 @@
 "New category" = "Новые категории";
 
 /* adresses */
-"Title:" = "Звание:";
+"Title" = "Звание";
 "Service:" = "Сервис:";
 "Company:" = "Компания:";
 "Department:" = "Отдел:";
 "Organization:" = "Организация:";
 "Address:" = "Адрес:";
-"City:" = "Город:";
+"City" = "Город";
 "State_Province:" = "Область/штат:";
 "ZIP_Postal Code:" = "ZIP/Postal Code:";
-"Country:" = "Страна:";
+"Country" = "Страна";
 "Web Page:" = "Веб-страница:";
 
 "Work" = "Работа";
 "Other Infos" = "Другая информация";
 
-"Note:" = "Примечание:";
+"Note" = "Примечание";
 "Timezone:" = "Часовой пояс:";
-"Birthday:" = "День рождения";
-"Birthday (yyyy-mm-dd):" = "День рождения (ГГГГ-ММ-ДД):";
+"Birthday" = "День рождения";
+"Birthday (yyyy-mm-dd)" = "День рождения (ГГГГ-ММ-ДД)";
 "Freebusy URL:" = "Freebusy URL:";
 
 "Add as..." = "Добавить как...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Подробности списка";
-"List name:" = "Имя списка:";
-"List nickname:" = "Псевдоним списка:";
-"List description:" = "Описание списка:";
+"List name" = "Имя списка";
+"List nickname" = "Псевдоним списка";
+"List description" = "Описание списка";
 "Members" = "Члены";
 "Contacts" = "Контакты";
 "Add" = "Добавить";
diff --git a/UI/Contacts/Slovak.lproj/Localizable.strings b/UI/Contacts/Slovak.lproj/Localizable.strings
index 2aa2e901c..286fa1b4c 100644
--- a/UI/Contacts/Slovak.lproj/Localizable.strings
+++ b/UI/Contacts/Slovak.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Žiadne možnosti odberu";
 
 "Preferred" = "Preferovaný";
-"Display:" = "Zobraz:";
-"Display Name:" = "Zobrazované meno:";
+"Display" = "Zobraz";
+"Display Name" = "Zobrazované meno";
 "Email:" = "Email:";
 "Additional Email:" = "Další email:";
 
-"Phone Number:" = "Telefónne číslo:";
+"Phone Number" = "Telefónne číslo";
 "Prefers to receive messages formatted as:" = "Preferuje prijímať správy formátované ako:";
 "Screen Name:" = "Zobrazované meno:";
 "Categories:" = "Kategórie:";
 
 "First:" = "Meno:";
 "Last:" = "Priezvisko:";
-"Nickname:" = "Prezývka:";
+"Nickname" = "Prezývka";
 
 "Telephone" = "Telefón";
 "Work:" = "Do práce:";
@@ -103,25 +103,25 @@
 "New category" = "Nová kategória";
 
 /* adresses */
-"Title:" = "Názov:";
+"Title" = "Názov";
 "Service:" = "Služba:";
 "Company:" = "Spoločnosť:";
 "Department:" = "Oddelenie:";
 "Organization:" = "Organizácia:";
 "Address:" = "Adresa:";
-"City:" = "Mesto:";
+"City" = "Mesto";
 "State_Province:" = "Štát:";
 "ZIP_Postal Code:" = "Poštové smerové číslo:";
-"Country:" = "Krajina:";
+"Country" = "Krajina";
 "Web Page:" = "WWW stránka:";
 
 "Work" = "Práca";
 "Other Infos" = "Ostatné informácie";
 
-"Note:" = "Poznámky:";
+"Note" = "Poznámky";
 "Timezone:" = "Časová zóna:";
-"Birthday:" = "Narodeniny:";
-"Birthday (yyyy-mm-dd):" = "Narodeniny (dd-mm-yyyy):";
+"Birthday" = "Narodeniny";
+"Birthday (yyyy-mm-dd)" = "Narodeniny (dd-mm-yyyy)";
 "Freebusy URL:" = "URL voľný alebo obsadený:";
 
 "Add as..." = "Pridaj ako...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Detaily zoznamu";
-"List name:" = "Meno zoznamu:";
-"List nickname:" = "Prezývka zoznamu:";
-"List description:" = "Popis zoznamu:";
+"List name" = "Meno zoznamu";
+"List nickname" = "Prezývka zoznamu";
+"List description" = "Popis zoznamu";
 "Members" = "Členovia";
 "Contacts" = "Kontakty";
 "Add" = "Pridaj";
diff --git a/UI/Contacts/Slovenian.lproj/Localizable.strings b/UI/Contacts/Slovenian.lproj/Localizable.strings
index 0ff095037..9526f0eef 100644
--- a/UI/Contacts/Slovenian.lproj/Localizable.strings
+++ b/UI/Contacts/Slovenian.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Naročnina ni mogoča";
 
 "Preferred" = "Željeno";
-"Display:" = "Prikaz:";
-"Display Name:" = "Prikazno ime:";
+"Display" = "Prikaz";
+"Display Name" = "Prikazno ime";
 "Email:" = "E-pošta:";
 "Additional Email:" = "Dodatna e-pošta:";
 
-"Phone Number:" = "Telefonska številka:";
+"Phone Number" = "Telefonska številka";
 "Prefers to receive messages formatted as:" = "Željen format za prejeta sporočila:";
 "Screen Name:" = "Ime na zaslonu:";
 "Categories:" = "Kategorije:";
 
 "First:" = "Prvo:";
 "Last:" = "Zadnje:";
-"Nickname:" = "Vzdevek:";
+"Nickname" = "Vzdevek";
 
 "Telephone" = "Telefon";
 "Work:" = "Služba:";
@@ -103,25 +103,25 @@
 "New category" = "Nova kategorija";
 
 /* adresses */
-"Title:" = "Naslov:";
+"Title" = "Naslov";
 "Service:" = "Storitev:";
 "Company:" = "Podjetje:";
 "Department:" = "Oddelek:";
 "Organization:" = "Organizacija:";
 "Address:" = "Naslov:";
-"City:" = "Mesto:";
+"City" = "Mesto";
 "State_Province:" = "Država/Provinca:";
 "ZIP_Postal Code:" = "ZIP/Poštna številka:";
-"Country:" = "Država:";
+"Country" = "Država";
 "Web Page:" = "Spletna stran:";
 
 "Work" = "Delo";
 "Other Infos" = "Ostali podatki";
 
-"Note:" = "Opomba:";
+"Note" = "Opomba";
 "Timezone:" = "Časovni pas:";
-"Birthday:" = "Rojstni dan:";
-"Birthday (yyyy-mm-dd):" = "Rojstni dan (llll-mm-dd):";
+"Birthday" = "Rojstni dan";
+"Birthday (yyyy-mm-dd)" = "Rojstni dan (llll-mm-dd)";
 "Freebusy URL:" = "Freebusy URL:";
 
 "Add as..." = "Dodaj kot...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Podrobnosti seznama";
-"List name:" = "Ime iz seznama:";
-"List nickname:" = "Vzdevek iz seznama:";
-"List description:" = "Opis iz seznama:";
+"List name" = "Ime iz seznama";
+"List nickname" = "Vzdevek iz seznama";
+"List description" = "Opis iz seznama";
 "Members" = "Člani";
 "Contacts" = "Stiki";
 "Add" = "Dodaj";
diff --git a/UI/Contacts/SpanishArgentina.lproj/Localizable.strings b/UI/Contacts/SpanishArgentina.lproj/Localizable.strings
index 3adb1eafa..5d1ec88ba 100644
--- a/UI/Contacts/SpanishArgentina.lproj/Localizable.strings
+++ b/UI/Contacts/SpanishArgentina.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "No es posible la suscripción";
 
 "Preferred" = "Preferido";
-"Display:" = "Mostrar como:";
-"Display Name:" = "Nombre a mostrar:";
+"Display" = "Mostrar como";
+"Display Name" = "Nombre a mostrar";
 "Email:" = "Correo electrónico:";
 "Additional Email:" = "Correo electrónico adicional:";
 
-"Phone Number:" = "Número de teléfono:";
+"Phone Number" = "Número de teléfono";
 "Prefers to receive messages formatted as:" = "Formato preferido para los mensajes recibidos:";
 "Screen Name:" = "Nombre en Pantalla:";
 "Categories:" = "Categorías:";
 
 "First:" = "Nombre:";
 "Last:" = "Apellidos:";
-"Nickname:" = "Alias:";
+"Nickname" = "Alias";
 
 "Telephone" = "Teléfono";
 "Work:" = "Trabajo:";
@@ -103,25 +103,25 @@
 "New category" = "Nueva categoría";
 
 /* adresses */
-"Title:" = "Título:";
+"Title" = "Título";
 "Service:" = "Servicio:";
 "Company:" = "Empresa:";
 "Department:" = "Departamento:";
 "Organization:" = "Organización:";
 "Address:" = "Domicilio:";
-"City:" = "Ciudad:";
+"City" = "Ciudad";
 "State_Province:" = "Estado/Provincia:";
 "ZIP_Postal Code:" = "Código postal:";
-"Country:" = "País:";
+"Country" = "País";
 "Web Page:" = "Web:";
 
 "Work" = "Trabajo";
 "Other Infos" = "Otra Información";
 
-"Note:" = "Nota:";
+"Note" = "Nota";
 "Timezone:" = "Zona horaria:";
-"Birthday:" = "Fecha de nacimiento:";
-"Birthday (yyyy-mm-dd):" = "Fecha e nacimiento (aaaa-mm-dd):";
+"Birthday" = "Fecha de nacimiento";
+"Birthday (yyyy-mm-dd)" = "Fecha e nacimiento (aaaa-mm-dd)";
 "Freebusy URL:" = "URL de disponibilidad:";
 
 "Add as..." = "Añadir como...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Detalles de la lista";
-"List name:" = "Nombre de la lista:";
-"List nickname:" = "Alias de la lista:";
-"List description:" = "descripción de la lista:";
+"List name" = "Nombre de la lista";
+"List nickname" = "Alias de la lista";
+"List description" = "descripción de la lista";
 "Members" = "Miembros";
 "Contacts" = "Contactos";
 "Add" = "Añadir";
diff --git a/UI/Contacts/SpanishSpain.lproj/Localizable.strings b/UI/Contacts/SpanishSpain.lproj/Localizable.strings
index a8ba01958..cf324d43a 100644
--- a/UI/Contacts/SpanishSpain.lproj/Localizable.strings
+++ b/UI/Contacts/SpanishSpain.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "No es posible la suscripción";
 
 "Preferred" = "Preferido";
-"Display:" = "Mostrado:";
-"Display Name:" = "Mostrar Nombre:";
+"Display" = "Mostrado";
+"Display Name" = "Mostrar Nombre";
 "Email:" = "Correo electrónico:";
 "Additional Email:" = "Correo electrónico Adicional:";
 
-"Phone Number:" = "Número de teléfono:";
+"Phone Number" = "Número de teléfono";
 "Prefers to receive messages formatted as:" = "Formato preferido para los mensajes recibidos:";
 "Screen Name:" = "Nombre en Pantalla:";
 "Categories:" = "Categorias:";
 
 "First:" = "Nombre:";
 "Last:" = "Apellidos:";
-"Nickname:" = "Alias:";
+"Nickname" = "Alias";
 
 "Telephone" = "Teléfono";
 "Work:" = "Trabajo:";
@@ -103,25 +103,25 @@
 "New category" = "Nueva categoria";
 
 /* adresses */
-"Title:" = "Título:";
+"Title" = "Título";
 "Service:" = "Servicio:";
 "Company:" = "Empresa:";
 "Department:" = "Departamento:";
 "Organization:" = "Organización:";
 "Address:" = "Domicilio:";
-"City:" = "Ciudad:";
+"City" = "Ciudad";
 "State_Province:" = "Estado/Provincia:";
 "ZIP_Postal Code:" = "Código postal:";
-"Country:" = "País:";
+"Country" = "País";
 "Web Page:" = "Web:";
 
 "Work" = "Trabajo";
 "Other Infos" = "Otra Información";
 
-"Note:" = "Nota:";
+"Note" = "Nota";
 "Timezone:" = "Zona horaria:";
-"Birthday:" = "Fecha nacimiento:";
-"Birthday (yyyy-mm-dd):" = "Fecha nacimiento (aaaa-mm-dd):";
+"Birthday" = "Fecha nacimiento";
+"Birthday (yyyy-mm-dd)" = "Fecha nacimiento (aaaa-mm-dd)";
 "Freebusy URL:" = "URL disponibilidad:";
 
 "Add as..." = "Añadir como...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Detalles de la lista";
-"List name:" = "Nombre de la lista:";
-"List nickname:" = "Alias de la lista:";
-"List description:" = "descripcion de la lista:";
+"List name" = "Nombre de la lista";
+"List nickname" = "Alias de la lista";
+"List description" = "descripcion de la lista";
 "Members" = "Miembros";
 "Contacts" = "Contactos";
 "Add" = "Añadir";
diff --git a/UI/Contacts/Swedish.lproj/Localizable.strings b/UI/Contacts/Swedish.lproj/Localizable.strings
index a09576708..ee45e7b11 100644
--- a/UI/Contacts/Swedish.lproj/Localizable.strings
+++ b/UI/Contacts/Swedish.lproj/Localizable.strings
@@ -77,19 +77,19 @@
 
 "Preferred" = "Föredragen";
 "Card for %@" = "Adresskort för %@";
-"Display:" = "Visa:";
-"Display Name:" = "Visningsnamn:";
+"Display" = "Visa";
+"Display Name" = "Visningsnamn";
 "Email:" = "E-post:";
 "Additional Email:" = "Ytterligare e-post:";
 
-"Phone Number:" = "Telefonnummer:";
+"Phone Number" = "Telefonnummer";
 "Prefers to receive messages formatted as:" = "Föredrar att få mottagna meddelanden kodade som:";
 "Screen Name:" = "Skärmnamn:";
 "Categories:" = "Kategorier:";
 
 "First:" = "Förnamn:";
 "Last:" = "Efternamn:";
-"Nickname:" = "Kortnamn:";
+"Nickname" = "Kortnamn";
 
 "Telephone" = "Telefonnummer";
 "Work:" = "Arbete:";
@@ -104,25 +104,25 @@
 "New category" = "Ny kategori";
 
 /* adresses */
-"Title:" = "Titel:";
+"Title" = "Titel";
 "Service:" = "Befattning:";
 "Company:" = "Företag:";
 "Department:" = "Avdelning:";
 "Organization:" = "Organisation:";
 "Address:" = "Adress:";
-"City:" = "Stad: ";
+"City" = "Stad ";
 "State_Province:" = "Landsdel/Stat:";
 "ZIP_Postal Code:" = "Postnummer:";
-"Country:" = "Land:";
+"Country" = "Land";
 "Web Page:" = "Webbplats:";
 
 "Work" = "Arbete";
 "Other Infos" = "Övrigt";
 
-"Note:" = "Anteckning:";
+"Note" = "Anteckning";
 "Timezone:" = "Tidzon:";
-"Birthday:" = "Födelsedag:";
-"Birthday (yyyy-mm-dd):" = "Födelsedag (yyyy-mm-dd):";
+"Birthday" = "Födelsedag";
+"Birthday (yyyy-mm-dd)" = "Födelsedag (yyyy-mm-dd)";
 "Freebusy URL:" = "Ledig/upptagen URL:";
 
 "Add as..." = "Lägg till som...";
@@ -185,9 +185,9 @@
 
 /* Lists */
 "List details" = "Information om utskickslistan";
-"List name:" = "Namn på utskickslistan:";
-"List nickname:" = "Smeknamn på utskickslistan:";
-"List description:" = "Beskrivning:";
+"List name" = "Namn på utskickslistan";
+"List nickname" = "Smeknamn på utskickslistan";
+"List description" = "Beskrivning";
 "Members" = "Medlemmar";
 "Contacts" = "Kontakter";
 "Add" = "Lägg till";
diff --git a/UI/Contacts/Ukrainian.lproj/Localizable.strings b/UI/Contacts/Ukrainian.lproj/Localizable.strings
index 7600fd519..47602589d 100644
--- a/UI/Contacts/Ukrainian.lproj/Localizable.strings
+++ b/UI/Contacts/Ukrainian.lproj/Localizable.strings
@@ -76,19 +76,19 @@
 "No possible subscription" = "Відсутні підписки";
 
 "Preferred" = "Найзручніше";
-"Display:" = "Відображати як:";
-"Display Name:" = "Ім’я, що відображається:";
+"Display" = "Відображати як";
+"Display Name" = "Ім’я, що відображається";
 "Email:" = "Електронна пошта:";
 "Additional Email:" = "Дод. електронна адреса:";
 
-"Phone Number:" = "Номер телефону:";
+"Phone Number" = "Номер телефону";
 "Prefers to receive messages formatted as:" = "Вважає за краще отримувати пошту у форматі:";
 "Screen Name:" = "Інтернет-пейджер:";
 "Categories:" = "Категорії:";
 
 "First:" = "Ім’я:";
 "Last:" = "Прізвище:";
-"Nickname:" = "Псевдонім:";
+"Nickname" = "Псевдонім";
 
 "Telephone" = "Телефон";
 "Work:" = "Робочий:";
@@ -103,25 +103,25 @@
 "New category" = "Нова категорія";
 
 /* adresses */
-"Title:" = "Посада:";
+"Title" = "Посада";
 "Service:" = "Служба:";
 "Company:" = "Організація:";
 "Department:" = "Відділ:";
 "Organization:" = "Організація:";
 "Address:" = "Адреса:";
-"City:" = "Місто:";
+"City" = "Місто";
 "State_Province:" = "Область, регіон:";
 "ZIP_Postal Code:" = "Поштовий індекс:";
-"Country:" = "Країна:";
+"Country" = "Країна";
 "Web Page:" = "Веб-сторінка:";
 
 "Work" = "Робоча";
 "Other Infos" = "Інша інформація";
 
-"Note:" = "Примітки:";
+"Note" = "Примітки";
 "Timezone:" = "Часова зона:";
-"Birthday:" = "День народження:";
-"Birthday (yyyy-mm-dd):" = "Дата народження (рррр-мм-дд):";
+"Birthday" = "День народження";
+"Birthday (yyyy-mm-dd)" = "Дата народження (рррр-мм-дд)";
 "Freebusy URL:" = "Freebusy URL:";
 
 "Add as..." = "Додати як...";
@@ -186,9 +186,9 @@
 
 /* Lists */
 "List details" = "Деталі списку";
-"List name:" = "Назва списку:";
-"List nickname:" = "Псевдонім списку:";
-"List description:" = "Опис:";
+"List name" = "Назва списку";
+"List nickname" = "Псевдонім списку";
+"List description" = "Опис";
 "Members" = "Учасники";
 "Contacts" = "Контакти";
 "Add" = "Додати";
diff --git a/UI/Contacts/Welsh.lproj/Localizable.strings b/UI/Contacts/Welsh.lproj/Localizable.strings
index aeefefbd3..3b9b026d7 100644
--- a/UI/Contacts/Welsh.lproj/Localizable.strings
+++ b/UI/Contacts/Welsh.lproj/Localizable.strings
@@ -71,7 +71,7 @@
 
 "Preferred" = "Fafriedig";
 "Card for %@" = "Cerdyn i %@";
-"Display Name:" = "Dangos Enw: ";
+"Display Name" = "Dangos Enw ";
 "Email:" = "Cyfeiriad ebost: ";
 "Additional Email:" = "Additional Email:";
 
@@ -80,7 +80,7 @@
 
 "First:" = "Enw cyntaf: ";
 "Last:" = "Cyfenw: ";
-"Nickname:" = "Llysenw: ";
+"Nickname" = "Llysenw ";
 
 "Telephone" = "Teleffon";
 "Work:" = "Gwaith: ";
@@ -95,23 +95,23 @@
 "New category" = "New category";
 
 /* adresses */
-"Title:" = "Teitl: ";
+"Title" = "Teitl ";
 "Service:" = "Gwasanaeth: ";
 "Company:" = "Cwmni: ";
 "Street Address:" = "Cyfeiriad Stryd: ";
-"City:" = "Dinas: ";
+"City" = "Dinas ";
 "State_Province:" = "Sir/Talaith:";
 "ZIP_Postal Code:" = "ZIP/Cod Post:";
-"Country:" = "Gwlad:";
+"Country" = "Gwlad";
 "Web:" = "We: ";
 
 "Work" = "gwaith";
 "Other Infos" = "Gwybodaeth Arall";
 
-"Note:" = "Nodyn: ";
+"Note" = "Nodyn ";
 "Timezone:" = "Cylchfa Amser: ";
-"Birthday:" = "Penblwydd:";
-"Birthday (yyyy-mm-dd):" = "Penblwydd (yyyy-mm-dd):";
+"Birthday" = "Penblwydd";
+"Birthday (yyyy-mm-dd)" = "Penblwydd (yyyy-mm-dd)";
 "Freebusy URL:" = "Freebusy URL: ";
 
 "Add as..." = "Ychwanegu fel...";
@@ -174,9 +174,9 @@
 
 /* Lists */
 "List details" = "List details";
-"List name:" = "List name:";
-"List nickname:" = "List nickname:";
-"List description:" = "List description:";
+"List name" = "List name";
+"List nickname" = "List nickname";
+"List description" = "List description";
 "Members" = "Members";
 "Contacts" = "Contacts";
 "Add" = "Add";
diff --git a/UI/MailerUI/Arabic.lproj/Localizable.strings b/UI/MailerUI/Arabic.lproj/Localizable.strings
index 490cea964..112839bdd 100644
--- a/UI/MailerUI/Arabic.lproj/Localizable.strings
+++ b/UI/MailerUI/Arabic.lproj/Localizable.strings
@@ -237,8 +237,8 @@
 
 /* Folder operations */
 "Name :" = "أسم:";
-"Enter the new name of your folder :"
- = "أدخل اسم جديد للمجلد:";
+"Enter the new name of your folder "
+ = "أدخل اسم جديد للمجلد";
 "Do you really want to move this folder into the trash ?"
  = "هل تريد حقا نقل هذا المجلد إلى سلة المهملات؟";
 "Operation failed" = "فشلت عملية";
diff --git a/UI/MailerUI/Basque.lproj/Localizable.strings b/UI/MailerUI/Basque.lproj/Localizable.strings
index aa1603cba..770fab8b6 100644
--- a/UI/MailerUI/Basque.lproj/Localizable.strings
+++ b/UI/MailerUI/Basque.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "ez zaborra gisa";
 "Run Junk Mail Controls" = "Exekutatu zabor-posta kontrolak";
 
-"Search messages in:" = "Bilatu mezuak hemen:";
+"Search messages in" = "Bilatu mezuak hemen";
 "Search" = "Bilatu";
 "Search subfolders" = "Bilatu azpikarpetak";
 "Match any of the following" = "Irizpide hauetako edozein betetzen dituztenak";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Izena:";
-"Enter the new name of your folder :"
- = "Idatzi zure karpetaren izen berria:";
+"Enter the new name of your folder "
+ = "Idatzi zure karpetaren izen berria";
 "Do you really want to move this folder into the trash ?"
  = "Ziur zaude karpeta hau zakarrontzira mugitu nahi duzula?";
 "Operation failed" = "Eragiketak huts egin du";
diff --git a/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
index 92af97fe0..b7b43f7d3 100644
--- a/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/MailerUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Como Não é Lixo Eletrônico";
 "Run Junk Mail Controls" = "Executar Controle de Lixo Eletrônico";
 
-"Search messages in:" = "Pesquisar mensagens em:";
+"Search messages in" = "Pesquisar mensagens em";
 "Search" = "Pesquisar";
 "Search subfolders" = "Pesquisar sub-pastas";
 "Match any of the following" = "Combinar qualquer uma das seguintes";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Nome :";
-"Enter the new name of your folder :"
- = "Informe o novo nome de sua pasta :";
+"Enter the new name of your folder "
+ = "Informe o novo nome de sua pasta ";
 "Do you really want to move this folder into the trash ?"
  = "Você realmente quer mover esta pasta para a Lixeira ?";
 "Operation failed" = "Falha na Operação";
diff --git a/UI/MailerUI/Catalan.lproj/Localizable.strings b/UI/MailerUI/Catalan.lproj/Localizable.strings
index c76770b66..21f506135 100644
--- a/UI/MailerUI/Catalan.lproj/Localizable.strings
+++ b/UI/MailerUI/Catalan.lproj/Localizable.strings
@@ -239,8 +239,8 @@
 
 /* Folder operations */
 "Name :" = "Nom: ";
-"Enter the new name of your folder :"
- = "Introduïu el nom nou per a la carpeta: ";
+"Enter the new name of your folder "
+ = "Introduïu el nom nou per a la carpeta ";
 "Do you really want to move this folder into the trash ?"
  = "Voleu moure aquesta carpeta a la paperera?";
 "Operation failed" = "Operació no vàlida";
diff --git a/UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings b/UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings
index 8755cd3ea..373171be1 100644
--- a/UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings
+++ b/UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "這不是垃圾郵件";
 "Run Junk Mail Controls" = "執行垃圾郵件管制";
 
-"Search messages in:" = "搜尋信件在:";
+"Search messages in" = "搜尋信件在";
 "Search" = "搜尋";
 "Search subfolders" = "搜尋子資料匣";
 "Match any of the following" = "符合下列任一條件";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "名稱:";
-"Enter the new name of your folder :"
- = "輸入新資料匣名稱 :";
+"Enter the new name of your folder "
+ = "輸入新資料匣名稱 ";
 "Do you really want to move this folder into the trash ?"
  = "是否確定將這個資料匣移到垃圾桶?";
 "Operation failed" = "操作失敗";
diff --git a/UI/MailerUI/Czech.lproj/Localizable.strings b/UI/MailerUI/Czech.lproj/Localizable.strings
index 8c551d65f..b3f900acb 100644
--- a/UI/MailerUI/Czech.lproj/Localizable.strings
+++ b/UI/MailerUI/Czech.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Jako vyžádané";
 "Run Junk Mail Controls" = "Spustit kontrolu nevyžádaných";
 
-"Search messages in:" = "Hledat zprávy v:";
+"Search messages in" = "Hledat zprávy v";
 "Search" = "Hledat";
 "Search subfolders" = "Hledat v podsložkách";
 "Match any of the following" = "Odpovídající některému pravidlu";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Jméno :";
-"Enter the new name of your folder :"
- = "Zadejte nový název Vaší složky :";
+"Enter the new name of your folder "
+ = "Zadejte nový název Vaší složky ";
 "Do you really want to move this folder into the trash ?"
  = "Opravdu chcete tuto složku vyhodit do koše ?";
 "Operation failed" = "Operace selhala";
diff --git a/UI/MailerUI/Danish.lproj/Localizable.strings b/UI/MailerUI/Danish.lproj/Localizable.strings
index e668f8cae..9377966bc 100644
--- a/UI/MailerUI/Danish.lproj/Localizable.strings
+++ b/UI/MailerUI/Danish.lproj/Localizable.strings
@@ -237,8 +237,8 @@
 
 /* Folder operations */
 "Name :" = "Navn:";
-"Enter the new name of your folder :"
- = "Indtast det nye navn på din mappe:";
+"Enter the new name of your folder "
+ = "Indtast det nye navn på din mappe";
 "Do you really want to move this folder into the trash ?"
  = "Er du sikker på, at du vil flytte denne mappe til papirkurven?";
 "Operation failed" = "Handlingen mislykkedes";
diff --git a/UI/MailerUI/Dutch.lproj/Localizable.strings b/UI/MailerUI/Dutch.lproj/Localizable.strings
index dff1f42e6..ce6974027 100644
--- a/UI/MailerUI/Dutch.lproj/Localizable.strings
+++ b/UI/MailerUI/Dutch.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Als gewenst";
 "Run Junk Mail Controls" = "Ongewenste berichtenfilter starten";
 
-"Search messages in:" = "Zoek berichten in:";
+"Search messages in" = "Zoek berichten in";
 "Search" = "Zoeken";
 "Search subfolders" = "Zoek in submappen";
 "Match any of the following" = "Gelijk aan een van de volgende";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Naam:";
-"Enter the new name of your folder :"
- = "Geef de nieuw naam van de map op:";
+"Enter the new name of your folder "
+ = "Geef de nieuw naam van de map op";
 "Do you really want to move this folder into the trash ?"
  = "Weet u zeker dat u deze map naar de prullenbak wilt verplaatsen?";
 "Operation failed" = "Bewerking mislukt.";
diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index 02466f5b5..512948dec 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "As Not Junk";
 "Run Junk Mail Controls" = "Run Junk Mail Controls";
 
-"Search messages in:" = "Search messages in:";
+"Search messages in" = "Search messages in";
 "Search" = "Search";
 "Search subfolders" = "Search subfolders";
 "Match any of the following" = "Match any of the following";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Name :";
-"Enter the new name of your folder :"
- = "Enter the new name of your folder :";
+"Enter the new name of your folder "
+ = "Enter the new name of your folder ";
 "Do you really want to move this folder into the trash ?"
  = "Do you really want to move this folder into the trash ?";
 "Operation failed" = "Operation failed";
diff --git a/UI/MailerUI/Finnish.lproj/Localizable.strings b/UI/MailerUI/Finnish.lproj/Localizable.strings
index 66e488318..68a5f5b9d 100644
--- a/UI/MailerUI/Finnish.lproj/Localizable.strings
+++ b/UI/MailerUI/Finnish.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Ei roskaksi";
 "Run Junk Mail Controls" = "Käynnistä roskapostien hallinta";
 
-"Search messages in:" = "Etsi viestejä:";
+"Search messages in" = "Etsi viestejä";
 "Search" = "Etsi";
 "Search subfolders" = "Etsi alihakemistoista";
 "Match any of the following" = "Täsmää mihin tahansa seuraavista";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Nimi:";
-"Enter the new name of your folder :"
- = "Syötä kansiosi uusi nimi:";
+"Enter the new name of your folder "
+ = "Syötä kansiosi uusi nimi";
 "Do you really want to move this folder into the trash ?"
  = "Oletko varma että haluat siirtää tämän kansion roskakoriin?  ";
 "Operation failed" = "Toiminto epäonnistui";
diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
index b136c0a99..d41db2a36 100644
--- a/UI/MailerUI/French.lproj/Localizable.strings
+++ b/UI/MailerUI/French.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Comme acceptable";
 "Run Junk Mail Controls" = "Lancer le contrôle des indésirables";
 
-"Search messages in:" = "Rechercher dans :";
+"Search messages in" = "Rechercher dans ";
 "Search" = "Recherche";
 "Search subfolders" = "Rechercher dans les sous-dossiers";
 "Match any of the following" = "Répondant à un des critères suivants";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Nom:";
-"Enter the new name of your folder :"
- = "Entrez le nouveau nom de votre dossier:";
+"Enter the new name of your folder "
+ = "Entrez le nouveau nom de votre dossier";
 "Do you really want to move this folder into the trash ?"
  = "Voulez-vous vraiment déplacer le dossier sélectionné dans la corbeille?";
 "Operation failed" = "L'opération a échoué.";
diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings
index 6ea7e17db..7f19e552a 100644
--- a/UI/MailerUI/German.lproj/Localizable.strings
+++ b/UI/MailerUI/German.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Kein Junk";
 "Run Junk Mail Controls" = "Junk-Filter anwenden";
 
-"Search messages in:" = "Nachrichten suchen in:";
+"Search messages in" = "Nachrichten suchen in";
 "Search" = "Suchen";
 "Search subfolders" = "Durchsuche Unterordner";
 "Match any of the following" = "Die auf mindestens eines der folgenden Muster passen";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Name:";
-"Enter the new name of your folder :"
- = "Geben Sie den Namen des neuen Ordners ein:";
+"Enter the new name of your folder "
+ = "Geben Sie den Namen des neuen Ordners ein";
 "Do you really want to move this folder into the trash ?"
  = "Wollen Sie diesen Ordner wirklich in den Papierkorb verschieben?";
 "Operation failed" = "Operation fehlgeschlagen.";
diff --git a/UI/MailerUI/Hungarian.lproj/Localizable.strings b/UI/MailerUI/Hungarian.lproj/Localizable.strings
index c22c1cf77..2e1e81267 100644
--- a/UI/MailerUI/Hungarian.lproj/Localizable.strings
+++ b/UI/MailerUI/Hungarian.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Nem szemétként";
 "Run Junk Mail Controls" = "Levélszemétgyűjtő futtatása";
 
-"Search messages in:" = "Üzenetek keresése ebben:";
+"Search messages in" = "Üzenetek keresése ebben";
 "Search" = "Keresés";
 "Search subfolders" = "Keresés almappákban";
 "Match any of the following" = "A következők egyikének feleljen meg";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Név:";
-"Enter the new name of your folder :"
- = "Adja meg az új mappa nevét:";
+"Enter the new name of your folder "
+ = "Adja meg az új mappa nevét";
 "Do you really want to move this folder into the trash ?"
  = "Biztosan lomtárba kívánja helyezni ezt a mappát ?";
 "Operation failed" = "A művelet megszakadt";
diff --git a/UI/MailerUI/Icelandic.lproj/Localizable.strings b/UI/MailerUI/Icelandic.lproj/Localizable.strings
index 375f4e6e7..a2019dcd4 100644
--- a/UI/MailerUI/Icelandic.lproj/Localizable.strings
+++ b/UI/MailerUI/Icelandic.lproj/Localizable.strings
@@ -235,8 +235,8 @@
 
 /* Folder operations */
 "Name :" = "Nafn :";
-"Enter the new name of your folder :"
- = "Enter the new name of your folder :";
+"Enter the new name of your folder "
+ = "Enter the new name of your folder ";
 "Do you really want to move this folder into the trash ?"
  = "Do you really want to move this folder into the trash ?";
 "Operation failed" = "Aðgerðin mistókst";
diff --git a/UI/MailerUI/Italian.lproj/Localizable.strings b/UI/MailerUI/Italian.lproj/Localizable.strings
index 0bf331060..a84018495 100644
--- a/UI/MailerUI/Italian.lproj/Localizable.strings
+++ b/UI/MailerUI/Italian.lproj/Localizable.strings
@@ -237,8 +237,8 @@
 
 /* Folder operations */
 "Name :" = "Nome :";
-"Enter the new name of your folder :"
- = "Inserisci il nuovo nome della cartella :";
+"Enter the new name of your folder "
+ = "Inserisci il nuovo nome della cartella ";
 "Do you really want to move this folder into the trash ?"
  = "Sei sicuro di voler spostare la cartella nel cestino ?";
 "Operation failed" = "Operazione non riuscita";
diff --git a/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings b/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
index e2f6937d9..62e505615 100644
--- a/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
+++ b/UI/MailerUI/NorwegianBokmal.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Som ikke søppel";
 "Run Junk Mail Controls" = "Kjør søppelpostkontroll";
 
-"Search messages in:" = "Søk etter beskjeder i:";
+"Search messages in" = "Søk etter beskjeder i";
 "Search" = "Søk";
 "Search subfolders" = "Søk i undermapper";
 "Match any of the following" = "Passer noen av";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Navn : ";
-"Enter the new name of your folder :"
- = "Skriv navnet på mappen :";
+"Enter the new name of your folder "
+ = "Skriv navnet på mappen ";
 "Do you really want to move this folder into the trash ?"
  = "Vil du virkelig flytte mappen til papirkurven ?";
 "Operation failed" = "Operasjonen mislyktes";
diff --git a/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
index 776cc23e6..68b9b1cd1 100644
--- a/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
+++ b/UI/MailerUI/NorwegianNynorsk.lproj/Localizable.strings
@@ -235,8 +235,8 @@
 
 /* Folder operations */
 "Name :" = "Navn: ";
-"Enter the new name of your folder :"
- = "Skriv navnet på mappen: ";
+"Enter the new name of your folder "
+ = "Skriv navnet på mappen ";
 "Do you really want to move this folder into the trash ?"
  = "Vil du virkelig flytte mappen till papirkurven?";
 "Operation failed" = "Operasjonen misslykkes";
diff --git a/UI/MailerUI/Polish.lproj/Localizable.strings b/UI/MailerUI/Polish.lproj/Localizable.strings
index cf823edc6..c32f63ec3 100644
--- a/UI/MailerUI/Polish.lproj/Localizable.strings
+++ b/UI/MailerUI/Polish.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Jako nie-śmieć";
 "Run Junk Mail Controls" = "Uruchom kontrolę wiadomości śmieci";
 
-"Search messages in:" = "Szukaj wiadomości w:";
+"Search messages in" = "Szukaj wiadomości w";
 "Search" = "Szukaj";
 "Search subfolders" = "Przeszukaj podfoldery";
 "Match any of the following" = "Dopasuj dowolny z warunków";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Nazwa :";
-"Enter the new name of your folder :"
- = "Wprowadź nową nazwę twojego folderu:";
+"Enter the new name of your folder "
+ = "Wprowadź nową nazwę twojego folderu";
 "Do you really want to move this folder into the trash ?"
  = "Czy na pewno chcesz przenieść ten folder do kosza ?";
 "Operation failed" = "Operacja nie powiodła się";
diff --git a/UI/MailerUI/Russian.lproj/Localizable.strings b/UI/MailerUI/Russian.lproj/Localizable.strings
index 1f7828d61..5b41d19cb 100644
--- a/UI/MailerUI/Russian.lproj/Localizable.strings
+++ b/UI/MailerUI/Russian.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Не спам";
 "Run Junk Mail Controls" = "Запустить фильтр спама";
 
-"Search messages in:" = "Искать сообщения в:.";
+"Search messages in" = "Искать сообщения в.";
 "Search" = "Поиск";
 "Search subfolders" = "Искать во вложенных папках";
 "Match any of the following" = "Отвечают любому из следующих";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Имя :";
-"Enter the new name of your folder :"
- = "Введите новое имя папки :";
+"Enter the new name of your folder "
+ = "Введите новое имя папки ";
 "Do you really want to move this folder into the trash ?"
  = "Вы действительно хотите перенести эту папку в корзину?";
 "Operation failed" = "Операция завершилась неудачно";
diff --git a/UI/MailerUI/Slovak.lproj/Localizable.strings b/UI/MailerUI/Slovak.lproj/Localizable.strings
index 31a5958a1..fe2745067 100644
--- a/UI/MailerUI/Slovak.lproj/Localizable.strings
+++ b/UI/MailerUI/Slovak.lproj/Localizable.strings
@@ -239,8 +239,8 @@
 
 /* Folder operations */
 "Name :" = "Meno:";
-"Enter the new name of your folder :"
- = "Zadajte nové meno adresára:";
+"Enter the new name of your folder "
+ = "Zadajte nové meno adresára";
 "Do you really want to move this folder into the trash ?"
  = "Skutočne chcete presunúť tento priečinok do koša?";
 "Operation failed" = "Operácia zlyhala";
diff --git a/UI/MailerUI/Slovenian.lproj/Localizable.strings b/UI/MailerUI/Slovenian.lproj/Localizable.strings
index 0414e7de9..f141f8950 100644
--- a/UI/MailerUI/Slovenian.lproj/Localizable.strings
+++ b/UI/MailerUI/Slovenian.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Kot zaželeno";
 "Run Junk Mail Controls" = "Poženi nadzor nezaželene pošte";
 
-"Search messages in:" = "Išči sporočila v:";
+"Search messages in" = "Išči sporočila v";
 "Search" = "Išči";
 "Search subfolders" = "Išči podmape";
 "Match any of the following" = "sklada se s katerimkoli od naslednjih";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Ime :";
-"Enter the new name of your folder :"
- = "Vpiši novo ime tvoje mape :";
+"Enter the new name of your folder "
+ = "Vpiši novo ime tvoje mape ";
 "Do you really want to move this folder into the trash ?"
  = "Zares želiš premakniti to mapo v koš?";
 "Operation failed" = "Dejanje ni uspelo";
diff --git a/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings b/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
index 682d71d24..be6ea45a7 100644
--- a/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
+++ b/UI/MailerUI/SpanishArgentina.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Como correo normal";
 "Run Junk Mail Controls" = "Ejecutar controles de correo basura";
 
-"Search messages in:" = "Buscar mensajes en:";
+"Search messages in" = "Buscar mensajes en";
 "Search" = "Buscar";
 "Search subfolders" = "Buscar en subcarpetas";
 "Match any of the following" = "Coincidir con cualquiera de los siguientes criterios:";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Nombre: ";
-"Enter the new name of your folder :"
- = "Introduzca el nuevo nombre de la carpeta: ";
+"Enter the new name of your folder "
+ = "Introduzca el nuevo nombre de la carpeta ";
 "Do you really want to move this folder into the trash ?"
  = "¿Está seguro de que desea mover la carpeta a la papelera?";
 "Operation failed" = "Operación fallida";
diff --git a/UI/MailerUI/SpanishSpain.lproj/Localizable.strings b/UI/MailerUI/SpanishSpain.lproj/Localizable.strings
index 804acdcc5..0fc1db279 100644
--- a/UI/MailerUI/SpanishSpain.lproj/Localizable.strings
+++ b/UI/MailerUI/SpanishSpain.lproj/Localizable.strings
@@ -240,7 +240,7 @@
 "As Not Junk" = "Como correo normal";
 "Run Junk Mail Controls" = "Ejecutar controles de correo basura";
 
-"Search messages in:" = "Buscar mensajes en:";
+"Search messages in" = "Buscar mensajes en";
 "Search" = "Buscar";
 "Search subfolders" = "Buscar sub carpetas";
 "Match any of the following" = "Cumplen cualquiera de las reglas siguientes";
@@ -254,8 +254,8 @@
 
 /* Folder operations */
 "Name :" = "Nombre: ";
-"Enter the new name of your folder :"
- = "Introduzca el nuevo nombre de la carpeta: ";
+"Enter the new name of your folder "
+ = "Introduzca el nuevo nombre de la carpeta ";
 "Do you really want to move this folder into the trash ?"
  = "¿Seguro que desea mover la carpeta a la papelera?";
 "Operation failed" = "Operación fallida";
diff --git a/UI/MailerUI/Swedish.lproj/Localizable.strings b/UI/MailerUI/Swedish.lproj/Localizable.strings
index ee18ce90f..69d745480 100644
--- a/UI/MailerUI/Swedish.lproj/Localizable.strings
+++ b/UI/MailerUI/Swedish.lproj/Localizable.strings
@@ -235,8 +235,8 @@
 
 /* Folder operations */
 "Name :" = "Namn: ";
-"Enter the new name of your folder :"
- = "Skriv namnet på mappen: ";
+"Enter the new name of your folder "
+ = "Skriv namnet på mappen ";
 "Do you really want to move this folder into the trash ?"
  = "Vill du verkligen flytta mappen till papperskorgen?";
 "Operation failed" = "Operationen misslyckades";
diff --git a/UI/MailerUI/Ukrainian.lproj/Localizable.strings b/UI/MailerUI/Ukrainian.lproj/Localizable.strings
index d7ae77b28..af60d34d1 100644
--- a/UI/MailerUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/MailerUI/Ukrainian.lproj/Localizable.strings
@@ -237,8 +237,8 @@
 
 /* Folder operations */
 "Name :" = "Назва :";
-"Enter the new name of your folder :"
- = "Введіть нову назву теки :";
+"Enter the new name of your folder "
+ = "Введіть нову назву теки ";
 "Do you really want to move this folder into the trash ?"
  = "Ви справді бажаєте перенести цю теку до кошика?";
 "Operation failed" = "Операція завершилась невдало";
diff --git a/UI/MailerUI/Welsh.lproj/Localizable.strings b/UI/MailerUI/Welsh.lproj/Localizable.strings
index 8a4d93d7e..1692baa65 100644
--- a/UI/MailerUI/Welsh.lproj/Localizable.strings
+++ b/UI/MailerUI/Welsh.lproj/Localizable.strings
@@ -235,8 +235,8 @@
 
 /* Folder operations */
 "Name :" = "Enw :";
-"Enter the new name of your folder :"
- = "Rhowch yr enw newydd ar eich ffolder :";
+"Enter the new name of your folder "
+ = "Rhowch yr enw newydd ar eich ffolder ";
 "Do you really want to move this folder into the trash ?"
  = "A ydych yn sicr eich bod eisiau symudy ffolder yma i'r sbwriel ?";
 "Operation failed" = "Gweithrediad wedi methu";
diff --git a/UI/MainUI/Arabic.lproj/Localizable.strings b/UI/MainUI/Arabic.lproj/Localizable.strings
index 78eaa957f..9501bd65e 100644
--- a/UI/MainUI/Arabic.lproj/Localizable.strings
+++ b/UI/MainUI/Arabic.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "سوجو";
 
-"Username:" = "اسم المستخدم:";
-"Password:" = "كلمة السر:";
-"Domain:" = "النطاق:";
+"Username" = "اسم المستخدم";
+"Password" = "كلمة السر";
+"Domain" = "النطاق";
 "Remember username" = "تذكر اسم المستخدم";
 
 "Connect" = "اتصل";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "بدلا من ذلك، يمكنك أيضا استخدام سفاري.";
 "Download" = "نزِّل";
 
-"Language:" = "اللغة:";
+"Language" = "اللغة";
 "choose" = "إختار ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Basque.lproj/Localizable.strings b/UI/MainUI/Basque.lproj/Localizable.strings
index b07bf2fea..1c8cc1327 100644
--- a/UI/MainUI/Basque.lproj/Localizable.strings
+++ b/UI/MainUI/Basque.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Erabiltzailea:";
-"Password:" = "Pasahitza:";
-"Domain:" = "Domeinua";
+"Username" = "Erabiltzailea";
+"Password" = "Pasahitza";
+"Domain" = "Domeinua";
 "Remember username" = "Gogoratu erabiltzaile-izena";
 
 "Connect" = "Konektatu";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Aukeran, Safari arakatzailea erabili dezakezu ere.";
 "Download" = "Deskargatu";
 
-"Language:" = "Hizkuntza";
+"Language" = "Hizkuntza";
 "choose" = "Aukeratu ...";
 "Arabic" = "العربية";
 "Catalan" = "Català";
diff --git a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
index d7c38ac29..b9d376927 100644
--- a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Usuário:";
-"Password:" = "Senha:";
-"Domain:" = "Domínio:";
+"Username" = "Usuário";
+"Password" = "Senha";
+"Domain" = "Domínio";
 "Remember username" = "Lembrar login";
 
 "Connect" = "Conectar";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternativamente, você pode usar o Safari.";
 "Download" = "Download";
 
-"Language:" = "Idioma:";
+"Language" = "Idioma";
 "choose" = "Escolha ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Catalan.lproj/Localizable.strings b/UI/MainUI/Catalan.lproj/Localizable.strings
index aa2dad483..83d0ed6a1 100644
--- a/UI/MainUI/Catalan.lproj/Localizable.strings
+++ b/UI/MainUI/Catalan.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Usuari:";
-"Password:" = "Contrasenya:";
-"Domain:" = "Domini:";
+"Username" = "Usuari";
+"Password" = "Contrasenya";
+"Domain" = "Domini";
 "Remember username" = "recordar usuari";
 
 "Connect" = "Connectar";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Safari.";
 "Download" = "Descàrrega";
 
-"Language:" = "Llengua:";
+"Language" = "Llengua";
 "choose" = "Triar ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings b/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
index 56420bce6..36eb103ed 100644
--- a/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
+++ b/UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Username:";
-"Password:" = "Password:";
-"Domain:" = "Domain:";
+"Username" = "Username";
+"Password" = "Password";
+"Domain" = "Domain";
 "Remember username" = "Remember username";
 
 "Connect" = "Connect";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternatively, you can also use Safari.";
 "Download" = "Download";
 
-"Language:" = "Language:";
+"Language" = "Language";
 "choose" = "Choose ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Czech.lproj/Localizable.strings b/UI/MainUI/Czech.lproj/Localizable.strings
index 8d4553090..17e168ac0 100644
--- a/UI/MainUI/Czech.lproj/Localizable.strings
+++ b/UI/MainUI/Czech.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Uživatelské jméno:";
-"Password:" = "Heslo:";
-"Domain:" = "Doména";
+"Username" = "Uživatelské jméno";
+"Password" = "Heslo";
+"Domain" = "Doména";
 "Remember username" = "Pamatovat si uživatelské jméno";
 
 "Connect" = "Připojit";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Můžete však použít i Safari.";
 "Download" = "Stáhnout";
 
-"Language:" = "Jazyk:";
+"Language" = "Jazyk";
 "choose" = "Vybrat ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Danish.lproj/Localizable.strings b/UI/MainUI/Danish.lproj/Localizable.strings
index 1342cac67..6c40e18cc 100644
--- a/UI/MainUI/Danish.lproj/Localizable.strings
+++ b/UI/MainUI/Danish.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "Sogo";
 
-"Username:" = "Brugernavn:";
-"Password:" = "Adgangskode:";
-"Domain:" = "Domæne:";
+"Username" = "Brugernavn";
+"Password" = "Adgangskode";
+"Domain" = "Domæne";
 "Remember username" = "Husk brugernavn";
 
 "Connect" = "Tilslut";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternativt kan du også bruge Safari.";
 "Download" = "Download";
 
-"Language:" = "Sprog:";
+"Language" = "Sprog";
 "choose" = "Vælg ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Dutch.lproj/Localizable.strings b/UI/MainUI/Dutch.lproj/Localizable.strings
index ab6533c60..b84ff789f 100644
--- a/UI/MainUI/Dutch.lproj/Localizable.strings
+++ b/UI/MainUI/Dutch.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Gebruikersnaam:";
-"Password:" = "Wachtwoord:";
-"Domain:" = "Domein:";
+"Username" = "Gebruikersnaam";
+"Password" = "Wachtwoord";
+"Domain" = "Domein";
 "Remember username" = "Onthoud gebruikersnaam";
 
 "Connect" = "Inloggen";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Als alternatief kunt u ook Safari gebruiken.";
 "Download" = "Download";
 
-"Language:" = "Taal:";
+"Language" = "Taal";
 "choose" = "Kies...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings
index 56420bce6..36eb103ed 100644
--- a/UI/MainUI/English.lproj/Localizable.strings
+++ b/UI/MainUI/English.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Username:";
-"Password:" = "Password:";
-"Domain:" = "Domain:";
+"Username" = "Username";
+"Password" = "Password";
+"Domain" = "Domain";
 "Remember username" = "Remember username";
 
 "Connect" = "Connect";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternatively, you can also use Safari.";
 "Download" = "Download";
 
-"Language:" = "Language:";
+"Language" = "Language";
 "choose" = "Choose ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Finnish.lproj/Localizable.strings b/UI/MainUI/Finnish.lproj/Localizable.strings
index ccb1525cb..21458c5c2 100644
--- a/UI/MainUI/Finnish.lproj/Localizable.strings
+++ b/UI/MainUI/Finnish.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Käyttäjätunnus:";
-"Password:" = "Salasana:";
-"Domain:" = "Domain:";
+"Username" = "Käyttäjätunnus";
+"Password" = "Salasana";
+"Domain" = "Domain";
 "Remember username" = "Muista käyttäjätunnus";
 
 "Connect" = "Yhdistä";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Vaihtoehtoisesti voit myös käyttää Safaria.";
 "Download" = "Lataa";
 
-"Language:" = "Kieli:";
+"Language" = "Kieli";
 "choose" = "Valitse ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings
index 5bd1cd32c..3131bf5df 100644
--- a/UI/MainUI/French.lproj/Localizable.strings
+++ b/UI/MainUI/French.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Nom d'utilisateur :";
-"Password:" = "Mot de passe :";
-"Domain:" = "Domaine :";
+"Username" = "Nom d'utilisateur ";
+"Password" = "Mot de passe ";
+"Domain" = "Domaine ";
 "Remember username" = "Se souvenir de moi";
 
 "Connect" = "Connexion";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Comme alternative, vous pouvez aussi utiliser Safari.";
 "Download" = "Télécharger";
 
-"Language:" = "Langue:";
+"Language" = "Langue";
 "choose" = "Choisir ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/German.lproj/Localizable.strings b/UI/MainUI/German.lproj/Localizable.strings
index 696835015..fa7d2ce07 100644
--- a/UI/MainUI/German.lproj/Localizable.strings
+++ b/UI/MainUI/German.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Benutzername:";
-"Password:" = "Passwort:";
-"Domain:" = "Domain:";
+"Username" = "Benutzername";
+"Password" = "Passwort";
+"Domain" = "Domain";
 "Remember username" = "Benutzername merken";
 
 "Connect" = "Anmelden";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Sie können auch Safari benutzen.";
 "Download" = "Herunterladen";
 
-"Language:" = "Sprache:";
+"Language" = "Sprache";
 "choose" = "Auswählen ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Hungarian.lproj/Localizable.strings b/UI/MainUI/Hungarian.lproj/Localizable.strings
index f5ffe864a..85acf770b 100644
--- a/UI/MainUI/Hungarian.lproj/Localizable.strings
+++ b/UI/MainUI/Hungarian.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Felhasználó:";
-"Password:" = "Jelszó:";
-"Domain:" = "Tartomány:";
+"Username" = "Felhasználó";
+"Password" = "Jelszó";
+"Domain" = "Tartomány";
 "Remember username" = "Felhasználónév megjegyzése";
 
 "Connect" = "Kapcsolódás";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "A Safari böngésző is használható.";
 "Download" = "Letöltés";
 
-"Language:" = "Nyelv:";
+"Language" = "Nyelv";
 "choose" = "Válasszon ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Icelandic.lproj/Localizable.strings b/UI/MainUI/Icelandic.lproj/Localizable.strings
index f2e7ce9c7..778dc07e9 100644
--- a/UI/MainUI/Icelandic.lproj/Localizable.strings
+++ b/UI/MainUI/Icelandic.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Notandanafn:";
-"Password:" = "Lykilorð:";
-"Domain:" = "Domain:";
+"Username" = "Notandanafn";
+"Password" = "Lykilorð";
+"Domain" = "Domain";
 
 "Connect" = "Tengjast";
 
@@ -16,7 +16,7 @@
 "alternativeBrowserSafari" = "Einnig er hægt að nota Safari.";
 "Download" = "Hala niður";
 
-"Language:" = "Tungumál:";
+"Language" = "Tungumál";
 "choose" = "Velja...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Italian.lproj/Localizable.strings b/UI/MainUI/Italian.lproj/Localizable.strings
index 101e95579..469c6468a 100644
--- a/UI/MainUI/Italian.lproj/Localizable.strings
+++ b/UI/MainUI/Italian.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Nome utente:";
-"Password:" = "Password:";
-"Domain:" = "Dominio";
+"Username" = "Nome utente";
+"Password" = "Password";
+"Domain" = "Dominio";
 "Remember username" = "Ricorda il nome utente";
 
 "Connect" = "Entra";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternativamente, puoi utilizzare Safari.";
 "Download" = "Scarica";
 
-"Language:" = "Lingua:";
+"Language" = "Lingua";
 "choose" = "Scegli...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings b/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
index f753c1c54..2c70931c3 100644
--- a/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
+++ b/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Brukernavn:";
-"Password:" = "Passord:";
-"Domain:" = "Domene:";
+"Username" = "Brukernavn";
+"Password" = "Passord";
+"Domain" = "Domene";
 "Remember username" = "Husk brukernavn";
 
 "Connect" = "Koble til";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternativt kan du også bruke Safari.";
 "Download" = "Last ned";
 
-"Language:" = "Språk:";
+"Language" = "Språk";
 "choose" = "Velg ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
index 5aaa9f4f4..3481093e3 100644
--- a/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
+++ b/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Brukernavn:";
-"Password:" = "Passord:";
-"Domain:" = "Domain:";
+"Username" = "Brukernavn";
+"Password" = "Passord";
+"Domain" = "Domain";
 "Remember username" = "Husk brukernavn";
 
 "Connect" = "Logg inn";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternativt kan du også bruke Safari.";
 "Download" = "Last ned";
 
-"Language:" = "Språk:";
+"Language" = "Språk";
 "choose" = "Velg ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Polish.lproj/Localizable.strings b/UI/MainUI/Polish.lproj/Localizable.strings
index fc60f99e3..62105b655 100644
--- a/UI/MainUI/Polish.lproj/Localizable.strings
+++ b/UI/MainUI/Polish.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Nazwa użytkownika:";
-"Password:" = "Hasło:";
-"Domain:" = "Domena:";
+"Username" = "Nazwa użytkownika";
+"Password" = "Hasło";
+"Domain" = "Domena";
 "Remember username" = "Pamiętaj nazwę użytkownika";
 
 "Connect" = "Zaloguj";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternatywnie możesz używać również przeglądarki Safari.";
 "Download" = "Pobierz";
 
-"Language:" = "Język:";
+"Language" = "Język";
 "choose" = "Wybierz ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Russian.lproj/Localizable.strings b/UI/MainUI/Russian.lproj/Localizable.strings
index 8e17e5ef0..fde95a6ae 100644
--- a/UI/MainUI/Russian.lproj/Localizable.strings
+++ b/UI/MainUI/Russian.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Логин:";
-"Password:" = "Пароль:";
-"Domain:" = "Домен:";
+"Username" = "Логин";
+"Password" = "Пароль";
+"Domain" = "Домен";
 "Remember username" = "Запомнить имя пользователя";
 
 "Connect" = "Соединение";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Также можно использовать Safari.";
 "Download" = "Скачать";
 
-"Language:" = "Язык:";
+"Language" = "Язык";
 "choose" = "Выбрать ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Slovak.lproj/Localizable.strings b/UI/MainUI/Slovak.lproj/Localizable.strings
index 00239a599..f2272dd65 100644
--- a/UI/MainUI/Slovak.lproj/Localizable.strings
+++ b/UI/MainUI/Slovak.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Užívateľské meno:";
-"Password:" = "Heslo:";
-"Domain:" = "Doména:";
+"Username" = "Užívateľské meno";
+"Password" = "Heslo";
+"Domain" = "Doména";
 "Remember username" = "Zapamätať uživateľské meno";
 
 "Connect" = "Pripojiť";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternatívne je možné použiť aj Safari.";
 "Download" = "Stiahnuť";
 
-"Language:" = "Jazyk:";
+"Language" = "Jazyk";
 "choose" = "Výber ...";
 "Arabic" = "العربية";
 "Catalan" = "Katalánsky";
diff --git a/UI/MainUI/Slovenian.lproj/Localizable.strings b/UI/MainUI/Slovenian.lproj/Localizable.strings
index ef5fe0c51..9d7f33379 100644
--- a/UI/MainUI/Slovenian.lproj/Localizable.strings
+++ b/UI/MainUI/Slovenian.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Uporabniško ime:";
-"Password:" = "Geslo:";
-"Domain:" = "Domena:";
+"Username" = "Uporabniško ime";
+"Password" = "Geslo";
+"Domain" = "Domena";
 "Remember username" = "Zapomni si up. ime";
 
 "Connect" = "Poveži";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Alternativno lahko uporabljaš tudi Safari.";
 "Download" = "Prenos";
 
-"Language:" = "Jezik:";
+"Language" = "Jezik";
 "choose" = "Izberi ...";
 "Arabic" = "العربية";
 "Catalan" = "Català";
diff --git a/UI/MainUI/SpanishArgentina.lproj/Localizable.strings b/UI/MainUI/SpanishArgentina.lproj/Localizable.strings
index 11504571d..804006ff9 100644
--- a/UI/MainUI/SpanishArgentina.lproj/Localizable.strings
+++ b/UI/MainUI/SpanishArgentina.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Usuario:";
-"Password:" = "Contraseña:";
-"Domain:" = "Dominio:";
+"Username" = "Usuario";
+"Password" = "Contraseña";
+"Domain" = "Dominio";
 "Remember username" = "Recordar el nombre de usuario";
 
 "Connect" = "Conectar";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Como alternativa, puede usar Safari.";
 "Download" = "Descarga";
 
-"Language:" = "Idioma:";
+"Language" = "Idioma";
 "choose" = "Elija ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/SpanishSpain.lproj/Localizable.strings b/UI/MainUI/SpanishSpain.lproj/Localizable.strings
index 35350ec58..479321ffb 100644
--- a/UI/MainUI/SpanishSpain.lproj/Localizable.strings
+++ b/UI/MainUI/SpanishSpain.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Usuario:";
-"Password:" = "Contraseña:";
-"Domain:" = "Dominio:";
+"Username" = "Usuario";
+"Password" = "Contraseña";
+"Domain" = "Dominio";
 "Remember username" = "Recordar usuario";
 
 "Connect" = "Conectar";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Como alternativa, puede usar Safari.";
 "Download" = "Descarga";
 
-"Language:" = "Idioma:";
+"Language" = "Idioma";
 "choose" = "Elija ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Swedish.lproj/Localizable.strings b/UI/MainUI/Swedish.lproj/Localizable.strings
index d44508b20..e8c165a34 100644
--- a/UI/MainUI/Swedish.lproj/Localizable.strings
+++ b/UI/MainUI/Swedish.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Användarnamn:";
-"Password:" = "Lösenord:";
-"Domain:" = "Domain:";
+"Username" = "Användarnamn";
+"Password" = "Lösenord";
+"Domain" = "Domain";
 
 "Connect" = "Logga in";
 
@@ -16,7 +16,7 @@
 "alternativeBrowserSafari" = "Alternativt kan du också använda Safari.";
 "Download" = "Ladda ner";
 
-"Language:" = "Språk:";
+"Language" = "Språk";
 "choose" = "Välj ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Ukrainian.lproj/Localizable.strings b/UI/MainUI/Ukrainian.lproj/Localizable.strings
index a81718e8a..f18b55f22 100644
--- a/UI/MainUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/MainUI/Ukrainian.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Лоґін:";
-"Password:" = "Пароль:";
-"Domain:" = "Домен:";
+"Username" = "Лоґін";
+"Password" = "Пароль";
+"Domain" = "Домен";
 "Remember username" = "Пам’ятати мене";
 
 "Connect" = "Увійти";
@@ -17,7 +17,7 @@
 "alternativeBrowserSafari" = "Також можна використовувати Safari.";
 "Download" = "Звантажити";
 
-"Language:" = "Мова:";
+"Language" = "Мова";
 "choose" = "Вибрати ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/MainUI/Welsh.lproj/Localizable.strings b/UI/MainUI/Welsh.lproj/Localizable.strings
index eb8200a06..d9e58ef44 100644
--- a/UI/MainUI/Welsh.lproj/Localizable.strings
+++ b/UI/MainUI/Welsh.lproj/Localizable.strings
@@ -2,9 +2,9 @@
 
 "title" = "SOGo";
 
-"Username:" = "Enw defnyddiwr:";
-"Password:" = "Cyfrinair:";
-"Domain:" = "Domain:";
+"Username" = "Enw defnyddiwr";
+"Password" = "Cyfrinair";
+"Domain" = "Domain";
 
 "Connect" = "Cysylltu";
 
@@ -16,7 +16,7 @@
 "alternativeBrowserSafari" = "Medrwch hefyd defnyddio Safari.";
 "Download" = "Lawrlwytho";
 
-"Language:" = "Iaith:";
+"Language" = "Iaith";
 "choose" = "Dewis ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
diff --git a/UI/PreferencesUI/Arabic.lproj/Localizable.strings b/UI/PreferencesUI/Arabic.lproj/Localizable.strings
index 14c11e534..ff590e9a0 100644
--- a/UI/PreferencesUI/Arabic.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Arabic.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "تمكين الرد التلقائي أثناء العطلة";
-"Auto reply message :" = "رسالة الرد التلقائي:";
-"Email addresses (separated by commas) :" = "عناوين البريد الإلكتروني (مفصولة بفواصل):";
+"Auto reply message " = "رسالة الرد التلقائي";
+"Email addresses (separated by commas) " = "عناوين البريد الإلكتروني (مفصولة بفواصل)";
 "Add default email addresses" = "إضافة عناوين البريد الإلكتروني الافتراضية";
-"Days between responses :" = "عدد الأيام بين الردود:";
+"Days between responses " = "عدد الأيام بين الردود";
 "Do not send responses to mailing lists" = "لا ترسل ردود الى القوائم البريدية";
 "Disable auto reply on" = "تعطيل الرد التلقائي في";
 "Please specify your message and your email addresses for which you want to enable auto reply."
@@ -41,10 +41,10 @@
 = "يرجى تحديد العنوان الذي تريد إعادة توجيه رسائلك له.";
 
 /* d & t */
-"Current Time Zone :" = "التوقيت الزمني الحالى:";
-"Short Date Format :" = "التاريخ بالصيغة المختصرة:";
-"Long Date Format :" = "التاريخ بالصيغة الكاملة:";
-"Time Format :" = "تنسيق الوقت:";
+"Current Time Zone " = "التوقيت الزمني الحالى";
+"Short Date Format " = "التاريخ بالصيغة المختصرة";
+"Long Date Format " = "التاريخ بالصيغة الكاملة";
+"Time Format " = "تنسيق الوقت";
 
 "default" = "الافتراضي";
 
@@ -90,23 +90,23 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "بداية الاسبوع:";
-"Day start time :" = "بداية يوم العمل:";
-"Day end time :" = "نهاية يوم العمل:";
+"Week begins on " = "بداية الاسبوع";
+"Day start time " = "بداية يوم العمل";
+"Day end time " = "نهاية يوم العمل";
 "Day start time must be prior to day end time." = "يجب أن يكون وقت بداية يوم العمل قبل وقت نهاية يوم العمل.";
 "Show time as busy outside working hours" = "إظهار الوقت  خارج ساعات العمل على أنه مشغول";
-"First week of year :" = "الأسبوع الأول من السنة:";
+"First week of year " = "الأسبوع الأول من السنة";
 "Enable reminders for Calendar items" = "تمكين التذكيرات لعناصر التقويم";
 "Play a sound when a reminder comes due"
 = "تشغيل صوت للتذكير بموعد اقترب وقته";
-"Default reminder :" = "التذكير الإفتراضي:";
+"Default reminder " = "التذكير الإفتراضي";
 
 "firstWeekOfYear_January1" = "يبدأ في 1 يناير";
 "firstWeekOfYear_First4DayWeek" = "أول 4 ايام في الاسبوع";
 "firstWeekOfYear_FirstFullWeek" = "أول اسبوع كامل";
 
 /* Default Calendar */
-"Default calendar :" = "التقويم الإفتراضي:";
+"Default calendar " = "التقويم الإفتراضي";
 "selectedCalendar" = "التقويم المحدد";
 "personalCalendar" = "التقويم الشخصي";
 "firstCalendar" = "أول تقويم ممكن";
@@ -136,11 +136,11 @@
 "refreshview_every_30_minutes" = "كل 30 دقيقة";
 "refreshview_once_per_hour" = "مرة كل ساعة";
 
-"Forward messages:" = "أعد توجيه الرسائل:";
+"Forward messages" = "أعد توجيه الرسائل";
 "messageforward_inline" = "مضمنة";
 "messageforward_attached" = "كمرفق";
 
-"When replying to a message:" = "متى يُرَدُّ على الرِّسالة:";
+"When replying to a message" = "متى يُرَدُّ على الرِّسالة";
 "replyplacement_above" = "بدء الرد فوق الاقتباس";
 "replyplacement_below" = "بدء الرد تحت الاقتباس";
 "And place my signature" = "ووضع توقيعي";
@@ -156,17 +156,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "حساب بريد إلكتروني جديد";
 
-"Server Name:" = "أسم الخادم:";
-"Port:" = "مدخل:";
-"Encryption:" = "التشفير:";
+"Server Name" = "أسم الخادم";
+"Port" = "مدخل";
+"Encryption" = "التشفير";
 "None" = "بلا";
-"User Name:" = "اسم المستخدم:";
-"Password:" = "كلمة المرور:";
+"User Name" = "اسم المستخدم";
+"Password" = "كلمة المرور";
 
-"Full Name:" = "الإسم الكامل:";
-"Email:" = "البريد الإلكتروني:";
-"Reply To Email:" = "الرد على البريد الإلكتروني:";
-"Signature:" = "التوقيع:";
+"Full Name" = "الإسم الكامل";
+"Email" = "البريد الإلكتروني";
+"Reply To Email" = "الرد على البريد الإلكتروني";
+"Signature" = "التوقيع";
 "(Click to create)" = "(انقر للصنع)";
 
 "Signature" = "التوقيع";
@@ -179,13 +179,13 @@
 "Additional Parameters" = "معلمات إضافية";
 
 /* password */
-"New password:" = "كلمة مرور جديدة:";
-"Confirmation:" = "تأكيد:";
+"New password" = "كلمة مرور جديدة";
+"Confirmation" = "تأكيد";
 "Change" = "لا شيء";
 
 /* Event+task classifications */
-"Default events classification :" = "تصنيف الأحداث الافتراضية:";
-"Default tasks classification :" = "تصنيف المهام الافتراضية  :";
+"Default events classification " = "تصنيف الأحداث الافتراضية";
+"Default tasks classification " = "تصنيف المهام الافتراضية  ";
 "PUBLIC_item" = "علني";
 "CONFIDENTIAL_item" = "سري";
 "PRIVATE_item" = "خاص";
@@ -199,9 +199,9 @@
 "Contacts" = "دفتر العناوين";
 "Mail" = "بريد";
 "Last" = "أخر إستخدام";
-"Default Module :" = "وحدة نمطية افتراضية :";
+"Default Module " = "وحدة نمطية افتراضية ";
 
-"Language :" = "اللغة:";
+"Language " = "اللغة";
 "choose" = "اختيار ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -231,12 +231,12 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "عندما اتلقى طلبا لإرسال ايصال استلام:";
+"When I receive a request for a return receipt" = "عندما اتلقى طلبا لإرسال ايصال استلام";
 "Never send a return receipt" = "لا ترسل إيصال استلام";
 "Allow return receipts for some messages" = "السماح بإرسال إيصالات استلام مقابل بعض الرسائل الواردة";
-"If I'm not in the To or Cc of the message:" = "إذا لم أكن من ضمن المرسل لهم او المرسل لهم نسخة:";
-"If the sender is outside my domain:" = "إذا كان المرسل من خارج النطاق:";
-"In all other cases:" = "في جميع الحالات الأخرى:";
+"If I'm not in the To or Cc of the message" = "إذا لم أكن من ضمن المرسل لهم او المرسل لهم نسخة";
+"If the sender is outside my domain" = "إذا كان المرسل من خارج النطاق";
+"In all other cases" = "في جميع الحالات الأخرى";
 
 "Never send" = "لم يرسل";
 "Always send" = "إرسال دائما";
diff --git a/UI/PreferencesUI/Basque.lproj/Localizable.strings b/UI/PreferencesUI/Basque.lproj/Localizable.strings
index a3d3947e8..bf417a522 100644
--- a/UI/PreferencesUI/Basque.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Basque.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Gaitu \"oporretan nago\" erantzun automatikoa";
-"Auto reply message :" = "Erantzun automatikorako mezua:";
-"Email addresses (separated by commas) :" = "Email helbideak (koma bidez banatuak):";
+"Auto reply message " = "Erantzun automatikorako mezua";
+"Email addresses (separated by commas) " = "Email helbideak (koma bidez banatuak)";
 "Add default email addresses" = "Gehitu email helbide lehenetsiak";
-"Days between responses :" = "Erantzunen arteko egunak:";
+"Days between responses " = "Erantzunen arteko egunak";
 "Do not send responses to mailing lists" = "Ez bidali erantzunak email zerrendatara";
 "Disable auto reply on" = "Ezgaitu erantzun automatikoa";
 "Always send vacation message response" = "'Oporretan nago' erantzun mezua beti bidali";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Uneko ordu-zona:";
-"Short Date Format :" = "Data-formatu laburra:";
-"Long Date Format :" = "Data-formatu luzea:";
-"Time Format :" = "Ordu-formatua:";
+"Current Time Zone " = "Uneko ordu-zona";
+"Short Date Format " = "Data-formatu laburra";
+"Long Date Format " = "Data-formatu luzea";
+"Time Format " = "Ordu-formatua";
 
 "default" = "Lehenetsia";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Astea hasteko eguna:";
-"Day start time :" = "Egunaren hasiera ordua:";
-"Day end time :" = "Egunaren amaiera ordua:";
+"Week begins on " = "Astea hasteko eguna";
+"Day start time " = "Egunaren hasiera ordua";
+"Day end time " = "Egunaren amaiera ordua";
 "Day start time must be prior to day end time." = "Egunaren hasiera orduak amaiera orduak baino lehenago behar du izan.";
 "Show time as busy outside working hours" = "Erakutsi denbora lanpetuta bezala lan orduetatik kanpo";
-"First week of year :" = "Urteko lehen astea:";
+"First week of year " = "Urteko lehen astea";
 "Enable reminders for Calendar items" = "Gaitu oroigarriak egutegiko elementuetarako";
 "Play a sound when a reminder comes due" = "Soinua jo oroigarri baten ondorioz.";
-"Default reminder :" = "Lehenetsitako oroigarria:";
+"Default reminder " = "Lehenetsitako oroigarria";
 
 "firstWeekOfYear_January1" = "Urtarrilak 1eab hasten da";
 "firstWeekOfYear_First4DayWeek" = "Lehenengo 4 eguneko astea";
 "firstWeekOfYear_FirstFullWeek" = "Lehenengo aste osoa";
 
 "Prevent from being invited to appointments" = "Hitzorduetara gonbidatua izatea eragotzi.";
-"White list for appointment invitations:" = "Hitzordu gonbidapenetarako zerrenda-zuria:";
+"White list for appointment invitations" = "Hitzordu gonbidapenetarako zerrenda-zuria";
 "Contacts Names" = "Kontaktuen izenak";
 
 /* Default Calendar */
-"Default calendar :" = "Lehenetsitako egutegia:";
+"Default calendar " = "Lehenetsitako egutegia";
 "selectedCalendar" = "Aukeratutako egutegia";
 "personalCalendar" = "Egutegi pertsonala";
 "firstCalendar" = "Gaitutako lehenengo egutegia";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Antolatu mezuak haritan";
 "When sending mail, add unknown recipients to my" = "Mezua bidaltzerakoan gehitu jasotzaile ezezagunak nere";
 
-"Forward messages:" = "Mezuak birbidali:";
+"Forward messages" = "Mezuak birbidali";
 "messageforward_inline" = "Mezuaren barruan";
 "messageforward_attached" = "Iruzkin bezala";
 
-"When replying to a message:" = "Mezu bati erantzuterakoan:";
+"When replying to a message" = "Mezu bati erantzuterakoan";
 "replyplacement_above" = "Hasi nere erantzuna aipamenaren gainean";
 "replyplacement_below" = "Hasi nere erantzuna aipamenaren azpian";
 "And place my signature" = "Eta jarri nere sinadura";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Email kontu berria";
 
-"Server Name:" = "Zerbitzariaren izena:";
-"Port:" = "Portua:";
-"Encryption:" = "Zifraketa:";
+"Server Name" = "Zerbitzariaren izena";
+"Port" = "Portua";
+"Encryption" = "Zifraketa";
 "None" = "Bat ere ez";
-"User Name:" = "Erabiltzaile izena";
-"Password:" = "Pasahitza";
+"User Name" = "Erabiltzaile izena";
+"Password" = "Pasahitza";
 
-"Full Name:" = "Izen osoa:";
-"Email:" = "Emaila:";
-"Reply To Email:" = "Erantzun honi emaila:";
-"Signature:" = "Sinadura";
+"Full Name" = "Izen osoa";
+"Email" = "Emaila";
+"Reply To Email" = "Erantzun honi emaila";
+"Signature" = "Sinadura";
 "(Click to create)" = "(Klikatu sortzeko)";
 
 "Signature" = "Sinadura";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Beste parametroak";
 
 /* password */
-"New password:" = "Pasahitz berria:";
-"Confirmation:" = "Berrespena:";
+"New password" = "Pasahitz berria";
+"Confirmation" = "Berrespena";
 "Change" = "Aldatu";
 
 /* Event+task classifications */
-"Default events classification :" = "Ekitaldien sailkapen lehenetsia:";
-"Default tasks classification :" = "Zereginen sailkapen lehenetsia:";
+"Default events classification " = "Ekitaldien sailkapen lehenetsia";
+"Default tasks classification " = "Zereginen sailkapen lehenetsia";
 "PUBLIC_item" = "Publikoa";
 "CONFIDENTIAL_item" = "Isilpekoa";
 "PRIVATE_item" = "Pribatua";
@@ -210,10 +210,10 @@
 "Contacts" = "Helbide liburua";
 "Mail" = "Emaila";
 "Last" = "Azkenekoz erabilia";
-"Default Module :" = "Lehenetsitako modulua:";
-"SOGo Version :" = "SOGo betsioa:";
+"Default Module " = "Lehenetsitako modulua";
+"SOGo Version " = "SOGo betsioa";
 
-"Language :" = "Hizkuntza";
+"Language " = "Hizkuntza";
 "choose" = "Aukeratu ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -242,7 +242,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Eguneratu ikuspegia";
+"Refresh View " = "Eguneratu ikuspegia";
 "refreshview_manually" = "Eskuz";
 "refreshview_every_minute" = "Minuturo";
 "refreshview_every_2_minutes" = "2 minuturo";
@@ -253,12 +253,12 @@
 "refreshview_once_per_hour" = "Orduro";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Jasotze-agiriaren eskakizun bat jasotzen dudanean:";
+"When I receive a request for a return receipt" = "Jasotze-agiriaren eskakizun bat jasotzen dudanean";
 "Never send a return receipt" = "Jasotze agiria inoiz ez bidali.";
 "Allow return receipts for some messages" = "Baimendu jasotze-agiriak zenbait mezutarako.";
-"If I'm not in the To or Cc of the message:" = "Ez banago mezuaren 'nori' edo 'kopia' eremuetan:";
-"If the sender is outside my domain:" = "Bidaltzailea nere domeinutik kanpo badago:";
-"In all other cases:" = "Beste kasu guztietan:";
+"If I'm not in the To or Cc of the message" = "Ez banago mezuaren 'nori' edo 'kopia' eremuetan";
+"If the sender is outside my domain" = "Bidaltzailea nere domeinutik kanpo badago";
+"In all other cases" = "Beste kasu guztietan";
 
 "Never send" = "Inoiz ez bidali";
 "Always send" = "Bidali beti";
diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
index 95e760d0d..4802b3de3 100644
--- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Habilitar auto resposta de férias";
-"Auto reply message :" = "Auto Responder somente uma vez a cada remetente com o seguinte texto:";
-"Email addresses (separated by commas) :" = "Endereço de e-mail (separado por vírgulas):";
+"Auto reply message " = "Auto Responder somente uma vez a cada remetente com o seguinte texto";
+"Email addresses (separated by commas) " = "Endereço de e-mail (separado por vírgulas)";
 "Add default email addresses" = "Adicionar endereço de e-mail padrão";
-"Days between responses :" = "Dias entre respostas:";
+"Days between responses " = "Dias entre respostas";
 "Do not send responses to mailing lists" = "Não envie respostas para lista de e-mails";
 "Disable auto reply on" = "Desativar resposta automática em";
 "Always send vacation message response" = "Sempre enviar resposta de mensagem de férias";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Fuso Horário:";
-"Short Date Format :" = "Formato da Data (Curto) :";
-"Long Date Format :" = "Formato da Data (Longo) :";
-"Time Format :" = "Formato da Hora :";
+"Current Time Zone " = "Fuso Horário";
+"Short Date Format " = "Formato da Data (Curto) ";
+"Long Date Format " = "Formato da Data (Longo) ";
+"Time Format " = "Formato da Hora ";
 
 "default" = "Padrão";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "A Semana começa em :";
-"Day start time :" = "O Dia começa as :";
-"Day end time :" = "O Dia termina as :";
+"Week begins on " = "A Semana começa em ";
+"Day start time " = "O Dia começa as ";
+"Day end time " = "O Dia termina as ";
 "Day start time must be prior to day end time." = "Dia de inicio deve ser anterior ao dia de fim.";
 "Show time as busy outside working hours" = "Exibir horas como ocupadas quando fora do horário de serviço";
-"First week of year :" = "Primeira semana do ano :";
+"First week of year " = "Primeira semana do ano ";
 "Enable reminders for Calendar items" = "Habilitar lembretes para os itens do Calendário";
 "Play a sound when a reminder comes due" = "Executar um som quando existir um lembrete";
-"Default reminder :" = "Lembrete padrão :";
+"Default reminder " = "Lembrete padrão ";
 
 "firstWeekOfYear_January1" = "Inicia em 01 de janeiro";
 "firstWeekOfYear_First4DayWeek" = "Primeira semana com 4 dias";
 "firstWeekOfYear_FirstFullWeek" = "Primeira semana com 5 dias";
 
 "Prevent from being invited to appointments" = "Impedir de ser convidado para um compromisso";
-"White list for appointment invitations:" = "Lista branca para convites de compromissos:";
+"White list for appointment invitations" = "Lista branca para convites de compromissos";
 "Contacts Names" = "Nomes de Contatos";
 
 /* Default Calendar */
-"Default calendar :" = "Calendário Padrão";
+"Default calendar " = "Calendário Padrão";
 "selectedCalendar" = "Calendário selecionado";
 "personalCalendar" = "Calendário pessoal";
 "firstCalendar" = "Calendário habilizado pela primeira vez";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Ordenar mensagens por tópicos";
 "When sending mail, add unknown recipients to my" = "Ao enviar e-mail, adicionar destinatários desconhecidos ao meu";
 
-"Forward messages:" = "Encaminhar mensagens:";
+"Forward messages" = "Encaminhar mensagens";
 "messageforward_inline" = "No corpo da mensagem";
 "messageforward_attached" = "Como anexo";
 
-"When replying to a message:" = "Ao responder a uma mensagem:";
+"When replying to a message" = "Ao responder a uma mensagem";
 "replyplacement_above" = "Começar minha resposta acima das citações";
 "replyplacement_below" = "Começar minha resposta abaixo das citações";
 "And place my signature" = "E colocar minha assinatura";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nova conta de e-mail";
 
-"Server Name:" = "Nome do Servidor:";
-"Port:" = "Porta:";
-"Encryption:" = "Encriptação:";
+"Server Name" = "Nome do Servidor";
+"Port" = "Porta";
+"Encryption" = "Encriptação";
 "None" = "Nenhum";
-"User Name:" = "Nome do Usuário:";
-"Password:" = "Senha:";
+"User Name" = "Nome do Usuário";
+"Password" = "Senha";
 
-"Full Name:" = "Nome Completo:";
-"Email:" = "E-mail:";
-"Reply To Email:" = "Responder para o Email:";
-"Signature:" = "Assinatura:";
+"Full Name" = "Nome Completo";
+"Email" = "E-mail";
+"Reply To Email" = "Responder para o Email";
+"Signature" = "Assinatura";
 "(Click to create)" = "(Click para criar)";
 
 "Signature" = "Assinatura";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Parâmetros Adicionais";
 
 /* password */
-"New password:" = "Nova senha:";
-"Confirmation:" = "Confirmação:";
+"New password" = "Nova senha";
+"Confirmation" = "Confirmação";
 "Change" = "Alterar";
 
 /* Event+task classifications */
-"Default events classification :" = "Classificação padrão do compromisso:";
-"Default tasks classification :" = "Classificação padrão da tarefa:";
+"Default events classification " = "Classificação padrão do compromisso";
+"Default tasks classification " = "Classificação padrão da tarefa";
 "PUBLIC_item" = "Público";
 "CONFIDENTIAL_item" = "Confidencial";
 "PRIVATE_item" = "Particular";
@@ -210,10 +210,10 @@
 "Contacts" = "Catálogo";
 "Mail" = "Correio";
 "Last" = "Último usado";
-"Default Module :" = "Módulo Padrão:";
-"SOGo Version :" = "Versão do SOGo:";
+"Default Module " = "Módulo Padrão";
+"SOGo Version " = "Versão do SOGo";
 
-"Language :" = "Idioma :";
+"Language " = "Idioma ";
 "choose" = "Escolha ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -241,7 +241,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Atualizar a Visualização:";
+"Refresh View " = "Atualizar a Visualização";
 "refreshview_manually" = "Manualmente";
 "refreshview_every_minute" = "A cada minuto";
 "refreshview_every_2_minutes" = "A cada 2 minutos";
@@ -252,12 +252,12 @@
 "refreshview_once_per_hour" = "Uma vez por hora";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Quando eu receber uma confirmação de leitura:";
+"When I receive a request for a return receipt" = "Quando eu receber uma confirmação de leitura";
 "Never send a return receipt" = "Nunca enviar confirmação";
 "Allow return receipts for some messages" = "Permitir confirmação para algumas mensagens";
-"If I'm not in the To or Cc of the message:" = "Se eu não estiver no Para ou Cc da mensagem:";
-"If the sender is outside my domain:" = "Se o remetente está fora do meu domínio:";
-"In all other cases:" = "Em todos os outros casos:";
+"If I'm not in the To or Cc of the message" = "Se eu não estiver no Para ou Cc da mensagem";
+"If the sender is outside my domain" = "Se o remetente está fora do meu domínio";
+"In all other cases" = "Em todos os outros casos";
 
 "Never send" = "Nunca envia";
 "Always send" = "Sempre envia";
diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings
index 7ef1ae962..2a78716f7 100644
--- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Activar resposta automàtica";
-"Auto reply message :" = "Respondre automàticament una sola vegada a cada remitent amb aquest text: ";
-"Email addresses (separated by commas) :" = "Adreces de correu (separades per comes) :";
+"Auto reply message " = "Respondre automàticament una sola vegada a cada remitent amb aquest text ";
+"Email addresses (separated by commas) " = "Adreces de correu (separades per comes) ";
 "Add default email addresses" = "Afegir adreces de correu per defecte";
-"Days between responses :" = "Dies entre respostes :";
+"Days between responses " = "Dies entre respostes ";
 "Do not send responses to mailing lists" = "No enviar respostes a llistes de correu";
 "Disable auto reply on" = "Desactivar la resposta automàtica en";
 "Please specify your message and your email addresses for which you want to enable auto reply."
@@ -41,10 +41,10 @@
 = "Especifiqueu l'adreça a la qual voleu redirigir els missatges.";
 
 /* d & t */
-"Current Time Zone :" = "Zona horària actual: ";
-"Short Date Format :" = "Format de data curt: ";
-"Long Date Format :" = "Format de data llarg: ";
-"Time Format :" = "Format d'hora: ";
+"Current Time Zone " = "Zona horària actual ";
+"Short Date Format " = "Format de data curt ";
+"Long Date Format " = "Format de data llarg ";
+"Time Format " = "Format d'hora ";
 
 "default" = "Per defecte";
 
@@ -90,26 +90,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Setmana comença en: ";
-"Day start time :" = "Hora inici dia: ";
-"Day end time :" = "Hora final dia: ";
+"Week begins on " = "Setmana comença en ";
+"Day start time " = "Hora inici dia ";
+"Day end time " = "Hora final dia ";
 "Day start time must be prior to day end time." = "L'hora de començament del dia ha de ser anterior a l'hora d'acabament.";
 "Show time as busy outside working hours" = "Mostra el temps com ocupat fora de les hores de treball";
-"First week of year :" = "Primera setmana de l'any: ";
+"First week of year " = "Primera setmana de l'any ";
 "Enable reminders for Calendar items" = "Habilitar recordatoris per a ítems del calendari";
 "Play a sound when a reminder comes due" = "Usar senyal acústic per als recordatoris";
-"Default reminder :" = "Recordatori per omissió: ";
+"Default reminder " = "Recordatori per omissió ";
 
 "firstWeekOfYear_January1" = "Comença l'1 de gener";
 "firstWeekOfYear_First4DayWeek" = "Primera setmana de 4 dies";
 "firstWeekOfYear_FirstFullWeek" = "Primera setmana completa";
 
 "Prevent from being invited to appointments" = "Impedeix ser convidat a cites";
-"White list for appointment invitations:" = "Llista blanca per a invitacions a cites:";
+"White list for appointment invitations" = "Llista blanca per a invitacions a cites";
 "Contacts Names" = "Nom dels Contactes";
 
 /* Default Calendar */
-"Default calendar :" = "Calendari per defecte";
+"Default calendar " = "Calendari per defecte";
 "selectedCalendar" = "Calendari seleccionat";
 "personalCalendar" = "Calendari personal";
 "firstCalendar" = "Primer calendari habilitat";
@@ -144,11 +144,11 @@
 "refreshview_every_30_minutes" = "Cada 30 minuts";
 "refreshview_once_per_hour" = "Cada hora";
 
-"Forward messages:" = "Reenviar missatges:";
+"Forward messages" = "Reenviar missatges";
 "messageforward_inline" = "Incorporats";
 "messageforward_attached" = "Com a adjunts";
 
-"When replying to a message:" = "En contestar a un missatge";
+"When replying to a message" = "En contestar a un missatge";
 "replyplacement_above" = "amb la resposta abans";
 "replyplacement_below" = "amb la resposta després";
 "And place my signature" = "Col·locant la signatura";
@@ -168,17 +168,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Compte de correu nou";
 
-"Server Name:" = "Servidor:";
-"Port:" = "Port:";
-"Encryption:" = "Encriptació:";
+"Server Name" = "Servidor";
+"Port" = "Port";
+"Encryption" = "Encriptació";
 "None" = "Cap";
-"User Name:" = "Usuari:";
-"Password:" = "Contrasenya:";
+"User Name" = "Usuari";
+"Password" = "Contrasenya";
 
-"Full Name:" = "Nom complet:";
-"Email:" = "Correu electrònic:";
-"Reply To Email:" = "Respondre a aquesta adreça de correu: ";
-"Signature:" = "Signatura:";
+"Full Name" = "Nom complet";
+"Email" = "Correu electrònic";
+"Reply To Email" = "Respondre a aquesta adreça de correu ";
+"Signature" = "Signatura";
 "(Click to create)" = "(Clic per a crear-la)";
 
 "Signature" = "Signatura";
@@ -191,13 +191,13 @@
 "Additional Parameters" = "Paràmetres addicionals";
 
 /* password */
-"New password:" = "Contrasenya nova:";
-"Confirmation:" = "Confirmar contrasenya nova:";
+"New password" = "Contrasenya nova";
+"Confirmation" = "Confirmar contrasenya nova";
 "Change" = "Canviar";
 
 /* Event+task classifications */
-"Default events classification :" = "Classificació per defecte dels esdeveniments ";
-"Default tasks classification :" = "Classificació per defecte de les tasques ";
+"Default events classification " = "Classificació per defecte dels esdeveniments ";
+"Default tasks classification " = "Classificació per defecte de les tasques ";
 "PUBLIC_item" = "Públic ";
 "CONFIDENTIAL_item" = "Confidencial ";
 "PRIVATE_item" = "Privat ";
@@ -211,10 +211,10 @@
 "Contacts" = "Llibreta d'adreces";
 "Mail" = "Correu";
 "Last" = "Últim usat";
-"Default Module :" = "Pàgina per defecte :";
-"SOGo Version :" = "Versió del SOGo:";
+"Default Module " = "Pàgina per defecte ";
+"SOGo Version " = "Versió del SOGo";
 
-"Language :" = "Language :";
+"Language " = "Language ";
 "choose" = "Choose ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -244,12 +244,12 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Quan reba una sol·licitud de justificant de recepció:";
+"When I receive a request for a return receipt" = "Quan reba una sol·licitud de justificant de recepció";
 "Never send a return receipt" = "No enviar mai un justificant de recepció";
 "Allow return receipts for some messages" = "Permetre els justificants de recepció per alguns dels missatges";
-"If I'm not in the To or Cc of the message:" = "Si no estic en el camp Per o CC del missatge:";
-"If the sender is outside my domain:" = "Si el remitent està fora del meu domini:";
-"In all other cases:" = "En tots els altres casos:";
+"If I'm not in the To or Cc of the message" = "Si no estic en el camp Per o CC del missatge";
+"If the sender is outside my domain" = "Si el remitent està fora del meu domini";
+"In all other cases" = "En tots els altres casos";
 
 "Never send" = "No enviar mai";
 "Always send" = "Enviar sempre";
diff --git a/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings b/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
index c2f558d92..f472308e2 100644
--- a/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
+++ b/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "開啟休假自動回覆";
-"Auto reply message :" = "自動回覆內容:";
-"Email addresses (separated by commas) :" = "電子郵件地址 (用逗號分隔):";
+"Auto reply message " = "自動回覆內容";
+"Email addresses (separated by commas) " = "電子郵件地址 (用逗號分隔)";
 "Add default email addresses" = "增加預設的電子郵件地址";
-"Days between responses :" = "回覆間隔天數:";
+"Days between responses " = "回覆間隔天數";
 "Do not send responses to mailing lists" = "不要寄送回覆給列表的帳號";
 "Disable auto reply on" = "關閉自動回覆功能";
 "Always send vacation message response" = "開啟休假自動回覆功能";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "時區:";
-"Short Date Format :" = "簡易日期格式:";
-"Long Date Format :" = "完整日期格式:";
-"Time Format :" = "時間格式:";
+"Current Time Zone " = "時區";
+"Short Date Format " = "簡易日期格式";
+"Long Date Format " = "完整日期格式";
+"Time Format " = "時間格式";
 
 "default" = "預設";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "一週起始日為:";
-"Day start time :" = "每日開始時間是:";
-"Day end time :" = "每日結束時間是:";
+"Week begins on " = "一週起始日為";
+"Day start time " = "每日開始時間是";
+"Day end time " = "每日結束時間是";
 "Day start time must be prior to day end time." = "每日開始時間必須早於結束時間。";
 "Show time as busy outside working hours" = "顯示工作時間以下時段顯示為忙碌";
-"First week of year :" = "一年的第一週:";
+"First week of year " = "一年的第一週";
 "Enable reminders for Calendar items" = "開啟行事曆的提醒功能";
 "Play a sound when a reminder comes due" = "提醒時撥放音效";
-"Default reminder :" = "預設提醒:";
+"Default reminder " = "預設提醒";
 
 "firstWeekOfYear_January1" = "開始於一月一日";
 "firstWeekOfYear_First4DayWeek" = "第一個只有四天的週";
 "firstWeekOfYear_FirstFullWeek" = "第一個完整的週";
 
 "Prevent from being invited to appointments" = "拒絶邀請";
-"White list for appointment invitations:" = "接受邀請的名單列表:";
+"White list for appointment invitations" = "接受邀請的名單列表";
 "Contacts Names" = "連絡人姓名";
 
 /* Default Calendar */
-"Default calendar :" = "預設行事曆";
+"Default calendar " = "預設行事曆";
 "selectedCalendar" = "選擇的行事曆";
 "personalCalendar" = "個人行事曆";
 "firstCalendar" = "第一個有效的行事曆";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "依指定的方式進行排序";
 "When sending mail, add unknown recipients to my" = "寄送信件時，將未知的收件者帳號加入我的通訊錄";
 
-"Forward messages:" = "轉寄信件:";
+"Forward messages" = "轉寄信件";
 "messageforward_inline" = "加入原始信件內容";
 "messageforward_attached" = "將原始信件做為附件";
 
-"When replying to a message:" = "當回覆信件時:";
+"When replying to a message" = "當回覆信件時";
 "replyplacement_above" = "回覆內容在原始信件上面";
 "replyplacement_below" = "回覆內容在原始信件下面";
 "And place my signature" = "增加簽名檔";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "新的電子郵件帳號";
 
-"Server Name:" = "伺服器名稱:";
-"Port:" = "埠號:";
-"Encryption:" = "加密:";
+"Server Name" = "伺服器名稱";
+"Port" = "埠號";
+"Encryption" = "加密";
 "None" = "無";
-"User Name:" = "使用者名稱:";
-"Password:" = "密碼:";
+"User Name" = "使用者名稱";
+"Password" = "密碼";
 
-"Full Name:" = "全名:";
-"Email:" = "電子郵件郵件:";
-"Reply To Email:" = "回覆電子郵件帳號:";
-"Signature:" = "簽名檔:";
+"Full Name" = "全名";
+"Email" = "電子郵件郵件";
+"Reply To Email" = "回覆電子郵件帳號";
+"Signature" = "簽名檔";
 "(Click to create)" = "(點擊後建立)";
 
 "Signature" = "簽名";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "其他參數";
 
 /* password */
-"New password:" = "新密碼";
-"Confirmation:" = "確認:";
+"New password" = "新密碼";
+"Confirmation" = "確認";
 "Change" = "修改";
 
 /* Event+task classifications */
-"Default events classification :" = "預設的事件類別:";
-"Default tasks classification :" = "預設的任務類別:";
+"Default events classification " = "預設的事件類別";
+"Default tasks classification " = "預設的任務類別";
 "PUBLIC_item" = "公開";
 "CONFIDENTIAL_item" = "機密";
 "PRIVATE_item" = "私人";
@@ -210,10 +210,10 @@
 "Contacts" = "通訊錄";
 "Mail" = "郵件";
 "Last" = "上次使用";
-"Default Module :" = "預設模式:";
-"SOGo Version :" = "SOGo版本:";
+"Default Module " = "預設模式";
+"SOGo Version " = "SOGo版本";
 
-"Language :" = "語言:";
+"Language " = "語言";
 "choose" = "選擇...";
 "Arabic" = "العربية";
 "Catalan" = "Català";
@@ -239,7 +239,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "重新整理:";
+"Refresh View " = "重新整理";
 "refreshview_manually" = "手動";
 "refreshview_every_minute" = "每分鐘";
 "refreshview_every_2_minutes" = "每2分鐘";
@@ -250,12 +250,12 @@
 "refreshview_once_per_hour" = "一小時一次";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "當我收到要求讀取回條時:";
+"When I receive a request for a return receipt" = "當我收到要求讀取回條時";
 "Never send a return receipt" = "不傳送回條";
 "Allow return receipts for some messages" = "部份郵件允許傳送回條";
-"If I'm not in the To or Cc of the message:" = "當我的帳號不在郵件的收件者或或副本收件者名單中:";
-"If the sender is outside my domain:" = "當寄件者帳號與我不同網域名稱:";
-"In all other cases:" = "任何其他的情形:";
+"If I'm not in the To or Cc of the message" = "當我的帳號不在郵件的收件者或或副本收件者名單中";
+"If the sender is outside my domain" = "當寄件者帳號與我不同網域名稱";
+"In all other cases" = "任何其他的情形";
 
 "Never send" = "不要傳送回條";
 "Always send" = "傳送回條";
diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings
index aadda48dc..f8ba7426e 100644
--- a/UI/PreferencesUI/Czech.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Zapnout odpovědi v nepřítomnosti";
-"Auto reply message :" = "Zpráva zasílaná v nepřítomnosti :";
-"Email addresses (separated by commas) :" = "Emailové adresy (oddělené čárkami) :";
+"Auto reply message " = "Zpráva zasílaná v nepřítomnosti ";
+"Email addresses (separated by commas) " = "Emailové adresy (oddělené čárkami) ";
 "Add default email addresses" = "Přidat základní emailové adresy";
-"Days between responses :" = "Počet dnů mezi odpověďmi :";
+"Days between responses " = "Počet dnů mezi odpověďmi ";
 "Do not send responses to mailing lists" = "Neposílat odpovědi do konferencí";
 "Disable auto reply on" = "Automatické odpovědi vypnout dne";
 "Always send vacation message response" = "Vždy posílat zprávu v nepřítomnosti";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Současné časové pásmo :";
-"Short Date Format :" = "Krátký formát data :";
-"Long Date Format :" = "Dlouhý formát data :";
-"Time Format :" = "Formát času :";
+"Current Time Zone " = "Současné časové pásmo ";
+"Short Date Format " = "Krátký formát data ";
+"Long Date Format " = "Dlouhý formát data ";
+"Time Format " = "Formát času ";
 
 "default" = "výchozí";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Týden začíná v :";
-"Day start time :" = "Začátek dne :";
-"Day end time :" = "Konec dne :";
+"Week begins on " = "Týden začíná v ";
+"Day start time " = "Začátek dne ";
+"Day end time " = "Konec dne ";
 "Day start time must be prior to day end time." = "Čas Začátek dne musí předcházet času Konec dne.";
 "Show time as busy outside working hours" = "Čas mimo pracovní dobu zobrazovat jako obsazený";
-"First week of year :" = "První týden roku :";
+"First week of year " = "První týden roku ";
 "Enable reminders for Calendar items" = "Povolit upozornění pro události v kalendáři";
 "Play a sound when a reminder comes due" = "Při upozornění přehrát zvuk";
-"Default reminder :" = "Výchozí upozornění :";
+"Default reminder " = "Výchozí upozornění ";
 
 "firstWeekOfYear_January1" = "Začíná 1. ledna";
 "firstWeekOfYear_First4DayWeek" = "První 4-denní týden";
 "firstWeekOfYear_FirstFullWeek" = "První celý týden";
 
 "Prevent from being invited to appointments" = "Blokovat budoucí pozvání na schůzky";
-"White list for appointment invitations:" = "Seznam povolených pro pozvání na schůzky:";
+"White list for appointment invitations" = "Seznam povolených pro pozvání na schůzky";
 "Contacts Names" = "Jména kontaktů";
 
 /* Default Calendar */
-"Default calendar :" = "Výchozí kalendář :";
+"Default calendar " = "Výchozí kalendář ";
 "selectedCalendar" = "Zvolený kalendář";
 "personalCalendar" = "Osobní kalendář";
 "firstCalendar" = "První kalendář";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Třídit zprávy podle souvislostí";
 "When sending mail, add unknown recipients to my" = "Automaticky přidávat odchozí e-mailovou adresu do složky:";
 
-"Forward messages:" = "Přeposlat zprávy:";
+"Forward messages" = "Přeposlat zprávy";
 "messageforward_inline" = "Do řady";
 "messageforward_attached" = "Jako přílohu";
 
-"When replying to a message:" = "Při odpovědi na zprávu:";
+"When replying to a message" = "Při odpovědi na zprávu";
 "replyplacement_above" = "Začít mojí odpověď nad citací";
 "replyplacement_below" = "Začít mojí odpověď pod citací";
 "And place my signature" = "A umístit můj podpis";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nový poštovní účet";
 
-"Server Name:" = "Adresa serveru:";
-"Port:" = "Port:";
-"Encryption:" = "Zabezpečení spojení:";
+"Server Name" = "Adresa serveru";
+"Port" = "Port";
+"Encryption" = "Zabezpečení spojení";
 "None" = "Žádné";
-"User Name:" = "Uživatelské jméno:";
-"Password:" = "Heslo:";
+"User Name" = "Uživatelské jméno";
+"Password" = "Heslo";
 
-"Full Name:" = "Celé jméno:";
-"Email:" = "E-mailová adresa:";
-"Reply To Email:" = "Adresa pro odpověď:";
-"Signature:" = "Podpis:";
+"Full Name" = "Celé jméno";
+"Email" = "E-mailová adresa";
+"Reply To Email" = "Adresa pro odpověď";
+"Signature" = "Podpis";
 "(Click to create)" = "(Klikni pro vytvoření)";
 
 "Signature" = "Podpis";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Dodatečné parametry";
 
 /* password */
-"New password:" = "Nové heslo:";
-"Confirmation:" = "Potvrzení:";
+"New password" = "Nové heslo";
+"Confirmation" = "Potvrzení";
 "Change" = "Změnit";
 
 /* Event+task classifications */
-"Default events classification :" = "Výchozí druh události :";
-"Default tasks classification :" = "Výchozí druh úkolu :";
+"Default events classification " = "Výchozí druh události ";
+"Default tasks classification " = "Výchozí druh úkolu ";
 "PUBLIC_item" = "Veřejné";
 "CONFIDENTIAL_item" = "Důvěrné";
 "PRIVATE_item" = "Soukromé";
@@ -210,10 +210,10 @@
 "Contacts" = "Adresář";
 "Mail" = "Pošta";
 "Last" = "Naposledy použitý";
-"Default Module :" = "Výchozí modul :";
-"SOGo Version :" = "SOGo verze:";
+"Default Module " = "Výchozí modul ";
+"SOGo Version " = "SOGo verze";
 
-"Language :" = "Jazyk :";
+"Language " = "Jazyk ";
 "choose" = "Vybrat ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -242,7 +242,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Aktualizace zobrazení:";
+"Refresh View " = "Aktualizace zobrazení";
 "refreshview_manually" = "Manuálně";
 "refreshview_every_minute" = "Každou minutu";
 "refreshview_every_2_minutes" = "Každé 2 minuty";
@@ -253,12 +253,12 @@
 "refreshview_once_per_hour" = "Jednou za hodinu";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Pokud zpráva obsahuje žádost potvrzení o přečtení:";
+"When I receive a request for a return receipt" = "Pokud zpráva obsahuje žádost potvrzení o přečtení";
 "Never send a return receipt" = "Nikdy neodeslat potvrzení o přečtení";
 "Allow return receipts for some messages" = "Vracet potvrzení o přečtení pro některé zprávy";
-"If I'm not in the To or Cc of the message:" = "Pokud nejsem uveden v Komu nebo Kopie:";
-"If the sender is outside my domain:" = "Pokud je odesílatel z jiné domény:";
-"In all other cases:" = "Ve všech ostatních případech:";
+"If I'm not in the To or Cc of the message" = "Pokud nejsem uveden v Komu nebo Kopie";
+"If the sender is outside my domain" = "Pokud je odesílatel z jiné domény";
+"In all other cases" = "Ve všech ostatních případech";
 
 "Never send" = "Nikdy neodeslat";
 "Always send" = "Vždy odeslat";
diff --git a/UI/PreferencesUI/Danish.lproj/Localizable.strings b/UI/PreferencesUI/Danish.lproj/Localizable.strings
index 524b5aec1..d20fe2364 100644
--- a/UI/PreferencesUI/Danish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Danish.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Aktivér ferie autosvar";
-"Auto reply message :" = "Automatisk beskedsvar:";
-"Email addresses (separated by commas) :" = "E-mail adresser (adskilt af kommaer):";
+"Auto reply message " = "Automatisk beskedsvar";
+"Email addresses (separated by commas) " = "E-mail adresser (adskilt af kommaer)";
 "Add default email addresses" = "Tilføj standard e-mail-adresser";
-"Days between responses :" = "Dage imellem svar:";
+"Days between responses " = "Dage imellem svar";
 "Do not send responses to mailing lists" = "Send ikke svar til postlister";
 "Disable auto reply on" = "Deaktiver Autosvar til";
 "Please specify your message and your email addresses for which you want to enable auto reply."
@@ -41,10 +41,10 @@
 = "Angiv en adresse, som du ønsker at sende dine beskeder til.";
 
 /* d & t */
-"Current Time Zone :" = "Aktuel tidszone:";
-"Short Date Format :" = "Kort dato format:";
-"Long Date Format :" = "Lang dato format:";
-"Time Format :" = "Tidsformat:";
+"Current Time Zone " = "Aktuel tidszone";
+"Short Date Format " = "Kort dato format";
+"Long Date Format " = "Lang dato format";
+"Time Format " = "Tidsformat";
 
 "default" = "Standard";
 
@@ -90,23 +90,23 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Uge start tidspunkt:";
-"Day start time :" = "Dag start tidspunkt:";
-"Day end time :" = "Dag slut tidspunkt:";
+"Week begins on " = "Uge start tidspunkt";
+"Day start time " = "Dag start tidspunkt";
+"Day end time " = "Dag slut tidspunkt";
 "Day start time must be prior to day end time." = "Dagens start tidspunkt skal være før dagens slut tidspunkt.";
 "Show time as busy outside working hours" = "Vis tid som optaget uden for arbejdstiden";
-"First week of year :" = "Første uge på året:";
+"First week of year " = "Første uge på året";
 "Enable reminders for Calendar items" = "Aktivér påmindelser for kalenderemner";
 "Play a sound when a reminder comes due"
 = "Afspil en lyd, når en påmindelse aktiveres";
-"Default reminder :" = "Standard påmindelse:";
+"Default reminder " = "Standard påmindelse";
 
 "firstWeekOfYear_January1" = "Starter den 1. januar";
 "firstWeekOfYear_First4DayWeek" = "Første 4-dages uge";
 "firstWeekOfYear_FirstFullWeek" = "Første hele uge";
 
 /* Default Calendar */
-"Default calendar :" = "Standard kalender";
+"Default calendar " = "Standard kalender";
 "selectedCalendar" = "Valgte kalender";
 "personalCalendar" = "Personlig kalender";
 "firstCalendar" = "Første aktiveret kalender";
@@ -136,11 +136,11 @@
 "refreshview_every_30_minutes" = "Hvert 30. minut";
 "refreshview_once_per_hour" = "Én gang i timen";
 
-"Forward messages:" = "Videresend beskeder:";
+"Forward messages" = "Videresend beskeder";
 "messageforward_inline" = "På linie";
 "messageforward_attached" = "Som vedhæftet fil";
 
-"When replying to a message:" = "Når du besvarer en besked:";
+"When replying to a message" = "Når du besvarer en besked";
 "replyplacement_above" = "Start mit svar over citat";
 "replyplacement_below" = "Start mit svar under citat";
 "And place my signature" = "Og placér min signatur";
@@ -156,20 +156,20 @@
 /* IMAP Accounts */
 "New Mail Account" = "Ny mail-konto";
 
-"Server Name:" = "Server Navn:";
-"Port:" = "Port:";
-"Encryption:" = "Krypteret:";
+"Server Name" = "Server Navn";
+"Port" = "Port";
+"Encryption" = "Krypteret";
 "None" = "Ingen";
-"User Name:" = "Brugernavn:";
-"Password:" = "Adgangskode:";
+"User Name" = "Brugernavn";
+"Password" = "Adgangskode";
 
-"Full Name:" = "Fulde navn:";
-"Email:" = "E-mail:";
-"Reply To Email:" = "Besvar på mail:";
-"Signature:" = "Signatur:";
+"Full Name" = "Fulde navn";
+"Email" = "E-mail";
+"Reply To Email" = "Besvar på mail";
+"Signature" = "Signatur";
 "(Click to create)" = "(Klik for at oprette)";
 
-"Signature" = "Signatur:";
+"Signature" = "Signatur";
 "Please enter your signature below:" = "Indsæt venligst din signatur nedenfor:";
 
 "Please specify a valid sender address." = "Angiv venligst en gyldig afsenderadresse.";
@@ -179,13 +179,13 @@
 "Additional Parameters" = "Yderligere parametre";
 
 /* password */
-"New password:" = "Ny adgangskode:";
-"Confirmation:" = "Bekræftelse:";
+"New password" = "Ny adgangskode";
+"Confirmation" = "Bekræftelse";
 "Change" = "Skift";
 
 /* Event+task classifications */
-"Default events classification :" = "Standard begivenhedsklassifikation:";
-"Default tasks classification :" = "Standard opgaveklassifikation:";
+"Default events classification " = "Standard begivenhedsklassifikation";
+"Default tasks classification " = "Standard opgaveklassifikation";
 "PUBLIC_item" = "Offentlig";
 "CONFIDENTIAL_item" = "Fortrolig";
 "PRIVATE_item" = "Privat";
@@ -199,9 +199,9 @@
 "Contacts" = "Adressebog";
 "Mail" = "Mail";
 "Last" = "Sidst anvendt";
-"Default Module :" = "Standard modul:";
+"Default Module " = "Standard modul";
 
-"Language :" = "Sprog:";
+"Language " = "Sprog";
 "choose" = "Vælg ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -230,12 +230,12 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Når jeg modtager en anmodning om en kvittering:";
+"When I receive a request for a return receipt" = "Når jeg modtager en anmodning om en kvittering";
 "Never send a return receipt" = "Send aldrig en kvittering";
 "Allow return receipts for some messages" = "Tillad kvitteringer for nogle beskeder";
-"If I'm not in the To or Cc of the message:" = "Hvis jeg ikke er i feltet Til eller Cc i meddelelsen:";
-"If the sender is outside my domain:" = "Hvis afsenderen er uden for mit domæne:";
-"In all other cases:" = "I alle andre tilfælde:";
+"If I'm not in the To or Cc of the message" = "Hvis jeg ikke er i feltet Til eller Cc i meddelelsen";
+"If the sender is outside my domain" = "Hvis afsenderen er uden for mit domæne";
+"In all other cases" = "I alle andre tilfælde";
 
 "Never send" = "Send aldrig";
 "Always send" = "Send altid";
diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
index 4ada4c412..6976244ce 100644
--- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Automatisch bericht bij afwezigheid inschakelen";
-"Auto reply message :" = "Automatisch eenmalig met het volgende bericht beantwoorden:";
-"Email addresses (separated by commas) :" = "E-mailaddressen (gescheiden door komma's):";
+"Auto reply message " = "Automatisch eenmalig met het volgende bericht beantwoorden";
+"Email addresses (separated by commas) " = "E-mailaddressen (gescheiden door komma's)";
 "Add default email addresses" = "Standaard e-mailadres toevoegen";
-"Days between responses :" = "Dagen tussen reacties:";
+"Days between responses " = "Dagen tussen reacties";
 "Do not send responses to mailing lists" = "Geen reacties naar maillinglijsten sturen";
 "Disable auto reply on" = "Automatisch bericht bij afwezigheid uitschakelen op";
 "Always send vacation message response" = "Afwezigheidsbericht altijd versturen";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Huidige tijdzone:";
-"Short Date Format :" = "Kort datumformaat:";
-"Long Date Format :" = "Lang datumformaat:";
-"Time Format :" = "Tijdformaat:";
+"Current Time Zone " = "Huidige tijdzone";
+"Short Date Format " = "Kort datumformaat";
+"Long Date Format " = "Lang datumformaat";
+"Time Format " = "Tijdformaat";
 
 "default" = "Default";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Week begint op:";
-"Day start time :" = "Dag begint om:";
-"Day end time :" = "Dag eindigt om:";
+"Week begins on " = "Week begint op";
+"Day start time " = "Dag begint om";
+"Day end time " = "Dag eindigt om";
 "Day start time must be prior to day end time." = "Het begin van de dag moet voor het einde liggen.";
 "Show time as busy outside working hours" = "Tijd buiten werkdag weergeven als bezet";
-"First week of year :" = "Eerste week van het jaar:";
+"First week of year " = "Eerste week van het jaar";
 "Enable reminders for Calendar items" = "Herinneringen inschakelen voor afspraken";
 "Play a sound when a reminder comes due" = "Geluid afspelen bij herinnering";
-"Default reminder :" = "Standaardherinnering:";
+"Default reminder " = "Standaardherinnering";
 
 "firstWeekOfYear_January1" = "Begint op 1 januari";
 "firstWeekOfYear_First4DayWeek" = "Eerste week met 4 dagen";
 "firstWeekOfYear_FirstFullWeek" = "Eerste volledige week";
 
 "Prevent from being invited to appointments" = "Voorkom uitgenodigingen voor gebeurtenissen";
-"White list for appointment invitations:" = "Whitelist voor uitnodigingen:";
+"White list for appointment invitations" = "Whitelist voor uitnodigingen";
 "Contacts Names" = "Contactnamen";
 
 /* Default Calendar */
-"Default calendar :" = "Standaardagenda:";
+"Default calendar " = "Standaardagenda";
 "selectedCalendar" = "Geselecteerde agenda";
 "personalCalendar" = "Persoonlijke agenda";
 "firstCalendar" = "Eerste ingeschakelde agenda";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Berichten sorteren op threads";
 "When sending mail, add unknown recipients to my" = "Bij het versturen van mail, voeg onbekende ontvangers toe aan mijn";
 
-"Forward messages:" = "Berichten doorsturen:";
+"Forward messages" = "Berichten doorsturen";
 "messageforward_inline" = "In het bericht";
 "messageforward_attached" = "Als bijlage";
 
-"When replying to a message:" = "Bij het beantwoorden van een bericht:";
+"When replying to a message" = "Bij het beantwoorden van een bericht";
 "replyplacement_above" = "Reactie boven orginele tekst";
 "replyplacement_below" = "Reactie onder orginele tekst";
 "And place my signature" = "Ondertekening plaatsen";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nieuw mailaccount";
 
-"Server Name:" = "Servernaam:";
-"Port:" = "Poort:";
-"Encryption:" = "Encryptie:";
+"Server Name" = "Servernaam";
+"Port" = "Poort";
+"Encryption" = "Encryptie";
 "None" = "Geen";
-"User Name:" = "Gebruikersnaam:";
-"Password:" = "Wachtwoord:";
+"User Name" = "Gebruikersnaam";
+"Password" = "Wachtwoord";
 
-"Full Name:" = "Naam:";
-"Email:" = "E-mail:";
-"Reply To Email:" = "Antwoord op e-mail:";
-"Signature:" = "Ondertekening:";
+"Full Name" = "Naam";
+"Email" = "E-mail";
+"Reply To Email" = "Antwoord op e-mail";
+"Signature" = "Ondertekening";
 "(Click to create)" = "(Klik om op te stellen)";
 
 "Signature" = "Ondertekening";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Extra Parameters";
 
 /* password */
-"New password:" = "Nieuw wachtwoord:";
-"Confirmation:" = "Bevestig wachtwoord:";
+"New password" = "Nieuw wachtwoord";
+"Confirmation" = "Bevestig wachtwoord";
 "Change" = "Veranderen";
 
 /* Event+task classifications */
-"Default events classification :" = "Standaardclassificatie afspraken:";
-"Default tasks classification :" = "Standaardclassificatie taken:";
+"Default events classification " = "Standaardclassificatie afspraken";
+"Default tasks classification " = "Standaardclassificatie taken";
 "PUBLIC_item" = "Publiek";
 "CONFIDENTIAL_item" = "Vertrouwelijk";
 "PRIVATE_item" = "Privé";
@@ -210,10 +210,10 @@
 "Contacts" = "Adresboek";
 "Mail" = "Mail";
 "Last" = "Laatst gebruikt";
-"Default Module :" = "Standaardmodule:";
-"SOGo Version :" = "SOGo versie:";
+"Default Module " = "Standaardmodule";
+"SOGo Version " = "SOGo versie";
 
-"Language :" = "Taal:";
+"Language " = "Taal";
 "choose" = "Kies...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -242,7 +242,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Overzicht verversen";
+"Refresh View " = "Overzicht verversen";
 "refreshview_manually" = "Handmatig";
 "refreshview_every_minute" = "Iedere minuut";
 "refreshview_every_2_minutes" = "Iedere 2 minuten";
@@ -253,12 +253,12 @@
 "refreshview_once_per_hour" = "Ieder uur";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Bij aanvraag van een ontvangstbevestiging:";
+"When I receive a request for a return receipt" = "Bij aanvraag van een ontvangstbevestiging";
 "Never send a return receipt" = "Ontvangstbevestiging nooit sturen";
 "Allow return receipts for some messages" = "Ontvangstbevestigingen voor sommige berichten toestaan";
-"If I'm not in the To or Cc of the message:" = "Als ik niet in aan of cc van het bericht sta:";
-"If the sender is outside my domain:" = "Als de afzender buiten mijn domein zit:";
-"In all other cases:" = "In alle andere gevallen:";
+"If I'm not in the To or Cc of the message" = "Als ik niet in aan of cc van het bericht sta";
+"If the sender is outside my domain" = "Als de afzender buiten mijn domein zit";
+"In all other cases" = "In alle andere gevallen";
 
 "Never send" = "Nooit sturen";
 "Always send" = "Altijd sturen";
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 7f5159f84..f78af6770 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Enable vacation auto reply";
-"Auto reply message :" = "Auto reply message:";
-"Email addresses (separated by commas) :" = "Email addresses (separated by commas):";
+"Auto reply message " = "Auto reply message";
+"Email addresses (separated by commas) " = "Email addresses (separated by commas)";
 "Add default email addresses" = "Add default email addresses";
-"Days between responses :" = "Days between responses:";
+"Days between responses " = "Days between responses";
 "Do not send responses to mailing lists" = "Do not send responses to mailing lists";
 "Disable auto reply on" = "Disable auto reply on";
 "Always send vacation message response" = "Always send vacation message response";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Current Time Zone:";
-"Short Date Format :" = "Short Date Format:";
-"Long Date Format :" = "Long Date Format:";
-"Time Format :" = "Time Format:";
+"Current Time Zone " = "Current Time Zone";
+"Short Date Format " = "Short Date Format";
+"Long Date Format " = "Long Date Format";
+"Time Format " = "Time Format";
 
 "default" = "Default";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Week begins on:";
-"Day start time :" = "Day start time:";
-"Day end time :" = "Day end time:";
+"Week begins on " = "Week begins on";
+"Day start time " = "Day start time";
+"Day end time " = "Day end time";
 "Day start time must be prior to day end time." = "Day start time must be prior to day end time.";
 "Show time as busy outside working hours" = "Show time as busy outside working hours";
-"First week of year :" = "First week of year:";
+"First week of year " = "First week of year";
 "Enable reminders for Calendar items" = "Enable reminders for Calendar items";
 "Play a sound when a reminder comes due" = "Play a sound when a reminder comes due";
-"Default reminder :" = "Default reminder:";
+"Default reminder " = "Default reminder";
 
 "firstWeekOfYear_January1" = "Starts on january 1";
 "firstWeekOfYear_First4DayWeek" = "First 4-day week";
 "firstWeekOfYear_FirstFullWeek" = "First full week";
 
 "Prevent from being invited to appointments" = "Prevent from being invited to appointments";
-"White list for appointment invitations:" = "White list for appointment invitations:";
+"White list for appointment invitations" = "White list for appointment invitations";
 "Contacts Names" = "Contacts Names";
 
 /* Default Calendar */
-"Default calendar :" = "Default calendar:";
+"Default calendar " = "Default calendar";
 "selectedCalendar" = "Selected calendar";
 "personalCalendar" = "Personal calendar";
 "firstCalendar" = "First enabled calendar";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Sort messages by threads";
 "When sending mail, add unknown recipients to my" = "When sending mail, add unknown recipients to my";
 
-"Forward messages:" = "Forward messages:";
+"Forward messages" = "Forward messages";
 "messageforward_inline" = "Inline";
 "messageforward_attached" = "As Attachment";
 
-"When replying to a message:" = "When replying to a message:";
+"When replying to a message" = "When replying to a message";
 "replyplacement_above" = "Start my reply above the quote";
 "replyplacement_below" = "Start my reply below the quote";
 "And place my signature" = "And place my signature";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "New Mail Account";
 
-"Server Name:" = "Server Name:";
-"Port:" = "Port:";
-"Encryption:" = "Encryption:";
+"Server Name" = "Server Name";
+"Port" = "Port";
+"Encryption" = "Encryption";
 "None" = "None";
-"User Name:" = "User Name:";
-"Password:" = "Password:";
+"User Name" = "User Name";
+"Password" = "Password";
 
-"Full Name:" = "Full Name:";
-"Email:" = "Email:";
-"Reply To Email:" = "Reply To Email:";
-"Signature:" = "Signature:";
+"Full Name" = "Full Name";
+"Email" = "Email";
+"Reply To Email" = "Reply To Email";
+"Signature" = "Signature";
 "(Click to create)" = "(Click to create)";
 
 "Signature" = "Signature";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Additional Parameters";
 
 /* password */
-"New password:" = "New password:";
-"Confirmation:" = "Confirmation:";
+"New password" = "New password";
+"Confirmation" = "Confirmation";
 "Change" = "Change";
 
 /* Event+task classifications */
-"Default events classification :" = "Default events classification:";
-"Default tasks classification :" = "Default tasks classification:";
+"Default events classification " = "Default events classification";
+"Default tasks classification " = "Default tasks classification";
 "PUBLIC_item" = "Public";
 "CONFIDENTIAL_item" = "Confidential";
 "PRIVATE_item" = "Private";
@@ -210,10 +210,10 @@
 "Contacts" = "Address Book";
 "Mail" = "Mail";
 "Last" = "Last used";
-"Default Module :" = "Default Module:";
-"SOGo Version :" = "SOGo Version:";
+"Default Module " = "Default Module";
+"SOGo Version " = "SOGo Version";
 
-"Language :" = "Language:";
+"Language " = "Language";
 "choose" = "Choose ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -242,7 +242,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Refresh View:";
+"Refresh View " = "Refresh View";
 "refreshview_manually" = "Manually";
 "refreshview_every_minute" = "Every minute";
 "refreshview_every_2_minutes" = "Every 2 minutes";
@@ -253,12 +253,12 @@
 "refreshview_once_per_hour" = "Once per hour";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "When I receive a request for a return receipt:";
+"When I receive a request for a return receipt" = "When I receive a request for a return receipt";
 "Never send a return receipt" = "Never send a return receipt";
 "Allow return receipts for some messages" = "Allow return receipts for some messages";
-"If I'm not in the To or Cc of the message:" = "If I'm not in the To or Cc of the message:";
-"If the sender is outside my domain:" = "If the sender is outside my domain:";
-"In all other cases:" = "In all other cases:";
+"If I'm not in the To or Cc of the message" = "If I'm not in the To or Cc of the message";
+"If the sender is outside my domain" = "If the sender is outside my domain";
+"In all other cases" = "In all other cases";
 
 "Never send" = "Never send";
 "Always send" = "Always send";
diff --git a/UI/PreferencesUI/Finnish.lproj/Localizable.strings b/UI/PreferencesUI/Finnish.lproj/Localizable.strings
index 207bd0916..b479eac52 100644
--- a/UI/PreferencesUI/Finnish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Finnish.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Laita automaattinen lomavastaaja päälle";
-"Auto reply message :" = "Automaattivastaus:";
-"Email addresses (separated by commas) :" = "Sähköpostiosoitteet (eroteltuna pilkuin)";
+"Auto reply message " = "Automaattivastaus";
+"Email addresses (separated by commas) " = "Sähköpostiosoitteet (eroteltuna pilkuin)";
 "Add default email addresses" = "Syötä oletussähköpostiosoite";
-"Days between responses :" = "Päivät vastausten välillä:";
+"Days between responses " = "Päivät vastausten välillä";
 "Do not send responses to mailing lists" = "Älä lähetä vastauksia postituslistoille";
 "Disable auto reply on" = "Poista automaattivastaus käytöstä";
 "Always send vacation message response" = "Lähetä lomaviestivastaus aina";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Nykyinen aikavyöhyke:";
-"Short Date Format :" = "Lyhyt ajan esitysmuoto:";
-"Long Date Format :" = "Pitkä ajan esitysmuoto:";
-"Time Format :" = "Ajan esitysmuoto:";
+"Current Time Zone " = "Nykyinen aikavyöhyke";
+"Short Date Format " = "Lyhyt ajan esitysmuoto";
+"Long Date Format " = "Pitkä ajan esitysmuoto";
+"Time Format " = "Ajan esitysmuoto";
 
 "default" = "Oletus";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Viikon alkupäivä:";
-"Day start time :" = "Päivä alkaa klo:";
-"Day end time :" = "Päivä päättyy klo:";
+"Week begins on " = "Viikon alkupäivä";
+"Day start time " = "Päivä alkaa klo";
+"Day end time " = "Päivä päättyy klo";
 "Day start time must be prior to day end time." = "Päivän alkuajan tulee olla ennen päättymisaikaa.";
 "Show time as busy outside working hours" = "Näytä työajan ulkopuolinen aika varattuna";
-"First week of year :" = "Vuoden ensimmäinen viikko:";
+"First week of year " = "Vuoden ensimmäinen viikko";
 "Enable reminders for Calendar items" = "Ota käyttöön kalenterimerkintöjen muistuttajat";
 "Play a sound when a reminder comes due" = "Soita äänimerkki kun muistuttaja aktivoituu";
-"Default reminder :" = "Oletusmuistuttaja";
+"Default reminder " = "Oletusmuistuttaja";
 
 "firstWeekOfYear_January1" = "Alkaa Tammikuun 1.";
 "firstWeekOfYear_First4DayWeek" = "Ensimmäinen nelipäiväinen viikko";
 "firstWeekOfYear_FirstFullWeek" = "Ensimmäinen täysi viikko";
 
 "Prevent from being invited to appointments" = "Estä tapaamiskutsut";
-"White list for appointment invitations:" = "Valkoinen lista kalenterikutsuille:";
+"White list for appointment invitations" = "Valkoinen lista kalenterikutsuille";
 "Contacts Names" = "Yhteystietojen Nimet";
 
 /* Default Calendar */
-"Default calendar :" = "Oletuskalenteri";
+"Default calendar " = "Oletuskalenteri";
 "selectedCalendar" = "Valittu kalenteri";
 "personalCalendar" = "Henkilökohtainen kalenteri";
 "firstCalendar" = "Ensimmäinen käyttöönotettu kalenteri";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Järjestä viestit ketjuiksi";
 "When sending mail, add unknown recipients to my" = "Postia lähettäessä lisää tuntemattomat vastaanottajat";
 
-"Forward messages:" = "Edelleenlähetä viestit:";
+"Forward messages" = "Edelleenlähetä viestit";
 "messageforward_inline" = "Tekstisisällössä";
 "messageforward_attached" = "Liitteinä";
 
-"When replying to a message:" = "Kun vastaan viestiin:";
+"When replying to a message" = "Kun vastaan viestiin";
 "replyplacement_above" = "Aloita vastaukseni lainauksen yläpuolelta";
 "replyplacement_below" = "Aloita vastaukseni lainauksen alapuolelta";
 "And place my signature" = "Ja sijoita allekirjoitukseni";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Uusi sähköpostitili";
 
-"Server Name:" = "Palvelinnimi:";
-"Port:" = "Portti:";
-"Encryption:" = "Salaus";
+"Server Name" = "Palvelinnimi";
+"Port" = "Portti";
+"Encryption" = "Salaus";
 "None" = "Ei mitään";
-"User Name:" = "Käyttäjätunnus:";
-"Password:" = "Salasana:";
+"User Name" = "Käyttäjätunnus";
+"Password" = "Salasana";
 
-"Full Name:" = "Koko nimi:";
-"Email:" = "Sähköposti:";
-"Reply To Email:" = "Vastaa sähköpostiin:";
-"Signature:" = "Allekirjoitus:";
+"Full Name" = "Koko nimi";
+"Email" = "Sähköposti";
+"Reply To Email" = "Vastaa sähköpostiin";
+"Signature" = "Allekirjoitus";
 "(Click to create)" = "(Napsauta luodaksesi)";
 
 "Signature" = "Allekirjoitus";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Lisäparametrit";
 
 /* password */
-"New password:" = "Uusi salasana";
-"Confirmation:" = "Vahvistus:";
+"New password" = "Uusi salasana";
+"Confirmation" = "Vahvistus";
 "Change" = "Vaihda";
 
 /* Event+task classifications */
-"Default events classification :" = "Oletus tapahtumaluokittelu:";
-"Default tasks classification :" = "Oletus tehtäväluokittelu:";
+"Default events classification " = "Oletus tapahtumaluokittelu";
+"Default tasks classification " = "Oletus tehtäväluokittelu";
 "PUBLIC_item" = "Julkinen";
 "CONFIDENTIAL_item" = "Luottamuksellinen";
 "PRIVATE_item" = "Yksityinen";
@@ -210,10 +210,10 @@
 "Contacts" = "Osoitekirja";
 "Mail" = "Sähköposti";
 "Last" = "Viimeksi käytetty";
-"Default Module :" = "Oletusmoduli:";
-"SOGo Version :" = "SOGo versio:";
+"Default Module " = "Oletusmoduli";
+"SOGo Version " = "SOGo versio";
 
-"Language :" = "Kieli:";
+"Language " = "Kieli";
 "choose" = "Valitse...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -242,7 +242,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Päivitä näkymä:";
+"Refresh View " = "Päivitä näkymä";
 "refreshview_manually" = "Manuaalisesti";
 "refreshview_every_minute" = "Joka minuutti";
 "refreshview_every_2_minutes" = "Joka toinen minuutti";
@@ -253,12 +253,12 @@
 "refreshview_once_per_hour" = "Kerran tunnissa ";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Kun saan kuittauspyynnön:";
+"When I receive a request for a return receipt" = "Kun saan kuittauspyynnön";
 "Never send a return receipt" = "Alä koskaan lähetä kuittausta";
 "Allow return receipts for some messages" = "Salli kuittaukset joillekin viesteille";
-"If I'm not in the To or Cc of the message:" = "Jos en ole viestin To tai Cc -kentissä: ";
-"If the sender is outside my domain:" = "Jos lähettäjä on oman toimialueeni ulkopuolelta:";
-"In all other cases:" = "Kaikissa muissa tapauksissa:";
+"If I'm not in the To or Cc of the message" = "Jos en ole viestin To tai Cc -kentissä ";
+"If the sender is outside my domain" = "Jos lähettäjä on oman toimialueeni ulkopuolelta";
+"In all other cases" = "Kaikissa muissa tapauksissa";
 
 "Never send" = "Älä koskaan lähetä";
 "Always send" = "Lähetä aina";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 00a12a5b7..c9ae7611e 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Activer message d'absence prolongée";
-"Auto reply message :" = "Message de réponse automatique :";
-"Email addresses (separated by commas) :" = "Adresses courriels (séparées par des virgules) :";
+"Auto reply message " = "Message de réponse automatique ";
+"Email addresses (separated by commas) " = "Adresses courriels (séparées par des virgules) ";
 "Add default email addresses" = "Ajouter les adresses par défaut";
-"Days between responses :" = "Nombre de jours entre réponses :";
+"Days between responses " = "Nombre de jours entre réponses ";
 "Do not send responses to mailing lists" = "Ne pas envoyer les réponses aux listes de diffusion";
 "Disable auto reply on" = "Désactiver la réponse automatique le";
 "Always send vacation message response" = "Toujours envoyer le message de vacances prolongées";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Fuseau horaire en cours :";
-"Short Date Format :" = "Style de date courte :";
-"Long Date Format :" = "Style de date longue :";
-"Time Format :" = "Style de l'heure :";
+"Current Time Zone " = "Fuseau horaire en cours ";
+"Short Date Format " = "Style de date courte ";
+"Long Date Format " = "Style de date longue ";
+"Time Format " = "Style de l'heure ";
 
 "default" = "Défaut";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Premier jour de la semaine :";
-"Day start time :" = "Début de la journée :";
-"Day end time :" = "Fin de la journée :";
+"Week begins on " = "Premier jour de la semaine ";
+"Day start time " = "Début de la journée ";
+"Day end time " = "Fin de la journée ";
 "Day start time must be prior to day end time." = "Le début de la journée doit être avant la fin de la journée.";
 "Show time as busy outside working hours" = "Afficher comme occupé pendant les heures non-ouvrables";
-"First week of year :" = "Première semaine de l'année :";
+"First week of year " = "Première semaine de l'année ";
 "Enable reminders for Calendar items" = "Activer les rappels pour les éléments du calendrier";
 "Play a sound when a reminder comes due" = "Émettre un signal sonore à l'échéance du rappel";
-"Default reminder :" = "Rappel par défaut :";
+"Default reminder " = "Rappel par défaut ";
 
 "firstWeekOfYear_January1" = "Commence le 1er janvier";
 "firstWeekOfYear_First4DayWeek" = "Première semaine de 4 jours";
 "firstWeekOfYear_FirstFullWeek" = "Première semaine entière";
 
 "Prevent from being invited to appointments" = "Interdire de m'inviter à des rendez-vous";
-"White list for appointment invitations:" = "Liste blanche pour les invitations";
+"White list for appointment invitations" = "Liste blanche pour les invitations";
 "Contacts Names" = "Noms des contacts";
 
 /* Default Calendar */
-"Default calendar :" = "Calendrier par défaut :";
+"Default calendar " = "Calendrier par défaut ";
 "selectedCalendar" = "le calendrier sélectionné";
 "personalCalendar" = "le calendrier personnel";
 "firstCalendar" = "le premier calendrier actif";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Grouper les discussions";
 "When sending mail, add unknown recipients to my" = "Lors de l'envoi d'un message, ajouter les destinataires inconnus au carnet";
 
-"Forward messages:" = "Transférer les messages :";
+"Forward messages" = "Transférer les messages ";
 "messageforward_inline" = "intégrés";
 "messageforward_attached" = "en pièces jointes";
 
-"When replying to a message:" = "En répondant à un message";
+"When replying to a message" = "En répondant à un message";
 "replyplacement_above" = "Placer ma réponse avant la citation";
 "replyplacement_below" = "Placer ma réponse après la citation";
 "And place my signature" = "Et placer ma signature";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nouveau compte";
 
-"Server Name:" = "Serveur :";
-"Port:" = "Port :";
-"Encryption:" = "Chiffrement :";
+"Server Name" = "Serveur ";
+"Port" = "Port ";
+"Encryption" = "Chiffrement ";
 "None" = "Aucun";
-"User Name:" = "Utilisateur :";
-"Password:" = "Mot de passe :";
+"User Name" = "Utilisateur ";
+"Password" = "Mot de passe ";
 
-"Full Name:" = "Nom complet :";
-"Email:" = "Email :";
-"Reply To Email:" = "Adresse de retour :";
-"Signature:" = "Signature :";
+"Full Name" = "Nom complet ";
+"Email" = "Email ";
+"Reply To Email" = "Adresse de retour ";
+"Signature" = "Signature ";
 "(Click to create)" = "(Signature vide)";
 
 "Signature" = "Signature";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Paramètres supplémentaires";
 
 /* password */
-"New password:" = "Nouveau mot de passe:";
-"Confirmation:" = "Confirmation:";
+"New password" = "Nouveau mot de passe";
+"Confirmation" = "Confirmation";
 "Change" = "Changer";
 
 /* Event+task classifications */
-"Default events classification :" = "Classification par défaut des événements :";
-"Default tasks classification :" = "Classification par défaut des tâches :";
+"Default events classification " = "Classification par défaut des événements ";
+"Default tasks classification " = "Classification par défaut des tâches ";
 "PUBLIC_item" = "Public";
 "CONFIDENTIAL_item" = "Confidentiel";
 "PRIVATE_item" = "Privé";
@@ -210,10 +210,10 @@
 "Contacts" = "Carnet d'adresses";
 "Mail" = "Courrier";
 "Last" = "Dernier utilisé";
-"Default Module :" = "Module par défaut :";
-"SOGo Version :" = "Version :";
+"Default Module " = "Module par défaut ";
+"SOGo Version " = "Version ";
 
-"Language :" = "Langue :";
+"Language " = "Langue ";
 "choose" = "Choisir ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -242,7 +242,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Actualisation :";
+"Refresh View " = "Actualisation ";
 "refreshview_manually" = "Manuellement";
 "refreshview_every_minute" = "Chaque minute";
 "refreshview_every_2_minutes" = "Toutes les 2 minutes";
@@ -253,12 +253,12 @@
 "refreshview_once_per_hour" = "Une fois par heure";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Lors de la réception d'une demande d'accusé de réception :";
+"When I receive a request for a return receipt" = "Lors de la réception d'une demande d'accusé de réception ";
 "Never send a return receipt" = "Ne jamais envoyer d'accusé de réception";
 "Allow return receipts for some messages" = "Autoriser les accusés de réception pour certains messages";
-"If I'm not in the To or Cc of the message:" = "Si je ne suis pas dans le destinataire ou en copie du message :";
-"If the sender is outside my domain:" = "Si l'expéditeur est hors de mon domaine :";
-"In all other cases:" = "Dans tous les autres cas :";
+"If I'm not in the To or Cc of the message" = "Si je ne suis pas dans le destinataire ou en copie du message ";
+"If the sender is outside my domain" = "Si l'expéditeur est hors de mon domaine ";
+"In all other cases" = "Dans tous les autres cas ";
 
 "Never send" = "Ne jamais envoyer";
 "Always send" = "Toujours envoyer";
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 50bf5a125..657dd18cb 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Automatische Abwesenheitsnachricht aktivieren";
-"Auto reply message :" = "Mit folgender Nachricht auf jede eingehende E-Mail antworten:";
-"Email addresses (separated by commas) :" = "E-Mail-Adressen (getrennt durch Kommata):";
+"Auto reply message " = "Mit folgender Nachricht auf jede eingehende E-Mail antworten";
+"Email addresses (separated by commas) " = "E-Mail-Adressen (getrennt durch Kommata)";
 "Add default email addresses" = "Standardadresse hinzufügen";
-"Days between responses :" = "Tage zwischen automatischen Abwesenheitsnachrichten:";
+"Days between responses " = "Tage zwischen automatischen Abwesenheitsnachrichten";
 "Do not send responses to mailing lists" = "Keine automatischen Abwesenheitsnachrichten an Mailinglisten senden";
 "Disable auto reply on" = "Automatische Abwesenheitsnachricht abschalten am";
 "Always send vacation message response" = "Immer Abwesenheitsmeldung senden";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Aktuelle Zeitzone:";
-"Short Date Format :" = "Kurzes Datumsformat:";
-"Long Date Format :" = "Langes Datumsformat:";
-"Time Format :" = "Zeitformat:";
+"Current Time Zone " = "Aktuelle Zeitzone";
+"Short Date Format " = "Kurzes Datumsformat";
+"Long Date Format " = "Langes Datumsformat";
+"Time Format " = "Zeitformat";
 
 "default" = "Standard";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Erster Wochentag:";
-"Day start time :" = "Tagesanfang:";
-"Day end time :" = "Tagesende:";
+"Week begins on " = "Erster Wochentag";
+"Day start time " = "Tagesanfang";
+"Day end time " = "Tagesende";
 "Day start time must be prior to day end time." = "Der Tagesanfang muss vor dem Tagesende liegen.";
 "Show time as busy outside working hours" = "Zeiten außerhalb der Arbeitszeit als belegt anzeigen";
-"First week of year :" = "Erste Woche des Jahres:";
+"First week of year " = "Erste Woche des Jahres";
 "Enable reminders for Calendar items" = "Termin- und Aufgabenerinnerungen aktivieren";
 "Play a sound when a reminder comes due" = "Akustisches Signal zur Terminerinnerung";
-"Default reminder :" = "Standard Terminerinnerung:";
+"Default reminder " = "Standard Terminerinnerung";
 
 "firstWeekOfYear_January1" = "Beginnt am 1. Januar";
 "firstWeekOfYear_First4DayWeek" = "Erste 4 Tage Woche";
 "firstWeekOfYear_FirstFullWeek" = "Erste ganze Woche";
 
 "Prevent from being invited to appointments" = "Verhindere, dass ich zu Terminen eingeladen werde";
-"White list for appointment invitations:" = "White-Liste für Termineinladungen:";
+"White list for appointment invitations" = "White-Liste für Termineinladungen";
 "Contacts Names" = "Kontaktnamen";
 
 /* Default Calendar */
-"Default calendar :" = "Standardkalender";
+"Default calendar " = "Standardkalender";
 "selectedCalendar" = "Gewählter Kalender";
 "personalCalendar" = "Persönlicher Kalender";
 "firstCalendar" = "Erster eingeschalteter Kalender";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Nachrichten nach Thema sortieren";
 "When sending mail, add unknown recipients to my" = "Unbekannte Empfänger meiner E-Mails hinzufügen zu";
 
-"Forward messages:" = "Nachrichten weiterleiten:";
+"Forward messages" = "Nachrichten weiterleiten";
 "messageforward_inline" = "Eingebunden";
 "messageforward_attached" = "Als Anhang";
 
-"When replying to a message:" = "Wenn auf eine Nachricht geantwortet wird: ";
+"When replying to a message" = "Wenn auf eine Nachricht geantwortet wird ";
 "replyplacement_above" = "Antwort oberhalb des Zitates beginnen";
 "replyplacement_below" = "Antwort unterhalb des Zitates beginnen";
 "And place my signature" = "Und setze meine Signatur";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Neues E-Mail-Konto";
 
-"Server Name:" = "Servername:";
-"Port:" = "Port:";
-"Encryption:" = "Verschlüsselung:";
+"Server Name" = "Servername";
+"Port" = "Port";
+"Encryption" = "Verschlüsselung";
 "None" = "Keine";
-"User Name:" = "Benutzername:";
-"Password:" = "Passwort:";
+"User Name" = "Benutzername";
+"Password" = "Passwort";
 
-"Full Name:" = "Name:";
-"Email:" = "E-Mail-Adresse:";
-"Reply To Email:" = "\"Antworten An\" E-Mail-Adresse (Reply-To):";
-"Signature:" = "Signatur:";
+"Full Name" = "Name";
+"Email" = "E-Mail-Adresse";
+"Reply To Email" = "\"Antworten An\" E-Mail-Adresse (Reply-To)";
+"Signature" = "Signatur";
 "(Click to create)" = "(Zum Erstellen klicken)";
 
 "Signature" = "Signatur";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Zusätzliche Einstellungen";
 
 /* password */
-"New password:" = "Neues Passwort:";
-"Confirmation:" = "Bestätigung:";
+"New password" = "Neues Passwort";
+"Confirmation" = "Bestätigung";
 "Change" = "Ändern";
 
 /* Event+task classifications */
-"Default events classification :" = "Standard Einstufung Termine:";
-"Default tasks classification :" = "Standard Einstufung Aufgaben:";
+"Default events classification " = "Standard Einstufung Termine";
+"Default tasks classification " = "Standard Einstufung Aufgaben";
 "PUBLIC_item" = "Öffentlich";
 "CONFIDENTIAL_item" = "Vertraulich";
 "PRIVATE_item" = "Privat";
@@ -210,10 +210,10 @@
 "Contacts" = "Adressbuch";
 "Mail" = "E-Mail";
 "Last" = "Zuletzt benutztes";
-"Default Module :" = "Standard Modul:";
-"SOGo Version :" = "SOGo Version:";
+"Default Module " = "Standard Modul";
+"SOGo Version " = "SOGo Version";
 
-"Language :" = "Sprache:";
+"Language " = "Sprache";
 "choose" = "Auswählen ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -242,7 +242,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Ansicht aktualisieren:";
+"Refresh View " = "Ansicht aktualisieren";
 "refreshview_manually" = "Manuell";
 "refreshview_every_minute" = "Minütlich";
 "refreshview_every_2_minutes" = "Alle 2 Minuten";
@@ -253,12 +253,12 @@
 "refreshview_once_per_hour" = "Stündlich";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Wenn ich die Anforderung einer Empfangsbestätigung erhalte:";
+"When I receive a request for a return receipt" = "Wenn ich die Anforderung einer Empfangsbestätigung erhalte";
 "Never send a return receipt" = "Niemals eine Bestätigung senden";
 "Allow return receipts for some messages" = "Erlaube eine Bestätigung für einige Nachrichten";
-"If I'm not in the To or Cc of the message:" = "Wenn ich nicht in An oder CC der Nachricht bin:";
-"If the sender is outside my domain:" = "Wenn der Absender außerhalb meiner Domain ist:";
-"In all other cases:" = "In allen anderen Fällen:";
+"If I'm not in the To or Cc of the message" = "Wenn ich nicht in An oder CC der Nachricht bin";
+"If the sender is outside my domain" = "Wenn der Absender außerhalb meiner Domain ist";
+"In all other cases" = "In allen anderen Fällen";
 
 "Never send" = "Niemals senden";
 "Always send" = "Immer senden";
diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
index 4cbef1ee1..67be181d5 100644
--- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Automatikus távollét üzenet engedélyezése";
-"Auto reply message :" = "Automatikus válasz minden feladónak csak egy alkalommal :";
-"Email addresses (separated by commas) :" = "Email címek (vesszővel elválasztva)";
+"Auto reply message " = "Automatikus válasz minden feladónak csak egy alkalommal ";
+"Email addresses (separated by commas) " = "Email címek (vesszővel elválasztva)";
 "Add default email addresses" = "Saját email címek hozzáadása";
-"Days between responses :" = "Válaszok közötti napok száma:";
+"Days between responses " = "Válaszok közötti napok száma";
 "Do not send responses to mailing lists" = "Levelező listákra válasz mellőzése";
 "Disable auto reply on" = "Automatikus válasz tiltása";
 "Always send vacation message response" = "Mindig küldjön távollét üzenet választ";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Időzóna :";
-"Short Date Format :" = "Rövid dátumformátum :";
-"Long Date Format :" = "Hosszú dátumformátum :";
-"Time Format :" = "Időformátum :";
+"Current Time Zone " = "Időzóna ";
+"Short Date Format " = "Rövid dátumformátum ";
+"Long Date Format " = "Hosszú dátumformátum ";
+"Time Format " = "Időformátum ";
 
 "default" = "Alapértelmezett";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Hét kezdőnapja:";
-"Day start time :" = "Nap kezdete:";
-"Day end time :" = "Nap vége:";
+"Week begins on " = "Hét kezdőnapja";
+"Day start time " = "Nap kezdete";
+"Day end time " = "Nap vége";
 "Day start time must be prior to day end time." = "A kezdőnap nem lehet későbbi, mint a befejező nap.";
 "Show time as busy outside working hours" = "A munkaidőn túli időszakokra foglaltság jelzése";
-"First week of year :" = "Év első hete:";
+"First week of year " = "Év első hete";
 "Enable reminders for Calendar items" = "Emlékeztető engedélyezése a naptárbejegyzésekhez";
 "Play a sound when a reminder comes due" = "Hang lejátszása az emlékeztetőhöz";
-"Default reminder :" = "Alapértelmezett emlékeztető:";
+"Default reminder " = "Alapértelmezett emlékeztető";
 
 "firstWeekOfYear_January1" = "Január 1-jétől";
 "firstWeekOfYear_First4DayWeek" = "Első 4 napos héttől";
 "firstWeekOfYear_FirstFullWeek" = "Első teljes héttől";
 
 "Prevent from being invited to appointments" = "Megakadályozza a meghívást találkozókra";
-"White list for appointment invitations:" = "Engedélyezési lista a találkozók meghívásaihoz:";
+"White list for appointment invitations" = "Engedélyezési lista a találkozók meghívásaihoz";
 "Contacts Names" = "Kapcsolatok nevei";
 
 /* Default Calendar */
-"Default calendar :" = "Alapértelmezett naptár";
+"Default calendar " = "Alapértelmezett naptár";
 "selectedCalendar" = "Kiválasztott naptár";
 "personalCalendar" = "Személyes naptár";
 "firstCalendar" = "Első engedélyezett naptár";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Üzenetek beszélgetések szerinti rendezése ";
 "When sending mail, add unknown recipients to my" = "Levél küldésekor az ismeretlen címeket adja hozzá a következőhöz";
 
-"Forward messages:" = "Üzenetek továbbítása:";
+"Forward messages" = "Üzenetek továbbítása";
 "messageforward_inline" = "Levélként";
 "messageforward_attached" = "Mellékletként";
 
-"When replying to a message:" = "Amikor válaszol egy üzenetre:";
+"When replying to a message" = "Amikor válaszol egy üzenetre";
 "replyplacement_above" = "Válasz elhelyezése az idézet fölött";
 "replyplacement_below" = "Válasz elhelyezése az idézet alatt";
 "And place my signature" = "Aláírás beszúrása";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Új email fiók";
 
-"Server Name:" = "Kiszolgáló neve:";
-"Port:" = "Port:";
-"Encryption:" = "Titkosítás:";
+"Server Name" = "Kiszolgáló neve";
+"Port" = "Port";
+"Encryption" = "Titkosítás";
 "None" = "Nincs";
-"User Name:" = "Felhasználónév:";
-"Password:" = "Jelszó:";
+"User Name" = "Felhasználónév";
+"Password" = "Jelszó";
 
-"Full Name:" = "Teljes név:";
-"Email:" = "Email cím:";
-"Reply To Email:" = "Válaszlevél";
-"Signature:" = "Aláírás:";
+"Full Name" = "Teljes név";
+"Email" = "Email cím";
+"Reply To Email" = "Válaszlevél";
+"Signature" = "Aláírás";
 "(Click to create)" = "(A létrehozáshoz kattintson ide)";
 
 "Signature" = "Aláírás";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "További beállítások";
 
 /* password */
-"New password:" = "Új jelszó:";
-"Confirmation:" = "Megerősítés:";
+"New password" = "Új jelszó";
+"Confirmation" = "Megerősítés";
 "Change" = "Megváltoztat";
 
 /* Event+task classifications */
-"Default events classification :" = "Az események alapértelmezett besorolása:";
-"Default tasks classification :" = "Alapértelmezett feladat besorolás";
+"Default events classification " = "Az események alapértelmezett besorolása";
+"Default tasks classification " = "Alapértelmezett feladat besorolás";
 "PUBLIC_item" = "Nyilvános";
 "CONFIDENTIAL_item" = "Bizalmas";
 "PRIVATE_item" = "Magán";
@@ -210,10 +210,10 @@
 "Contacts" = "Címjegyzék";
 "Mail" = "Levél";
 "Last" = "Utoljára használt";
-"Default Module :" = "Alapértelmezett modul";
-"SOGo Version :" = "SOGo verzió:";
+"Default Module " = "Alapértelmezett modul";
+"SOGo Version " = "SOGo verzió";
 
-"Language :" = "Nyelv :";
+"Language " = "Nyelv ";
 "choose" = "Válasszon ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -241,7 +241,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Nézet frissítés:";
+"Refresh View " = "Nézet frissítés";
 "refreshview_manually" = "Kézi";
 "refreshview_every_minute" = "Percenként";
 "refreshview_every_2_minutes" = "Kétpercenként";
@@ -252,12 +252,12 @@
 "refreshview_once_per_hour" = "Óránként";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Visszaigazolási kérelem esetén:";
+"When I receive a request for a return receipt" = "Visszaigazolási kérelem esetén";
 "Never send a return receipt" = "Soha ne küldjön visszaigazolást";
 "Allow return receipts for some messages" = "Egyes üzenetek esetén visszaigazolás küldésének engedélyezése";
-"If I'm not in the To or Cc of the message:" = "Amennyiben nem szereplek a címzett vagy másolat mezőben:";
-"If the sender is outside my domain:" = "Amennyiben a feladó külső (más domain):";
-"In all other cases:" = "Minden egyéb esetben:";
+"If I'm not in the To or Cc of the message" = "Amennyiben nem szereplek a címzett vagy másolat mezőben";
+"If the sender is outside my domain" = "Amennyiben a feladó külső (más domain)";
+"In all other cases" = "Minden egyéb esetben";
 
 "Never send" = "Küldés mellőzése mindig";
 "Always send" = "Küldés minden esetben";
diff --git a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
index 5c88cb8fb..088e6b36c 100644
--- a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Virkja sjálfvirkt svar í fríi";
-"Auto reply message :" = "Skilaboð fyrir sjálfvirkt svar :";
-"Email addresses (separated by commas) :" = "Netföng (aðgreind með kommu) :";
+"Auto reply message " = "Skilaboð fyrir sjálfvirkt svar ";
+"Email addresses (separated by commas) " = "Netföng (aðgreind með kommu) ";
 "Add default email addresses" = "Bæta við sjálfgefnu netfangi";
-"Days between responses :" = "Dagar milli svara :";
+"Days between responses " = "Dagar milli svara ";
 "Do not send responses to mailing lists" = "Ekki senda svör til póstlista";
 "Please specify your message and your email addresses for which you want to enable auto reply."
 = "Hér þarf að skrá skilaboðin og netfangið til að virkja sjálfvirkt svar.";
@@ -37,10 +37,10 @@
 = "Hér þarf að skrá netfangið sem ný skilaboð eiga að áframsendast á";
 
 /* d & t */
-"Current Time Zone :" = "Núverandi tímabelti :";
-"Short Date Format :" = "Stutt dagsetningarform :";
-"Long Date Format :" = "Löng dagsetning :";
-"Time Format :" = "Tímasnið :";
+"Current Time Zone " = "Núverandi tímabelti ";
+"Short Date Format " = "Stutt dagsetningarform ";
+"Long Date Format " = "Löng dagsetning ";
+"Time Format " = "Tímasnið ";
 
 "default" = "Sjálfgefið";
 
@@ -78,15 +78,15 @@
 "timeFmt_2" = "";
 
 /* calendar */
-"Week begins on :" = "Vikan byrjar á :";
-"Day start time :" = "Degi lýkur kl. :";
-"Day end time :" = "Dagur hefst kl. :";
+"Week begins on " = "Vikan byrjar á ";
+"Day start time " = "Degi lýkur kl. ";
+"Day end time " = "Dagur hefst kl. ";
 "Day start time must be prior to day end time." = "Tími þegar dagur hefst, þarf að vera fyrir þann tíma sem degi lýkur. ";
-"First week of year :" = "Fyrsta vika árs :";
+"First week of year " = "Fyrsta vika árs ";
 "Enable reminders for Calendar items" = "Virkja áminningar fyrir hluti í dagatali";
 "Play a sound when a reminder comes due"
 = "Spila hljóð við áminningu";
-"Default reminder :" = "Sjálfgefin áminning :";
+"Default reminder " = "Sjálfgefin áminning ";
 
 "firstWeekOfYear_January1" = "Byrjar 1. janúar";
 "firstWeekOfYear_First4DayWeek" = "Fyrstu 4 dagar viku";
@@ -116,7 +116,7 @@
 "refreshview_every_30_minutes" = "Hverjar 30 mínútur";
 "refreshview_once_per_hour" = "Á klukkustundar fresti";
 
-"Forward messages:" = "Áframsenda póst:";
+"Forward messages" = "Áframsenda póst";
 "messageforward_inline" = "Innfellt";
 "messageforward_attached" = "Sem viðhengi";
 
@@ -132,14 +132,14 @@
 /* IMAP Accounts */
 "New Mail Account" = "Ný uppsetning á pósti";
 
-"Server Name:" = "Nafn netþjóns:";
-"Port:" = "Gátt:";
-"User Name:" = "Notandanafn:";
-"Password:" = "Lykilorð:";
+"Server Name" = "Nafn netþjóns";
+"Port" = "Gátt";
+"User Name" = "Notandanafn";
+"Password" = "Lykilorð";
 
-"Full Name:" = "Fullt nafn :";
-"Email:" = "Tölvupóstfang:";
-"Signature:" = "Undirritun:";
+"Full Name" = "Fullt nafn ";
+"Email" = "Tölvupóstfang";
+"Signature" = "Undirritun";
 "(Click to create)" = "(Smella til að búa til)";
 
 "Signature" = "Undirritun";
@@ -149,13 +149,13 @@
 "Additional Parameters" = "Fleiri færibreytur";
 
 /* password */
-"New password:" = "Nýtt lykilorð:";
-"Confirmation:" = "Staðfesting:";
+"New password" = "Nýtt lykilorð";
+"Confirmation" = "Staðfesting";
 "Change" = "Breyta";
 
 /* Event+task classifications */
-"Default events classification :" = "Default events classification :";
-"Default tasks classification :" = "Default tasks classification :";
+"Default events classification " = "Default events classification ";
+"Default tasks classification " = "Default tasks classification ";
 "PUBLIC_item" = "Public";
 "CONFIDENTIAL_item" = "Confidential";
 "PRIVATE_item" = "Private";
@@ -169,9 +169,9 @@
 "Contacts" = "Nafnaskrá";
 "Mail" = "Póstur";
 "Last" = "Síðast notað";
-"Default Module :" = "Sjálfgefið viðmót :";
+"Default Module " = "Sjálfgefið viðmót ";
 
-"Language :" = "Tungumál :";
+"Language " = "Tungumál ";
 "choose" = "Velja...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -201,24 +201,24 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Þegar ég móttek beiðni um staðfestingu á lestri:";
+"When I receive a request for a return receipt" = "Þegar ég móttek beiðni um staðfestingu á lestri";
 "Never send a return receipt" = "Aldrei senda staðfestingu á lestri";
 "Allow return receipts for some messages" = "Leyfa staðfestinu á lestri fyrir suman póst";
-"If I'm not in the To or Cc of the message:" = "Ef ég er ekki í 'Til' eða 'Afrit'-reitum póstsins:";
-"If the sender is outside my domain:" = "Ef sendandi er fyrir utan mitt lén:";
-"In all other cases:" = "Í öllum öðrum tilfellum:";
+"If I'm not in the To or Cc of the message" = "Ef ég er ekki í 'Til' eða 'Afrit'-reitum póstsins";
+"If the sender is outside my domain" = "Ef sendandi er fyrir utan mitt lén";
+"In all other cases" = "Í öllum öðrum tilfellum";
 
 "Never send" = "Aldrei senda";
 "Always send" = "Senda alltaf";
 "Ask me" = "Spyrja mig";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Þegar ég móttek beiðni um staðfestingu á lestri:";
+"When I receive a request for a return receipt" = "Þegar ég móttek beiðni um staðfestingu á lestri";
 "Never send a return receipt" = "Aldrei senda staðfestingu á lestri";
 "Allow return receipts for some messages" = "Leyfa staðfestinu á lestri fyrir suman póst";
-"If I'm not in the To or Cc of the message:" = "Ef ég er ekki í 'Til' eða 'Afrit'-reitum póstsins:";
-"If the sender is outside my domain:" = "Ef sendandi er fyrir utan mitt lén:";
-"In all other cases:" = "Í öllum öðrum tilfellum:";
+"If I'm not in the To or Cc of the message" = "Ef ég er ekki í 'Til' eða 'Afrit'-reitum póstsins";
+"If the sender is outside my domain" = "Ef sendandi er fyrir utan mitt lén";
+"In all other cases" = "Í öllum öðrum tilfellum";
 
 "Never send" = "Aldrei senda";
 "Always send" = "Senda alltaf";
diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings
index e7e7980d1..7925b773f 100644
--- a/UI/PreferencesUI/Italian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Abilita il risponditore automatico";
-"Auto reply message :" = "Rispondi automaticamente solo una volta ad ogni mittente usando questo testo:";
-"Email addresses (separated by commas) :" = "Indirizzi email (separati da virgole) :";
+"Auto reply message " = "Rispondi automaticamente solo una volta ad ogni mittente usando questo testo";
+"Email addresses (separated by commas) " = "Indirizzi email (separati da virgole) ";
 "Add default email addresses" = "Aggiungi gli indirizzi email";
-"Days between responses :" = "Numero giorni tra le risposte :";
+"Days between responses " = "Numero giorni tra le risposte ";
 "Do not send responses to mailing lists" = "Non mandare risposte alle mailing list";
 "Disable auto reply on" = "Disabilita il risponditore automatico";
 "Please specify your message and your email addresses for which you want to enable auto reply."
@@ -41,10 +41,10 @@
 = "Prego specificare l'indirizzo verso quale inoltrare i messaggi.";
 
 /* d & t */
-"Current Time Zone :" = "Fuso orario:";
-"Short Date Format :" = "Data breve:";
-"Long Date Format :" = "Data estesa:";
-"Time Format :" = "Formato ora:";
+"Current Time Zone " = "Fuso orario";
+"Short Date Format " = "Data breve";
+"Long Date Format " = "Data estesa";
+"Time Format " = "Formato ora";
 
 "default" = "Default";
 
@@ -90,23 +90,23 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "La settimana inizia il:";
-"Day start time :" = "La giornata lavorativa inizia alle ore:";
-"Day end time :" = "La giornata lavorativa termina alle ore:";
+"Week begins on " = "La settimana inizia il";
+"Day start time " = "La giornata lavorativa inizia alle ore";
+"Day end time " = "La giornata lavorativa termina alle ore";
 "Day start time must be prior to day end time." = "Il giorno di inizio deve essere precedente alla giorno di fine.";
 "Show time as busy outside working hours" = "Mostra come occupato il tempo fuori dalle ore lavorative";
-"First week of year :" = "Prima settimana dell'anno:";
+"First week of year " = "Prima settimana dell'anno";
 "Enable reminders for Calendar items" = "Abilita promemoria per gli eventi del Calendario";
 "Play a sound when a reminder comes due"
 = "Riproduci un suono quando un promemoria è attivo";
-"Default reminder :" = "Promemoria predefinito:";
+"Default reminder " = "Promemoria predefinito";
 
 "firstWeekOfYear_January1" = "Inizia l'1 gennaio";
 "firstWeekOfYear_First4DayWeek" = "Prima settimana di 4 giorni";
 "firstWeekOfYear_FirstFullWeek" = "Prima settimana completa";
 
 /* Default Calendar */
-"Default calendar :" = "Calendario di default";
+"Default calendar " = "Calendario di default";
 "selectedCalendar" = "Calendario selezionato";
 "personalCalendar" = "Calendario personale";
 "firstCalendar" = "Primo calendario abilitato";
@@ -136,7 +136,7 @@
 "refreshview_every_30_minutes" = "Ogni 30 minuti";
 "refreshview_once_per_hour" = "Ogni ora";
 
-"Forward messages:" = "Inoltra messaggi come:";
+"Forward messages" = "Inoltra messaggi come";
 "messageforward_inline" = "Parte del messaggio";
 "messageforward_attached" = "Allegato";
 
@@ -152,15 +152,15 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nuovo account mail";
 
-"Server Name:" = "Nome del server:";
-"Port:" = "Porta:";
-"User Name:" = "Nome utente:";
-"Password:" = "Password:";
+"Server Name" = "Nome del server";
+"Port" = "Porta";
+"User Name" = "Nome utente";
+"Password" = "Password";
 
-"Full Name:" = "Nome completo:";
-"Email:" = "Email";
-"Reply To Email:" = "Rispondi all'email:";
-"Signature:" = "Firma:";
+"Full Name" = "Nome completo";
+"Email" = "Email";
+"Reply To Email" = "Rispondi all'email";
+"Signature" = "Firma";
 "(Click to create)" = "(Clicca per creare)";
 
 "Signature" = "Firma";
@@ -170,13 +170,13 @@
 "Additional Parameters" = "Parametri addizionali";
 
 /* password */
-"New password:" = "Nuova password:";
-"Confirmation:" = "Ripeti nuova password:";
+"New password" = "Nuova password";
+"Confirmation" = "Ripeti nuova password";
 "Change" = "Cambia Password";
 
 /* Event+task classifications */
-"Default events classification :" = "Classificazioni degli eventi di default:";
-"Default tasks classification :" = "Classificazione di default delle attività:";
+"Default events classification " = "Classificazioni degli eventi di default";
+"Default tasks classification " = "Classificazione di default delle attività";
 "PUBLIC_item" = "Pubblico";
 "CONFIDENTIAL_item" = "Confidenziale";
 "PRIVATE_item" = "Privato";
@@ -190,9 +190,9 @@
 "Contacts" = "Rubrica";
 "Mail" = "Posta";
 "Last" = "Ultimo usato";
-"Default Module :" = "Modulo di default :";
+"Default Module " = "Modulo di default ";
 
-"Language :" = "Lingua :";
+"Language " = "Lingua ";
 "choose" = "Scegli...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -222,12 +222,12 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Quando ricevo una richiesta di notifica di lettura:";
+"When I receive a request for a return receipt" = "Quando ricevo una richiesta di notifica di lettura";
 "Never send a return receipt" = "Non inviare mail una notifica di lettura";
 "Allow return receipts for some messages" = "Permetti la notifica di lettura per alcuni messaggi";
-"If I'm not in the To or Cc of the message:" = "Se non sono presente nel campo To e Cc del messaggio:";
-"If the sender is outside my domain:" = "Se il mittente ha un dominio diverso dal mio:";
-"In all other cases:" = "In tutti gli altri casi:";
+"If I'm not in the To or Cc of the message" = "Se non sono presente nel campo To e Cc del messaggio";
+"If the sender is outside my domain" = "Se il mittente ha un dominio diverso dal mio";
+"In all other cases" = "In tutti gli altri casi";
 
 "Never send" = "Non inviare mai";
 "Always send" = "Invia sempre";
diff --git a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
index 849ff98c8..76d214899 100644
--- a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
+++ b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Aktiver auto-svar ved fravær";
-"Auto reply message :" = "Auto-svar melding:";
-"Email addresses (separated by commas) :" = "E-postadresser (separert med komma):";
+"Auto reply message " = "Auto-svar melding";
+"Email addresses (separated by commas) " = "E-postadresser (separert med komma)";
 "Add default email addresses" = "Legg til standard e-postadresser";
-"Days between responses :" = "Dager mellom svar:";
+"Days between responses " = "Dager mellom svar";
 "Do not send responses to mailing lists" = "Ikke send svar til e-postlister";
 "Disable auto reply on" = "Skru av auto-svar";
 "Always send vacation message response" = "Alltid send ferie melding";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Gjeldende tidssone:";
-"Short Date Format :" = "Kort datoformat:";
-"Long Date Format :" = "Langt datoformat:";
-"Time Format :" = "Tidsformat:";
+"Current Time Zone " = "Gjeldende tidssone";
+"Short Date Format " = "Kort datoformat";
+"Long Date Format " = "Langt datoformat";
+"Time Format " = "Tidsformat";
 
 "default" = "Standard";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Uken begynner med:";
-"Day start time :" = "Dagen begynner kl.:";
-"Day end time :" = "Dagen slutter kl.:";
+"Week begins on " = "Uken begynner med";
+"Day start time " = "Dagen begynner kl.";
+"Day end time " = "Dagen slutter kl.";
 "Day start time must be prior to day end time." = "Dagens starttid må være før dagens sluttid.";
 "Show time as busy outside working hours" = "Vis tid som opptatt utenfor arbeidstid";
-"First week of year :" = "Første uken i året:";
+"First week of year " = "Første uken i året";
 "Enable reminders for Calendar items" = "Aktivere påminnelser for kalenderelementer";
 "Play a sound when a reminder comes due" = "Avspill lyd ved en påminnelse";
-"Default reminder :" = "Standardpåminnelse:";
+"Default reminder " = "Standardpåminnelse";
 
 "firstWeekOfYear_January1" = "Begynner den 1. januar";
 "firstWeekOfYear_First4DayWeek" = "Første firedagersuken i året";
 "firstWeekOfYear_FirstFullWeek" = "Første hele uken i året";
 
 "Prevent from being invited to appointments" = "Hindre fra å bli invitert til avtaler";
-"White list for appointment invitations:" = "Hviteliste for avtale invitasjoner:";
+"White list for appointment invitations" = "Hviteliste for avtale invitasjoner";
 "Contacts Names" = "Kontakters navn";
 
 /* Default Calendar */
-"Default calendar :" = "Standard kalender:";
+"Default calendar " = "Standard kalender";
 "selectedCalendar" = "Valgte kalender";
 "personalCalendar" = "Personlig kalender";
 "firstCalendar" = "Første aktiverte kalender";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Sorter meldinger etter tråder";
 "When sending mail, add unknown recipients to my" = "Ved sending av mail, legg til ukjente mottakere til min";
 
-"Forward messages:" = "Videresend meldinger:";
+"Forward messages" = "Videresend meldinger";
 "messageforward_inline" = "Innsatt";
 "messageforward_attached" = "Som Vedlegg";
 
-"When replying to a message:" = "Ved svar på melding: ";
+"When replying to a message" = "Ved svar på melding ";
 "replyplacement_above" = "Start svaret ovenfor";
 "replyplacement_below" = "Start svaret under";
 "And place my signature" = "Legg til min signatur";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Ny e-postkonto";
 
-"Server Name:" = "Servernavn:";
-"Port:" = "Port:";
-"Encryption:" = "Kryptering:";
+"Server Name" = "Servernavn";
+"Port" = "Port";
+"Encryption" = "Kryptering";
 "None" = "Ingen";
-"User Name:" = "Brukernavn:";
-"Password:" = "Passord:";
+"User Name" = "Brukernavn";
+"Password" = "Passord";
 
-"Full Name:" = "Fullt navn:";
-"Email:" = "E-post:";
-"Reply To Email:" = "Svar til e-post:";
-"Signature:" = "Signatur:";
+"Full Name" = "Fullt navn";
+"Email" = "E-post";
+"Reply To Email" = "Svar til e-post";
+"Signature" = "Signatur";
 "(Click to create)" = "(Klikk for å opprette)";
 
 "Signature" = "Signatur";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Øvrige parametre";
 
 /* password */
-"New password:" = "Nytt passord:";
-"Confirmation:" = "Bekreft:";
+"New password" = "Nytt passord";
+"Confirmation" = "Bekreft";
 "Change" = "Endre";
 
 /* Event+task classifications */
-"Default events classification :" = "Standard hendelsesklassifikasjon:";
-"Default tasks classification :" = "Standard oppgaveklassifisering";
+"Default events classification " = "Standard hendelsesklassifikasjon";
+"Default tasks classification " = "Standard oppgaveklassifisering";
 "PUBLIC_item" = "Offentlig";
 "CONFIDENTIAL_item" = "Konfidensiell";
 "PRIVATE_item" = "Privat";
@@ -210,10 +210,10 @@
 "Contacts" = "Adressebok";
 "Mail" = "E-post";
 "Last" = "Sist besøkt";
-"Default Module :" = "Standardmodul:";
-"SOGo Version :" = "SOGo versjon:";
+"Default Module " = "Standardmodul";
+"SOGo Version " = "SOGo versjon";
 
-"Language :" = "Språk:";
+"Language " = "Språk";
 "choose" = "Velg ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -241,7 +241,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Oppdater Visning:";
+"Refresh View " = "Oppdater Visning";
 "refreshview_manually" = "Manuelt";
 "refreshview_every_minute" = "Hvert minutt";
 "refreshview_every_2_minutes" = "Hvert 2. minutt";
@@ -252,12 +252,12 @@
 "refreshview_once_per_hour" = "Hver time";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Når jeg mottar anmodning om en returkvittering:";
+"When I receive a request for a return receipt" = "Når jeg mottar anmodning om en returkvittering";
 "Never send a return receipt" = "Send aldri en returkvittering";
 "Allow return receipts for some messages" = "Tillat returkvittering for noen meldinger";
-"If I'm not in the To or Cc of the message:" = "Hvis jeg ikke er i Til- eller Cc-feltet i meldingen:";
-"If the sender is outside my domain:" = "Hvis senderen er utenfor mitt domene:";
-"In all other cases:" = "I alle andre tilfeller:";
+"If I'm not in the To or Cc of the message" = "Hvis jeg ikke er i Til- eller Cc-feltet i meldingen";
+"If the sender is outside my domain" = "Hvis senderen er utenfor mitt domene";
+"In all other cases" = "I alle andre tilfeller";
 
 "Never send" = "Aldri send";
 "Always send" = "Alltid send";
diff --git a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
index 399fdd71d..897c4c146 100644
--- a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
+++ b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Aktiver auto-svar ved fravær";
-"Auto reply message :" = "Auto-svar melding:";
-"Email addresses (separated by commas) :" = "E-postadresser (separert med komma):";
+"Auto reply message " = "Auto-svar melding";
+"Email addresses (separated by commas) " = "E-postadresser (separert med komma)";
 "Add default email addresses" = "Legg til standard e-postadresser";
-"Days between responses :" = "Dager mellom svar:";
+"Days between responses " = "Dager mellom svar";
 "Do not send responses to mailing lists" = "Ikke send svar til e-postlister";
 "Please specify your message and your email addresses for which you want to enable auto reply."
 = "Skriv melding og angi din e-postadresse som du vil aktivera auto-svar på.";
@@ -37,10 +37,10 @@
 = "Angi adressen du vil videresende dine meldinger til.";
 
 /* d & t */
-"Current Time Zone :" = "Gjeldende tidssone:";
-"Short Date Format :" = "Kort datoformat:";
-"Long Date Format :" = "Langt datoformat:";
-"Time Format :" = "Tidsformat:";
+"Current Time Zone " = "Gjeldende tidssone";
+"Short Date Format " = "Kort datoformat";
+"Long Date Format " = "Langt datoformat";
+"Time Format " = "Tidsformat";
 
 "default" = "Standard";
 
@@ -78,22 +78,22 @@
 "timeFmt_2" = "";
 
 /* calendar */
-"Week begins on :" = "Uken begynner med:";
-"Day start time :" = "Dagen begynner kl.:";
-"Day end time :" = "Dagen slutter kl.:";
+"Week begins on " = "Uken begynner med";
+"Day start time " = "Dagen begynner kl.";
+"Day end time " = "Dagen slutter kl.";
 "Day start time must be prior to day end time." = "Dagens starttid må være før dagens sluttid.";
-"First week of year :" = "Første uken i året:";
+"First week of year " = "Første uken i året";
 "Enable reminders for Calendar items" = "Aktivere påminnelser for kalenderelementer";
 "Play a sound when a reminder comes due"
 = "Avspill lyd ved en påminnelse";
-"Default reminder :" = "Standardpåminnelse:";
+"Default reminder " = "Standardpåminnelse";
 
 "firstWeekOfYear_January1" = "Begynner den 1. januar";
 "firstWeekOfYear_First4DayWeek" = "Første 4-dagersuken i året";
 "firstWeekOfYear_FirstFullWeek" = "Første hele uken i året";
 
 /* Default Calendar */
-"Default calendar :" = "Default calendar";
+"Default calendar " = "Default calendar";
 "selectedCalendar" = "Selected calendar";
 "personalCalendar" = "Personal calendar";
 "firstCalendar" = "First enabled calendar";
@@ -123,7 +123,7 @@
 "refreshview_every_30_minutes" = "Hvert 30 minutt";
 "refreshview_once_per_hour" = "Hver time";
 
-"Forward messages:" = "Videresend melding:";
+"Forward messages" = "Videresend melding";
 "messageforward_inline" = "Innsatt";
 "messageforward_attached" = "Vedlegg";
 
@@ -139,14 +139,14 @@
 /* IMAP Accounts */
 "New Mail Account" = "Ny epostkonto";
 
-"Server Name:" = "Servernavn:";
-"Port:" = "Port:";
-"User Name:" = "Brukernavn:";
-"Password:" = "Passord:";
+"Server Name" = "Servernavn";
+"Port" = "Port";
+"User Name" = "Brukernavn";
+"Password" = "Passord";
 
-"Full Name:" = "Fullt Navn:";
-"Email:" = "E-post:";
-"Signature:" = "Signatur:";
+"Full Name" = "Fullt Navn";
+"Email" = "E-post";
+"Signature" = "Signatur";
 "(Click to create)" = "(Klikk for å opprette)";
 
 "Signature" = "Signatur";
@@ -156,13 +156,13 @@
 "Additional Parameters" = "Øvrige parametre";
 
 /* password */
-"New password:" = "Nytt passord:";
-"Confirmation:" = "Bekreft:";
+"New password" = "Nytt passord";
+"Confirmation" = "Bekreft";
 "Change" = "Endre";
 
 /* Event+task classifications */
-"Default events classification :" = "Default events classification :";
-"Default tasks classification :" = "Default tasks classification :";
+"Default events classification " = "Default events classification ";
+"Default tasks classification " = "Default tasks classification ";
 "PUBLIC_item" = "Public";
 "CONFIDENTIAL_item" = "Confidential";
 "PRIVATE_item" = "Private";
@@ -176,9 +176,9 @@
 "Contacts" = "Adressebok";
 "Mail" = "E-post";
 "Last" = "Sist besøkt";
-"Default Module :" = "Standardmodul:";
+"Default Module " = "Standardmodul";
 
-"Language :" = "Språk:";
+"Language " = "Språk";
 "choose" = "Velg ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -208,24 +208,24 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Når jeg mottar anmodning om en returkvittering:";
+"When I receive a request for a return receipt" = "Når jeg mottar anmodning om en returkvittering";
 "Never send a return receipt" = "Send aldri en returkvittering";
 "Allow return receipts for some messages" = "Tillat returkvittering for noen meldinger";
-"If I'm not in the To or Cc of the message:" = "Hvis jeg ikke er i Til eller Cc feltet i meldingen:";
-"If the sender is outside my domain:" = "Hvis senderen er utenfor mitt domene:";
-"In all other cases:" = "I alle andre tilfeller:";
+"If I'm not in the To or Cc of the message" = "Hvis jeg ikke er i Til eller Cc feltet i meldingen";
+"If the sender is outside my domain" = "Hvis senderen er utenfor mitt domene";
+"In all other cases" = "I alle andre tilfeller";
 
 "Never send" = "Send aldri";
 "Always send" = "Send alltid";
 "Ask me" = "Spør meg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Når jeg mottar anmodning om en returkvittering:";
+"When I receive a request for a return receipt" = "Når jeg mottar anmodning om en returkvittering";
 "Never send a return receipt" = "Send aldri en returkvittering";
 "Allow return receipts for some messages" = "Tillat returkvittering for noen meldinger";
-"If I'm not in the To or Cc of the message:" = "Hvis jeg ikke er i Til eller Cc feltet i meldingen:";
-"If the sender is outside my domain:" = "Hvis senderen er utenfor mitt domene:";
-"In all other cases:" = "I alle andre tilfeller:";
+"If I'm not in the To or Cc of the message" = "Hvis jeg ikke er i Til eller Cc feltet i meldingen";
+"If the sender is outside my domain" = "Hvis senderen er utenfor mitt domene";
+"In all other cases" = "I alle andre tilfeller";
 
 "Never send" = "Send aldri";
 "Always send" = "Send alltid";
@@ -296,5 +296,5 @@
 "Unhandled error response" = "Erreur inconnue";
 "Password change is not supported." = "Changement de mot de passe non-supporté.";
 "Unhandled HTTP error code: %{0}" = "Code HTTP non-géré: %{0}";
-"New password:" = "Nytt passord:";
-"Confirmation:" = "Bekreft:";
\ No newline at end of file
+"New password" = "Nytt passord";
+"Confirmation" = "Bekreft";
diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings
index f8f3e88a3..f97d128fa 100644
--- a/UI/PreferencesUI/Polish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Włącz autoodpowiedź podczas nieobecności";
-"Auto reply message :" = "Treść autoodpowiedzi :";
-"Email addresses (separated by commas) :" = "Adresy e-mail (oddzielone przecinkami) :";
+"Auto reply message " = "Treść autoodpowiedzi ";
+"Email addresses (separated by commas) " = "Adresy e-mail (oddzielone przecinkami) ";
 "Add default email addresses" = "Dodaj domyślne adresy e-mail";
-"Days between responses :" = "Dni pomiędzy odpowiedziami :";
+"Days between responses " = "Dni pomiędzy odpowiedziami ";
 "Do not send responses to mailing lists" = "Nie wysyłaj odpowiedzi do grup pocztowych";
 "Disable auto reply on" = "Zablokuj autoodpowiedź w";
 "Always send vacation message response" = "Zawsze wysyłaj autoodpowiedź";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Bieżąca strefa czasowa :";
-"Short Date Format :" = "Krótki format daty :";
-"Long Date Format :" = "Długi format daty :";
-"Time Format :" = "Format czasu :";
+"Current Time Zone " = "Bieżąca strefa czasowa ";
+"Short Date Format " = "Krótki format daty ";
+"Long Date Format " = "Długi format daty ";
+"Time Format " = "Format czasu ";
 
 "default" = "Domyślne";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Pierwszy dzień tygodnia :";
-"Day start time :" = "Początek dnia :";
-"Day end time :" = "Koniec dnia :";
+"Week begins on " = "Pierwszy dzień tygodnia ";
+"Day start time " = "Początek dnia ";
+"Day end time " = "Koniec dnia ";
 "Day start time must be prior to day end time." = "Początek dnia musi wypadać wcześniej niż koniec dnia.";
 "Show time as busy outside working hours" = "Pokaż czas poza godzinami pracy jako zajęty";
-"First week of year :" = "Pierwszy tydzień roku :";
+"First week of year " = "Pierwszy tydzień roku ";
 "Enable reminders for Calendar items" = "Włącz przypomnienia pozycji kalendarza";
 "Play a sound when a reminder comes due" = "Odtwórz dźwięk w momencie przypomnienia";
-"Default reminder :" = "Domyślne przypomnienie :";
+"Default reminder " = "Domyślne przypomnienie ";
 
 "firstWeekOfYear_January1" = "rozpoczyna się 1 stycznia";
 "firstWeekOfYear_First4DayWeek" = "pierwszy 4-dniowy tydzień";
 "firstWeekOfYear_FirstFullWeek" = "pierwszy pełny tydzień";
 
 "Prevent from being invited to appointments" = "Zablokuj możliwość zapraszania cię na wydarzenia";
-"White list for appointment invitations:" = "Osoby, którym pozwalasz się zapraszać:";
+"White list for appointment invitations" = "Osoby, którym pozwalasz się zapraszać";
 "Contacts Names" = "Nazwy kontaktów";
 
 /* Default Calendar */
-"Default calendar :" = "Domyślny kalendarz:";
+"Default calendar " = "Domyślny kalendarz";
 "selectedCalendar" = "Wybrany kalendarz";
 "personalCalendar" = "Kalendarz osobisty";
 "firstCalendar" = "Pierwszy kalendarz";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Sortuj wiadomości według wątków";
 "When sending mail, add unknown recipients to my" = "Gdy wysyłam e-mail, dodaj adresy nowych odbiorców do";
 
-"Forward messages:" = "Przekaż wiadomości:";
+"Forward messages" = "Przekaż wiadomości";
 "messageforward_inline" = "w treści";
 "messageforward_attached" = "jako załącznik";
 
-"When replying to a message:" = "Gdy odpowiadam na wiadomość:";
+"When replying to a message" = "Gdy odpowiadam na wiadomość";
 "replyplacement_above" = "Rozpocznij moją odpowiedź powyżej cytatu";
 "replyplacement_below" = "Rozpocznij moją odpowiedź poniżej cytatu";
 "And place my signature" = "i wstaw mój podpis";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nowe konto";
 
-"Server Name:" = "Nazwa serwera:";
-"Port:" = "Port:";
-"Encryption:" = "Szyfrowanie:";
+"Server Name" = "Nazwa serwera";
+"Port" = "Port";
+"Encryption" = "Szyfrowanie";
 "None" = "Brak";
-"User Name:" = "Użytkownik:";
-"Password:" = "Hasło:";
+"User Name" = "Użytkownik";
+"Password" = "Hasło";
 
-"Full Name:" = "Imię i nazwisko:";
-"Email:" = "E-mail:";
-"Reply To Email:" = "Odpowiedź do:";
-"Signature:" = "Sygnatura:";
+"Full Name" = "Imię i nazwisko";
+"Email" = "E-mail";
+"Reply To Email" = "Odpowiedź do";
+"Signature" = "Sygnatura";
 "(Click to create)" = "(Kliknij by stworzyć)";
 
 "Signature" = "Podpis";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Dodatkowe parametry";
 
 /* password */
-"New password:" = "Nowe hasło:";
-"Confirmation:" = "Potwierdzenie:";
+"New password" = "Nowe hasło";
+"Confirmation" = "Potwierdzenie";
 "Change" = "Zmiana";
 
 /* Event+task classifications */
-"Default events classification :" = "Domyślna klasyfikacja zdarzeń:";
-"Default tasks classification :" = "Domyślna klasyfikacja zadań:";
+"Default events classification " = "Domyślna klasyfikacja zdarzeń";
+"Default tasks classification " = "Domyślna klasyfikacja zadań";
 "PUBLIC_item" = "Publiczny";
 "CONFIDENTIAL_item" = "Poufny";
 "PRIVATE_item" = "Prywatny";
@@ -210,10 +210,10 @@
 "Contacts" = "Książka adresowa";
 "Mail" = "Poczta";
 "Last" = "Ostatnio używane";
-"Default Module :" = "Tryb domyślny:";
-"SOGo Version :" = "Wersja SOGo:";
+"Default Module " = "Tryb domyślny";
+"SOGo Version " = "Wersja SOGo";
 
-"Language :" = "Język:";
+"Language " = "Język";
 "choose" = "Wybierz";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -241,7 +241,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Odświeżanie:";
+"Refresh View " = "Odświeżanie";
 "refreshview_manually" = "ręcznie";
 "refreshview_every_minute" = "co minutę";
 "refreshview_every_2_minutes" = "co 2 minuty";
@@ -252,12 +252,12 @@
 "refreshview_once_per_hour" = "raz na godzinę";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Kiedy otrzymam żądanie potwierdzenia odbioru:";
+"When I receive a request for a return receipt" = "Kiedy otrzymam żądanie potwierdzenia odbioru";
 "Never send a return receipt" = "Nigdy nie wysyłaj potwierdzenia odbioru";
 "Allow return receipts for some messages" = "Pozwól na potwierdzanie odbioru niektórych wiadomości";
-"If I'm not in the To or Cc of the message:" = "Jeśli nie jestem odbiorcą Do lub DW wiadomości:";
-"If the sender is outside my domain:" = "Jeśli nadawca jest spoza mojej domeny:";
-"In all other cases:" = "We wszystkich pozostałych przypadkach:";
+"If I'm not in the To or Cc of the message" = "Jeśli nie jestem odbiorcą Do lub DW wiadomości";
+"If the sender is outside my domain" = "Jeśli nadawca jest spoza mojej domeny";
+"In all other cases" = "We wszystkich pozostałych przypadkach";
 
 "Never send" = "Nigdy nie wysyłaj";
 "Always send" = "Zawsze wysyłaj";
diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings
index 5b7ea15f3..ae810988d 100644
--- a/UI/PreferencesUI/Russian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Включить автоматическую отправку сообщения об отпуске";
-"Auto reply message :" = "Автоматически посылать этот текст каждому отправителю один раз :";
-"Email addresses (separated by commas) :" = "Email адреса (разделенные запятыми) :";
+"Auto reply message " = "Автоматически посылать этот текст каждому отправителю один раз ";
+"Email addresses (separated by commas) " = "Email адреса (разделенные запятыми) ";
 "Add default email addresses" = "Добавить e-mail адреса по умолчанию";
-"Days between responses :" = "Дни между ответами :";
+"Days between responses " = "Дни между ответами ";
 "Do not send responses to mailing lists" = "Не отправлять ответы на почтовые списки рассылки";
 "Disable auto reply on" = "Запрет автоответа включен";
 "Always send vacation message response" = "Всегда отправлять ответное сообщение об отпуске";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Текущая временная зона :";
-"Short Date Format :" = "Короткий формат даты :";
-"Long Date Format :" = "Длинный формат даты :";
-"Time Format :" = "Формат времени :";
+"Current Time Zone " = "Текущая временная зона ";
+"Short Date Format " = "Короткий формат даты ";
+"Long Date Format " = "Длинный формат даты ";
+"Time Format " = "Формат времени ";
 
 "default" = "Default";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Неделя начинается с:";
-"Day start time :" = "Рабочий день начинается в:";
-"Day end time :" = "Рабочий день заканчивается в :";
+"Week begins on " = "Неделя начинается с";
+"Day start time " = "Рабочий день начинается в";
+"Day end time " = "Рабочий день заканчивается в ";
 "Day start time must be prior to day end time." = "Время начала дня должно быть перед временем его окончания.";
 "Show time as busy outside working hours" = "Показывать время, как занятое, если оно за границами рабочего времени.";
-"First week of year :" = "Первая неделя года :";
+"First week of year " = "Первая неделя года ";
 "Enable reminders for Calendar items" = "Включить напоминания для событий календаря";
 "Play a sound when a reminder comes due" = "Проигрывать звук когда срабатывает оповещение";
-"Default reminder :" = "Обычное оповещение :";
+"Default reminder " = "Обычное оповещение ";
 
 "firstWeekOfYear_January1" = "Начинается 1 января";
 "firstWeekOfYear_First4DayWeek" = "Первая 4-х дневная неделя";
 "firstWeekOfYear_FirstFullWeek" = "Первая полная неделя";
 
 "Prevent from being invited to appointments" = "Не допускать приглашения на встречи";
-"White list for appointment invitations:" = "Белый список для приглашений на встречи:";
+"White list for appointment invitations" = "Белый список для приглашений на встречи";
 "Contacts Names" = "Имена контактов";
 
 /* Default Calendar */
-"Default calendar :" = "Календарь по-умолчанию";
+"Default calendar " = "Календарь по-умолчанию";
 "selectedCalendar" = "Выбранный календарь";
 "personalCalendar" = "Персональный календарь";
 "firstCalendar" = "Первый разрешенный календарь";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Сортировать сообщения по нитям";
 "When sending mail, add unknown recipients to my" = "При отправке писем добавлять неизвестных получателей в мою";
 
-"Forward messages:" = "Пересылать сообщения:";
+"Forward messages" = "Пересылать сообщения";
 "messageforward_inline" = "В теле письма";
 "messageforward_attached" = "Приложенным файлом";
 
-"When replying to a message:" = "При ответе на сообщение:";
+"When replying to a message" = "При ответе на сообщение";
 "replyplacement_above" = "Начинать мой ответ над цитируемым текстом";
 "replyplacement_below" = "Начинать мой ответ под цитируемым текстом";
 "And place my signature" = "И поместить мою подпись";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "New Mail Account";
 
-"Server Name:" = "Имя сервера:";
-"Port:" = "Порт:";
-"Encryption:" = "Шифрование:";
+"Server Name" = "Имя сервера";
+"Port" = "Порт";
+"Encryption" = "Шифрование";
 "None" = "Нет";
-"User Name:" = "Имя пользователя:";
-"Password:" = "Пароль:";
+"User Name" = "Имя пользователя";
+"Password" = "Пароль";
 
-"Full Name:" = "Full Name:";
-"Email:" = "Email:";
-"Reply To Email:" = "Ответить на Email:";
-"Signature:" = "Подпись:";
+"Full Name" = "Full Name";
+"Email" = "Email";
+"Reply To Email" = "Ответить на Email";
+"Signature" = "Подпись";
 "(Click to create)" = "(Click to create)";
 
 "Signature" = "Подпись";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Дополнительные параметры";
 
 /* password */
-"New password:" = "Новый пароль:";
-"Confirmation:" = "Повтор нового пароля:";
+"New password" = "Новый пароль";
+"Confirmation" = "Повтор нового пароля";
 "Change" = "Изменить";
 
 /* Event+task classifications */
-"Default events classification :" = "Default events classification :";
-"Default tasks classification :" = "Default tasks classification :";
+"Default events classification " = "Default events classification ";
+"Default tasks classification " = "Default tasks classification ";
 "PUBLIC_item" = "Public";
 "CONFIDENTIAL_item" = "Confidential";
 "PRIVATE_item" = "Private";
@@ -210,10 +210,10 @@
 "Contacts" = "Адресная книга";
 "Mail" = "Почта";
 "Last" = "Последнее использование";
-"Default Module :" = "Модуль по умолчанию:";
-"SOGo Version :" = "Версия SOGo:";
+"Default Module " = "Модуль по умолчанию";
+"SOGo Version " = "Версия SOGo";
 
-"Language :" = "Язык:";
+"Language " = "Язык";
 "choose" = "Выбрать ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -242,7 +242,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Обновить вид:";
+"Refresh View " = "Обновить вид";
 "refreshview_manually" = "Вручную";
 "refreshview_every_minute" = "Каждую минуту";
 "refreshview_every_2_minutes" = "Каждые 2 минуты";
@@ -253,12 +253,12 @@
 "refreshview_once_per_hour" = "Раз в час";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Когда я получаю запрос об уведомлении о доставке:";
+"When I receive a request for a return receipt" = "Когда я получаю запрос об уведомлении о доставке";
 "Never send a return receipt" = "Никогда не посылать уведомления о доставке";
 "Allow return receipts for some messages" = "Разрешить уведомления о доставке для некоторых сообщений";
-"If I'm not in the To or Cc of the message:" = "Если я не в поле Кому: или Копия: для этого сообщения:";
-"If the sender is outside my domain:" = "Если отправитель вне моего домена:";
-"In all other cases:" = "Во всех остальных случаях:";
+"If I'm not in the To or Cc of the message" = "Если я не в поле Кому или Копия для этого сообщения";
+"If the sender is outside my domain" = "Если отправитель вне моего домена";
+"In all other cases" = "Во всех остальных случаях";
 
 "Never send" = "Никогда не посылать";
 "Always send" = "Всегда посылать";
diff --git a/UI/PreferencesUI/Slovak.lproj/Localizable.strings b/UI/PreferencesUI/Slovak.lproj/Localizable.strings
index 9c041a677..0cb2370fc 100644
--- a/UI/PreferencesUI/Slovak.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Slovak.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Zapnúť automatickú odpoveď";
-"Auto reply message :" = "Automatická odpoveď:";
-"Email addresses (separated by commas) :" = "Emailové adresy (oddelené čiarkami):";
+"Auto reply message " = "Automatická odpoveď";
+"Email addresses (separated by commas) " = "Emailové adresy (oddelené čiarkami)";
 "Add default email addresses" = "Pridať východziu emailovú adresu";
-"Days between responses :" = "Dni medzi odpoveďami:";
+"Days between responses " = "Dni medzi odpoveďami";
 "Do not send responses to mailing lists" = "Neposielať odpoveď emailovým skupinám";
 "Disable auto reply on" = "Vypnúť automatickú odpoveď";
 "Please specify your message and your email addresses for which you want to enable auto reply."
@@ -41,10 +41,10 @@
 = "Prosím zvoľte adresu na ktorú checete preposielať Vaše správy";
 
 /* d & t */
-"Current Time Zone :" = "Aktuálna Časová Zóna:";
-"Short Date Format :" = "Krátky formát dátumu:";
-"Long Date Format :" = "Dlhý formát dátumu:";
-"Time Format :" = "Formát času:";
+"Current Time Zone " = "Aktuálna Časová Zóna";
+"Short Date Format " = "Krátky formát dátumu";
+"Long Date Format " = "Dlhý formát dátumu";
+"Time Format " = "Formát času";
 
 "default" = "Predvolený";
 
@@ -90,22 +90,22 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Týždeň začína v:";
-"Day start time :" = "Začiatok dňa:";
-"Day end time :" = "Koniec dňa:";
+"Week begins on " = "Týždeň začína v";
+"Day start time " = "Začiatok dňa";
+"Day end time " = "Koniec dňa";
 "Day start time must be prior to day end time." = "Začiatok dňa musí byť skôr ako koniec dňa.";
 "Show time as busy outside working hours" = "Mimo pracovných hodín ukáž čas ako obsadený";
-"First week of year :" = "Prvý týždeň roka:";
+"First week of year " = "Prvý týždeň roka";
 "Enable reminders for Calendar items" = "Zapni pripomienky pre položky Kalendára";
 "Play a sound when a reminder comes due" = "Prehraj zvuk keď začne pripomienka";
-"Default reminder :" = "Predvolená pripomienka:";
+"Default reminder " = "Predvolená pripomienka";
 
 "firstWeekOfYear_January1" = "Začína 1. Januárom";
 "firstWeekOfYear_First4DayWeek" = "Prvý 4-dňový týždeň";
 "firstWeekOfYear_FirstFullWeek" = "Prvý celý týžden";
 
 /* Default Calendar */
-"Default calendar :" = "Predvolený kalendár:";
+"Default calendar " = "Predvolený kalendár";
 "selectedCalendar" = "Zvolený kalendár";
 "personalCalendar" = "Osobný kalendár";
 "firstCalendar" = "Prvý zapnutý kalendár";
@@ -140,11 +140,11 @@
 "refreshview_every_30_minutes" = "Každých 30 minút";
 "refreshview_once_per_hour" = "Raz za hodinu";
 
-"Forward messages:" = "Preposielaj správy:";
+"Forward messages" = "Preposielaj správy";
 "messageforward_inline" = "Vrade";
 "messageforward_attached" = "Ako prílohu";
 
-"When replying to a message:" = "Pri odpovedaní na správu:";
+"When replying to a message" = "Pri odpovedaní na správu";
 "replyplacement_above" = "Odpoveď začína nad citáciou";
 "replyplacement_below" = "Odpoveď začína pod citáciou";
 "And place my signature" = "A vlož môj podpis";
@@ -164,17 +164,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nový mailový účet";
 
-"Server Name:" = "Meno servera:";
-"Port:" = "Port:";
-"Encryption:" = "Šifrovanie:";
+"Server Name" = "Meno servera";
+"Port" = "Port";
+"Encryption" = "Šifrovanie";
 "None" = "Žiadne";
-"User Name:" = "Užívateľské meno:";
-"Password:" = "Heslo:";
+"User Name" = "Užívateľské meno";
+"Password" = "Heslo";
 
-"Full Name:" = "Celé meno:";
-"Email:" = "Email:";
-"Reply To Email:" = "Email pre odpoveď:";
-"Signature:" = "Podpis:";
+"Full Name" = "Celé meno";
+"Email" = "Email";
+"Reply To Email" = "Email pre odpoveď";
+"Signature" = "Podpis";
 "(Click to create)" = "(klikni pre vytvorenie)";
 
 "Signature" = "Podpis";
@@ -187,13 +187,13 @@
 "Additional Parameters" = "Dalšie parametre";
 
 /* password */
-"New password:" = "Nové heslo:";
-"Confirmation:" = "Potvrdenie:";
+"New password" = "Nové heslo";
+"Confirmation" = "Potvrdenie";
 "Change" = "Zmena";
 
 /* Event+task classifications */
-"Default events classification :" = "Predvolená klasifikácia udalostí";
-"Default tasks classification :" = "Predvolená klasifikácia úloh";
+"Default events classification " = "Predvolená klasifikácia udalostí";
+"Default tasks classification " = "Predvolená klasifikácia úloh";
 "PUBLIC_item" = "Verejný";
 "CONFIDENTIAL_item" = "Dôverný";
 "PRIVATE_item" = "Súkromný";
@@ -207,10 +207,10 @@
 "Contacts" = "Adresár";
 "Mail" = "Pošta";
 "Last" = "Naposledy použité";
-"Default Module :" = "Predvolený modul:";
-"SOGo Version :" = "Verzia SOGo:";
+"Default Module " = "Predvolený modul";
+"SOGo Version " = "Verzia SOGo";
 
-"Language :" = "Jazyk:";
+"Language " = "Jazyk";
 "choose" = "Vyber...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -240,12 +240,12 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Keď dostanem požiadavku na potvrdenie o doručení";
+"When I receive a request for a return receipt" = "Keď dostanem požiadavku na potvrdenie o doručení";
 "Never send a return receipt" = "Nikdy neposielať potvrdenie o doručení";
 "Allow return receipts for some messages" = "Povoliť potvrdenie o doručení pre niektoré správy";
-"If I'm not in the To or Cc of the message:" = "Pokial nie som v Pre alebo Kópia políčku správy:";
-"If the sender is outside my domain:" = "Pokiaľ je odosielateľ mimo mojej domény:";
-"In all other cases:" = "Vo všetkých ostatných prípadoch:";
+"If I'm not in the To or Cc of the message" = "Pokial nie som v Pre alebo Kópia políčku správy";
+"If the sender is outside my domain" = "Pokiaľ je odosielateľ mimo mojej domény";
+"In all other cases" = "Vo všetkých ostatných prípadoch";
 
 "Never send" = "Nikdy neposielaj";
 "Always send" = "Vždy posielaj";
diff --git a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings
index 96e245c4a..cc9785853 100644
--- a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Omogoči samodejni odgovor ob odsotnosti";
-"Auto reply message :" = "Samodejno sporočilo:";
-"Email addresses (separated by commas) :" = "E-poštni naslovi (ločeni z vejivo):";
+"Auto reply message " = "Samodejno sporočilo";
+"Email addresses (separated by commas) " = "E-poštni naslovi (ločeni z vejivo)";
 "Add default email addresses" = "Dodaj privzete e-poštne naslove";
-"Days between responses :" = "Dnevi med odzivi:";
+"Days between responses " = "Dnevi med odzivi";
 "Do not send responses to mailing lists" = "Ne pošlji odzivov na poštne sezname";
 "Disable auto reply on" = "Onemogoči samodejni odgovor za";
 "Always send vacation message response" = "Vedno pošlji sporočilo o odsotnosti";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Trenutni časovni pas:";
-"Short Date Format :" = "Kratki format datuma:";
-"Long Date Format :" = "Dolgi format datuma:";
-"Time Format :" = "Format časa:";
+"Current Time Zone " = "Trenutni časovni pas";
+"Short Date Format " = "Kratki format datuma";
+"Long Date Format " = "Dolgi format datuma";
+"Time Format " = "Format časa";
 
 "default" = "Privzeto";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Teden se začne z:";
-"Day start time :" = "Začetni čas dneva:";
-"Day end time :" = "Končni čas dneva:";
+"Week begins on " = "Teden se začne z";
+"Day start time " = "Začetni čas dneva";
+"Day end time " = "Končni čas dneva";
 "Day start time must be prior to day end time." = "Začetni čas dneva mora biti pred končnim časom dneva.";
 "Show time as busy outside working hours" = "Prikaži čas kot zasedem izven delovnega časa";
-"First week of year :" = "Prvi teden leta:";
+"First week of year " = "Prvi teden leta";
 "Enable reminders for Calendar items" = "Omogoči opomnike za koledarske elemente";
 "Play a sound when a reminder comes due" = "Zvočno opozori, ko opomnik zapade";
-"Default reminder :" = "Privzeti opomnik:";
+"Default reminder " = "Privzeti opomnik";
 
 "firstWeekOfYear_January1" = "Začne s 1. januarjem";
 "firstWeekOfYear_First4DayWeek" = "Prvi 4 dnevni teden";
 "firstWeekOfYear_FirstFullWeek" = "Prvi celotni vikend";
 
 "Prevent from being invited to appointments" = "Prepreči pred vabilom na sestanek";
-"White list for appointment invitations:" = "Beli seznam za vabila na sestanke:";
+"White list for appointment invitations" = "Beli seznam za vabila na sestanke";
 "Contacts Names" = "Imena stikov";
 
 /* Default Calendar */
-"Default calendar :" = "Privzeti koledar:";
+"Default calendar " = "Privzeti koledar";
 "selectedCalendar" = "Izbrani koledar";
 "personalCalendar" = "Osebnik koledar";
 "firstCalendar" = "Prvi omogočeni koledar";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Sortiraj sporočila po nitih";
 "When sending mail, add unknown recipients to my" = "Pri pošiljanju pošte dodaj neznane prejemnike k mojemu";
 
-"Forward messages:" = "Posreduj sporočila:";
+"Forward messages" = "Posreduj sporočila";
 "messageforward_inline" = "V vrsti";
 "messageforward_attached" = "Kot priloga";
 
-"When replying to a message:" = "Pri odgovoru na sporočilo:";
+"When replying to a message" = "Pri odgovoru na sporočilo";
 "replyplacement_above" = "Začni odgovor nad navednicami";
 "replyplacement_below" = "Začni odgovor pod navednicami";
 "And place my signature" = "In umesti moj podpis";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Novi poštni račun";
 
-"Server Name:" = "Ime strežnika:";
-"Port:" = "Port:";
-"Encryption:" = "Enkripcija:";
+"Server Name" = "Ime strežnika";
+"Port" = "Port";
+"Encryption" = "Enkripcija";
 "None" = "Noben";
-"User Name:" = "Uporabniško ime:";
-"Password:" = "Geslo:";
+"User Name" = "Uporabniško ime";
+"Password" = "Geslo";
 
-"Full Name:" = "Polno ime:";
-"Email:" = "E-pošta:";
-"Reply To Email:" = "Odgovor na e-pošto:";
-"Signature:" = "Podpis:";
+"Full Name" = "Polno ime";
+"Email" = "E-pošta";
+"Reply To Email" = "Odgovor na e-pošto";
+"Signature" = "Podpis";
 "(Click to create)" = "(Klikni za kreiranje)";
 
 "Signature" = "Podpis";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Dodatni parametri";
 
 /* password */
-"New password:" = "Novo geslo:";
-"Confirmation:" = "Potrditev:";
+"New password" = "Novo geslo";
+"Confirmation" = "Potrditev";
 "Change" = "Spremeni";
 
 /* Event+task classifications */
-"Default events classification :" = "Privzeta razvrstitev dogodkov:";
-"Default tasks classification :" = "Privzeta razvrstitev opravil:";
+"Default events classification " = "Privzeta razvrstitev dogodkov";
+"Default tasks classification " = "Privzeta razvrstitev opravil";
 "PUBLIC_item" = "Javno";
 "CONFIDENTIAL_item" = "Zaupno";
 "PRIVATE_item" = "Osebno";
@@ -210,10 +210,10 @@
 "Contacts" = "Adresar";
 "Mail" = "Pošta";
 "Last" = "Zadnje uporabljeno";
-"Default Module :" = "Privzeti modul:";
-"SOGo Version :" = "SOGo različica:";
+"Default Module " = "Privzeti modul";
+"SOGo Version " = "SOGo različica";
 
-"Language :" = "Jezik:";
+"Language " = "Jezik";
 "choose" = "Izberi ...";
 "Arabic" = "العربية";
 "Catalan" = "Català";
@@ -241,7 +241,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Osveži pogled:";
+"Refresh View " = "Osveži pogled";
 "refreshview_manually" = "Ročno";
 "refreshview_every_minute" = "Vsako minuto";
 "refreshview_every_2_minutes" = "Vsaki 2 minuti";
@@ -252,12 +252,12 @@
 "refreshview_once_per_hour" = "Enkrat na uro";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Ko prejmem zahtevo za povratnico:";
+"When I receive a request for a return receipt" = "Ko prejmem zahtevo za povratnico";
 "Never send a return receipt" = "Nikoli ne pošlji povratnice";
 "Allow return receipts for some messages" = "Dovoli povratnice za nekatera sporočila";
-"If I'm not in the To or Cc of the message:" = "Če nisem med Za ali Kp sporočila:";
-"If the sender is outside my domain:" = "Če je pošiljatelj izven moje domene:";
-"In all other cases:" = "V vseh ostalih primerih:";
+"If I'm not in the To or Cc of the message" = "Če nisem med Za ali Kp sporočila";
+"If the sender is outside my domain" = "Če je pošiljatelj izven moje domene";
+"In all other cases" = "V vseh ostalih primerih";
 
 "Never send" = "Nikoli ne pošlji";
 "Always send" = "Vedno pošlji";
diff --git a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
index 292981c60..2d549dc0b 100644
--- a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
+++ b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Activar respuesta automática por vacaciones";
-"Auto reply message :" = "Mensaje de respuesta automática:";
-"Email addresses (separated by commas) :" = "Dirección de correo (separado por comas):";
+"Auto reply message " = "Mensaje de respuesta automática";
+"Email addresses (separated by commas) " = "Dirección de correo (separado por comas)";
 "Add default email addresses" = "Añadir dirección de correo por defecto";
-"Days between responses :" = "Dias entre respuestas:";
+"Days between responses " = "Dias entre respuestas";
 "Do not send responses to mailing lists" = "No enviar respuestas a listas de correo";
 "Disable auto reply on" = "Deshabilitar la autorrespuesta en la siguiente fecha";
 "Please specify your message and your email addresses for which you want to enable auto reply."
@@ -42,10 +42,10 @@
 = "Por favor, especifique una dirección para aquellos mensajes que quiere reenviar.";
 
 /* d & t */
-"Current Time Zone :" = "Zona horaria actual:";
-"Short Date Format :" = " Formato de fecha corto:";
-"Long Date Format :" = "Formato de fecha largo:";
-"Time Format :" = "Formato de hora:";
+"Current Time Zone " = "Zona horaria actual";
+"Short Date Format " = " Formato de fecha corto";
+"Long Date Format " = "Formato de fecha largo";
+"Time Format " = "Formato de hora";
 
 "default" = "Por defecto";
 
@@ -91,26 +91,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "La semana comienza el: ";
-"Day start time :" = "Hora de inicio del día: ";
-"Day end time :" = "Hora de finalización del día:";
+"Week begins on " = "La semana comienza el ";
+"Day start time " = "Hora de inicio del día ";
+"Day end time " = "Hora de finalización del día";
 "Day start time must be prior to day end time." = "La hora de inicio del día debe ser anterior a la hora de fin del día.";
 "Show time as busy outside working hours" = "Mostrar el tiempo fuera de las horas de trabajo como ocupado";
-"First week of year :" = "Primera semana del año: ";
+"First week of year " = "Primera semana del año ";
 "Enable reminders for Calendar items" = "Habilitar recordatorios para los elementos del calendario";
 "Play a sound when a reminder comes due" = "Señal acústica para los recordatorios";
-"Default reminder :" = "Recordatorio por defecto: ";
+"Default reminder " = "Recordatorio por defecto ";
 
 "firstWeekOfYear_January1" = "Empieza el 1 de enero";
 "firstWeekOfYear_First4DayWeek" = "Primera semana del año de 4 días";
 "firstWeekOfYear_FirstFullWeek" = "Primera semana del año completa";
 
 "Prevent from being invited to appointments" = "No permitir que otros me inviten a eventos";
-"White list for appointment invitations:" = "Lista de excepciones para invitación a eventos:";
+"White list for appointment invitations" = "Lista de excepciones para invitación a eventos";
 "Contacts Names" = "Nombre de los contactos";
 
 /* Default Calendar */
-"Default calendar :" = "Calendario por defecto";
+"Default calendar " = "Calendario por defecto";
 "selectedCalendar" = "Calendario seleccionado";
 "personalCalendar" = "Calendario personal";
 "firstCalendar" = "Primer calendario habilitado";
@@ -136,11 +136,11 @@
 "Sort messages by threads" = "Ordenar mensajes por conversaciones";
 "When sending mail, add unknown recipients to my" = "Al enviar correos, agregar destinatarios desconocidos a mi";
 
-"Forward messages:" = "Reenviar mensajes:";
+"Forward messages" = "Reenviar mensajes";
 "messageforward_inline" = "Incorporado";
 "messageforward_attached" = "Como adjunto";
 
-"When replying to a message:" = "Cuando responda a un mensaje:";
+"When replying to a message" = "Cuando responda a un mensaje";
 "replyplacement_above" = "Empezar mi respuesta sobre el texto citado";
 "replyplacement_below" = "Empieza mi respuesta bajo el texto citado";
 "And place my signature" = "Y añadir mi firma";
@@ -160,17 +160,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nueva Cuenta de Correo";
 
-"Server Name:" = "Nombre del servidor:";
-"Port:" = "Puerto:";
-"Encryption:" = "Cifrado:";
+"Server Name" = "Nombre del servidor";
+"Port" = "Puerto";
+"Encryption" = "Cifrado";
 "None" = "Sin cifrar";
-"User Name:" = "Nombre de usuario:";
-"Password:" = "Contraseña:";
+"User Name" = "Nombre de usuario";
+"Password" = "Contraseña";
 
-"Full Name:" = "Nombre Completo:";
-"Email:" = "Correo Electrónico:";
-"Reply To Email:" = "Responder a esta dirección de correo:";
-"Signature:" = "Firma:";
+"Full Name" = "Nombre Completo";
+"Email" = "Correo Electrónico";
+"Reply To Email" = "Responder a esta dirección de correo";
+"Signature" = "Firma";
 "(Click to create)" = "(Click para crear)";
 
 "Signature" = "Firma";
@@ -183,13 +183,13 @@
 "Additional Parameters" = "Parámetros Adicionales";
 
 /* password */
-"New password:" = "Nueva contraseña:";
-"Confirmation:" = "Confirmar nueva contraseña:";
+"New password" = "Nueva contraseña";
+"Confirmation" = "Confirmar nueva contraseña";
 "Change" = "Cambiar";
 
 /* Event+task classifications */
-"Default events classification :" = "Clasificación por defecto para los eventos";
-"Default tasks classification :" = "Clasificación por defecto para las tareas";
+"Default events classification " = "Clasificación por defecto para los eventos";
+"Default tasks classification " = "Clasificación por defecto para las tareas";
 "PUBLIC_item" = "Público";
 "CONFIDENTIAL_item" = "Confidencial";
 "PRIVATE_item" = "Privado";
@@ -203,10 +203,10 @@
 "Contacts" = "Libreta de direcciones";
 "Mail" = "Correo";
 "Last" = "Ultimo usado";
-"Default Module :" = "Módulo por defecto :";
-"SOGo Version :" = "Versión de SOGo:";
+"Default Module " = "Módulo por defecto ";
+"SOGo Version " = "Versión de SOGo";
 
-"Language :" = "Idioma :";
+"Language " = "Idioma ";
 "choose" = "Elija ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -235,7 +235,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Actualizar la vista:";
+"Refresh View " = "Actualizar la vista";
 "refreshview_manually" = "Manualmente";
 "refreshview_every_minute" = "Cada minuto";
 "refreshview_every_2_minutes" = "Cada 2 minutos";
@@ -246,12 +246,12 @@
 "refreshview_once_per_hour" = "Cada hora";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Cuando reciba una petición de un acuse de recibo:";
+"When I receive a request for a return receipt" = "Cuando reciba una petición de un acuse de recibo";
 "Never send a return receipt" = "Nunca enviar un acuse de recibo";
 "Allow return receipts for some messages" = "Permitir acuses de recibo para algunos mensajes";
-"If I'm not in the To or Cc of the message:" = "Si no estoy en el Para o Cc del mensaje:";
-"If the sender is outside my domain:" = "Si el remitente esta fuera de mi dominio de correo:";
-"In all other cases:" = "En el resto de casos:";
+"If I'm not in the To or Cc of the message" = "Si no estoy en el Para o Cc del mensaje";
+"If the sender is outside my domain" = "Si el remitente esta fuera de mi dominio de correo";
+"In all other cases" = "En el resto de casos";
 
 "Never send" = "No enviar nunca";
 "Always send" = "Enviar siempre";
diff --git a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
index e65014701..9104e0dd9 100644
--- a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
+++ b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings
@@ -23,10 +23,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Activar respuesta automática para vacaciones";
-"Auto reply message :" = "Mensaje de respuesta automática :";
-"Email addresses (separated by commas) :" = "Dirección de correo (separado por comas) :";
+"Auto reply message " = "Mensaje de respuesta automática ";
+"Email addresses (separated by commas) " = "Dirección de correo (separado por comas) ";
 "Add default email addresses" = "Añadir dirección de correo por defecto";
-"Days between responses :" = "Dias entre respuestas :";
+"Days between responses " = "Dias entre respuestas ";
 "Do not send responses to mailing lists" = "No enviar respuestas a las listas de distribución";
 "Disable auto reply on" = "Desactivar respuesta automatica";
 "Always send vacation message response" = "Siempre enviar mensaje de vacaciones";
@@ -46,10 +46,10 @@
 
 
 /* d & t */
-"Current Time Zone :" = "Zona horaria actual :";
-"Short Date Format :" = "Formato de fecha corto :";
-"Long Date Format :" = "Formato de fecha largo :";
-"Time Format :" = "Formato de hora :";
+"Current Time Zone " = "Zona horaria actual ";
+"Short Date Format " = "Formato de fecha corto ";
+"Long Date Format " = "Formato de fecha largo ";
+"Time Format " = "Formato de hora ";
 
 "default" = "Por defecto";
 
@@ -95,26 +95,26 @@
 "timeFmt_4" = "";
 
 /* calendar */
-"Week begins on :" = "Semana empieza por: ";
-"Day start time :" = "Hora inicio: ";
-"Day end time :" = "Hora fin: ";
+"Week begins on " = "Semana empieza por ";
+"Day start time " = "Hora inicio ";
+"Day end time " = "Hora fin ";
 "Day start time must be prior to day end time." = "Hora de inicio del día debe ser anterior a la hora de fin del día.";
 "Show time as busy outside working hours" = "Mostrar tiempo ocupado fuera del horario laboral";
-"First week of year :" = "Primera semana del año: ";
+"First week of year " = "Primera semana del año ";
 "Enable reminders for Calendar items" = "Habilitar recordatorios para elementos del calendario";
 "Play a sound when a reminder comes due" = "Señal acústica para los recordatorios";
-"Default reminder :" = "Recordatorio por defecto: ";
+"Default reminder " = "Recordatorio por defecto ";
 
 "firstWeekOfYear_January1" = "Empieza el 1 de enero";
 "firstWeekOfYear_First4DayWeek" = "Primera semana del año de 4 días";
 "firstWeekOfYear_FirstFullWeek" = "Primera semana del año completa";
 
 "Prevent from being invited to appointments" = "Evitar invitaciones a eventos";
-"White list for appointment invitations:" = "Lista blanca de invitaciones a eventos:";
+"White list for appointment invitations" = "Lista blanca de invitaciones a eventos";
 "Contacts Names" = "Nombres de Contacto";
 
 /* Default Calendar */
-"Default calendar :" = "Calendario por defecto";
+"Default calendar " = "Calendario por defecto";
 "selectedCalendar" = "Calendario seleccionado";
 "personalCalendar" = "Calendario personal";
 "firstCalendar" = "Primer calendario disponible";
@@ -140,11 +140,11 @@
 "Sort messages by threads" = "Ordenar mensajes por temas";
 "When sending mail, add unknown recipients to my" = "Cuando se envía correo, añade destinatarios desconocidos a mi";
 
-"Forward messages:" = "Reenviar mensajes:";
+"Forward messages" = "Reenviar mensajes";
 "messageforward_inline" = "Incorporado";
 "messageforward_attached" = "Como adjunto";
 
-"When replying to a message:" = "Cuando se contesta a un mensaje:";
+"When replying to a message" = "Cuando se contesta a un mensaje";
 "replyplacement_above" = "Empieza mi respuesta sobre el texto";
 "replyplacement_below" = "Empieza mi respuesta bajo el texto";
 "And place my signature" = "Y añade mi firma";
@@ -167,17 +167,17 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nueva Cuenta de Correo";
 
-"Server Name:" = "Nombre de Servidor:";
-"Port:" = "Puerto:";
-"Encryption:" = "Cifrado:";
+"Server Name" = "Nombre de Servidor";
+"Port" = "Puerto";
+"Encryption" = "Cifrado";
 "None" = "Ninguno";
-"User Name:" = "Nombre de usuario:";
-"Password:" = "Contraseña:";
+"User Name" = "Nombre de usuario";
+"Password" = "Contraseña";
 
-"Full Name:" = "Nombre Completo:";
-"Email:" = "Correo Electrónico:";
-"Reply To Email:" = "Correo electronico para responder:";
-"Signature:" = "Firma:";
+"Full Name" = "Nombre Completo";
+"Email" = "Correo Electrónico";
+"Reply To Email" = "Correo electronico para responder";
+"Signature" = "Firma";
 "(Click to create)" = "(Click para crear)";
 
 "Signature" = "Firma";
@@ -190,13 +190,13 @@
 "Additional Parameters" = "Parámetros Adicionales";
 
 /* password */
-"New password:" = "Nueva contraseña:";
-"Confirmation:" = "Confirmar nueva contraseña:";
+"New password" = "Nueva contraseña";
+"Confirmation" = "Confirmar nueva contraseña";
 "Change" = "Cambiar";
 
 /* Event+task classifications */
-"Default events classification :" = "Clasificación de evento por defecto";
-"Default tasks classification :" = "Clasificación de tarea por defecto";
+"Default events classification " = "Clasificación de evento por defecto";
+"Default tasks classification " = "Clasificación de tarea por defecto";
 "PUBLIC_item" = "Publico";
 "CONFIDENTIAL_item" = "Confidencial";
 "PRIVATE_item" = "Privado";
@@ -210,10 +210,10 @@
 "Contacts" = "Libreta de direcciones";
 "Mail" = "Correo";
 "Last" = "Ultimo usado";
-"Default Module :" = "Módulo por defecto :";
-"SOGo Version :" = "Versión de SOGo:";
+"Default Module " = "Módulo por defecto ";
+"SOGo Version " = "Versión de SOGo";
 
-"Language :" = "Idioma :";
+"Language " = "Idioma ";
 "choose" = "Elija ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -241,7 +241,7 @@
 "Ukrainian" = "Українська";
 "Welsh" = "Cymraeg";
 
-"Refresh View :" = "Refrescar Vista:";
+"Refresh View " = "Refrescar Vista";
 "refreshview_manually" = "Manualmente";
 "refreshview_every_minute" = "Cada minuto";
 "refreshview_every_2_minutes" = "Cada 2 minutos";
@@ -252,12 +252,12 @@
 "refreshview_once_per_hour" = "Cada hora";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Cuando reciba una petición de un acuse de recibo:";
+"When I receive a request for a return receipt" = "Cuando reciba una petición de un acuse de recibo";
 "Never send a return receipt" = "Nunca enviar un acuse de recibo";
 "Allow return receipts for some messages" = "Permitir acuses de recibo para algunos mensajes";
-"If I'm not in the To or Cc of the message:" = "Si no estoy en el Para o Cc del mensaje:";
-"If the sender is outside my domain:" = "Si el remitente esta fuera de mi dominio de correo:";
-"In all other cases:" = "En el resto de casos:";
+"If I'm not in the To or Cc of the message" = "Si no estoy en el Para o Cc del mensaje";
+"If the sender is outside my domain" = "Si el remitente esta fuera de mi dominio de correo";
+"In all other cases" = "En el resto de casos";
 
 "Never send" = "Nunca enviar";
 "Always send" = "Enviar siempre";
diff --git a/UI/PreferencesUI/Swedish.lproj/Localizable.strings b/UI/PreferencesUI/Swedish.lproj/Localizable.strings
index 8d5920d64..e25c24e22 100644
--- a/UI/PreferencesUI/Swedish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Swedish.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Aktivera frånvaro auto-svar";
-"Auto reply message :" = "Auto-svar meddelande:";
-"Email addresses (separated by commas) :" = "E-post adresser (kommaseparerade):";
+"Auto reply message " = "Auto-svar meddelande";
+"Email addresses (separated by commas) " = "E-post adresser (kommaseparerade)";
 "Add default email addresses" = "Lägg till standard e-postadress";
-"Days between responses :" = "Dagar mellan svar:";
+"Days between responses " = "Dagar mellan svar";
 "Do not send responses to mailing lists" = "Skicka inte svar till utskickslistor";
 "Please specify your message and your email addresses for which you want to enable auto reply."
 = "Skriv meddelandet och ange din e-postadress som du vill aktivera auto-svar.";
@@ -37,10 +37,10 @@
 = "Ange adressen du vill vidarebefordra dina meddelanden till.";
 
 /* d & t */
-"Current Time Zone :" = "Gällande tidszon:";
-"Short Date Format :" = "Kort datumformat:";
-"Long Date Format :" = "Långt datumformat:";
-"Time Format :" = "Tidsformat:";
+"Current Time Zone " = "Gällande tidszon";
+"Short Date Format " = "Kort datumformat";
+"Long Date Format " = "Långt datumformat";
+"Time Format " = "Tidsformat";
 
 "default" = "Standard";
 
@@ -78,22 +78,22 @@
 "timeFmt_2" = "";
 
 /* calendar */
-"Week begins on :" = "Veckan börjar med:";
-"Day start time :" = "Dagen börjar kl:";
-"Day end time :" = "Dagen slutar kl:";
+"Week begins on " = "Veckan börjar med";
+"Day start time " = "Dagen börjar kl";
+"Day end time " = "Dagen slutar kl";
 "Day start time must be prior to day end time." = "Dagens starttid måste vara före dagens sluttid.";
-"First week of year :" = "Första veckan på året:";
+"First week of year " = "Första veckan på året";
 "Enable reminders for Calendar items" = "Aktivera påminnelser för kalenderposter";
 "Play a sound when a reminder comes due"
 = "Spela upp ett ljud vid en påminnelse";
-"Default reminder :" = "Standardpåminnelse:";
+"Default reminder " = "Standardpåminnelse";
 
 "firstWeekOfYear_January1" = "Börjar den 1 januari";
 "firstWeekOfYear_First4DayWeek" = "Första 4-dagarsveckan på året";
 "firstWeekOfYear_FirstFullWeek" = "Första hela veckan på året";
 
 /* Default Calendar */
-"Default calendar :" = "Default calendar";
+"Default calendar " = "Default calendar";
 "selectedCalendar" = "Selected calendar";
 "personalCalendar" = "Personal calendar";
 "firstCalendar" = "First enabled calendar";
@@ -123,7 +123,7 @@
 "refreshview_every_30_minutes" = "Varje 30 minuter";
 "refreshview_once_per_hour" = "Varje timme";
 
-"Forward messages:" = "Vidarebefordra meddelanden:";
+"Forward messages" = "Vidarebefordra meddelanden";
 "messageforward_inline" = "Infogade";
 "messageforward_attached" = "Bifogade";
 
@@ -139,16 +139,16 @@
 /* IMAP Accounts */
 "New Mail Account" = "Nytt e-postkonto";
 
-"Server Name:" = "
+"Server Name" = "
 
 Servernamn:";
-"Port:" = "Port:";
-"User Name:" = "Användarnamn:";
-"Password:" = "Lösenord:";
+"Port" = "Port";
+"User Name" = "Användarnamn";
+"Password" = "Lösenord";
 
-"Full Name:" = "Fullständigt namn:";
-"Email:" = "E-postadress:";
-"Signature:" = "Signatur:";
+"Full Name" = "Fullständigt namn";
+"Email" = "E-postadress";
+"Signature" = "Signatur";
 "(Click to create)" = "(Klicka för att skapa)";
 
 "Signature" = "Signatur";
@@ -158,13 +158,13 @@ Servernamn:";
 "Additional Parameters" = "Övriga parametrar";
 
 /* password */
-"New password:" = "Nytt lösenord:";
-"Confirmation:" = "Bekräfta:";
+"New password" = "Nytt lösenord";
+"Confirmation" = "Bekräfta";
 "Change" = "Ändra";
 
 /* Event+task classifications */
-"Default events classification :" = "Default events classification :";
-"Default tasks classification :" = "Default tasks classification :";
+"Default events classification " = "Default events classification ";
+"Default tasks classification " = "Default tasks classification ";
 "PUBLIC_item" = "Public";
 "CONFIDENTIAL_item" = "Confidential";
 "PRIVATE_item" = "Private";
@@ -178,9 +178,9 @@ Servernamn:";
 "Contacts" = "Adressbok";
 "Mail" = "E-post";
 "Last" = "Senast använd";
-"Default Module :" = "Standardmodul:";
+"Default Module " = "Standardmodul";
 
-"Language :" = "Språk:";
+"Language " = "Språk";
 "choose" = "Välj ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -210,24 +210,24 @@ Servernamn:";
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "När jag får en begäran om mottagningskvitto:";
+"When I receive a request for a return receipt" = "När jag får en begäran om mottagningskvitto";
 "Never send a return receipt" = "Skicka aldrig mottagningskvitto";
 "Allow return receipts for some messages" = "Tillåt mottagningskvitto för vissa meddelanden";
-"If I'm not in the To or Cc of the message:" = "Om jag inte finns i meddelandets Till-fält eller Kopia-fält:";
-"If the sender is outside my domain:" = "Om avsändaren finns utanför min domän:";
-"In all other cases:" = "I alla andra fall:";
+"If I'm not in the To or Cc of the message" = "Om jag inte finns i meddelandets Till-fält eller Kopia-fält";
+"If the sender is outside my domain" = "Om avsändaren finns utanför min domän";
+"In all other cases" = "I alla andra fall";
 
 "Never send" = "Skicka aldrig";
 "Always send" = "Skicka alltid";
 "Ask me" = "Fråga mig";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "När jag får en begäran om mottagningskvitto:";
+"When I receive a request for a return receipt" = "När jag får en begäran om mottagningskvitto";
 "Never send a return receipt" = "Skicka aldrig mottagningskvitto";
 "Allow return receipts for some messages" = "Tillåt mottagningskvitto för vissa meddelanden";
-"If I'm not in the To or Cc of the message:" = "Om jag inte finns i meddelandets Till-fält eller Kopia-fält:";
-"If the sender is outside my domain:" = "Om avsändaren finns utanför min domän:";
-"In all other cases:" = "I alla andra fall:";
+"If I'm not in the To or Cc of the message" = "Om jag inte finns i meddelandets Till-fält eller Kopia-fält";
+"If the sender is outside my domain" = "Om avsändaren finns utanför min domän";
+"In all other cases" = "I alla andra fall";
 
 "Never send" = "Skicka aldrig";
 "Always send" = "Skicka alltid";
@@ -298,5 +298,5 @@ Servernamn:";
 "Unhandled error response" = "Erreur inconnue";
 "Password change is not supported." = "Changement de mot de passe non-supporté.";
 "Unhandled HTTP error code: %{0}" = "Code HTTP non-géré: %{0}";
-"New password:" = "Nytt lösenord:";
-"Confirmation:" = "Bekräfta:";
+"New password" = "Nytt lösenord";
+"Confirmation" = "Bekräfta";
diff --git a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
index 00a0b1c53..c4494ec05 100644
--- a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Увімкнути повідомлення про мою відсутність";
-"Auto reply message :" = "Текст автоматичної відповіді:";
-"Email addresses (separated by commas) :" = "Електронні адреси (розділені комами):";
+"Auto reply message " = "Текст автоматичної відповіді";
+"Email addresses (separated by commas) " = "Електронні адреси (розділені комами)";
 "Add default email addresses" = "Додати адреси за замовчанням";
-"Days between responses :" = "Днів між відповідями :";
+"Days between responses " = "Днів між відповідями ";
 "Do not send responses to mailing lists" = "Не надсилати автоматичні відповіді на адреси розсилок";
 "Disable auto reply on" = "Вимкнути автоматичну відповідь";
 "Please specify your message and your email addresses for which you want to enable auto reply."
@@ -41,10 +41,10 @@
 = "Будь ласка, зазначте адресу, на яку потрібно перенаправляти повідомлення, адресовані Вам.";
 
 /* d & t */
-"Current Time Zone :" = "Поточна часова зона :";
-"Short Date Format :" = "Стислий формат дати :";
-"Long Date Format :" = "Повний формат дати :";
-"Time Format :" = "Формат часу :";
+"Current Time Zone " = "Поточна часова зона ";
+"Short Date Format " = "Стислий формат дати ";
+"Long Date Format " = "Повний формат дати ";
+"Time Format " = "Формат часу ";
 
 "default" = "Типово";
 
@@ -89,23 +89,23 @@
 "timeFmt_3" = "";
 
 /* calendar */
-"Week begins on :" = "Тиждень починаєтья з :";
-"Day start time :" = "Робочий день починається о :";
-"Day end time :" = "Робочий день закінчується о :";
+"Week begins on " = "Тиждень починаєтья з ";
+"Day start time " = "Робочий день починається о ";
+"Day end time " = "Робочий день закінчується о ";
 "Day start time must be prior to day end time." = "Початок дня має бути ранішим за кінець дня.";
 "Show time as busy outside working hours" = "Показувати час зайнятим якщо поза межами робочих годин";
-"First week of year :" = "Перший тиждень року :";
+"First week of year " = "Перший тиждень року ";
 "Enable reminders for Calendar items" = "Увімкнути нагадування подій календаря";
 "Play a sound when a reminder comes due"
 = "Програти звук у разі сповіщення";
-"Default reminder :" = "Звичайне сповіщення :";
+"Default reminder " = "Звичайне сповіщення ";
 
 "firstWeekOfYear_January1" = "Починається 1 січня";
 "firstWeekOfYear_First4DayWeek" = "Перший чотириденний тиждень";
 "firstWeekOfYear_FirstFullWeek" = "Перший повний тиждень";
 
 /* Default Calendar */
-"Default calendar :" = "Типовий календар";
+"Default calendar " = "Типовий календар";
 "selectedCalendar" = "Вибраний календар";
 "personalCalendar" = "Особистий календар";
 "firstCalendar" = "Перший активний календар";
@@ -135,7 +135,7 @@
 "refreshview_every_30_minutes" = "Кожні 30 хвилин";
 "refreshview_once_per_hour" = "Раз на годину";
 
-"Forward messages:" = "Перенаправляти повідомлення:";
+"Forward messages" = "Перенаправляти повідомлення";
 "messageforward_inline" = "В тілі листа";
 "messageforward_attached" = "Вкладеним файлом";
 
@@ -151,14 +151,14 @@
 /* IMAP Accounts */
 "New Mail Account" = "Новий обліковий запис";
 
-"Server Name:" = "Ім’я сервера:";
-"Port:" = "Порт:";
-"User Name:" = "Ім’я користувача:";
-"Password:" = "Пароль:";
+"Server Name" = "Ім’я сервера";
+"Port" = "Порт";
+"User Name" = "Ім’я користувача";
+"Password" = "Пароль";
 
-"Full Name:" = "Повне ім’я:";
-"Email:" = "E-Mail:";
-"Signature:" = "Підпис:";
+"Full Name" = "Повне ім’я";
+"Email" = "E-Mail";
+"Signature" = "Підпис";
 "(Click to create)" = "(Клацніть, щоб додати)";
 
 "Signature" = "Підпис";
@@ -168,13 +168,13 @@
 "Additional Parameters" = "Додаткові параметри";
 
 /* password */
-"New password:" = "Новий пароль:";
-"Confirmation:" = "Повтор нового пароля:";
+"New password" = "Новий пароль";
+"Confirmation" = "Повтор нового пароля";
 "Change" = "Змінити";
 
 /* Event+task classifications */
-"Default events classification :" = "Класифікація типових подій:";
-"Default tasks classification :" = "Класифікація типових завдань:";
+"Default events classification " = "Класифікація типових подій";
+"Default tasks classification " = "Класифікація типових завдань";
 "PUBLIC_item" = "Загальний доступ";
 "CONFIDENTIAL_item" = "Обмежений доступ";
 "PRIVATE_item" = "Приватний доступ";
@@ -188,9 +188,9 @@
 "Contacts" = "Адресна книга";
 "Mail" = "Електронна пошта";
 "Last" = "Останнє";
-"Default Module :" = "Модуль за замовчанням :";
+"Default Module " = "Модуль за замовчанням ";
 
-"Language :" = "Мова :";
+"Language " = "Мова ";
 "choose" = "Choose ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -220,12 +220,12 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "Коли я отримую запит на сповіщення про прочитання:";
+"When I receive a request for a return receipt" = "Коли я отримую запит на сповіщення про прочитання";
 "Never send a return receipt" = "Ніколи не відправляти сповіщення";
 "Allow return receipts for some messages" = "Дозволити надсилати сповіщення для окремих повідомлень";
-"If I'm not in the To or Cc of the message:" = "Якщо я не серед адресатів та у копії листа:";
-"If the sender is outside my domain:" = "Якщо відправник не з мого домену:";
-"In all other cases:" = "У всіх інших випадках:";
+"If I'm not in the To or Cc of the message" = "Якщо я не серед адресатів та у копії листа";
+"If the sender is outside my domain" = "Якщо відправник не з мого домену";
+"In all other cases" = "У всіх інших випадках";
 
 "Never send" = "Ніколи не відправляти";
 "Always send" = "Завжди відправляти";
@@ -287,11 +287,11 @@
 "Password must not be empty." = "Пароль не має бути порожнім";
 "The passwords do not match. Please try again." = "Паролі не співпадають. Спробуйте ще раз.";
 "Password change failed" = "Помилка під час зміни пароля.";
-"Password change failed - Permission denied" = "Помилка під час зміни пароля: доступ заборонено.";
-"Password change failed - Insufficient password quality" = "Помилка під час зміни пароля: недостатня стійкість пароля";
-"Password change failed - Password is too short" = "Помилка під час зміни пароля: пароль замалий";
-"Password change failed - Password is too young" = "Помилка під час зміни пароля: такий пароль нещодавно вже встановлювався";
-"Password change failed - Password is in history" = "Помилка під час зміни пароля: такий пароль вже встановлювався";
+"Password change failed - Permission denied" = "Помилка під час зміни пароля доступ заборонено.";
+"Password change failed - Insufficient password quality" = "Помилка під час зміни пароля недостатня стійкість пароля";
+"Password change failed - Password is too short" = "Помилка під час зміни пароля пароль замалий";
+"Password change failed - Password is too young" = "Помилка під час зміни пароля такий пароль нещодавно вже встановлювався";
+"Password change failed - Password is in history" = "Помилка під час зміни пароля такий пароль вже встановлювався";
 "Unhandled policy error: %{0}" = "Невідома помилка політик: %{0}";
 "Unhandled error response" = "Невідома помилка";
 "Password change is not supported." = "Зміна паролю не підтримується.";
diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
index 6c3077f64..d1dc11182 100644
--- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
@@ -22,10 +22,10 @@
 
 /* vacation (auto-reply) */
 "Enable vacation auto reply" = "Enable vacation auto reply";
-"Auto reply message :" = "Ymateb Awtomatig unwaith yn unig i pob anfonwr gyda'r testun canlynol :";
-"Email addresses (separated by commas) :" = "Email addresses (separated by commas) :";
+"Auto reply message " = "Ymateb Awtomatig unwaith yn unig i pob anfonwr gyda'r testun canlynol ";
+"Email addresses (separated by commas) " = "Email addresses (separated by commas) ";
 "Add default email addresses" = "Add default email addresses";
-"Days between responses :" = "Days between responses :";
+"Days between responses " = "Days between responses ";
 "Do not send responses to mailing lists" = "Do not send responses to mailing lists";
 "Please specify your message and your email addresses for which you want to enable auto reply."
 = "Please specify your message and your email addresses for which you want to enable auto reply.";
@@ -37,10 +37,10 @@
 = "Please specify an address to which you want to forward your messages.";
 
 /* d & t */
-"Current Time Zone :" = "Amser Cyfredol :";
-"Short Date Format :" = "Dyddiad fformat byr :";
-"Long Date Format :" = "Dyddiad fformat hir :";
-"Time Format :" = "Fformat amser :";
+"Current Time Zone " = "Amser Cyfredol ";
+"Short Date Format " = "Dyddiad fformat byr ";
+"Long Date Format " = "Dyddiad fformat hir ";
+"Time Format " = "Fformat amser ";
 
 "default" = "Default";
 
@@ -78,22 +78,22 @@
 "timeFmt_2" = "";
 
 /* calendar */
-"Week begins on :" = "wythnos yn dechrau :";
-"Day start time :" = "Amser dechrau'r diwrnod :";
-"Day end time :" = "Amser diwedd y dydd :";
+"Week begins on " = "wythnos yn dechrau ";
+"Day start time " = "Amser dechrau'r diwrnod ";
+"Day end time " = "Amser diwedd y dydd ";
 "Day start time must be prior to day end time." = "Day start time must be prior to day end time.";
-"First week of year :" = "Wythnos cyntaf y flwyddyn :";
+"First week of year " = "Wythnos cyntaf y flwyddyn ";
 "Enable reminders for Calendar items" = "Galluogu atgoffa ar gyfer eitemau calendr";
 "Play a sound when a reminder comes due"
 = "Chwarae swn pan fydd amser atgoffa";
-"Default reminder :" = "Atgoffa gwreiddiol :";
+"Default reminder " = "Atgoffa gwreiddiol ";
 
 "firstWeekOfYear_January1" = "Dechrau ar Ionawr 1";
 "firstWeekOfYear_First4DayWeek" = "First 4-day week";
 "firstWeekOfYear_FirstFullWeek" = "Wythnos cyntaf llawn";
 
 /* Default Calendar */
-"Default calendar :" = "Default calendar";
+"Default calendar " = "Default calendar";
 "selectedCalendar" = "Selected calendar";
 "personalCalendar" = "Personal calendar";
 "firstCalendar" = "First enabled calendar";
@@ -123,7 +123,7 @@
 "refreshview_every_30_minutes" = "Pob 30 munud";
 "refreshview_once_per_hour" = "Unwaith pob awr";
 
-"Forward messages:" = "Blaenyrru negeseuon:";
+"Forward messages" = "Blaenyrru negeseuon";
 "messageforward_inline" = "Mewn llinell";
 "messageforward_attached" = "Fel Atodiad";
 
@@ -139,14 +139,14 @@
 /* IMAP Accounts */
 "New Mail Account" = "New Mail Account";
 
-"Server Name:" = "Server Name:";
-"Port:" = "Port:";
-"User Name:" = "User Name:";
-"Password:" = "Cyfrinair:";
+"Server Name" = "Server Name";
+"Port" = "Port";
+"User Name" = "User Name";
+"Password" = "Cyfrinair";
 
-"Full Name:" = "Full Name:";
-"Email:" = "Email:";
-"Signature:" = "Llofnod:";
+"Full Name" = "Full Name";
+"Email" = "Email";
+"Signature" = "Llofnod";
 "(Click to create)" = "(Click to create)";
 
 "Signature" = "Llofnod";
@@ -156,13 +156,13 @@
 "Additional Parameters" = "Additional Parameters";
 
 /* password */
-"New password:" = "New password:";
-"Confirmation:" = "Confirmation:";
+"New password" = "New password";
+"Confirmation" = "Confirmation";
 "Change" = "Change";
 
 /* Event+task classifications */
-"Default events classification :" = "Default events classification :";
-"Default tasks classification :" = "Default tasks classification :";
+"Default events classification " = "Default events classification ";
+"Default tasks classification " = "Default tasks classification ";
 "PUBLIC_item" = "Public";
 "CONFIDENTIAL_item" = "Confidential";
 "PRIVATE_item" = "Private";
@@ -176,9 +176,9 @@
 "Contacts" = "Address Book";
 "Mail" = "Mail";
 "Last" = "Last used";
-"Default Module :" = "Default module :";
+"Default Module " = "Default module ";
 
-"Language :" = "Iaith :";
+"Language " = "Iaith ";
 "choose" = "Dewis ...";
 "Arabic" = "العربية";
 "Basque" = "Euskara";
@@ -208,24 +208,24 @@
 "Welsh" = "Cymraeg";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "When I receive a request for a return receipt:";
+"When I receive a request for a return receipt" = "When I receive a request for a return receipt";
 "Never send a return receipt" = "Never send a return receipt";
 "Allow return receipts for some messages" = "Allow return receipts for some messages";
-"If I'm not in the To or Cc of the message:" = "If I'm not in the To or Cc of the message:";
-"If the sender is outside my domain:" = "If the sender is outside my domain:";
-"In all other cases:" = "In all other cases:";
+"If I'm not in the To or Cc of the message" = "If I'm not in the To or Cc of the message";
+"If the sender is outside my domain" = "If the sender is outside my domain";
+"In all other cases" = "In all other cases";
 
 "Never send" = "Never send";
 "Always send" = "Always send";
 "Ask me" = "Ask me";
 
 /* Return receipts */
-"When I receive a request for a return receipt:" = "When I receive a request for a return receipt:";
+"When I receive a request for a return receipt" = "When I receive a request for a return receipt";
 "Never send a return receipt" = "Never send a return receipt";
 "Allow return receipts for some messages" = "Allow return receipts for some messages";
-"If I'm not in the To or Cc of the message:" = "If I'm not in the To or Cc of the message:";
-"If the sender is outside my domain:" = "If the sender is outside my domain:";
-"In all other cases:" = "In all other cases:";
+"If I'm not in the To or Cc of the message" = "If I'm not in the To or Cc of the message";
+"If the sender is outside my domain" = "If the sender is outside my domain";
+"In all other cases" = "In all other cases";
 
 "Never send" = "Never send";
 "Always send" = "Always send";
@@ -296,5 +296,5 @@
 "Unhandled error response" = "Erreur inconnue";
 "Password change is not supported." = "Changement de mot de passe non-supporté.";
 "Unhandled HTTP error code: %{0}" = "Code HTTP non-géré: %{0}";
-"New password:" = "New password:";
-"Confirmation:" = "Confirmation:";
+"New password" = "New password";
+"Confirmation" = "Confirmation";
diff --git a/UI/Scheduler/Arabic.lproj/Localizable.strings b/UI/Scheduler/Arabic.lproj/Localizable.strings
index 1d4b86057..8e457c291 100644
--- a/UI/Scheduler/Arabic.lproj/Localizable.strings
+++ b/UI/Scheduler/Arabic.lproj/Localizable.strings
@@ -152,33 +152,33 @@
 "Appointment editor" = "محرر المواعيد";
 "Appointment proposal" = "اقتراح المواعيد";
 "Appointment on" = "تشغيل المواعيد";
-"Start:" = "البدء:";
-"End:" = "النهاية:";
-"Due Date:" = "تاريخ الاستحقاق:";
-"Title:" = "العنوان:";
-"Calendar:" = "الحالة:";
+"Start" = "البدء";
+"End" = "النهاية";
+"Due Date" = "تاريخ الاستحقاق";
+"Title" = "العنوان";
+"Calendar" = "الحالة";
 "Name" = "الاسم";
 "Email" = "البريد الإلكتروني";
-"Status:" = "الحالة:";
+"Status" = "الحالة";
 "% complete" = "اكتمل %c";
-"Location:" = "المكان:";
-"Priority:" = "الأولوية:";
+"Location" = "المكان";
+"Priority" = "الأولوية";
 "Privacy" = "الخصوصية";
 "Cycle" = "الدورة";
 "Cycle End" = "نهاية الدورة";
 "Categories" = "التصنيفات";
 "Classification" = "التصنيف";
 "Duration" = "المدة";
-"Attendees:" = "الحضور:";
+"Attendees" = "الحضور";
 "Resources" = "الموارد";
-"Organizer:" = "المنظم:";
-"Description:" = "الوصف:";
-"Document:" = "المستند:";
-"Category:" = "التصنيف:";
-"Repeat:" = "التكرار:";
-"Reminder:" = "التنبيه:";
-"General:" = "العام:";
-"Reply:" = "الرد:";
+"Organizer" = "المنظم";
+"Description" = "الوصف";
+"Document" = "المستند";
+"Category" = "التصنيف";
+"Repeat" = "التكرار";
+"Reminder" = "التنبيه";
+"General" = "العام";
+"Reply" = "الرد";
 
 "Target:" = "الهدف:";
 
@@ -223,7 +223,7 @@
 "view_future" = "جميع الأحداث المستقبلية";
 "view_selectedday" = "اليوم المحدد";
 
-"View:" = "العرض:";
+"View" = "العرض";
 "Title or Description" = "العنوان أو الوصف";
 
 "Search" = "ابحث";
@@ -481,8 +481,8 @@ vtodo_class2 = "(مهمة سرية)";
 "button_allOccurrences" = "كل التكرارات";
 
 /* Properties dialog */
-"Name:" = "الاسم:";
-"Color:" = "اللون:";
+"Name" = "الاسم";
+"Color" = "اللون";
 
 "Include in free-busy" = "ضمن حالة التوفر-الانشغال";
 
@@ -497,7 +497,7 @@ vtodo_class2 = "(مهمة سرية)";
 "Notifications" = "الإشعارات";
 "Receive a mail when I modify my calendar" = "تلقي البريد عندما أقوم بتعديل التقويم الخاص بي";
 "Receive a mail when someone else modifies my calendar" = "تلقي البريد عندما يقوم شخص آخر بتعديل التقويم الخاص بي";
-"When I modify my calendar, send a mail to:" = "عندما أقوم بتعديل التقويم الخاص بي، أرسل رسالة بريد إلكتروني إلى:";
+"When I modify my calendar, send a mail to" = "عندما أقوم بتعديل التقويم الخاص بي، أرسل رسالة بريد إلكتروني إلى";
 
 "Links to this Calendar" = "روابط لهذا التقويم";
 "Authenticated User Access" = "مصادقة وصول المستخدم";
diff --git a/UI/Scheduler/Basque.lproj/Localizable.strings b/UI/Scheduler/Basque.lproj/Localizable.strings
index 8e0c6589f..53d10b842 100644
--- a/UI/Scheduler/Basque.lproj/Localizable.strings
+++ b/UI/Scheduler/Basque.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Zerrenda";
 "Print Settings" = "Ezarpenak inprimatu";
-"Title:" = "Izena:";
-"Layout:" = "Plana";
+"Title" = "Izena";
+"Layout" = "Plana";
 "What to Print" = "Inprimatzeko elementuak";
 "Options" = "Aukerak";
 "Tasks with no due date" = "Amaiera-datarik gabeko eginkizunak";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Kontaktuen editorea";
 "Appointment proposal" = "Hitzordu proposamenak";
 "Appointment on" = "Hitzordua";
-"Start:" = "Hasi:";
-"End:" = "Amaitu:";
-"Due Date:" = "Epemuga:";
-"Title:" = "Izena:";
-"Calendar:" = "Egutegia";
+"Start" = "Hasi";
+"End" = "Amaitu";
+"Due Date" = "Epemuga";
+"Title" = "Izena";
+"Calendar" = "Egutegia";
 "Name" = "Izena";
 "Email" = "Emaila";
-"Status:" = "Egoera";
+"Status" = "Egoera";
 "% complete" = "% amaituta";
-"Location:" = "Kokapena";
-"Priority:" = "Lehentasuna";
+"Location" = "Kokapena";
+"Priority" = "Lehentasuna";
 "Privacy" = "Pribatasuna";
 "Cycle" = "Zikloa";
 "Cycle End" = "Zikloaren amaiera";
 "Categories" = "Kategoriak";
 "Classification" = "Sailkapena";
 "Duration" = "Epea";
-"Attendees:" = "Partaideak:";
+"Attendees" = "Partaideak";
 "Resources" = "Baliabideak";
-"Organizer:" = "Antolatzailea:";
-"Description:" = "Deskribapena:";
-"Document:" = "Dokumentua:";
-"Category:" = "Kategoria:";
-"Repeat:" = "Errepikatu:";
-"Reminder:" = "Oroigarria:";
-"General:" = "Orokorra:";
-"Reply:" = "Errepikatu:";
-"Created by:" = "Honek sortua:";
+"Organizer" = "Antolatzailea";
+"Description" = "Deskribapena";
+"Document" = "Dokumentua";
+"Category" = "Kategoria";
+"Repeat" = "Errepikatu";
+"Reminder" = "Oroigarria";
+"General" = "Orokorra";
+"Reply" = "Errepikatu";
+"Created by" = "Honek sortua";
 
 
 "Target:" = "Helburua:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Epemuga gainditutako zeregina";
 "view_incomplete" = "Amaitu gabeko zeregina";
 
-"View:" = "Ikuskatu:";
+"View" = "Ikuskatu";
 "Title, category or location" = "Izenburua, sailkapena edo kokapena";
 "Entire content" = "Eduki osoa";
 
@@ -480,9 +480,9 @@ validate_endbeforestart    = "Ipini duzun amaiera-data hasiera-dataren aurretik
 
 /* apt list */
 "Title" = "Izenburua";
-"Start" = "Hasi:";
-"End" = "Amaitu:";
-"Due Date" = "Epemuga:";
+"Start" = "Hasi";
+"End" = "Amaitu";
+"Due Date" = "Epemuga";
 "Location" = "Kokapena";
 
 "(Private Event)" = "(Ekitaldi pribatua)";
@@ -508,8 +508,8 @@ vtodo_class2 = "(Isilpeko zeregina)";
 "button_allOccurrences" = "Agerraldi guztiak";
 
 /* Properties dialog */
-"Name:" = "Izena:";
-"Color:" = "Kolorea:";
+"Name" = "Izena";
+"Color" = "Kolorea";
 
 "Include in free-busy" = "libre-lanpetua-n gehitu";
 
@@ -524,11 +524,11 @@ vtodo_class2 = "(Isilpeko zeregina)";
 "Notifications" = "Jakinarazpenak";
 "Receive a mail when I modify my calendar" = "Jaso mezua nere egutegia aldatzen dudanean";
 "Receive a mail when someone else modifies my calendar" = "Jaso mezua edonorkl nere egutegia aldatzen duenean";
-"When I modify my calendar, send a mail to:" = "Nere egutegia aldatzen dudanean, bidali mezua honi:";
+"When I modify my calendar, send a mail to" = "Nere egutegia aldatzen dudanean, bidali mezua honi";
 
 "Links to this Calendar" = "Egutegi honetarako estekak";
 "Authenticated User Access" = "Autentifikatutako erabiltzaileentzako atzipena";
-"CalDAV URL" = "CalDAV URL-a:";
+"CalDAV URL" = "CalDAV URL-a";
 "WebDAV ICS URL" = "WebDAV ICS URL-a";
 "WebDAV XML URL" = "WebDAV XML URL-a";
 
diff --git a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
index b3686c62f..8def18978 100644
--- a/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/Scheduler/BrazilianPortuguese.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Lista";
 "Print Settings" = "Configurações de Impressão";
-"Title:" = "Título:";
-"Layout:" = "Layout:";
+"Title" = "Título";
+"Layout" = "Layout";
 "What to Print" = "O que imprimir";
 "Options" = "Opções";
 "Tasks with no due date" = "Tarefas sem data de vencimento";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Editor de Compromisso";
 "Appointment proposal" = "Compromisso Proposto";
 "Appointment on" = "Compromisso em";
-"Start:" = "Inicio:";
-"End:" = "Fim:";
-"Due Date:" = "Data:";
-"Title:" = "Título:";
-"Calendar:" = "Calendário:";
+"Start" = "Inicio";
+"End" = "Fim";
+"Due Date" = "Data";
+"Title" = "Título";
+"Calendar" = "Calendário";
 "Name" = "Nome";
 "Email" = "Correio";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% completado";
-"Location:" = "Localização:";
-"Priority:" = "Prioridade:";
+"Location" = "Localização";
+"Priority" = "Prioridade";
 "Privacy" = "Privacidade";
 "Cycle" = "Ciclo";
 "Cycle End" = "Ciclo Final";
 "Categories" = "Categorias";
 "Classification" = "Classificação";
 "Duration" = "Duração";
-"Attendees:" = "Participantes:";
+"Attendees" = "Participantes";
 "Resources" = "Recursos";
-"Organizer:" = "Organizador:";
-"Description:" = "Descrição:";
-"Document:" = "Documento:";
-"Category:" = "Categoria:";
-"Repeat:" = "Repetir:";
-"Reminder:" = "Lembrete:";
-"General:" = "Geral:";
-"Reply:" = "Responder:";
-"Created by:" = "Criado por:";
+"Organizer" = "Organizador";
+"Description" = "Descrição";
+"Document" = "Documento";
+"Category" = "Categoria";
+"Repeat" = "Repetir";
+"Reminder" = "Lembrete";
+"General" = "Geral";
+"Reply" = "Responder";
+"Created by" = "Criado por";
 
 
 "Target:" = "Marca:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Tarefas em atraso";
 "view_incomplete" = "Tarefas incompletas";
 
-"View:" = "Visão:";
+"View" = "Visão";
 "Title, category or location" = "Título, categoria ou localização";
 "Entire content" = "Todo o conteúdo";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Tarefa Confidencial)";
 "button_allOccurrences" = "Todas as ocorrências";
 
 /* Properties dialog */
-"Name:" = "Nome:";
-"Color:" = "Cor:";
+"Name" = "Nome";
+"Color" = "Cor";
 
 "Include in free-busy" = "Incluir na disponibilidade";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Tarefa Confidencial)";
 "Notifications" = "Notificações";
 "Receive a mail when I modify my calendar" = "Receber um email quando eu modificar meu calendário";
 "Receive a mail when someone else modifies my calendar" = "Receber um email quando alguem modificar meu calendário";
-"When I modify my calendar, send a mail to:" = "Quando eu modificar meu calendário, enviar um email para:";
+"When I modify my calendar, send a mail to" = "Quando eu modificar meu calendário, enviar um email para";
 
 "Links to this Calendar" = "Links para este Calendário";
 "Authenticated User Access" = "Acesso a Usuário Autenticado";
-"CalDAV URL" = "CalDAV URL:";
+"CalDAV URL" = "CalDAV URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Catalan.lproj/Localizable.strings b/UI/Scheduler/Catalan.lproj/Localizable.strings
index 30f5ef20b..2c8dbf04b 100644
--- a/UI/Scheduler/Catalan.lproj/Localizable.strings
+++ b/UI/Scheduler/Catalan.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Llista";
 "Print Settings" = "Configuració d'Impressió";
-"Title:" = "Títol:";
-"Layout:" = "Disseny:";
+"Title" = "Títol";
+"Layout" = "Disseny";
 "What to Print" = "Què imprimir";
 "Options" = "Opcions";
 "Tasks with no due date" = "Tasques sense data de finalització";
@@ -164,34 +164,34 @@
 "Appointment editor" = "Modificar cita";
 "Appointment proposal" = "Proposta de cita";
 "Appointment on" = "Cita sobre";
-"Start:" = "Des de:";
-"End:" = "Fins a:";
-"Due Date:" = "Data límit:";
-"Title:" = "Títol:";
-"Calendar:" = "Calendari:";
+"Start" = "Des de";
+"End" = "Fins a";
+"Due Date" = "Data límit";
+"Title" = "Títol";
+"Calendar" = "Calendari";
 "Name" = "Nom";
 "Email" = "Correu";
-"Status:" = "Estat:";
+"Status" = "Estat";
 "% complete" = "% complet";
-"Location:" = "Lloc:";
-"Priority:" = "Prioritat:";
+"Location" = "Lloc";
+"Priority" = "Prioritat";
 "Privacy" = "Privacitat";
 "Cycle" = "Repetir";
 "Cycle End" = "Final repetició";
 "Categories" = "Categories";
 "Classification" = "Privacitat";
 "Duration" = "Duració";
-"Attendees:" = "Assistents:";
+"Attendees" = "Assistents";
 "Resources" = "Recursos";
-"Organizer:" = "Organitzador:";
-"Description:" = "Descripció:";
-"Document:" = "Document:";
-"Category:" = "Categoria:";
-"Repeat:" = "Repetir:";
-"Reminder:" = "Recordatori:";
-"General:" = "General:";
-"Reply:" = "Respondre:";
-"Created by:" = "Creat per:";
+"Organizer" = "Organitzador";
+"Description" = "Descripció";
+"Document" = "Document";
+"Category" = "Categoria";
+"Repeat" = "Repetir";
+"Reminder" = "Recordatori";
+"General" = "General";
+"Reply" = "Respondre";
+"Created by" = "Creat per";
 
 
 "Target:" = "URL document:";
@@ -241,7 +241,7 @@
 "view_overdue" = "Tasques vençudes";
 "view_incomplete" = "Incomplete tasks";
 
-"View:" = "Veure:";
+"View" = "Veure";
 "Title, category or location" = "Títol, categoria o ubicació";
 "Entire content" = "Tot el contingut";
 
@@ -329,7 +329,7 @@
 "No end date" = "Sense data final";
 "Create" = "Fins a crear";
 "appointment(s)" = "cita/es";
-"Repeat until" = "Fins a: ";
+"Repeat until" = "Fins a ";
 
 "First" = "Primer";
 "Second" = "Segon";
@@ -503,8 +503,8 @@ vtodo_class2 = "(Tasca confidencial)";
 "button_allOccurrences" = "Totes les ocurrències";
 
 /* Properties dialog */
-"Name:" = "Nom:";
-"Color:" = "Color:";
+"Name" = "Nom";
+"Color" = "Color";
 
 "Include in free-busy" = "Inclòs en lliure-ocupat";
 
@@ -519,11 +519,11 @@ vtodo_class2 = "(Tasca confidencial)";
 "Notifications" = "Notificacions";
 "Receive a mail when I modify my calendar" = "Rebre un correu de notificació quan modifique el meu calendari";
 "Receive a mail when someone else modifies my calendar" = "Rebre un correu de notificació quan altra persona modifique el meu calendari ";
-"When I modify my calendar, send a mail to:" = "Quan modifique el meu calendari, enviar un correu a: ";
+"When I modify my calendar, send a mail to" = "Quan modifique el meu calendari, enviar un correu a ";
 
 "Links to this Calendar" = "Enllaços a aquest calendari";
 "Authenticated User Access" = "Accés autenticat";
-"CalDAV URL" = "URL CalDAV:";
+"CalDAV URL" = "URL CalDAV";
 "WebDAV ICS URL" = "url WebDAV ICS";
 "WebDAV XML URL" = "url WebDAV XML";
 
diff --git a/UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings b/UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings
index d934b78a8..e1b904875 100644
--- a/UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings
+++ b/UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "列表";
 "Print Settings" = "列印設定";
-"Title:" = "標題:";
-"Layout:" = "格式:";
+"Title" = "標題";
+"Layout" = "格式";
 "What to Print" = "列印內容";
 "Options" = "選項";
 "Tasks with no due date" = "無截止日期的任務";
@@ -167,34 +167,34 @@
 "Appointment editor" = "編輯議程";
 "Appointment proposal" = "安排議程";
 "Appointment on" = "會議安排在";
-"Start:" = "開始:";
-"End:" = "結束:";
-"Due Date:" = "到期日:";
-"Title:" = "標題:";
-"Calendar:" = "行事曆:";
+"Start" = "開始";
+"End" = "結束";
+"Due Date" = "到期日";
+"Title" = "標題";
+"Calendar" = "行事曆";
 "Name" = "名字";
 "Email" = "郵件";
-"Status:" = "狀態:";
+"Status" = "狀態";
 "% complete" = "% 完成";
-"Location:" = "地點:";
-"Priority:" = "優先順序";
+"Location" = "地點";
+"Priority" = "優先順序";
 "Privacy" = "私人";
 "Cycle" = "重複事件";
 "Cycle End" = "重複事件結束";
 "Categories" = "類别";
 "Classification" = "分類";
 "Duration" = "期間";
-"Attendees:" = "出席者:";
+"Attendees" = "出席者";
 "Resources" = "資源";
-"Organizer:" = "發起人:";
-"Description:" = "說明:";
-"Document:" = "文件:";
-"Category:" = "類別:";
-"Repeat:" = "重複:";
-"Reminder:" = "提醒:";
-"General:" = "一般";
-"Reply:" = "回覆:";
-"Created by:" = "建立者:";
+"Organizer" = "發起人";
+"Description" = "說明";
+"Document" = "文件";
+"Category" = "類別";
+"Repeat" = "重複";
+"Reminder" = "提醒";
+"General" = "一般";
+"Reply" = "回覆";
+"Created by" = "建立者";
 
 
 "Target:" = "目標:";
@@ -244,7 +244,7 @@
 "view_overdue" = "逾期的任務";
 "view_incomplete" = "未完任的任務";
 
-"View:" = "檢視:";
+"View" = "檢視";
 "Title, category or location" = "主題, 類別或地點";
 "Entire content" = "全部內容";
 
@@ -482,7 +482,7 @@ validate_endbeforestart    = "事件開始時間不能大於結束時間。";
 "Title" = "標題";
 "Start" = "開始";
 "End" = "結束";
-"Due Date" = "到期日:";
+"Due Date" = "到期日";
 "Location" = "地點";
 
 "(Private Event)" = "(私人事件)";
@@ -508,8 +508,8 @@ vtodo_class2 = "(機密任務)";
 "button_allOccurrences" = "所有重複事件";
 
 /* Properties dialog */
-"Name:" = "名稱:";
-"Color:" = "顏色:";
+"Name" = "名稱";
+"Color" = "顏色";
 
 "Include in free-busy" = "包括忙碌-空間";
 
@@ -524,11 +524,11 @@ vtodo_class2 = "(機密任務)";
 "Notifications" = "提醒";
 "Receive a mail when I modify my calendar" = "當我修改我的行事曆時以電子郵件通知我";
 "Receive a mail when someone else modifies my calendar" = "當有其他人修改我的行事曆時以電子郵件通知我";
-"When I modify my calendar, send a mail to:" = "當我修改我的行事曆時以電子郵件通知:";
+"When I modify my calendar, send a mail to" = "當我修改我的行事曆時以電子郵件通知";
 
 "Links to this Calendar" = "連結到這本行事曆";
 "Authenticated User Access" = "授權的使用者存取";
-"CalDAV URL" = "CalDAV URL: ";
+"CalDAV URL" = "CalDAV URL ";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Czech.lproj/Localizable.strings b/UI/Scheduler/Czech.lproj/Localizable.strings
index 2404787a7..e1305bdd6 100644
--- a/UI/Scheduler/Czech.lproj/Localizable.strings
+++ b/UI/Scheduler/Czech.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Seznam";
 "Print Settings" = "Nastavení tisku";
-"Title:" = "Název:";
-"Layout:" = "Vzhled:";
+"Title" = "Název";
+"Layout" = "Vzhled";
 "What to Print" = "Rozsah tisku";
 "Options" = "Možnosti";
 "Tasks with no due date" = "Úkoly bez termínu";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Editovat schůzky";
 "Appointment proposal" = "Navrhnout schůzku";
 "Appointment on" = "Schůzka na";
-"Start:" = "Začátek:";
-"End:" = "Konec:";
-"Due Date:" = "Datum splnění:";
-"Title:" = "Název:";
-"Calendar:" = "Kalendář:";
+"Start" = "Začátek";
+"End" = "Konec";
+"Due Date" = "Datum splnění";
+"Title" = "Název";
+"Calendar" = "Kalendář";
 "Name" = "Jméno";
 "Email" = "E-Mail";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% hotovo";
-"Location:" = "Místo:";
-"Priority:" = "Priorita:";
+"Location" = "Místo";
+"Priority" = "Priorita";
 "Privacy" = "Soukromí";
 "Cycle" = "Cyklus opakování";
 "Cycle End" = "Konec cyklu";
 "Categories" = "Kategorie";
 "Classification" = "Klasifikace";
 "Duration" = "Trvání";
-"Attendees:" = "Účastníci:";
+"Attendees" = "Účastníci";
 "Resources" = "Zdroje";
-"Organizer:" = "Organizátor:";
-"Description:" = "Popis:";
-"Document:" = "Dokument:";
-"Category:" = "Kategorie:";
-"Repeat:" = "Opakování:";
-"Reminder:" = "Připomenutí:";
-"General:" = "Obecný:";
-"Reply:" = "Odpověď:";
-"Created by:" = "Vytvořeno:";
+"Organizer" = "Organizátor";
+"Description" = "Popis";
+"Document" = "Dokument";
+"Category" = "Kategorie";
+"Repeat" = "Opakování";
+"Reminder" = "Připomenutí";
+"General" = "Obecný";
+"Reply" = "Odpověď";
+"Created by" = "Vytvořeno";
 
 
 "Target:" = "Vložte adresu webové stránky nebo dokumentu.";
@@ -244,7 +244,7 @@
 "view_overdue" = "Nesplněné úkoly";
 "view_incomplete" = "Nedokončené úkoly";
 
-"View:" = "Zobrazit:";
+"View" = "Zobrazit";
 "Title, category or location" = "Název, kategorie nebo místo";
 "Entire content" = "Celý obsah";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Důvěrný úkol)";
 "button_allOccurrences" = "Všechna opakování";
 
 /* Properties dialog */
-"Name:" = "Název:";
-"Color:" = "Barva:";
+"Name" = "Název";
+"Color" = "Barva";
 
 "Include in free-busy" = "Zahrnout do obsazeného času (free-busy)";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Důvěrný úkol)";
 "Notifications" = "Připomenutí";
 "Receive a mail when I modify my calendar" = "Obdržet zprávu když upravím svůj kalendář";
 "Receive a mail when someone else modifies my calendar" = "Obdržet zprávu když někdo jiný upraví můj kalendář";
-"When I modify my calendar, send a mail to:" = "Když upravím svůj kalendář, poslat zprávu na:";
+"When I modify my calendar, send a mail to" = "Když upravím svůj kalendář, poslat zprávu na";
 
 "Links to this Calendar" = "Odkazy na tento kalendář";
 "Authenticated User Access" = "Přístup pro ověřené uživatele";
-"CalDAV URL" = "CalDAV URL:";
+"CalDAV URL" = "CalDAV URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Danish.lproj/Localizable.strings b/UI/Scheduler/Danish.lproj/Localizable.strings
index f3141ffa5..6de7deeff 100644
--- a/UI/Scheduler/Danish.lproj/Localizable.strings
+++ b/UI/Scheduler/Danish.lproj/Localizable.strings
@@ -152,33 +152,33 @@
 "Appointment editor" = "Aftale editor";
 "Appointment proposal" = "Aftale Forslag";
 "Appointment on" = "Aftale på";
-"Start:" = "Start:";
-"End:" = "Slut:";
-"Due Date:" = "Forfaldsdato:";
-"Title:" = "Titel:";
-"Calendar:" = "Kalender:";
+"Start" = "Start";
+"End" = "Slut";
+"Due Date" = "Forfaldsdato";
+"Title" = "Titel";
+"Calendar" = "Kalender";
 "Name" = "Navn";
 "Email" = "E-mail";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% Færdig";
-"Location:" = "Sted:";
-"Priority:" = "Prioritet:";
+"Location" = "Sted";
+"Priority" = "Prioritet";
 "Privacy" = "Beskyttelse af personlige oplysninger";
 "Cycle" = "Cyklus";
 "Cycle End" = "Cyklus sluttidspunkt";
 "Categories" = "Kategorier";
 "Classification" = "Klassifikation";
 "Duration" = "Varighed";
-"Attendees:" = "Deltagere:";
+"Attendees" = "Deltagere";
 "Resources" = "Ressourcer";
-"Organizer:" = "Arrangør:";
-"Description:" = "Beskrivelse:";
-"Document:" = "Dokument:";
-"Category:" = "Kategori:";
-"Repeat:" = "Gentag:";
-"Reminder:" = "Påmindelse:";
-"General:" = "Generelt:";
-"Reply:" = "Svar:";
+"Organizer" = "Arrangør";
+"Description" = "Beskrivelse";
+"Document" = "Dokument";
+"Category" = "Kategori";
+"Repeat" = "Gentag";
+"Reminder" = "Påmindelse";
+"General" = "Generelt";
+"Reply" = "Svar";
 
 "Target:" = "Mål:";
 
@@ -223,7 +223,7 @@
 "view_future" = "Alle fremtidige begivenheder";
 "view_selectedday" = "Valgte dag";
 
-"View:" = "Vis:";
+"View" = "Vis";
 "Title or Description" = "Titel eller Beskrivelse";
 
 "Search" = "Søg";
@@ -481,8 +481,8 @@ vtodo_class2 = "(Hemmelig opgave)";
 "button_allOccurrences" = "Alle forekomster";
 
 /* Properties dialog */
-"Name:" = "Navn:";
-"Color:" = "Farve:";
+"Name" = "Navn";
+"Color" = "Farve";
 
 "Include in free-busy" = "Medtag i ledig-optaget";
 
@@ -497,7 +497,7 @@ vtodo_class2 = "(Hemmelig opgave)";
 "Notifications" = "Notifikationer";
 "Receive a mail when I modify my calendar" = "Modtag en mail, når jeg ændrer min kalender";
 "Receive a mail when someone else modifies my calendar" = "Modtag en mail, når andre ændrer min kalender";
-"When I modify my calendar, send a mail to:" = "Når jeg ændrer min kalender, så send en mail til:";
+"When I modify my calendar, send a mail to" = "Når jeg ændrer min kalender, så send en mail til";
 
 "Links to this Calendar" = "Links til denne kalender";
 "Authenticated User Access" = "Godkendt brugeradgang";
diff --git a/UI/Scheduler/Dutch.lproj/Localizable.strings b/UI/Scheduler/Dutch.lproj/Localizable.strings
index f6f0c9b21..e44167199 100644
--- a/UI/Scheduler/Dutch.lproj/Localizable.strings
+++ b/UI/Scheduler/Dutch.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Lijst";
 "Print Settings" = "Print instellingen";
-"Title:" = "Titel:";
-"Layout:" = "Opmaak:";
+"Title" = "Titel";
+"Layout" = "Opmaak";
 "What to Print" = "Wat moet afgedrukt worden";
 "Options" = "Opties:";
 "Tasks with no due date" = "Taken zonder verloopdatum";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Afspraak aanpassen";
 "Appointment proposal" = "Afspraak voorstellen";
 "Appointment on" = "Afspraak op";
-"Start:" = "Begin:";
-"End:" = "Einde:";
-"Due Date:" = "Verloopdatum:";
-"Title:" = "Titel:";
-"Calendar:" = "Agenda:";
+"Start" = "Begin";
+"End" = "Einde";
+"Due Date" = "Verloopdatum";
+"Title" = "Titel";
+"Calendar" = "Agenda";
 "Name" = "Naam";
 "Email" = "E-mail";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% voltooid";
-"Location:" = "Plaats:";
-"Priority:" = "Prioriteit:";
+"Location" = "Plaats";
+"Priority" = "Prioriteit";
 "Privacy" = "Privacy";
 "Cycle" = "Herhalen";
 "Cycle End" = "Einde herhaling";
 "Categories" = "Categoriën";
 "Classification" = "Classificatie";
 "Duration" = "Duur";
-"Attendees:" = "Deelnemers:";
+"Attendees" = "Deelnemers";
 "Resources" = "Middelen";
-"Organizer:" = "Organisator:";
-"Description:" = "Omschrijving:";
-"Document:" = "Document:";
-"Category:" = "Categorie:";
-"Repeat:" = "Herhalen:";
-"Reminder:" = "Alarm:";
-"General:" = "Algemeen:";
-"Reply:" = "Antwoord:";
-"Created by:" = "Aangemaakt door:";
+"Organizer" = "Organisator";
+"Description" = "Omschrijving";
+"Document" = "Document";
+"Category" = "Categorie";
+"Repeat" = "Herhalen";
+"Reminder" = "Alarm";
+"General" = "Algemeen";
+"Reply" = "Antwoord";
+"Created by" = "Aangemaakt door";
 
 
 "Target:" = "Bestemming:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Achterstallige taken";
 "view_incomplete" = "Onvolledige taken";
 
-"View:" = "Bekijken:";
+"View" = "Bekijken";
 "Title, category or location" = "Titel, categorie of plaats";
 "Entire content" = "Volledige inhoud";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Vertrouwelijke taak)";
 "button_allOccurrences" = "Alle herhalingen";
 
 /* Properties dialog */
-"Name:" = "Naam:";
-"Color:" = "Kleur:";
+"Name" = "Naam";
+"Color" = "Kleur";
 
 "Include in free-busy" = "In de beschikbaarheid insluiten";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Vertrouwelijke taak)";
 "Notifications" = "Notificaties";
 "Receive a mail when I modify my calendar" = "Ontvang een e-mail als ik mijn agenda verander";
 "Receive a mail when someone else modifies my calendar" = "Ontvang een e-mail als iemand anders mijn agenda verandert";
-"When I modify my calendar, send a mail to:" = "Als ik mijn agenda verander, stuur een e-mail naar:";
+"When I modify my calendar, send a mail to" = "Als ik mijn agenda verander, stuur een e-mail naar";
 
 "Links to this Calendar" = "Koppelingen naar deze agenda";
 "Authenticated User Access" = "Toegang voor geauthenticeerde gebruikers";
-"CalDAV URL" = "CalDAV-URL:";
+"CalDAV URL" = "CalDAV-URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings
index 4bb62c42b..8cc0ee7c2 100644
--- a/UI/Scheduler/English.lproj/Localizable.strings
+++ b/UI/Scheduler/English.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "List";
 "Print Settings" = "Print Settings";
-"Title:" = "Title:";
-"Layout:" = "Layout:";
+"Title" = "Title";
+"Layout" = "Layout";
 "What to Print" = "What to Print";
 "Options" = "Options";
 "Tasks with no due date" = "Tasks with no due date";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Appointment Editor";
 "Appointment proposal" = "Appointment Proposal";
 "Appointment on" = "Appointment on";
-"Start:" = "Start:";
-"End:" = "End:";
-"Due Date:" = "Due Date:";
-"Title:" = "Title:";
-"Calendar:" = "Calendar:";
+"Start" = "Start";
+"End" = "End";
+"Due Date" = "Due Date";
+"Title" = "Title";
+"Calendar" = "Calendar";
 "Name" = "Name";
 "Email" = "Email";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% complete";
-"Location:" = "Location:";
-"Priority:" = "Priority:";
+"Location" = "Location";
+"Priority" = "Priority";
 "Privacy" = "Privacy";
 "Cycle" = "Cycle";
 "Cycle End" = "Cycle End";
 "Categories" = "Categories";
 "Classification" = "Classification";
 "Duration" = "Duration";
-"Attendees:" = "Attendees:";
+"Attendees" = "Attendees";
 "Resources" = "Resources";
-"Organizer:" = "Organizer:";
-"Description:" = "Description:";
-"Document:" = "Document:";
-"Category:" = "Category:";
-"Repeat:" = "Repeat:";
-"Reminder:" = "Reminder:";
-"General:" = "General:";
-"Reply:" = "Reply:";
-"Created by:" = "Created by:";
+"Organizer" = "Organizer";
+"Description" = "Description";
+"Document" = "Document";
+"Category" = "Category";
+"Repeat" = "Repeat";
+"Reminder" = "Reminder";
+"General" = "General";
+"Reply" = "Reply";
+"Created by" = "Created by";
 
 
 "Target:" = "Target:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Overdue tasks";
 "view_incomplete" = "Incomplete tasks";
 
-"View:" = "View:";
+"View" = "View";
 "Title, category or location" = "Title, category or location";
 "Entire content" = "Entire content";
 
@@ -508,8 +508,8 @@ vtodo_class2 = "(Confidential task)";
 "button_allOccurrences" = "All occurences";
 
 /* Properties dialog */
-"Name:" = "Name:";
-"Color:" = "Color:";
+"Name" = "Name";
+"Color" = "Color";
 
 "Include in free-busy" = "Include in free-busy";
 
@@ -524,11 +524,11 @@ vtodo_class2 = "(Confidential task)";
 "Notifications" = "Notifications";
 "Receive a mail when I modify my calendar" = "Receive a mail when I modify my calendar";
 "Receive a mail when someone else modifies my calendar" = "Receive a mail when someone else modifies my calendar";
-"When I modify my calendar, send a mail to:" = "When I modify my calendar, send a mail to:";
+"When I modify my calendar, send a mail to" = "When I modify my calendar, send a mail to";
 
 "Links to this Calendar" = "Links to this Calendar";
 "Authenticated User Access" = "Authenticated User Access";
-"CalDAV URL" = "CalDAV URL: ";
+"CalDAV URL" = "CalDAV URL ";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Finnish.lproj/Localizable.strings b/UI/Scheduler/Finnish.lproj/Localizable.strings
index 5a052696e..babc6aaa0 100644
--- a/UI/Scheduler/Finnish.lproj/Localizable.strings
+++ b/UI/Scheduler/Finnish.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Lista";
 "Print Settings" = "Tulostusasetukset";
-"Title:" = "Otsikko:";
-"Layout:" = "Ulkoasu";
+"Title" = "Otsikko";
+"Layout" = "Ulkoasu";
 "What to Print" = "Tulostusvalinnat";
 "Options" = "Asetukset";
 "Tasks with no due date" = "Tehtävät ilman määräpäivää";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Tapaamisen muokkain";
 "Appointment proposal" = "Tapaamisehdotus";
 "Appointment on" = "Tapaaminen";
-"Start:" = "Alkaa:";
-"End:" = "Päättyy:";
-"Due Date:" = "Määräpäivä:";
-"Title:" = "Otsikko:";
-"Calendar:" = "Kalenteri:";
+"Start" = "Alkaa";
+"End" = "Päättyy";
+"Due Date" = "Määräpäivä";
+"Title" = "Otsikko";
+"Calendar" = "Kalenteri";
 "Name" = "Nimi";
 "Email" = "Sähköposti";
-"Status:" = "Tila:";
+"Status" = "Tila";
 "% complete" = "% valmiina";
-"Location:" = "Paikka:";
-"Priority:" = "Prioriteetti:";
+"Location" = "Paikka";
+"Priority" = "Prioriteetti";
 "Privacy" = "Yksityisyys";
 "Cycle" = "Kierto";
 "Cycle End" = "Kierto päättyy";
 "Categories" = "Luokat";
 "Classification" = "Luokittelu";
 "Duration" = "Kesto";
-"Attendees:" = "Osallistujat:";
+"Attendees" = "Osallistujat";
 "Resources" = "Resurssit";
-"Organizer:" = "Järjestäjä:";
-"Description:" = "Kuvaus:";
-"Document:" = "Tiedosto:";
-"Category:" = "Luokka:";
-"Repeat:" = "Toista:";
-"Reminder:" = "Muistuttaja:";
-"General:" = "Yleinen:";
-"Reply:" = "Vastaus:";
-"Created by:" = "Luonut:";
+"Organizer" = "Järjestäjä";
+"Description" = "Kuvaus";
+"Document" = "Tiedosto";
+"Category" = "Luokka";
+"Repeat" = "Toista";
+"Reminder" = "Muistuttaja";
+"General" = "Yleinen";
+"Reply" = "Vastaus";
+"Created by" = "Luonut";
 
 
 "Target:" = "Kohde:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Myöhästyneet tehtävät";
 "view_incomplete" = "Keskeneräiset tehtävät";
 
-"View:" = "Näytä:";
+"View" = "Näytä";
 "Title, category or location" = "Otsikko, luokka tai sijainti";
 "Entire content" = "Koko sisältö";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Luottamuksellinen tehtävä)";
 "button_allOccurrences" = "Kaikki esiintymät";
 
 /* Properties dialog */
-"Name:" = "Nimi:";
-"Color:" = "Väri:";
+"Name" = "Nimi";
+"Color" = "Väri";
 
 "Include in free-busy" = "Sisällytä vapaa-varattuun";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Luottamuksellinen tehtävä)";
 "Notifications" = "Ilmoitukset";
 "Receive a mail when I modify my calendar" = "Vastaanota sähköposti kun muokkaan kalenteriani";
 "Receive a mail when someone else modifies my calendar" = "Vastaanota sähköposti kun joku muu muokkaa kalenteriani";
-"When I modify my calendar, send a mail to:" = "Kun muokkaan kalenteriani lähetä viesti osoitteeseen:";
+"When I modify my calendar, send a mail to" = "Kun muokkaan kalenteriani lähetä viesti osoitteeseen";
 
 "Links to this Calendar" = "Linkit tähän kalenteriin";
 "Authenticated User Access" = "Kirjautuneiden käyttäjien pääsy";
-"CalDAV URL" = "CalDAV URL: ";
+"CalDAV URL" = "CalDAV URL ";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings
index 5516e8152..a813f6780 100644
--- a/UI/Scheduler/French.lproj/Localizable.strings
+++ b/UI/Scheduler/French.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Liste";
 "Print Settings" = "Paramètres d'impression";
-"Title:" = "Titre :";
-"Layout:" = "Vue :";
+"Title" = "Titre ";
+"Layout" = "Vue ";
 "What to Print" = "Contenu";
 "Options" = "Options";
 "Tasks with no due date" = "Tâches sans date d'échéance";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Edition de rendez-vous";
 "Appointment proposal" = "Proposition de rendez-vous";
 "Appointment on" = "Rendez-vous le";
-"Start:" = "Début :";
-"End:" = "Au :";
-"Due Date:" = "Fin prévue :";
-"Title:" = "Titre :";
-"Calendar:" = "Agenda :";
+"Start" = "Début ";
+"End" = "Au ";
+"Due Date" = "Fin prévue ";
+"Title" = "Titre ";
+"Calendar" = "Agenda ";
 "Name" = "Nom";
 "Email" = "Courrier";
-"Status:" = "Statut :";
+"Status" = "Statut ";
 "% complete" = "% d'achèvement";
-"Location:" = "Lieu :";
-"Priority:" = "Priorité";
+"Location" = "Lieu ";
+"Priority" = "Priorité";
 "Privacy" = "Confidentialité";
 "Cycle" = "Récurrence";
 "Cycle End" = "s'arreter";
 "Categories" = "Catégories";
 "Classification" = "Classification";
 "Duration" = "Durée";
-"Attendees:" = "Participants :";
+"Attendees" = "Participants ";
 "Resources" = "Ressources";
-"Organizer:" = "Organisateur :";
-"Description:" = "Description :";
-"Document:" = "Document :";
-"Category:" = "Catégorie :";
-"Repeat:" = "Répétition :";
-"Reminder:" = "Rappel :";
-"General:" = "Général:";
-"Reply:" = "Réponse:";
-"Created by:" = "Créé par:";
+"Organizer" = "Organisateur ";
+"Description" = "Description ";
+"Document" = "Document ";
+"Category" = "Catégorie ";
+"Repeat" = "Répétition ";
+"Reminder" = "Rappel ";
+"General" = "Général";
+"Reply" = "Réponse";
+"Created by" = "Créé par";
 
 
 "Target:" = "Destination :";
@@ -244,7 +244,7 @@
 "view_overdue" = "Tâches en retard";
 "view_incomplete" = "Tâches à compléter";
 
-"View:" = "Voir :";
+"View" = "Voir ";
 "Title, category or location" = "Titre, catégorie ou lieu";
 "Entire content" = "Tout le contenu";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Tâche confidentielle)";
 "button_allOccurrences" = "Toutes les occurences";
 
 /* Properties dialog */
-"Name:" = "Nom :";
-"Color:" = "Couleur :";
+"Name" = "Nom ";
+"Color" = "Couleur ";
 
 "Include in free-busy" = "Inclure dans la disponibilité";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Tâche confidentielle)";
 "Notifications" = "Notifications";
 "Receive a mail when I modify my calendar" = "Émettre un courrier quand je modifie mon agenda";
 "Receive a mail when someone else modifies my calendar" = "Émettre un courrier quand quelqu'un d'autre modifie mon agenda";
-"When I modify my calendar, send a mail to:" = "Quand je modifie mon agenda, émettre un courrier à :";
+"When I modify my calendar, send a mail to" = "Quand je modifie mon agenda, émettre un courrier à ";
 
 "Links to this Calendar" = "Liens vers cet agenda";
 "Authenticated User Access" = "Accès aux utilisateurs authentifiés";
-"CalDAV URL" = "Accès en CalDAV :";
+"CalDAV URL" = "Accès en CalDAV ";
 "WebDAV ICS URL" = "Représentation ICS en WebDAV";
 "WebDAV XML URL" = "Représentation XML en WebDAV";
 
diff --git a/UI/Scheduler/German.lproj/Localizable.strings b/UI/Scheduler/German.lproj/Localizable.strings
index 131fd1c27..52c2a8734 100644
--- a/UI/Scheduler/German.lproj/Localizable.strings
+++ b/UI/Scheduler/German.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Liste";
 "Print Settings" = "Druckeinstellungen";
-"Title:" = "Titel:";
-"Layout:" = "Formatierung:";
+"Title" = "Titel";
+"Layout" = "Formatierung";
 "What to Print" = "Was soll gedruckt werden";
 "Options" = "Optionen";
 "Tasks with no due date" = "Aufgaben ohne Fälligkeitsdatum";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Termin Bearbeiten";
 "Appointment proposal" = "Termin Vorschlag";
 "Appointment on" = "Termin am";
-"Start:" = "Beginn:";
-"End:" = "Ende:";
-"Due Date:" = "Fällig:";
-"Title:" = "Titel:";
-"Calendar:" = "Kalender:";
+"Start" = "Beginn";
+"End" = "Ende";
+"Due Date" = "Fällig";
+"Title" = "Titel";
+"Calendar" = "Kalender";
 "Name" = "Name";
 "Email" = "E-Mail";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% fertig";
-"Location:" = "Ort: ";
-"Priority:" = "Priorität: ";
+"Location" = "Ort ";
+"Priority" = "Priorität ";
 "Privacy" = "Vertraulichkeit";
 "Cycle" = "Wiederholen";
 "Cycle End" = "Wiederholungsende";
 "Categories" = "Kategorien";
 "Classification" = "Einordnung";
 "Duration" = "Dauer";
-"Attendees:" = "Teilnehmer:";
+"Attendees" = "Teilnehmer";
 "Resources" = "Ressourcen";
-"Organizer:" = "Organisator:";
-"Description:" = "Beschreibung:";
-"Document:" = "Dokument:";
-"Category:" = "Kategorie:";
-"Repeat:" = "Wiederholen:";
-"Reminder:" = "Erinnerung:";
-"General:" = "Allgemein:";
-"Reply:" = "Antwort:";
-"Created by:" = "Erstellt von:";
+"Organizer" = "Organisator";
+"Description" = "Beschreibung";
+"Document" = "Dokument";
+"Category" = "Kategorie";
+"Repeat" = "Wiederholen";
+"Reminder" = "Erinnerung";
+"General" = "Allgemein";
+"Reply" = "Antwort";
+"Created by" = "Erstellt von";
 
 
 "Target:" = "Ziel:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Überfällige Aufgaben";
 "view_incomplete" = "Unvollständige Aufgaben";
 
-"View:" = "Anzeigen:";
+"View" = "Anzeigen";
 "Title, category or location" = "Titel, Kategorie oder Ort";
 "Entire content" = "Gesamter Inhalt";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 "button_allOccurrences" = "Alle Ereignisse";
 
 /* Properties dialog */
-"Name:" = "Name:";
-"Color:" = "Farbe:";
+"Name" = "Name";
+"Color" = "Farbe";
 
 "Include in free-busy" = "In der Verfügbarkeit einschließen";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
 "Notifications" = "Benachrichtigungen";
 "Receive a mail when I modify my calendar" = "E-Mail erhalten, wenn ich meinen Kalender verändere";
 "Receive a mail when someone else modifies my calendar" = "E-Mail erhalten, wenn jemand anderes meinen Kalender verändert";
-"When I modify my calendar, send a mail to:" = "Wenn ich meinen Kalender verändere, schicke eine E-Mail an: ";
+"When I modify my calendar, send a mail to" = "Wenn ich meinen Kalender verändere, schicke eine E-Mail an ";
 
 "Links to this Calendar" = "Links zu diesem Kalender";
 "Authenticated User Access" = "Zugang für authentifizierte Benutzer";
-"CalDAV URL" = "CalDAV-URL:";
+"CalDAV URL" = "CalDAV-URL";
 "WebDAV ICS URL" = "WebDAV-ICS-URL";
 "WebDAV XML URL" = "WebDAV-XML-URL";
 
diff --git a/UI/Scheduler/Hungarian.lproj/Localizable.strings b/UI/Scheduler/Hungarian.lproj/Localizable.strings
index a1ee97ab7..8f63f2b4c 100644
--- a/UI/Scheduler/Hungarian.lproj/Localizable.strings
+++ b/UI/Scheduler/Hungarian.lproj/Localizable.strings
@@ -115,7 +115,7 @@
 "Subscribe to a Calendar..." = "Feliratkozás naptárra...";
 "Remove the selected Calendar" = "Kijelölt naptár törlése";
 
-"Name of the Calendar" = "A naptár neve:";
+"Name of the Calendar" = "A naptár neve";
 
 "new" = "Új";
 "Print view" = "Nyomtatási nézet";
@@ -150,8 +150,8 @@
 
 "LIST" = "Lista";
 "Print Settings" = "Nyomtatási beállítások";
-"Title:" = "Cím:";
-"Layout:" = "Elrendezés:";
+"Title" = "Cím";
+"Layout" = "Elrendezés";
 "What to Print" = "Mi kerüljön nyomtatásra";
 "Options" = "Beállítások";
 "Tasks with no due date" = "Befejező dátum nélküli feladatok";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Találkozó szerkesztő";
 "Appointment proposal" = "Találkozó ajánló";
 "Appointment on" = "Találkozó ekkor";
-"Start:" = "Kezdete:";
-"End:" = "Vége:";
-"Due Date:" = "Lejárat:";
-"Title:" = "Cím:";
-"Calendar:" = "Naptár:";
+"Start" = "Kezdete";
+"End" = "Vége";
+"Due Date" = "Lejárat";
+"Title" = "Cím";
+"Calendar" = "Naptár";
 "Name" = "Név";
 "Email" = "Email";
-"Status:" = "Állapot";
+"Status" = "Állapot";
 "% complete" = "% kész";
-"Location:" = "Hely:";
-"Priority:" = "Prioritás:";
+"Location" = "Hely";
+"Priority" = "Prioritás";
 "Privacy" = "Adatvédelem";
 "Cycle" = "Ismétlődés";
 "Cycle End" = "Ismétlődés vége";
 "Categories" = "Kategória";
 "Classification" = "Besorolás";
 "Duration" = "Időtartam";
-"Attendees:" = "Résztvevők:";
+"Attendees" = "Résztvevők";
 "Resources" = "Erőforrások";
-"Organizer:" = "Szervező:";
-"Description:" = "Leírás:";
-"Document:" = "Dokumentum:";
-"Category:" = "Kategória:";
-"Repeat:" = "Ismétlés:";
-"Reminder:" = "Emlékeztető:";
-"General:" = "Általános:";
-"Reply:" = "Válasz:";
-"Created by:" = "Létrehozta:";
+"Organizer" = "Szervező";
+"Description" = "Leírás";
+"Document" = "Dokumentum";
+"Category" = "Kategória";
+"Repeat" = "Ismétlés";
+"Reminder" = "Emlékeztető";
+"General" = "Általános";
+"Reply" = "Válasz";
+"Created by" = "Létrehozta";
 
 
 "Target:" = "Cél:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Lejárt feladatok";
 "view_incomplete" = "Befejezetlen feladat";
 
-"View:" = "Nézet:";
+"View" = "Nézet";
 "Title, category or location" = "Cím, kategória vagy helyszin";
 "Entire content" = "Teljes tartalom";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Bizalmas feladat)";
 "button_allOccurrences" = "Az összes előfordulást";
 
 /* Properties dialog */
-"Name:" = "Név:";
-"Color:" = "Szín:";
+"Name" = "Név";
+"Color" = "Szín";
 
 "Include in free-busy" = "Foglaltság mutatása";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Bizalmas feladat)";
 "Notifications" = "Értesítések";
 "Receive a mail when I modify my calendar" = "Kapjak email értesítést, amikor módosítok a naptáramon";
 "Receive a mail when someone else modifies my calendar" = "Kapjak email értesítést, amikor mások módosítják a naptáramat";
-"When I modify my calendar, send a mail to:" = "Email értesítés küldése az alábbi címre a naptáram módosításakor";
+"When I modify my calendar, send a mail to" = "Email értesítés küldése az alábbi címre a naptáram módosításakor";
 
 "Links to this Calendar" = "Hivatkozások ehhez a naptárhoz";
 "Authenticated User Access" = "Belépett felhasználók";
-"CalDAV URL" = "CalDAV URL:";
+"CalDAV URL" = "CalDAV URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Icelandic.lproj/Localizable.strings b/UI/Scheduler/Icelandic.lproj/Localizable.strings
index 499ed3c80..8e40020b2 100644
--- a/UI/Scheduler/Icelandic.lproj/Localizable.strings
+++ b/UI/Scheduler/Icelandic.lproj/Localizable.strings
@@ -151,33 +151,33 @@
 "Appointment editor" = "Sýsla með tímapantanir";
 "Appointment proposal" = "Tillaga um tímapöntun";
 "Appointment on" = "Tímapöntun á";
-"Start:" = "Byrjun:";
-"End:" = "Endir:";
-"Due Date:" = "Lokadagur:";
-"Title:" = "Titill:";
-"Calendar:" = "Dagatal:";
+"Start" = "Byrjun";
+"End" = "Endir";
+"Due Date" = "Lokadagur";
+"Title" = "Titill";
+"Calendar" = "Dagatal";
 "Name" = "Nafn";
 "Email" = "Tölvupóstur";
-"Status:" = "Staða:";
+"Status" = "Staða";
 "% complete" = "% lokið";
-"Location:" = "Staðsetning:";
-"Priority:" = "Mikilvægi:";
+"Location" = "Staðsetning";
+"Priority" = "Mikilvægi";
 "Privacy" = "Friðhelgi";
 "Cycle" = "Cycle";
 "Cycle End" = "Cycle End";
 "Categories" = "Flokkar";
 "Classification" = "Classification";
 "Duration" = "Tímalengd";
-"Attendees:" = "Þáttakendur:";
+"Attendees" = "Þáttakendur";
 "Resources" = "Tilföng";
-"Organizer:" = "Skipuleggjandi:";
-"Description:" = "Lýsing:";
-"Document:" = "Skjal:";
-"Category:" = "Flokkun:";
-"Repeat:" = "Endurtaka:";
-"Reminder:" = "Áminning:";
-"General:" = "Almennt:";
-"Reply:" = "Reply:";
+"Organizer" = "Skipuleggjandi";
+"Description" = "Lýsing";
+"Document" = "Skjal";
+"Category" = "Flokkun";
+"Repeat" = "Endurtaka";
+"Reminder" = "Áminning";
+"General" = "Almennt";
+"Reply" = "Reply";
 
 "Target:" = "Target:";
 
@@ -222,7 +222,7 @@
 "view_future" = "Allir framtíðarviðburðir";
 "view_selectedday" = "Valinn Dagur";
 
-"View:" = "Sýn:";
+"View" = "Sýn";
 "Title or Description" = "Titill eða Lýsing";
 
 "Search" = "Leita";
@@ -475,8 +475,8 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)";
 "button_allOccurrences" = "Öllum atvikum";
 
 /* Properties dialog */
-"Name:" = "Nafn:";
-"Color:" = "Litur:";
+"Name" = "Nafn";
+"Color" = "Litur";
 
 "Include in free-busy" = "Taka með í upplýsingum um lausan og upptekin tíma";
 
diff --git a/UI/Scheduler/Italian.lproj/Localizable.strings b/UI/Scheduler/Italian.lproj/Localizable.strings
index 3ca6154f9..ed69aaf49 100644
--- a/UI/Scheduler/Italian.lproj/Localizable.strings
+++ b/UI/Scheduler/Italian.lproj/Localizable.strings
@@ -152,33 +152,33 @@
 "Appointment editor" = "Modifica appuntamenti";
 "Appointment proposal" = "Proponi appuntamenti";
 "Appointment on" = "Appuntamento del";
-"Start:" = "Inizio:";
-"End:" = "Fine:";
-"Due Date:" = "Scadenza:";
-"Title:" = "Titolo:";
-"Calendar:" = "Calendario:";
+"Start" = "Inizio";
+"End" = "Fine";
+"Due Date" = "Scadenza";
+"Title" = "Titolo";
+"Calendar" = "Calendario";
 "Name" = "Nome";
 "Email" = "Email";
-"Status:" = "Stato:";
+"Status" = "Stato";
 "% complete" = "% completato";
-"Location:" = "Luogo:";
-"Priority:" = "Priorità:";
+"Location" = "Luogo";
+"Priority" = "Priorità";
 "Privacy" = "Privacy";
 "Cycle" = "Ricorrenza";
 "Cycle End" = "Termine ricorrenza";
 "Categories" = "Categorie";
 "Classification" = "Classificazione";
 "Duration" = "Durata";
-"Attendees:" = "Partecipanti:";
+"Attendees" = "Partecipanti";
 "Resources" = "Risorse";
-"Organizer:" = "Proprietario:";
-"Description:" = "Descrizione:";
-"Document:" = "Documento:";
-"Category:" = "Categoria:";
-"Repeat:" = "Ripeti:";
-"Reminder:" = "Promemoria:";
-"General:" = "Generale:";
-"Reply:" = "Risposta:";
+"Organizer" = "Proprietario";
+"Description" = "Descrizione";
+"Document" = "Documento";
+"Category" = "Categoria";
+"Repeat" = "Ripeti";
+"Reminder" = "Promemoria";
+"General" = "Generale";
+"Reply" = "Risposta";
 
 "Target:" = "Percorso:";
 
@@ -223,7 +223,7 @@
 "view_future" = "Tutti i prossimi eventi";
 "view_selectedday" = "Giorno selezionato";
 
-"View:" = "Visualizza:";
+"View" = "Visualizza";
 "Title or Description" = "Titolo o descrizione";
 
 "Search" = "Cerca";
@@ -476,8 +476,8 @@ vtodo_class2 = "(Attività confidenziale)";
 "button_allOccurrences" = "Tutte le occorrenze";
 
 /* Properties dialog */
-"Name:" = "Nome:";
-"Color:" = "Colore:";
+"Name" = "Nome";
+"Color" = "Colore";
 
 "Include in free-busy" = "Includi nel libero-occupato";
 
@@ -491,7 +491,7 @@ vtodo_class2 = "(Attività confidenziale)";
 
 "Receive a mail when I modify my calendar" = "Ricevi una mail quando io modifico il mio calendario";
 "Receive a mail when someone else modifies my calendar" = "Ricevi una mail quando qualcuno modifica il mio calendario";
-"When I modify my calendar, send a mail to:" = "Quando modifico il mio calendario, invia una mail a:";
+"When I modify my calendar, send a mail to" = "Quando modifico il mio calendario, invia una mail a";
 
 "Links to this Calendar" = "Link a questo Calendario";
 "Authenticated User Access" = "Tutti gli utenti autenticati";
diff --git a/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings b/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings
index 28c606bb1..bbcc23789 100644
--- a/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings
+++ b/UI/Scheduler/NorwegianBokmal.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Liste";
 "Print Settings" = "Utskrift instillinger";
-"Title:" = "Tittel:";
-"Layout:" = "Visning:";
+"Title" = "Tittel";
+"Layout" = "Visning";
 "What to Print" = "Hva som skal printes";
 "Options" = "Alternativer";
 "Tasks with no due date" = "Oppgaver uten forfallsdato";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Avtaleredigerer";
 "Appointment proposal" = "Avtaleforslag";
 "Appointment on" = "Møteavtale";
-"Start:" = "Starter:";
-"End:" = "Slutter:";
-"Due Date:" = "Dato:";
-"Title:" = "Tittel:";
-"Calendar:" = "Kalender:";
+"Start" = "Starter";
+"End" = "Slutter";
+"Due Date" = "Dato";
+"Title" = "Tittel";
+"Calendar" = "Kalender";
 "Name" = "Navn";
 "Email" = "E-post";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% utført";
-"Location:" = "Sted:";
-"Priority:" = "Prioritet:";
+"Location" = "Sted";
+"Priority" = "Prioritet";
 "Privacy" = "Personvern";
 "Cycle" = "Intervall";
 "Cycle End" = "Intervall slutter";
 "Categories" = "Kategorier";
 "Classification" = "Klassifisering";
 "Duration" = "Varighet";
-"Attendees:" = "Deltakere:";
+"Attendees" = "Deltakere";
 "Resources" = "Ressurser";
-"Organizer:" = "Organisator:";
-"Description:" = "Beskrivelse:";
-"Document:" = "Dokument:";
-"Category:" = "Kategori:";
-"Repeat:" = "Gjenta:";
-"Reminder:" = "Påminnelse:";
-"General:" = "Generell:";
-"Reply:" = "Svar:";
-"Created by:" = "Opprettet av:";
+"Organizer" = "Organisator";
+"Description" = "Beskrivelse";
+"Document" = "Dokument";
+"Category" = "Kategori";
+"Repeat" = "Gjenta";
+"Reminder" = "Påminnelse";
+"General" = "Generell";
+"Reply" = "Svar";
+"Created by" = "Opprettet av";
 
 
 "Target:" = "Mål:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Forfalte oppgaver";
 "view_incomplete" = "Ufullstendige oppgaver";
 
-"View:" = "Vis:";
+"View" = "Vis";
 "Title, category or location" = "Tittel, kategori eller sted";
 "Entire content" = "Fullstendig innhold";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "button_allOccurrences" = "Alle forekomster";
 
 /* Properties dialog */
-"Name:" = "Navn:";
-"Color:" = "Farge:";
+"Name" = "Navn";
+"Color" = "Farge";
 
 "Include in free-busy" = "Inkluder i fritt opptatt";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "Notifications" = "Varslinger";
 "Receive a mail when I modify my calendar" = "Motta e-post når jeg oppdaterer kalenderen min";
 "Receive a mail when someone else modifies my calendar" = "Motta e-post når andre oppdaterer kalenderen min";
-"When I modify my calendar, send a mail to:" = "Når jeg endrer kalenderen, send e-post til:";
+"When I modify my calendar, send a mail to" = "Når jeg endrer kalenderen, send e-post til";
 
 "Links to this Calendar" = "Linker til denne kalenderen";
 "Authenticated User Access" = "Autentisert brukertilgang";
-"CalDAV URL" = "CalDAV URL:";
+"CalDAV URL" = "CalDAV URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings b/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings
index e5ead80b3..89ce83889 100644
--- a/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings
+++ b/UI/Scheduler/NorwegianNynorsk.lproj/Localizable.strings
@@ -151,33 +151,33 @@
 "Appointment editor" = "Avtaleredigerer";
 "Appointment proposal" = "Avtaleforslag";
 "Appointment on" = "Møteavtale";
-"Start:" = "Starter:";
-"End:" = "Slutter:";
-"Due Date:" = "Dato:";
-"Title:" = "Tittel:";
-"Calendar:" = "Kalender:";
+"Start" = "Starter";
+"End" = "Slutter";
+"Due Date" = "Dato";
+"Title" = "Tittel";
+"Calendar" = "Kalender";
 "Name" = "Navn";
 "Email" = "E-post";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% utført";
-"Location:" = "Plass:";
-"Priority:" = "Prioritet:";
+"Location" = "Plass";
+"Priority" = "Prioritet";
 "Privacy" = "Personvern";
 "Cycle" = "Intervall";
 "Cycle End" = "Intervall slutter";
 "Categories" = "Kategorier";
 "Classification" = "Klassifisering";
 "Duration" = "Varighet";
-"Attendees:" = "Deltakere:";
+"Attendees" = "Deltakere";
 "Resources" = "Ressurser";
-"Organizer:" = "Organisatør:";
-"Description:" = "Beskrivelse:";
-"Document:" = "Dokument:";
-"Category:" = "Kategori:";
-"Repeat:" = "Gjenta:";
-"Reminder:" = "Påminnelse:";
-"General:" = "Generell:";
-"Reply:" = "Svar:";
+"Organizer" = "Organisatør";
+"Description" = "Beskrivelse";
+"Document" = "Dokument";
+"Category" = "Kategori";
+"Repeat" = "Gjenta";
+"Reminder" = "Påminnelse";
+"General" = "Generell";
+"Reply" = "Svar";
 
 "Target:" = "Mål:";
 
@@ -222,7 +222,7 @@
 "view_future" = "Alle fremtidige hendelser";
 "view_selectedday" = "Valgt dag";
 
-"View:" = "Vis:";
+"View" = "Vis";
 "Title or Description" = "Tittel eller beskrivelse";
 
 "Search" = "Søk";
@@ -475,8 +475,8 @@ vtodo_class2 = "(Konfidensiell oppgave)";
 "button_allOccurrences" = "Alle forekomster";
 
 /* Properties dialog */
-"Name:" = "Navn:";
-"Color:" = "Farge:";
+"Name" = "Navn";
+"Color" = "Farge";
 
 "Include in free-busy" = "Inkluder i fritt opptatt";
 
diff --git a/UI/Scheduler/Polish.lproj/Localizable.strings b/UI/Scheduler/Polish.lproj/Localizable.strings
index 928b6572c..d69138a1d 100644
--- a/UI/Scheduler/Polish.lproj/Localizable.strings
+++ b/UI/Scheduler/Polish.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Lista";
 "Print Settings" = "Ustawienia wydruku";
-"Title:" = "Tytuł:";
-"Layout:" = "Układ:";
+"Title" = "Tytuł";
+"Layout" = "Układ";
 "What to Print" = "Elementy do wydruku";
 "Options" = "Opcje";
 "Tasks with no due date" = "Zadania bez terminu";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Edytor spotkań";
 "Appointment proposal" = "Propozycja spotkania";
 "Appointment on" = "Spotkanie w";
-"Start:" = "Początek:";
-"End:" = "Koniec:";
-"Due Date:" = "Termin:";
-"Title:" = "Tytuł:";
-"Calendar:" = "Kalendarz:";
+"Start" = "Początek";
+"End" = "Koniec";
+"Due Date" = "Termin";
+"Title" = "Tytuł";
+"Calendar" = "Kalendarz";
 "Name" = "Nazwa";
 "Email" = "E-mail";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% wykonania";
-"Location:" = "Miejsce:";
-"Priority:" = "Priorytet:";
+"Location" = "Miejsce";
+"Priority" = "Priorytet";
 "Privacy" = "Prywatność";
 "Cycle" = "Powtarzaj";
 "Cycle End" = "Koniec powtarzania";
 "Categories" = "Kategorie";
 "Classification" = "Klasyfikacja";
 "Duration" = "Czas trwania";
-"Attendees:" = "Uczestnicy:";
+"Attendees" = "Uczestnicy";
 "Resources" = "Zasoby";
-"Organizer:" = "Organizator:";
-"Description:" = "Opis:";
-"Document:" = "Dokument:";
-"Category:" = "Kategoria:";
-"Repeat:" = "Powtórz:";
-"Reminder:" = "Przypomnienie:";
-"General:" = "Ogólne:";
-"Reply:" = "Odpowiedź:";
-"Created by:" = "Stworzone przez:";
+"Organizer" = "Organizator";
+"Description" = "Opis";
+"Document" = "Dokument";
+"Category" = "Kategoria";
+"Repeat" = "Powtórz";
+"Reminder" = "Przypomnienie";
+"General" = "Ogólne";
+"Reply" = "Odpowiedź";
+"Created by" = "Stworzone przez";
 
 
 "Target:" = "Cel:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Zadania zaległe";
 "view_incomplete" = "Zadania nieukończone";
 
-"View:" = "Widok:";
+"View" = "Widok";
 "Title, category or location" = "Tytuł, kategoria lub położenie";
 "Entire content" = "Cała zawartość";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Zadanie poufne)";
 "button_allOccurrences" = "Wszystkie wystąpienia";
 
 /* Properties dialog */
-"Name:" = "Nazwa:";
-"Color:" = "Kolor:";
+"Name" = "Nazwa";
+"Color" = "Kolor";
 
 "Include in free-busy" = "Uwzględnij w wolny-zajęty";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Zadanie poufne)";
 "Notifications" = "Powiadomienia";
 "Receive a mail when I modify my calendar" = "Przyślij e-mail, gdy zmieniam swój kalendarz";
 "Receive a mail when someone else modifies my calendar" = "Przyślij e-mail, gdy ktoś zmienia mój kalendarz";
-"When I modify my calendar, send a mail to:" = "Gdy zmieniam swój kalendarz, wyślij e-mail do:";
+"When I modify my calendar, send a mail to" = "Gdy zmieniam swój kalendarz, wyślij e-mail do";
 
 "Links to this Calendar" = "Odnośniki do tego kalendarza";
 "Authenticated User Access" = "Dostęp dla zalogowanych użytkowników";
-"CalDAV URL" = "CalDAV URL:";
+"CalDAV URL" = "CalDAV URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Russian.lproj/Localizable.strings b/UI/Scheduler/Russian.lproj/Localizable.strings
index 1f43a8900..bdb9375f8 100644
--- a/UI/Scheduler/Russian.lproj/Localizable.strings
+++ b/UI/Scheduler/Russian.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Список";
 "Print Settings" = "Настройки печати";
-"Title:" = "Заголовок:";
-"Layout:" = "Разметка:";
+"Title" = "Заголовок";
+"Layout" = "Разметка";
 "What to Print" = "Что печатать";
 "Options" = "Опции";
 "Tasks with no due date" = "Задачи без указания времени окончания";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Редактор встреч";
 "Appointment proposal" = "Предложение встреч";
 "Appointment on" = "Встреча";
-"Start:" = "Начало:";
-"End:" = "Конец:";
-"Due Date:" = "К дате:";
-"Title:" = "Заголовок:";
-"Calendar:" = "Календарь:";
+"Start" = "Начало";
+"End" = "Конец";
+"Due Date" = "К дате";
+"Title" = "Заголовок";
+"Calendar" = "Календарь";
 "Name" = "Имя";
 "Email" = "Email";
-"Status:" = "Статус:";
+"Status" = "Статус";
 "% complete" = "% выполнено";
-"Location:" = "Место:";
-"Priority:" = "Приоритет:";
+"Location" = "Место";
+"Priority" = "Приоритет";
 "Privacy" = "Приватность";
 "Cycle" = "Цикл";
 "Cycle End" = "Конец цикла";
 "Categories" = "Категории";
 "Classification" = "Классификация";
 "Duration" = "Продолжительность";
-"Attendees:" = "Участники:";
+"Attendees" = "Участники";
 "Resources" = "Ресурсы";
-"Organizer:" = "Организатор:";
-"Description:" = "Описание:";
-"Document:" = "Документ:";
-"Category:" = "Категория:";
-"Repeat:" = "Повторять:";
-"Reminder:" = "Напоминание:";
-"General:" = "Общее:";
-"Reply:" = "Ответ:";
-"Created by:" = "Создано:";
+"Organizer" = "Организатор";
+"Description" = "Описание";
+"Document" = "Документ";
+"Category" = "Категория";
+"Repeat" = "Повторять";
+"Reminder" = "Напоминание";
+"General" = "Общее";
+"Reply" = "Ответ";
+"Created by" = "Создано";
 
 
 "Target:" = "Цель:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Просроченные задачи";
 "view_incomplete" = "Незаконченные задачи";
 
-"View:" = "Вид:";
+"View" = "Вид";
 "Title, category or location" = "Заголовок, категория или место";
 "Entire content" = "Всё содержимое";
 
@@ -506,8 +506,8 @@ vtodo_class2 = "(Конфиденциальное задание)";
 "button_allOccurrences" = "Все повторы";
 
 /* Properties dialog */
-"Name:" = "Название:";
-"Color:" = "Цвет:";
+"Name" = "Название";
+"Color" = "Цвет";
 
 "Include in free-busy" = "Включить в free-busy";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Конфиденциальное задание)";
 "Notifications" = "Напоминания";
 "Receive a mail when I modify my calendar" = "Получать письмо в случае если я изменю свой календарь";
 "Receive a mail when someone else modifies my calendar" = "Получать письмо если кто-то изменит мой календарь";
-"When I modify my calendar, send a mail to:" = "Если я изменю свой календарь, отправить письмо на адрес: ";
+"When I modify my calendar, send a mail to" = "Если я изменю свой календарь, отправить письмо на адрес ";
 
 "Links to this Calendar" = "Ссылки на этот календарь";
 "Authenticated User Access" = "Доступ авторизированных пользователей";
-"CalDAV URL" = "CalDAV URL: ";
+"CalDAV URL" = "CalDAV URL ";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Slovak.lproj/Localizable.strings b/UI/Scheduler/Slovak.lproj/Localizable.strings
index be50e57cb..add7a1c9c 100644
--- a/UI/Scheduler/Slovak.lproj/Localizable.strings
+++ b/UI/Scheduler/Slovak.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Zoznam";
 "Print Settings" = "Nastavenia tlače";
-"Title:" = "Názov:";
-"Layout:" = "Zobrazenie:";
+"Title" = "Názov";
+"Layout" = "Zobrazenie";
 "What to Print" = "Čo chcete tlačiť";
 "Options" = "Možnosti";
 "Tasks with no due date" = "Úlohy bez časového obmedzenia";
@@ -163,34 +163,34 @@
 "Appointment editor" = "Editovať schôdzky";
 "Appointment proposal" = "Navrhnúť schôdzku";
 "Appointment on" = "Schôdzka na";
-"Start:" = "Začiatok:";
-"End:" = "Koniec:";
-"Due Date:" = "Dátum splnenia:";
-"Title:" = "Názov:";
-"Calendar:" = "Kalendár:";
+"Start" = "Začiatok";
+"End" = "Koniec";
+"Due Date" = "Dátum splnenia";
+"Title" = "Názov";
+"Calendar" = "Kalendár";
 "Name" = "Meno";
 "Email" = "E-Mail";
-"Status:" = "Stav:";
+"Status" = "Stav";
 "% complete" = "% hotovo";
-"Location:" = "Miesto:";
-"Priority:" = "Priorita:";
+"Location" = "Miesto";
+"Priority" = "Priorita";
 "Privacy" = "Súkromie";
 "Cycle" = "Cyklus opakovania";
 "Cycle End" = "Koniec cyklu";
 "Categories" = "Kategórie";
 "Classification" = "Klasifikácia";
 "Duration" = "Trvanie";
-"Attendees:" = "Účastníci:";
+"Attendees" = "Účastníci";
 "Resources" = "Zdroje";
-"Organizer:" = "Organizátor:";
-"Description:" = "Popis:";
-"Document:" = "Dokument:";
-"Category:" = "Kategória:";
-"Repeat:" = "Opakovanie:";
-"Reminder:" = "Pripomenutie:";
-"General:" = "Hlavný:";
-"Reply:" = "Odpoveď:";
-"Created by:" = "Vytvorené:";
+"Organizer" = "Organizátor";
+"Description" = "Popis";
+"Document" = "Dokument";
+"Category" = "Kategória";
+"Repeat" = "Opakovanie";
+"Reminder" = "Pripomenutie";
+"General" = "Hlavný";
+"Reply" = "Odpoveď";
+"Created by" = "Vytvorené";
 
 
 "Target:" = "Cieľ:";
@@ -240,7 +240,7 @@
 "view_overdue" = "Vypršané úlohy";
 "view_incomplete" = "Nedokončené úlohy";
 
-"View:" = "Zobraziť:";
+"View" = "Zobraziť";
 "Title, category or location" = "Názov, kategória alebo miesto";
 "Entire content" = "Celý obsah";
 
@@ -502,8 +502,8 @@ vtodo_class2 = "(Dôverná úloha)";
 "button_allOccurrences" = "Všetky opakovania";
 
 /* Properties dialog */
-"Name:" = "Názov:";
-"Color:" = "Farba:";
+"Name" = "Názov";
+"Color" = "Farba";
 
 "Include in free-busy" = "Zahrnúť do voľný-obsadený";
 
@@ -518,11 +518,11 @@ vtodo_class2 = "(Dôverná úloha)";
 "Notifications" = "Oznámenia";
 "Receive a mail when I modify my calendar" = "Informuj emailom keď upravím môj kalendár";
 "Receive a mail when someone else modifies my calendar" = "Informuj emailom keď niekto iný upraví môj kalendár";
-"When I modify my calendar, send a mail to:" = "Keď upravím svoj kalendár, pošli email:";
+"When I modify my calendar, send a mail to" = "Keď upravím svoj kalendár, pošli email";
 
 "Links to this Calendar" = "Odkazy na tento kalendár";
 "Authenticated User Access" = "Prístup pre overeného užívateľa";
-"CalDAV URL" = "CalDAV url:";
+"CalDAV URL" = "CalDAV url";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Slovenian.lproj/Localizable.strings b/UI/Scheduler/Slovenian.lproj/Localizable.strings
index 8d13fd39a..d92e3d29c 100644
--- a/UI/Scheduler/Slovenian.lproj/Localizable.strings
+++ b/UI/Scheduler/Slovenian.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Seznam";
 "Print Settings" = "Tiskaj nastavitve";
-"Title:" = "Naslov:";
-"Layout:" = "Postavitev:";
+"Title" = "Naslov";
+"Layout" = "Postavitev";
 "What to Print" = "Kaj za tiskanje";
 "Options" = "Možnosti";
 "Tasks with no due date" = "Opravila brez datuma zapadlosti";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Urejevalnik sestankov";
 "Appointment proposal" = "Predlog sestanka";
 "Appointment on" = "Sestanek na";
-"Start:" = "Začetek:";
-"End:" = "Konec:";
-"Due Date:" = "Datum zapadlosti:";
-"Title:" = "Naslov:";
-"Calendar:" = "Koledar:";
+"Start" = "Začetek";
+"End" = "Konec";
+"Due Date" = "Datum zapadlosti";
+"Title" = "Naslov";
+"Calendar" = "Koledar";
 "Name" = "Ime";
 "Email" = "E-pošta";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% dokončan";
-"Location:" = "Mesto:";
-"Priority:" = "Prioriteta:";
+"Location" = "Mesto";
+"Priority" = "Prioriteta";
 "Privacy" = "Zasebnost";
 "Cycle" = "Cikel";
 "Cycle End" = "Konec cikla";
 "Categories" = "Kategorije";
 "Classification" = "Razvrstitev";
 "Duration" = "Trajanje";
-"Attendees:" = "Udeleženci:";
+"Attendees" = "Udeleženci";
 "Resources" = "Viri";
-"Organizer:" = "Organizator:";
-"Description:" = "Opis:";
-"Document:" = "Dokument:";
-"Category:" = "Kategorija:";
-"Repeat:" = "Ponovitev:";
-"Reminder:" = "Opomnik:";
-"General:" = "Splošno:";
-"Reply:" = "Odgovori:";
-"Created by:" = "Ustvaril:";
+"Organizer" = "Organizator";
+"Description" = "Opis";
+"Document" = "Dokument";
+"Category" = "Kategorija";
+"Repeat" = "Ponovitev";
+"Reminder" = "Opomnik";
+"General" = "Splošno";
+"Reply" = "Odgovori";
+"Created by" = "Ustvaril";
 
 
 "Target:" = "Cilj:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Zapadla opravila";
 "view_incomplete" = "Nedokončana opravila";
 
-"View:" = "Pregled:";
+"View" = "Pregled";
 "Title, category or location" = "Naslov, kategorija ali mesto";
 "Entire content" = "Vsa vsebina";
 
@@ -508,8 +508,8 @@ vtodo_class2 = "(Zaupno opravilo)";
 "button_allOccurrences" = "Vse ponovitve";
 
 /* Properties dialog */
-"Name:" = "Ime:";
-"Color:" = "Barva:";
+"Name" = "Ime";
+"Color" = "Barva";
 
 "Include in free-busy" = "Vključi v prosto-zasedeno";
 
@@ -524,11 +524,11 @@ vtodo_class2 = "(Zaupno opravilo)";
 "Notifications" = "Obvestila";
 "Receive a mail when I modify my calendar" = "Prejmi pošto, ko spremenim moj koledar";
 "Receive a mail when someone else modifies my calendar" = "Prejmi pošto, ko kdorkoli drugi spremeni moj koledar";
-"When I modify my calendar, send a mail to:" = "Ko spremenim moj koledar, pošlji pošto za:";
+"When I modify my calendar, send a mail to" = "Ko spremenim moj koledar, pošlji pošto za";
 
 "Links to this Calendar" = "Povezave do tega koledarja";
 "Authenticated User Access" = "Preverjeni uporabniški dostop";
-"CalDAV URL" = "CalDAV URL:";
+"CalDAV URL" = "CalDAV URL";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings b/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings
index a987dcfbf..52e44022e 100644
--- a/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings
+++ b/UI/Scheduler/SpanishArgentina.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Lista";
 "Print Settings" = "Opciones de impresión";
-"Title:" = "Título:";
-"Layout:" = "Disposición:";
+"Title" = "Título";
+"Layout" = "Disposición";
 "What to Print" = "Qué imprimir";
 "Options" = "Opciones";
 "Tasks with no due date" = "Tareas sin fecha de vencimiento";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Editor de eventos";
 "Appointment proposal" = "Propuesta de evento";
 "Appointment on" = "Evento";
-"Start:" = "Desde:";
-"End:" = "Hasta:";
-"Due Date:" = "Vencimiento:";
-"Title:" = "Título:";
-"Calendar:" = "Calendario:";
+"Start" = "Desde";
+"End" = "Hasta";
+"Due Date" = "Vencimiento";
+"Title" = "Título";
+"Calendar" = "Calendario";
 "Name" = "Nombre";
 "Email" = "Correo";
-"Status:" = "Estado:";
+"Status" = "Estado";
 "% complete" = "% completo";
-"Location:" = "Lugar:";
-"Priority:" = "Prioridad:";
+"Location" = "Lugar";
+"Priority" = "Prioridad";
 "Privacy" = "Privacidad";
 "Cycle" = "Repetir";
 "Cycle End" = "Fin repetición";
 "Categories" = "Categorías";
 "Classification" = "Privacidad";
 "Duration" = "Duración";
-"Attendees:" = "Asistentes:";
+"Attendees" = "Asistentes";
 "Resources" = "Recursos";
-"Organizer:" = "Organizador:";
-"Description:" = "Descripción:";
-"Document:" = "Documento:";
-"Category:" = "Categoría:";
-"Repeat:" = "Repetir:";
-"Reminder:" = "Recordatorio:";
-"General:" = "General:";
-"Reply:" = "Responder:";
-"Created by:" = "Creado por:";
+"Organizer" = "Organizador";
+"Description" = "Descripción";
+"Document" = "Documento";
+"Category" = "Categoría";
+"Repeat" = "Repetir";
+"Reminder" = "Recordatorio";
+"General" = "General";
+"Reply" = "Responder";
+"Created by" = "Creado por";
 
 
 "Target:" = "URL documento:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Tareas que han vencido";
 "view_incomplete" = "Tareas incompletas";
 
-"View:" = "Ver:";
+"View" = "Ver";
 "Title, category or location" = "Título, categoría o lugar";
 "Entire content" = "Contenido completo";
 
@@ -332,7 +332,7 @@
 "No end date" = "Sin fecha de finalización";
 "Create" = "Crear";
 "appointment(s)" = "evento(s)";
-"Repeat until" = "Repetir hasta: ";
+"Repeat until" = "Repetir hasta ";
 
 "First" = "Primero";
 "Second" = "Segundo";
@@ -506,8 +506,8 @@ vtodo_class2 = "(Tarea confidencial)";
 "button_allOccurrences" = "Todas las apariciones";
 
 /* Properties dialog */
-"Name:" = "Nombre:";
-"Color:" = "Color:";
+"Name" = "Nombre";
+"Color" = "Color";
 
 "Include in free-busy" = "Incluir en información de disponibilidad";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Tarea confidencial)";
 "Notifications" = "Notificaciones";
 "Receive a mail when I modify my calendar" = "Recibir un correo de notificación cuando modifique mi calendario";
 "Receive a mail when someone else modifies my calendar" = "Recibir un correo de notificación cuando otra persona modifique mi calendario";
-"When I modify my calendar, send a mail to:" = "Cuando modifique mi calendario enviar un correo a: ";
+"When I modify my calendar, send a mail to" = "Cuando modifique mi calendario enviar un correo a ";
 
 "Links to this Calendar" = "Vínculos a éste calendario";
 "Authenticated User Access" = "Acceso a usuario autenticado";
-"CalDAV URL" = "URL CalDAV:";
+"CalDAV URL" = "URL CalDAV";
 "WebDAV ICS URL" = "URL ICS WebDAV";
 "WebDAV XML URL" = "URL XML WebDAV";
 
diff --git a/UI/Scheduler/SpanishSpain.lproj/Localizable.strings b/UI/Scheduler/SpanishSpain.lproj/Localizable.strings
index 2eeb4c3f9..99397e321 100644
--- a/UI/Scheduler/SpanishSpain.lproj/Localizable.strings
+++ b/UI/Scheduler/SpanishSpain.lproj/Localizable.strings
@@ -150,8 +150,8 @@
 
 "LIST" = "Lista";
 "Print Settings" = "Opciones de impresión";
-"Title:" = "Título:";
-"Layout:" = "Disposición";
+"Title" = "Título";
+"Layout" = "Disposición";
 "What to Print" = "Que imprimir";
 "Options" = "Parametros";
 "Tasks with no due date" = "Tareas sin fecha de vencimiento";
@@ -167,34 +167,34 @@
 "Appointment editor" = "Editor de eventos";
 "Appointment proposal" = "Propuesta de evento";
 "Appointment on" = "Evento";
-"Start:" = "Desde:";
-"End:" = "Hasta:";
-"Due Date:" = "Vencimiento:";
-"Title:" = "Título:";
-"Calendar:" = "Calendario:";
+"Start" = "Desde";
+"End" = "Hasta";
+"Due Date" = "Vencimiento";
+"Title" = "Título";
+"Calendar" = "Calendario";
 "Name" = "Nombre";
 "Email" = "Correo";
-"Status:" = "Estado:";
+"Status" = "Estado";
 "% complete" = "% completo";
-"Location:" = "Lugar:";
-"Priority:" = "Prioridad:";
+"Location" = "Lugar";
+"Priority" = "Prioridad";
 "Privacy" = "Privacidad";
 "Cycle" = "Repetir";
 "Cycle End" = "Fin repetición";
 "Categories" = "Categorías";
 "Classification" = "Privacidad";
 "Duration" = "Duración";
-"Attendees:" = "Asistentes:";
+"Attendees" = "Asistentes";
 "Resources" = "Recursos";
-"Organizer:" = "Organizador:";
-"Description:" = "Descripción:";
-"Document:" = "Documento:";
-"Category:" = "Categoría:";
-"Repeat:" = "Repetir:";
-"Reminder:" = "Recordatorio:";
-"General:" = "General:";
-"Reply:" = "Responder:";
-"Created by:" = "Creado por:";
+"Organizer" = "Organizador";
+"Description" = "Descripción";
+"Document" = "Documento";
+"Category" = "Categoría";
+"Repeat" = "Repetir";
+"Reminder" = "Recordatorio";
+"General" = "General";
+"Reply" = "Responder";
+"Created by" = "Creado por";
 
 
 "Target:" = "URL documento:";
@@ -244,7 +244,7 @@
 "view_overdue" = "Tareas vencidas";
 "view_incomplete" = "Tareas Incompletas";
 
-"View:" = "Ver:";
+"View" = "Ver";
 "Title, category or location" = "Titulo, Categoría o localización";
 "Entire content" = "Contenido Completo";
 
@@ -332,7 +332,7 @@
 "No end date" = "Sin fecha fin";
 "Create" = "Crear";
 "appointment(s)" = "evento(s)";
-"Repeat until" = "Repetir hasta: ";
+"Repeat until" = "Repetir hasta ";
 
 "First" = "Primero";
 "Second" = "Segundo";
@@ -506,8 +506,8 @@ vtodo_class2 = "(Tarea confidencial)";
 "button_allOccurrences" = "Todas las apariciones";
 
 /* Properties dialog */
-"Name:" = "Nombre:";
-"Color:" = "Color:";
+"Name" = "Nombre";
+"Color" = "Color";
 
 "Include in free-busy" = "Incluye en tiempo libre-ocupado";
 
@@ -522,11 +522,11 @@ vtodo_class2 = "(Tarea confidencial)";
 "Notifications" = "Notificaciones";
 "Receive a mail when I modify my calendar" = "Recibir un correo electrónico cuando modifico mi calendario";
 "Receive a mail when someone else modifies my calendar" = "Recibir un correo electrónico cuando alguien distinto modifica mi calendario";
-"When I modify my calendar, send a mail to:" = "Cuando modifico mi calendario, envir un correo electrónico a:";
+"When I modify my calendar, send a mail to" = "Cuando modifico mi calendario, envir un correo electrónico a";
 
 "Links to this Calendar" = "Vínculos a éste calendario";
 "Authenticated User Access" = "Acceso a usuario autenticado";
-"CalDAV URL" = "URL CalDAV:";
+"CalDAV URL" = "URL CalDAV";
 "WebDAV ICS URL" = "WebDAV ICS URL";
 "WebDAV XML URL" = "WebDAV XML URL";
 
diff --git a/UI/Scheduler/Swedish.lproj/Localizable.strings b/UI/Scheduler/Swedish.lproj/Localizable.strings
index 7a151b7ca..95092af21 100644
--- a/UI/Scheduler/Swedish.lproj/Localizable.strings
+++ b/UI/Scheduler/Swedish.lproj/Localizable.strings
@@ -151,33 +151,33 @@
 "Appointment editor" = "Mötesredigerare";
 "Appointment proposal" = "Mötesförslag";
 "Appointment on" = "Möte";
-"Start:" = "Startar:";
-"End:" = "Slutar:";
-"Due Date:" = "Datum:";
-"Title:" = "Titel:";
-"Calendar:" = "Kalender:";
+"Start" = "Startar";
+"End" = "Slutar";
+"Due Date" = "Datum";
+"Title" = "Titel";
+"Calendar" = "Kalender";
 "Name" = "Namn";
 "Email" = "E-post";
-"Status:" = "Status:";
+"Status" = "Status";
 "% complete" = "% utfört";
-"Location:" = "Plats:";
-"Priority:" = "Prioritet:";
+"Location" = "Plats";
+"Priority" = "Prioritet";
 "Privacy" = "Sekretess";
 "Cycle" = "Intervall";
 "Cycle End" = "Intervall slutar";
 "Categories" = "Kategorier";
 "Classification" = "Klassifiering";
 "Duration" = "Längd";
-"Attendees:" = "Deltagare:";
+"Attendees" = "Deltagare";
 "Resources" = "Resurser";
-"Organizer:" = "Organisatör:";
-"Description:" = "Beskrivning:";
-"Document:" = "Dokument:";
-"Category:" = "Kategori:";
-"Repeat:" = "Upprepa:";
-"Reminder:" = "Påminnelse:";
-"General:" = "Allmännt:";
-"Reply:" = "Svara:";
+"Organizer" = "Organisatör";
+"Description" = "Beskrivning";
+"Document" = "Dokument";
+"Category" = "Kategori";
+"Repeat" = "Upprepa";
+"Reminder" = "Påminnelse";
+"General" = "Allmännt";
+"Reply" = "Svara";
 
 "Target:" = "Mål:";
 
@@ -222,7 +222,7 @@
 "view_future" = "Alla framtida händelser";
 "view_selectedday" = "Vald dag";
 
-"View:" = "Visa:";
+"View" = "Visa";
 "Title or Description" = "Titel eller beskrivning";
 
 "Search" = "Sök";
@@ -475,8 +475,8 @@ vtodo_class2 = "(Konfidentiell uppgift)";
 "button_allOccurrences" = "Alla förekomster";
 
 /* Properties dialog */
-"Name:" = "Namn:";
-"Color:" = "Färg:";
+"Name" = "Namn";
+"Color" = "Färg";
 
 "Include in free-busy" = "Inkludera i ledig/upptagen";
 
diff --git a/UI/Scheduler/Ukrainian.lproj/Localizable.strings b/UI/Scheduler/Ukrainian.lproj/Localizable.strings
index 8818182b4..e84741c9e 100644
--- a/UI/Scheduler/Ukrainian.lproj/Localizable.strings
+++ b/UI/Scheduler/Ukrainian.lproj/Localizable.strings
@@ -151,33 +151,33 @@
 "Appointment editor" = "Зміна зустрічі";
 "Appointment proposal" = "Пропозиція зустрічі";
 "Appointment on" = "Зустріч";
-"Start:" = "Початок:";
-"End:" = "Кінець:";
-"Due Date:" = "Дійсно до:";
-"Title:" = "Назва:";
-"Calendar:" = "Календар:";
+"Start" = "Початок";
+"End" = "Кінець";
+"Due Date" = "Дійсно до";
+"Title" = "Назва";
+"Calendar" = "Календар";
 "Name" = "Ім’я";
 "Email" = "E-Mail";
-"Status:" = "Стан:";
+"Status" = "Стан";
 "% complete" = "% виконано";
-"Location:" = "Місце:";
-"Priority:" = "Пріоритет:";
+"Location" = "Місце";
+"Priority" = "Пріоритет";
 "Privacy" = "Конфіденційність";
 "Cycle" = "Цикл";
 "Cycle End" = "Закінчення циклу";
 "Categories" = "Категорії";
 "Classification" = "Визначення";
 "Duration" = "Термін";
-"Attendees:" = "Учасники:";
+"Attendees" = "Учасники";
 "Resources" = "Ресурси";
-"Organizer:" = "Організатор:";
-"Description:" = "Опис:";
-"Document:" = "Документ:";
-"Category:" = "Категорія:";
-"Repeat:" = "Повтор:";
-"Reminder:" = "Нагадування:";
-"General:" = "Загальне:";
-"Reply:" = "Відповідь:";
+"Organizer" = "Організатор";
+"Description" = "Опис";
+"Document" = "Документ";
+"Category" = "Категорія";
+"Repeat" = "Повтор";
+"Reminder" = "Нагадування";
+"General" = "Загальне";
+"Reply" = "Відповідь";
 
 "Target:" = "Введіть веб-сторінку або місце документа:";
 
@@ -222,7 +222,7 @@
 "view_future" = "Всі майбутні події";
 "view_selectedday" = "Вибраний день";
 
-"View:" = "Перегляд:";
+"View" = "Перегляд";
 "Title or Description" = "Назва або опис";
 
 "Search" = "Пошук";
@@ -475,8 +475,8 @@ vtodo_class2 = "(Конфіденційне завдання)";
 "button_allOccurrences" = "Всі повторення";
 
 /* Properties dialog */
-"Name:" = "Назва:";
-"Color:" = "Колір:";
+"Name" = "Назва";
+"Color" = "Колір";
 
 "Include in free-busy" = "Вставити до free-busy";
 
diff --git a/UI/Scheduler/Welsh.lproj/Localizable.strings b/UI/Scheduler/Welsh.lproj/Localizable.strings
index a68551a4d..2051c51cb 100644
--- a/UI/Scheduler/Welsh.lproj/Localizable.strings
+++ b/UI/Scheduler/Welsh.lproj/Localizable.strings
@@ -151,33 +151,33 @@
 "Appointment editor" = "Golygydd Apwyntiadau";
 "Appointment proposal" = "Cynnig Apwyntiad";
 "Appointment on" = "Apwyntiad ar";
-"Start:" = "Dechrau:";
-"End:" = "Diwedd:";
-"Due Date:" = "Dyddiad dyledus:";
-"Title:" = "Teitl:";
-"Calendar:" = "Calendr:";
+"Start" = "Dechrau";
+"End" = "Diwedd";
+"Due Date" = "Dyddiad dyledus";
+"Title" = "Teitl";
+"Calendar" = "Calendr";
 "Name" = "Enw";
 "Email" = "Ebost";
-"Status:" = "Statws:";
+"Status" = "Statws";
 "% complete" = "% cwblhau";
-"Location:" = "Lleoliad:";
-"Priority:" = "Blaenoriaeth:";
+"Location" = "Lleoliad";
+"Priority" = "Blaenoriaeth";
 "Privacy" = "Preifatrwydd";
 "Cycle" = "Cylch";
 "Cycle End" = "Diwedd Cylch";
 "Categories" = "Categoriau";
 "Classification" = "Dosbarthiad";
 "Duration" = "Parhad";
-"Attendees:" = "Mynychwyr:";
+"Attendees" = "Mynychwyr";
 "Resources" = "Adnoddau";
-"Organizer:" = "Trefnwr:";
-"Description:" = "Disgrifiad:";
-"Document:" = "Dogfen:";
-"Category:" = "Categori:";
-"Repeat:" = "Ailwneud:";
-"Reminder:" = "Atgoffa:";
-"General:" = "General:";
-"Reply:" = "Reply:";
+"Organizer" = "Trefnwr";
+"Description" = "Disgrifiad";
+"Document" = "Dogfen";
+"Category" = "Categori";
+"Repeat" = "Ailwneud";
+"Reminder" = "Atgoffa";
+"General" = "General";
+"Reply" = "Reply";
 
 "Target:" = "Targed:";
 
@@ -222,7 +222,7 @@
 "view_future" = "Holl digwyddiadau'r dyfodol";
 "view_selectedday" = "Diwrnod dewisol";
 
-"View:" = "Golygfa:";
+"View" = "Golygfa";
 "Title or Description" = "Teitl neu disgrifiad";
 
 "Search" = "Chwilio";
@@ -475,8 +475,8 @@ vtodo_class2 = "(Tasg gyhoeddus)";
 "button_allOccurrences" = "Pob achlysur";
 
 /* Properties dialog */
-"Name:" = "Enw:";
-"Color:" = "Lliw:";
+"Name" = "Enw";
+"Color" = "Lliw";
 
 "Include in free-busy" = "Include in free-busy";
 
diff --git a/UI/Templates/Appointments/SOGoAptMailReceipt.wox b/UI/Templates/Appointments/SOGoAptMailReceipt.wox
index fc9f701d7..0e2111a12 100644
--- a/UI/Templates/Appointments/SOGoAptMailReceipt.wox
+++ b/UI/Templates/Appointments/SOGoAptMailReceipt.wox
@@ -41,7 +41,7 @@ th, td { font-family: Lucida Grande, Bitstream VeraSans, Tahoma, sans-serif; fon
       ><tr>
         <td></td>
         <th align="left" style="font-weight: bold; padding-top: 9px;"><var:string
-          label:value="The following attendees(s) were notified:" const:escapeHTML="NO"/></th>
+          label:value="The following attendees(s) were notified" const:escapeHTML="NO"/></th>
       </tr>
       <var:foreach list="updatedAttendees" item="currentRecipient">
       <tr>
@@ -54,7 +54,7 @@ th, td { font-family: Lucida Grande, Bitstream VeraSans, Tahoma, sans-serif; fon
       ><tr>
         <td></td>
         <th align="left" style="font-weight: bold; padding-top: 9px;"><var:string
-          label:value="The following attendees(s) were added:" const:escapeHTML="NO"/></th>
+          label:value="The following attendees(s) were added" const:escapeHTML="NO"/></th>
       </tr>
       <var:foreach list="addedAttendees" item="currentRecipient">
       <tr>
@@ -67,7 +67,7 @@ th, td { font-family: Lucida Grande, Bitstream VeraSans, Tahoma, sans-serif; fon
       ><tr>
         <td></td>
         <th align="left" style="font-weight: bold; padding-top: 9px;"><var:string
-          label:value="The following attendees(s) were removed:" const:escapeHTML="NO"/></th>
+          label:value="The following attendees(s) were removed" const:escapeHTML="NO"/></th>
       </tr>
       <var:foreach list="deletedAttendees" item="currentRecipient">
       <tr>
diff --git a/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
new file mode 100644
index 000000000..743e0e3bd
--- /dev/null
+++ b/UI/Templates/ContactsUI/UIxContactEditorTemplate.wox
@@ -0,0 +1,345 @@
+<?xml version='1.0' standalone='yes'?>
+<container xmlns="http://www.w3.org/1999/xhtml" xmlns:var="http://www.skyrix.com/od/binding" xmlns:const="http://www.skyrix.com/od/constant" xmlns:label="OGo:label">
+
+
+    <md-content md-scroll-y="true" class="md-padding md-whiteframe-z1 bg-sogoPaper-50">
+      <div class="editor md-padding">
+        <hgroup class="header">
+          <h1 class="sg-md-display-2--light" ng-bind-html="editor.card.$fullname()"><!-- fullname --></h1>
+          <h6 class="sg-md-display-2-subheader">{{editor.card.$description()}}</h6>
+        </hgroup>
+        
+        <!-- contact editor -->
+        <form name="cardForm" ng-show="editor.card.$isCard()" ng-submit="editor.save(cardForm)">
+          <md-input-container>
+            <var:entity const:name="nbsp"/>
+            <label>
+              <var:string label:value="Display"/>
+            </label>
+            <input type="text" ng-maxlength="30" ng-model="editor.card.c_cn"/>
+          </md-input-container>
+          <!-- todo: look for better reset/normalization. Semanticaly this should be a fieldset, but content doesn't flex properly du to browser styles-->
+          <div id="contact-identification" class="sg-fieldset" layout="row" layout-sm="column">
+            <md-input-container flex="40">
+              <label>
+                <var:string label:value="Firstname"/>
+              </label>
+              <input type="text" ng-model="editor.card.c_givenname"/>
+            </md-input-container>
+            <md-input-container flex="40">
+              <label>
+                <var:string label:value="Lastname"/>
+              </label>
+              <input type="text" ng-model="editor.card.c_sn"/>
+            </md-input-container>
+            <md-input-container flex="20">
+              <label>
+                <var:string label:value="Nickname"/>
+              </label>
+              <input type="text" ng-model="editor.card.nickname"/>
+            </md-input-container>
+          </div>
+
+          <div class="sg-fieldset" layout="row" layout-sm="column">
+            <md-input-container>
+              <label>
+                <var:string label:value="Organization"/>
+              </label>
+              <input type="text" ng-model="editor.card.c_org"/>
+            </md-input-container>
+            <md-input-container>
+              <label>
+                <var:string label:value="Title"/>
+              </label>
+              <input type="text" ng-model="editor.card.title"/>
+            </md-input-container>
+          </div>
+
+          <!-- org units -->
+          <div class="attr" ng-repeat="unit in editor.card.orgUnits">
+            <div layout="row" layout-align="center end">
+              <md-input-container>
+                <label>
+                  <var:string label:value="Organization Unit"/>
+                </label>
+                <input type="text" ng-model="unit.value"
+                       sg-focus-on="orgUnit_{{$index}}"/>
+              </md-input-container>
+              <md-button class="sg-icon-button" type="button" ng-click="editor.card.$delete('orgUnits', $index)">
+                <md-icon>remove_circle</md-icon>
+              </md-button>
+            </div>
+          </div>
+          <div class="md-layout-margin" layout="row" layout-align="start center">
+            <md-button class="sg-icon-button" type="button" ng-click="editor.addOrgUnit($event)">
+              <md-icon>add_circle</md-icon>
+            </md-button>
+            <label class="button-label">
+              <var:string label:value="Add Organizational Unit"/>
+            </label>
+          </div>
+
+          <!-- categories -->
+          <md-chips ng-model="editor.card.categories">
+            <md-chip-template>
+              {{$chip.value}}
+            </md-chip-template>
+            <md-autocomplete
+                md-selected-item="editor.categories.selected"
+                md-selected-item-change="editor.card.$addCategory(category)"
+                md-search-text="editor.categories.searchText"
+                md-items="category in editor.card.constructor.filterCategories(editor.categories.searchText)"
+                label:placeholder="Add a category">
+              <span md-highlight-text="editor.categories.searchText">{{category}}</span>
+            </md-autocomplete>
+          </md-chips>
+
+          <!-- emails -->
+          <div class="section">
+            <div class="attr" ng-repeat="email in editor.card.emails">
+              <div class="md-layout-margin" layout="row" layout-align="space-between end">
+                <md-select ng-model="email.type" label:placeholder="Type">
+                  <md-option ng-repeat="type in ::editor.allEmailTypes" ng-value="type">{{ type }}</md-option>
+                </md-select>
+                <md-input-container>
+                  <label>
+                    <var:string label:value="Email Address"/>
+                  </label>
+                  <input type="email" ng-model="email.value"
+                         sg-focus-on="email_{{$index}}"/>
+                </md-input-container>
+                <md-button class="sg-icon-button" type="button" ng-click="editor.card.$delete('emails', $index)">
+                  <md-icon>remove_circle</md-icon>
+                </md-button>
+              </div>
+
+            </div>
+            <div class="md-layout-margin" layout="row" layout-align="start center">
+              <md-button class="sg-icon-button" type="button" ng-click="editor.addEmail()">
+                <md-icon>add_circle</md-icon>
+              </md-button>
+              <label class="button-label">
+                <var:string label:value="New Email Address"/>
+              </label>
+            </div>
+          </div>
+
+          <!-- birthday -->
+          <md-input-container>
+            <label>
+              <var:string label:value="Birthday"/>
+            </label>
+            <input type="date" ng-model="editor.card.birthday"/>
+          </md-input-container>
+
+          <!-- phones -->
+          <div class="section">
+            <div class="attr" ng-repeat="phone in editor.card.phones">
+              <div class="md-layout-margin" layout="row" layout-align="space-between end">
+                <md-select ng-model="phone.type" label:placeholder="Type">
+                  <md-option ng-repeat="type in ::editor.allTelTypes" ng-value="type">{{ type }}</md-option>
+                </md-select>
+                <md-input-container>
+                  <label>
+                    <var:string label:value="Phone Number"/>
+                  </label>
+                  <input type="text" ng-model="phone.value"
+                         sg-focus-on="phone_{{$index}}"/>
+                </md-input-container>
+                <md-button class="sg-icon-button" type="button" ng-click="editor.card.$delete('phones', $index)">
+                  <md-icon>remove_circle</md-icon>
+                </md-button>
+              </div>
+            </div>
+
+            <div class="md-layout-margin" layout="row" layout-align="start center">
+              <md-button class="sg-icon-button" type="button" ng-click="editor.addPhone()">
+                <md-icon>add_circle</md-icon>
+              </md-button>
+              <label class="button-label">
+                <var:string label:value="New Phone Number"/>
+              </label>
+            </div>
+          </div>
+
+          <!-- urls -->
+          <div class="section">
+            <div class="attr" ng-repeat="url in editor.card.urls">
+              <div class="md-layout-margin" layout="row" layout-align="space-between end">
+                <md-select ng-model="url.type" label:placeholder="Type">
+                  <md-option ng-repeat="type in ::editor.allUrlTypes" ng-value="type">{{ type }}</md-option>
+                </md-select>
+                <md-input-container>
+                  <label>
+                    <var:string label:value="URL"/>
+                  </label>
+                  <input type="url" ng-model="url.value" sg-focus-on="url_{{$index}}"/>
+                </md-input-container>
+                <md-button class="sg-icon-button" type="button" ng-click="editor.card.$delete('urls', $index)">
+                  <md-icon>remove_circle</md-icon>
+                </md-button>
+              </div>
+            </div>
+            <div class="md-layout-margin" layout="row" layout-align="start center">
+              <md-button class="sg-icon-button" type="button" ng-click="editor.addUrl()">
+                <md-icon>add_circle</md-icon>
+              </md-button>
+              <label class="button-label">
+                <var:string label:value="New URL"/>
+              </label>
+            </div>
+          </div>
+
+          <!-- addresses -->
+          <div class="section">
+            <div class="attr" ng-repeat="address in editor.card.addresses">
+              <div layout="row" layout-align="center end">
+                <md-select ng-model="address.type" label:placeholder="Type">
+                  <md-option ng-repeat="type in ::editor.allAddressTypes" ng-value="type">{{ type }}</md-option>
+                </md-select>
+                <md-input-container>
+                  <label>
+                    <var:string label:value="street"/>
+                  </label>
+                  <input type="text" ng-model="address.street"
+                         sg-focus-on="address_{{$index}}"/>
+                </md-input-container>
+                <md-input-container>
+                  <label>
+                    <var:string label:value=""/>
+                  </label>
+                  <input type="text" ng-model="address.street2"/>
+                </md-input-container>
+              </div>
+              <div layout="row" layout-align="center end">
+                <md-input-container>
+                  <label>
+                    <var:string label:value="Postoffice"/>
+                  </label>
+                  <input type="text" ng-model="address.postoffice"/>
+                </md-input-container>
+              </div>
+              <div layout="row" layout-align="center end">
+                <md-input-container>
+                  <label>
+                    <var:string label:value="City"/>
+                  </label>
+                  <input type="text" ng-model="address.locality"/>
+                </md-input-container>
+              </div>
+              <div layout="row" layout-align="center end">
+                <md-input-container>
+                  <label>
+                    <var:string label:value="Region"/>
+                  </label>
+                  <input type="text" ng-model="address.region"/>
+                </md-input-container>
+              </div>
+              <div layout="row" layout-align="center end">
+                <md-input-container>
+                  <label>
+                    <var:string label:value="Country"/>
+                  </label>
+                  <input type="text" ng-model="address.country"/>
+                </md-input-container>
+              </div>
+              <div layout="row" layout-align="center end">
+                <md-input-container>
+                  <label>
+                    <var:string label:value="Postal Code"/>
+                  </label>
+                  <input type="text" ng-model="address.postalcode"/>
+                </md-input-container>
+                <md-button class="sg-icon-button" type="button" ng-click="editor.card.$delete('addresses', $index)">
+                  <md-icon>remove_circle</md-icon>
+                </md-button>
+              </div>
+            </div>
+            <div class="md-layout-margin" layout="row" layout-align="start center">
+              <md-button class="sg-icon-button" type="button" ng-click="editor.addAddress()">
+                <md-icon>add_circle</md-icon>
+              </md-button>
+              <label class="button-label">
+                <var:string label:value="New Address"/>
+              </label>
+            </div>
+          </div>
+
+          <!-- note -->
+          <md-input-container>
+            <label class="right inline">
+              <var:string label:value="Note"/>
+            </label>
+            <textarea ng-model="editor.card.note"><!-- note --></textarea>
+          </md-input-container>
+
+          <div class="fieldset md-layout-margin" layout="row" layout-align="end center">
+            <md-button type="button" ng-click="editor.cancel()">
+              <var:string label:value="Cancel"/>
+            </md-button>
+            <md-button type="button" ng-click="editor.reset()">
+              <var:string label:value="Reset"/>
+            </md-button>
+            <md-button class="md-primary md-hue-3" type="submit">
+              <var:string label:value="Save"/>
+            </md-button>
+          </div>
+        </form>
+
+        <!-- list editor -->
+        <form name="listForm" ng-if="editor.card.$isList()" ng-submit="editor.save(listForm)">
+          <md-input-container>
+            <label>
+              <var:string label:value="Display"/>
+            </label>
+            <input type="text" ng-maxlength="30" ng-model="editor.card.c_cn"/>
+          </md-input-container>
+          
+          <md-input-container>
+            <label>
+              <var:string label:value="Nickname"/>
+            </label>
+            <input type="text" ng-maxlength="30" ng-model="editor.card.nickname"/>
+          </md-input-container>
+
+          <md-input-container>
+            <label>
+              <var:string label:value="Description"/>
+            </label>
+            <textarea ng-model="editor.card.description"><!-- note --></textarea>
+          </md-input-container>
+          
+          <!-- list members -->
+          <div class="pseudo-input-container">
+            <label class="pseudo-input-label">
+                  <var:string label:value="Members"/>
+            </label>
+            <md-contact-chips
+                ng-model="editor.card.refs"
+                md-contacts="editor.userFilter($query, editor.card.refs)"
+                md-contact-name="$$fullname"
+                md-contact-image="$$image"
+                md-contact-email="$$email"
+                md-require-match="md-require-match"
+                filter-selected="false"
+                label:placeholder="Add Member"><!-- members --></md-contact-chips>
+          </div>
+          
+          <div class="fieldset md-layout-margin" layout="row" layout-align="end center">
+            <md-button type="button" ng-click="editor.cancel()">
+              <var:string label:value="Cancel"/>
+            </md-button>
+            <md-button type="button" ng-click="editor.reset()">
+              <var:string label:value="Reset"/>
+            </md-button>
+            <var:if condition="canCreateOrModify">
+              <md-button class="md-primary md-hue-3" type="submit">
+                <var:string label:value="Save"/>
+              </md-button>
+            </var:if>
+          </div>
+        </form>
+      </div>
+    </md-content>
+
+</container>
diff --git a/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox b/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
new file mode 100644
index 000000000..00cdfafff
--- /dev/null
+++ b/UI/Templates/ContactsUI/UIxContactFolderLinksTemplate.wox
@@ -0,0 +1,42 @@
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE container>
+<container
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label"
+    >
+  <md-dialog flex="40">
+    <md-toolbar class="sg-padded">
+      <div class="md-toolbar-tools">
+        <div class="pseudo-input-container md-flex">
+          <label class="pseudo-input-label"><var:string label:value="Links to this Address Book"/></label>
+          <div class="pseudo-input-field sg-md-title"><var:string value="addressBook.displayName"/></div>
+        </div>
+        <md-button class="md-icon-button" ng-click="close()">
+          <md-icon aria-label="Close dialog">close</md-icon>
+        </md-button>
+      </div>
+    </md-toolbar>
+
+    <md-dialog-content>
+      <div layout="column" layout-padding="layout-padding">
+        <div class="sg-md-title"><var:string label:value="Authenticated User Access"/></div>
+        <md-input-container>
+          <label><var:string label:value="CardDAV URL "/></label>
+          <input var:value="cardDavURL" ng-readonly="true"/>
+        </md-input-container>
+      </div>
+      <var:if condition="isPublicAccessEnabled">
+        <div layout="column" layout-padding="layout-padding">
+          <div class="sg-md-title"><var:string label:value="Public Access"/></div>
+          <md-input-container>
+            <label><var:string label:value="CardDAV URL "/></label>
+            <input var:value="publicCardDavURL" ng-readonly="true"/>
+          </md-input-container>
+        </div>
+      </var:if>
+    </md-dialog-content>
+  </md-dialog>
+
+</container>
diff --git a/UI/Templates/ContactsUI/UIxListEditor.wox b/UI/Templates/ContactsUI/UIxListEditor.wox
index d82e9cc89..7f30d24cd 100644
--- a/UI/Templates/ContactsUI/UIxListEditor.wox
+++ b/UI/Templates/ContactsUI/UIxListEditor.wox
@@ -20,13 +20,13 @@
     <form var:href="saveURL" name="editform" id="mainForm">
       <div id="listEditor">
         <span class="caption"><var:string label:value="List details" /></span>
-        <table class="frame"><tr><td width="35%"><var:string label:value="List name:"/></td>
+        <table class="frame"><tr><td width="35%"><var:string label:value="List name"/></td>
             <td><input type="text" const:id="listName" const:name="listName"
                 var:value="listName" class="textField" /></td></tr>
-          <tr><td><var:string label:value="List nickname:"/></td>
+          <tr><td><var:string label:value="List nickname"/></td>
             <td><input type="text" const:id="nickname" const:name="nickname"
                 var:value="nickname" class="textField" /></td></tr>
-          <tr><td><var:string label:value="List description:"/></td>
+          <tr><td><var:string label:value="List description"/></td>
             <td><input type="text" const:id="description" const:name="description"
                 var:value="description" class="textField" /></td></tr>
         </table>
diff --git a/UI/Templates/MailerUI/UIxMailSearch.wox b/UI/Templates/MailerUI/UIxMailSearch.wox
index 669bd6d02..c111d2f7e 100644
--- a/UI/Templates/MailerUI/UIxMailSearch.wox
+++ b/UI/Templates/MailerUI/UIxMailSearch.wox
@@ -23,7 +23,7 @@
     <tbody>
       <tr>
         <td id="mailAccountsCell">
-          <label><var:string label:value="Search messages in:" /></label>
+          <label><var:string label:value="Search messages in" /></label>
           <var:popup const:id="mailAccountsList"
                      list="mailAccountsList"
                      item="item"
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox
index 85a4e1e3b..32ab4b083 100644
--- a/UI/Templates/MainUI/SOGoRootPage.wox
+++ b/UI/Templates/MainUI/SOGoRootPage.wox
@@ -36,13 +36,13 @@
 	    <img const:alt="*" id="splash" rsrc:src="sogo-logo.png"/>
 	  </td>
 	  <td id="loginCell" width="230">
-	    <label><var:string label:value="Username:"/><br/>
+	    <label><var:string label:value="Username"/><br/>
 	    <input class="textField" id="userName" name="userName"
 		   type="text" var:value="cookieUsername" /></label>
-	    <label><var:string label:value="Password:"/><br/>
+	    <label><var:string label:value="Password"/><br/>
 	    <input class="textField" id="password"
 		   name="password" type="password" var:value="password" /></label>
-	    <label><var:string label:value="Language:"/><br/>
+	    <label><var:string label:value="Language"/><br/>
 	    <var:popup const:id="language" const:name="language"
 		       list="languages"
 		       item="item"
@@ -51,7 +51,7 @@
 		       label:noSelectionString="choose"
 		       /></label>
             <var:if condition="hasLoginDomains">
-	    <label><var:string label:value="Domain:"/><br/>
+	    <label><var:string label:value="Domain"/><br/>
 	    <var:popup const:id="domain" const:name="domain"
 		       list="loginDomains"
 		       item="item"
diff --git a/UI/Templates/PreferencesUI/UIxAccountEditor.wox b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
new file mode 100644
index 000000000..014cdd635
--- /dev/null
+++ b/UI/Templates/PreferencesUI/UIxAccountEditor.wox
@@ -0,0 +1,121 @@
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE var:component>
+<var:component
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:uix="OGo:uix"
+    xmlns:rsrc="OGo:url"
+    xmlns:label="OGo:label"
+    className="UIxPageFrame"
+    >
+  <md-dialog>
+    <md-dialog-content>
+
+      <form id="mainForm" name="accountForm" var:href="ownPath">
+
+        <md-input-container>
+          <label><var:string label:value="Account Name"/></label>
+          <input type="text" required="required"
+                 ng-readonly="accountId == 0" ng-model="account.name"/>
+        </md-input-container>
+
+        <md-input-container>
+          <label><var:string label:value="Server Name"/></label>
+          <input type="text" required="required"
+                 ng-readonly="accountId == 0" ng-model="account.serverName"/>
+        </md-input-container>
+
+        <md-input-container>
+          <label><var:string label:value="Port"/></label>
+          <input type="number" required="required" min="1" max="65535"
+                 ng-readonly="accountId == 0" ng-model="account.port"/>
+        </md-input-container>
+
+        <label><var:string label:value="Encryption"/></label>
+        <md-radio-group ng-model="account.encryption">
+          <md-radio-button ng-disabled="accountId == 0" value="none" class="md-primary"><var:string label:value="None"/></md-radio-button>
+          <md-radio-button ng-disabled="accountId == 0" value="ssl"><var:string label:value="SSL"/></md-radio-button>
+          <md-radio-button ng-disabled="accountId == 0" value="tls"><var:string label:value="TLS"/></md-radio-button>
+        </md-radio-group>
+
+        <md-input-container>
+          <label><var:string label:value="User Name"/></label>
+          <input type="text" required="required"
+                 ng-readonly="accountId == 0" ng-model="account.userName"/>
+        </md-input-container>
+
+        <md-input-container>
+          <label><var:string label:value="Password"/></label>
+          <input type="password" ng-readonly="accountId == 0"
+                 ng-model="account.password"/>
+        </md-input-container>
+
+        <md-input-container>
+          <label><var:string label:value="Full Name"/></label>
+          <input type="text" required="required"
+                 ng-readonly="customFromIsReadonly()"
+                 ng-model="account.identities[0].fullName"/>
+        </md-input-container>
+
+        <md-input-container>
+          <label><var:string label:value="Email"/></label>
+          <input type="email" required="required"
+                 ng-readonly="customFromIsReadonly()"
+                 ng-model="account.identities[0].email"/>
+        </md-input-container>
+
+        <md-input-container>
+          <label><var:string label:value="Reply To Email"/></label>
+          <input type="email" ng-model="account.identities[0].replyTo"/>
+        </md-input-container>
+
+        <!-- FIXME -->
+        <md-input-container>
+          <label><var:string label:value="Signature"/></label>
+        <input type="text" ng-model="account.identities[0].signature" />
+      </md-input-container>
+
+        <md-radio-group ng-model="account.receipts.receiptAction">
+          <label><var:string label:value="When I receive a request for a return receipt"/></label>
+          <md-radio-button value="ignore"><var:string label:value="Never send a return receipt"/></md-radio-button>
+          <md-radio-button value="allow"><var:string label:value="Allow return receipts for some messages"/></md-radio-button>
+        </md-radio-group>
+
+        <label>
+          <var:string label:value="If I'm not in the To or Cc of the message"/>
+          <md-select ng-model="account.receipts.receiptNonRecipientAction">
+            <md-option  const:value="ignore"><var:string label:value="Never send"/></md-option>
+            <md-option  const:value="send"><var:string label:value="Always send"/></md-option>
+            <md-option  const:value="ask"><var:string label:value="Ask me"/></md-option>
+          </md-select>
+        </label>
+
+        <label>
+          <var:string  label:value="If the sender is outside my domain"/>
+          <md-select ng-model="account.receipts.receiptOutsideDomainAction">
+            <md-option  const:value="ignore"><var:string label:value="Never send"/></md-option>
+            <md-option  const:value="send"><var:string label:value="Always send"/></md-option>
+            <md-option  const:value="ask"><var:string label:value="Ask me"/></md-option>
+          </md-select>
+        </label>
+
+        <label>
+          <var:string label:value="In all other cases"/>
+          <md-select ng-model="account.receipts.receiptAnyAction">
+            <md-option  const:value="ignore"><var:string label:value="Never send"/></md-option>
+            <md-option  const:value="send"><var:string label:value="Always send"/></md-option>
+            <md-option  const:value="ask"><var:string label:value="Ask me"/></md-option>
+          </md-select>
+        </label>
+
+        <div class="md-actions" layout="row">
+          <md-button type="button" ng-click="cancel()">Cancel</md-button>
+          <md-button type="button" class="md-primary"
+                     ng-disabled="accountForm.$invalid" ng-click="save()">Save</md-button>
+        </div>
+
+      </form>
+    </md-dialog-content>
+  </md-dialog>
+</var:component>
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index 6459c874d..e1fa06770 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -127,43 +127,43 @@
       <div class="tabs">
         <div id="generalView" class="tab">
           <dl class="dl-horizontal">
-            <dt><var:string label:value="SOGo Version :"/></dt>
+            <dt><var:string label:value="SOGo Version "/></dt>
             <dd><var:string value="sogoVersion"/></dd>
-            <dt><var:string label:value="Language :"/></dt>
+            <dt><var:string label:value="Language "/></dt>
             <dd><var:popup list="languages" item="item"
               const:id="language"
               const:name="language"
               string="languageText"
               selection="language"
               label:noSelectionString="choose" /></dd>
-            <dt><var:string label:value="Current Time Zone :"/></dt>
+            <dt><var:string label:value="Current Time Zone "/></dt>
             <dd><var:popup list="timeZonesList" item="item"
               const:id="timezone"
               const:name="timezone"
               string="item" selection="userTimeZone" /></dd>
-            <dt><var:string label:value="Short Date Format :"/></dt>
+            <dt><var:string label:value="Short Date Format "/></dt>
             <dd><var:popup list="shortDateFormatsList" item="item"
               const:id="shortDateFormat"
               const:name="shortDateFormat"
               string="itemShortDateFormatText" selection="userShortDateFormat"/></dd>
-            <dt><var:string label:value="Long Date Format :"/></dt>
+            <dt><var:string label:value="Long Date Format "/></dt>
             <dd><var:popup list="longDateFormatsList" item="item"
               const:id="longDateFormat"
               const:name="longDateFormat"
               string="itemLongDateFormatText" selection="userLongDateFormat"
               /></dd>
-            <dt><var:string label:value="Time Format :"/></dt>
+            <dt><var:string label:value="Time Format "/></dt>
             <dd><var:popup list="timeFormatsList" item="item"
               const:id="timeFormat"
               const:name="timeFormat"
               string="itemTimeFormatText" selection="userTimeFormat"
               /></dd>
-            <dt><var:string label:value="Default Module :"/></dt>
+            <dt><var:string label:value="Default Module "/></dt>
             <dd><var:popup list="availableModules" item="item"
               const:id="defaultModule"
               const:name="defaultModule"
               string="itemModuleText" selection="userDefaultModule"/></dd>
-            <dt><var:string label:value="Refresh View :"/></dt>
+            <dt><var:string label:value="Refresh View "/></dt>
             <dd><var:popup list="refreshViewList" item="item"
               const:id="refreshView"
               const:name="refreshView"
@@ -173,17 +173,17 @@
         <var:if condition="userHasCalendarAccess">
           <div id="calendarOptionsView" class="tab">
             <dl class="dl-horizontal">
-              <dt><var:string label:value="Week begins on :"/></dt>
+              <dt><var:string label:value="Week begins on "/></dt>
               <dd><var:popup list="daysList" item="item"
                 const:id="weekStartDay"
                 const:name="weekStartDay"
                 string="itemWeekStartDay" selection="userWeekStartDay"/></dd>
-              <dt><var:string label:value="Day start time :"/></dt>
+              <dt><var:string label:value="Day start time "/></dt>
               <dd><var:popup list="hoursList" item="item"
                 const:id="dayStartTime"
                 const:name="dayStartTime"
                 string="item" selection="userDayStartTime"/></dd>
-              <dt><var:string label:value="Day end time :"/></dt>
+              <dt><var:string label:value="Day end time "/></dt>
               <dd><var:popup list="hoursList" item="item"
                 const:id="dayEndTime"
                 const:name="dayEndTime"
@@ -194,27 +194,27 @@
                 const:id="busyOffHours"
                 var:checked="busyOffHours" />
                 <var:string label:value="Show time as busy outside working hours"/></dd>
-              <dt><var:string label:value="First week of year :"/></dt>
+              <dt><var:string label:value="First week of year "/></dt>
               <dd><var:popup list="firstWeekList" item="item"
                 const:id="firstWeek"
                 const:name="firstWeek"
                 string="itemFirstWeekText" selection="userFirstWeek"/></dd>
-              <dt><var:string label:value="Default calendar :"/></dt>
+              <dt><var:string label:value="Default calendar "/></dt>
               <dd><var:popup list="defaultCalendarList" item="item"
                 const:id="defaultCalendar"
                 const:name="defaultCalendar"
                 string="itemCalendarText" selection="userDefaultCalendar"/></dd>
-              <dt><var:string label:value="Default events classification :"/></dt>
+              <dt><var:string label:value="Default events classification "/></dt>
               <dd><var:popup list="calendarClassificationsList" item="item"
                 const:id="eventsClassification"
                 const:name="eventsClassification"
                 string="itemClassificationText" selection="eventsDefaultClassification"/></dd>
-              <dt><var:string label:value="Default tasks classification :"/></dt>
+              <dt><var:string label:value="Default tasks classification "/></dt>
               <dd><var:popup list="calendarClassificationsList" item="item"
                 const:id="tasksClassification"
                 const:name="tasksClassification"
                 string="itemClassificationText" selection="tasksDefaultClassification"/></dd>
-              <dt><var:string label:value="Default reminder :"/></dt>
+              <dt><var:string label:value="Default reminder "/></dt>
               <dd><var:popup list="reminderList" item="item"
                 const:disabledValue="-"
                 label:noSelectionString="reminder_NONE"
@@ -270,7 +270,7 @@
                               var:checked="preventInvitations" />
                   <var:string label:value="Prevent from being invited to appointments"/></div>
                   <hr />
-                  <var:string label:value="White list for appointment invitations:"/>
+                  <var:string label:value="White list for appointment invitations"/>
                   <div id="appointmentsWhiteListWrapper" class="listWrapper">
                     <table id="tableViewWhiteList" cellspacing="0">
                       <thead>
@@ -359,13 +359,13 @@
                 const:name="addressBookList"
                 string="itemAddressBookText" selection="userAddressBook"/></dd>
               <dt></dt>
-              <dt><var:string label:value="Forward messages:"/></dt>
+              <dt><var:string label:value="Forward messages"/></dt>
               <dd><var:popup list="messageForwardingList" item="item"
                 const:id="messageForwarding"
                 const:name="messageForwarding"
                 string="itemMessageForwardingText"
                 selection="userMessageForwarding"/></dd>
-              <dt><var:string label:value="When replying to a message:"/></dt>
+              <dt><var:string label:value="When replying to a message"/></dt>
               <dd><var:popup list="replyPlacementList" item="item"
                 const:id="replyPlacementList"
                 const:name="replyPlacementList"
@@ -496,20 +496,20 @@
             <div id="mailAccountEditor">
               <fieldset const:id="accountInfo">
                 <dl class="dl-horizontal">
-                  <dt><var:string label:value="Server Name:"/></dt>
+                  <dt><var:string label:value="Server Name"/></dt>
                   <dd><input const:name="serverName" const:id="serverName" type="text" const:value=""/>
-                    <var:string label:value="Port:"/>
+                    <var:string label:value="Port"/>
                     <input const:name="port" const:id="port" type="text" const:value=""/></dd>
-                  <dt><var:string label:value="Encryption:"/></dt>
+                  <dt><var:string label:value="Encryption"/></dt>
                   <dd><input const:name="encryption" type="radio" const:value="none"/>
                     <var:string label:value="None"/>
                     <input const:name="encryption" type="radio" const:value="ssl"/>
                     <var:string label:value="SSL"/>
                     <input const:name="encryption" type="radio" const:value="tls"/>
                     <var:string label:value="TLS"/></dd>
-                  <dt><var:string label:value="User Name:"/></dt>
+                  <dt><var:string label:value="User Name"/></dt>
                   <dd><input const:name="userName" const:id="userName" type="text" const:value=""/></dd>
-                  <dt><var:string label:value="Password:"/></dt>
+                  <dt><var:string label:value="Password"/></dt>
                   <dd><input const:name="password" const:id="password" type="password" const:value=""/></dd>
                 </dl>
                 <input const:name="encryption" type="hidden" const:value="none"/>
@@ -521,20 +521,20 @@
               
               <fieldset const:id="identityInfo">
                 <dl class="dl-horizontal">
-                  <dt><var:string label:value="Full Name:"/></dt>
+                  <dt><var:string label:value="Full Name"/></dt>
                   <dd><input const:name="fullName" const:id="fullName" type="text" const:value=""/></dd>
-                  <dt><var:string label:value="Email:"/></dt>
+                  <dt><var:string label:value="Email"/></dt>
                   <dd><input const:name="email" const:id="email" type="text" const:value=""/></dd>
-                  <dt><var:string label:value="Reply To Email:"/></dt>
+                  <dt><var:string label:value="Reply To Email"/></dt>
                   <dd><input const:name="replyTo" const:id="replyTo" type="text" autocomplete="off" const:value=""/></dd>
-                  <dt><var:string label:value="Signature:"/></dt>
+                  <dt><var:string label:value="Signature"/></dt>
                   <dd><span id="actSignature"><!--space --></span></dd>
                 </dl>
               </fieldset>
               
               <fieldset const:id="returnReceiptsInfo">
                 <var:string
-                label:value="When I receive a request for a return receipt:"
+                label:value="When I receive a request for a return receipt"
                 /><br/>
                 <label><input const:name="receipt-action" const:id="receipt-action-ignore"
                   type="radio" const:value="ignore"/>
@@ -548,7 +548,7 @@
                 ><br/>
                 <div id="receiptOptions">
                   <var:string
-                  label:value="If I'm not in the To or Cc of the message:"/>
+                  label:value="If I'm not in the To or Cc of the message"/>
                   <select name="receipt-non-recipient-action" id="receipt-non-recipient-action">
                     <option const:value="ignore"><var:string label:value="Never send"/></option>
                     <option const:value="send"><var:string label:value="Always send"/></option>
@@ -556,7 +556,7 @@
                   </select><br/>
                   
                   <var:string
-                  label:value="If the sender is outside my domain:"/>
+                  label:value="If the sender is outside my domain"/>
                   <select name="receipt-outside-domain-action" id="receipt-outside-domain-action">
                     <option const:value="ignore"><var:string label:value="Never send"/></option>
                     <option const:value="send"><var:string label:value="Always send"/></option>
@@ -564,7 +564,7 @@
                   </select><br/>
                   
                   <var:string
-                  label:value="In all other cases:"/>
+                  label:value="In all other cases"/>
                   <select name="receipt-any-action" id="receipt-any-action">
                     <option const:value="ignore"><var:string label:value="Never send"/></option>
                     <option const:value="send"><var:string label:value="Always send"/></option>
@@ -583,13 +583,13 @@
                 var:checked="enableVacation" />
                 <var:string label:value="Enable vacation auto reply"/></label>
               <div id="vacation">
-                <label><var:string label:value="Auto reply message :"/><br/>
+                <label><var:string label:value="Auto reply message "/><br/>
                   <textarea const:name="autoReplyText"
                   const:id="autoReplyText"
                   var:value="autoReplyText"/>
                 </label><br/>
                 
-                <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
+                <label><var:string label:value="Email addresses (separated by commas) "/><br/>
                   <input type="hidden"
                   const:id="defaultEmailAddresses"
                   var:value="defaultEmailAddresses" />
@@ -601,7 +601,7 @@
                   </span>
                 </label><br/>
 
-                <label><var:string label:value="Days between responses :"/>
+                <label><var:string label:value="Days between responses "/>
                   <var:popup list="daysBetweenResponsesList" item="item"
                   const:id="daysBetweenResponsesList"
                   const:name="daysBetweenResponsesList"
@@ -643,7 +643,7 @@
                 <var:string label:value="Forward incoming messages"/></label><br/>
               
               <div id="forward">
-                <label><var:string label:value="Email addresses (separated by commas) :"/><br/>
+                <label><var:string label:value="Email addresses (separated by commas) "/><br/>
                   <textarea const:name="forwardAddress"
                   const:id="forwardAddress"
                   var:value="forwardAddress" />
@@ -663,10 +663,10 @@
         </var:if><!-- userHasMailAccess -->
         <var:if condition="shouldDisplayPasswordChange">
           <div id="passwordView" class="tab">
-            <p id="passwordFields"><label><var:string label:value="New password:"
+            <p id="passwordFields"><label><var:string label:value="New password"
               /><input const:id="newPasswordField" class="textField"
               type="password" const:value=""/></label><br/>
-            <label><var:string label:value="Confirmation:"
+            <label><var:string label:value="Confirmation"
               /><input const:id="newPasswordConfirmationField" class="textField"
               type="password" const:value=""/></label><br/>
             <a href="#" class="button" id="changePasswordBtn"
@@ -684,4 +684,5 @@
       </div>
     </div>
   </form>
+
 </var:component>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
index 016175578..fadb4f973 100644
--- a/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditor.wox
@@ -24,7 +24,7 @@
         <li class="separator"><!-- separator --></li>
       </ul>
     </div>
-    <label id="attendeesLabel"><var:string label:value="Attendees:"
+    <label id="attendeesLabel"><var:string label:value="Attendees"
         /><span class="content"
         ><a href="#" id="attendeesHref"><!-- space --></a></span></label>
     <hr />
@@ -34,14 +34,14 @@
             var:checked="isAllDay"
             /> <var:string label:value="All day Event"
             /></span></span></label>
-    <span class="checkBoxList"><var:string label:value="Start:" />
+    <span class="checkBoxList"><var:string label:value="Start" />
       <span class="content"><var:component className="UIxTimeDateControl"
           const:controlID="startTime"
           date="aptStartDate"
           const:dayStartHour="0"
           const:dayEndHour="23"
           /></span></span>
-    <span class="checkBoxList"><var:string label:value="End:" />
+    <span class="checkBoxList"><var:string label:value="End" />
       <span class="content"><var:component className="UIxTimeDateControl"
           const:controlID="endTime"
           date="aptEndDate"
@@ -64,20 +64,20 @@
   </var:if>
   <var:if condition="eventIsReadOnly">
     <var:if condition="isAllDay">
-      <label><var:string label:value="Start:" />
+      <label><var:string label:value="Start" />
         <span class="content"><var:string var:value="aptStartDateText"/> (<var:string label:value="All day Event"/>)</span>
       </label>
       <var:if condition="startDateIsEqualToEndDate" const:negate="YES">
-        <label><var:string label:value="End:" />
+        <label><var:string label:value="End" />
           <span class="content"><var:string var:value="aptEndDateText" /></span>
         </label>
       </var:if>
     </var:if>
     <var:if condition="isAllDay" const:negate="YES">
-      <label><var:string label:value="Start:" />
+      <label><var:string label:value="Start" />
         <span class="content"><var:string var:value="aptStartDateTimeText" /></span>
       </label>
-      <label><var:string label:value="End:" />
+      <label><var:string label:value="End" />
         <span class="content"><var:string var:value="aptEndDateTimeText" /></span>
       </label>
     </var:if>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
new file mode 100644
index 000000000..3412a51a3
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
@@ -0,0 +1,252 @@
+<?xml version='1.0' standalone='yes'?>
+<container
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label">
+  <md-dialog flex="60">
+    <form name="eventForm" ng-submit="editor.save(eventForm)">
+      <md-toolbar class="md-padding" ng-class="editor.component.getClassName('bg')">
+        <div class="md-toolbar-tools">
+          <!-- summary -->
+          <md-icon ng-if="editor.component.classification == 'confidential'">visibility_off</md-icon>
+          <md-icon ng-if="editor.component.classification == 'private'">vpn_key</md-icon>
+          <md-input-container md-no-float="true">
+            <input type="text"
+                   class="md-title"
+                   label:placeholder="Title"
+                   ng-model="editor.component.summary"/>
+          </md-input-container>
+          <md-button class="md-icon-button" ng-click="editor.cancel()">
+            <md-icon aria-label="Close dialog">close</md-icon>
+          </md-button>
+        </div>
+      </md-toolbar>
+      <!--<md-chips>
+          <md-chip ng-repeat="category in editor.component.categories">{{category}}</md-chip>
+        </md-chips>-->
+    <md-dialog-content>
+      <!-- location -->
+      <md-input-container>
+        <label><var:string label:value="Location"/></label>
+        <input type="text" ng-model="editor.component.location"/>
+      </md-input-container>
+      <!-- categories -->
+      <md-chips ng-model="editor.component.categories">
+        <md-autocomplete
+            md-selected-item="editor.categories.selected"
+            md-search-text="editor.categories.searchText"
+            md-items="category in editor.component.constructor.filterCategories(editor.categories.searchText)"
+            label:placeholder="Add a category">
+          <span md-highlight-text="editor.categories.searchText">{{category}}</span>
+        </md-autocomplete>
+      </md-chips>
+      <!-- calendar -->
+      <md-input-container>
+        <label><var:string label:value="Calendar"/></label>
+        <md-select ng-model="editor.component.destinationCalendar">
+          <md-option ng-repeat="calendar in ::editor.calendars"
+                     ng-value="calendar.id">{{calendar.name}}</md-option>
+        </md-select>
+      </md-input-container>
+      <!-- classification -->
+      <md-radio-group layout="row" layout-align="space-around center"
+                      ng-model="editor.component.classification">
+        <md-radio-button value="public">
+          <var:string label:value="label_Public"/>
+        </md-radio-button>
+        <md-radio-button value="confidential">
+          <var:string label:value="label_Confidential"/>
+        </md-radio-button>
+        <md-radio-button value="private">
+          <var:string label:value="label_Private"/>
+        </md-radio-button>
+      </md-radio-group>
+      <!-- priority -->
+      <div layout="row" layout-align="center center">
+        <div flex="20"><var:string label:value="Priority"/></div>
+        <md-slider class="md-flex"
+                   md-discrete="true"
+                   ng-model="editor.component.priority"
+                   step="1"
+                   min="0"
+                   max="9"
+                   label:aria-label="Priority"><!-- slider --></md-slider>
+      </div>
+      <!-- is all day -->
+      <md-checkbox
+          ng-model="editor.component.isAllDay"
+          ng-true-value="1"
+          ng-false-value="0"
+          label:aria-label="All day Event">
+        <var:string label:value="All day Event"/>
+      </md-checkbox>
+      <!-- is transparent -->
+      <md-checkbox
+          ng-model="editor.component.isTransparent"
+          ng-true-value="1"
+          ng-false-value="0"
+          label:aria-label="Show Time as Free">
+        <var:string label:value="Show Time as Free"/>
+      </md-checkbox>
+      <!-- send appointment notifications -->
+      <md-checkbox
+          ng-model="editor.component.sendAppointmentNotifications"
+          ng-true-value="1"
+          ng-false-value="0"
+          label:aria-label="Send Appointment Notifications">
+        <var:string label:value="Send Appointment Notifications"/>
+      </md-checkbox>
+      <!-- start + end -->
+      <div layout="row">
+        <md-input-container>
+          <label><var:string label:value="From"/></label>
+          <input type="text" ng-model="editor.component.startDate"/>
+        </md-input-container>
+        <md-input-container>
+          <label><var:string label:value="To"/></label>
+          <input type="text" ng-model="editor.component.endDate"/>
+        </md-input-container>
+      </div>
+      <!-- attach urls -->
+      <div class="attr" ng-repeat="attach in editor.component.attachUrls">
+        <div layout="row" layout-align="center end">
+          <md-input-container>
+            <label>
+              <var:string label:value="URL"/>
+            </label>
+            <input type="text" ng-model="attach.value"
+                   sg-focus-on="attachUrl_{{$index}}"/>
+          </md-input-container>
+          <md-button class="sg-icon-button" type="button" ng-click="editor.component.deleteAttachUrl($index)">
+            <md-icon>remove_circle</md-icon>
+          </md-button>
+        </div>
+      </div>
+      <div class="md-layout-margin" layout="row" layout-align="start center">
+        <md-button class="sg-icon-button" type="button" ng-click="editor.addAttachUrl($event)">
+          <md-icon>add_circle</md-icon>
+        </md-button>
+        <label class="button-label">
+          <var:string label:value="Attach"/>
+        </label>
+      </div>
+      <!-- comment -->
+      <md-input-container>
+        <label><var:string label:value="Description"/></label>
+        <textarea ng-model="editor.component.comment"><!-- comment --></textarea>
+      </md-input-container>
+      <!-- repeat -->
+      <div layout="row" layout-align="start end">
+        <div class="md-flex">
+          <md-input-container>
+            <label><var:string label:value="Repeat"/></label>
+            <md-select ng-model="editor.component.repeat.frequency" ng-disabled="editor.component.occurrenceId">
+              <var:foreach list="repeatList" item="item">
+                <md-option var:value="item"><var:string var:value="itemRepeatText"/></md-option>
+              </var:foreach>
+            </md-select>
+          </md-input-container>
+        </div>
+        <md-button type="button" class="sg-icon-button"
+                   label:aria-label="repeat_CUSTOM"
+                   ng-show="editor.component.repeat.frequency != 'never'"
+                   ng-click="editor.toggleRecurrenceEditor()">
+          <md-icon ng-class="{'md-rotate-45': editor.showRecurrenceEditor}">add</md-icon>
+        </md-button>
+      </div>
+      <div ng-show="editor.showRecurrenceEditor" class="sg-subcontent">
+        <var:component className="UIxRecurrenceEditor" />
+      </div>
+      <!-- end repeat -->
+      <div layout="row" layout-align="start end">
+        <div ng-show="editor.component.repeat.frequency != 'never'">
+          <md-input-container>
+            <label><var:string label:value="End Repeat"/></label>
+            <md-select ng-model="editor.component.repeat.end">
+              <md-option value="never"><var:string label:value="Never"/></md-option>
+              <md-option value="count"><var:string label:value="After"/></md-option>
+              <md-option value="until"><var:string label:value="On Date"/></md-option>
+            </md-select>
+          </md-input-container>
+        </div>
+        <div layout="row" layout-align="start center" ng-show="editor.component.repeat.end == 'count'">
+          <md-input-container class="md-input-number">
+            <input type="number" label:aria-label="times" ng-model="editor.component.repeat.count"/>
+          </md-input-container>
+          <var:string label:value="times"/>
+        </div>
+        <md-input-container ng-show="editor.component.repeat.end == 'until'">
+          <input type="date" label:aria-label="Repeat until" ng-model="editor.component.repeat.until"/>
+        </md-input-container>
+      </div>
+      <!-- attendees -->
+      <div layout="row" layout-align="start start">
+        <md-autocomplete class="md-flex"
+                         label:md-floating-label="Invite Attendees"
+                         md-selected-item="attendeeToAdd"
+                         md-search-text="editor.searchText"
+                         md-selected-item-change="editor.addAttendee(card)"
+                         md-items="card in editor.cardFilter(editor.searchText)"
+                         md-item-text="user.empty"
+                         md-min-length="3"
+                         md-delay="300"
+                         md-no-cache="true"
+                         sg-enter="editor.addAttendee(editor.searchText)">
+          <md-item-template>
+            <div class="md-contact-suggestion" layout="row" layout-align="space-between center">
+              <span class="md-contact-name"
+                    md-highlight-text="editor.searchText"
+                    md-highlight-flags="^i">{{card.$$fullname}}</span>
+              <span class="md-contact-email"
+                    md-highlight-text="editor.searchText"
+                    md-highlight-flags="^i">{{card.$$email}}</span>
+            </div>
+          </md-item-template>
+        </md-autocomplete>
+        <md-button type="button" class="sg-icon-button"
+                   label:aria-label="repeat_CUSTOM"
+                   ng-click="editor.toggleAttendeesEditor()">
+          <md-icon ng-class="{'md-rotate-180': editor.showAttendeesEditor}">expand_more</md-icon>
+        </md-button>
+      </div>
+        <!-- md-contact-chips don't support "readonly", so we build them using md-chips
+             in readonly mode and a template similar to the one of md-contact-chips -->
+        <md-chips class="md-contact-chips sg-readonly"
+                  ng-model="editor.component.attendees"
+                  ng-hide="editor.showAttendeesEditor"
+                  readonly="true">
+          <md-chip-template>
+            <div class="md-contact-avatar"><img src="#" ng-src="{{$chip.image}}" alt="{{$chip.name}}"/></div>
+            <div class="md-contact-name">{{$chip.name}}</div>
+            <md-icon ng-class="'icon-' + $chip.status"><!-- partstat --></md-icon>
+          </md-chip-template>
+        </md-chips>
+      <div ng-show="editor.showAttendeesEditor" class="sg-subcontent attendees">
+         <var:component className="UIxAttendeesEditor" />
+      </div>
+      <!-- reminder -->
+      <md-checkbox ng-model="editor.component.$hasAlarm"
+                   label:aria-label="Reminder">
+        <var:string label:value="Reminder"/>
+      </md-checkbox>
+      <div class="sg-subcontent"
+           ng-show="editor.component.$hasAlarm">
+        <var:component className="UIxReminderEditor" />
+      </div>
+    </md-dialog-content>
+      <!-- cancel/reset/save -->
+      <div class="md-actions">
+        <md-button type="button" ng-click="editor.cancel()">
+          <var:string label:value="Cancel"/>
+        </md-button>
+        <md-button type="button" ng-click="editor.component.$reset()">
+          <var:string label:value="Reset"/>
+        </md-button>
+        <md-button class="md-primary md-hue-3" type="submit">
+          <var:string label:value="Save"/>
+        </md-button>
+      </div>
+  </form>
+</md-dialog>
+</container>
diff --git a/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
new file mode 100644
index 000000000..737ba59f4
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxAppointmentViewTemplate.wox
@@ -0,0 +1,129 @@
+<?xml version='1.0' standalone='yes'?>
+<container
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label">
+  <md-dialog flex="40">
+    <form name="eventForm" ng-submit="viewer.save(eventForm)">
+      <md-toolbar class="md-padding" ng-class="viewer.component.getClassName('bg')">
+        <div class="md-toolbar-tools">
+          <md-icon class="material-icons sg-icon-toolbar-bg">event</md-icon>
+          <h2 class="md-flex">
+            <!-- classification -->
+            <md-icon ng-if="viewer.component.classification == 'confidential'">visibility_off</md-icon>
+            <md-icon ng-if="viewer.component.classification == 'private'">vpn_key</md-icon>
+            <!-- summary -->
+            {{viewer.component.summary}}
+            <!-- priority -->
+            <md-icon ng-repeat="i in viewer.component.priority | range">star</md-icon>
+          </h2>
+          <md-button class="md-icon-button" ng-click="viewer.close()">
+            <md-icon aria-label="Close dialog">close</md-icon>
+          </md-button>
+        </div>
+      </md-toolbar>
+      <md-dialog-content>
+      <md-list>
+        <!-- categories -->
+        <md-list-item ng-show="viewer.component.categories.length > 0">
+          <md-chips class="sg-readonly" ng-model="viewer.component.categories" readonly="true">
+            <md-chip-template>
+              <span>{{$chip}}</span>
+            </md-chip-template>
+          </md-chips>
+        </md-list-item>
+        <!-- location -->
+        <md-list-item ng-show="viewer.component.location">
+          <md-icon>place</md-icon>
+          <p>{{viewer.component.location}}</p>
+        </md-list-item>
+        <!-- calendar -->
+        <md-list-item>
+          <md-icon>event</md-icon>
+          <p>{{viewer.component.calendar}}</p>
+        </md-list-item>
+        <!-- start/end dates -->
+        <md-list-item class="md-2-line">
+          <md-icon>access_time</md-icon>
+          <div layout="row" class="md-flex">
+            <div class="md-list-item-text" ng-show="viewer.component.startDate">
+              <p><var:string label:value="Start"/></p>
+              <h3>
+                {{viewer.component.localizedStartDate}}
+                <span ng-hide="viewer.component.isAllDay"> {{viewer.component.localizedStartTime}}</span>
+              </h3>
+            </div>
+            <div class="md-list-item-text" ng-show="viewer.component.endDate">
+              <p><var:string label:value="End"/></p>
+              <h3>
+                {{viewer.component.localizedEndDate}}
+                <span ng-hide="viewer.component.isAllDay">{{viewer.component.localizedEndTime}}</span>
+              </h3>
+            </div>
+          </div>
+        </md-list-item>
+        <!-- is transparent -->
+        <md-list-item ng-show="viewer.component.isTransparent">
+          <md-icon>event_available</md-icon>
+          <p><var:string label:value="Show Time as Free"/></p>
+        </md-list-item>
+        <!-- send appointment notifications -->
+        <md-list-item ng-show="viewer.component.sendAppointmentNotifications">
+          <md-icon>send</md-icon>
+          <p><var:string label:value="Send Appointment Notifications"/></p>
+        </md-list-item>
+        <!-- attach urls -->
+        <md-list-item ng-show="viewer.component.attachUrls.length > 0">
+          <md-icon>link</md-icon>
+          <p ng-repeat="url in viewer.component.attachUrls"><a ng-href="{{url.value}}">{{url.value}}</a></p>
+        </md-list-item>
+        <!-- comment -->
+        <md-list-item ng-show="viewer.component.comment">
+          <md-icon>mode_comment</md-icon>
+          <p>{{viewer.component.comment}}</p>
+        </md-list-item>
+        <!-- repeat -->
+        <md-list-item ng-show="viewer.component.repeat">
+          <md-icon>repeat</md-icon>
+          <p><!-- viewer.component.repeat.toString() --></p>
+        </md-list-item>
+        <!-- reminder -->
+        <md-list-item ng-show="viewer.component.$hasAlarm">
+          <md-icon>alarm</md-icon>
+          <p><!-- viewer.component.alarm.toString() --></p>
+        </md-list-item>
+        <!-- attendees -->
+        <md-list-item ng-show="viewer.component.attendees.length > 0">
+          <div class="pseudo-input-container">
+            <label class="pseudo-input-label"><var:string label:value="Attendees"/></label>
+            <!-- md-contact-chips don't support "readonly", so we build them using md-chips
+                 in readonly mode and a template similar to the one of md-contact-chips -->
+            <md-chips class="md-contact-chips"
+                      ng-model="viewer.component.attendees"
+                      readonly="true">
+              <md-chip-template>
+                <div class="md-contact-avatar"><img src="#" ng-src="{{$chip.image}}" alt="{{$chip.name}}"/></div>
+                <div class="md-contact-name">{{$chip.name}}</div>
+                <md-icon ng-class="'icon-' + $chip.status"><!-- partstat --></md-icon>
+              </md-chip-template>
+            </md-chips>
+          </div>
+        </md-list-item>
+      </md-list>
+    </md-dialog-content>
+    <!-- actions -->
+    <div class="md-actions">
+      <md-button type="button" ng-click="viewer.edit()" ng-hide="viewer.component.occurrenceId">
+        <var:string label:value="Edit"/>
+      </md-button>
+      <md-button type="button" ng-click="viewer.editAllOccurrences()" ng-show="viewer.component.occurrenceId">
+        <var:string label:value="Edit All Occurrences"/>
+      </md-button>
+      <md-button type="button" ng-click="viewer.edit()" ng-show="viewer.component.occurrenceId">
+        <var:string label:value="Edit This Occurrence"/>
+      </md-button>
+    </div>
+  </form>
+</md-dialog>
+</container>
diff --git a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
index 90c01a982..d52433cad 100644
--- a/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
+++ b/UI/Templates/SchedulerUI/UIxCalFilterPanel.wox
@@ -21,7 +21,7 @@
                menuid="eventSearchMenu" />
       </span>
 
-      <var:string label:value="View:" />
+      <var:string label:value="View" />
       <var:popup list="filters"
         const:id="filterpopup"
         item="filter" string="filterLabel" value="filter"
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 31ec553d6..8dc1789d5 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -100,9 +100,9 @@
     <div>
       <h1><!-- space --></h1>
       <p><span><!-- space --></span></p>
-      <p><span class="label"><var:string label:value="Calendar:" /></span> <span><!-- space --></span></p>
-      <p><span class="label"><var:string label:value="Location:" /></span> <span><!-- space --></span></p>
-      <p><span class="label"><var:string label:value="Created by:" /></span> <span><!-- space --></span></p>
+      <p><span class="label"><var:string label:value="Calendar" /></span> <span><!-- space --></span></p>
+      <p><span class="label"><var:string label:value="Location" /></span> <span><!-- space --></span></p>
+      <p><span class="label"><var:string label:value="Created by" /></span> <span><!-- space --></span></p>
       <p class="description"><!-- space --></p>
     </div>
   </div>
diff --git a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
index f146975c2..a289bf06d 100644
--- a/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
+++ b/UI/Templates/SchedulerUI/UIxCalViewPrint.wox
@@ -22,13 +22,13 @@
     <table class="frame">
       <tr>
         <td style="width: 30%;">
-          <label id="labelTitle"><var:string label:value="Title:" /></label></td>
+          <label id="labelTitle"><var:string label:value="Title" /></label></td>
         <td>
           <input type="text" id="inputFieldTitle" value="" /></td>
       </tr>
       <tr>
         <td>
-          <label><var:string label:value="Layout:" /></label></td>
+          <label><var:string label:value="Layout" /></label></td>
         <td>
           <var:popup list="printLayoutList" item="item"
           const:id="printLayoutList"
@@ -64,7 +64,7 @@
             <var:string label:value="Custom date range" /></label></td></tr>
       <tr>
         <td id="dateRangeFrom" name="dateRange">
-          <label id="labelFrom"><var:string label:value="From:" /></label>
+          <label id="labelFrom"><var:string label:value="From" /></label>
           <var:component className="UIxDatePicker"
           const:dateID="startingDate"
           day="startDay"
@@ -73,7 +73,7 @@
           label:label="Select starting date"/></td></tr>
       <tr>
         <td id="dateRangeTo" name="dateRange">
-          <label id="labelTo"><var:string label:value="To:" /></label>
+          <label id="labelTo"><var:string label:value="To" /></label>
           <var:component className="UIxDatePicker"
           const:dateID="endingDate"
           day="endDay"
diff --git a/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox b/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
new file mode 100644
index 000000000..906f04f64
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxCalendarFolderLinksTemplate.wox
@@ -0,0 +1,76 @@
+<?xml version="1.0" standalone="yes"?>
+<!DOCTYPE container>
+<container
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label"
+    >
+
+  <md-dialog flex="40">
+    <md-toolbar class="sg-padded">
+      <div class="md-toolbar-tools">
+        <div class="pseudo-input-container md-flex">
+          <label class="pseudo-input-label"><var:string label:value="Links to this Calendar"/></label>
+          <div class="pseudo-input-field sg-md-title"><var:string value="calendar.displayName"/></div>
+        </div>
+        <md-button class="md-icon-button" ng-click="close()">
+          <md-icon aria-label="Close dialog">close</md-icon>
+        </md-button>
+      </div>
+    </md-toolbar>
+
+    <md-dialog-content>
+      <div  layout="column" layout-padding="layout-padding">
+
+        <div layout="column" layout-padding="layout-padding">
+
+          <var:if condition="isWebCalendar">
+            <md-input-container>
+              <label><var:string label:value="URL"/></label>
+              <input var:value="webCalendarURL" ng-readonly="true"/>
+            </md-input-container>
+          </var:if>
+          <var:if condition="isWebCalendar" const:negate="YES">
+            <div class="sg-md-title"><var:string label:value="Authenticated User Access"/></div>
+
+            <md-input-container>
+              <label><var:string label:value="CalDAV URL"/></label>
+              <input var:value="calDavURL" ng-readonly="true"/>
+            </md-input-container>
+            <md-input-container>
+              <label><var:string label:value="WebDAV ICS URL"/></label>
+              <input var:value="webDavICSURL" ng-readonly="true"/>
+            </md-input-container>
+            <md-input-container>
+              <label><var:string label:value="WebDAV XML URL"/></label>
+              <input var:value="webDavXMLURL" ng-readonly="true"/>
+            </md-input-container>
+          </var:if>
+        </div>
+
+        <var:if condition="isPublicAccessEnabled">
+          <var:if condition="isWebCalendar" const:negate="YES">
+            <div layout="column" layout-padding="layout-padding">
+              <div class="sg-md-title"><var:string label:value="Public Access"/></div>
+              <md-input-container>
+                <label><var:string label:value="CalDAV URL"/></label>
+                <input var:value="publicCalDavURL" ng-readonly="true"/>
+              </md-input-container>
+              <md-input-container>
+                <label><var:string label:value="WebDAV ICS URL"/></label>
+                <input var:value="publicWebDavICSURL" ng-readonly="true"/>
+              </md-input-container>
+              <md-input-container>
+                <label><var:string label:value="WebDAV XML URL"/></label>
+                <input var:value="publicWebDavXMLURL" ng-readonly="true"/>
+              </md-input-container>
+            </div>
+          </var:if>
+        </var:if>
+      </div>
+
+    </md-dialog-content>
+  </md-dialog>
+
+</container>
diff --git a/UI/Templates/SchedulerUI/UIxComponentEditor.wox b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
index 51b089e80..f8e79b860 100644
--- a/UI/Templates/SchedulerUI/UIxComponentEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxComponentEditor.wox
@@ -40,54 +40,54 @@
 
   <form var:href="saveURL" name="editform">
     <div id="eventView">
-      <label><var:string label:value="Title:" /><span class="content"
+      <label><var:string label:value="Title" /><span class="content"
           ><input type="text" name="summary" id="summary"
             class="textField"
             var:value="title"
             /></span></label>
-      <label><var:string label:value="Location:" /><span class="content"
+      <label><var:string label:value="Location" /><span class="content"
           ><input type="text" name="location" id="location"
             class="textField"
             var:value="location"
             /></span></label>
-      <span class="checkBoxList"><var:string label:value="Category:" />
+      <span class="checkBoxList"><var:string label:value="Category" />
         <span class="content"><var:popup const:id="categoryList"
 	    list="categoryList" item="item"
             label:noSelectionString="category_none"
             string="item" selection="category"
-            /> <var:string label:value="Calendar:" />
+            /> <var:string label:value="Calendar" />
           <var:popup const:id="calendarList"
 	    var:disabled="isChildOccurence"
 	    list="calendarList" item="item"
             string="calendarDisplayName"
 	    var:selection="componentCalendar"
 	    /></span></span>
-      <span class="checkBoxList"><var:string label:value="Priority:" />
+      <span class="checkBoxList"><var:string label:value="Priority" />
          <span class="content"><var:popup const:id="priorityList" list="priorities" item="item"
             label:noSelectionString="prio_0"
             string="itemPriorityText" selection="priority"/>
       </span></span>
       <var:if condition="hasOrganizer"
-	><label id="organizerLabel"><var:string label:value="Organizer:"
+	><label id="organizerLabel"><var:string label:value="Organizer"
 	    /><span class="content"><a var:href="organizer.email" var:email="organizer.email.rfc822Email"
               ><var:string value="organizerName" /></a
               ></span></label>
       </var:if>
       <var:if condition="hasCreatedBy"
-	><label id="createdByLabel"><var:string label:value="Created by:"
+	><label id="createdByLabel"><var:string label:value="Created by"
 	    /><span class="content"><a var:href="createdByLink" var:email="createdBy"
 	      ><var:string value="createdByName" /></a
 	      ></span></label>
       </var:if>
       <!--<var:if condition="canBeOrganizer"
-	><label id="organizerListLabel"><var:string label:value="Organizer:"
+	><label id="organizerListLabel"><var:string label:value="Organizer"
 	    /><span class="content"><var:popup list="organizerList"
 	      item="item" string="itemOrganizerText"
 	      var:selection="organizerIdentity"/>
 	  </span></label></var:if>-->
       <var:component-content />
       <hr />
-      <label><var:string label:value="Repeat:" />
+      <label><var:string label:value="Repeat" />
        <span class="content"><var:popup list="repeatList" item="item"
           label:noSelectionString="repeat_NEVER"
 	  var:disabled="isChildOccurence"
@@ -98,7 +98,7 @@
           /> <a href="#" id="repeatHref" style="display: none;"
              ><var:string label:value="Edit"/></a></span></label>
       <hr />
-      <label><var:string label:value="Reminder:" />
+      <label><var:string label:value="Reminder" />
       <span class="content"><var:popup list="reminderList" item="item"
          const:disabledValue="-"
          label:noSelectionString="reminder_NONE"
@@ -108,9 +108,9 @@
          /> <a href="#" id="reminderHref" style="display: none;"
              ><var:string label:value="Edit"/></a></span></label>
       <hr />
-      <label id="commentArea"><var:string label:value="Description:"
+      <label id="commentArea"><var:string label:value="Description"
 	  /><span class="content"><textarea rows="20" name="comment" var:value="comment" /></span></label>
-      <label id="documentLabel" style="display: none;"><var:string label:value="Document:"
+      <label id="documentLabel" style="display: none;"><var:string label:value="Document"
 	  /><span class="content"
 	  ><a href="#" id="documentHref"><!-- space --></a
 	    ><a id="changeAttachButton" class="button" var:href="#"
@@ -190,45 +190,45 @@
   <div id="eventView">
     <label class="calendarName"><var:string var:value="componentCalendarName" /></label>
     <div id="generalDiv">
-    <label class="title titleNoSpace"><var:string label:value="General:" />
+    <label class="title titleNoSpace"><var:string label:value="General" />
       <span class="content headerContent"><!-- line --></span>
     </label>
-  <label><var:string label:value="Title:" />
+  <label><var:string label:value="Title" />
     <span class="content"><var:string var:value="title"/></span>
   </label>
   <var:if condition="hasLocation">
-    <label><var:string label:value="Location:" />
+    <label><var:string label:value="Location" />
       <span class="content"><var:string var:value="location" /></span>
     </label>
   </var:if>
   <var:if condition="hasCategory">
-    <label><var:string label:value="Category:" />
+    <label><var:string label:value="Category" />
       <span class="content"><var:string var:value="category" /></span>
     </label>
   </var:if>
   <var:if condition="hasPriority">
-    <label><var:string label:value="Priority:" />
+    <label><var:string label:value="Priority" />
       <span class="content"><var:string var:value="priority"/></span>
     </label>
   </var:if>
   <var:component-content />
   <var:if condition="hasRepeat">
-    <label><var:string label:value="Repeat:" />
+    <label><var:string label:value="Repeat" />
       <span class="content"><var:string var:value="repeatLabel" /></span>
     </label>
   </var:if>
-  <label id="documentLabel" style="display: none;"><var:string label:value="Document:" />
+  <label id="documentLabel" style="display: none;"><var:string label:value="Document" />
     <span class="content"><a href="#" id="documentHref"><!-- space --></a></span>
   </label>
   <var:if condition="hasAttendees">
-    <label id="organizerLabel"><var:string label:value="Organizer:"/>
+    <label id="organizerLabel"><var:string label:value="Organizer"/>
     <span class="content"><a var:href="organizer.email" var:email="organizer.email.rfc822Email"
       ><var:string value="organizerName" /></a
     ></span>
     </label>
   </var:if>
   <var:if condition="hasCreatedBy">
-    <label id="createdByLabel"><var:string label:value="Created by:"/>
+    <label id="createdByLabel"><var:string label:value="Created by"/>
     <span class="content"><a var:href="createdBy" var:email="createdBy"
       ><var:string value="createdByName" /></a
     ></span>
@@ -238,7 +238,7 @@
   <var:if condition="userHasRSVP">
     <form var:href="rsvpURL" name="rsvpform">
 
-    <label><var:string label:value="Reply:" />
+    <label><var:string label:value="Reply" />
       <span class="content"><var:popup list="replyList" item="item"
           const:name="replyList"
           const:id="replyList"
@@ -276,7 +276,7 @@
 	    id="reminderEmailAttendees"
 	    var:value="reminderEmailAttendees"/>
     
-    <label><var:string label:value="Reminder:" />
+    <label><var:string label:value="Reminder" />
     <span class="content"><var:popup list="reminderList" item="item"
          const:disabledValue="-"
          label:noSelectionString="reminder_NONE"
@@ -290,7 +290,7 @@
     </div>
     <var:if condition="hasAttendees">
     <div id="attendeesDiv">
-      <label class="title"><var:string label:value="Attendees:" />
+      <label class="title"><var:string label:value="Attendees" />
         <span class="content headerContent"><!-- line --></span>
       </label>
       <label id="attendeesLabel">
@@ -310,7 +310,7 @@
     </var:if>
     <var:if condition="hasComment">
       <div id="descriptionDiv">
-        <label class="title"><var:string label:value="Description:" />
+        <label class="title"><var:string label:value="Description" />
           <span class="content headerContent"><!-- line --></span>
         </label>
         <label><span class="content">
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditor.wox b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
index 770713cd0..2e80404eb 100644
--- a/UI/Templates/SchedulerUI/UIxTaskEditor.wox
+++ b/UI/Templates/SchedulerUI/UIxTaskEditor.wox
@@ -14,7 +14,7 @@
   var:saveURL="saveURL">
 
   <var:if condition="eventIsReadOnly" const:negate="YES">
-  <span class="checkBoxList"><var:string label:value="Start:" />
+  <span class="checkBoxList"><var:string label:value="Start" />
     <span class="content"><input var:checked="hasStartDate"
 	id="startDateCB" type="checkbox" class="checkBox"
 	onchange="onTimeControlCheck(this);"
@@ -25,7 +25,7 @@
 	const:dayStartHour="0"
 	const:dayEndHour="23"
 	/></span></span>
-  <span class="checkBoxList"><var:string label:value="Due Date:" />
+  <span class="checkBoxList"><var:string label:value="Due Date" />
     <span class="content"><input var:checked="hasDueDate"
 	id="dueDateCB" type="checkbox" class="checkBox"
 	onchange="onTimeControlCheck(this);"
@@ -36,7 +36,7 @@
 	const:dayStartHour="0"
 	const:dayEndHour="23"
 	/></span></span>
-  <span class="checkBoxList"><var:string label:value="Status:" />
+  <span class="checkBoxList"><var:string label:value="Status" />
     <span class="content"><var:popup list="statusList" item="item"
 	const:id="statusList"
         label:noSelectionString="status_NOT-SPECIFIED"
@@ -58,16 +58,16 @@
   </var:if>
   <var:if condition="eventIsReadOnly">
   <var:if condition="hasStartDate">
-  <label><var:string label:value="Start:" />
+  <label><var:string label:value="Start" />
     <span class="content"><var:string var:value="taskStartDateTimeText" /></span>
   </label>
   </var:if>
   <var:if condition="hasDueDate">
-  <label><var:string label:value="Due Date:" />
+  <label><var:string label:value="Due Date" />
     <span class="content"><var:string var:value="taskDueDateTimeText" /></span>
   </label>
   </var:if>
-  <span class="checkBoxList"><var:string label:value="Status:" />
+  <span class="checkBoxList"><var:string label:value="Status" />
     <span class="content"><var:string var:value="itemStatusText"
         /><var:if condition="statusDateDisabled" const:negate="YES"> <var:string var:value="statusDateText"/></var:if
 	><var:if condition="statusPercentDisabled" const:negate="YES"> (<var:string var:value="statusPercent"/> <var:string label:value="% complete"/>)</var:if>
diff --git a/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
new file mode 100644
index 000000000..2ebdc59c7
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
@@ -0,0 +1,215 @@
+<?xml version='1.0' standalone='yes'?>
+<container
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label">
+  <md-dialog flex="60">
+    <form name="eventForm" ng-submit="editor.save(eventForm)">
+      <md-toolbar class="md-padding" ng-class="editor.component.getClassName('bg')">
+        <div class="md-toolbar-tools">
+          <!-- summary -->
+          <md-icon ng-if="editor.component.classification == 'confidential'">visibility_off</md-icon>
+          <md-icon ng-if="editor.component.classification == 'private'">vpn_key</md-icon>
+          <md-input-container md-no-float="true">
+            <input type="text"
+                   class="md-title"
+                   label:placeholder="Title"
+                   ng-model="editor.component.summary"/>
+          </md-input-container>
+          <md-button class="md-icon-button" ng-click="editor.cancel()">
+            <md-icon aria-label="Close dialog">close</md-icon>
+          </md-button>
+        </div>
+      </md-toolbar>
+    <md-dialog-content>
+      <!-- location -->
+      <md-input-container>
+        <label><var:string label:value="Location"/></label>
+        <input type="text" ng-model="editor.component.location"/>
+      </md-input-container>
+      <!-- categories -->
+      <md-chips ng-model="editor.component.categories">
+        <md-autocomplete
+            md-selected-item="editor.categories.selected"
+            md-search-text="editor.categories.searchText"
+            md-items="category in editor.component.constructor.filterCategories(editor.categories.searchText)"
+            label:placeholder="Add a category">
+          <span md-highlight-text="editor.categories.searchText">{{category}}</span>
+        </md-autocomplete>
+      </md-chips>
+      <!-- calendar -->
+      <md-input-container>
+        <label><var:string label:value="Calendar"/></label>
+        <md-select ng-model="editor.component.destinationCalendar">
+          <md-option ng-repeat="calendar in ::editor.calendars"
+                     ng-value="calendar.id">{{calendar.name}}</md-option>
+        </md-select>
+      </md-input-container>
+      <!-- classification -->
+      <md-radio-group layout="row" layout-align="space-around center"
+                      ng-model="editor.component.classification">
+        <md-radio-button value="public">
+          <var:string label:value="label_Public"/>
+        </md-radio-button>
+        <md-radio-button value="confidential">
+          <var:string label:value="label_Confidential"/>
+        </md-radio-button>
+        <md-radio-button value="private">
+          <var:string label:value="label_Private"/>
+        </md-radio-button>
+      </md-radio-group>
+      <!-- priority -->
+      <div layout="row" layout-align="center center">
+        <div flex="20"><var:string label:value="Priority"/></div>
+        <md-slider class="md-flex"
+                   md-discrete="true"
+                   ng-model="editor.component.priority"
+                   step="1"
+                   min="0"
+                   max="9"
+                   label:aria-label="Priority"><!-- slider --></md-slider>
+      </div>
+      <!-- is all day -->
+      <md-checkbox
+          ng-model="editor.component.isAllDay"
+          ng-true-value="1"
+          ng-false-value="0"
+          label:aria-label="All day Event">
+        <var:string label:value="All day Event"/>
+      </md-checkbox>
+      <!-- start + end -->
+      <div layout="row">
+        <md-input-container>
+          <label><var:string label:value="Start"/></label>
+          <input type="text" ng-model="editor.component.startDate"/>
+        </md-input-container>
+        <md-input-container>
+          <label><var:string label:value="Due"/></label>
+          <input type="text" ng-model="editor.component.dueDate"/>
+        </md-input-container>
+      </div>
+      <!-- status -->
+      <div layout="row">
+        <md-input-container flex="50">
+          <label><var:string label:value="Status"/></label>
+          <md-select ng-model="editor.component.status">
+            <var:foreach list="statusList" item="item">
+              <md-option var:value="item"><var:string value="itemStatusText"/></md-option>
+            </var:foreach>
+          </md-select>
+        </md-input-container>
+        <md-input-container ng-show="editor.component.status == 'completed'">
+          <label><var:string label:value="status_COMPLETED"/></label>
+          <input type="text" ng-model="editor.component.completedDate"/>
+        </md-input-container>
+      </div>
+      <div layout="row" layout-align="center center"
+           ng-show="editor.component.enablePercentComplete()">
+        <md-slider class="md-flex"
+                   md-discrete="true"
+                   ng-model="editor.component.percentComplete"
+                   step="5"
+                   min="0"
+                   max="100"
+                   label:aria-label="% complete"><!-- slider --></md-slider>
+        <div flex="30">{{editor.component.percentComplete}} <var:string label:value="% complete"/></div>
+      </div>
+      <!-- attach urls -->
+      <div class="attr" ng-repeat="attach in editor.component.attachUrls">
+        <div layout="row" layout-align="center end">
+          <md-input-container>
+            <label>
+              <var:string label:value="URL"/>
+            </label>
+            <input type="text" ng-model="attach.value"
+                   sg-focus-on="attachUrl_{{$index}}"/>
+          </md-input-container>
+          <md-button class="sg-icon-button" type="button" ng-click="editor.component.deleteAttachUrl($index)">
+            <md-icon>remove_circle</md-icon>
+          </md-button>
+        </div>
+      </div>
+      <div class="md-layout-margin" layout="row" layout-align="start center">
+        <md-button class="sg-icon-button" type="button" ng-click="editor.addAttachUrl($event)">
+          <md-icon>add_circle</md-icon>
+        </md-button>
+        <label class="button-label">
+          <var:string label:value="Attach"/>
+        </label>
+      </div>
+      <!-- comment -->
+      <md-input-container>
+        <label><var:string label:value="Description"/></label>
+        <textarea ng-model="editor.component.comment"><!-- comment --></textarea>
+      </md-input-container>
+      <!-- repeat -->
+      <div layout="row" layout-align="start end">
+        <div class="md-flex">
+          <md-input-container>
+            <label><var:string label:value="Repeat"/></label>
+            <md-select class="pseudo-input-field" ng-model="editor.component.repeat.frequency">
+              <var:foreach list="repeatList" item="item">
+                <md-option var:value="item"><var:string var:value="itemRepeatText"/></md-option>
+              </var:foreach>
+            </md-select>
+          </md-input-container>
+        </div>
+        <md-button type="button" class="sg-icon-button"
+                   label:aria-label="repeat_CUSTOM"
+                   ng-show="editor.component.repeat.frequency != 'never'"
+                   ng-click="editor.toggleRecurrenceEditor()">
+          <md-icon ng-class="{'icon-more-horiz': !editor.showRecurrenceEditor,
+                              'icon-clear': editor.showRecurrenceEditor}"><!-- toggle custom rule --></md-icon>
+        </md-button>
+      </div>
+      <div ng-show="editor.showRecurrenceEditor" class="sg-subcontent">
+        <var:component className="UIxRecurrenceEditor" />
+      </div>
+      <!-- end repeat -->
+      <div layout="row" layout-align="start end">
+        <div ng-show="editor.component.repeat.frequency != 'never'">
+          <md-input-container>
+            <label><var:string label:value="End Repeat"/></label>
+            <md-select class="pseudo-input-field" ng-model="editor.component.repeat.end">
+              <md-option value="never"><var:string label:value="Never"/></md-option>
+              <md-option value="count"><var:string label:value="After"/></md-option>
+              <md-option value="until"><var:string label:value="On Date"/></md-option>
+            </md-select>
+          </md-input-container>
+        </div>
+        <div layout="row" layout-align="start center" ng-show="editor.component.repeat.end == 'count'">
+          <md-input-container class="md-input-number">
+            <input type="number" label:aria-label="times" ng-model="editor.component.repeat.count"/>
+          </md-input-container>
+          <var:string label:value="times"/>
+        </div>
+        <md-input-container ng-show="editor.component.repeat.end == 'until'">
+          <input type="date" label:aria-label="Repeat until" ng-model="editor.component.repeat.until"/>
+        </md-input-container>
+      </div>
+      <!-- reminder -->
+      <md-checkbox ng-model="editor.component.$hasAlarm"
+                   label:aria-label="Reminder">
+        <var:string label:value="Reminder"/>
+      </md-checkbox>
+      <div class="sg-subcontent"
+           ng-show="editor.component.$hasAlarm">
+        <var:component className="UIxReminderEditor" />
+      </div>
+    </md-dialog-content>
+    <!-- cancel/reset/save -->
+    <div class="md-actions">
+      <md-button type="button" ng-click="editor.cancel()">
+        <var:string label:value="Cancel"/>
+      </md-button>
+      <md-button type="button" ng-click="editor.component.$reset()">
+        <var:string label:value="Reset"/>
+      </md-button>
+      <md-button class="md-primary md-hue-3" type="submit">
+        <var:string label:value="Save"/>
+      </md-button>
+    </div>
+  </form>
+</md-dialog>
+</container>
diff --git a/UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox b/UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox
new file mode 100644
index 000000000..9c65096dc
--- /dev/null
+++ b/UI/Templates/SchedulerUI/UIxTaskViewTemplate.wox
@@ -0,0 +1,103 @@
+<?xml version='1.0' standalone='yes'?>
+<container
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:label="OGo:label">
+  <md-dialog flex="40">
+    <md-toolbar class="md-padding" ng-class="viewer.component.getClassName('bg')">
+      <div class="md-toolbar-tools">
+        <md-icon class="material-icons sg-icon-toolbar-bg">assignment_turned_in</md-icon>
+        <h2 class="md-flex">
+          <!-- classification -->
+          <md-icon ng-if="viewer.component.classification == 'confidential'">visibility_off</md-icon>
+          <md-icon ng-if="viewer.component.classification == 'private'">vpn_key</md-icon>
+          <!-- summary -->
+          {{viewer.component.summary}}
+          <!-- priority -->
+          <md-icon ng-repeat="i in viewer.component.priority | range">star</md-icon>
+        </h2>
+        <md-button class="md-icon-button" ng-click="viewer.close()">
+          <md-icon aria-label="Close dialog">close</md-icon>
+        </md-button>
+      </div>
+    </md-toolbar>
+    <md-dialog-content>
+      <md-list>
+        <!-- categories -->
+        <md-list-item ng-show="viewer.component.categories.length > 0">
+          <md-chips ng-model="viewer.component.categories" readonly="true">
+            <md-chip-template>
+              <span>{{$chip}}</span>
+            </md-chip-template>
+          </md-chips>
+        </md-list-item>
+        <!-- location -->
+        <md-list-item ng-show="viewer.component.location">
+          <md-icon>place</md-icon>
+          <p>{{viewer.component.location}}</p>
+        </md-list-item>
+        <!-- calendar -->
+        <md-list-item>
+          <md-icon>event</md-icon>
+          <p>{{viewer.component.calendar}}</p>
+        </md-list-item>
+        <!-- start/due dates -->
+        <md-list-item class="md-2-line">
+          <md-icon>access_time</md-icon>
+          <div layout="row" class="md-flex">
+            <div class="md-list-item-text" ng-show="viewer.component.startDate">
+              <p><var:string label:value="Start"/></p>
+              <h3>
+                {{viewer.component.localizedStartDate}}
+                <span ng-hide="viewer.component.isAllDay"> {{viewer.component.localizedStartTime}}</span>
+              </h3>
+            </div>
+            <div class="md-list-item-text" ng-show="viewer.component.dueDate">
+              <p><var:string label:value="Due Date"/></p>
+              <h3>
+                {{viewer.component.localizedDueDate}}
+                <span ng-hide="viewer.component.isAllDay">{{viewer.component.localizedDueTime}}</span>
+              </h3>
+            </div>
+          </div>
+        </md-list-item>
+        <!-- status -->
+        <md-list-item ng-show="viewer.component.status == 'completed'">
+          <md-icon>check</md-icon>
+          <p>{{viewer.component.localizedCompletedDate}} {{viewer.component.localizedCompletedTime}}</p>
+        </md-list-item>
+        <md-list-item ng-show="viewer.component.enablePercentComplete()">
+          <md-icon>call_made</md-icon>
+          <p>{{viewer.component.percentComplete}} %</p>
+        </md-list-item>
+        <!-- attach urls -->
+        <md-list-item ng-show="viewer.component.attachUrls.length > 0">
+          <md-icon>link</md-icon>
+          <p ng-repeat="url in viewer.component.attachUrls"><a ng-href="url.value">{{url.value}}</a></p>
+        </md-list-item>
+        <!-- comment -->
+        <md-list-item ng-show="viewer.component.comment">
+          <md-icon>mode_comment</md-icon>
+          <p>{{viewer.component.comment}}</p>
+        </md-list-item>
+        <!-- repeat -->
+        <md-list-item ng-show="viewer.component.repeat">
+          <md-icon>repeat</md-icon>
+          <p><!-- viewer.component.repeat.toString() --></p>
+        </md-list-item>
+        <!-- reminder -->
+        <md-list-item ng-show="viewer.component.$hasAlarm">
+          <md-icon>alarm</md-icon>
+          <p><!-- viewer.component.alarm.toString() --></p>
+        </md-list-item>
+      </md-list>
+    </md-dialog-content>
+    <!-- edit -->
+    <div class="md-actions">
+      <md-button ng-click="viewer.edit()">
+        <var:string label:value="Edit"/>
+      </md-button>
+    </div>
+  </md-dialog>
+</container>