diff --git a/SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings b/SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings
index 9b669217e..08a944f16 100644
--- a/SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings
+++ b/SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings
@@ -35,9 +35,9 @@ vtodo_class2 = "(Gizli görev)";
 = "%{Organizer} %{SentByText}şu etkinliği iptal etti: %{Summary}.\n\nBaşlangıç: %{StartDate} saat %{StartTime}\nBitiş: %{EndDate} saat %{EndTime}\nTanım: %{Description}";
 /* Update */
 "The appointment \"%{Summary}\" for the %{OldStartDate} has changed"
-= "\"%{Summary}\" isimli, %{OldStartDate} tarihli çalışma değişti";
+= "%{OldStartDate} tarihindeki \"%{Summary}\" çalışması değişti";
 "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
-= "\"%{Summary}\" isimli, %{OldStartDate} tarihli ve %{OldStartTime} saatli çalışma değişti";
+= " %{OldStartDate} tarihli ve %{OldStartTime} başlangıç saatli \"%{Summary}\" çalışması değişti";
 "The following parameters have changed in the \"%{Summary}\" meeting:"
 = "\"%{Summary}\" buluşmasının şu özellikleri değişti:";
 "Please accept or decline those changes."
@@ -45,16 +45,16 @@ vtodo_class2 = "(Gizli görev)";
 /* Reply */
 "Accepted invitation: \"%{Summary}\"" = "Davet kabul edilidi: \"%{Summary}\"";
 "Declined invitation: \"%{Summary}\"" = "Davet Geri Çevrildi: \"%{Summary}\"";
-"Delegated invitation: \"%{Summary}\"" = "Temsilci atanmış davet: \"%{Summary}\"";
+"Delegated invitation: \"%{Summary}\"" = "Vekalet edilen davet: \"%{Summary}\"";
 "Not yet decided on invitation: \"%{Summary}\"" = "Davet hakkında henüz karar verilmedi: \"%{Summary}\"";
 "%{Attendee} %{SentByText}has accepted your event invitation."
 = "%{Attendee} %{SentByText}etkinlik davetinizi kabul etti.";
 "%{Attendee} %{SentByText}has declined your event invitation."
 = "%{Attendee} %{SentByText}davetinizi reddetti.";
 "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}."
-= "%{Attendee} %{SentByText} davete temsilci atadı: %{Delegate} ";
+= "%{Attendee} %{SentByText} tarafından %{Delegate} davete vekil olarak atadı.";
 "%{Attendee} %{SentByText}has not yet decided upon your event invitation."
 = "%{Attendee} %{SentByText}henüz etkinlik davetinizle ilgili kararını vermedi.";
 /* Resources */
 "Cannot access resource: \"%{Cn} %{SystemEmail}\"" = "Kaynağa ulaşılamıyor: \"%{Cn} %{SystemEmail}\"";
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "\"%{Cn} %{SystemEmail}\" kanağı için maksimum eşzamanlı kayıt adedine (%{NumberOfSimultaneousBookings}) ulaşıldı. Çakışan  \"%{EventTitle}\" etkinlik, %{StartDate} tarihinde başlıyor.";
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\". The conflicting event is \"%{EventTitle}\", and starts on %{StartDate}." = "\"%{Cn} %{SystemEmail}\" kaynağı için maksimum eşzamanlı kayıt adedine (%{NumberOfSimultaneousBookings}) ulaşıldı. Çakışan  \"%{EventTitle}\" etkinlik, %{StartDate} tarihinde başlıyor.";
diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings
index e7107095b..35dcfd958 100644
--- a/UI/Common/English.lproj/Localizable.strings
+++ b/UI/Common/English.lproj/Localizable.strings
@@ -69,14 +69,6 @@
 "delegate is organizer" = "The delegate is the organizer. Please specify a different delegate.";
 "delegate is a participant" = "The delegate is already a participant.";
 "delegate is a group" = "The specified address corresponds to a group. You can only delegate to a unique person.";
-"Snooze for " = "Snooze for ";
-"5 minutes" = "5 minutes";
-"10 minutes" = "10 minutes";
-"15 minutes" = "15 minutes";
-"30 minutes" = "30 minutes";
-"45 minutes" = "45 minutes";
-"1 hour" = "1 hour";
-"1 day" = "1 day";
 
 /* common buttons */
 "OK" = "OK";
@@ -89,6 +81,15 @@
 "Start" = "Start";
 "Due Date" = "Due Date";
 "Location" = "Location";
+"Snooze" = "Snooze";
+"Snooze for " = "Snooze for ";
+"5 minutes" = "5 minutes";
+"10 minutes" = "10 minutes";
+"15 minutes" = "15 minutes";
+"30 minutes" = "30 minutes";
+"45 minutes" = "45 minutes";
+"1 hour" = "1 hour";
+"1 day" = "1 day";
 
 /* mail labels */
 "Important" = "Important";
@@ -118,9 +119,12 @@
 /* Authentication failed */
 "Wrong username or password." = "Wrong username or password.";
 
-/* Error message display bellow search field when the search string has less than the required number of characters */
+/* Error message displayed bellow search field when the search string has less than the required number of characters */
 "Enter at least %{minimumSearchLength} characters" = "Enter at least %{minimumSearchLength} characters";
 
+/* Error message displayed when a file upload exceeds WOMaxUploadSize */
+"File size upload limit reached" = "File size upload limit reached";
+
 /* Toggle visibility (ex: mail account in left navigation menu) */
 "Toggle visibility" = "Toggle visibility";
 
diff --git a/UI/Common/French.lproj/Localizable.strings b/UI/Common/French.lproj/Localizable.strings
index 50486f738..5721bef96 100644
--- a/UI/Common/French.lproj/Localizable.strings
+++ b/UI/Common/French.lproj/Localizable.strings
@@ -69,14 +69,6 @@
 "delegate is organizer" = "L'adresse spécifiée correspond à l'organisateur. Veuillez entrer un autre délégué.";
 "delegate is a participant" = "Le délégué est déjà un participant.";
 "delegate is a group" = "L'adresse spécifiée correspond à un groupe. Vous ne pouvez déléguer qu'à une personne.";
-"Snooze for " = "Rappel dans ";
-"5 minutes" = "5 minutes";
-"10 minutes" = "10 minutes";
-"15 minutes" = "15 minutes";
-"30 minutes" = "30 minutes";
-"45 minutes" = "45 minutes";
-"1 hour" = "1 heure";
-"1 day" = "1 jour";
 
 /* common buttons */
 "OK" = "OK";
@@ -89,6 +81,15 @@
 "Start" = "Début";
 "Due Date" = "Échéance";
 "Location" = "Lieu";
