LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog 

Monotone-Parent: c3c5403094c30c3fc814d898f3de659d0ca951fc
Monotone-Revision: cdffa33720324e664e37834e059eaa9964d13092

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-05-27T20:53:16
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2011-05-27 20:53:16 +00:00
parent 9b07317a48
commit 68cb4e465a
21 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Catalan.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Czech.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Dutch.lproj/Localizable.strings
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.";

2
UI/PreferencesUI/English.lproj/Localizable.strings
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";

1
UI/PreferencesUI/French.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/German.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Hungarian.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Icelandic.lproj/Localizable.strings
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 á";

1
UI/PreferencesUI/Italian.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Norwegian.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Polish.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Russian.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Spanish.lproj/Localizable.strings
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.";

1
UI/PreferencesUI/Swedish.lproj/Localizable.strings
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.";

14
UI/PreferencesUI/UIxPreferences.m
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

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

1
UI/PreferencesUI/Welsh.lproj/Localizable.strings
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.";

11
UI/Templates/PreferencesUI/UIxPreferences.wox
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"

10
UI/WebServerResources/UIxPreferences.css
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

10
UI/WebServerResources/UIxPreferences.js
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) {