Update SOGo (and its SOPE dependency) to 2.0.2a

ChangeLog since 2.0.0

2.0.2a (2012-11-15)
-------------------

Enhancements
 - improved user rights editor in calendar module
 - disable alarms for newly subsribed calendars

Bug fixes
 - fixed typos in Spanish (Spain) translation
 - fixed display of raw source for tasks
 - fixed title display of cards with a photo
 - fixed null address in reply-to header of messages
 - fixed scrolling for calendar/addressbooks lists
 - fixed display of invitations on BlackBerry devices
 - fixed sogo-tool rename-user for MySQL database
 - fixed corrupted attachments in Webmail
 - fixed parsing of URLs that can throw an exception
 - fixed password encoding in user sources

2.0.2 (2012-10-24)
------------------

New features
 - added support for SMTP AUTH
 - sogo configuration can now be set in /etc/sogo/sogo.conf
 - added support for GNU TLS

Enhancements
 - speed up of the parsing of IMAP traffic
 - minor speed up of the web interface
 - speed up the scrolling of the message list in the mail module
 - speed up the deletion of a large amounts of entries in the contacts module
 - updated the timezone files to the 2012.g edition
 - openchange backend: miscellaneous speed up of the synchronization
   operations
 - open file descriptors are now closed when the process starts

Bug fixes
 - the parameters included in the url of remote calendars are now taken into
   account
 - fixed an issue occurring with timezone definitions providing multiple entries
 - openchange backend: miscellaneous crashes during certain Outlook
   operations, which have appeared in version 2.0.0, have been fixed
 - fixed issues occuring on OpenBSD and potentially other BSD flavours

2.0.1 (2012-10-10)
-------------------

Enhancements
 - deletion of contacts is now performed in batch, which speeds up the
   operation for large numbers of items
 - scalability enhancements in the OpenChange backend that enables the first
   synchronization of mailboxes in a more reasonable time and using less
   memory
 - the task list is now sortable

Bug Fixes
 - improved support of IE 9

12 files changed, 304 insertions, 121 deletions

diff --git a/devel/SOPE/Makefile b/devel/SOPE/Makefile
index 2f382294dd5..b6ffb4a4227 100644
--- a/devel/SOPE/Makefile
+++ b/devel/SOPE/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:16:33 asau Exp $
+# $NetBSD: Makefile,v 1.5 2012/11/24 14:06:43 manu Exp $
 #
 
-DISTNAME=	SOPE-2.0.0b3
-PKGREVISION=	1
+DISTNAME=	SOPE-2.0.2a
 CATEGORIES=	devel
 MASTER_SITES=	http://www.sogo.nu/files/downloads/SOGo/Sources/
 
@@ -11,6 +10,8 @@ HOMEPAGE=	http://sope.opengroupware.org/
 COMMENT=	Framework for writing clever web servers driven by objects
 LICENSE=	gnu-lgpl-v2
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_TOOLS+=	gmake
 
 WRKSRC=		${WRKDIR}/SOPE
@@ -18,12 +19,16 @@ HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-gnustep --enable-debug --disable-strip
 
+pre-configure:
+	${LN} -s ${BUILDLINK_DIR}/lib/mysql/libmysqlclient.so \
+	         ${BUILDLINK_DIR}/lib/libmysqlclient.so
+
 .include "../../devel/gnustep-make/buildlink3.mk"
 .include "../../devel/gnustep-base/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../databases/openldap-client/buildlink3.mk"
-.include "../../databases/postgresql90-client/buildlink3.mk"
-.include "../../databases/mysql55-client/buildlink3.mk"
+.include "../../mk/pgsql.buildlink3.mk"
+.include "../../mk/mysql.buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/SOPE/PLIST b/devel/SOPE/PLIST
index 537f34afae8..7f12180b2e6 100644
--- a/devel/SOPE/PLIST
+++ b/devel/SOPE/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2011/10/16 05:34:58 manu Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/11/24 14:06:43 manu Exp $
 bin/wod
 bin/load-EOAdaptor
 bin/connect-EOAdaptor
@@ -208,6 +208,7 @@ include/NGMime/NGMimeUtilities.h
 include/NGMime/NGPart.h
 include/NGMime/NGMimeFileData.h
 include/NGMime/NGMimeJoinedData.h
+include/NGMime/NSData+RFC822.h
 include/NGMail/NGMailDecls.h
 include/NGMail/NGMail.h
 include/NGMail/NGMailAddressList.h
diff --git a/devel/SOPE/distinfo b/devel/SOPE/distinfo
index 112ac6d6657..fb068466522 100644
--- a/devel/SOPE/distinfo
+++ b/devel/SOPE/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2012/09/01 10:02:34 marino Exp $
+$NetBSD: distinfo,v 1.4 2012/11/24 14:06:43 manu Exp $
 