+"Snooze" = "Rappel";
+"Snooze for " = "Rappel dans ";
+"5 minutes" = "5 minutes";
+"10 minutes" = "10 minutes";
+"15 minutes" = "15 minutes";
+"30 minutes" = "30 minutes";
+"45 minutes" = "45 minutes";
+"1 hour" = "1 heure";
+"1 day" = "1 jour";
 
 /* mail labels */
 "Important" = "Important";
@@ -118,18 +119,27 @@
 /* Authentication failed */
 "Wrong username or password." = "Mauvais nom d'utilisateur ou mot de passe.";
 
-/* Error message display bellow search field when the search string has less than the required number of characters */
+/* Error message displayed bellow search field when the search string has less than the required number of characters */
 "Enter at least %{minimumSearchLength} characters" = "Entrez au moins %{minimumSearchLength} caractères";
 
+/* Error message displayed when a file upload exceeds WOMaxUploadSize */
+"File size upload limit reached" = "Le fichier dépasse la taille limite permise";
+
 /* Toggle visibility (ex: mail account in left navigation menu) */
 "Toggle visibility" = "Basculer l'affichage";
 
+/* Toggle multiple items at the same time (hotkeys cheatsheet) */
+"Toggle range of items" = "Basculer l'étendue des éléments";
+
 /* Question mark shows list of hotkeys */
 "Show or hide this help" = "Afficher ou cache cette aide";
 
 /* Space key */
 "key_space" = "espace";
 
+/* Shift and space key */
+"key_shift+space" = "maj. + espace";
+
 /* Up arrow key */
 "key_up" = "↑";
 
diff --git a/UI/Common/German.lproj/Localizable.strings b/UI/Common/German.lproj/Localizable.strings
index 598903d15..064bbf723 100644
--- a/UI/Common/German.lproj/Localizable.strings
+++ b/UI/Common/German.lproj/Localizable.strings
@@ -69,14 +69,6 @@
 "delegate is organizer" = "Der Vertreter ist der Organisator. Bitte einen anderen Vertreter angeben.";
 "delegate is a participant" = "Der Vertreter ist bereits ein Teilnehmer.";
 "delegate is a group" = "Die angegebene Adresse gehört einer Gruppe. Es kann nur an eine einzelne Person delegiert werden.";
-"Snooze for " = "Erneut erinnern nach ";
-"5 minutes" = "5 Minuten";
-"10 minutes" = "10 Minuten";
-"15 minutes" = "15 Minuten";
-"30 minutes" = "30 Minuten";
-"45 minutes" = "45 Minuten";
-"1 hour" = "1 Stunde";
-"1 day" = "1 Tag";
 
 /* common buttons */
 "OK" = "OK";
@@ -89,6 +81,15 @@
 "Start" = "Beginn";
 "Due Date" = "Fällig";
 "Location" = "Ort";
+"Snooze" = "Erneut erinnern";
+"Snooze for " = "Erneut erinnern nach ";
+"5 minutes" = "5 Minuten";
+"10 minutes" = "10 Minuten";
+"15 minutes" = "15 Minuten";
+"30 minutes" = "30 Minuten";
+"45 minutes" = "45 Minuten";
+"1 hour" = "1 Stunde";
+"1 day" = "1 Tag";
 
 /* mail labels */
 "Important" = "Wichtig";
@@ -118,18 +119,27 @@
 /* Authentication failed */
 "Wrong username or password." = "Falscher Benutzername oder falsches Passwort";
 
-/* Error message display bellow search field when the search string has less than the required number of characters */
+/* Error message displayed bellow search field when the search string has less than the required number of characters */
 "Enter at least %{minimumSearchLength} characters" = "Mindestens %{minimumSearchLength} Zeichen eingeben";
 
+/* Error message displayed when a file upload exceeds WOMaxUploadSize */
+"File size upload limit reached" = "Maximale Dateigröße für das Hochladen erreicht";
+
 /* Toggle visibility (ex: mail account in left navigation menu) */
 "Toggle visibility" = "Sichtbarkeit umschalten";
 
+/* Toggle multiple items at the same time (hotkeys cheatsheet) */
+"Toggle range of items" = "Mehrere Punkte umschalten";
+
 /* Question mark shows list of hotkeys */
 "Show or hide this help" = "Diese Hilfe anzeigen oder ausblenden";
 
 /* Space key */
 "key_space" = "space";
 
+/* Shift and space key */
+"key_shift+space" = "Umschalt + Leerzeichen";
+
 /* Up arrow key */
 "key_up" = "↑";
 
diff --git a/UI/Common/Polish.lproj/Localizable.strings b/UI/Common/Polish.lproj/Localizable.strings
index 4c558e041..49b4feabf 100644
--- a/UI/Common/Polish.lproj/Localizable.strings
+++ b/UI/Common/Polish.lproj/Localizable.strings
@@ -69,14 +69,6 @@
 "delegate is organizer" = "Wskazany delegat jest organizatorem. Wskaż innego delegata.";
 "delegate is a participant" = "Delegat jest już uczestnikiem.";
 "delegate is a group" = "Wskazany adres jest grupą. Możesz oddelegować tylko pojedynczną osobę.";
-"Snooze for " = "Drzemka przez ";
-"5 minutes" = "5 minut";
-"10 minutes" = "10 minut";
-"15 minutes" = "15 minut";
-"30 minutes" = "30 minut";
-"45 minutes" = "45 minut";
-"1 hour" = "1 godzinę";
-"1 day" = "1 dzień";
 
 /* common buttons */
 "OK" = "OK";
@@ -89,6 +81,15 @@
 "Start" = "Początek";
 "Due Date" = "Termin";
 "Location" = "Miejsce";
+"Snooze" = "Drzemka";
+"Snooze for " = "Drzemka przez ";
+"5 minutes" = "5 minut";
+"10 minutes" = "10 minut";
+"15 minutes" = "15 minut";
+"30 minutes" = "30 minut";
+"45 minutes" = "45 minut";
+"1 hour" = "1 godzinę";
+"1 day" = "1 dzień";
 
 /* mail labels */
 "Important" = "Ważne";
@@ -118,18 +119,27 @@
 /* Authentication failed */
 "Wrong username or password." = "Zła nazwa użytkownika lub hasło.";
 
-/* Error message display bellow search field when the search string has less than the required number of characters */
+/* Error message displayed bellow search field when the search string has less than the required number of characters */
 "Enter at least %{minimumSearchLength} characters" = "Wprowadź co najmniej %{minimumSearchLength} znaków";
 
+/* Error message displayed when a file upload exceeds WOMaxUploadSize */
+"File size upload limit reached" = "Rozmiar pliku jest większy niż dopuszczalny limit";
+
 /* Toggle visibility (ex: mail account in left navigation menu) */
 "Toggle visibility" = "Odwróć widok";
 
+/* Toggle multiple items at the same time (hotkeys cheatsheet) */
+"Toggle range of items" = "Odwróć wskazany zakres";
+
 /* Question mark shows list of hotkeys */
 "Show or hide this help" = "Pokaż lub ukryj tę podpowiedź";
 
 /* Space key */
 "key_space" = "space";
 
