merge of 'c65e5de16bdce7bebdde2adc5fd2504e2066e9f2'

and 'cdffa33720324e664e37834e059eaa9964d13092'

Monotone-Parent: c65e5de16bdce7bebdde2adc5fd2504e2066e9f2
Monotone-Parent: cdffa33720324e664e37834e059eaa9964d13092
Monotone-Revision: e347244635dd06d86b291dac5a5f75e1f9d61eb9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-05-30T21:16:09
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2011-05-30 21:16:09 +00:00
29 changed files with 62 additions and 62 deletions

View File

@@ -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}\".";
"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}\".";

View File

@@ -5,8 +5,8 @@
Efni: <#subject/><#newLine/>
Dags: <#date/><#newLine/>
Frá: <#from/><#newLine/>
<#hasReplyTo>Svara-til: <#replyTo/></#hasReplyTo><#hasOrganization>Skipulagseining: <#organization/></#hasOrganization>Till: <#to/><#newLine/>
<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenser: <#references/></#hasReferences><#newLine/>
<#hasReplyTo>Svara-til: <#replyTo/></#hasReplyTo><#hasOrganization>Skipulagseining: <#organization/></#hasOrganization>Til: <#to/><#newLine/>
<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Tilvísanir: <#references/></#hasReferences><#newLine/>
<#newLine/>
<#messageBody/><#newLine/>
<#newLine/>

View File

@@ -2,12 +2,12 @@
<#newLine/>
</#replyPlacementOnTop><#signaturePlacementOnTop><#newLine/>
<#signature/><#newLine/>
</#signaturePlacementOnTop><#outlookMode>-------- Orginalmeddelande --------<#newLine/>
</#signaturePlacementOnTop><#outlookMode>-------- Upprunalegur texti --------<#newLine/>
Efni: <#subject/><#newLine/>
Dags: <#date/><#newLine/>
Frá: <#from/><#newLine/>
<#hasReplyTo>Svara-til: <#replyTo/></#hasReplyTo><#hasOrganization>Organisation: <#organization/></#hasOrganization>Til: <#to/><#newLine/>
<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Referenser: <#references/></#hasReferences></#outlookMode><#newLine/>
<#hasCc>Afrit: <#cc/></#hasCc><#hasNewsGroups>Fréttahópar: <#newsgroups/></#hasNewsGroups><#hasReferences>Tilvísanir: <#references/></#hasReferences></#outlookMode><#newLine/>
<#standardMode>Þann <#date/>, skrifaði <#from/>:</#standardMode><#newLine/>
<#newLine/>
<#messageBody/><#newLine/>

View File

@@ -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Í.";

View File

@@ -1,4 +1,4 @@
/* Swedish */
/* Icelandic */
{
NSLanguageName = "Icelandic";
NSFormalName = "Íslenska";

View File

@@ -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.<br/><br/>
SOGo provides a rich AJAX-based Web interface and supports multiple native clients through the use of standard protocols such as CalDAV and CardDAV.<br/><br/>
SOGo is distributed under the <a href=\"http://gnu.org/licenses/gpl.html\">GNU GPL</a> 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.<br/><br/>
See <a href=\"http://www.sogo.nu/en/support/community.html\">this page</a> 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.<br/><br/>
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.<br/><br/>
SOGo er dreift í samkvæmt hugbúnaðarleyfinu <a href=\"http://gnu.org/licenses/gpl.html\">GNU GPL</a> ú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.<br/><br/>
S <a href=\"http://www.sogo.nu/en/support/community.html\">þessa síðu</a> 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.";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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.";

View File

@@ -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

View File

@@ -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."
= "Будь ласка, зазначте адресу, на яку потрібно перенаправляти повідомлення, адресовані Вам.";

View File

@@ -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.";

View File

@@ -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...";

View File

@@ -376,12 +376,11 @@
<var:string label:value="Forward incoming messages"/></label><br/>
<div id="forward">
<label><var:string label:value="Forward to address :"/>
<input type="text"
const:id="forwardAddress"
const:name="forwardAddress"
var:value="forwardAddress"
size="30" /></label><br/>
<label><var:string label:value="Email addresses (separated by commas) :"/><br/>
<textarea const:name="forwardAddress"
const:id="forwardAddress"
var:value="forwardAddress" />
</label><br/>
<label><input type="checkbox"
const:name="forwardKeepCopy"

View File

@@ -12,7 +12,7 @@
</var:if>
<var:if condition="isBody">
Mappen <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> hefur verið búinn til.
Mappan <var:string const:value='"' const:escapeHTML="NO"/><var:string value="displayName" const:escapeHTML="NO"/><var:string const:value='"' const:escapeHTML="NO"/> hefur verið búinn til.
<!--
Hægt er fá þessi aðföng með því að nota eftirfarandi URL:

View File

@@ -66,16 +66,18 @@ DIV.listWrapper
border-left: 1px solid #9b9b9b;
background: #ccddec; }
/* vacation */
/* vacation, forward */
#vacation, #forward
{ padding-left: 2.5em; }
#vacation LABEL
{ margin-left: 0; }
#vacation TEXTAREA
#vacation TEXTAREA,
#forward TEXTAREA
{ width: 100%; }
#vacation TEXTAREA#autoReplyText
{ height: 100px; }
#vacation TEXTAREA#autoReplyEmailAddresses
#vacation TEXTAREA#autoReplyEmailAddresses,
#forward TEXTAREA
{ height: 50px; }
#vacation SPAN
{ float: right; }
@@ -87,7 +89,7 @@ DIV.listWrapper
DIV#filtersListWrapper
{ bottom: 30px;
right: 2em;
top: 154px;
top: 164px;
left: 2em; }
TABLE#filtersList

View File

@@ -37,10 +37,12 @@ function savePreferences(sender) {
}
if ($("enableForward") && $("enableForward").checked) {
if (!emailRE.test($("forwardAddress").value)) {
alert(_("Please specify an address to which you want to forward your messages."));
sendForm = false;
}
var addresses = $("forwardAddress").value.split(",");
for (var i = 0; i < addresses.length && sendForm; i++)
if (!emailRE.test(addresses[i].strip())) {
alert(_("Please specify an address to which you want to forward your messages."));
sendForm = false;
}
}
if (isSieveScriptsEnabled) {