-SHA1 (SOPE-2.0.0b3.tar.gz) = 9f2b337f0d9015377fba81a4e1cc0e95141e6b59
-RMD160 (SOPE-2.0.0b3.tar.gz) = 45311144e883c7415a338ae7e634865b92c5baaa
-Size (SOPE-2.0.0b3.tar.gz) = 2153481 bytes
-SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = a4fe1cf1949579fab9a135c7a98dbfdf877ce315
+SHA1 (SOPE-2.0.2a.tar.gz) = 8dcb2a1ea3b90b860969878bdca5a2685eb37296
+RMD160 (SOPE-2.0.2a.tar.gz) = f9fd9ba7ed6ea550e86343f784fd64beac008df8
+Size (SOPE-2.0.2a.tar.gz) = 2243113 bytes
+SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = 5309786f9208e3799d3b659b912f1c263c63427c
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketAddress.m) = f5c6cb90d64ea48316175390d973ba59e44f29b9
 SHA1 (patch-sope-core_NGStreams_NGLocalSocketDomain.m) = 23dfa6732f3af2165b1adcf2637fc77bfeadfe3c
diff --git a/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m b/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m
index 21a0c1df59c..58f78d1884c 100644
--- a/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m
+++ b/devel/SOPE/patches/patch-sope-core_NGStreams_NGInternetSocketAddress.m
@@ -1,13 +1,15 @@
-$NetBSD: patch-sope-core_NGStreams_NGInternetSocketAddress.m,v 1.1 2012/09/01 10:02:34 marino Exp $
+$NetBSD: patch-sope-core_NGStreams_NGInternetSocketAddress.m,v 1.2 2012/11/24 14:06:43 manu Exp $
 
---- sope-core/NGStreams/NGInternetSocketAddress.m.orig	2011-11-04 12:39:19.000000000 +0000
-+++ sope-core/NGStreams/NGInternetSocketAddress.m
-@@ -48,7 +48,7 @@
+--- sope-core/NGStreams/NGInternetSocketAddress.m.orig	2012-11-15 18:51:03.000000000 +0100
++++ sope-core/NGStreams/NGInternetSocketAddress.m	2012-11-22 18:39:01.000000000 +0100
+@@ -47,9 +47,9 @@
+ #include "NGInternetSocketAddress.h"
  #include "NGInternetSocketDomain.h"
  #include "common.h"
  
--#if defined(HAVE_GETHOSTBYNAME_R) && !defined(linux) && !defined(__FreeBSD__)
-+#if defined(HAVE_GETHOSTBYNAME_R) && !defined(linux) && !defined(__FreeBSD__) && !defined(__DragonFly__)
+-#if defined(HAVE_GETHOSTBYNAME_R) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__)
++#if defined(HAVE_GETHOSTBYNAME_R) && !defined(linux) && !defined(__FreeBSD__) && !defined(__GLIBC__) && !defined(__DragonFly__)
  #define USE_GETHOSTBYNAME_R 1
  #endif
  
+ @implementation NGInternetSocketAddress
diff --git a/doc/CHANGES-2012 b/doc/CHANGES-2012
index e7202472d5a..75eb3181026 100644
--- a/doc/CHANGES-2012
+++ b/doc/CHANGES-2012
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2012,v 1.3624 2012/11/24 13:55:10 adam Exp $
+$NetBSD: CHANGES-2012,v 1.3625 2012/11/24 14:06:43 manu Exp $
 
 Changes to the packages collection and infrastructure in 2012:
 
@@ -5567,3 +5567,5 @@ Changes to the packages collection and infrastructure in 2012:
 	Updated net/knot to 1.1.2 [pettai 2012-11-23]
 	Updated chat/weechat to 0.3.9.2 [tonio 2012-11-24]
 	Updated devel/p5-Tree-DAG_Node to 1.09 [adam 2012-11-24]
+	Updated devel/SOPE to 2.0.2a [manu 2012-11-24]
+	Updated www/SOGo to 2.0.2a [manu 2012-11-24]
diff --git a/www/SOGo/Makefile b/www/SOGo/Makefile
index c6929f13bed..bde7a461d5c 100644
--- a/www/SOGo/Makefile
+++ b/www/SOGo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2012/10/28 06:30:00 asau Exp $
+# $NetBSD: Makefile,v 1.7 2012/11/24 14:06:43 manu Exp $
 #
 
-DISTNAME=	SOGo-2.0.0b3
-PKGREVISION=	1
+DISTNAME=	SOGo-2.0.2a
 CATEGORIES=	www
 MASTER_SITES=	http://www.sogo.nu/files/downloads/SOGo/Sources/
 
@@ -11,7 +10,8 @@ HOMEPAGE=	http://www.sogo.nu/
 COMMENT=	Groupware server supporting CalDAV, CardDAV and GroupDAV
 LICENSE=	gnu-gpl-v2
 
-WRKSRC=		${WRKDIR}/SOGo
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c
 USE_TOOLS+=     gmake zip:run
@@ -61,6 +61,7 @@ pre-install:
 .include "../../devel/SOPE/buildlink3.mk"
 .include "../../devel/libmemcached/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../www/curl/buildlink3.mk"
 
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/SOGo/PLIST b/www/SOGo/PLIST
index 7801350c31f..7127cfd5e47 100644
--- a/www/SOGo/PLIST
+++ b/www/SOGo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/12/14 15:02:24 manu Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/11/24 14:06:43 manu Exp $
 include/GDLContentStore/EOAdaptorChannel+GCS.h
 include/GDLContentStore/GCSAlarmsFolder.h
 include/GDLContentStore/GCSChannelManager.h
