diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist index d23fa971a..17388f261 100644 --- a/SoObjects/SOGo/SOGoDefaults.plist +++ b/SoObjects/SOGo/SOGoDefaults.plist @@ -55,11 +55,11 @@ SOGoIMAPServer = "localhost"; SOGoMailDomain = "localhost"; SOGoSelectedAddressBook = "collected"; - SOGoMailMessageCheck = "manually"; + SOGoRefreshViewCheck = "manually"; SOGoMailMessageForwarding = "inline"; SOGoMailReplyPlacement = "below"; SOGoMailSignaturePlacement = "below"; - SOGoMailPollingIntervals = ( 1, 2, 5, 10, 20, 30, 60 ); + SOGoRefreshViewIntervals = ( 1, 2, 5, 10, 20, 30, 60 ); SOGoMailComposeMessageType = "text"; SOGoMailListViewColumnsOrder = ( "Thread", "Flagged", "Attachment", "Subject", "From", "Unread", "Date", "Priority", diff --git a/SoObjects/SOGo/SOGoDomainDefaults.h b/SoObjects/SOGo/SOGoDomainDefaults.h index a55bb572c..00a79cfe9 100644 --- a/SoObjects/SOGo/SOGoDomainDefaults.h +++ b/SoObjects/SOGo/SOGoDomainDefaults.h @@ -66,7 +66,7 @@ - (BOOL) foldersSendEMailNotifications; - (NSArray *) calendarDefaultRoles; - (NSArray *) contactsDefaultRoles; -- (NSArray *) mailPollingIntervals; +- (NSArray *) refreshViewIntervals; - (NSString *) subscriptionFolderFormat; - (NSString *) calendarDefaultCategoryColor; diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m index b602e8a9a..1a577c3f6 100644 --- a/SoObjects/SOGo/SOGoDomainDefaults.m +++ b/SoObjects/SOGo/SOGoDomainDefaults.m @@ -225,9 +225,9 @@ return [mailingMechanism lowercaseString]; } -- (NSArray *) mailPollingIntervals +- (NSArray *) refreshViewIntervals { - return [self arrayForKey: @"SOGoMailPollingIntervals"]; + return [self arrayForKey: @"SOGoRefreshViewIntervals"]; } - (NSString *) smtpServer diff --git a/SoObjects/SOGo/SOGoUserDefaults.h b/SoObjects/SOGo/SOGoUserDefaults.h index b8df5621b..4cb893b8d 100644 --- a/SoObjects/SOGo/SOGoUserDefaults.h +++ b/SoObjects/SOGo/SOGoUserDefaults.h @@ -117,8 +117,8 @@ extern NSString *SOGoWeekStartFirstFullWeek; - (void) setSelectedAddressBook: (NSString *) newValue; - (NSString *) selectedAddressBook; -- (void) setMailMessageCheck: (NSString *) newValue; -- (NSString *) mailMessageCheck; +- (void) setRefreshViewCheck: (NSString *) newValue; +- (NSString *) refreshViewCheck; - (void) setMailComposeMessageType: (NSString *) newValue; - (NSString *) mailComposeMessageType; diff --git a/SoObjects/SOGo/SOGoUserDefaults.m b/SoObjects/SOGo/SOGoUserDefaults.m index d6d1c3999..56c88c319 100644 --- a/SoObjects/SOGo/SOGoUserDefaults.m +++ b/SoObjects/SOGo/SOGoUserDefaults.m @@ -198,7 +198,7 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek"; @"SOGoLanguage", @"Language", @"SOGoMailComposeMessageType", @"ComposeMessagesType", @"SOGoSelectedAddressBook", @"SelectedAddressBook", - @"SOGoMailMessageCheck", @"MessageCheck", + @"SOGoRefreshViewCheck", @"refreshViewCheck", @"SOGoMailMessageForwarding", @"MessageForwarding", @"SOGoMailSignature", @"MailSignature", @"SOGoMailSignaturePlacement", @"SignaturePlacement", @@ -488,14 +488,14 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek"; return [self stringForKey: @"SOGoSelectedAddressBook"]; } -- (void) setMailMessageCheck: (NSString *) newValue +- (void) setRefreshViewCheck: (NSString *) newValue { - [self setObject: newValue forKey: @"SOGoMailMessageCheck"]; + [self setObject: newValue forKey: @"SOGoRefreshViewCheck"]; } -- (NSString *) mailMessageCheck +- (NSString *) refreshViewCheck { - return [self stringForKey: @"SOGoMailMessageCheck"]; + return [self stringForKey: @"SOGoRefreshViewCheck"]; } - (void) setMailComposeMessageType: (NSString *) newValue diff --git a/UI/PreferencesUI/Arabic.lproj/Localizable.strings b/UI/PreferencesUI/Arabic.lproj/Localizable.strings index 3b526b597..855e12075 100644 --- a/UI/PreferencesUI/Arabic.lproj/Localizable.strings +++ b/UI/PreferencesUI/Arabic.lproj/Localizable.strings @@ -127,14 +127,14 @@ "Show subscribed mailboxes only" = "عرض صناديق البريد المشترك بها فقط"; "Sort messages by threads" = "رتب الرسائل حسب المواضيع"; "Check for new mail:" = "تحقق من وجود بريد جديد:"; -"messagecheck_manually" = "يدوي"; -"messagecheck_every_minute" = "كل دقيقة"; -"messagecheck_every_2_minutes" = "كل 2 دقيقة"; -"messagecheck_every_5_minutes" = "كل 5 دقائق"; -"messagecheck_every_10_minutes" = "كل 10 دقائق"; -"messagecheck_every_20_minutes" = "كل 20 دقيقة"; -"messagecheck_every_30_minutes" = "كل 30 دقيقة"; -"messagecheck_once_per_hour" = "مرة كل ساعة"; +"refreshview_manually" = "يدوي"; +"refreshview_every_minute" = "كل دقيقة"; +"refreshview_every_2_minutes" = "كل 2 دقيقة"; +"refreshview_every_5_minutes" = "كل 5 دقائق"; +"refreshview_every_10_minutes" = "كل 10 دقائق"; +"refreshview_every_20_minutes" = "كل 20 دقيقة"; +"refreshview_every_30_minutes" = "كل 30 دقيقة"; +"refreshview_once_per_hour" = "مرة كل ساعة"; "Forward messages:" = "أعد توجيه الرسائل:"; "messageforward_inline" = "مضمنة"; @@ -199,7 +199,7 @@ "Contacts" = "دفتر العناوين"; "Mail" = "بريد"; "Last" = "أخر إستخدام"; -"Default module :" = "وحدة نمطية افتراضية :"; +"Default Module :" = "وحدة نمطية افتراضية :"; "Language :" = "اللغة:"; "choose" = "اختيار ..."; diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings index 933d6250f..eae77b19b 100644 --- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings @@ -127,14 +127,14 @@ "Show subscribed mailboxes only" = "Exibir somente caixas de correio inscritas"; "Sort messages by threads" = "Ordenar mensagens por tópicos"; "Check for new mail:" = "Checar novos emails:"; -"messagecheck_manually" = "Manualmente"; -"messagecheck_every_minute" = "A cada minuto"; -"messagecheck_every_2_minutes" = "A cada 2 minutos"; -"messagecheck_every_5_minutes" = "A cada 5 minutos"; -"messagecheck_every_10_minutes" = "A cada 10 minutos"; -"messagecheck_every_20_minutes" = "A cada 20 minutos"; -"messagecheck_every_30_minutes" = "A cada 30 minutos"; -"messagecheck_once_per_hour" = "Uma vez por hora"; +"refreshview_manually" = "Manualmente"; +"refreshview_every_minute" = "A cada minuto"; +"refreshview_every_2_minutes" = "A cada 2 minutos"; +"refreshview_every_5_minutes" = "A cada 5 minutos"; +"refreshview_every_10_minutes" = "A cada 10 minutos"; +"refreshview_every_20_minutes" = "A cada 20 minutos"; +"refreshview_every_30_minutes" = "A cada 30 minutos"; +"refreshview_once_per_hour" = "Uma vez por hora"; "Forward messages:" = "Encaminhar mensagens:"; "messageforward_inline" = "No corpo da mensagem"; @@ -199,7 +199,7 @@ "Contacts" = "Catálogo"; "Mail" = "Correio"; "Last" = "Último usado"; -"Default module :" = "Módulo Padrão:"; +"Default Module :" = "Módulo Padrão:"; "Language :" = "Idioma :"; "choose" = "Escolha ..."; diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings index 2668c029b..e0b312133 100644 --- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings +++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings @@ -127,14 +127,14 @@ "Show subscribed mailboxes only" = "Mostrar només les bústies subscrites"; "Sort messages by threads" = "Ordenar els missatges per temes"; "Check for new mail:" = "Comprovar nou correu: "; -"messagecheck_manually" = "Manualment"; -"messagecheck_every_minute" = "Cada minut"; -"messagecheck_every_2_minutes" = "Cada 2 minuts"; -"messagecheck_every_5_minutes" = "Cada 5 minuts"; -"messagecheck_every_10_minutes" = "Cada 10 minuts"; -"messagecheck_every_20_minutes" = "Cada 20 minuts"; -"messagecheck_every_30_minutes" = "Cada 30 minuts"; -"messagecheck_once_per_hour" = "Cada hora"; +"refreshview_manually" = "Manualment"; +"refreshview_every_minute" = "Cada minut"; +"refreshview_every_2_minutes" = "Cada 2 minuts"; +"refreshview_every_5_minutes" = "Cada 5 minuts"; +"refreshview_every_10_minutes" = "Cada 10 minuts"; +"refreshview_every_20_minutes" = "Cada 20 minuts"; +"refreshview_every_30_minutes" = "Cada 30 minuts"; +"refreshview_once_per_hour" = "Cada hora"; "Forward messages:" = "Reenviar missatges:"; "messageforward_inline" = "Incorporats"; @@ -199,7 +199,7 @@ "Contacts" = "Llibreta d'adreces"; "Mail" = "Correu"; "Last" = "Últim usat"; -"Default module :" = "Pàgina per defecte :"; +"Default Module :" = "Pàgina per defecte :"; "Language :" = "Language :"; "choose" = "Choose ..."; diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings index bcf32ab2c..1eb6a83d1 100644 --- a/UI/PreferencesUI/Czech.lproj/Localizable.strings +++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings @@ -131,14 +131,14 @@ "Sort messages by threads" = "Třídit zprávy podle souvislostí"; "When sending mail, add unknown recipients to my" = "Automaticky přidávat odchozí e-mailovou adresu do složky:"; "Check for new mail:" = "Zkontrolovat novou poštu:"; -"messagecheck_manually" = "Manuálně"; -"messagecheck_every_minute" = "Každou minutu"; -"messagecheck_every_2_minutes" = "Každé 2 minuty"; -"messagecheck_every_5_minutes" = "Každých 5 minut"; -"messagecheck_every_10_minutes" = "Každých 10 minut"; -"messagecheck_every_20_minutes" = "Každých 20 minut"; -"messagecheck_every_30_minutes" = "Každých 30 minut"; -"messagecheck_once_per_hour" = "Jednou za hodinu"; +"refreshview_manually" = "Manuálně"; +"refreshview_every_minute" = "Každou minutu"; +"refreshview_every_2_minutes" = "Každé 2 minuty"; +"refreshview_every_5_minutes" = "Každých 5 minut"; +"refreshview_every_10_minutes" = "Každých 10 minut"; +"refreshview_every_20_minutes" = "Každých 20 minut"; +"refreshview_every_30_minutes" = "Každých 30 minut"; +"refreshview_once_per_hour" = "Jednou za hodinu"; "Forward messages:" = "Přeposlat zprávy:"; "messageforward_inline" = "Do řady"; @@ -207,8 +207,8 @@ "Contacts" = "Adresář"; "Mail" = "Pošta"; "Last" = "Naposledy použitý"; -"Default module :" = "Výchozí modul :"; -"SOGo version:" = "SOGo verze:"; +"Default Module :" = "Výchozí modul :"; +"SOGo Version :" = "SOGo verze:"; "Language :" = "Jazyk :"; "choose" = "Vybrat ..."; diff --git a/UI/PreferencesUI/Danish.lproj/Localizable.strings b/UI/PreferencesUI/Danish.lproj/Localizable.strings index ad2b8b98c..903abf10d 100644 --- a/UI/PreferencesUI/Danish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Danish.lproj/Localizable.strings @@ -127,14 +127,14 @@ "Show subscribed mailboxes only" = "Vis kun abonnerede postkasser"; "Sort messages by threads" = "Sortér beskeder efter tråd"; "Check for new mail:" = "Tjek for ny post:"; -"messagecheck_manually" = "Manuelt"; -"messagecheck_every_minute" = "Hvert minut"; -"messagecheck_every_2_minutes" = "Hvert 2. minut"; -"messagecheck_every_5_minutes" = "Hvert 5. minut"; -"messagecheck_every_10_minutes" = "Hvert 10. minut"; -"messagecheck_every_20_minutes" = "Hvert 20. minut"; -"messagecheck_every_30_minutes" = "Hvert 30. minut"; -"messagecheck_once_per_hour" = "Én gang i timen"; +"refreshview_manually" = "Manuelt"; +"refreshview_every_minute" = "Hvert minut"; +"refreshview_every_2_minutes" = "Hvert 2. minut"; +"refreshview_every_5_minutes" = "Hvert 5. minut"; +"refreshview_every_10_minutes" = "Hvert 10. minut"; +"refreshview_every_20_minutes" = "Hvert 20. minut"; +"refreshview_every_30_minutes" = "Hvert 30. minut"; +"refreshview_once_per_hour" = "Én gang i timen"; "Forward messages:" = "Videresend beskeder:"; "messageforward_inline" = "På linie"; @@ -199,7 +199,7 @@ "Contacts" = "Adressebog"; "Mail" = "Mail"; "Last" = "Sidst anvendt"; -"Default module :" = "Standard modul:"; +"Default Module :" = "Standard modul:"; "Language :" = "Sprog:"; "choose" = "Vælg ..."; diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings index 5135fe739..2d2b14852 100644 --- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings +++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings @@ -131,14 +131,14 @@ "Sort messages by threads" = "Berichten sorteren op threads"; "When sending mail, add unknown recipients to my" = "Bij het versturen van mail, voeg onbekende ontvangers toe aan mijn"; "Check for new mail:" = "Controleren op nieuwe mail:"; -"messagecheck_manually" = "Handmatig"; -"messagecheck_every_minute" = "Iedere minuut"; -"messagecheck_every_2_minutes" = "Iedere 2 minuten"; -"messagecheck_every_5_minutes" = "Iedere 5 minuten"; -"messagecheck_every_10_minutes" = "Iedere 10 minuten"; -"messagecheck_every_20_minutes" = "Iedere 20 minuten"; -"messagecheck_every_30_minutes" = "Iedere 30 minuten"; -"messagecheck_once_per_hour" = "Ieder uur"; +"refreshview_manually" = "Handmatig"; +"refreshview_every_minute" = "Iedere minuut"; +"refreshview_every_2_minutes" = "Iedere 2 minuten"; +"refreshview_every_5_minutes" = "Iedere 5 minuten"; +"refreshview_every_10_minutes" = "Iedere 10 minuten"; +"refreshview_every_20_minutes" = "Iedere 20 minuten"; +"refreshview_every_30_minutes" = "Iedere 30 minuten"; +"refreshview_once_per_hour" = "Ieder uur"; "Forward messages:" = "Berichten doorsturen:"; "messageforward_inline" = "In het bericht"; @@ -207,8 +207,8 @@ "Contacts" = "Adresboek"; "Mail" = "Mail"; "Last" = "Laatst gebruikt"; -"Default module :" = "Standaardmodule:"; -"SOGo version:" = "SOGo versie:"; +"Default Module :" = "Standaardmodule:"; +"SOGo Version :" = "SOGo versie:"; "Language :" = "Taal:"; "choose" = "Kies..."; diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index 7c31da1f4..65219eec9 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -134,15 +134,6 @@ "Show subscribed mailboxes only" = "Show subscribed mailboxes only"; "Sort messages by threads" = "Sort messages by threads"; "When sending mail, add unknown recipients to my" = "When sending mail, add unknown recipients to my"; -"Check for new mail:" = "Check for new mail:"; -"messagecheck_manually" = "Manually"; -"messagecheck_every_minute" = "Every minute"; -"messagecheck_every_2_minutes" = "Every 2 minutes"; -"messagecheck_every_5_minutes" = "Every 5 minutes"; -"messagecheck_every_10_minutes" = "Every 10 minutes"; -"messagecheck_every_20_minutes" = "Every 20 minutes"; -"messagecheck_every_30_minutes" = "Every 30 minutes"; -"messagecheck_once_per_hour" = "Once per hour"; "Forward messages:" = "Forward messages:"; "messageforward_inline" = "Inline"; @@ -211,8 +202,8 @@ "Contacts" = "Address Book"; "Mail" = "Mail"; "Last" = "Last used"; -"Default module :" = "Default module:"; -"SOGo version:" = "SOGo version:"; +"Default Module :" = "Default Module:"; +"SOGo Version :" = "SOGo Version:"; "Language :" = "Language:"; "choose" = "Choose ..."; @@ -240,6 +231,16 @@ "Ukrainian" = "Українська"; "Welsh" = "Cymraeg"; +"Refresh View :" = "Refresh View:"; +"refreshview_manually" = "Manually"; +"refreshview_every_minute" = "Every minute"; +"refreshview_every_2_minutes" = "Every 2 minutes"; +"refreshview_every_5_minutes" = "Every 5 minutes"; +"refreshview_every_10_minutes" = "Every 10 minutes"; +"refreshview_every_20_minutes" = "Every 20 minutes"; +"refreshview_every_30_minutes" = "Every 30 minutes"; +"refreshview_once_per_hour" = "Once per hour"; + /* Return receipts */ "When I receive a request for a return receipt:" = "When I receive a request for a return receipt:"; "Never send a return receipt" = "Never send a return receipt"; diff --git a/UI/PreferencesUI/Finnish.lproj/Localizable.strings b/UI/PreferencesUI/Finnish.lproj/Localizable.strings index 1224ac125..4769f69e0 100644 --- a/UI/PreferencesUI/Finnish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Finnish.lproj/Localizable.strings @@ -135,14 +135,14 @@ "Sort messages by threads" = "Järjestä viestit ketjuiksi"; "When sending mail, add unknown recipients to my" = "Postia lähettäessä lisää tuntemattomat vastaanottajat"; "Check for new mail:" = "Hae uudet sähköpostit"; -"messagecheck_manually" = "Manuaalisesti"; -"messagecheck_every_minute" = "Joka minuutti"; -"messagecheck_every_2_minutes" = "Joka toinen minuutti"; -"messagecheck_every_5_minutes" = "Viiden minuutin välein"; -"messagecheck_every_10_minutes" = "10 minuutin välein"; -"messagecheck_every_20_minutes" = "20 minuutin välein"; -"messagecheck_every_30_minutes" = "Puolen tunnin välein"; -"messagecheck_once_per_hour" = "Kerran tunnissa "; +"refreshview_manually" = "Manuaalisesti"; +"refreshview_every_minute" = "Joka minuutti"; +"refreshview_every_2_minutes" = "Joka toinen minuutti"; +"refreshview_every_5_minutes" = "Viiden minuutin välein"; +"refreshview_every_10_minutes" = "10 minuutin välein"; +"refreshview_every_20_minutes" = "20 minuutin välein"; +"refreshview_every_30_minutes" = "Puolen tunnin välein"; +"refreshview_once_per_hour" = "Kerran tunnissa "; "Forward messages:" = "Edelleenlähetä viestit:"; "messageforward_inline" = "Tekstisisällössä"; @@ -211,8 +211,8 @@ "Contacts" = "Osoitekirja"; "Mail" = "Sähköposti"; "Last" = "Viimeksi käytetty"; -"Default module :" = "Oletusmoduli:"; -"SOGo version:" = "SOGo versio:"; +"Default Module :" = "Oletusmoduli:"; +"SOGo Version :" = "SOGo versio:"; "Language :" = "Kieli:"; "choose" = "Valitse..."; diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings index 23c323376..53b9403a8 100644 --- a/UI/PreferencesUI/French.lproj/Localizable.strings +++ b/UI/PreferencesUI/French.lproj/Localizable.strings @@ -135,14 +135,14 @@ "Sort messages by threads" = "Grouper les discussions"; "When sending mail, add unknown recipients to my" = "Lors de l'envoi d'un message, ajouter les destinataires inconnus au carnet"; "Check for new mail:" = "Vérifier l'arrivée de messages :"; -"messagecheck_manually" = "Manuellement"; -"messagecheck_every_minute" = "Chaque minute"; -"messagecheck_every_2_minutes" = "Toutes les 2 minutes"; -"messagecheck_every_5_minutes" = "Toutes les 5 minutes"; -"messagecheck_every_10_minutes" = "Toutes les 10 minutes"; -"messagecheck_every_20_minutes" = "Toutes les 20 minutes"; -"messagecheck_every_30_minutes" = "Toutes les 30 minutes"; -"messagecheck_once_per_hour" = "Une fois par heure"; +"refreshview_manually" = "Manuellement"; +"refreshview_every_minute" = "Chaque minute"; +"refreshview_every_2_minutes" = "Toutes les 2 minutes"; +"refreshview_every_5_minutes" = "Toutes les 5 minutes"; +"refreshview_every_10_minutes" = "Toutes les 10 minutes"; +"refreshview_every_20_minutes" = "Toutes les 20 minutes"; +"refreshview_every_30_minutes" = "Toutes les 30 minutes"; +"refreshview_once_per_hour" = "Une fois par heure"; "Forward messages:" = "Transférer les messages :"; "messageforward_inline" = "intégrés"; @@ -211,8 +211,8 @@ "Contacts" = "Carnet d'adresses"; "Mail" = "Courrier"; "Last" = "Dernier utilisé"; -"Default module :" = "Module par défaut :"; -"SOGo version:" = "Version :"; +"Default Module :" = "Module par défaut :"; +"SOGo Version :" = "Version :"; "Language :" = "Langue :"; "choose" = "Choisir ..."; diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings index 393e5e883..baca7235c 100644 --- a/UI/PreferencesUI/German.lproj/Localizable.strings +++ b/UI/PreferencesUI/German.lproj/Localizable.strings @@ -135,14 +135,14 @@ "Sort messages by threads" = "Nachrichten nach Thema sortieren"; "When sending mail, add unknown recipients to my" = "Unbekannte Empfänger meiner E-Mails hinzufügen zu"; "Check for new mail:" = "Auf neue Nachrichten prüfen:"; -"messagecheck_manually" = "Manuell"; -"messagecheck_every_minute" = "Minütlich"; -"messagecheck_every_2_minutes" = "Alle 2 Minuten"; -"messagecheck_every_5_minutes" = "Alle 5 Minuten"; -"messagecheck_every_10_minutes" = "Alle 10 Minuten"; -"messagecheck_every_20_minutes" = "Alle 20 Minuten"; -"messagecheck_every_30_minutes" = "Alle 30 Minuten"; -"messagecheck_once_per_hour" = "Stündlich"; +"refreshview_manually" = "Manuell"; +"refreshview_every_minute" = "Minütlich"; +"refreshview_every_2_minutes" = "Alle 2 Minuten"; +"refreshview_every_5_minutes" = "Alle 5 Minuten"; +"refreshview_every_10_minutes" = "Alle 10 Minuten"; +"refreshview_every_20_minutes" = "Alle 20 Minuten"; +"refreshview_every_30_minutes" = "Alle 30 Minuten"; +"refreshview_once_per_hour" = "Stündlich"; "Forward messages:" = "Nachrichten weiterleiten:"; "messageforward_inline" = "Eingebunden"; @@ -211,8 +211,8 @@ "Contacts" = "Adressbuch"; "Mail" = "E-Mail"; "Last" = "Zuletzt benutztes"; -"Default module :" = "Standard Modul:"; -"SOGo version:" = "SOGo Version:"; +"Default Module :" = "Standard Modul:"; +"SOGo Version :" = "SOGo Version:"; "Language :" = "Sprache:"; "choose" = "Auswählen ..."; diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings index d4be47a0c..7853d9790 100644 --- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings @@ -131,14 +131,14 @@ "Sort messages by threads" = "Üzenetek beszélgetések szerinti rendezése "; "When sending mail, add unknown recipients to my" = "Levél küldésekor az ismeretlen címeket adja hozzá a következőhöz"; "Check for new mail:" = "Új üzenetek letöltése:"; -"messagecheck_manually" = "Kézi"; -"messagecheck_every_minute" = "Percenként"; -"messagecheck_every_2_minutes" = "Kétpercenként"; -"messagecheck_every_5_minutes" = "Ötpercenként"; -"messagecheck_every_10_minutes" = "Tízpercenként"; -"messagecheck_every_20_minutes" = "Húszpercenként"; -"messagecheck_every_30_minutes" = "Harminc percenként"; -"messagecheck_once_per_hour" = "Óránként"; +"refreshview_manually" = "Kézi"; +"refreshview_every_minute" = "Percenként"; +"refreshview_every_2_minutes" = "Kétpercenként"; +"refreshview_every_5_minutes" = "Ötpercenként"; +"refreshview_every_10_minutes" = "Tízpercenként"; +"refreshview_every_20_minutes" = "Húszpercenként"; +"refreshview_every_30_minutes" = "Harminc percenként"; +"refreshview_once_per_hour" = "Óránként"; "Forward messages:" = "Üzenetek továbbítása:"; "messageforward_inline" = "Levélként"; @@ -207,8 +207,8 @@ "Contacts" = "Címjegyzék"; "Mail" = "Levél"; "Last" = "Utoljára használt"; -"Default module :" = "Alapértelmezett modul"; -"SOGo version:" = "SOGo verzió:"; +"Default Module :" = "Alapértelmezett modul"; +"SOGo Version :" = "SOGo verzió:"; "Language :" = "Nyelv :"; "choose" = "Válasszon ..."; diff --git a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings index c4b496ecd..264172a04 100644 --- a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings +++ b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings @@ -107,14 +107,14 @@ "Label" = "Merki"; "Show subscribed mailboxes only" = "Sýna aðeins pósthólf sem eru í áskrift"; "Check for new mail:" = "Sækja nýjan póst:"; -"messagecheck_manually" = "Handvirkt"; -"messagecheck_every_minute" = "Hverjar mínútu"; -"messagecheck_every_2_minutes" = "Hverjar 2 mínútur"; -"messagecheck_every_5_minutes" = "Hverjar 5 mínútur"; -"messagecheck_every_10_minutes" = "Hverjar 10 mínútur"; -"messagecheck_every_20_minutes" = "Hverjar 20 mínútur"; -"messagecheck_every_30_minutes" = "Hverjar 30 mínútur"; -"messagecheck_once_per_hour" = "Á klukkustundar fresti"; +"refreshview_manually" = "Handvirkt"; +"refreshview_every_minute" = "Hverjar mínútu"; +"refreshview_every_2_minutes" = "Hverjar 2 mínútur"; +"refreshview_every_5_minutes" = "Hverjar 5 mínútur"; +"refreshview_every_10_minutes" = "Hverjar 10 mínútur"; +"refreshview_every_20_minutes" = "Hverjar 20 mínútur"; +"refreshview_every_30_minutes" = "Hverjar 30 mínútur"; +"refreshview_once_per_hour" = "Á klukkustundar fresti"; "Forward messages:" = "Áframsenda póst:"; "messageforward_inline" = "Innfellt"; @@ -169,7 +169,7 @@ "Contacts" = "Nafnaskrá"; "Mail" = "Póstur"; "Last" = "Síðast notað"; -"Default module :" = "Sjálfgefið viðmót :"; +"Default Module :" = "Sjálfgefið viðmót :"; "Language :" = "Tungumál :"; "choose" = "Velja..."; diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings index 546109f36..dda3400af 100644 --- a/UI/PreferencesUI/Italian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings @@ -127,14 +127,14 @@ "Show subscribed mailboxes only" = "Mostra solo le cartelle sottoscritte"; "Sort messages by threads" = "Ordina i messaggi per conversazione"; "Check for new mail:" = "Controlla la posta in arrivo:"; -"messagecheck_manually" = "Manualmente"; -"messagecheck_every_minute" = "Ogni minuto"; -"messagecheck_every_2_minutes" = "Ogni 2 minuti"; -"messagecheck_every_5_minutes" = "Ogni 5 minuti"; -"messagecheck_every_10_minutes" = "Ogni 10 minuti"; -"messagecheck_every_20_minutes" = "Ogni 20 minuti"; -"messagecheck_every_30_minutes" = "Ogni 30 minuti"; -"messagecheck_once_per_hour" = "Ogni ora"; +"refreshview_manually" = "Manualmente"; +"refreshview_every_minute" = "Ogni minuto"; +"refreshview_every_2_minutes" = "Ogni 2 minuti"; +"refreshview_every_5_minutes" = "Ogni 5 minuti"; +"refreshview_every_10_minutes" = "Ogni 10 minuti"; +"refreshview_every_20_minutes" = "Ogni 20 minuti"; +"refreshview_every_30_minutes" = "Ogni 30 minuti"; +"refreshview_once_per_hour" = "Ogni ora"; "Forward messages:" = "Inoltra messaggi come:"; "messageforward_inline" = "Parte del messaggio"; @@ -190,7 +190,7 @@ "Contacts" = "Rubrica"; "Mail" = "Posta"; "Last" = "Ultimo usato"; -"Default module :" = "Modulo di default :"; +"Default Module :" = "Modulo di default :"; "Language :" = "Lingua :"; "choose" = "Scegli..."; diff --git a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings index 221db266c..d8fe5de2c 100644 --- a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings @@ -127,14 +127,14 @@ "Show subscribed mailboxes only" = "Vis bare abonnerte postbokser"; "Sort messages by threads" = "Sorter meldinger etter tråder"; "Check for new mail:" = "Hent ny post:"; -"messagecheck_manually" = "Manuelt"; -"messagecheck_every_minute" = "Hvert minutt"; -"messagecheck_every_2_minutes" = "Hvert 2. minutt"; -"messagecheck_every_5_minutes" = "Hvert 5. minutt"; -"messagecheck_every_10_minutes" = "Hvert 10. minutt"; -"messagecheck_every_20_minutes" = "Hvert 20. minutt"; -"messagecheck_every_30_minutes" = "Hvert 30. minutt"; -"messagecheck_once_per_hour" = "Hver time"; +"refreshview_manually" = "Manuelt"; +"refreshview_every_minute" = "Hvert minutt"; +"refreshview_every_2_minutes" = "Hvert 2. minutt"; +"refreshview_every_5_minutes" = "Hvert 5. minutt"; +"refreshview_every_10_minutes" = "Hvert 10. minutt"; +"refreshview_every_20_minutes" = "Hvert 20. minutt"; +"refreshview_every_30_minutes" = "Hvert 30. minutt"; +"refreshview_once_per_hour" = "Hver time"; "Forward messages:" = "Videresend meldinger:"; "messageforward_inline" = "Innsatt"; @@ -199,7 +199,7 @@ "Contacts" = "Adressebok"; "Mail" = "E-post"; "Last" = "Sist besøkt"; -"Default module :" = "Standardmodul:"; +"Default Module :" = "Standardmodul:"; "Language :" = "Språk:"; "choose" = "Velg ..."; diff --git a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings index 718b758bc..3c8f23b64 100644 --- a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings @@ -114,14 +114,14 @@ "Show subscribed mailboxes only" = "Vis bare abonnerte postbokser"; "Sort messages by threads" = "Sort messages by threads"; "Check for new mail:" = "Hent ny post:"; -"messagecheck_manually" = "Manuelt"; -"messagecheck_every_minute" = "Hvert minutt"; -"messagecheck_every_2_minutes" = "Hvert 2 minutt"; -"messagecheck_every_5_minutes" = "Hvert 5 minutt"; -"messagecheck_every_10_minutes" = "Hvert 10 minutt"; -"messagecheck_every_20_minutes" = "Hvert 20 minutt"; -"messagecheck_every_30_minutes" = "Hvert 30 minutt"; -"messagecheck_once_per_hour" = "Hver time"; +"refreshview_manually" = "Manuelt"; +"refreshview_every_minute" = "Hvert minutt"; +"refreshview_every_2_minutes" = "Hvert 2 minutt"; +"refreshview_every_5_minutes" = "Hvert 5 minutt"; +"refreshview_every_10_minutes" = "Hvert 10 minutt"; +"refreshview_every_20_minutes" = "Hvert 20 minutt"; +"refreshview_every_30_minutes" = "Hvert 30 minutt"; +"refreshview_once_per_hour" = "Hver time"; "Forward messages:" = "Videresend melding:"; "messageforward_inline" = "Innsatt"; @@ -176,7 +176,7 @@ "Contacts" = "Adressebok"; "Mail" = "E-post"; "Last" = "Sist besøkt"; -"Default module :" = "Standardmodul:"; +"Default Module :" = "Standardmodul:"; "Language :" = "Språk:"; "choose" = "Velg ..."; diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings index 1144a3740..0799869aa 100644 --- a/UI/PreferencesUI/Polish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings @@ -131,14 +131,14 @@ "Sort messages by threads" = "Sortuj wiadomości według wątków"; "When sending mail, add unknown recipients to my" = "Gdy wysyłam e-mail, dodaj adresy nowych odbiorców do"; "Check for new mail:" = "Sprawdzaj nowe wiadomości:"; -"messagecheck_manually" = "ręcznie"; -"messagecheck_every_minute" = "co minutę"; -"messagecheck_every_2_minutes" = "co 2 minuty"; -"messagecheck_every_5_minutes" = "co 5 minut"; -"messagecheck_every_10_minutes" = "co 10 minut"; -"messagecheck_every_20_minutes" = "co 20 minut"; -"messagecheck_every_30_minutes" = "co 30 minut"; -"messagecheck_once_per_hour" = "raz na godzinę"; +"refreshview_manually" = "ręcznie"; +"refreshview_every_minute" = "co minutę"; +"refreshview_every_2_minutes" = "co 2 minuty"; +"refreshview_every_5_minutes" = "co 5 minut"; +"refreshview_every_10_minutes" = "co 10 minut"; +"refreshview_every_20_minutes" = "co 20 minut"; +"refreshview_every_30_minutes" = "co 30 minut"; +"refreshview_once_per_hour" = "raz na godzinę"; "Forward messages:" = "Przekaż wiadomości:"; "messageforward_inline" = "w treści"; @@ -207,8 +207,8 @@ "Contacts" = "Książka adresowa"; "Mail" = "Poczta"; "Last" = "Ostatnio używane"; -"Default module :" = "Tryb domyślny:"; -"SOGo version:" = "Wersja SOGo:"; +"Default Module :" = "Tryb domyślny:"; +"SOGo Version :" = "Wersja SOGo:"; "Language :" = "Język:"; "choose" = "Wybierz"; diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings index b9fcba4d9..59876e6e7 100644 --- a/UI/PreferencesUI/Russian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings @@ -131,14 +131,14 @@ "Sort messages by threads" = "Сортировать сообщения по нитям"; "When sending mail, add unknown recipients to my" = "При отправке писем добавлять неизвестных получателей в мою"; "Check for new mail:" = "Проверять новую почту:"; -"messagecheck_manually" = "Вручную"; -"messagecheck_every_minute" = "Каждую минуту"; -"messagecheck_every_2_minutes" = "Каждые 2 минуты"; -"messagecheck_every_5_minutes" = "Каждые 5 минут"; -"messagecheck_every_10_minutes" = "Каждые 10 минут"; -"messagecheck_every_20_minutes" = "Каждые 20 минут"; -"messagecheck_every_30_minutes" = "Каждые 30 минут"; -"messagecheck_once_per_hour" = "Раз в час"; +"refreshview_manually" = "Вручную"; +"refreshview_every_minute" = "Каждую минуту"; +"refreshview_every_2_minutes" = "Каждые 2 минуты"; +"refreshview_every_5_minutes" = "Каждые 5 минут"; +"refreshview_every_10_minutes" = "Каждые 10 минут"; +"refreshview_every_20_minutes" = "Каждые 20 минут"; +"refreshview_every_30_minutes" = "Каждые 30 минут"; +"refreshview_once_per_hour" = "Раз в час"; "Forward messages:" = "Пересылать сообщения:"; "messageforward_inline" = "В теле письма"; @@ -207,8 +207,8 @@ "Contacts" = "Адресная книга"; "Mail" = "Почта"; "Last" = "Последнее использование"; -"Default module :" = "Модуль по умолчанию :"; -"SOGo version:" = "Версия SOGo:"; +"Default Module :" = "Модуль по умолчанию :"; +"SOGo Version :" = "Версия SOGo:"; "Language :" = "Язык :"; "choose" = "Выбрать ..."; diff --git a/UI/PreferencesUI/Slovak.lproj/Localizable.strings b/UI/PreferencesUI/Slovak.lproj/Localizable.strings index dc8208fa2..e564e8c50 100644 --- a/UI/PreferencesUI/Slovak.lproj/Localizable.strings +++ b/UI/PreferencesUI/Slovak.lproj/Localizable.strings @@ -131,14 +131,14 @@ "Sort messages by threads" = "Zoraď správy do konverzácií"; "When sending mail, add unknown recipients to my" = "Pri odosielaní emailu, pridaj neznámych príjemcov do môjho"; "Check for new mail:" = "Kontrola nových mailov:"; -"messagecheck_manually" = "Ručne"; -"messagecheck_every_minute" = "Každú minútu"; -"messagecheck_every_2_minutes" = "Každé 2 minúty"; -"messagecheck_every_5_minutes" = "Každých 5 minút"; -"messagecheck_every_10_minutes" = "Každých 10 minút"; -"messagecheck_every_20_minutes" = "Každých 20 minút"; -"messagecheck_every_30_minutes" = "Každých 30 minút"; -"messagecheck_once_per_hour" = "Raz za hodinu"; +"refreshview_manually" = "Ručne"; +"refreshview_every_minute" = "Každú minútu"; +"refreshview_every_2_minutes" = "Každé 2 minúty"; +"refreshview_every_5_minutes" = "Každých 5 minút"; +"refreshview_every_10_minutes" = "Každých 10 minút"; +"refreshview_every_20_minutes" = "Každých 20 minút"; +"refreshview_every_30_minutes" = "Každých 30 minút"; +"refreshview_once_per_hour" = "Raz za hodinu"; "Forward messages:" = "Preposielaj správy:"; "messageforward_inline" = "Vrade"; @@ -207,8 +207,8 @@ "Contacts" = "Adresár"; "Mail" = "Pošta"; "Last" = "Naposledy použité"; -"Default module :" = "Predvolený modul:"; -"SOGo version:" = "Verzia SOGo:"; +"Default Module :" = "Predvolený modul:"; +"SOGo Version :" = "Verzia SOGo:"; "Language :" = "Jazyk:"; "choose" = "Vyber..."; diff --git a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings index c2b003477..98f09d019 100644 --- a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +++ b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings @@ -131,14 +131,14 @@ "Sort messages by threads" = "Ordenar mensajes por conversaciones"; "When sending mail, add unknown recipients to my" = "Al enviar correos, agregar destinatarios desconocidos a mi"; "Check for new mail:" = "Comprobar si hay nuevos correos: "; -"messagecheck_manually" = "Manualmente"; -"messagecheck_every_minute" = "Cada minuto"; -"messagecheck_every_2_minutes" = "Cada 2 minutos"; -"messagecheck_every_5_minutes" = "Cada 5 minutos"; -"messagecheck_every_10_minutes" = "Cada 10 minutos"; -"messagecheck_every_20_minutes" = "Cada 20 minutos"; -"messagecheck_every_30_minutes" = "Cada 30 minutos"; -"messagecheck_once_per_hour" = "Cada hora"; +"refreshview_manually" = "Manualmente"; +"refreshview_every_minute" = "Cada minuto"; +"refreshview_every_2_minutes" = "Cada 2 minutos"; +"refreshview_every_5_minutes" = "Cada 5 minutos"; +"refreshview_every_10_minutes" = "Cada 10 minutos"; +"refreshview_every_20_minutes" = "Cada 20 minutos"; +"refreshview_every_30_minutes" = "Cada 30 minutos"; +"refreshview_once_per_hour" = "Cada hora"; "Forward messages:" = "Reenviar mensajes:"; "messageforward_inline" = "Incorporado"; @@ -207,8 +207,8 @@ "Contacts" = "Libreta de direcciones"; "Mail" = "Correo"; "Last" = "Ultimo usado"; -"Default module :" = "Módulo por defecto :"; -"SOGo version:" = "Versión de SOGo:"; +"Default Module :" = "Módulo por defecto :"; +"SOGo Version :" = "Versión de SOGo:"; "Language :" = "Idioma :"; "choose" = "Elija ..."; diff --git a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings index 4dc692f4a..3cc800f6f 100644 --- a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +++ b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings @@ -135,14 +135,14 @@ "Sort messages by threads" = "Ordenar mensajes por temas"; "When sending mail, add unknown recipients to my" = "Cuando se envía correo, añade destinatarios desconocidos a mi"; "Check for new mail:" = "Comprobar correo nuevo: "; -"messagecheck_manually" = "Manualmente"; -"messagecheck_every_minute" = "Cada minuto"; -"messagecheck_every_2_minutes" = "Cada 2 minutos"; -"messagecheck_every_5_minutes" = "Cada 5 minutos"; -"messagecheck_every_10_minutes" = "Cada 10 minutos"; -"messagecheck_every_20_minutes" = "Cada 20 minutos"; -"messagecheck_every_30_minutes" = "Cada 30 minutos"; -"messagecheck_once_per_hour" = "Cada hora"; +"refreshview_manually" = "Manualmente"; +"refreshview_every_minute" = "Cada minuto"; +"refreshview_every_2_minutes" = "Cada 2 minutos"; +"refreshview_every_5_minutes" = "Cada 5 minutos"; +"refreshview_every_10_minutes" = "Cada 10 minutos"; +"refreshview_every_20_minutes" = "Cada 20 minutos"; +"refreshview_every_30_minutes" = "Cada 30 minutos"; +"refreshview_once_per_hour" = "Cada hora"; "Forward messages:" = "Reenviar mensajes:"; "messageforward_inline" = "Incorporado"; @@ -211,8 +211,8 @@ "Contacts" = "Libreta de direcciones"; "Mail" = "Correo"; "Last" = "Ultimo usado"; -"Default module :" = "Módulo por defecto :"; -"SOGo version:" = "Versión de SOGo:"; +"Default Module :" = "Módulo por defecto :"; +"SOGo Version :" = "Versión de SOGo:"; "Language :" = "Idioma :"; "choose" = "Elija ..."; diff --git a/UI/PreferencesUI/Swedish.lproj/Localizable.strings b/UI/PreferencesUI/Swedish.lproj/Localizable.strings index 73e4b0282..915b3d324 100644 --- a/UI/PreferencesUI/Swedish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Swedish.lproj/Localizable.strings @@ -114,14 +114,14 @@ "Show subscribed mailboxes only" = "Visa endast prenumrerade postlådor"; "Sort messages by threads" = "Sort messages by threads"; "Check for new mail:" = "Hämta ny post:"; -"messagecheck_manually" = "Manuellt"; -"messagecheck_every_minute" = "Varje minut"; -"messagecheck_every_2_minutes" = "Varje 2 minuter"; -"messagecheck_every_5_minutes" = "Varje 5 minuter"; -"messagecheck_every_10_minutes" = "Varje 10 minuter"; -"messagecheck_every_20_minutes" = "Varje 20 minuter"; -"messagecheck_every_30_minutes" = "Varje 30 minuter"; -"messagecheck_once_per_hour" = "Varje timme"; +"refreshview_manually" = "Manuellt"; +"refreshview_every_minute" = "Varje minut"; +"refreshview_every_2_minutes" = "Varje 2 minuter"; +"refreshview_every_5_minutes" = "Varje 5 minuter"; +"refreshview_every_10_minutes" = "Varje 10 minuter"; +"refreshview_every_20_minutes" = "Varje 20 minuter"; +"refreshview_every_30_minutes" = "Varje 30 minuter"; +"refreshview_once_per_hour" = "Varje timme"; "Forward messages:" = "Vidarebefordra meddelanden:"; "messageforward_inline" = "Infogade"; @@ -178,7 +178,7 @@ Servernamn:"; "Contacts" = "Adressbok"; "Mail" = "E-post"; "Last" = "Senast använd"; -"Default module :" = "Standardmodul:"; +"Default Module :" = "Standardmodul:"; "Language :" = "Språk:"; "choose" = "Välj ..."; diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index a58dbd8a9..5017a4bec 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -805,15 +805,15 @@ static NSArray *reminderValues = nil; [userDefaults setSelectedAddressBook: newSelectedAddressBook]; } -- (NSArray *) messageCheckList +- (NSArray *) refreshViewList { NSArray *intervalsList; - NSMutableArray *messageCheckList; + NSMutableArray *refreshViewList; NSString *value; int count, max, interval; - intervalsList = [[user domainDefaults] mailPollingIntervals]; - messageCheckList = [NSMutableArray arrayWithObjects: @"manually", nil]; + intervalsList = [[user domainDefaults] refreshViewIntervals]; + refreshViewList = [NSMutableArray arrayWithObjects: @"manually", nil]; max = [intervalsList count]; for (count = 0; count < max; count++) { @@ -832,26 +832,25 @@ static NSArray *reminderValues = nil; value = nil; } if (value) - [messageCheckList addObject: value]; + [refreshViewList addObject: value]; } - return messageCheckList; + return refreshViewList; } -- (NSString *) itemMessageCheckText +- (NSString *) itemRefreshViewCheckText { - return [self labelForKey: - [NSString stringWithFormat: @"messagecheck_%@", item]]; + return [self labelForKey: [NSString stringWithFormat: @"refreshview_%@", item]]; } -- (NSString *) userMessageCheck +- (NSString *) userRefreshViewCheck { - return [userDefaults mailMessageCheck]; + return [userDefaults refreshViewCheck]; } -- (void) setUserMessageCheck: (NSString *) newMessageCheck +- (void) setUserRefreshViewCheck: (NSString *) newRefreshViewCheck { - [userDefaults setMailMessageCheck: newMessageCheck]; + [userDefaults setRefreshViewCheck: newRefreshViewCheck]; } - (NSArray *) messageForwardingList diff --git a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings index ead74f31c..0f3ef69ec 100644 --- a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings @@ -126,14 +126,14 @@ "Show subscribed mailboxes only" = "Показувати лише поштові скриньки, на які я підписаний"; "Sort messages by threads" = "Сортувати повідомлення за гілками"; "Check for new mail:" = "Перевіряти нову пошту:"; -"messagecheck_manually" = "Вручну"; -"messagecheck_every_minute" = "Щохвилини"; -"messagecheck_every_2_minutes" = "Кожні 2 хвилини"; -"messagecheck_every_5_minutes" = "Кожні 5 хвилин"; -"messagecheck_every_10_minutes" = "Кожні 10 хвилин"; -"messagecheck_every_20_minutes" = "Кожні 20 хвилин"; -"messagecheck_every_30_minutes" = "Кожні 30 хвилин"; -"messagecheck_once_per_hour" = "Раз на годину"; +"refreshview_manually" = "Вручну"; +"refreshview_every_minute" = "Щохвилини"; +"refreshview_every_2_minutes" = "Кожні 2 хвилини"; +"refreshview_every_5_minutes" = "Кожні 5 хвилин"; +"refreshview_every_10_minutes" = "Кожні 10 хвилин"; +"refreshview_every_20_minutes" = "Кожні 20 хвилин"; +"refreshview_every_30_minutes" = "Кожні 30 хвилин"; +"refreshview_once_per_hour" = "Раз на годину"; "Forward messages:" = "Перенаправляти повідомлення:"; "messageforward_inline" = "В тілі листа"; @@ -188,7 +188,7 @@ "Contacts" = "Адресна книга"; "Mail" = "Електронна пошта"; "Last" = "Останнє"; -"Default module :" = "Модуль за замовчанням :"; +"Default Module :" = "Модуль за замовчанням :"; "Language :" = "Мова :"; "choose" = "Choose ..."; diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings index fd7dc78a1..f7a9f46ba 100644 --- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings +++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings @@ -114,14 +114,14 @@ "Show subscribed mailboxes only" = "Show subscribed mailboxes only"; "Sort messages by threads" = "Sort messages by threads"; "Check for new mail:" = "Chwilio am ebost newydd:"; -"messagecheck_manually" = "Corfforol"; -"messagecheck_every_minute" = "Pob munud"; -"messagecheck_every_2_minutes" = "Pob 2 munud"; -"messagecheck_every_5_minutes" = "Pob 5 munud"; -"messagecheck_every_10_minutes" = "Pob 10 munud"; -"messagecheck_every_20_minutes" = "Pob 20 munud"; -"messagecheck_every_30_minutes" = "Pob 30 munud"; -"messagecheck_once_per_hour" = "Unwaith pob awr"; +"refreshview_manually" = "Corfforol"; +"refreshview_every_minute" = "Pob munud"; +"refreshview_every_2_minutes" = "Pob 2 munud"; +"refreshview_every_5_minutes" = "Pob 5 munud"; +"refreshview_every_10_minutes" = "Pob 10 munud"; +"refreshview_every_20_minutes" = "Pob 20 munud"; +"refreshview_every_30_minutes" = "Pob 30 munud"; +"refreshview_once_per_hour" = "Unwaith pob awr"; "Forward messages:" = "Blaenyrru negeseuon:"; "messageforward_inline" = "Mewn llinell"; @@ -176,7 +176,7 @@ "Contacts" = "Address Book"; "Mail" = "Mail"; "Last" = "Last used"; -"Default module :" = "Default module :"; +"Default Module :" = "Default module :"; "Language :" = "Iaith :"; "choose" = "Dewis ..."; diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox index 75bbae736..893b94ddd 100644 --- a/UI/Templates/ContactsUI/UIxContactEditor.wox +++ b/UI/Templates/ContactsUI/UIxContactEditor.wox @@ -8,7 +8,7 @@ xmlns:label="OGo:label" className="UIxPageFrame" title="name" - const:userDefaultsKeys="SOGoContactsCategories" + const:userDefaultsKeys="SOGoRefreshViewCheck, SOGoContactsCategories" const:popup="YES" const:cssFiles="datepicker.css" const:jsFiles="datepicker.js"> diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox index b796d8ad3..aa924a35d 100644 --- a/UI/Templates/MailerUI/UIxMailMainFrame.wox +++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox @@ -7,7 +7,7 @@ xmlns:label="OGo:label" className="UIxPageFrame" title="title" - const:userDefaultsKeys="SOGoMailMessageCheck,SOGoMailSortByThreads,SOGoMailListViewColumnsOrder,SOGoMailDisplayRemoteInlineImages" + const:userDefaultsKeys="SOGoMailMessageCheck,SOGoRefreshViewCheck,SOGoMailSortByThreads,SOGoMailListViewColumnsOrder,SOGoMailDisplayRemoteInlineImages" const:userSettingsKeys="Mail" const:jsFiles="dtree.js,MailerUIdTree.js,SOGoAutoCompletion.js,SOGoResizableTable.js,SOGoMailDataSource.js,SOGoDataTable.js,jquery-ui.js, UIxMailSearch.js" const:cssFiles="UIxMailSearch.css"> diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index cd72b338f..7184e9417 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -127,7 +127,7 @@
-
+
-
+
+
+
@@ -354,11 +359,6 @@ const:name="addressBookList" string="itemAddressBookText" selection="userAddressBook"/>
-
-
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 9781a2c44..bfe85c311 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -11,6 +11,8 @@ var Contact = { currentContactId: null }; +var refreshViewCheckTimer; + function openContactsFolder(contactsFolder, reload, idx) { if ((contactsFolder && contactsFolder != Contact.currentAddressBook) || reload) { @@ -1363,6 +1365,7 @@ function initContacts(event) { configureAddressBooks(); configureDraggables(); updateAddressBooksMenus(); + initRefreshViewCheckTimer(); var table = $("contactsList"); if (table) { @@ -1625,4 +1628,24 @@ function onContactsReload () { openContactsFolder(Contact.currentAddressBook, true); } +function initRefreshViewCheckTimer() { + var refreshViewCheck = UserDefaults["SOGoRefreshViewCheck"]; + if (refreshViewCheck && refreshViewCheck != "manually") { + var interval; + if (refreshViewCheck == "once_per_hour") + interval = 3600; + else if (refreshViewCheck == "every_minute") + interval = 60; + else { + interval = parseInt(refreshViewCheck.substr(6)) * 60; + } + refreshViewCheckTimer = window.setInterval(onRefreshViewCheckCallback, + interval * 1000); + } +} + +function onRefreshViewCheckCallback(event) { + onContactsReload(); +} + document.observe("dom:loaded", initContacts); diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js index aed69c52e..7ed06d139 100644 --- a/UI/WebServerResources/MailerUI.js +++ b/UI/WebServerResources/MailerUI.js @@ -31,7 +31,7 @@ var pageContent = $("pageContent"); var deleteMessageRequestCount = 0; -var messageCheckTimer; +var refreshViewCheckTimer; // Variables for feature threadsCollapsing var displayThreadElement = false; @@ -2072,7 +2072,7 @@ function initMailer(event) { configureMessageListEvents(); initMailboxTree(); - initMessageCheckTimer(); + initRefreshViewCheckTimer(); Event.observe(document, "keydown", onDocumentKeydown); @@ -2092,23 +2092,27 @@ function initMailer(event) { Event.observe(window, "resize", onWindowResize); } -function initMessageCheckTimer() { - var messageCheck = UserDefaults["SOGoMailMessageCheck"]; - if (messageCheck && messageCheck != "manually") { +function initRefreshViewCheckTimer() { + // TEMPORARY : to be erase + var refreshViewCheck = UserDefaults["SOGoMailMessageCheck"]; + if (refreshViewCheck == null) + refreshViewCheck = UserDefaults["SOGoRefreshViewCheck"]; + + if (refreshViewCheck && refreshViewCheck != "manually") { var interval; - if (messageCheck == "once_per_hour") + if (refreshViewCheck == "once_per_hour") interval = 3600; - else if (messageCheck == "every_minute") + else if (refreshViewCheck == "every_minute") interval = 60; else { - interval = parseInt(messageCheck.substr(6)) * 60; + interval = parseInt(refreshViewCheck.substr(6)) * 60; } - messageCheckTimer = window.setInterval(onMessageCheckCallback, - interval * 1000); + refreshViewCheckTimer = window.setInterval(onRefreshViewCheckCallback, + interval * 1000); } } -function onMessageCheckCallback(event) { +function onRefreshViewCheckCallback(event) { refreshMailbox(); } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 02e5cbab8..a5ce13e45 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -35,6 +35,7 @@ var categoriesStyleSheet = null; var clipboard = null; var eventsToCopy = []; +var refreshViewCheckTimer; // This should probably go in the generic.js function printView() { @@ -1440,6 +1441,26 @@ function refreshEventsAndTasks() { refreshTasks(); } +function initRefreshViewCheckTimer() { + var refreshViewCheck = UserDefaults["SOGoRefreshViewCheck"]; + if (refreshViewCheck && refreshViewCheck != "manually") { + var interval; + if (refreshViewCheck == "once_per_hour") + interval = 3600; + else if (refreshViewCheck == "every_minute") + interval = 60; + else { + interval = parseInt(refreshViewCheck.substr(6)) * 60; + } + refreshViewCheckTimer = window.setInterval(onRefreshViewCheckCallback, + interval * 1000); + } +} + +function onRefreshViewCheckCallback(event) { + onCalendarReload(); +} + function onCalendarReload() { if (!reloadWebCalendars()) { refreshEventsAndTasks(); @@ -3887,6 +3908,7 @@ function initScheduler() { $("calendarView").on("click", "#listCollapse", onListCollapse); Event.observe(document, "keydown", onDocumentKeydown); } + initRefreshViewCheckTimer() onWindowResize.defer(); Event.observe(window, "resize", onWindowResize); diff --git a/UI/WebServerResources/UIxPreferences.js b/UI/WebServerResources/UIxPreferences.js index a6f117b98..20f8a9778 100644 --- a/UI/WebServerResources/UIxPreferences.js +++ b/UI/WebServerResources/UIxPreferences.js @@ -144,7 +144,7 @@ function prototypeIfyFilters() { function _setupEvents() { var widgets = [ "timezone", "shortDateFormat", "longDateFormat", "timeFormat", "weekStartDay", "dayStartTime", "dayEndTime", - "firstWeek", "messageCheck", "sortByThreads", "displayRemoteInlineImages", + "firstWeek", "refreshViewCheck", "sortByThreads", "displayRemoteInlineImages", "subscribedFoldersOnly", "language", "defaultCalendar", "enableVacation" ]; for (var i = 0; i < widgets.length; i++) {