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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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