@@ -56,9 +56,11 @@ lib/GNUstep/Frameworks/SOGo.framework/Resources
 lib/GNUstep/Frameworks/SOGo.framework/SOGo
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/DOMNode+SOGo.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/LDAPSource.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/LDAPSourceSchema.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSArray+DAV.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSArray+Utilities.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSCalendarDate+SOGo.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSData+Crypto.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSDictionary+DAV.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSDictionary+URL.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSDictionary+Utilities.h
@@ -66,6 +68,7 @@ lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSNull+Utilities.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSNumber+Utilities.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSObject+DAV.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSObject+Utilities.h
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSString+Crypto.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSString+DAV.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSString+Utilities.h
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Headers/NSURL+DAV.h
@@ -106,7 +109,7 @@ lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/Info-gnustep.plist
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/SOGoDefaults.plist
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/SOGo
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so
-lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so.2.0.0
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so.2.0.2
 lib/GNUstep/Frameworks/SOGo.framework/Versions/Current
 lib/GNUstep/Frameworks/SOGo.framework/libSOGo.so
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Abidjan.ics
@@ -134,6 +137,7 @@ lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Freetown.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Gaborone.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Harare.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Johannesburg.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Juba.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Kampala.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Khartoum.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Kigali.ics
@@ -198,6 +202,7 @@ lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Cayman.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Chicago.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Chihuahua.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Costa_Rica.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Creston.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Cuiaba.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Curacao.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Danmarkshavn.ics
@@ -236,9 +241,11 @@ lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Jamaica.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Juneau.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Kentucky/Louisville.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Kentucky/Monticello.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Kralendijk.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/La_Paz.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Lima.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Los_Angeles.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Lower_Princes.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Maceio.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Managua.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Manaus.ics
@@ -248,16 +255,20 @@ lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Matamoros.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Mazatlan.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Menominee.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Merida.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Metlakatla.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Mexico_City.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Miquelon.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Moncton.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Monterrey.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Montevideo.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Montreal.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Montserrat.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Nassau.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/New_York.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Nipigon.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Nome.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Noronha.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/North_Dakota/Beulah.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/North_Dakota/Center.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/North_Dakota/New_Salem.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Ojinaga.ics
@@ -282,6 +293,7 @@ lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Santo_Domingo.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Sao_Paulo.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Scoresbysund.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Shiprock.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/Sitka.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/St_Barthelemy.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/St_Johns.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/America/St_Kitts.ics
@@ -336,6 +348,7 @@ lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Asia/Dubai.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Asia/Dushanbe.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Asia/Gaza.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Asia/Harbin.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Asia/Hebron.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Asia/Ho_Chi_Minh.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Asia/Hong_Kong.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Asia/Hovd.ics
@@ -518,6 +531,7 @@ lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Pacific/Tongatapu.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Pacific/Truk.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Pacific/Wake.ics
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Pacific/Wallis.ics
+lib/GNUstep/Libraries/Resources/NGCards/TimeZones/UPDATING
 lib/GNUstep/OCSTypeModels/appointment-oracle.ocs
 lib/GNUstep/OCSTypeModels/appointment.ocs
 lib/GNUstep/OCSTypeModels/contact-oracle.ocs