+/* Shift and space key */
+"key_shift+space" = "shift + spacja";
+
 /* Up arrow key */
 "key_up" = "↑";
 
diff --git a/UI/Common/TurkishTurkey.lproj/Localizable.strings b/UI/Common/TurkishTurkey.lproj/Localizable.strings
index c218914cd..1e17c414b 100644
--- a/UI/Common/TurkishTurkey.lproj/Localizable.strings
+++ b/UI/Common/TurkishTurkey.lproj/Localizable.strings
@@ -65,10 +65,10 @@
 = "Bu modül veya sisteme erişim yetkiniz yok. Lütfen, sistem yöneticisiyle iletişime geçin.";
 "You don't have the required privileges to perform the operation."
 = "Bu işlemi gerçekleştirmek için gereken yetkilere sahip değilsiniz.";
-"noEmailForDelegation" = "Davetinize temsilci atayacağınız adresleri belirtmelisiniz.";
-"delegate is organizer" = "Temsilci etkinliği düzenleyen kişidir. Lütfen başka bir temsilci seçin. ";
-"delegate is a participant" = "Temsilci zaten bu etkinliğe katılıyor.";
-"delegate is a group" = "Belirtilen adres bir gruba denk geliyor. Sadece bir kişiyi temsilci atayabilirsiniz.";
+"noEmailForDelegation" = "Davetinize vekil atayacağınız kişinin adresini belirtmelisiniz.";
+"delegate is organizer" = "Vekil edilen kişi etkinliği düzenleyen kişidir. Lütfen başka bir vekil belirleyin edin. ";
+"delegate is a participant" = "Vekil edilen kişi zaten bu etkinliğe katılıyor.";
+"delegate is a group" = "Belirtilen adres bir gruba denk geliyor. Sadece bir kişiyi vekil tayin edebilirsiniz.";
 "Snooze for " = "Beklenecek süre";
 "5 minutes" = "5 dakika";
 "10 minutes" = "10 dakika";
diff --git a/UI/Contacts/Macedonian.lproj/Localizable.strings b/UI/Contacts/Macedonian.lproj/Localizable.strings
index 4793b91b6..4e4b81805 100644
--- a/UI/Contacts/Macedonian.lproj/Localizable.strings
+++ b/UI/Contacts/Macedonian.lproj/Localizable.strings
@@ -246,7 +246,7 @@
 "Add Screen Name" = "Додади прекар";
 "Synchronization" = "Синхронизација";
 "Synchronize" = "Синхронизирај";
-"Sucessfully subscribed to address book" = "Успешно сте претплатени на адресарот";
+"Sucessfully subscribed to address book" = "Успешно се претплативте на адресната книга";
 
 /* Aria label for scope of search on contacts */
 "Search scope" = "Предмет на пребарување";
diff --git a/UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings b/UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings
index 41db6aa9f..d568efde7 100644
--- a/UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings
+++ b/UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings
@@ -1,7 +1,7 @@
 ACCEPTED = "kabul edildi";
 COMPLETED = "tamamlandı";
 DECLINED = "reddedildi";
-DELEGATED = "temsilci atanmış";
+DELEGATED = "yetkilendirildi";
 "IN-PROCESS" = "işleniyor";
 "NEEDS-ACTION" = "eyleme ihtiyaç var";
 TENTATIVE = "geçici";
@@ -16,7 +16,7 @@ Appointment = "Çalışma";
 was = "önceden";
 
 Organizer = "Düzenleyen";
-Time = "Süre";
+Time = "Zaman";
 Attendees = "Katılımcılar";
 request_info = "sizi toplantıya katılmaya davet ediyor. ";
 "Add to calendar" = "Takvime ekle";
@@ -25,10 +25,10 @@ request_info = "sizi toplantıya katılmaya davet ediyor. ";
 Accept = "Kabul et";
 Decline = "Reddet";
 Tentative = "Geçici";
-"Delegate ..." = "Temsilci Ata ...";
-"Delegated to" = "Temsilci atanan";
+"Delegate ..." = "Yetkili Ata ...";
+"Delegated to" = "Yetkilendirilen";
 "Update status in calendar" = "Takvimdeki durumu güncelle";
-"delegated from" = "tarafından temsilci atandı";
+"delegated from" = "Yetkilendiren";
 reply_info_no_attendee = "Bir etkinlik programına yanıt aldınız fakat yanıtı gönderen kişi katılımcı değil.";
 reply_info = "Yapmış olduğunuz etkinlik davetinin yanıtıdır.";
 "to" = "alıcı";
diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings
index b0cc629a4..f414ad8a8 100644
--- a/UI/MailerUI/English.lproj/Localizable.strings
+++ b/UI/MailerUI/English.lproj/Localizable.strings
@@ -217,6 +217,12 @@
 /* Message view "more" menu: create a task from message */
 "Convert To Task" = "Convert To Task";
 
+/* Message view "more" menu: download all attachments as a zip archive */
+"Download all attachments" = "Download all attachments";
+
+/* Filename prefix when downloading all attachments as a zip archive */
+"attachments" = "attachments";
+
 "Print..." = "Print...";
 "Delete Message" = "Delete Message";
 "Delete Selected Messages" = "Delete Selected Messages";
@@ -315,6 +321,7 @@
 /* Error when uploading a file attachment */
 "Error while uploading the file \"%{0}\":" = "Error while uploading the file \"%{0}\":";
 "There is an active file upload. Closing the window will interrupt it." = "There is an active file upload. Closing the window will interrupt it.";
+"Message is too big" = "Message is too big";
 
 /* Appears while sending the message */
 "Sending" = "Sending";
diff --git a/UI/MailerUI/Finnish.lproj/Localizable.strings b/UI/MailerUI/Finnish.lproj/Localizable.strings
index 993b248b5..27808d4e7 100644
--- a/UI/MailerUI/Finnish.lproj/Localizable.strings
+++ b/UI/MailerUI/Finnish.lproj/Localizable.strings
@@ -269,6 +269,10 @@
 "quotasFormat" = "%{0}% käytetty %{1} Mt:sta";
 "Unable to move/delete folder." = "Hakemiston siirto/poisto ei onnistu.";
 
+/* Alternative operation when folder cannot be deleted */
+"The mailbox could not be moved to the trash folder. Would you like to delete it immediately?"
+= "Postilaatikon vienti roskakoriin epäonniestui. Haluatko poistaa sen välittömästi?";
+
 /* Confirmation message when deleting multiple messages */
 "Are you sure you want to delete the selected messages?" = "Haluatko varmasti poistaa valitut viestit?";
 
@@ -350,6 +354,7 @@
 "Copy messages" = "Kopioi viestit";
 "More messages options" = "Lisää viestiasetuksia";
 "Mark as Unread" = "Merkitse lukemattomaksi";
