Merge branch 'master' into feature/addMissingStrings2

Conflicts:
	UI/AdministrationUI/English.lproj/Localizable.strings
	UI/PreferencesUI/English.lproj/Localizable.strings
	UI/Templates/PreferencesUI/UIxFilterEditor.wox

UI/MailPartViewers/UIxMailPartHTMLViewer.m

@@ -161,10 +161,10 @@ static NSData* _sanitizeContent(NSData *theData)
       if (i < len-5)
 	{
 	  if ((*bytes == '<') &&
-	      (*(bytes+1) == 'm' || *(bytes+2) == 'M') &&
-	      (*(bytes+2) == 'e' || *(bytes+3) == 'E') &&
-	      (*(bytes+3) == 't' || *(bytes+4) == 'T') &&
-	      (*(bytes+4) == 'a' || *(bytes+5) == 'A') &&
+	      (*(bytes+1) == 'm' || *(bytes+1) == 'M') &&
+	      (*(bytes+2) == 'e' || *(bytes+2) == 'E') &&
+	      (*(bytes+3) == 't' || *(bytes+3) == 'T') &&
+	      (*(bytes+4) == 'a' || *(bytes+4) == 'A') &&
 	      (*(bytes+5) == ' '))
             in_meta = YES;
 	}
@@ -551,9 +551,9 @@ static NSData* _sanitizeContent(NSData *theData)
                   else
                     skipAttribute = YES;
                 }
-              else if ([name isEqualToString: @"background"] ||
+              else if (([name isEqualToString: @"background"] ||
                        ([name isEqualToString: @"data"]
-                        || [name isEqualToString: @"classid"])
+                        || [name isEqualToString: @"classid"]))
                        && [lowerName isEqualToString: @"object"])
                 {
                   value = [_attributes valueAtIndex: count];
@@ -741,7 +741,7 @@ static NSData* _sanitizeContent(NSData *theData)
 
 /* SaxLexicalHandler */
 - (void) comment: (unichar *) _chars
-          length: (NSUInteger) _len
+          length: (int) _len
 {
   showWhoWeAre();
   if (inStyle)
@@ -807,7 +807,7 @@ static NSData* _sanitizeContent(NSData *theData)
     }
   [dump appendFormat: @"--- end ---\n"];
 
-  NSLog(dump);
+  NSLog(@"%@", dump);
   [dump release];
 }
 

UI/MailPartViewers/UIxMailPartICalActions.m

@@ -46,6 +46,7 @@
 #import <Mailer/SOGoMailObject.h>
 #import <SOGo/SOGoParentFolder.h>
 #import <SOGo/SOGoUser.h>
+#import <SOGo/NSString+Utilities.h>
 #import <Mailer/SOGoMailBodyPart.h>
 
 #import "UIxMailPartICalActions.h"

UI/MailPartViewers/UIxMailPartMessageViewer.m

@@ -228,7 +228,7 @@
           info = [parts objectAtIndex: i];
           viewer = [[[self context] mailRenderingContext] viewerForBodyInfo: info];
           [viewer setBodyInfo: info];
-          [viewer setPartPath: [[self contentPartPath] arrayByAddingObject: [NSString stringWithFormat: @"%d", i+1]]];
+          [viewer setPartPath: [[self contentPartPath] arrayByAddingObject: [NSString stringWithFormat: @"%d", (int)i+1]]];
           [renderedParts addObject: [viewer renderedPart]];
         }
     }

UI/MailPartViewers/UIxMailPartMixedViewer.h

@@ -33,7 +33,7 @@
 
 - (void) setChildInfo: (id) _info;
 - (id) childInfo;
-- (void) setChildIndex: (unsigned int) _index;
+- (void) setChildIndex: (NSUInteger) _index;
 - (id) childPartPath;
 
 

UI/MailPartViewers/UIxMailPartMixedViewer.m

@@ -61,7 +61,7 @@
   return [NSString stringWithFormat: @"%u",
                    (unsigned int) ([self childIndex] + 1)];
   char buf[8];
-  sprintf(buf, "%d", [self childIndex] + 1);
+  sprintf(buf, "%d", (int)[self childIndex] + 1);
   return [NSString stringWithCString:buf];
 }
 
@@ -87,6 +87,7 @@
   id info, viewer;
   NSArray *parts;
   NSMutableArray *renderedParts;
+  NSString *contentType;
   NSUInteger i, max;
 
   parts = [[self bodyInfo] objectForKey: @"parts"];
@@ -102,9 +103,13 @@
       [viewer setPartPath: [self childPartPath]];
       [renderedParts addObject: [viewer renderedPart]];
     }
+  contentType = [NSString stringWithFormat: @"%@/%@",
+                          [[self bodyInfo] objectForKey: @"type"],
+                          [[self bodyInfo] objectForKey: @"subtype"]];
 
   return [NSDictionary dictionaryWithObjectsAndKeys:
                          [self className], @"type",
+                       contentType, @"contentType",
                        renderedParts, @"content",
                        nil];
 }

UI/MailPartViewers/UIxMailPartTextViewer.h

@@ -1,8 +1,6 @@
 /* UIxMailPartTextViewer.h - this file is part of $PROJECT_NAME_HERE$
  *
- * Copyright (C) 2006 Inverse inc.
- *
- * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
+ * Copyright (C) 2006-2015 Inverse inc.
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

UI/MailPartViewers/UIxMailPartTextViewer.m

@@ -1,23 +1,22 @@
-/*
-  Copyright (C) 2004-2005 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
+/* UIxMailPartTextViewer.m - this file is part of $PROJECT_NAME_HERE$
+ *
+ * Copyright (C) 2006-2015 Inverse inc.
+ *
+ * This file is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This file is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
 
 /*
   UIxMailPartTextViewer

UI/MailPartViewers/UIxMailPartViewer.m

@@ -287,7 +287,7 @@
   if ([filename length])
     // We replace any slash by a dash since Apache won't allow encoded slashes by default.
     // See http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes
-    filename = [filename stringByReplacingString: @"/" withString: @"-"];
+    filename = (NSMutableString *)[filename stringByReplacingString: @"/" withString: @"-"];
   else
     [filename appendFormat: @"%@-%@",
 	      [self labelForKey: @"Untitled"],