@@ -526,6 +540,7 @@ lib/GNUstep/SOGo/AdministrationUI.SOGo/AdministrationUI
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/French.lproj/Localizable.strings
@@ -533,10 +548,12 @@ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/German.lproj/Localizable.string
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/Localizable.strings
-lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/UIxAdministration.toolbar
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Ukrainian.lproj/Localizable.strings
@@ -547,6 +564,7 @@ lib/GNUstep/SOGo/Appointments.SOGo/Appointments
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/French.lproj/Localizable.strings
@@ -555,10 +573,14 @@ lib/GNUstep/SOGo/Appointments.SOGo/Resources/Hungarian.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/Appointments.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPRequest.wo/MSExchangeFreeBusySOAPRequest.html
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/MSExchangeFreeBusySOAPRequest.wo/MSExchangeFreeBusySOAPRequest.wod
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Russian.lproj/Localizable.strings
-lib/GNUstep/SOGo/Appointments.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Ukrainian.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Welsh.lproj/Localizable.strings
@@ -568,6 +590,7 @@ lib/GNUstep/SOGo/CommonUI.SOGo/CommonUI
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/French.lproj/Localizable.strings
@@ -576,10 +599,12 @@ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Russian.lproj/Localizable.strings
-lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Ukrainian.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Welsh.lproj/Localizable.strings
@@ -590,6 +615,7 @@ lib/GNUstep/SOGo/Contacts.SOGo/Contacts
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/French.lproj/Localizable.strings
@@ -598,10 +624,12 @@ lib/GNUstep/SOGo/Contacts.SOGo/Resources/Hungarian.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/Contacts.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Russian.lproj/Localizable.strings
-lib/GNUstep/SOGo/Contacts.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Ukrainian.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Welsh.lproj/Localizable.strings
@@ -611,6 +639,7 @@ lib/GNUstep/SOGo/ContactsUI.SOGo/ContactsUI
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/French.lproj/Localizable.strings
@@ -619,11 +648,13 @@ lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SOGoContactFolder.toolbar
-lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Ukrainian.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Welsh.lproj/Localizable.strings
@@ -634,6 +665,7 @@ lib/GNUstep/SOGo/MailPartViewers.SOGo/MailPartViewers
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/French.lproj/Localizable.strings
@@ -642,10 +674,12 @@ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Hungarian.lproj/Localizable.stri
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/Localizable.strings
-lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Ukrainian.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Welsh.lproj/Localizable.strings
@@ -665,6 +699,10 @@ lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCzechForward.wo/SOGoMailCzechForw
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCzechForward.wo/SOGoMailCzechForward.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCzechReply.wo/SOGoMailCzechReply.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCzechReply.wo/SOGoMailCzechReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailDanishForward.wo/SOGoMailDanishForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailDanishForward.wo/SOGoMailDanishForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailDanishReply.wo/SOGoMailDanishReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailDanishReply.wo/SOGoMailDanishReply.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailDutchForward.wo/SOGoMailDutchForward.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailDutchForward.wo/SOGoMailDutchForward.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailDutchReply.wo/SOGoMailDutchReply.html
@@ -686,15 +724,21 @@ lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailHungarianForward.wo/SOGoMailHunga
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailHungarianReply.wo/SOGoMailHungarianReply.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailHungarianReply.wo/SOGoMailHungarianReply.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailIcelandicForward.wo/SOGoMailIcelandicForward.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailIcelandicReply.wo/SOGoMailIcelandicReply.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailItalianForward.wo/SOGoMailItalianForward.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailItalianForward.wo/SOGoMailItalianForward.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailItalianReply.wo/SOGoMailItalianReply.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailItalianReply.wo/SOGoMailItalianReply.wod
-lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianForward.wo/SOGoMailNorwegianForward.html
-lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianForward.wo/SOGoMailNorwegianForward.wod
-lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianReply.wo/SOGoMailNorwegianReply.html
-lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianReply.wo/SOGoMailNorwegianReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianBokmalForward.wo/SOGoMailNorwegianBokmalForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianBokmalReply.wo/SOGoMailNorwegianBokmalReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianBokmalReply.wo/SOGoMailNorwegianBokmalReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianNynorskForward.wo/SOGoMailNorwegianNynorskForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianNynorskReply.wo/SOGoMailNorwegianNynorskReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailNorwegianNynorskReply.wo/SOGoMailNorwegianNynorskReply.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPolishForward.wo/SOGoMailPolishForward.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPolishForward.wo/SOGoMailPolishForward.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailPolishReply.wo/SOGoMailPolishReply.html
@@ -703,14 +747,22 @@ lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailRussianForward.wo/SOGoMailRussian
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailRussianForward.wo/SOGoMailRussianForward.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailRussianReply.wo/SOGoMailRussianReply.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailRussianReply.wo/SOGoMailRussianReply.wod
-lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html
-lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.wod
-lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.html
-lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishReply.wo/SOGoMailSpanishReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishArgentinaForward.wo/SOGoMailSpanishArgentinaForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishArgentinaReply.wo/SOGoMailSpanishArgentinaReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishArgentinaReply.wo/SOGoMailSpanishArgentinaReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishSpainForward.wo/SOGoMailSpanishSpainForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishSpainReply.wo/SOGoMailSpanishSpainReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSpanishSpainReply.wo/SOGoMailSpanishSpainReply.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSwedishForward.wo/SOGoMailSwedishForward.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSwedishReply.wo/SOGoMailSwedishReply.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailSwedishReply.wo/SOGoMailSwedishReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailUkrainianForward.wo/SOGoMailUkrainianForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailUkrainianReply.wo/SOGoMailUkrainianReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailUkrainianReply.wo/SOGoMailUkrainianReply.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailWelshForward.wo/SOGoMailWelshForward.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailWelshForward.wo/SOGoMailWelshForward.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailWelshReply.wo/SOGoMailWelshReply.html
@@ -721,6 +773,7 @@ lib/GNUstep/SOGo/MailerUI.SOGo/MailerUI
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/French.lproj/Localizable.strings
@@ -729,12 +782,15 @@ lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Russian.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoDraftObject.toolbar
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoMailFolder.toolbar
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoMailObject.toolbar
-lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Ukrainian.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Welsh.lproj/Localizable.strings
@@ -748,6 +804,8 @@ lib/GNUstep/SOGo/MainUI.SOGo/Resources/Catalan.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Czech.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Danish.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Dutch.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/English.lproj/Locale
@@ -763,8 +821,10 @@ lib/GNUstep/SOGo/MainUI.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Italian.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/MainUI.SOGo/Resources/Norwegian.lproj/Locale
-lib/GNUstep/SOGo/MainUI.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/NorwegianBokmal.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/NorwegianNynorsk.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/OCSFolderInfo-oracle.sql
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/OCSFolderInfo.sql
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Polish.lproj/Locale
@@ -773,8 +833,10 @@ lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/SOGoProfile-oracle.sql
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/SOGoProfile.sql
-lib/GNUstep/SOGo/MainUI.SOGo/Resources/Spanish.lproj/Locale
-lib/GNUstep/SOGo/MainUI.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishSpain.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Swedish.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Ukrainian.lproj/Locale
@@ -787,6 +849,7 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/PreferencesUI
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/French.lproj/Localizable.strings
@@ -795,10 +858,12 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Hungarian.lproj/Localizable.string
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/Localizable.strings
-lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/UIxPreferences.toolbar
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Ukrainian.lproj/Localizable.strings
@@ -808,6 +873,7 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/stamp.make
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Catalan.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Czech.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/English.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/French.lproj/Localizable.strings
@@ -816,7 +882,8 @@ lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Icelandic.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Info-gnustep.plist
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Italian.lproj/Localizable.strings
-lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Norwegian.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Russian.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoAppointmentFolders.toolbar
@@ -827,7 +894,8 @@ lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoAppointmentObjectDecline.toolbar
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoComponentClose.toolbar
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoEmpty.toolbar
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoTaskObject.toolbar
-lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Spanish.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Swedish.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Ukrainian.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Welsh.lproj/Localizable.strings
@@ -839,12 +907,10 @@ lib/GNUstep/SOGo/SchedulerUI.SOGo/stamp.make
 lib/GNUstep/SOGo/Templates/AdministrationUI/UIxAdministration.wox
 lib/GNUstep/SOGo/Templates/AdministrationUI/UIxAdministrationFilterPanel.wox
 lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailDeletion.wox
-lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailDeletionReceipt.wox
 lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailICalReply.wox
 lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailInvitation.wox
-lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailInvitationReceipt.wox
+lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailReceipt.wox
 lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailUpdate.wox
-lib/GNUstep/SOGo/Templates/Appointments/SOGoAptMailUpdateReceipt.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactEditor.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactFoldersView.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactView.wox
@@ -893,6 +959,9 @@ lib/GNUstep/SOGo/Templates/SOGoACLCatalanRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLCzechAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLCzechModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLCzechRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLDanishAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLDanishModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLDanishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLDutchAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLDutchModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLDutchRemovalAdvisory.wox
@@ -914,18 +983,24 @@ lib/GNUstep/SOGo/Templates/SOGoACLIcelandicRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLItalianAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLItalianModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLItalianRemovalAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoACLNorwegianAdditionAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoACLNorwegianModificationAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoACLNorwegianRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLNorwegianBokmalAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLNorwegianBokmalModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLNorwegianBokmalRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLNorwegianNynorskAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLNorwegianNynorskModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLNorwegianNynorskRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLPolishAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLPolishModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLPolishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLRussianAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLRussianModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLRussianRemovalAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoACLSpanishAdditionAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoACLSpanishModificationAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoACLSpanishRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSpanishSpainAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSpanishSpainModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSpanishSpainRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLSwedishAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLSwedishModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLSwedishRemovalAdvisory.wox
@@ -938,6 +1013,8 @@ lib/GNUstep/SOGo/Templates/SOGoFolderCatalanAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderCatalanRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderCzechAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderCzechRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderDanishAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderDanishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderDutchAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderDutchRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderEnglishAdditionAdvisory.wox
@@ -952,14 +1029,18 @@ lib/GNUstep/SOGo/Templates/SOGoFolderIcelandicAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderIcelandicRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderItalianAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderItalianRemovalAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianAdditionAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianBokmalAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianBokmalRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianNynorskAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderNorwegianNynorskRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderPolishAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderPolishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderRussianAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderRussianRemovalAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoFolderSpanishAdditionAdvisory.wox
-lib/GNUstep/SOGo/Templates/SOGoFolderSpanishRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderSpanishArgentinaAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderSpanishArgentinaRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderSpanishSpainAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderSpanishSpainRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderSwedishAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderSwedishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderUkrainianAdditionAdvisory.wox
@@ -993,6 +1074,7 @@ lib/GNUstep/SOGo/Templates/SchedulerUI/UIxTaskProposal.wox
 lib/GNUstep/SOGo/Templates/SchedulerUI/UIxTimeDateControl.wox
 lib/GNUstep/SOGo/Templates/UIxAclEditor.wox
 lib/GNUstep/SOGo/Templates/UIxJSClose.wox
+lib/GNUstep/SOGo/Templates/UIxLoading.wox
 lib/GNUstep/SOGo/Templates/UIxModuleAccessDenied.wox
 lib/GNUstep/SOGo/Templates/UIxPageFrame.wox
 lib/GNUstep/SOGo/Templates/UIxSortableTableHeader.wox
@@ -1022,6 +1104,7 @@ lib/GNUstep/SOGo/WebServerResources/SOGoResizableTable.js
 lib/GNUstep/SOGo/WebServerResources/SOGoRootPage.css
 lib/GNUstep/SOGo/WebServerResources/SOGoRootPage.js
 lib/GNUstep/SOGo/WebServerResources/SOGoTabsController.js