+"Mark as Read" = "Merkitse luetuksi";
 "Closing Window ..." = "Ikkuna sulkeutuu...";
 "Tried to send too many mails. Please wait." = "Yritetty lähettää liian monta viestiä. Ole hyvä ja odota.";
 "View Mail" = "Näytä viesti";
@@ -373,5 +378,17 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";
 
+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
-"hotkey_flag" = "f";
\ No newline at end of file
+"hotkey_flag" = "*";
+
+/* Hotkey to reply to a message */
+"hotkey_reply" = "r";
+
+/* Hotkey to reply to all recipients of a message */
+"hotkey_replyall" = "a";
+
+/* Hotkey to forward to a message */
+"hotkey_forward" = "f";
\ No newline at end of file
diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
index e0083a149..0186fb37c 100644
--- a/UI/MailerUI/French.lproj/Localizable.strings
+++ b/UI/MailerUI/French.lproj/Localizable.strings
@@ -217,6 +217,12 @@
 /* Message view "more" menu: create a task from message */
 "Convert To Task" = "Convertir en tâche";
 
+/* Message view "more" menu: download all attachments as a zip archive */
+"Download all attachments" = "Télécharger toutes les pièces jointes";
+
+/* Filename prefix when downloading all attachments as a zip archive */
+"attachments" = "pièces-jointes";
+
 "Print..." = "Imprimer...";
 "Delete Message" = "Supprimer le message";
 "Delete Selected Messages" = "Supprimer les messages sélectionnés";
@@ -315,6 +321,7 @@
 /* Error when uploading a file attachment */
 "Error while uploading the file \"%{0}\":" = "Une erreur est survenue lors du téléversement du fichier « %{0} » :";
 "There is an active file upload. Closing the window will interrupt it." = "Un transfert est actif. La fermeture de la fenêtre causera son interruption.";
+"Message is too big" = "Le message dépasse la limite permise";
 
 /* Appears while sending the message */
 "Sending" = "Envoi en cours";
diff --git a/UI/MailerUI/German.lproj/Localizable.strings b/UI/MailerUI/German.lproj/Localizable.strings
index 5f95d676e..55c0989e7 100644
--- a/UI/MailerUI/German.lproj/Localizable.strings
+++ b/UI/MailerUI/German.lproj/Localizable.strings
@@ -217,6 +217,12 @@
 /* Message view "more" menu: create a task from message */
 "Convert To Task" = "In Aufgabe umwandeln";
 
+/* Message view "more" menu: download all attachments as a zip archive */
+"Download all attachments" = "Alle Anhänge herunterladen";
+
+/* Filename prefix when downloading all attachments as a zip archive */
+"attachments" = "Anhänge";
+
 "Print..." = "Drucken...";
 "Delete Message" = "Nachricht löschen";
 "Delete Selected Messages" = "Gewählte Nachricht(en) löschen";
@@ -315,6 +321,7 @@
 /* Error when uploading a file attachment */
 "Error while uploading the file \"%{0}\":" = "Fehler beim Hochladen der Datei \"%{0}\":";
 "There is an active file upload. Closing the window will interrupt it." = "Es wird gerade eine Datei hochgeladen. Das Schließen des Fensters wird dies abbrechen.";
+"Message is too big" = "Nachricht ist zu groß";
 
 /* Appears while sending the message */
 "Sending" = "Sende";
diff --git a/UI/MailerUI/Macedonian.lproj/Localizable.strings b/UI/MailerUI/Macedonian.lproj/Localizable.strings
index d3a8752bf..242c28249 100644
--- a/UI/MailerUI/Macedonian.lproj/Localizable.strings
+++ b/UI/MailerUI/Macedonian.lproj/Localizable.strings
@@ -77,7 +77,7 @@
 "List and see this folder" = "Излистај и погледни ја оваа папка";
 "Read mails from this folder" = "Читај ги пораките од оваа папка";
 "Mark mails read and unread" = "Означи ги пораките како прочитани и непрочитани";
-"Modify the flags of the mails in this folder" = "Промени ги знаменцата на пораките во оваа папка";
+"Modify the flags of the mails in this folder" = "Промени ги ознаките на пораките во оваа папка";
 "Insert, copy and move mails into this folder" = "Внеси, копирај и префрли пораки во оваа папка";
 "Post mails" = "Испрати пораки";
 "Add subfolders to this folder" = "Додади под папка во оваа папка";
@@ -242,7 +242,7 @@
 "Thread As Read" = "Преписката како прочитана";
 "As Read By Date..." = "Прочитано по датум...";
 "All Read" = "Сето прочитано";
-"Flag" = "Знаменце";
+"Flag" = "Ознака";
 "As Junk" = "Како отпад";
 "As Not Junk" = "Не е отпад";
 "Run Junk Mail Controls" = "Изврши ги контролите за отпад";
@@ -269,6 +269,10 @@
 "quotasFormat" = "%{0}% used on %{1} MB";
 "Unable to move/delete folder." = "Не е можно да ја префрлите/избришете папката.";
 
+/* Alternative operation when folder cannot be deleted */
+"The mailbox could not be moved to the trash folder. Would you like to delete it immediately?"
+= "Сандачето не може да биде преместено во кантата за ѓубре. Дали би сакале веднаш да го избришам?";
+
 /* Confirmation message when deleting multiple messages */
 "Are you sure you want to delete the selected messages?" = "Дали сте сигурни дека сакате да ги избришете селектираните пораки?";
 
@@ -350,6 +354,7 @@
 "Copy messages" = "Копирај ја пораката";
 "More messages options" = "Повеќе опции за пораките";
 "Mark as Unread" = "Означи како непрочитана";
+"Mark as Read" = "Означи како прочитано";
 "Closing Window ..." = "Затварање на прозорците ...";
 "Tried to send too many mails. Please wait." = "Се обидов да пратам премногу пораки. Ве молам почекајте.";
 "View Mail" = "Види пошта";
@@ -373,6 +378,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";
 
+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "ј";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";
 
diff --git a/UI/MailerUI/Polish.lproj/Localizable.strings b/UI/MailerUI/Polish.lproj/Localizable.strings
index 25c0a5ac5..e0a150413 100644
--- a/UI/MailerUI/Polish.lproj/Localizable.strings
+++ b/UI/MailerUI/Polish.lproj/Localizable.strings
@@ -217,6 +217,12 @@
 /* Message view "more" menu: create a task from message */
 "Convert To Task" = "Zamień na zadanie";
 
+/* Message view "more" menu: download all attachments as a zip archive */
+"Download all attachments" = "Pobierz wszystkie załączniki";
+
+/* Filename prefix when downloading all attachments as a zip archive */
+"attachments" = "załączniki";
+
 "Print..." = "Drukuj...";
 "Delete Message" = "Usuń wiadomość";
 "Delete Selected Messages" = "Usuń zaznaczone wiadomości";
