From 19720a645f870a7c5696fa6f9c592b6e185818ac Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Fri, 7 Dec 2007 14:51:18 +0000 Subject: [PATCH] see changelog Monotone-Parent: de5df66679da8b8e87d75ec3e045d06880110b27 Monotone-Revision: 24ba5bd537bf1999f7443bca34f07358c1ea42d9 Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2007-12-07T14:51:18 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 ++++++++ UI/Contacts/English.lproj/Localizable.strings | 2 +- UI/Contacts/French.lproj/Localizable.strings | 4 ++-- UI/MailPartViewers/UIxMailRenderingContext.m | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7094a3922..9612e1bbb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-12-07 Ludovic Marcotte + + * UI/MailPartViewers/UIxMailRenderingContext.m + We treat multipart/appledouble like multipart/mixed + for now. That allows the user to save both parts. + + * Corrected typos in Localizable.string files. + 2007-12-06 Wolfgang Sourdeau * UI/Common/UIxAclEditor.m ([-currentUserIsOwner]): replaced diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings index 9d17ab3ea..6762a87f0 100644 --- a/UI/Contacts/English.lproj/Localizable.strings +++ b/UI/Contacts/English.lproj/Localizable.strings @@ -29,7 +29,7 @@ "Unit" = "Unit"; "delete" = "delete"; "edit" = "edit"; -"invalidemailwarn" = "invalidemailwarn"; +"invalidemailwarn" = "The specified email is invalid"; "new" = "new"; "Preferred Phone" = "Preferred Phone"; diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings index 4854e4855..973321b48 100644 --- a/UI/Contacts/French.lproj/Localizable.strings +++ b/UI/Contacts/French.lproj/Localizable.strings @@ -1,4 +1,4 @@ -/* this file is in UTF-8 format! */ +e/* this file is in UTF-8 format! */ "Contact" = "Contact"; "Address" = "Adresses"; @@ -36,7 +36,7 @@ "Unit" = "Département"; "delete" = "Effacer"; "edit" = "Éditer"; -"invalidemailwarn" = "Champ de l'email invalide, continuer quand même ?"; +"invalidemailwarn" = "Le champ de l'adresse électronique est invalide"; "new" = "Nouveau"; "Preferred Phone" = "Numéro préféré"; diff --git a/UI/MailPartViewers/UIxMailRenderingContext.m b/UI/MailPartViewers/UIxMailRenderingContext.m index a82097f65..0ed6f0bb3 100644 --- a/UI/MailPartViewers/UIxMailRenderingContext.m +++ b/UI/MailPartViewers/UIxMailRenderingContext.m @@ -258,7 +258,7 @@ static BOOL showNamedTextAttachmentsInline = NO; if ([mt isEqualToString:@"multipart"]) { - if ([st isEqualToString:@"mixed"] || [st isEqualToString:@"related"]) + if ([st isEqualToString:@"mixed"] || [st isEqualToString:@"related"] || [st isEqualToString: @"appledouble"]) return [self mixedViewer]; else if ([st isEqualToString:@"signed"]) return [self signedViewer];