+lib/GNUstep/SOGo/WebServerResources/SOGoTimePicker.css
 lib/GNUstep/SOGo/WebServerResources/SOGoTimePicker.js
 lib/GNUstep/SOGo/WebServerResources/SchedulerUI.css
 lib/GNUstep/SOGo/WebServerResources/SchedulerUI.js
@@ -1103,8 +1186,8 @@ lib/GNUstep/SOGo/WebServerResources/busy.gif
 lib/GNUstep/SOGo/WebServerResources/calendar-folder-16x16.png
 lib/GNUstep/SOGo/WebServerResources/calendar-reload.png
 lib/GNUstep/SOGo/WebServerResources/choose-date.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/.htaccess
 lib/GNUstep/SOGo/WebServerResources/ckeditor/LICENSE.html
+lib/GNUstep/SOGo/WebServerResources/ckeditor/adapters/jquery.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/ckeditor.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/ckeditor_basic.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/config.js
@@ -1142,6 +1225,7 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/he.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hi.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hr.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hu.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/id.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/is.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/it.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ja.js
@@ -1150,6 +1234,7 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/km.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ko.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/lt.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/lv.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/mk.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/mn.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ms.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/nb.js
@@ -1167,13 +1252,36 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sr.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sv.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/th.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/tr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ug.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/uk.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/vi.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/zh-cn.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/zh.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/_translationstatus.txt
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/cs.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/cy.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/da.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/de.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/el.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/en.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/eo.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fa.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fi.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/gu.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/he.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/it.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/mk.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/nb.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/nl.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/no.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/pt-br.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/ro.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/tr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/ug.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/vi.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/zh-cn.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/about.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/logo_ckeditor.png
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/ajax/plugin.js
@@ -1209,8 +1317,32 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pagebreak/images/pagebreak.
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pastefromword/filter/default.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pastetext/dialogs/pastetext.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/dialogs/placeholder.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/_translationstatus.txt
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/bg.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/cs.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/cy.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/da.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/de.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/el.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/en.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/eo.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/et.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fa.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fi.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fr.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/he.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/hr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/it.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/nb.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/nl.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/no.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/pl.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/pt-br.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/tr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/ug.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/uk.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/vi.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/zh-cn.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/placeholder.gif
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/plugin.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/options.js
@@ -1249,7 +1381,27 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/tounge_smile.
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/wink_smile.gif
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/dialogs/specialchar.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/_translationstatus.txt
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/cs.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/cy.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/de.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/el.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/en.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/eo.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/et.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fa.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fi.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/he.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/hr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/it.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/nb.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/nl.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/no.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/pt-br.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/tr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/ug.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/zh-cn.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/styles/styles/default.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/stylesheetparser/plugin.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/table/dialogs/table.js
@@ -1261,8 +1413,33 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/template2.gif
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/template3.gif
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/dialogs/uicolor.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/_translationstatus.txt
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/bg.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/cs.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/cy.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/da.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/de.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/el.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/en.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/eo.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/et.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fa.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fi.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fr.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/he.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/hr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/it.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/mk.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/nb.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/nl.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/no.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/pl.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/pt-br.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/tr.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/ug.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/uk.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/vi.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/zh-cn.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/plugin.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/uicolor.gif
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
@@ -1320,6 +1497,8 @@ lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/templates.css
 lib/GNUstep/SOGo/WebServerResources/ckeditor/themes/default/theme.js
 lib/GNUstep/SOGo/WebServerResources/confidential.png
 lib/GNUstep/SOGo/WebServerResources/create-account.png
+lib/GNUstep/SOGo/WebServerResources/datepicker.css
+lib/GNUstep/SOGo/WebServerResources/datepicker.js
 lib/GNUstep/SOGo/WebServerResources/day-view-multicolumn.png
 lib/GNUstep/SOGo/WebServerResources/day-view.png
 lib/GNUstep/SOGo/WebServerResources/dialog-left.png
@@ -1327,6 +1506,7 @@ lib/GNUstep/SOGo/WebServerResources/dialog-right.png
 lib/GNUstep/SOGo/WebServerResources/dialog-top.png
 lib/GNUstep/SOGo/WebServerResources/dot.png
 lib/GNUstep/SOGo/WebServerResources/down-icon.png
+lib/GNUstep/SOGo/WebServerResources/dragdot.png
 lib/GNUstep/SOGo/WebServerResources/dtree.css
 lib/GNUstep/SOGo/WebServerResources/dtree.js
 lib/GNUstep/SOGo/WebServerResources/edit.png
@@ -1351,6 +1531,8 @@ lib/GNUstep/SOGo/WebServerResources/iefixes.css
 lib/GNUstep/SOGo/WebServerResources/important.png
 lib/GNUstep/SOGo/WebServerResources/input_bg.gif
 lib/GNUstep/SOGo/WebServerResources/inverse.png
+lib/GNUstep/SOGo/WebServerResources/jquery-ui.js
+lib/GNUstep/SOGo/WebServerResources/jquery.js
 lib/GNUstep/SOGo/WebServerResources/js_color_picker_v2.css
 lib/GNUstep/SOGo/WebServerResources/js_color_picker_v2.js
 lib/GNUstep/SOGo/WebServerResources/last.gif