@@ -315,6 +321,7 @@
 /* Error when uploading a file attachment */
 "Error while uploading the file \"%{0}\":" = "Błąd w trakcie wysyłania pliku \"%{0}\":";
 "There is an active file upload. Closing the window will interrupt it." = "Trwa przesyłanie pliku. Zamknięcie okna przerwie tą transmisję.";
+"Message is too big" = "Wiadomość jest zbyt duża";
 
 /* Appears while sending the message */
 "Sending" = "Wysyłanie";
diff --git a/UI/MailerUI/Serbian.lproj/Localizable.strings b/UI/MailerUI/Serbian.lproj/Localizable.strings
index 00f5f901d..6ae3705f1 100644
--- a/UI/MailerUI/Serbian.lproj/Localizable.strings
+++ b/UI/MailerUI/Serbian.lproj/Localizable.strings
@@ -269,6 +269,10 @@
 "quotasFormat" = "%{0}% искоришћено од %{1} МБ";
 "Unable to move/delete folder." = "Не могу да преместим/обришем директоријум.";
 
+/* Alternative operation when folder cannot be deleted */
+"The mailbox could not be moved to the trash folder. Would you like to delete it immediately?"
+= "Поруке не могу бити премештене у директоријум канте. Да ли желите да их одмах обришете?";
+
 /* Confirmation message when deleting multiple messages */
 "Are you sure you want to delete the selected messages?" = "Да ли сте сигурни да желите да обришете одабране поруке?";
 
@@ -350,6 +354,7 @@
 "Copy messages" = "Копирај поруке";
 "More messages options" = "Више опција порука";
 "Mark as Unread" = "Означи као непрочитано";
+"Mark as Read" = "Означи као прочитано";
 "Closing Window ..." = "Затварам прозор...";
 "Tried to send too many mails. Please wait." = "Покушавам да пошаљем превише поште. Молимо сачекајте.";
 "View Mail" = "Види пошту";
@@ -373,6 +378,9 @@
 /* Hotkey to write a new message */
 "hotkey_compose" = "w";
 
+/* Hotkey to mark selected message(s) as junk */
+"hotkey_junk" = "j";
+
 /* Hotkey to flag a message */
 "hotkey_flag" = "*";
 
diff --git a/UI/MailerUI/TurkishTurkey.lproj/Localizable.strings b/UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
index 1e8eabfab..035c383c6 100644
--- a/UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
+++ b/UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
@@ -2,7 +2,7 @@
 
 /* Icon's label */
 "Create"      = "Oluştur";
-"Empty Trash" = "Çöp Kutusunu Boşalt";
+"Empty Trash" = "Çöp Klasörünü Boşalt";
 "Delete"      = "Sil";
 "Expunge"     = "Silip At";
 "Forward"     = "İlet";
@@ -68,7 +68,7 @@
 /* Compact Folder success message */
 "Folder compacted" = "Klasör sıkıştırıldı";
 /* Empty Trash success message */
-"Trash emptied" = "Çöp Kutusu boşaltıldı";
+"Trash emptied" = "Çöp boşaltıldı";
 
 /* acls */
 "Access rights to" = "Klasörün erişim yetkileri";
@@ -76,7 +76,7 @@
 "Any Authenticated User" = "Kimliği doğrulanmış her kullanıcı";
 "List and see this folder" = "Klasörü listele ve görüntüle";
 "Read mails from this folder" = "Klasördeki iletileri okur";
-"Mark mails read and unread" = "Okumuş ve okunmamış iletileri işaretle";
+"Mark mails read and unread" = "Okumuş ve okunmamış iletileri işaretler";
 "Modify the flags of the mails in this folder" = "Bu klasördeki iletilerin yıldızlarını değiştirir";
 "Insert, copy and move mails into this folder" = "İletiler bu klasöre yerleştirir, kopyalar ve taşır";
 "Post mails" = "İletileri postalar";
@@ -141,7 +141,7 @@
 "Date"          = "Tarih";
 "View"          = "Görüntüle";
 "All"           = "Hepsi";
-"No message"    = "İleti yok";
+"No message"    = "Klasör boş";
 "messages"      = "ileti";
 "Yesterday"     = "Dün";
 "first"         = "İlk";
@@ -156,8 +156,8 @@
 
 /* Tree */
 "SentFolderName"   = "Gönderilmiş";
-"TrashFolderName"  = "Çöp Kutusu";
-"InboxFolderName"  = "Gelen Kutusu";
+"TrashFolderName"  = "Çöp";
+"InboxFolderName"  = "Gelen";
 "DraftsFolderName" = "Taslaklar";
 "JunkFolderName" = "İstenmeyen";
 "SieveFolderName"  = "Süzgeçler";
@@ -190,11 +190,11 @@
 "Use This Folder For" = "Bu Klasörü Şunun İçin Kullan";
 "Get Messages for Account" = "Hesaptaki İletileri Al";
 "Properties..." = "Özellikler...";
-"Delegation..." = "Temsilci Atama...";
+"Delegation..." = "Yetkili Tayini...";
 
 /* Use This Folder menu */
 "Sent Messages" = "Gönderilmiş İletiler";
-"Drafts" = "Taslak İletiler";
+"Drafts" = "Taslaklar";
 "Deleted Messages" = "Silinmiş İletiler";
 "Junk Messages" = "İstenmeyen İletiler";
 
@@ -263,7 +263,7 @@
 "Enter the new name of your folder"
  ="Yeni klasörünüzün adını yazın";
 "Do you really want to move this folder into the trash ?"
- = "Bu klasörü çöp kutusuna taşımak istediğinizden emin misiniz?";
+ = "Bu klasörü çöpe taşımak istediğinizden emin misiniz?";
 "Operation failed" = "İşlem başarısiz oldu";
 "Quota" = "Kota:";
 "quotasFormat" = "%{0}%  kullanılıyor, toplam %{1} MB";
@@ -271,7 +271,7 @@
 
 /* Alternative operation when folder cannot be deleted */
 "The mailbox could not be moved to the trash folder. Would you like to delete it immediately?"
-= "E-posta klasörü çöp kutusuna taşınamıyor. Klasörü hemen silmek ister misiniz?";
+= "Klasör çöpe taşınamıyor. Klasörü hemen silmek ister misiniz?";
 
 /* Confirmation message when deleting multiple messages */
 "Are you sure you want to delete the selected messages?" = "Seçili iletileri silmek istediğinizden emin misiniz?";
@@ -293,7 +293,7 @@
 "The folder could not be deleted."
 = "Klasör silinemiyor.";
 "The trash could not be emptied."
-= "Çöp Kutusu boşaltılamıyor.";
+= "Çöp boşaltılamıyor.";
 "The folder functionality could not be changed."
 = "Klasörün işlevi değişitirilemiyor.";
 "You need to choose a non-virtual folder!" = "Sanal olmayan bir klasör seçmelisiniz.";
