diff --git a/ActiveSync/SOGoMailObject+ActiveSync.m b/ActiveSync/SOGoMailObject+ActiveSync.m index 91e611df5..a975752ef 100644 --- a/ActiveSync/SOGoMailObject+ActiveSync.m +++ b/ActiveSync/SOGoMailObject+ActiveSync.m @@ -410,7 +410,7 @@ struct GlobalObjectId { charset = [[[self lookupInfoForBodyPart: key] objectForKey: @"parameterList"] objectForKey: @"charset"]; - if (![charset length]) + if (![charset length] || [charset caseInsensitiveCompare: @"us-ascii"] == NSOrderedSame) charset = @"utf-8"; s = [NSString stringWithData: d usingEncodingNamed: charset]; @@ -708,7 +708,7 @@ struct GlobalObjectId { charset = [[[self lookupInfoForBodyPart: @""] objectForKey: @"parameterList"] objectForKey: @"charset"]; - if (![charset length]) + if (![charset length] || [charset caseInsensitiveCompare: @"us-ascii"] == NSOrderedSame) charset = @"utf-8"; d = [[self fetchPlainTextParts] objectForKey: @""]; diff --git a/Documentation/SOGoInstallationGuide.asciidoc b/Documentation/SOGoInstallationGuide.asciidoc index 055628892..dfb6e8c24 100644 --- a/Documentation/SOGoInstallationGuide.asciidoc +++ b/Documentation/SOGoInstallationGuide.asciidoc @@ -3261,6 +3261,10 @@ current version of SOGo from the previous release. [cols="100a"] |======================================================================= + +h|5.8.2 +|Changes in Mac OS X Ventura 13.3. For mac Apple's Calendar users, the account must be removed and re-added (https://bugs.sogo.nu/view.php?id=5639#c16901). This can be achived in `` / `System Settings` / `Internet Accounts`. + h|5.8.1 |New options `SOGoSMTPMasterUserEnabled`, `SOGoSMTPMasterUserUsername` and `SOGoSMTPMasterUserPassword` has been added. Those parameters replace the `-p` option for sogo-ealarms-notify. diff --git a/SOPE/GDLContentStore/GCSFolder.m b/SOPE/GDLContentStore/GCSFolder.m index 733ebf025..8f7e1fe3a 100644 --- a/SOPE/GDLContentStore/GCSFolder.m +++ b/SOPE/GDLContentStore/GCSFolder.m @@ -1145,9 +1145,14 @@ andAttribute: (EOAttribute *)_attribute { // Update c_startdate for appointments if ([theComponent respondsToSelector:@selector(startDate)]) { + NSTimeInterval t = [startDate timeIntervalSince1970]; + startDate = [theComponent startDate]; if (startDate) { - [quickRow setObject:[NSNumber numberWithUnsignedInt:[startDate timeIntervalSince1970]] forKey:@"c_startdate"]; + if (t < (long long)INT_MAX && t > (long long)INT_MIN) + [quickRow setObject:[NSNumber numberWithInt: t] forKey:@"c_startdate"]; + else + [quickRow setObject:[NSNumber numberWithInt: 0] forKey:@"c_startdate"]; } } diff --git a/SoObjects/Appointments/SOGoAppointmentFolder.m b/SoObjects/Appointments/SOGoAppointmentFolder.m index a3fa6eb0a..5adddb782 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolder.m +++ b/SoObjects/Appointments/SOGoAppointmentFolder.m @@ -1575,7 +1575,8 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir { if ([filters isEqualToString:@"title_Category_Location"] || [filters isEqualToString:@"entireContent"]) { - [baseWhere addObject: [NSString stringWithFormat: @"(c_title isCaseInsensitiveLike: '*%@*' OR c_category isCaseInsensitiveLike: '*%@*' OR c_location isCaseInsensitiveLike: '*%@*')", + [baseWhere addObject: [NSString stringWithFormat: @"(c_title isCaseInsensitiveLike: '*%@*' OR c_category isCaseInsensitiveLike: '*%@*' OR c_location isCaseInsensitiveLike: '*%@*' OR c_content isCaseInsensitiveLike: '*SUMMARY:*%@*')", + [title asSafeSQLLikeString], [title asSafeSQLLikeString], [title asSafeSQLLikeString], [title asSafeSQLLikeString]]]; @@ -1698,6 +1699,23 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir else ma = [NSMutableArray array]; + if (title && [title length] > 0) { + // Case when multiple summary are set in c_content + // Need to filter on title + int i; + NSDictionary *currentItem; + for (i = [ma count] - 1; i >= 0; i--) { + currentItem = [ma objectAtIndex: i]; + if (currentItem && [currentItem objectForKey: @"c_title"] + && [[currentItem objectForKey: @"c_title"] length] > 0) { + if ([[currentItem objectForKey: @"c_title"] rangeOfString: title options: NSCaseInsensitiveSearch].location == NSNotFound) { + [ma removeObjectAtIndex: i]; + } + } + } + + } + return ma; } diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m index d5b723042..00c662f1e 100644 --- a/SoObjects/Mailer/SOGoDraftObject.m +++ b/SoObjects/Mailer/SOGoDraftObject.m @@ -918,7 +918,7 @@ static NSString *userAgent = nil; currentInfo = [NSMutableDictionary dictionaryWithObjectsAndKeys: filename, @"filename", mimeType, @"mimetype", - bodyId, @"bodyid", + bodyId, @"bodyId", nil]; [self saveAttachment: body withMetadata: currentInfo]; @@ -1898,6 +1898,7 @@ static NSString *userAgent = nil; newText = [text htmlByExtractingImages: extractedBodyParts]; if ([extractedBodyParts count]) [self setText: newText]; + } map = [self mimeHeaderMapWithHeaders: _headers @@ -1928,6 +1929,51 @@ static NSString *userAgent = nil; } } + if (_extractImages) + { + int i; + for (i = 0 ; i < [extractedBodyParts count] ; i++) { + NSMutableDictionary *currentInfo; + NSString *filename, *mimeType, *bodyId, *encoding; + NSData *body; + NGMimeBodyPart *extractedBodyPart; + NGMimeContentDispositionHeaderField *contentDisposition; + + extractedBodyPart = [extractedBodyParts objectAtIndex:i]; + if (extractedBodyPart && [extractedBodyPart headerForKey: @"content-disposition"]) { + encoding = [extractedBodyPart encoding]; + contentDisposition = [[NGMimeContentDispositionHeaderField alloc] initWithString: [extractedBodyPart headerForKey: @"content-disposition"]]; + + if (encoding + && [extractedBodyPart contentType] + && [extractedBodyPart contentId] + && [contentDisposition filename]) { + + mimeType = [[extractedBodyPart contentType] stringValue]; + bodyId = [[extractedBodyPart contentId] stringValue]; + filename = [contentDisposition filename]; + currentInfo = [NSMutableDictionary dictionaryWithObjectsAndKeys: + filename, @"filename", + mimeType, @"mimetype", + bodyId, @"bodyId", + nil]; + + if ([[extractedBodyParts objectAtIndex:i] body]) { + if (encoding && [encoding rangeOfString:@"base64"].location != NSNotFound) + body = [[[extractedBodyParts objectAtIndex:i] body] dataByDecodingBase64]; + else + body = [[extractedBodyParts objectAtIndex:i] body]; + + [self saveAttachment: body + withMetadata: currentInfo]; + } + } + [contentDisposition release]; + } + + } + } + return message; } diff --git a/SoObjects/SOGo/SOGoPasswordPolicy.m b/SoObjects/SOGo/SOGoPasswordPolicy.m index 5563cf9b3..94b681105 100644 --- a/SoObjects/SOGo/SOGoPasswordPolicy.m +++ b/SoObjects/SOGo/SOGoPasswordPolicy.m @@ -33,6 +33,8 @@ static const NSString *POLICY_MIN_DIGIT = @"POLICY_MIN_DIGIT"; static const NSString *POLICY_MIN_SPECIAL_SYMBOLS = @"POLICY_MIN_SPECIAL_SYMBOLS"; static const NSString *POLICY_MIN_LENGTH = @"POLICY_MIN_LENGTH"; +static const NSString *SPECIAL_SYMBOL_ALLOWED = @"%$&*(){}!?\\@#.,:;+="; + @implementation SOGoPasswordPolicy - (id) init @@ -58,7 +60,7 @@ static const NSString *POLICY_MIN_LENGTH = @"POLICY_MIN_LENGTH"; return [NSArray arrayWithObjects: [NSString stringWithFormat:@"(.*[a-z].*){%i}", [count intValue]], [NSString stringWithFormat:@"(.*[A-Z].*){%i}", [count intValue]], [NSString stringWithFormat:@"(.*[0-9].*){%i}", [count intValue]], - [NSString stringWithFormat:@"([%%$&*(){}!?\\@#.,:;].*){%i,}", [count intValue]], + [NSString stringWithFormat:@"([%@].*){%i,}", SPECIAL_SYMBOL_ALLOWED, [count intValue]], [NSString stringWithFormat:@".{%i,}", [count intValue]], nil]; } @@ -98,12 +100,16 @@ static const NSString *POLICY_MIN_LENGTH = @"POLICY_MIN_LENGTH"; NSNumber *value = [policy objectForKey:@"value"]; if (0 < value) { NSString *newLabel = [[translations objectForKey: label] - stringByReplacingOccurrencesOfString: @"%{0}" - withString: [value stringValue]]; + stringByReplacingOccurrencesOfString: @"%{0}" + withString: [value stringValue]]; + if ([POLICY_MIN_SPECIAL_SYMBOLS isEqualToString: label]) { + newLabel = [[newLabel stringByAppendingString: @" "] + stringByAppendingString: SPECIAL_SYMBOL_ALLOWED]; + } [userTranslatedPasswordPolicy addObject:[NSDictionary dictionaryWithObjectsAndKeys: - newLabel, @"label", - [policy objectForKey:@"regex"], @"regex", - nil]]; + newLabel, @"label", + [policy objectForKey:@"regex"], @"regex", + nil]]; } else { // Do nothing } diff --git a/SoObjects/SOGo/WORequest+SOGo.m b/SoObjects/SOGo/WORequest+SOGo.m index d66a95021..b807fa0ab 100644 --- a/SoObjects/SOGo/WORequest+SOGo.m +++ b/SoObjects/SOGo/WORequest+SOGo.m @@ -251,7 +251,7 @@ b = ( ( - [[cc userAgent] rangeOfString: @"macOS/13"].location != NSNotFound + nil != [cc userAgent] && [[cc userAgent] rangeOfString: @"macOS/13"].location != NSNotFound && [[cc userAgent] rangeOfString: @"dataaccessd"].location != NSNotFound ) ); diff --git a/Tools/SOGoToolManageACL.m b/Tools/SOGoToolManageACL.m index 331f543bf..914ec528e 100644 --- a/Tools/SOGoToolManageACL.m +++ b/Tools/SOGoToolManageACL.m @@ -366,7 +366,7 @@ typedef enum NSString *qs, *path; if ([theUser isEqualToString: @"ALL"]) - qs = [NSString stringWithFormat: @"c_uid LIKE '\%'", theUser]; + qs = [NSString stringWithFormat: @"c_uid LIKE '%%'"]; else qs = [NSString stringWithFormat: @"c_uid = '%@'", theUser]; diff --git a/UI/PreferencesUI/Arabic.lproj/Localizable.strings b/UI/PreferencesUI/Arabic.lproj/Localizable.strings index 6e7fd9ac0..aa28a47d1 100644 --- a/UI/PreferencesUI/Arabic.lproj/Localizable.strings +++ b/UI/PreferencesUI/Arabic.lproj/Localizable.strings @@ -25,7 +25,7 @@ "Add default email addresses" = "إضافة عناوين البريد الإلكتروني الافتراضية"; "Days between responses" ="عدد الأيام بين الردود"; "Do not send responses to mailing lists" = "لا ترسل ردود الى القوائم البريدية"; -"Disable auto reply on" = "تعطيل الرد التلقائي في"; +"Disable auto reply after" = "تعطيل الرد التلقائي في"; "Please specify your message and your email addresses for which you want to enable auto reply." = "يرجى تحديد رسالتك وعناوين البريد الإلكتروني التي تريد تمكين الرد التلقائي لها."; "Your vacation message must not end with a single dot on a line." = "يجب أن لا تنتهي رسالة العطلة بنقطة واحدة على السطر."; diff --git a/UI/PreferencesUI/Basque.lproj/Localizable.strings b/UI/PreferencesUI/Basque.lproj/Localizable.strings index 995eaf26b..e96ca4626 100644 --- a/UI/PreferencesUI/Basque.lproj/Localizable.strings +++ b/UI/PreferencesUI/Basque.lproj/Localizable.strings @@ -26,7 +26,7 @@ "Add default email addresses" = "Gehitu email helbide lehenetsiak"; "Days between responses" ="Erantzunen arteko egunak"; "Do not send responses to mailing lists" = "Ez bidali erantzunak email zerrendatara"; -"Disable auto reply on" = "Ezgaitu erantzun automatikoa"; +"Disable auto reply after" = "Ezgaitu erantzun automatikoa"; "Always send vacation message response" = "'Oporretan nago' erantzun mezua beti bidali"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Mesedez, zehaztu zure mezua eta zure helbide elektronikoa zeini erantzun automatikoa gaitu nahi diozun."; diff --git a/UI/PreferencesUI/Bosnian.lproj/Localizable.strings b/UI/PreferencesUI/Bosnian.lproj/Localizable.strings index aede4ae7b..404f8ebb6 100644 --- a/UI/PreferencesUI/Bosnian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Bosnian.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Aktivacijska Ograničenja"; "Enable auto reply on" = "Uključiti auto-odgovor"; "First day of vacation" = "Prvi dan odmora"; -"Disable auto reply on" = "Isključiti auto-odgovor"; +"Disable auto reply after" = "Isključiti auto-odgovor"; "Last day of vacation" = "Zadnji dan odmora"; "Enter date" = "Unesite datum"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings index 1d95d7ef6..30b39456f 100644 --- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Restrições de ativação"; "Enable auto reply on" = "Habilitar resposta automática em"; "First day of vacation" = "Primeiro dia de férias"; -"Disable auto reply on" = "Desativar resposta automática em"; +"Disable auto reply after" = "Desativar resposta automática em"; "Last day of vacation" = "Último dia de férias"; "Enter date" = "Digite a data"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Bulgarian.lproj/Localizable.strings b/UI/PreferencesUI/Bulgarian.lproj/Localizable.strings index fc41b6565..846c8d9ee 100644 --- a/UI/PreferencesUI/Bulgarian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Bulgarian.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Активационни ограничения"; "Enable auto reply on" = "Включи автоматичен отговор"; "First day of vacation" = "Първи ден от отпуска"; -"Disable auto reply on" = "Изключи автоматичен отговор на"; +"Disable auto reply after" = "Изключи автоматичен отговор на"; "Last day of vacation" = "Последен ден от отпуска"; "Enter date" = "Въведете дата"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings index 14507afb5..b027a2e85 100644 --- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings +++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings @@ -46,7 +46,7 @@ "Do not send responses to mailing lists" = "No enviar respostes a llistes de correu"; "Enable auto reply on" = "Activar resposta automàtica"; "First day of vacation" = "Primer dia de vacances"; -"Disable auto reply on" = "Desactivar la resposta automàtica en"; +"Disable auto reply after" = "Desactivar la resposta automàtica en"; "Last day of vacation" = "Últim dia de vacances"; "Enter date" = "Introduïu la Data"; "Always send vacation message response" = "Envia sempre resposta de missatge de vacances"; diff --git a/UI/PreferencesUI/ChineseChina.lproj/Localizable.strings b/UI/PreferencesUI/ChineseChina.lproj/Localizable.strings index 6ee5db010..509d7cc03 100644 --- a/UI/PreferencesUI/ChineseChina.lproj/Localizable.strings +++ b/UI/PreferencesUI/ChineseChina.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "回复间隔日数"; "Do not send responses to mailing lists" = "不要回复到邮件列表"; "Enable auto reply on" = "启用自动回复功能"; -"Disable auto reply on" = "禁用回复无效"; +"Disable auto reply after" = "禁用回复无效"; "Always send vacation message response" = "总是发送休假消息回复"; "Discard incoming mails during vacation" = "丢弃假期收到的邮件"; "Please specify your message and your email addresses for which you want to enable auto reply." diff --git a/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings b/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings index b47faaf89..e34d3007d 100644 --- a/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings +++ b/UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings @@ -26,7 +26,7 @@ "Add default email addresses" = "增加預設的電子郵件地址"; "Days between responses" ="回覆間隔天數"; "Do not send responses to mailing lists" = "不要寄送回覆給列表的帳號"; -"Disable auto reply on" = "關閉自動回覆功能"; +"Disable auto reply after" = "關閉自動回覆功能"; "Always send vacation message response" = "開啟休假自動回覆功能"; "Please specify your message and your email addresses for which you want to enable auto reply." = "請輸入自動回覆的訊息內容及電子郵件帳號。"; diff --git a/UI/PreferencesUI/Croatian.lproj/Localizable.strings b/UI/PreferencesUI/Croatian.lproj/Localizable.strings index 01c4a0dfa..6bb85bf67 100644 --- a/UI/PreferencesUI/Croatian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Croatian.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Dani između odgovora"; "Do not send responses to mailing lists" = "Nemoj slati odgovore na mailing liste"; "Enable auto reply on" = "Uključi automatski odgovor"; -"Disable auto reply on" = "Isključi automatski odgovor"; +"Disable auto reply after" = "Isključi automatski odgovor"; "Always send vacation message response" = "Uvijek pošalji automatsku obavijest o odsutnosti"; "Discard incoming mails during vacation" = "Odbij ulazne poruke tijekom odmora"; "Please specify your message and your email addresses for which you want to enable auto reply." diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings index 47b54ddad..a1f1180d9 100644 --- a/UI/PreferencesUI/Czech.lproj/Localizable.strings +++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings @@ -46,7 +46,7 @@ "Do not send responses to mailing lists" = "Neposílat odpovědi do konferencí"; "Enable auto reply on" = "Zapnout odpovědi v nepřítomnosti"; "First day of vacation" = "První den nepřítomnosti"; -"Disable auto reply on" = "Automatické odpovědi vypnout dne"; +"Disable auto reply after" = "Automatické odpovědi vypnout dne"; "Last day of vacation" = "Poslední den nepřítomnosti"; "Enter date" = "Zadejte datum"; "Always send vacation message response" = "Vždy posílat zprávu v nepřítomnosti"; diff --git a/UI/PreferencesUI/Danish.lproj/Localizable.strings b/UI/PreferencesUI/Danish.lproj/Localizable.strings index 681ab6cf7..51eb4856f 100644 --- a/UI/PreferencesUI/Danish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Danish.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Aktiveringsbegrænsninger"; "Enable auto reply on" = "Aktiver autosvar til"; "First day of vacation" = "Første feriedag"; -"Disable auto reply on" = "Deaktiver Autosvar til"; +"Disable auto reply after" = "Deaktiver Autosvar til"; "Last day of vacation" = "Sidste feriedag"; "Enter date" = "Indtast dato"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings index f3c80d24d..7bd65a42e 100644 --- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings +++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Activatiebeperkingen"; "Enable auto reply on" = "Automatisch beantwoorden inschakelen"; "First day of vacation" = "Eerste vakantiedag"; -"Disable auto reply on" = "Automatisch bericht bij afwezigheid uitschakelen op"; +"Disable auto reply after" = "Automatisch bericht bij afwezigheid uitschakelen op"; "Last day of vacation" = "Laatste vakantiedag"; "Enter date" = "Voer datum in"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index ac645b188..adc792bf2 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Activation Constraints"; "Enable auto reply on" = "Enable auto reply on"; "First day of vacation" = "First day of vacation"; -"Disable auto reply on" = "Disable auto reply on"; +"Disable auto reply after" = "Disable auto reply after"; "Last day of vacation" = "Last day of vacation"; "Enter date" = "Enter date"; /* Enable auto reply at this time of the day */ @@ -260,7 +260,7 @@ "POLICY_MIN_LOWERCASE_LETTER" = "Minimum of %{0} lowercase letter"; "POLICY_MIN_UPPERCASE_LETTER" = "Minimum of %{0} uppercase letter"; "POLICY_MIN_DIGIT" = "Minimum of %{0} digit"; -"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0}special symbols"; +"POLICY_MIN_SPECIAL_SYMBOLS" = "Minimum of %{0} special symbols"; "POLICY_MIN_LENGTH" = "Minimum length of %{0} characters"; diff --git a/UI/PreferencesUI/Finnish.lproj/Localizable.strings b/UI/PreferencesUI/Finnish.lproj/Localizable.strings index 9c5768f3b..13cb921e7 100644 --- a/UI/PreferencesUI/Finnish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Finnish.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Päivät vastausten välillä"; "Do not send responses to mailing lists" = "Älä lähetä vastauksia postituslistoille"; "Enable auto reply on" = "Ota automaattivastaus käyttöön"; -"Disable auto reply on" = "Poista automaattivastaus käytöstä"; +"Disable auto reply after" = "Poista automaattivastaus käytöstä"; "Always send vacation message response" = "Lähetä lomaviestivastaus aina"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Ole hyvä ja määritä viesti sekä sähköpostiosoitteet joille haluat aktivoida automaattivastauksen."; diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings index 48096027a..3d3471321 100644 --- a/UI/PreferencesUI/French.lproj/Localizable.strings +++ b/UI/PreferencesUI/French.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Conditions d'activation"; "Enable auto reply on" = "Débuter la réponse automatique le"; "First day of vacation" = "Premier jour d'absence"; -"Disable auto reply on" = "Désactiver la réponse automatique le"; +"Disable auto reply after" = "Désactiver la réponse automatique après le"; "Last day of vacation" = "Dernier jour d'absence"; "Enter date" = "Date"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings index 5a1240c93..4ef6d8582 100644 --- a/UI/PreferencesUI/German.lproj/Localizable.strings +++ b/UI/PreferencesUI/German.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Aktivierungsbedingungen"; "Enable auto reply on" = "Automatische Abwesenheitsnachricht anschalten am"; "First day of vacation" = "Erster Urlaubstag"; -"Disable auto reply on" = "Automatische Abwesenheitsnachricht abschalten am"; +"Disable auto reply after" = "Automatische Abwesenheitsnachricht abschalten am"; "Last day of vacation" = "Letzter Urlaubstag"; "Enter date" = "Datum eingeben"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Hebrew.lproj/Localizable.strings b/UI/PreferencesUI/Hebrew.lproj/Localizable.strings index 8f84401f2..c29fc5456 100644 --- a/UI/PreferencesUI/Hebrew.lproj/Localizable.strings +++ b/UI/PreferencesUI/Hebrew.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "ימים בין תשובות"; "Do not send responses to mailing lists" = "לא להשיב לרשימות תפוצה"; "Enable auto reply on" = "אפשר תשובה אוטומתית"; -"Disable auto reply on" = "בטל תשובה אוטומתית"; +"Disable auto reply after" = "בטל תשובה אוטומתית"; "Always send vacation message response" = "תמיד להשיב בעזרת הודעת חופשה"; "Please specify your message and your email addresses for which you want to enable auto reply." = "אנא ציינו את הודעתכם וכתובת האימייל שלכם עבורם תרצו לאפשר תשובות אוטומתיות."; diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings index e7ca0440a..bd5df7b04 100644 --- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Aktiválás kényszerek"; "Enable auto reply on" = "Automatikus válasz engedélyezése"; "First day of vacation" = "Távollét első napja"; -"Disable auto reply on" = "Automatikus válasz tiltása"; +"Disable auto reply after" = "Automatikus válasz tiltása"; "Last day of vacation" = "Távollét utolsó napja"; "Enter date" = "Adja meg a dátumot"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Indonesian.lproj/Localizable.strings b/UI/PreferencesUI/Indonesian.lproj/Localizable.strings index eedd7bdb6..97f37fc11 100644 --- a/UI/PreferencesUI/Indonesian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Indonesian.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Hari diantara tanggapan"; "Do not send responses to mailing lists" = "Jangan mengirim tanggapan ke milis"; "Enable auto reply on" = "Aktifkan balasan otomatis pada"; -"Disable auto reply on" = "Non Aktifkan balasan otomatis pada"; +"Disable auto reply after" = "Non Aktifkan balasan otomatis pada"; "Always send vacation message response" = "Selalu mengirim tanggapan pesan liburan"; "The vacation message is sent prior to apply your filters." = "The vacation message is sent prior to apply your filters."; "Discard incoming mails during vacation" = "Buang surat masuk saat liburan"; diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings index 8de171964..49c2fc5fb 100644 --- a/UI/PreferencesUI/Italian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Parametri di attivazione"; "Enable auto reply on" = "Abilita risposte automatiche dal giorno"; "First day of vacation" = "Primo giorno di assenza"; -"Disable auto reply on" = "Disabilita risposte automatiche il giorno"; +"Disable auto reply after" = "Disabilita risposte automatiche il giorno"; "Last day of vacation" = "Ultimo giorno di assenza"; "Enter date" = "Inserire data"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Japanese.lproj/Localizable.strings b/UI/PreferencesUI/Japanese.lproj/Localizable.strings index 3b8f8419f..906e8f638 100644 --- a/UI/PreferencesUI/Japanese.lproj/Localizable.strings +++ b/UI/PreferencesUI/Japanese.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "応答の間の日数"; "Do not send responses to mailing lists" = "メーリングリストに応答を送信しない。"; "Enable auto reply on" = "自動応答は有効化"; -"Disable auto reply on" = "次の自動応答は無効:"; +"Disable auto reply after" = "次の自動応答は無効:"; "Always send vacation message response" = "必ず休暇メッセージを送信する"; "Discard incoming mails during vacation" = "休暇中は受信したメールをゴミ箱に入れる"; "Please specify your message and your email addresses for which you want to enable auto reply." diff --git a/UI/PreferencesUI/Kazakh.lproj/Localizable.strings b/UI/PreferencesUI/Kazakh.lproj/Localizable.strings index 335184f65..b58cf12a2 100644 --- a/UI/PreferencesUI/Kazakh.lproj/Localizable.strings +++ b/UI/PreferencesUI/Kazakh.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Белсендіруді шектеу"; "Enable auto reply on" = "Автожауап қосу"; "First day of vacation" = "Демалыстың бірінші күні"; -"Disable auto reply on" = "Автожауапты өшіру"; +"Disable auto reply after" = "Автожауапты өшіру"; "Last day of vacation" = "Демалыстың соңғы күні"; "Enter date" = "Күнді енгізіңіз"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Latvian.lproj/Localizable.strings b/UI/PreferencesUI/Latvian.lproj/Localizable.strings index 332230a3a..f3491c8c3 100644 --- a/UI/PreferencesUI/Latvian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Latvian.lproj/Localizable.strings @@ -46,7 +46,7 @@ "Do not send responses to mailing lists" = "Nesūtīt automātiskās atbildes adresātu sarakstam"; "Enable auto reply on" = "Ieslēgt automātisko atbildi"; "First day of vacation" = "Pirmā atvaļinājuma diena"; -"Disable auto reply on" = "Izslēgt automātisko atbildi"; +"Disable auto reply after" = "Izslēgt automātisko atbildi"; "Last day of vacation" = "Pēdējā atvaļinājuma diena"; "Enter date" = "Ievadiet datumu"; "Always send vacation message response" = "Vienmēr sūtīt atvaļinājuma atbildes ziņojumu"; diff --git a/UI/PreferencesUI/Lithuanian.lproj/Localizable.strings b/UI/PreferencesUI/Lithuanian.lproj/Localizable.strings index c070bbfd1..6cddd09fb 100644 --- a/UI/PreferencesUI/Lithuanian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Lithuanian.lproj/Localizable.strings @@ -29,7 +29,7 @@ "Add default email addresses" = "Pridėti numatytajį elektroninį adresą"; "Days between responses" = "Dienos iki atsakymo"; "Do not send responses to mailing lists" = "Nesiųsti atsakymo į pašto sąrašus"; -"Disable auto reply on" = "Išjungti automatinį atsakymą"; +"Disable auto reply after" = "Išjungti automatinį atsakymą"; "Always send vacation message response" = "Visada atsiųsti atsakomąją žinutę"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Prašome nurodyti savo pranešimą ir savo elektroninio pašto adresą, kurį norite įgalinti automatiniam atsakymui."; diff --git a/UI/PreferencesUI/Macedonian.lproj/Localizable.strings b/UI/PreferencesUI/Macedonian.lproj/Localizable.strings index 8d12f55b4..de1c3e78f 100644 --- a/UI/PreferencesUI/Macedonian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Macedonian.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Денови помеѓу одговорите"; "Do not send responses to mailing lists" = "Не испраќај одговори кон мејлинг листи"; "Enable auto reply on" = "Овозможи го автоматскиот одговор"; -"Disable auto reply on" = "Исклучи го автоматскиот одговор"; +"Disable auto reply after" = "Исклучи го автоматскиот одговор"; "Always send vacation message response" = "Секогаш испрати порака кога си на одмор"; "Discard incoming mails during vacation" = "Не ги земај во предвид мејловите кои ќе дојдат за време на одморот"; "Please specify your message and your email addresses for which you want to enable auto reply." diff --git a/UI/PreferencesUI/Montenegrin.lproj/Localizable.strings b/UI/PreferencesUI/Montenegrin.lproj/Localizable.strings index edb10cb1c..86b9fdc05 100644 --- a/UI/PreferencesUI/Montenegrin.lproj/Localizable.strings +++ b/UI/PreferencesUI/Montenegrin.lproj/Localizable.strings @@ -46,7 +46,7 @@ "Do not send responses to mailing lists" = "Ne odgovaraj na poštanske liste"; "Enable auto reply on" = "Omogući automatski odgovor "; "First day of vacation" = "Prvi dan odmora"; -"Disable auto reply on" = "Onemogući automatski odgovor "; +"Disable auto reply after" = "Onemogući automatski odgovor "; "Last day of vacation" = "Poslednji dan odmora"; "Enter date" = "Unesite datum"; "Always send vacation message response" = "Uvijek pošalji poruku automatskog odgovora za vrijeme odmora"; diff --git a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings index ce35feba5..bfca780c9 100644 --- a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Aktiveringsbegrensninger "; "Enable auto reply on" = "Aktiver automatisk svar på"; "First day of vacation" = "Første feriedag"; -"Disable auto reply on" = "Skru av auto-svar"; +"Disable auto reply after" = "Skru av auto-svar"; "Last day of vacation" = "Siste feriedag"; "Enter date" = "Legg til dato"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings index b74985d49..3a0b6bc44 100644 --- a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings @@ -29,7 +29,7 @@ "Add default email addresses" = "Legg til standard e-postadresser"; "Days between responses" = "Dager mellom svar"; "Do not send responses to mailing lists" = "Ikke send svar til e-postlister"; -"Disable auto reply on" = "Aktivér auto-svar ved fravær"; +"Disable auto reply after" = "Aktivér auto-svar ved fravær"; "Always send vacation message response" = "Always send vacation message response"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Skriv melding og angi din e-postadresse som du vil aktivera auto-svar på."; diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings index 074d3bc0d..3a20d14e9 100644 --- a/UI/PreferencesUI/Polish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = " Ograniczenia aktywacji"; "Enable auto reply on" = "Włącz autoodpowiedź w"; "First day of vacation" = "Pierwszy dzień nieobecności"; -"Disable auto reply on" = "Zablokuj autoodpowiedź w"; +"Disable auto reply after" = "Zablokuj autoodpowiedź w"; "Last day of vacation" = "Ostatni dzień nieobecności"; "Enter date" = "Wprowadź datę"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Portuguese.lproj/Localizable.strings b/UI/PreferencesUI/Portuguese.lproj/Localizable.strings index 7cf1e3b5e..a54eb15d9 100644 --- a/UI/PreferencesUI/Portuguese.lproj/Localizable.strings +++ b/UI/PreferencesUI/Portuguese.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Dias entre respostas"; "Do not send responses to mailing lists" = "Não envie respostas para lista de e-mails"; "Enable auto reply on" = "Ativar resposta automática"; -"Disable auto reply on" = "Desativar resposta automática em"; +"Disable auto reply after" = "Desativar resposta automática em"; "Always send vacation message response" = "Sempre enviar uma mensagem-resposta de férias"; "Discard incoming mails during vacation" = "Rejeitar os emails recebidos quando activar \"Fora do Escritório\""; "Please specify your message and your email addresses for which you want to enable auto reply." diff --git a/UI/PreferencesUI/Romanian.lproj/Localizable.strings b/UI/PreferencesUI/Romanian.lproj/Localizable.strings index bf708ad37..05b842f84 100644 --- a/UI/PreferencesUI/Romanian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Romanian.lproj/Localizable.strings @@ -46,7 +46,7 @@ "Do not send responses to mailing lists" = "Nu răspundeți la mesajele de la liste de discuții"; "Enable auto reply on" = "Activare răspuns automat pe"; "First day of vacation" = " Prima zi de vacanță"; -"Disable auto reply on" = "Dezactivare răspuns automat pe"; +"Disable auto reply after" = "Dezactivare răspuns automat pe"; "Last day of vacation" = "Ultima zi de vacanță"; "Enter date" = "Introduceți data"; "Always send vacation message response" = "Întotdeauna trimite un mesaj de concediu"; diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings index b9ac50391..3ea99933f 100644 --- a/UI/PreferencesUI/Russian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Ограничения активации"; "Enable auto reply on" = "Включить автоответ на"; "First day of vacation" = "Первый день отпуска"; -"Disable auto reply on" = "Отключить автоответ"; +"Disable auto reply after" = "Отключить автоответ"; "Last day of vacation" = "Последний день отпуска"; "Enter date" = "Введите дату"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Serbian.lproj/Localizable.strings b/UI/PreferencesUI/Serbian.lproj/Localizable.strings index f95f1603c..c38eb0bea 100644 --- a/UI/PreferencesUI/Serbian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Serbian.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Активирање ограничења"; "Enable auto reply on" = "Омогући аутоматски одговор "; "First day of vacation" = "Први дан одмора"; -"Disable auto reply on" = "Онемогући аутоматски одговор "; +"Disable auto reply after" = "Онемогући аутоматски одговор "; "Last day of vacation" = "Последњи дан одмора"; "Enter date" = "Унесите датум"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings b/UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings index 5667326b5..f03b8c326 100644 --- a/UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings +++ b/UI/PreferencesUI/SerbianLatin.lproj/Localizable.strings @@ -46,7 +46,7 @@ "Do not send responses to mailing lists" = "Ne odgovaraj na poštanske liste"; "Enable auto reply on" = "Omogući automatski odgovor "; "First day of vacation" = "Prvi dan odmora"; -"Disable auto reply on" = "Onemogući automatski odgovor "; +"Disable auto reply after" = "Onemogući automatski odgovor "; "Last day of vacation" = "Poslednji dan odmora"; "Enter date" = "Unesite datum"; "Always send vacation message response" = "Uvek pošalji poruku automatskog odgovora za vreme odmora"; diff --git a/UI/PreferencesUI/Slovak.lproj/Localizable.strings b/UI/PreferencesUI/Slovak.lproj/Localizable.strings index d29b37c03..65fa16815 100644 --- a/UI/PreferencesUI/Slovak.lproj/Localizable.strings +++ b/UI/PreferencesUI/Slovak.lproj/Localizable.strings @@ -46,7 +46,7 @@ "Do not send responses to mailing lists" = "Neposielať odpovede e-mailovým skupinám"; "Enable auto reply on" = "Zapnúť automatickú odpoveď od"; "First day of vacation" = "Prvý deň neprítomnosti"; -"Disable auto reply on" = "Vypnúť automatickú odpoveď"; +"Disable auto reply after" = "Vypnúť automatickú odpoveď"; "Last day of vacation" = "Posledný den neprítomnosti"; "Enter date" = "Zadajte dátum"; "Always send vacation message response" = "Vždy odošli správu o dovolenke"; diff --git a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings index 7fc78476f..8d22ec314 100644 --- a/UI/PreferencesUI/Slovenian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Slovenian.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Omejitve aktivacije"; "Enable auto reply on" = "Omogoči samodejni odgovor na"; "First day of vacation" = "Prvi dan odsotnosti"; -"Disable auto reply on" = "Onemogoči samodejni odgovor na"; +"Disable auto reply after" = "Onemogoči samodejni odgovor na"; "Last day of vacation" = "Zadnji dan odsotnosti"; "Enter date" = "Vnesi datum"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings index 036ce8cb3..a7edaaf58 100644 --- a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +++ b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Dias entre respuestas"; "Do not send responses to mailing lists" = "No enviar respuestas a listas de correo"; "Enable auto reply on" = "Habilitar auto-respuesta"; -"Disable auto reply on" = "Deshabilitar la autorrespuesta en la siguiente fecha"; +"Disable auto reply after" = "Deshabilitar la autorrespuesta en la siguiente fecha"; "Always send vacation message response" = "Mandar siempre un mensaje de respuesta por vacaciones"; "Discard incoming mails during vacation" = "Descartar correo entrante durante vacaciones"; "Please specify your message and your email addresses for which you want to enable auto reply." diff --git a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings index 7d6f8d7df..48f4dc8e8 100644 --- a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +++ b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Dias entre respuestas"; "Do not send responses to mailing lists" = "No enviar respuestas a las listas de distribución"; "Enable auto reply on" = "Activar respuesta automática"; -"Disable auto reply on" = "Desactivar respuesta automatica"; +"Disable auto reply after" = "Desactivar respuesta automatica"; "Always send vacation message response" = "Siempre enviar mensaje de vacaciones"; "Discard incoming mails during vacation" = "Descartar los correos entrantes durante las vacaciones"; "Please specify your message and your email addresses for which you want to enable auto reply." diff --git a/UI/PreferencesUI/Swedish.lproj/Localizable.strings b/UI/PreferencesUI/Swedish.lproj/Localizable.strings index e70de6ab5..e8e1f74b7 100644 --- a/UI/PreferencesUI/Swedish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Swedish.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Dagar mellan svar"; "Do not send responses to mailing lists" = "Skicka inte svar till e-postlistor"; "Enable auto reply on" = "Aktivera auto-svar den"; -"Disable auto reply on" = "Inaktivera auto-svar den"; +"Disable auto reply after" = "Inaktivera auto-svar den"; "Always send vacation message response" = "Skicka alltid frånvaromeddelande"; "The vacation message is sent prior to apply your filters." = "Semestermeddelandet skickas innan du tillämpar dina filter."; "Discard incoming mails during vacation" = "Släng inkommande e-post under semester"; diff --git a/UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings b/UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings index 55abe3939..5d0eead71 100644 --- a/UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings +++ b/UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Aktivasyon Kısıtlamaları"; "Enable auto reply on" = "Otomatik yanıtın etkinleştirme tarihi"; "First day of vacation" = "Tatilin ilk günü"; -"Disable auto reply on" = "Otomatik yanıt bitiş tarihi"; +"Disable auto reply after" = "Otomatik yanıt bitiş tarihi"; "Last day of vacation" = "Tatilin son günü"; "Enter date" = "Tarih girin"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index 7ff36bd07..c95f15035 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -1385,7 +1385,9 @@ static NSArray *reminderValues = nil; for (identity in previousIdentities) { if ([newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]]) { [identity setObject: [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"fullName"] forKey: @"fullName"]; - [identity setObject: [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"signature"] forKey: @"signature"]; + if ([identity objectForKey:@"signature"]) { + [identity setObject: [[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"signature"] forKey: @"signature"]; + } if ([[newIdentitiesAsDict objectForKey: [identity objectForKey:@"email"]] objectForKey:@"isDefault"]) { [identity setObject: [NSNumber numberWithBool: YES] forKey: @"isDefault"]; } else { diff --git a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings index 72d7654d2..4603d7b0c 100644 --- a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings @@ -47,7 +47,7 @@ "Activation Constraints" = "Обмеження активації"; "Enable auto reply on" = "Включити автовідповідь на"; "First day of vacation" = "Перший день відпустки"; -"Disable auto reply on" = "Вимкнути автоматичну відповідь"; +"Disable auto reply after" = "Вимкнути автоматичну відповідь"; "Last day of vacation" = "Останній день відпустки"; "Enter date" = "Введіть дату"; /* Enable auto reply at this time of the day */ diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings index d05b92f1b..e4a5e362f 100644 --- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings +++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings @@ -45,7 +45,7 @@ "Days between responses" = "Diwrnodau rhwng ymatebion"; "Do not send responses to mailing lists" = "Peidio anfon ymatebion i restrau postio"; "Enable auto reply on" = "Galluogi ateb awtomatig ymlaen"; -"Disable auto reply on" = "Analluogi ateb awtomatig ymlaen"; +"Disable auto reply after" = "Analluogi ateb awtomatig ymlaen"; "Always send vacation message response" = "Anfon ymateb gwyliau bob amser"; "Discard incoming mails during vacation" = "Taflu e-byst sy'n dod i mewn yn ystod gwyliau"; "Please specify your message and your email addresses for which you want to enable auto reply." diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index dd5321bf6..a503b3d05 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -37,6 +37,8 @@ "this month" = "this month"; "Previous Month" = "Previous Month"; "Next Month" = "Next Month"; +/* Week number prefix */ +"W" = "W"; /* Year */ "this year" = "this year"; @@ -563,6 +565,7 @@ vtodo_class2 = "(Confidential task)"; "CalDAV URL" = "CalDAV URL "; "WebDAV ICS URL" = "WebDAV ICS URL"; "WebDAV XML URL" = "WebDAV XML URL"; +"Copy to clipboard" = "Copy to clipboard"; /* Error messages */ "dayFieldInvalid" = "Please specify a numerical value in the Days field greater or equal to 1."; diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 19832b8c1..4d09808ba 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -37,6 +37,8 @@ "this month" = "ce mois"; "Previous Month" = "Mois précédent"; "Next Month" = "Mois suivant"; +/* Week number prefix */ +"W" = "S"; /* Year */ "this year" = "Cette année"; @@ -563,6 +565,7 @@ vtodo_class2 = "(Tâche confidentielle)"; "CalDAV URL" = "Accès en CalDAV "; "WebDAV ICS URL" = "Représentation ICS en WebDAV"; "WebDAV XML URL" = "Représentation XML en WebDAV"; +"Copy to clipboard" = "Copier dans le presse-papier"; /* Error messages */ "dayFieldInvalid" = "Veuillez spécifier un chiffre supérieur ou égal à 1 dans le champ Jours."; diff --git a/UI/Scheduler/UIxCalMonthView.m b/UI/Scheduler/UIxCalMonthView.m index 1c8757318..ac4a86586 100644 --- a/UI/Scheduler/UIxCalMonthView.m +++ b/UI/Scheduler/UIxCalMonthView.m @@ -234,6 +234,19 @@ return daysNumbersToDisplay[i]; } +- (BOOL) isFirstDayOfWeek { + return 0 == [currentWeek indexOfObject: currentTableDay]; +} + +- (int) currentWeekNumber +{ + SOGoUser *user; + + user = [context activeUser]; + + return [user weekNumberForDate: currentTableDay]; +} + - (void) setCurrentWeek: (NSArray *) newCurrentWeek { ASSIGN (currentWeek, newCurrentWeek); diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox index 04a902328..5b2c5df3d 100644 --- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox +++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox @@ -8,7 +8,7 @@ xmlns:label="OGo:label" className="UIxPageFrame" title="moduleName" - const:jsFiles="vendor/ckeditor/ckeditor.js, Common/sgCkeditor.component.js, Common.js, Preferences.services.js, Mailer.services.js, Contacts.js, Contacts.services.js, vendor/angular-file-upload.min.js, vendor/FileSaver.min.js"> + const:jsFiles="vendor/ckeditor/ckeditor.js, Common/sgCkeditor.component.js, Common.js, Preferences.services.js, Mailer.services.js, Contacts.js, Contacts.services.js, vendor/angular-file-upload.min.js, vendor/FileSaver.min.js, vendor/punycode.js"> diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox index 002cb8267..364cd8a9b 100644 --- a/UI/Templates/MailerUI/UIxMailEditor.wox +++ b/UI/Templates/MailerUI/UIxMailEditor.wox @@ -219,8 +219,7 @@ + ng-keydown="editor.ignoreReturn($event)" />
diff --git a/UI/Templates/MainUI/SOGoRootPage.wox b/UI/Templates/MainUI/SOGoRootPage.wox index 6d3d9622a..4ac38e6ce 100644 --- a/UI/Templates/MainUI/SOGoRootPage.wox +++ b/UI/Templates/MainUI/SOGoRootPage.wox @@ -43,24 +43,24 @@
- - person - + + person + - - email - - visibility + + email + + visibility
- language - - - language + + + @@ -75,7 +75,7 @@
- domain + domain @@ -109,7 +109,7 @@ - info + info
- lock + lock - arrow_backward + arrow_backward - arrow_forward + arrow_forward
@@ -180,7 +180,7 @@ {{app.cn}}
- priority_high + priority_high
diff --git a/UI/Templates/PreferencesUI/UIxPreferences.wox b/UI/Templates/PreferencesUI/UIxPreferences.wox index fc46be6ee..fa3b8e710 100644 --- a/UI/Templates/PreferencesUI/UIxPreferences.wox +++ b/UI/Templates/PreferencesUI/UIxPreferences.wox @@ -1189,7 +1189,7 @@ ng-true-value="1" ng-false-value="0" ng-change="app.toggleVacationEndDate()"> - + diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 4ff706d22..a3337f247 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -8,7 +8,7 @@ xmlns:label="OGo:label" className="UIxPageFrame" title="moduleName" - const:jsFiles="vendor/ckeditor/ckeditor.js, vendor/ng-sortable.min.js, Common/sgCkeditor.component.js, Common.js, Preferences.services.js, Contacts.services.js, Mailer.services.js, vendor/angular-file-upload.min.js, Scheduler.js, Scheduler.services.js, vendor/FileSaver.min.js"> + const:jsFiles="vendor/ckeditor/ckeditor.js, vendor/ng-sortable.min.js, Common/sgCkeditor.component.js, Common.js, Preferences.services.js, Contacts.services.js, Mailer.services.js, vendor/angular-file-upload.min.js, Scheduler.js, Scheduler.services.js, vendor/FileSaver.min.js, vendor/punycode.js">