@@ -1536,20 +1718,9 @@ lib/GNUstep/SOGo/WebServerResources/remove-addressbook.png
 lib/GNUstep/SOGo/WebServerResources/remove-calendar.png
 lib/GNUstep/SOGo/WebServerResources/remove-contact.gif
 lib/GNUstep/SOGo/WebServerResources/remove-icon.png
-lib/GNUstep/SOGo/WebServerResources/scriptaculous.js
-lib/GNUstep/SOGo/WebServerResources/scriptaculous/MIT-LICENSE
-lib/GNUstep/SOGo/WebServerResources/scriptaculous/builder.js
-lib/GNUstep/SOGo/WebServerResources/scriptaculous/controls.js
-lib/GNUstep/SOGo/WebServerResources/scriptaculous/dragdrop.js
-lib/GNUstep/SOGo/WebServerResources/scriptaculous/effects.js
-lib/GNUstep/SOGo/WebServerResources/scriptaculous/slider.js
-lib/GNUstep/SOGo/WebServerResources/scriptaculous/sound.js
-lib/GNUstep/SOGo/WebServerResources/scriptaculous/unittest.js
 lib/GNUstep/SOGo/WebServerResources/search-messages.png
 lib/GNUstep/SOGo/WebServerResources/signature-not-ok.png
 lib/GNUstep/SOGo/WebServerResources/signature-ok.png
-lib/GNUstep/SOGo/WebServerResources/skycalendar.html
-lib/GNUstep/SOGo/WebServerResources/skycalendar.js
 lib/GNUstep/SOGo/WebServerResources/slider_handle.gif
 lib/GNUstep/SOGo/WebServerResources/smalltoolbarbtn_a_bg.png
 lib/GNUstep/SOGo/WebServerResources/smalltoolbarbtn_span_bg.png
@@ -1589,16 +1760,16 @@ lib/GNUstep/SOGo/WebServerResources/tb-mail-replyall-flat-24x24.png
 lib/GNUstep/SOGo/WebServerResources/tb-mail-stop-flat-24x24.png
 lib/GNUstep/SOGo/WebServerResources/tb-mail-write-flat-24x24.png
 lib/GNUstep/SOGo/WebServerResources/tbtv_account_17x17.png
-lib/GNUstep/SOGo/WebServerResources/tbtv_corner_17x17.gif
-lib/GNUstep/SOGo/WebServerResources/tbtv_corner_minus_17x17.gif
-lib/GNUstep/SOGo/WebServerResources/tbtv_corner_plus_17x17.gif
+lib/GNUstep/SOGo/WebServerResources/tbtv_corner_17x22.png
+lib/GNUstep/SOGo/WebServerResources/tbtv_corner_minus_17x22.png
+lib/GNUstep/SOGo/WebServerResources/tbtv_corner_plus_17x22.png
 lib/GNUstep/SOGo/WebServerResources/tbtv_drafts_17x17.png
 lib/GNUstep/SOGo/WebServerResources/tbtv_inbox_17x17.png
-lib/GNUstep/SOGo/WebServerResources/tbtv_junction_17x17.gif
+lib/GNUstep/SOGo/WebServerResources/tbtv_junction_17x22.png
 lib/GNUstep/SOGo/WebServerResources/tbtv_leaf_corner_17x17.png
-lib/GNUstep/SOGo/WebServerResources/tbtv_line_17x17.gif
-lib/GNUstep/SOGo/WebServerResources/tbtv_minus_17x17.gif
-lib/GNUstep/SOGo/WebServerResources/tbtv_plus_17x17.gif
+lib/GNUstep/SOGo/WebServerResources/tbtv_line_17x22.png
+lib/GNUstep/SOGo/WebServerResources/tbtv_minus_17x22.png
+lib/GNUstep/SOGo/WebServerResources/tbtv_plus_17x22.png
 lib/GNUstep/SOGo/WebServerResources/tbtv_sent_17x17.png
 lib/GNUstep/SOGo/WebServerResources/tbtv_trash_17x17.png
 lib/GNUstep/SOGo/WebServerResources/tentative.png
@@ -1631,7 +1802,7 @@ lib/libNGCards.so.4.9.0
 lib/libOGoContentStore.so
 lib/libOGoContentStore.so.0.9.0
 lib/libSOGo.so
-lib/libSOGo.so.2.0.0
+lib/libSOGo.so.2.0.2
 lib/libSOGoUI.so
 lib/libSOGoUI.so.2.0.0
 sbin/sogo-ealarms-notify
diff --git a/www/SOGo/distinfo b/www/SOGo/distinfo
index d9dfafcc96f..6a3a5430d80 100644
--- a/www/SOGo/distinfo
+++ b/www/SOGo/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/12/15 12:55:16 dholland Exp $
+$NetBSD: distinfo,v 1.6 2012/11/24 14:06:44 manu Exp $
 
