diff --git a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
index bbb7b04cb..958b2ad85 100644
--- a/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
+++ b/SoObjects/Appointments/BrazilianPortuguese.lproj/Localizable.strings
@@ -60,3 +60,6 @@ vtodo_class2 = "(Tarefa Confidencial)";
= "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}foi ainda não decidiu seu convite ao evento.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Catalan.lproj/Localizable.strings b/SoObjects/Appointments/Catalan.lproj/Localizable.strings
index 5516bf6f4..098987ec6 100644
--- a/SoObjects/Appointments/Catalan.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Catalan.lproj/Localizable.strings
@@ -61,4 +61,5 @@ vtodo_class2 = "(Tasca confidencial)";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}encara no s'ha decidit sobre la invitació a l'esdeveniment.";
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Nombre màxim de reserves simultànies (%{NumberOfSimultaneousBookings}) assolit per al recurs \"%{Cn}{%SystemEmail}\".";
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Nombre màxim de reserves simultànies (%{NumberOfSimultaneousBookings}) assolit per al recurs \"%{Cn}{%SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Czech.lproj/Localizable.strings b/SoObjects/Appointments/Czech.lproj/Localizable.strings
index 943721336..294efe89b 100644
--- a/SoObjects/Appointments/Czech.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Czech.lproj/Localizable.strings
@@ -60,3 +60,6 @@ vtodo_class2 = "(Skrytý úkol)";
= "%{Attendee} %{SentByText}delegoval/a Vaši pozvánku na %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}dosud o Vaší pozvánce k události nerozhodl/a.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Dutch.lproj/Localizable.strings b/SoObjects/Appointments/Dutch.lproj/Localizable.strings
index b68771cde..f3acf2d5d 100644
--- a/SoObjects/Appointments/Dutch.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Dutch.lproj/Localizable.strings
@@ -60,3 +60,6 @@ vtodo_class2 = "(Vertrouwelijke taak)";
= "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}has not yet decided upon your event invitation.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
index 4a89b8e1e..6b0bed1b9 100644
--- a/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Hungarian.lproj/Localizable.strings
@@ -61,4 +61,5 @@ vtodo_class2 = "(Bizalmas feladat)";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}még meggondolja a meghívását.";
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Az egyidejű foglalások száma (%{NumberOfSimultaneousBookings}) elérte a maximumot \"%{Cn} %{SystemEmail}\".";
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Az egyidejű foglalások száma (%{NumberOfSimultaneousBookings}) elérte a maximumot \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
index 0bf814c52..11c32b634 100644
--- a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
@@ -35,8 +35,7 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)";
/* Invitation */
"Event Invitation: \"%{Summary}\"" = "Boð á viðburð: \"%{Summary}\"";
"(sent by %{SentBy}) " = "(%{SentBy} sendi þetta) ";
-"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" =
-"%{Organizer} %{SentByText}hefur boðið þér á þennan viðburð: %{Summary}.\n\nByrjun: %{StartDate} at %{StartTime}\nEndir: %{EndDate} at %{EndTime}\nLýsing: %{Description}";
+"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText}hefur boðið þér á þennan viðburð: %{Summary}.\n\nByrjun: %{StartDate} at %{StartTime}\nEndir: %{EndDate} at %{EndTime}\nLýsing: %{Description}";
/* Deletion */
"Event Cancelled: \"%{Summary}\"" = "Viðburði aflýst: \"%{Summary}\"";
diff --git a/SoObjects/Appointments/Italian.lproj/Localizable.strings b/SoObjects/Appointments/Italian.lproj/Localizable.strings
index f7d50d0d2..27dbbfa5d 100644
--- a/SoObjects/Appointments/Italian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Italian.lproj/Localizable.strings
@@ -60,3 +60,6 @@ vtodo_class2 = "(Attività confidenziale)";
= "%{Attendee} %{SentByText}ha delegato l'invito a %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}non ha ancora deciso riguardo il tuo invito all'evento.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Norwegian.lproj/Localizable.strings b/SoObjects/Appointments/Norwegian.lproj/Localizable.strings
index d3dac74ac..aee20395d 100644
--- a/SoObjects/Appointments/Norwegian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Norwegian.lproj/Localizable.strings
@@ -16,10 +16,6 @@ vtodo_class2 = "(Konfidensiell oppgave)";
"You have invited the following attendees(s):" = "Du har invitert følende deltagere:";
"... to attend the following event:" = "... til å delta i følgende hendelse:";
-"Receipt: invitation updated" = "Kvittering: invitasjon er oppdatert";
-"The following attendees(s):" = "Følgende deltager(e):";
-"... have been notified of the changes to the following event:" = "... har blitt informert om endringer i følgende hendelse:";
-
"Receipt: invitation updated" = "Kvittering: invitasjon oppdatert";
"The following attendees(s):" = "Følgende deltager(e):";
"... have been notified of the changes to the following event:" = "... har blitt informert om endringene i følgende hendelse:";
@@ -64,3 +60,6 @@ vtodo_class2 = "(Konfidensiell oppgave)";
= "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}has not yet decided upon your event invitation.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Polish.lproj/Localizable.strings b/SoObjects/Appointments/Polish.lproj/Localizable.strings
index 66c83afb4..3e078d6f7 100644
--- a/SoObjects/Appointments/Polish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Polish.lproj/Localizable.strings
@@ -60,3 +60,6 @@ vtodo_class2 = "(Zadanie poufne)";
= "%{Attendee} %{SentByText}oddelegował(a) %{Delegate} na twoje wydarzenie.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}jeszcze nie zdecydował(a) o obecności na twoim wydarzeniu.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Russian.lproj/Localizable.strings b/SoObjects/Appointments/Russian.lproj/Localizable.strings
index 2fde34301..36d546870 100644
--- a/SoObjects/Appointments/Russian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Russian.lproj/Localizable.strings
@@ -61,4 +61,5 @@ vtodo_class2 = "(Confidential task)";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}не определился с желанием участвовать в запланированном мероприятии.";
-"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Уже подано максимальное количество заявок (%{NumberOfSimultaneousBookings}) на ресурс \"%{Cn} %{SystemEmail}\".";
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Уже подано максимальное количество заявок (%{NumberOfSimultaneousBookings}) на ресурс \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Swedish.lproj/Localizable.strings b/SoObjects/Appointments/Swedish.lproj/Localizable.strings
index 75cbf0ce8..69d46ce56 100644
--- a/SoObjects/Appointments/Swedish.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Swedish.lproj/Localizable.strings
@@ -60,3 +60,6 @@ vtodo_class2 = "(Konfidentiell uppgift)";
= "%{Attendee} %{SentByText}har delegerat din inbjudan till %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}har inte än bestämt sig om din mötesinbjudan.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
index eac4b5bf9..7fe4ca8ba 100644
--- a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
@@ -60,3 +60,6 @@ vtodo_class2 = "(Конфіденційне завдання)";
= "%{Attendee} %{SentByText} пененаправив запрошення %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText} поки не визначився з участю в події.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Appointments/Welsh.lproj/Localizable.strings b/SoObjects/Appointments/Welsh.lproj/Localizable.strings
index bda59e824..2acbea8c1 100644
--- a/SoObjects/Appointments/Welsh.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Welsh.lproj/Localizable.strings
@@ -60,3 +60,6 @@ vtodo_class2 = "(Tasg gyfrinachol)";
= "%{Attendee} %{SentByText}has delegated the invitation to %{Delegate}.";
"%{Attendee} %{SentByText}has not yet decided upon your event invitation."
= "%{Attendee} %{SentByText}heb benderfynu ar eich gwahoddiad eto.";
+
+/* Resources */
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/UI/Common/Norwegian.lproj/Localizable.strings b/UI/Common/Norwegian.lproj/Localizable.strings
index 4ce206fd9..6d83d29cf 100644
--- a/UI/Common/Norwegian.lproj/Localizable.strings
+++ b/UI/Common/Norwegian.lproj/Localizable.strings
@@ -7,7 +7,7 @@
"Home" = "Hjem";
"Calendar" = "Kalender";
-"Address Book" = "Adressebok";
+"Address Book" = "Adressebok";
"Mail" = "E-post";
"Preferences" = "Innstillinger";
"Administration" = "Administrasjon";
@@ -39,22 +39,21 @@
/* generic.js */
"Unable to subscribe to that folder!"
- = "Du kan ikke abonnere på den mappen!";
+ = "Du kan ikke abonnere på den mappen!";
"You cannot subscribe to a folder that you own!"
- = "Du kan ikke abonnere på en mappe som du selv eier!";
+ = "Du kan ikke abonnere på en mappe som du selv eier!";
"Unable to unsubscribe from that folder!"
- = "Du kan ikke avslutte abonnement på mappen!";
+ = "Du kan ikke avslutte abonnement på mappen!";
"You cannot unsubscribe from a folder that you own!"
- = "Du kan ikke avslutte abonnement på en mappe som du selv eier!";
+ = "Du kan ikke avslutte abonnement på en mappe som du selv eier!";
"Unable to rename that folder!" = "Du kan ikke bytte navn på mappen!";
"You have already subscribed to that folder!"
- = "Du abonnerer allerede på mappen!";
+ = "Du abonnerer allerede på mappen!";
"The user rights cannot be edited for this object!"
= "Brukerrettighetene kan ikke endres på objektet!";
-"A folder by that name already exists."
- = "En mappe med det navnet finnes fra før.";
-"You cannot create a list in a shared address book."
- = "Du kan ikke opprette en liste i en delt adressebok.";
+"A folder by that name already exists." = "En mappe med det navnet finnes fra før.";
+"You cannot create a list in a shared address book."
+ = "Du kan ikke opprette en liste i en delt adressebok.";
"Warning" = "Advarsel";
"You are not allowed to access this module or this system. Please contact your system administrator."
@@ -64,6 +63,8 @@
"noEmailForDelegation" = "Du må angi adressen til personen du delegerer din invitasjon.";
"delegate is organizer" = "Personen du delegerer til er arrangør. Vennligst deleger til en annen person.";
+"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.";
/* common buttons */
"OK" = "OK";
@@ -76,6 +77,3 @@
"Start:" = "Start:";
"Due Date:" = "Forfallsdato:";
"Location:" = "Lokasjon:";
-
-
-
diff --git a/UI/MailerUI/Catalan.lproj/Localizable.strings b/UI/MailerUI/Catalan.lproj/Localizable.strings
index 73ac708eb..e31cc14b2 100644
--- a/UI/MailerUI/Catalan.lproj/Localizable.strings
+++ b/UI/MailerUI/Catalan.lproj/Localizable.strings
@@ -165,7 +165,7 @@
"InboxFolderName" = "Safata d'entrada";
"DraftsFolderName" = "Esborranys";
"SieveFolderName" = "Filtres";
-"OtherUsersFolderName" = "Altres usuaris";
+"OtherUsersFolderName" = "Altres usuaris";
"SharedFoldersName" = "Carpetes compartides";
"Folders" = "Carpetes"; /* title line */
diff --git a/UI/MailerUI/Norwegian.lproj/Localizable.strings b/UI/MailerUI/Norwegian.lproj/Localizable.strings
index 0e9eef368..96e5dcfeb 100644
--- a/UI/MailerUI/Norwegian.lproj/Localizable.strings
+++ b/UI/MailerUI/Norwegian.lproj/Localizable.strings
@@ -5,7 +5,7 @@
"Empty Trash" = "Tøm papirkurven";
"Delete" = "Slett";
"Expunge" = "Slett";
-"Forward" = "Videresende";
+"Forward" = "Videresend";
"Get Mail" = "Hent e-post";
"Junk" = "Søppelpost";
"Reply" = "Svar";
@@ -43,7 +43,7 @@
/* Main Frame */
-"Home" = "Hjem";
+"Home" = "Hjem";
"Calendar" = "Kalender";
"Addressbook" = "Adressebok";
"Mail" = "E-post";
@@ -91,7 +91,7 @@
"To" = "Til";
"Cc" = "Kopi";
"Bcc" = "Blindkopi";
-"Reply-To" = "Svar-til";
+"Reply-To" = "Svar-til";
"Add address" = "Legg til adresse";
"Attachments:" = "Vedlegg:";
@@ -289,4 +289,3 @@
"cannot send message: (smtp) all recipients discarded" = "Cannot send message: all recipients are invalid.";
"cannot send message (smtp) - recipients discarded:" = "Cannot send message. The following addresses are invalid:";
"cannot send message: (smtp) error when connecting" = "Cannot send message: error when connecting to the SMTP server.";
-
diff --git a/UI/MainUI/Norwegian.lproj/Localizable.strings b/UI/MainUI/Norwegian.lproj/Localizable.strings
index a7d2d0727..5f7f55c53 100644
--- a/UI/MainUI/Norwegian.lproj/Localizable.strings
+++ b/UI/MainUI/Norwegian.lproj/Localizable.strings
@@ -40,7 +40,8 @@ SOGo is distributed under the GNU G
See this page for various support options.";
"Your account was locked due to too many failed attempts." = "Din konto har blitt låst på grunn av for mange misslykkete innlogginger.";
-"Your account was locked due to an expired password." = "Din konto har blitt låst fordi ditt passord er utløpt.";"Login failed due to unhandled error case: " = "Login failed due to unhandled error case: ";
+"Your account was locked due to an expired password." = "Din konto har blitt låst fordi ditt passord er utløpt.";
+"Login failed due to unhandled error case: " = "Login failed due to unhandled error case: ";
"Change your Password" = "Endre ditt passord";
"Your password has expired, please enter a new one below:" = "Ditt passord har utløpt, vennligst fyll ut et nytt under:";
"Password must not be empty." = "Passordet må ikke være tomt.";
diff --git a/UI/MainUI/Ukrainian.lproj/Localizable.strings b/UI/MainUI/Ukrainian.lproj/Localizable.strings
index ac4d9a365..090bcda9f 100644
--- a/UI/MainUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/MainUI/Ukrainian.lproj/Localizable.strings
@@ -17,6 +17,7 @@
"Language:" = "Мова:";
"choose" = "Вибрати ...";
+"Catalan" = "Català";
"Czech" = "Česky";
"Dutch" = "Nederlands";
"English" = "English";