@@ -304,7 +304,7 @@
 
 /* Message operations */
 "The messages could not be moved to the trash folder. Would you like to delete them immediately?"
-= "İletiler çöp kutusuna taşınamıyor. Bu iletileri hemen silmek ister misiniz?";
+= "İletiler çöpe taşınamıyor. Bu iletileri hemen silmek ister misiniz?";
 
 /* Message editing */
 "error_missingsubject" = "İletiye bir konu başlığı yazılmadı. İletiyi konusuz olarak göndermek istediğinizden emin misiniz?";
@@ -329,7 +329,7 @@
 /* Contacts list in mail editor */
 "Email" = "E-posta";
 "More mail options" = "Diğer e-posta seçenekleri";
-"Delegation" = "Temsilci Atama";
+"Delegation" = "Yetkili Tayini";
 "Add User" = "Kullanıcı Ekleyin";
 "Add a tag" = "Etiket ekle";
 "reply" = "yanıtla";
@@ -340,12 +340,12 @@
 "Rename" = "Yeniden Adlandır";
 "Compact" = "Sıkıştır";
 "Export" = "Dışarı Aktar";
-"Set as Drafts" = "Taslaklar olarak tanımla";
-"Set as Sent" = "Gönderilmiş olarak tanımla";
-"Set as Trash" = "Çöp Kutusu olarak tanımla";
+"Set as Drafts" = "Taslaklar klasörü olarak tanımla";
+"Set as Sent" = "Gönderilmiş klasörü olarak tanımla";
+"Set as Trash" = "Çöp klasörü olarak tanımla";
 
 /* Set the folder as the one holding Junk mails */
-"Set as Junk" = "İstenmeyen olarak belirle";
+"Set as Junk" = "İstenmeyen klasörü olarak tanımla";
 
 "Sort" = "Sıralandır";
 "Order Received" = "Alınan Tarih";
diff --git a/UI/MainUI/Finnish.lproj/Localizable.strings b/UI/MainUI/Finnish.lproj/Localizable.strings
index f331c89fa..bbb18e845 100644
--- a/UI/MainUI/Finnish.lproj/Localizable.strings
+++ b/UI/MainUI/Finnish.lproj/Localizable.strings
@@ -15,6 +15,7 @@
 
 "Authentication Failed" = "Tunnistautuminen epäonnistui";
 "Wrong username or password." = "Väärä käyttäjätunnus tai salasana.";
+"Retry" = "Yritä uudelleen";
 "cookiesNotEnabled" = "Et voi kirjautua koska selaimesi evästeet eivät ole käytössä. Salli evästeet selaimen asetuksista ja yritä uudelleen.";
 "browserNotCompatible" = "Olemme havainneet että selaimesi versiota ei tällä hetkellä tueta tällä sivustolla. Suosituksemme on käyttää Firefoxia. Napsauta alla olevaa linkkiä ladataksesi uusimman version tästä selaimesta.";
 "alternativeBrowsers" = "Vaihtoehtoisesti voit myös käyttää seuraavia yhteensopivia selaimia";
diff --git a/UI/MainUI/Macedonian.lproj/Localizable.strings b/UI/MainUI/Macedonian.lproj/Localizable.strings
index 57aebda22..d260e9600 100644
--- a/UI/MainUI/Macedonian.lproj/Localizable.strings
+++ b/UI/MainUI/Macedonian.lproj/Localizable.strings
@@ -15,6 +15,7 @@
 
 "Authentication Failed" = "Неуспешна автентификација";
 "Wrong username or password." = "Погрешно корисничко име или лозинка.";
+"Retry" = "Обиди се повторно";
 "cookiesNotEnabled" = "Не можете да се најавите поради тоа што колачињата на вашиот прелистувач не се активирани. Ве молиме да ги овозможите колачињата во опциите на вашиот прелистувач и да се обидете повторно.";
 "browserNotCompatible" = "Забележивме дека вашиот прелистувач во моментов не е поддржан од овој сајт. Наша препорака е да користите Firefox. Клинете врз овој линк да ја преземете последната верзија на овој прелистувач.";
 "alternativeBrowsers" = "Како алтернатива исто така можете да користите еден од компатибилните прелистувачи";
diff --git a/UI/MainUI/Serbian.lproj/Localizable.strings b/UI/MainUI/Serbian.lproj/Localizable.strings
index 436db610e..847a0af43 100644
--- a/UI/MainUI/Serbian.lproj/Localizable.strings
+++ b/UI/MainUI/Serbian.lproj/Localizable.strings
@@ -15,6 +15,7 @@
 
 "Authentication Failed" = "Операција није успела";
 "Wrong username or password." = "Погрешно корисничко име и лозинка.";
+"Retry" = "Покушај поново";
 "cookiesNotEnabled" = "Не можете се пријавити јер су онемогућени колачићи у вашеп прегледачу. Молимо омогућите колачиће у подашавањима прегледача и покушајте поново.";
 "browserNotCompatible" = "Открили смо да верзија вашег прегледача није подржана на овом сајту. Наша препорука је да корситите Firefox. Кликните на линк испод да преузмете последњу верзију овог прегледача.";
 "alternativeBrowsers" = "Алтернативно, можете користити и следеће компатибилне прегледаче";
diff --git a/UI/MainUI/TurkishTurkey.lproj/Localizable.strings b/UI/MainUI/TurkishTurkey.lproj/Localizable.strings
index 03d9f90a5..c46f2ea6f 100644
--- a/UI/MainUI/TurkishTurkey.lproj/Localizable.strings
+++ b/UI/MainUI/TurkishTurkey.lproj/Localizable.strings
@@ -16,7 +16,7 @@
 "Authentication Failed" = "Kullanıcı Kimliği Doğrulanamadı";
 "Wrong username or password." = "Kullanıcı adı veya şifre yanlış.";
 "Retry" = "Yeniden deneyin";
-"cookiesNotEnabled" = "Giriş yapamıyorsunuz çünkü tarayıcınızdaki çerezler engellenmiş. Lütfen tarayıcınızın ayarlarında çerezleri etkinleştirip, tekrar deneyin.";
+"cookiesNotEnabled" = "Giriş yapamıyorsunuz, çünkü tarayıcınızdaki çerezler engellenmiş. Lütfen tarayıcınızın ayarlarında çerezleri etkinleştirip, tekrar deneyin.";
 "browserNotCompatible" = "Tarayıcı sürümünüzün bu sitede henüz desteklenmediğini tespit ettik.  Tavsiyemiz Firefox kullanmanız. Bu tarayıcının son sürümünü indirmek için aşağıdaki bağlantıya tıklayın.";
 "alternativeBrowsers" = "Diğer bir seçenek olarak, aşağıdaki uyumlu tarayıcıları da kullanabilirsiniz";
 "alternativeBrowserSafari" = "Diğer bir seçenek olarak, Safari de kullanabilirsiniz.";
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index 6801c4653..a4c4212df 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -194,6 +194,7 @@
 "Please enter your signature below" = "Please enter your signature below";
 "Please specify a valid sender address." = "Please specify a valid sender address.";
 "Please specify a valid reply-to address." = "Please specify a valid reply-to address.";
