diff --git a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
index 9074deb84..0bf814c52 100644
--- a/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
+++ b/SoObjects/Appointments/Icelandic.lproj/Localizable.strings
@@ -35,12 +35,13 @@ 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}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{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}\"";
"%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"
-= "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}";
+= "%{Organizer} %{SentByText}hefur aflýst þessum viðburði: %{Summary}.\n\nByrjun: %{StartDate} kl. %{StartTime}\nEndir: %{EndDate} kl. %{EndTime}\nLýsing: %{Description}";
/* Update */
"The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed"
@@ -62,4 +63,4 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)";
= "%{Attendee} %{SentByText}hefur ekki enn tekið ákvörðun varðandi boð þitt.";
/* 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
+"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Hámarksfjöldi samtímabókana (%{NumberOfSimultaneousBookings}) hefur verið náð varðandi aðfangið \"%{Cn} %{SystemEmail}\".";
\ No newline at end of file
diff --git a/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html b/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html
index 70646c53f..ab729ce4e 100644
--- a/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html
+++ b/SoObjects/Mailer/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html
@@ -5,8 +5,8 @@
Efni: <#subject/><#newLine/>
Dags: <#date/><#newLine/>
Frá: <#from/><#newLine/>
-<#hasReplyTo>Svara-til: <#replyTo/><#hasOrganization>Skipulagseining: <#organization/>Till: <#to/><#newLine/>
-<#hasCc>Afrit: <#cc/><#hasNewsGroups>Fréttahópar: <#newsgroups/><#hasReferences>Referenser: <#references/><#newLine/>
+<#hasReplyTo>Svara-til: <#replyTo/><#hasOrganization>Skipulagseining: <#organization/>Til: <#to/><#newLine/>
+<#hasCc>Afrit: <#cc/><#hasNewsGroups>Fréttahópar: <#newsgroups/><#hasReferences>Tilvísanir: <#references/><#newLine/>
<#newLine/>
<#messageBody/><#newLine/>
<#newLine/>
diff --git a/SoObjects/Mailer/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html b/SoObjects/Mailer/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html
index fc7ceea29..27aa5f323 100644
--- a/SoObjects/Mailer/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html
+++ b/SoObjects/Mailer/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html
@@ -2,12 +2,12 @@
<#newLine/>
<#signaturePlacementOnTop><#newLine/>
<#signature/><#newLine/>
-<#outlookMode>-------- Orginalmeddelande --------<#newLine/>
+<#outlookMode>-------- Upprunalegur texti --------<#newLine/>
Efni: <#subject/><#newLine/>
Dags: <#date/><#newLine/>
Frá: <#from/><#newLine/>
<#hasReplyTo>Svara-til: <#replyTo/><#hasOrganization>Organisation: <#organization/>Til: <#to/><#newLine/>
-<#hasCc>Afrit: <#cc/><#hasNewsGroups>Fréttahópar: <#newsgroups/><#hasReferences>Referenser: <#references/><#newLine/>
+<#hasCc>Afrit: <#cc/><#hasNewsGroups>Fréttahópar: <#newsgroups/><#hasReferences>Tilvísanir: <#references/><#newLine/>
<#standardMode>Þann <#date/>, skrifaði <#from/>:<#newLine/>
<#newLine/>
<#messageBody/><#newLine/>
diff --git a/UI/Common/Icelandic.lproj/Localizable.strings b/UI/Common/Icelandic.lproj/Localizable.strings
index fe6796394..77d5f632f 100644
--- a/UI/Common/Icelandic.lproj/Localizable.strings
+++ b/UI/Common/Icelandic.lproj/Localizable.strings
@@ -43,18 +43,18 @@
"You cannot subscribe to a folder that you own!"
= "Ekki er hægt að gerast áskrifandi að sínum eigin möppum.";
"Unable to unsubscribe from that folder!"
- = "Unable to unsubscribe from that folder!";
+ = "Ekki var hægt að segja upp áskrift að þeirri möppu!";
"You cannot unsubscribe from a folder that you own!"
- = "You cannot unsubscribe from a folder that you own!";
+ = "Ekki er hægt að segja upp möppu sem þú átt!";
"Unable to rename that folder!" = "Ekki var hægt að breyta nafninu á þeirri möppu!";
"You have already subscribed to that folder!"
- = "You have already subscribed to that folder!";
+ = "Áskrift er nú þegar að þeirri möppu!";
"The user rights cannot be edited for this object!"
- = "The user rights cannot be edited for this object!";
+ = "Ekki er hægt að breyta notandaréttindum fyrir þetta viðfang!";
"A folder by that name already exists." = "Nú þegar er til mappa með því nafni.";
"You cannot create a list in a shared address book."
- = "You cannot create a list in a shared address book.";
-"Warning" = "Aðvörun";
+ = "Ekki er hægt að búa til lista í samnýttri nafnaskrá.";
+"Warning" = "Viðvörun";
"You are not allowed to access this module or this system. Please contact your system administrator."
= "Þú hefur ekki aðgang að þessari einingu á þessu kerfi. Til þess þarftu að hafa samband við kerfisstjóra Reiknistofnunar HÍ.";
diff --git a/UI/MainUI/Icelandic.lproj/Locale b/UI/MainUI/Icelandic.lproj/Locale
index b6c18dee2..3e9df16ed 100644
--- a/UI/MainUI/Icelandic.lproj/Locale
+++ b/UI/MainUI/Icelandic.lproj/Locale
@@ -1,4 +1,4 @@
-/* Swedish */
+/* Icelandic */
{
NSLanguageName = "Icelandic";
NSFormalName = "Íslenska";
diff --git a/UI/MainUI/Icelandic.lproj/Localizable.strings b/UI/MainUI/Icelandic.lproj/Localizable.strings
index 0a2ccc132..7d04505b1 100644
--- a/UI/MainUI/Icelandic.lproj/Localizable.strings
+++ b/UI/MainUI/Icelandic.lproj/Localizable.strings
@@ -25,6 +25,7 @@
"German" = "Deutsch";
"Hungarian" = "Magyar";
"Italian" = "Italiano";
+"Icelandic" = "Íslenska";
"Norwegian" = "Norsk";
"BrazilianPortuguese" = "Português brasileiro";
"Russian" = "Русский";
@@ -34,10 +35,10 @@
"Welsh" = "Cymraeg";
"About" = "Um";
-"AboutBox" = "Developed by Inverse, SOGo is a fully-featured groupware server with a focus on scalability and simplicity.
-SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV and CardDAV.
-SOGo is distributed under the GNU GPL version 2 or later and parts are distributed under the GNU LGPL version 2. This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law.
-See this page for various support options.";
+"AboutBox" = "Hugbúnaðarþróun Inverse hefur framleitt SOGo sem er hópvinnukerfi með öllum þáttum og nýjungum, sem hefur það að markmiði að vera einfalt og skalast vel.
+SOGo býður upp á auðugt vefviðmót sem byggt er á AJAX viðmóti og það styður fjölda af biðlaraforritum með því að nota staðlaðar samskiptareglur eins og t.d. CalDAV og CardDAV.
+SOGo er dreift í samkvæmt hugbúnaðarleyfinu GNU GPL útgáfu 2 eða nýrri og sumum hlutum er dreift samkvæmt GNU LGPL útgáfu 2. Þetta er frjáls og opinn hugbúnaður: þér er frjálst að breyta honum og dreifa honum. Það er ENGIN ÁBYRGÐ, að því marki sem leyfilegt er, lögum samkvæmt.
+Sjá þessa síðu til að skoða ýmsa möguleika á þjónustu.";
"Your account was locked due to too many failed attempts." = "Your account was locked due to too many failed attempts.";
"Your account was locked due to an expired password." = "Your account was locked due to an expired password.";
diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
index 8759609d2..fd30f99ec 100644
--- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
+++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
"Keep a copy" = "Keep a copy";
"Please specify an address to which you want to forward your messages."
= "Please specify an address to which you want to forward your messages.";
diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings
index bea0f9287..4cb7e385b 100644
--- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Redirigir missatges entrants";
-"Forward to address :" = "Redirigir a l'adreça :";
"Keep a copy" = "Desar-ne una còpia";
"Please specify an address to which you want to forward your messages."
= "Especifiqueu l'adreça a la qual voleu redirigir els missatges.";
diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings
index 484f96545..5f15cf79d 100644
--- a/UI/PreferencesUI/Czech.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Přeposílat příchozí zprávy";
-"Forward to address :" = "Přeposílat na adresu :";
"Keep a copy" = "Ponechat kopii";
"Please specify an address to which you want to forward your messages."
= "Prosím zadejte adresu, na kterou chcete své zprávy přeposílat.";
diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
index 211f32f22..07bad8af5 100644
--- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
"Keep a copy" = "Keep a copy";
"Please specify an address to which you want to forward your messages."
= "Please specify an address to which you want to forward your messages.";
diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings
index fe036a9fd..390cabac9 100644
--- a/UI/PreferencesUI/English.lproj/Localizable.strings
+++ b/UI/PreferencesUI/English.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
"Keep a copy" = "Keep a copy";
"Please specify an address to which you want to forward your messages."
= "Please specify an address to which you want to forward your messages.";
@@ -108,6 +107,7 @@
/* Mailer */
"Show subscribed mailboxes only" = "Show subscribed mailboxes only";
+"Sort messages by threads" = "Sort messages by threads";
"Check for new mail:" = "Check for new mail:";
"messagecheck_manually" = "Manually";
"messagecheck_every_minute" = "Every minute";
diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings
index 4ffb2e0b4..9610c709d 100644
--- a/UI/PreferencesUI/French.lproj/Localizable.strings
+++ b/UI/PreferencesUI/French.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Transférer les messages entrant";
-"Forward to address :" = "Adresse de destination :";
"Keep a copy" = "Garder une copie";
"Please specify an address to which you want to forward your messages."
= "Veuillez définir une adresse à laquelle vous désirez transférer automatiquement vos nouveaux messages.";
diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings
index 217073650..69b83e968 100644
--- a/UI/PreferencesUI/German.lproj/Localizable.strings
+++ b/UI/PreferencesUI/German.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Ankommende Nachrichten weiterleiten";
-"Forward to address :" = "Weiterleiten an :";
"Keep a copy" = "Kopie behalten";
"Please specify an address to which you want to forward your messages."
= "Bitte Adresse angeben, an die Nachrichten weitergeleitet werden sollen.";
diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
index a3606a511..6d962735e 100644
--- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
"Keep a copy" = "Keep a copy";
"Please specify an address to which you want to forward your messages."
= "Please specify an address to which you want to forward your messages.";
diff --git a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
index 559c74544..1ef7cbf6f 100644
--- a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Áframsenda skilaboð sem berast";
-"Forward to address :" = "Áframsenda á netfangið :";
"Keep a copy" = "Halda afriti eftir";
"Please specify an address to which you want to forward your messages."
= "Hér þarf að skrá netfangið sem ný skilaboð eiga að áframsendast á";
@@ -148,7 +147,7 @@
"Please enter your signature below:" = "Setja má undirritun hér að neðan:";
/* Additional Parameters */
-"Additional Parameters" = "Additional Parameters";
+"Additional Parameters" = "Fleiri færibreytur";
/* password */
"New password:" = "Nýtt lykilorð:";
@@ -175,6 +174,7 @@
"French" = "Français";
"German" = "Deutsch";
"Hungarian" = "Magyar";
+"Icelandic" = "Íslenska";
"Italian" = "Italiano";
"Norwegian" = "Norsk";
"BrazilianPortuguese" = "Português brasileiro";
diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings
index 712ca0df3..8f837d84e 100644
--- a/UI/PreferencesUI/Italian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings
@@ -33,7 +33,6 @@
/* forward messages */
"Forward incoming messages" = "Inoltra i messaggi in arrivo";
-"Forward to address :" = "Inoltra all'indirizzo :";
"Keep a copy" = "Lascia una copia";
"Please specify an address to which you want to forward your messages."
= "Prego specificare l'indirizzo verso quale inoltrare i messaggi.";
diff --git a/UI/PreferencesUI/Norwegian.lproj/Localizable.strings b/UI/PreferencesUI/Norwegian.lproj/Localizable.strings
index 7736be0f4..950f28eab 100644
--- a/UI/PreferencesUI/Norwegian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Norwegian.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Videresend innkommende e-post";
-"Forward to address :" = "Videresend til adresse:";
"Keep a copy" = "Behold en kopi";
"Please specify an address to which you want to forward your messages."
= "Angi adressen du vil videresende dine meldinger til.";
diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings
index 987469f35..08c6fe575 100644
--- a/UI/PreferencesUI/Polish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings
@@ -33,7 +33,6 @@
/* forward messages */
"Forward incoming messages" = "Przekaż przychodzące wiadomości";
-"Forward to address :" = "Przekaż na adres :";
"Keep a copy" = "Zatrzymaj kopię";
"Please specify an address to which you want to forward your messages."
= "Podaj adres, na który chcesz przekazywać wiadomości.";
diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings
index dfa7d2467..b911512e1 100644
--- a/UI/PreferencesUI/Russian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
"Keep a copy" = "Keep a copy";
"Please specify an address to which you want to forward your messages."
= "Please specify an address to which you want to forward your messages.";
diff --git a/UI/PreferencesUI/Spanish.lproj/Localizable.strings b/UI/PreferencesUI/Spanish.lproj/Localizable.strings
index 47f339e0c..d7f0b222b 100644
--- a/UI/PreferencesUI/Spanish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Spanish.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Desvío de mensajes recibidos";
-"Forward to address :" = "Desviar a la dirección :";
"Keep a copy" = "Guardar una copia";
"Please specify an address to which you want to forward your messages."
= "Por favor, especificar una dirección para aquellos mensajes que quiere desviar.";
diff --git a/UI/PreferencesUI/Swedish.lproj/Localizable.strings b/UI/PreferencesUI/Swedish.lproj/Localizable.strings
index 96a2e24bb..e48b70b74 100644
--- a/UI/PreferencesUI/Swedish.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Swedish.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Vidarebefordra inkommande meddelanden";
-"Forward to address :" = "Vidarebefordra till adress:";
"Keep a copy" = "Spara en kopia";
"Please specify an address to which you want to forward your messages."
= "Ange adressen du vill vidarebefordra dina meddelanden till.";
diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m
index bb087356e..246546e64 100644
--- a/UI/PreferencesUI/UIxPreferences.m
+++ b/UI/PreferencesUI/UIxPreferences.m
@@ -859,13 +859,23 @@
- (void) setForwardAddress: (NSString *) forwardAddress
{
- [forwardOptions setObject: forwardAddress
+ NSArray *addresses;
+
+ addresses = [[forwardAddress componentsSeparatedByString: @","]
+ trimmedComponents];
+ [forwardOptions setObject: addresses
forKey: @"forwardAddress"];
}
- (NSString *) forwardAddress
{
- return [forwardOptions objectForKey: @"forwardAddress"];
+ id addresses;
+
+ addresses = [forwardOptions objectForKey: @"forwardAddress"];
+
+ return ([addresses respondsToSelector: @selector(componentsJoinedByString:)]
+ ? [(NSArray *)addresses componentsJoinedByString: @", "]
+ : (NSString *)addresses);
}
- (void) setForwardKeepCopy: (BOOL) keepCopy
diff --git a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
index 795207036..f5442fa85 100644
--- a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
@@ -35,7 +35,6 @@
/* forward messages */
"Forward incoming messages" = "Перенаправляти вхідні повідомлення";
-"Forward to address :" = "Перенаправляти на адреси :";
"Keep a copy" = "Зберігати копію";
"Please specify an address to which you want to forward your messages."
= "Будь ласка, зазначте адресу, на яку потрібно перенаправляти повідомлення, адресовані Вам.";
diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
index 40a8d2b6d..d4d9d220e 100644
--- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings
+++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings
@@ -32,7 +32,6 @@
/* forward messages */
"Forward incoming messages" = "Forward incoming messages";
-"Forward to address :" = "Forward to address :";
"Keep a copy" = "Keep a copy";
"Please specify an address to which you want to forward your messages."
= "Please specify an address to which you want to forward your messages.";
diff --git a/UI/Scheduler/Icelandic.lproj/Localizable.strings b/UI/Scheduler/Icelandic.lproj/Localizable.strings
index 904d7b61a..a82ab90cd 100644
--- a/UI/Scheduler/Icelandic.lproj/Localizable.strings
+++ b/UI/Scheduler/Icelandic.lproj/Localizable.strings
@@ -8,7 +8,7 @@
"Delete this event or task" = "Eyða þessum viðburði eða verkefni";
"Go to today" = "Skoða daginn í dag";
"Switch to day view" = "Skifta í dagasýn";
-"Switch to week view" = "Skifta í vikusýn<";
+"Switch to week view" = "Skifta í vikusýn";
"Switch to month view" = "Skifta í mánaðarsýn";
"Reload all calendars" = "Sækja öll dagatöl aftur";
@@ -43,7 +43,7 @@
"a2_Friday" = "Fö";
"a2_Saturday" = "La";
-"dayLabelFormat" = "%m/%d/%Y";
+"dayLabelFormat" = "%d/%m/%Y";
"today" = "Í dag";
"Previous Day" = "Fyrri dagur";
@@ -459,8 +459,8 @@ validate_endbeforestart = "Lokadagurinn sem er tilgreindur, er fyrr en byrjun
"Workweek days only" = "Aðeins vinnudagar";
"Tasks in View" = "Sýnd verkefni";
-"eventDeleteConfirmation" = "The following event(s) will be erased: \n%{0}\nWould you like to continue?";
-"taskDeleteConfirmation" = "The following task(s) will be erased: \n%{0}\nWould you like to continue?";
+"eventDeleteConfirmation" = "Eftirfarandi viðburði/viðburðum verður eytt: \n%{0}\nViltu halda áfram?";
+"taskDeleteConfirmation" = "Eftirfarandi verkefni/verkefnum verður eytt: \n%{0}\nViltu halda áfram?";
"You cannot remove nor unsubscribe from your personal calendar."
= "Ekki er hægt að fjarlægja eða segja upp áskrift að sínu eigin persónulega dagatali.";
@@ -496,7 +496,7 @@ validate_endbeforestart = "Lokadagurinn sem er tilgreindur, er fyrr en byrjun
"and" = "og";
"A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?"
-= "A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?";
+= "Árekstur við tíma hjá einum eða fleiri þáttakendum.\nEiga núverandi stillingar vera óbreyttar?";
/* apt list */
"Title" = "Titill";
@@ -552,10 +552,10 @@ vtodo_class2 = "(Verkefni er trúnaðarmál)";
"recurrenceUnsupported" = "Þessa tegund endurtekningar er ekki hægt að styðja enn sem komið er.";
"tagNotDefined" = "Þú þarft að tilgreina merki ef þú vilt samhæfa þetta dagatal.";
"tagAlreadyExists" = "Merkið sem þú tilgreindir er nú þegar bendlað við annað dagatal.";
-"tagHasChanged" = "If you change your calendar's tag, you'll need to reload the data on your mobile device.\nContinue?";
-"tagWasAdded" = "If you want to synchronize this calendar, you'll need to reload the data on your mobile device.\nContinue?";
-"tagWasRemoved" = "If you remove this calendar from synchronization, you'll need to reload the data on your mobile device.\nContinue?";
-"DestinationCalendarError" = "The source and destination calendars are the same. Please try to copy to a different calendar.";
+"tagHasChanged" = "Ef þú breytir merkingunni á dagatalinu þínu, þarftu að endurhlaða gögnum inn á farsíman þinn.\nHalda áfram?";
+"tagWasAdded" = "Ef þú vilt samhæfa þetta dagatal, þarftu að endurhlaða gögnum inn á farsíman þinn.\nHalda áfram?";
+"tagWasRemoved" = "Ef þú tekur þetta dagatali úr samhæfingu, þarftu að endurhlaða gögnum inn á farsíman þinn.\nHalda áfram?";
+"DestinationCalendarError" = "Upphafið og ákvörðunarstaðurinn á dagatölunum er sá sami. Betra væri að afrita gögn yfir í annað dagatal.";
"EventCopyError" = "Afritun mistókst. Það væri reynandi að afrita í annað dagatal.";
"Open Task..." = "Opna Verkefni...";
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox
index f0fdfe50c..b5b534412 100644
--- a/UI/Templates/PreferencesUI/UIxPreferences.wox
+++ b/UI/Templates/PreferencesUI/UIxPreferences.wox
@@ -376,12 +376,11 @@