-SHA1 (SOGo-2.0.0b3.tar.gz) = 3da9fc968842c521cabb3277017f9e128b3c16c6
-RMD160 (SOGo-2.0.0b3.tar.gz) = 711cd54c4b5cbb7481142c0600131579344cbdbb
-Size (SOGo-2.0.0b3.tar.gz) = 3801713 bytes
-SHA1 (patch-SoObjects_SOGo_NSString+Utilities.m) = 003d015629adff3b0f2bee165518fa549840901b
-SHA1 (patch-aa) = d5f7c3caea148b6b5f872fb0561d14ec15312c90
+SHA1 (SOGo-2.0.2a.tar.gz) = 0e722b8530465463560c2c9a2c45f748979d8674
+RMD160 (SOGo-2.0.2a.tar.gz) = dd1fc7764e9aa151ed8a64307d75d8130f05a810
+Size (SOGo-2.0.2a.tar.gz) = 6700117 bytes
+SHA1 (patch-SoObjects_SOGo_GNUmakefile.preamble) = ae129e2a04ab2e43d58c29c2db0a950881305fb1
+SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 259be0979fbbc61194a0fbccd34d81dee3659186
diff --git a/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble b/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble
new file mode 100644
index 00000000000..7216b71f14d
--- /dev/null
+++ b/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble
@@ -0,0 +1,14 @@
+$NetBSD: patch-SoObjects_SOGo_GNUmakefile.preamble,v 1.1 2012/11/24 14:06:44 manu Exp $
+--- ./SoObjects/SOGo/GNUmakefile.preamble.orig	2012-11-23 16:15:38.000000000 +0100
++++ ./SoObjects/SOGo/GNUmakefile.preamble	2012-11-23 16:15:43.000000000 +0100
+@@ -23,9 +23,9 @@
+ 	-lNGMime		\
+ 	-lNGStreams -lNGExtensions -lEOControl \
+ 	-lDOM -lSaxObjC \
+ 	-lNGLdap -lSBJson \
+-        -lGDLContentStore -lgnustep-base -lobjc -ldl
++        -lGDLContentStore -lgnustep-base -lobjc 
+ 
+ ifeq ($(HAS_LIBRARY_gnutls),yes)
+ ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
+ SOGo_LIBRARIES_DEPEND_UPON += -lgnutls
diff --git a/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m b/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m
new file mode 100644
index 00000000000..1a27fb6536a
--- /dev/null
+++ b/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m
@@ -0,0 +1,15 @@
+$NetBSD: patch-SoObjects_SOGo_NSData+Crypto.m,v 1.1 2012/11/24 14:06:44 manu Exp $
+
+--- SoObjects/SOGo/NSData+Crypto.m.orig	2012-11-22 18:43:09.000000000 +0100
++++ SoObjects/SOGo/NSData+Crypto.m	2012-11-22 18:43:47.000000000 +0100
+@@ -22,9 +22,9 @@
+  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+  * Boston, MA 02111-1307, USA.
+  */
+ 
+-#ifndef __OpenBSD__
++#ifdef __sun
+ #include <crypt.h>
+ #endif
+ 
+ #include <sys/types.h>
diff --git a/www/SOGo/patches/patch-SoObjects_SOGo_NSString+Utilities.m b/www/SOGo/patches/patch-SoObjects_SOGo_NSString+Utilities.m
deleted file mode 100644
index e211f0f45f3..00000000000
--- a/www/SOGo/patches/patch-SoObjects_SOGo_NSString+Utilities.m
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-SoObjects_SOGo_NSString+Utilities.m,v 1.1 2011/12/05 22:57:35 joerg Exp $
-
---- SoObjects/SOGo/NSString+Utilities.m.orig	2011-12-05 18:16:46.000000000 +0000
-+++ SoObjects/SOGo/NSString+Utilities.m
-@@ -21,7 +21,7 @@
-  * Boston, MA 02111-1307, USA.
-  */
- 
--#ifndef __OpenBSD__ 
-+#ifdef __sun
- #include <crypt.h>
- #endif
- 
diff --git a/www/SOGo/patches/patch-aa b/www/SOGo/patches/patch-aa
deleted file mode 100644
index bb7064204a2..00000000000
--- a/www/SOGo/patches/patch-aa
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2011/10/16 05:36:35 manu Exp $
-
-GNU cp(1) has a -d flag to copy symlinks instead of their targets. This
-flag does not exists with NetBSD cp(1) but it is the default behavior
-if -R is used, both with GNU cp(1) and NetBSD cp(1)
-
---- SOPE/NGCards/GNUmakefile.postamble.orig	2011-10-15 09:13:26.000000000 +0200
-+++ SOPE/NGCards/GNUmakefile.postamble	2011-10-15 09:13:36.000000000 +0200
-@@ -7,5 +7,5 @@
- 
- after-install :: mappings-dir
- 	cp NGCards.xmap $(MAPDIR)
- 	-mkdir -p $(GNUSTEP_LIBRARY)/Libraries/Resources/NGCards
--	cp -dpR TimeZones $(GNUSTEP_LIBRARY)/Libraries/Resources/NGCards
-+	cp -pR TimeZones $(GNUSTEP_LIBRARY)/Libraries/Resources/NGCards