+"Specify a hostname other than the local host" = "Specify a hostname other than the local host";
 
 /* Additional Parameters */
 "Additional Parameters" = "Additional Parameters";
diff --git a/UI/PreferencesUI/Finnish.lproj/Localizable.strings b/UI/PreferencesUI/Finnish.lproj/Localizable.strings
index 899bb62f0..8febf7348 100644
--- a/UI/PreferencesUI/Finnish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Finnish.lproj/Localizable.strings
@@ -146,6 +146,7 @@
 /* Mailer */
 "Labels" = "Otsikot";
 "Label" = "Otsikoi";
+"New label" = "Uusi otsikko";
 "Show subscribed mailboxes only" = "Näytä vain tilatut sähköpostikansiot";
 "Synchronize only default mail folders (EAS)" = "Synkronoi vain oletus sähköpostikansiot (EAS)";
 "Sort messages by threads" = "Järjestä viestit ketjuiksi";
@@ -212,6 +213,7 @@
 /* Event+task categories */
 "Calendar Category" = "Kalenteriryhmä";
 "Add Calendar Category" = "Lisää kalenteriryhmä";
+"New category" = "Uusi kategoria";
 "Remove Calendar Category" = "Poista kalenteriryhmä";
 "Contact Category" = "Yhteystietoryhmä";
 "Add Contact Category" = "Lisää yhteystietoryhmä";
@@ -317,11 +319,27 @@
 "Header" = "Otsikko";
 "Body" = "Runko";
 "Flag the message with" = "Merkitse viesti";
+
+/* Select field label of "flag message" mail filter action */
+"Flag" = "Lippu";
+
 "Discard the message" = "Hylkää viesti";
 "File the message in" = "Arkistoi viesti";
+
+/* Select field label of "file message" mail filter action */
+"Mailbox" = "Postilaatikko";
+
 "Keep the message" = "Pidä viesti";
 "Forward the message to" = "Lähetä viesti edelleen";
+
+/* Input field label of "forward" mail filter action */
+"Email" = "Sähköposti";
+
 "Send a reject message" = "Lähetä hylkäysviesti";
+
+/* Input field label of "reject" mail filter action */
+"Message" = "Viesti";
+
 "Send a vacation message" = "Lähetä lomaviesti";
 "Stop processing filter rules" = "Pysäytä suodatinsääntöjen suoritus";
 "is under" = "on alle";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index adc4b109b..4e751b316 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -42,9 +42,9 @@
 "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 les réponses d'absence";
 "Do not send responses to mailing lists" = "Ne pas envoyer les réponses aux listes de diffusion";
-"Enable auto reply on" = "Activer la réponse automatique le";
+"Enable auto reply on" = "Débuter la réponse automatique le";
 "Disable auto reply on" = "Désactiver la réponse automatique le";
 "Always send vacation message response" = "Toujours envoyer le message de vacances prolongées";
 "Please specify your message and your email addresses for which you want to enable auto reply."
@@ -194,6 +194,7 @@
 "Please enter your signature below" = "Introduisez votre signature ci-dessous";
 "Please specify a valid sender address." = "Veuillez définir une adresse d'expédition valide.";
 "Please specify a valid reply-to address." = "Veuillez définir une adresse de retour valide.";
+"Specify a hostname other than the local host" = "Veuillez utiliser un nom d'hôte autre que l'hôte local";
 
 /* Additional Parameters */
 "Additional Parameters" = "Paramètres supplémentaires";
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 1a5879471..53a2c828e 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -194,6 +194,7 @@
 "Please enter your signature below" = "Bitte fügen Sie die Signatur hier ein";
 "Please specify a valid sender address." = "Bitte geben Sie eine gültige Absenderadresse an.";
 "Please specify a valid reply-to address." = "Bitte geben Sie eine gültige \"Antworten An\"-Adresse (Reply-To) an.";
+"Specify a hostname other than the local host" = "Geben Sie einen anderen Servernamen an, als den Lokalen";
 
 /* Additional Parameters */
 "Additional Parameters" = "Zusätzliche Einstellungen";
diff --git a/UI/PreferencesUI/Macedonian.lproj/Localizable.strings b/UI/PreferencesUI/Macedonian.lproj/Localizable.strings
index bc8d2549b..b8928bdf3 100644
--- a/UI/PreferencesUI/Macedonian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Macedonian.lproj/Localizable.strings
@@ -319,11 +319,27 @@
 "Header" = "Заглавје";
 "Body" = "Тело";
 "Flag the message with" = "Означи ја пораката со";
+
+/* Select field label of "flag message" mail filter action */
+"Flag" = "Ознака";
+
 "Discard the message" = "Отфрли ја поракта";
 "File the message in" = "Смести ја пораката во";
+
+/* Select field label of "file message" mail filter action */
+"Mailbox" = "Поштенско сандаче";
+
 "Keep the message" = "Зачувај ја пораката";
 "Forward the message to" = "Препратија пораката до";
+
+/* Input field label of "forward" mail filter action */
+"Email" = "Електронска пошта";
+
 "Send a reject message" = "Испрати порака за отфрлање";
+
+/* Input field label of "reject" mail filter action */
+"Message" = "Порака";
+
 "Send a vacation message" = "Испрати автоматска порака кога си на одмор";
 "Stop processing filter rules" = "Запри го процесирањето на правилата за филтрирање";
 "is under" = "е под";
diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings
index d200fe65b..b48d7a41f 100644
--- a/UI/PreferencesUI/Polish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings
@@ -194,6 +194,7 @@
 "Please enter your signature below" = "Wprowadź swoją sygnaturę";
 "Please specify a valid sender address." = "Wprowadź poprawny adres nadawcy.";
 "Please specify a valid reply-to address." = "Wprowadź poprawny adres \"Odpowiedź do\"";
+"Specify a hostname other than the local host" = "Podaj nazwę serwera inną niż host lokalny";
 
 /* Additional Parameters */
 "Additional Parameters" = "Dodatkowe parametry";
diff --git a/UI/PreferencesUI/Serbian.lproj/Localizable.strings b/UI/PreferencesUI/Serbian.lproj/Localizable.strings
index 729898694..f4ded414d 100644
--- a/UI/PreferencesUI/Serbian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Serbian.lproj/Localizable.strings
@@ -319,11 +319,27 @@
 "Header" = "Заглавље";
 "Body" = "Тело";
 "Flag the message with" = "Означи поруку следећом заставицом";
+
+/* Select field label of "flag message" mail filter action */
+"Flag" = "Заставица";
+
 "Discard the message" = "Одбаци поруку";
 "File the message in" = "Стави поруку у";
+
+/* Select field label of "file message" mail filter action */
+"Mailbox" = "Поштанско сандуче";
+
 "Keep the message" = "Сачувај поруку";
 "Forward the message to" = "Проследи поруку";
+
+/* Input field label of "forward" mail filter action */
+"Email" = "Епошта";
+
 "Send a reject message" = "Пошаљи поруку одбијања";
+
+/* Input field label of "reject" mail filter action */
+"Message" = "Порука";
+
 "Send a vacation message" = "Пошаљи поруку за одмор";
 "Stop processing filter rules" = "Заустави обраду правила филтера";
 "is under" = "је испод";
diff --git a/UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings b/UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings
index 1df08b780..daeaad2c5 100644
--- a/UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings
+++ b/UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings
@@ -112,7 +112,7 @@
 "Day end time" = "Günün bitiş saati";
 "Day start time must be prior to day end time." = "Günün başlangıç saati, günün bitiş saatinden önce olmalı.";
 "Week days to display" = "Gösterilen günler";
-"Show time as busy outside working hours" = "Çalışma saati dışındaki saatleri meşgul olarak göster";
+"Show time as busy outside working hours" = "Mesai saati haricindeki zamanı meşgul olarak göster";
 "First week of year" = "Yılın ilk haftası";
 "Enable reminders for Calendar items" = "Takvim ögeleri için hatırlatıcıları etkinleştir";
 "Play a sound when a reminder comes due" = "Hatırlatma zamanı geldiğinde sesli olarak uyar";
@@ -120,8 +120,8 @@
 "firstWeekOfYear_January1" = "1 Ocak'da başlar";
 "firstWeekOfYear_First4DayWeek" = "İlk 4-günlük haftadır";
 "firstWeekOfYear_FirstFullWeek" = "İlk tam haftadır";
-"Prevent from being invited to appointments" = "Çalışma davet almayı engelle";
-"White list for appointment invitations" = "Çalışma daveti beyaz listesi";
+"Prevent from being invited to appointments" = "Çalışma daveti almayı engelle";
+"White list for appointment invitations" = "Çalışma davetleri beyaz listesi";
 "Contacts Names" = "Kişi İsimleri";
 
 /* Default Calendar */
diff --git a/UI/Scheduler/Finnish.lproj/Localizable.strings b/UI/Scheduler/Finnish.lproj/Localizable.strings
index 7b073e5fc..44e1a1287 100644
--- a/UI/Scheduler/Finnish.lproj/Localizable.strings
+++ b/UI/Scheduler/Finnish.lproj/Localizable.strings
@@ -380,7 +380,7 @@
 
 /* email notifications */
 "Send Appointment Notifications" = "Lähetä tapaamismuistutukset";
-"From" = "Keneltä";
+"From" = "Aloitusaika";
 "To" = "Kenelle";
 
 /* validation errors */
@@ -565,7 +565,7 @@ vtodo_class2 = "(Luottamuksellinen tehtävä)";
 "More options" = "Lisää valintoja";
 "Delete This Occurrence" = "Poista tämä tapahtuma";
 "Delete All Occurrences" = "Poista kaikki tapahtumat";
-"Add From" = "Lisää lähettäjä";
+"Add From" = "Lisää aloitusaika";
 "Add Due" = "Lisää määräaika";
 "Import" = "Tuo";
 "Rename" = "Nimeä uudelleen";
diff --git a/UI/Scheduler/TurkishTurkey.lproj/Localizable.strings b/UI/Scheduler/TurkishTurkey.lproj/Localizable.strings
index 6d59be30b..7c96bca74 100644
--- a/UI/Scheduler/TurkishTurkey.lproj/Localizable.strings
+++ b/UI/Scheduler/TurkishTurkey.lproj/Localizable.strings
@@ -59,7 +59,7 @@
 "Properties" = "Özellikler";
 "Done" = "Tamam";
 "An error occurred while importing calendar." = "Takvimi içeri aktarırken bir hata oluştu.";
-"No event was imported." = "İçeri etkinlik aktarılmadı.";
+"No event was imported." = "İçeri hiç bir etkinlik aktarılmadı.";
 "A total of %{0} events were imported in the calendar." = "Toplam %{0} etkinlik takvime aktarıldı.";
 "Compose E-Mail to All Attendees" = "Tüm Katılımcılara İleti Yaz";
 "Compose E-Mail to Undecided Attendees" = "Karar Vermemiş Katılımcılara İleti Yaz";
@@ -117,7 +117,7 @@
 
 /* Schedule */
 "Schedule" = "İş Programı";
-"No appointments found" = "Çalışma bulunamadı";
+"No appointments found" = "Hiç bir çalışma bulunamadı";
 "Meetings proposed by you" = "Sizin tarafınızdan teklif edilen toplantılar";
 "Meetings proposed to you" = "Size teklif edilen toplantılar";
 "sched_startDateFormat" = "%d/%m %H:%M";
@@ -178,7 +178,7 @@
 "Target" = "Hedef";
 "attributes" = "özellikler";
 "attendees" = "katılımcılar";
-"delegated from" = "tarafından temsilci atandı";
+"delegated from" = "vekil tayin eden";
 
 /* checkbox title */
 "is private" = "kişisel mi";
@@ -197,7 +197,7 @@
 "partStat_ACCEPTED" = "Katılacağım";
 "partStat_DECLINED" = "Katılmayacağım";
 "partStat_TENTATIVE" = "Katılabilirim";
-"partStat_DELEGATED" = "Temsilci atıyorum";
+"partStat_DELEGATED" = "Vekil atıyorum";
 "partStat_OTHER" = "Diğer";
 
 /* Appointments (error messages) */
@@ -253,7 +253,7 @@
 "PRIVATE_vevent" = "Kişisel Etkinlik";
 "PUBLIC_vtodo" = "Herkese Açık Görev";
 "CONFIDENTIAL_vtodo" = "Gizli Görev";
-"PRIVATE_vtodo" = "Kişisel görev";
+"PRIVATE_vtodo" = "Kişisel Görev";
 
 /* status type */
 "status_" = "Belirlenmemiş";
@@ -549,7 +549,7 @@ vtodo_class2 = "(Gizli görev)";
 "Custom date range" = "Özel tarih aralığı";
 "Select starting date" = "Başlangıç tarihini seçin";
 "Select ending date" = "Bitiş tarihini seçin";
-"Delegated to" = "Temsilci";
+"Delegated to" = "Vekil";
 "Keep sending me updates" = "Güncellemeleri bana göndermeye devam et";
 "OK" = "TAMAM";
 "Confidential" = "Gizli";