amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-27 12:54:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge to 2.2.5

Browse Source
This commit is contained in:
Francis Lachapelle
2014-06-05 13:35:45 -04:00
parent 95d6911f1a 6b6ec8a2ae
commit f0b4a05c70
35 changed files with 330 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ActiveSync/SOGoMailObject+ActiveSync.m
+18 -7
View File
@@ -285,20 +285,31 @@ struct GlobalObjectId {
[self _sanitizedMIMEPart: body
performed: b];
}
else if ([body isKindOfClass: [NSData class]] &&
else if (([body isKindOfClass: [NSData class]] || [body isKindOfClass: [NSString class]]) &&
[[[thePart contentType] type] isEqualToString: @"text"] &&
([[[thePart contentType] subType] isEqualToString: @"plain"] || [[[thePart contentType] subType] isEqualToString: @"html"]))
{
// We make sure everything is encoded in UTF-8
NSString *charset, *s;
NGMimeType *mimeType;
int encoding;
NSString *s;
charset = [[thePart contentType] valueOfParameter: @"charset"];
encoding = [NGMimeType stringEncodingForCharset: charset];
if ([body isKindOfClass: [NSData class]])
{
NSString *charset;
int encoding;
s = [[NSString alloc] initWithData: body encoding: encoding];
AUTORELEASE(s);
charset = [[thePart contentType] valueOfParameter: @"charset"];
encoding = [NGMimeType stringEncodingForCharset: charset];
s = [[NSString alloc] initWithData: body encoding: encoding];
AUTORELEASE(s);
}
else
{
// Handle situations when SOPE stupidly returns us a NSString
// This can happen for Content-Type: text/plain, Content-Transfer-Encoding: 8bit
s = body;
}
if (s)
{
ActiveSync/iCalRecurrenceRule+ActiveSync.m
+20 -3
View File
@@ -34,6 +34,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#import <Foundation/NSDictionary.h>
#import <Foundation/NSString.h>
#import <NGCards/iCalEvent.h>
#import <NGCards/iCalByDayMask.h>
#import "NSCalendarDate+ActiveSync.h"
@@ -77,10 +78,19 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
occurrences = [[self byDayMask] weekDayOccurrences];
v = 0;
for (i = 0; i < 7; i++)
if (occurrences)
{
if (occurrences[0][i])
v += (1 << i);
for (i = 0; i < 7; i++)
{
if (occurrences[0][i])
v += (1 << i);
}
}
else
{
// No byDayMask, we take the event's start date to compute the DayOfWeek
// 0 == Sunday, 6 == Saturday
v = (1 << [[[self parent] startDate] dayOfWeek]);
}
[s appendFormat: @"<Recurrence_DayOfWeek xmlns=\"Calendar:\">%d</Recurrence_DayOfWeek>", v];
@@ -125,6 +135,13 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// FIXME
}
}
else
{
// Simple reccurrence rule of type "Monthly"
type = 2;
[s appendFormat: @"<Recurrence_DayOfMonth xmlns=\"Calendar:\">%d</Recurrence_DayOfMonth>",
[[[self parent] startDate] dayOfMonth]];
}
}
else if ([self frequency] == iCalRecurrenceFrequenceYearly)
{
ChangeLog
+105
View File
@@ -1,3 +1,108 @@
commit ad30df26af2c95f91ad42fd02a3b45ada115502b
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu Jun 5 13:34:40 2014 -0400
Preparation for release 2.2.5
M Documentation/SOGo Installation Guide.odt
M Documentation/SOGo Mozilla Thunderbird Configuration.odt
M Documentation/SOGo Native Microsoft Outlook Configuration.odt
M Version
M packaging/rhel/sogo.spec
commit 6e56f46f8608c5bc6c2070c848c9fefbf4d95048
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu Jun 5 13:29:10 2014 -0400
Update Dutch, Finnish, German, Polish translations
M NEWS
M SoObjects/Contacts/Dutch.lproj/Localizable.strings
M SoObjects/Contacts/Finnish.lproj/Localizable.strings
M SoObjects/Contacts/German.lproj/Localizable.strings
M SoObjects/Contacts/Polish.lproj/Localizable.strings
M UI/Common/German.lproj/Localizable.strings
M UI/Contacts/Dutch.lproj/Localizable.strings
M UI/Contacts/Finnish.lproj/Localizable.strings
M UI/Contacts/German.lproj/Localizable.strings
M UI/MailerUI/Dutch.lproj/Localizable.strings
M UI/MailerUI/Finnish.lproj/Localizable.strings
M UI/MailerUI/German.lproj/Localizable.strings
M UI/PreferencesUI/Dutch.lproj/Localizable.strings
M UI/PreferencesUI/Finnish.lproj/Localizable.strings
M UI/PreferencesUI/German.lproj/Localizable.strings
M UI/PreferencesUI/Hungarian.lproj/Localizable.strings
M UI/PreferencesUI/Polish.lproj/Localizable.strings
M UI/Scheduler/Dutch.lproj/Localizable.strings
M UI/Scheduler/Finnish.lproj/Localizable.strings
M UI/Scheduler/German.lproj/Localizable.strings
commit fe38518a36cf0c23eb2888bb79c4ada07553ab4a
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu Jun 5 12:14:34 2014 -0400
Minor syntax and comments improvements
M SoObjects/Mailer/SOGoDraftObject.m
M UI/PreferencesUI/UIxPreferences.m
M UI/Scheduler/UIxCalListingActions.m
commit e118a72eab6f6ed461cbbf493d1cf1924bdf13e6
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu Jun 5 10:32:13 2014 -0400
Add meta tag to tell IE to use the highest mode
M NEWS
M UI/Templates/UIxPageFrame.wox
commit 72bec939d67ad98c974a339f944877d46f7b831a
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed Jun 4 15:56:22 2014 -0400
Fixed text/plain reencoding issues for Outlook
M ActiveSync/SOGoMailObject+ActiveSync.m
M NEWS
commit ba258ca8068e9414f8a5327ea38a0b7c427380b9
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Wed Jun 4 15:23:41 2014 -0400
Fixed repetitive events issues
M ActiveSync/iCalRecurrenceRule+ActiveSync.m
M NEWS
commit 0c2e2f28f7223f9a7e55585614bcf5ae8aaeabcb
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri May 30 13:53:20 2014 -0400
Don't try to add attachments during reply operations
M NEWS
M SoObjects/Mailer/SOGoDraftObject.h
M SoObjects/Mailer/SOGoDraftObject.m
M SoObjects/Mailer/SOGoDraftsFolder.m
M UI/MailerUI/UIxMailEditor.m
commit f0dfe37a55a692bc505708782d3c70ccb5b2951b
Author: Ludovic Marcotte <lmarcotte@inverse.ca>
Date: Fri May 30 08:41:42 2014 -0400
Avoid crashing when forwarding mails with no Subject header
M NEWS
M SoObjects/Mailer/SOGoDraftObject.m
commit dace1439df1c60c37c7092b44d8117105095f6ee
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu May 29 11:16:59 2014 -0400
Update ChangeLog
M ChangeLog
commit d91b37413fa0fe7f416311697ad7b487f88d967c
Author: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu May 29 11:16:40 2014 -0400
Documentation/SOGo Installation Guide.odt
BIN
View File
Binary file not shown.
Documentation/SOGo Mozilla Thunderbird Configuration.odt
BIN
View File
Binary file not shown.
Documentation/SOGo Native Microsoft Outlook Configuration.odt
BIN
View File
Binary file not shown.
NEWS
+13
View File
@@ -1,3 +1,16 @@
2.2.5 (2014-06-05)
------------------
Enhancements
- new meta tag to tell IE to use the highest mode available
- updated Dutch, Finnish, German, and Polish translations
Bug fixes
- avoid crashing when we forward an email with no Subject header
- we no longer try to include attachments when replying to a mail
- fixed ActiveSync repetitive events issues with "Weekly" and "Monthly" ones
- fixed ActiveSync text/plain parts re-encoding issues for Outlook
2.2.4 (2014-05-29)
------------------
SoObjects/Contacts/Dutch.lproj/Localizable.strings
+1
View File
@@ -1 +1,2 @@
"Personal Address Book" = "Persoonlijk adresboek";
"Collected Address Book" = "Verzamelde adressen";
SoObjects/Contacts/Finnish.lproj/Localizable.strings
+1
View File
@@ -1 +1,2 @@
"Personal Address Book" = "Henkilökohtainen osoitekirja";
"Collected Address Book" = "Kerätty osoitekirja";
SoObjects/Contacts/German.lproj/Localizable.strings
+1
View File
@@ -1 +1,2 @@
"Personal Address Book" = "Persönliches Adressbuch";
"Collected Address Book" = "Gesammelte Adressen";
SoObjects/Contacts/Polish.lproj/Localizable.strings
+1 -1
View File
@@ -1,2 +1,2 @@
"Personal Address Book" = "Osobista książka adresowa";
"Collected Address Book" = "Zbierana Książka Adresowa";
"Collected Address Book" = "Książka zebranych adresów";
SoObjects/Mailer/SOGoDraftObject.h
+8 -4
View File
@@ -1,20 +1,21 @@
/*
Copyright (C) 2007-2014 Inverse inc.
Copyright (C) 2004-2005 SKYRIX Software AG
This file is part of OpenGroupware.org.
This file is part of SOGo.
OGo is free software; you can redistribute it and/or modify it under
SOGo 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
SOGo 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
License along with SOGo; see the file COPYING. If not, write to the
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
02111-1307, USA.
*/
@@ -78,6 +79,9 @@
- (BOOL) isHTML;
/* for replies and forwards */
- (NSString *) inReplyTo;
- (void) setInReplyTo: (NSString *) newInReplyTo;
- (void) setSourceURL: (NSString *) newSurceURL;
- (void) setSourceFlag: (NSString *) newSourceFlag;
- (void) setSourceFolder: (NSString *) newSourceFolder;
SoObjects/Mailer/SOGoDraftObject.m
+12 -6
View File
@@ -396,6 +396,11 @@ static NSString *userAgent = nil;
return isHTML;
}
- (NSString *) inReplyTo
{
return inReplyTo;
}
- (void) setInReplyTo: (NSString *) newInReplyTo
{
ASSIGN (inReplyTo, newInReplyTo);
@@ -921,7 +926,7 @@ static NSString *userAgent = nil;
sourceEnvelope = [sourceMail envelope];
[self _fillInReplyAddresses: info replyToAll: toAll
envelope: sourceEnvelope];
envelope: sourceEnvelope];
msgID = [sourceEnvelope messageID];
if ([msgID length] > 0)
[self setInReplyTo: msgID];
@@ -977,7 +982,7 @@ static NSString *userAgent = nil;
@"message/rfc822", @"mimetype",
nil];
[self saveAttachment: [sourceMail content]
withMetadata: attachment];
withMetadata: attachment];
}
[self storeInfo];
@@ -1602,10 +1607,11 @@ static NSString *userAgent = nil;
/* add subject */
if ([(s = [headers objectForKey: @"subject"]) length] > 0)
[map setObject: [s asQPSubjectString: @"utf-8"]
forKey: @"subject"];
[map setObject: [headers objectForKey: @"message-id"]
forKey: @"message-id"];
forKey: @"subject"];
if ([(s = [headers objectForKey: @"message-id"]) length] > 0)
[map setObject: s
forKey: @"message-id"];
/* add standard headers */
dateString = [[NSCalendarDate date] rfc822DateString];
SoObjects/Mailer/SOGoDraftsFolder.m
+1 -3
View File
@@ -1,8 +1,6 @@
/* SOGoDraftsFolder.m - this file is part of SOGo
*
* Copyright (C) 2007 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
* Copyright (C) 2007-2014 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/Common/German.lproj/Localizable.strings
+7 -7
View File
@@ -39,15 +39,15 @@
"Sorry, the user rights can not be configured for that object." = "Leider können die Benutzerrechte für dieses Objekt nicht konfiguriert werden.";
"Any user with an account on this system will be able to access your mailbox \"%{0}\". Are you certain you trust them all?"
= "Jeder Benutzer mit einem Account auf diesem System wird in der Lage sein auf Ihren E-Mail-Ordner \"%{0}\" zuzugreifen. Sind Sie sicher, dass Sie allen trauen?";
= "Jeder Benutzer mit einem Konto auf diesem System wird in der Lage sein auf Ihren E-Mail-Ordner \"%{0}\" zuzugreifen. Sind Sie sicher, dass Sie allen vertrauen?";
"Any user with an account on this system will be able to access your calendar \"%{0}\". Are you certain you trust them all?"
= "Jeder Benutzer mit einem Account auf diesem System wird in der Lage sein, auf Ihren Kalender \"%{0}\" zuzugreifen. Sind Sie sicher, dass Sie allen vertrauen?";
= "Jeder Benutzer mit einem Konto auf diesem System wird in der Lage sein, auf Ihren Kalender \"%{0}\" zuzugreifen. Sind Sie sicher, dass Sie allen vertrauen?";
"Potentially anyone on the Internet will be able to access your calendar \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?"
= "Jeder aus dem Internet wird in der Lage sein, auf Ihren Kalender \"%{0}\" zuzugreifen, selbst wenn jene Personen keinen Account auf diesem System haben. Sind diese Informationen für das öffentliche Internet gedacht?";
= "Jeder aus dem Internet wird in der Lage sein, auf Ihren Kalender \"%{0}\" zuzugreifen, selbst wenn jene Personen kein Konto auf diesem System haben. Sind diese Informationen für das öffentliche Internet gedacht?";
"Any user with an account on this system will be able to access your address book \"%{0}\". Are you certain you trust them all?"
= "Jeder Benutzer mit einem Account auf diesem System wird auf Ihr Adressbuch \"%{0}\" zugreifen können. Sind Sie sicher, dass Sie allen trauen?";
= "Jeder Benutzer mit einem Konto auf diesem System wird auf Ihr Adressbuch \"%{0}\" zugreifen können. Sind Sie sicher, dass Sie allen vertrauen?";
"Potentially anyone on the Internet will be able to access your address book \"%{0}\", even if they do not have an account on this system. Is this information suitable for the public Internet?"
= "Jeder im Internet wird in der Lage sein auf Ihr Adressbuch \"%{0}\" zuzugreifen, selbst wenn diese keinen Account auf diesem System haben. Ist diese Information passend für das öffentliche Internet?";
= "Jeder im Internet wird in der Lage sein auf Ihr Adressbuch \"%{0}\" zuzugreifen, selbst wenn diese kein Konto auf diesem System haben. Ist diese Information passend für das öffentliche Internet?";
"Give Access" = "Allen Zugriff gewähren";
"Keep Private" = "Privat halten";
@@ -69,6 +69,7 @@
"You cannot create a list in a shared address book."
= "Sie können keine Liste in einem gemeinsamen Adressbuch erstellen.";
"Warning" = "Warnung";
"Can't contact server" = "Beim Verbindungsaufbau mit dem Server ist ein Fehler aufgetreten. Bitte versuchen Sie es später noch einmal.";
"You are not allowed to access this module or this system. Please contact your system administrator."
= "Sie sind nicht berechtigt auf dieses Modul oder System zuzugreifen. Bitte kontaktieren Sie ihren Systemadministrator.";
@@ -101,10 +102,9 @@
"Due Date:" = "Fällig:";
"Location:" = "Ort:";
/* Mail labels */
/* mail labels */
"Important" = "Wichtig";
"Work" = "Geschäftlich";
"Work" = "Geschäftlich";
"Personal" = "Persönlich";
"To Do" = "To-Do";
"Later" = "Später";
UI/Contacts/Dutch.lproj/Localizable.strings
+9 -2
View File
@@ -36,7 +36,6 @@
"delete" = "Verwijderen";
"edit" = "Bewerken";
"invalidemailwarn" = "Het ingevoerde e-mailadres is ongeldig.";
"invaliddatewarn" = "De ingevoerde datum is ongeldig.";
"new" = "Nieuw";
"Preferred Phone" = "Voorkeurstelefoon";
@@ -64,6 +63,7 @@
"New Card" = "Nieuw contactpersoon";
"New List" = "Nieuwe lijst";
"Edit" = "Bewerken";
"Properties" = "Eigenschappen";
"Sharing..." = "Delen...";
"Write" = "Bericht opstellen...";
@@ -147,7 +147,7 @@
"You cannot delete the card of \"%{0}\"."
= "U kunt da kaart van \"%{0}\" niet verwijderen.";
"Address Book Name" = "Naam van het adresboek";
"You cannot subscribe to a folder that you own!"
= "U kunt uzelf niet abonneren op uw eigen mappen!";
@@ -206,3 +206,10 @@
"A total of %{0} cards were imported in the addressbook." = "Een totaal van %{0} kaarten werd in het adresboek geïmporteerd.";
"Reload" = "Herlaad";
/* Properties window */
"Address Book Name:" = "Naam van het adresboek";
"Links to this Address Book" = "Koppeling naar adresboek";
"Authenticated User Access" = "Toegang voor geauthenticeerde gebruikers";
"CardDAV URL: " = "CardDAV-URL:";
UI/Contacts/Finnish.lproj/Localizable.strings
+9 -2
View File
@@ -36,7 +36,6 @@
"delete" = "poista";
"edit" = "muokkaa";
"invalidemailwarn" = "Määritetty sähköpostiosoite on virheellinen.";
"invaliddatewarn" = "Määritetty päivämäärä on virheellinen.";
"new" = "uusi";
"Preferred Phone" = "Ensisijainen puhelin";
@@ -64,6 +63,7 @@
"New Card" = "Uusi yhteystietokortti";
"New List" = "Uusi lista";
"Edit" = "Muokkaa";
"Properties" = "Ominaisuudet";
"Sharing..." = "Jakaminen...";
"Write" = "Kirjoita";
@@ -147,7 +147,7 @@
"You cannot delete the card of \"%{0}\"."
= "Et voi poistaa \"%{0}\"n korttia.";
"Address Book Name" = "Osoitekirjan nimi";
"You cannot subscribe to a folder that you own!"
= "Et voi tilata omistamaasi kansiota.";
@@ -206,3 +206,10 @@
"A total of %{0} cards were imported in the addressbook." = "Yhteensä %{0} korttia tuotu osoitekirjaan.";
"Reload" = "Päivitä";
/* Properties window */
"Address Book Name:" = "Osoitekirjan nimi:";
"Links to this Address Book" = "Linkit tähän osoitekirjaan";
"Authenticated User Access" = "Kirjautuneiden käyttäjien pääsy";
"CardDAV URL: " = "CardDAV URL: ";
UI/Contacts/German.lproj/Localizable.strings
+14 -7
View File
@@ -36,7 +36,6 @@
"delete" = "Löschen";
"edit" = "Bearbeiten";
"invalidemailwarn" = "Das Format der angegebenen E-Mail-Adresse ist ungültig.";
"invaliddatewarn" = "Das angegebene Datum ist ungültig.";
"new" = "Neu";
"Preferred Phone" = "Bevorzugte Telefonnummer";
@@ -64,6 +63,7 @@
"New Card" = "Neue Adresskarte";
"New List" = "Neue Liste";
"Edit" = "Ändern";
"Properties" = "Eigenschaften";
"Sharing..." = "Benutzerrechte...";
"Write" = "Verfassen";
@@ -94,17 +94,17 @@
"Work:" = "Dienstlich:";
"Home:" = "Privat:";
"Fax:" = "Fax:";
"Mobile:" = "Mobil:";
"Mobile:" = "Handy:";
"Pager:" = "Pager:";
/* categories */
"contacts_category_labels" = "Familienmitglied, Freund, Geschäftspartner, Kollegin, Konkurrent, Kunde, Lieferant, Presse, VIP";
"contacts_category_labels" = "Anbieter, Familienmitglied, Freund, Geschäftspartner, Kollegin, Konkurrent, Kunde, Lieferant, Presse, VIP";
"Categories" = "Kategorien";
"New category" = "Neue Kategorie";
/* adresses */
"Title:" = "Titel:";
"Service:" = "Service:";
"Service:" = "Dienst:";
"Company:" = "Firma:";
"Department:" = "Abteilung:";
"Organization:" = "Organisation:";
@@ -127,7 +127,7 @@
"Add as..." = "Hinzufügen als ...";
"Recipient" = "Empfänger";
"Carbon Copy" = "Kopie";
"Blind Carbon Copy" = "Blindkopie";
"Blind Carbon Copy" = "Blindkopie (BCC)";
"New Addressbook..." = "Neues Adressbuch...";
"Subscribe to an Addressbook..." = "Ein Adressbuch abonnieren...";
@@ -147,7 +147,7 @@
"You cannot delete the card of \"%{0}\"."
= "Sie können die Adresskarte von \"%{0}\" nicht löschen.";
"Address Book Name" = "Adressbuchname";
"You cannot subscribe to a folder that you own!"
= "Sie können ihre eigenen Ordner nicht abonnieren.";
@@ -197,7 +197,7 @@
"Export Address Book..." = "Adressbuch exportieren...";
"View Raw Source" = "Rohen Quelltext anzeigen";
"Import Cards" = "Adresskarten importieren";
"Select a vCard or LDIF file." = "Bitte wählen Sie eine vCard oder eine LDIF-Datei.";
"Select a vCard or LDIF file." = "Bitte wählen Sie eine vCard- oder eine LDIF-Datei.";
"Upload" = "Hochladen";
"Uploading" = "Hochladen";
"Done" = "Abgeschlossen";
@@ -206,3 +206,10 @@
"A total of %{0} cards were imported in the addressbook." = "%{0} Adresskarten wurden in das Adressbuch importiert.";
"Reload" = "Neu laden";
/* Properties window */
"Address Book Name:" = "Adressbuchname:";
"Links to this Address Book" = "Links zu diesem Adressbuch";
"Authenticated User Access" = "Zugriff für authentifizierte Benutzer";
"CardDAV URL: " = "CardDAV-URL:";
UI/MailerUI/Dutch.lproj/Localizable.strings
+1 -1
View File
@@ -79,7 +79,7 @@
"Remove this folder" = "Deze map verwijderen";
"Erase mails from this folder" = "E-mails in in deze map verwijderen";
"Expunge this folder" = "Deze map leegmaken";
"Archive This Folder" = "Deze map archiveren";
"Export This Folder" = "Deze map exporteren";
"Modify the acl of this folder" = "Machtigingen voor deze map aanpassen";
"Saved Messages.zip" = "Bewaarde Berichten.zip";
UI/MailerUI/Finnish.lproj/Localizable.strings
+1 -1
View File
@@ -79,7 +79,7 @@
"Remove this folder" = "Poista tämä kansio";
"Erase mails from this folder" = "Poista viestit tästä kansiosta";
"Expunge this folder" = "Poista tämä kansio";
"Archive This Folder" = "Arkistoi tämä kansio";
"Export This Folder" = "Vie tämä kansio";
"Modify the acl of this folder" = "Muokkaa kansion käyttäjäoikeuksia";
"Saved Messages.zip" = "TallennetutViestit.zip";
UI/MailerUI/German.lproj/Localizable.strings
+1 -1
View File
@@ -79,7 +79,7 @@
"Remove this folder" = "Diesen Ordner löschen";
"Erase mails from this folder" = "E-Mails in diesem Ordner löschen";
"Expunge this folder" = "Diesen Ordner komprimieren";
"Archive This Folder" = "Diesen Ordner archivieren";
"Export This Folder" = "Diesen Ordner exportieren";
"Modify the acl of this folder" = "Benutzerrechte dieses Ordners verändern";
"Saved Messages.zip" = "Gespeicherte Nachrichten.zip";
UI/MailerUI/UIxMailEditor.m
+2 -2
View File
@@ -636,15 +636,15 @@ static NSArray *infoKeys = nil;
- (NSArray *) attachmentAttrs
{
NSArray *a;
SOGoDraftObject *co;
SOGoMailObject *mail;
NSArray *a;
co = [self clientObject];
if (!attachmentAttrs || ![co imap4URL])
{
[co fetchInfo];
if ([co IMAP4ID] > -1)
if (![co inReplyTo] && [co IMAP4ID] > -1)
{
mail = [[[SOGoMailObject alloc] initWithImap4URL: [co imap4URL] inContainer: [co container]] autorelease];
a = [mail fetchFileAttachmentKeys];
UI/PreferencesUI/Dutch.lproj/Localizable.strings
+10 -3
View File
@@ -97,8 +97,7 @@
"Show time as busy outside working hours" = "Tijd buiten werkdag weergeven als bezet";
"First week of year :" = "Eerste week van het jaar:";
"Enable reminders for Calendar items" = "Herinneringen inschakelen voor afspraken";
"Play a sound when a reminder comes due"
= "Geluid afspelen bij herinnering";
"Play a sound when a reminder comes due" = "Geluid afspelen bij herinnering";
"Default reminder :" = "Standaardherinnering:";
"firstWeekOfYear_January1" = "Begint op 1 januari";
@@ -130,6 +129,7 @@
"Label" = "Labelen";
"Show subscribed mailboxes only" = "Toon alleen geabonneerde postvakken";
"Sort messages by threads" = "Berichten sorteren op threads";
"When sending mail, add unknown recipients to my" = "Bij het versturen van mail, voeg onbekende ontvangers toe aan mijn";
"Check for new mail:" = "Controleren op nieuwe mail:";
"messagecheck_manually" = "Handmatig";
"messagecheck_every_minute" = "Iedere minuut";
@@ -157,6 +157,10 @@
"displayremoteinlineimages_never" = "Nooit";
"displayremoteinlineimages_always" = "Altijd";
/* Contact */
"Personal Address Book" = "Persoonlijk adresboek";
"Collected Address Book" = "Verzameld adresboek";
/* IMAP Accounts */
"New Mail Account" = "Nieuw mailaccount";
@@ -204,6 +208,7 @@
"Mail" = "Mail";
"Last" = "Laatst gebruikt";
"Default module :" = "Standaardmodule:";
"SOGo version:" = "SOGo versie:";
"Language :" = "Taal:";
"choose" = "Kies...";
@@ -248,6 +253,8 @@
"Active" = "Actief";
"Move Up" = "Omhoog";
"Move Down" = "Omlaag";
"Connection error" = "Verbindingsfout";
"Service temporarily unavailable" = "Dienst tijdelijk niet beschikbaar";
/* Filters - UIxFilterEditor */
"Filter name:" = "Filternaam:";
@@ -306,4 +313,4 @@
"Unhandled policy error: %{0}" = "Onverwerkte beleidsfout: %{0}";
"Unhandled error response" = "Onverwerkte foutmelding";
"Password change is not supported." = "Wachtwoordwijziging wordt niet ondersteund.";
"Unhandled HTTP error code: %{0}" = "Onverwerkte HTTP-foutcode: %{0}";
"Unhandled HTTP error code: %{0}" = "Onverwerkte HTTP-foutcode: %{0}";
UI/PreferencesUI/Finnish.lproj/Localizable.strings
+10 -3
View File
@@ -97,8 +97,7 @@
"Show time as busy outside working hours" = "Näytä työajan ulkopuolinen aika varattuna";
"First week of year :" = "Vuoden ensimmäinen viikko:";
"Enable reminders for Calendar items" = "Ota käyttöön kalenterimerkintöjen muistuttajat";
"Play a sound when a reminder comes due"
= "Soita äänimerkki kun muistuttaja aktivoituu";
"Play a sound when a reminder comes due" = "Soita äänimerkki kun muistuttaja aktivoituu";
"Default reminder :" = "Oletusmuistuttaja";
"firstWeekOfYear_January1" = "Alkaa Tammikuun 1.";
@@ -130,6 +129,7 @@
"Label" = "Otsikoi";
"Show subscribed mailboxes only" = "Näytä vain tilatut sähköpostikansiot";
"Sort messages by threads" = "Järjestä viestit ketjuiksi";
"When sending mail, add unknown recipients to my" = "Postia lähettäessä lisää tuntemattomat vastaanottajat";
"Check for new mail:" = "Hae uudet sähköpostit";
"messagecheck_manually" = "Manuaalisesti";
"messagecheck_every_minute" = "Joka minuutti";
@@ -157,6 +157,10 @@
"displayremoteinlineimages_never" = "Ei koskaan";
"displayremoteinlineimages_always" = "Aina";
/* Contact */
"Personal Address Book" = "Henkilökohtainen osoitekirja";
"Collected Address Book" = "Keratty osoitekirja";
/* IMAP Accounts */
"New Mail Account" = "Uusi sähköpostitili";
@@ -204,6 +208,7 @@
"Mail" = "Sähköposti";
"Last" = "Viimeksi käytetty";
"Default module :" = "Oletusmoduli:";
"SOGo version:" = "SOGo versio:";
"Language :" = "Kieli:";
"choose" = "Valitse...";
@@ -248,6 +253,8 @@
"Active" = "Aktiivinen";
"Move Up" = "Siirry ylös";
"Move Down" = "Siirry alas";
"Connection error" = "Yhteysvirhe";
"Service temporarily unavailable" = "Palvelu tilapäisesti pois käytöstä";
/* Filters - UIxFilterEditor */
"Filter name:" = "Suodattimen nimi:";
@@ -306,4 +313,4 @@
"Unhandled policy error: %{0}" = "Käsittelemätön sääntövirhe: %{0} ";
"Unhandled error response" = "Käsittelemätön virhevastaus";
"Password change is not supported." = "Salasanan vaihto ei ole tuettu.";
"Unhandled HTTP error code: %{0}" = "Käsittelämätön HTTP virhekoodi: %{0}";
"Unhandled HTTP error code: %{0}" = "Käsittelämätön HTTP virhekoodi: %{0}";
UI/PreferencesUI/German.lproj/Localizable.strings
+12 -5
View File
@@ -22,7 +22,7 @@
/* vacation (auto-reply) */
"Enable vacation auto reply" = "Automatische Abwesenheitsnachricht aktivieren";
"Auto reply message :" = "Folgende Nachricht wird automatisch einmal an jeden Absender gesendet:";
"Auto reply message :" = "Folgende Nachricht wird automatisch an jeden Absender gesendet:";
"Email addresses (separated by commas) :" = "E-Mail-Adressen (getrennt durch Kommata):";
"Add default email addresses" = "Standardadresse hinzufügen";
"Days between responses :" = "Tage zwischen automatischen Abwesenheitsnachrichten:";
@@ -97,8 +97,7 @@
"Show time as busy outside working hours" = "Zeiten außerhalb der Arbeitszeit als belegt anzeigen";
"First week of year :" = "Erste Woche des Jahres:";
"Enable reminders for Calendar items" = "Termin- und Aufgabenerinnerungen aktivieren";
"Play a sound when a reminder comes due"
= "Akustisches Signal zur Terminerinnerung";
"Play a sound when a reminder comes due" = "Akustisches Signal zur Terminerinnerung";
"Default reminder :" = "Standard Terminerinnerung:";
"firstWeekOfYear_January1" = "Beginnt am 1. Januar";
@@ -130,6 +129,7 @@
"Label" = "Schlagwort";
"Show subscribed mailboxes only" = "Nur abonnierte Ordner anzeigen";
"Sort messages by threads" = "Nachrichten nach Thema sortieren";
"When sending mail, add unknown recipients to my" = "Wenn ich E-Mails sende, füge die unbekannten Empfänger zu meinem";
"Check for new mail:" = "Auf neue Nachrichten prüfen:";
"messagecheck_manually" = "Manuell";
"messagecheck_every_minute" = "Minütlich";
@@ -157,6 +157,10 @@
"displayremoteinlineimages_never" = "Niemals";
"displayremoteinlineimages_always" = "Immer";
/* Contact */
"Personal Address Book" = "Persönliches Adressbuch";
"Collected Address Book" = "Gesammelte Adressen";
/* IMAP Accounts */
"New Mail Account" = "Neues E-Mail-Konto";
@@ -204,8 +208,9 @@
"Mail" = "E-Mail";
"Last" = "Zuletzt benutztes";
"Default module :" = "Standard Modul:";
"SOGo version:" = "SOGo Version:";
"Language :" = "Sprache :";
"Language :" = "Sprache:";
"choose" = "Auswählen ...";
"Arabic" = "العربية";
"Catalan" = "Català";
@@ -248,6 +253,8 @@
"Active" = "Aktiv";
"Move Up" = "Nach oben";
"Move Down" = "Nach unten";
"Connection error" = "Verbindungsfehler";
"Service temporarily unavailable" = "Dienst vorübergehend nicht verfügbar";
/* Filters - UIxFilterEditor */
"Filter name:" = "Filtername:";
@@ -306,4 +313,4 @@
"Unhandled policy error: %{0}" = "Unbearbeiteter Vorgabenfehler: %{0}";
"Unhandled error response" = "Unbearbeitete Fehlerantwort";
"Password change is not supported." = "Passwortänderung wird nicht unterstützt.";
"Unhandled HTTP error code: %{0}" = "Unbearbeiteter HTTP-Fehlercode: %{0}";
"Unhandled HTTP error code: %{0}" = "Unbearbeiteter HTTP-Fehlercode: %{0}";
UI/PreferencesUI/Hungarian.lproj/Localizable.strings
+2 -2
View File
@@ -112,9 +112,9 @@
"reminder_NONE" = "Nincs emlékeztető";
"reminder_5_MINUTES_BEFORE" = "5 perccel előtte";
"reminder_10_MINUTES_BEFORE" = "10 perc";
"reminder_10_MINUTES_BEFORE" = "10 perccel előtte";
"reminder_15_MINUTES_BEFORE" = "15 perccel előtte";
"reminder_30_MINUTES_BEFORE" = "30 perc";
"reminder_30_MINUTES_BEFORE" = "30 perccel előtte";
"reminder_45_MINUTES_BEFORE" = "45 perccel előtte";
"reminder_1_HOUR_BEFORE" = "1 órával előtte";
"reminder_2_HOURS_BEFORE" = "2 órával előtte";
UI/PreferencesUI/Polish.lproj/Localizable.strings
+3 -3
View File
@@ -94,7 +94,7 @@
"Day start time :" = "Początek dnia :";
"Day end time :" = "Koniec dnia :";
"Day start time must be prior to day end time." = "Początek dnia musi wypadać wcześniej niż koniec dnia.";
"Show time as busy outside working hours" = "Oznacz termin jako zajęty poza godzinami pracy";
"Show time as busy outside working hours" = "Pokaż czas poza godzinami pracy jako zajęty";
"First week of year :" = "Pierwszy tydzień roku :";
"Enable reminders for Calendar items" = "Włącz przypomnienia pozycji kalendarza";
"Play a sound when a reminder comes due" = "Odtwórz dźwięk w momencie przypomnienia";
@@ -158,8 +158,8 @@
"displayremoteinlineimages_always" = "Zawsze";
/* Contact */
"Personal Address Book" = "Prywatna Książka Adresowa";
"Collected Address Book" = "Zbierana Książka Adresowa";
"Personal Address Book" = "Osobista książka adresowa";
"Collected Address Book" = "Książka zebranych adresów";
/* IMAP Accounts */
"New Mail Account" = "Nowe konto";
UI/PreferencesUI/UIxPreferences.m
+2
View File
@@ -1264,6 +1264,8 @@ static NSArray *reminderValues = nil;
account = [folder lookupName: @"0" inContext: context acquire: NO];
if ([account updateFilters])
// If Sieve is not enabled, the SOGoSieveManager will immediatly return a positive answer
// See [SOGoSieveManager updateFiltersForAccount:withUsername:andPassword:]
results = [self responseWithStatus: 200
andJSONRepresentation: [NSDictionary dictionaryWithObjectsAndKeys: [NSNumber numberWithBool:hasChanged], @"hasChanged", nil]];
UI/Scheduler/Dutch.lproj/Localizable.strings
+19 -3
View File
@@ -5,6 +5,7 @@
"Create a new event" = "Maak een nieuwe gebeurtenis";
"Create a new task" = "Maak een nieuwe taak";
"Edit this event or task" = "Bewerk deze gebeurtenis of taak";
"Print the current calendar view" = "Print de huidige agendaweergave";
"Delete this event or task" = "Verwijder deze gebeurtenis of taak";
"Go to today" = "Naar vandaag gaan";
"Switch to day view" = "Overschakelen naar dagweergave";
@@ -117,7 +118,7 @@
"Name of the Calendar" = "Naam van de agenda";
"new" = "Nieuw";
"printview" = "Afdrukvoorbeeld";
"Print view" = "Print weergave";
"edit" = "Aanpassen";
"delete" = "Verwijderen";
"proposal" = "Voorstel";
@@ -145,6 +146,16 @@
"Hide already accepted and rejected appointments" = "Reeds geaccepteerde/geweigerde afspraken verbergen";
"Show already accepted and rejected appointments" = "Reeds geaccepteerde/geweigerde afspraken weergeven";
/* Print view */
"LIST" = "Lijst";
"Print Settings" = "Print instellingen";
"Title:" = "Titel:";
"Layout:" = "Opmaak:";
"What to Print" = "Wat moet afgedrukt worden";
"Options" = "Opties:";
"Tasks with no due date" = "Taken zonder verloopdatum";
"Completed tasks" = "Afgeronde taken";
/* Appointments */
@@ -225,8 +236,13 @@
"view_future" = "Alle toekomstige afspraken";
"view_selectedday" = "Afspraken op de geselecteerde dag";
"view_not_started" = "Niet begonnen taken";
"view_overdue" = "Achterstallige taken";
"view_incomplete" = "Onvolledige taken";
"View:" = "Bekijken:";
"Title or Description" = "Titel of omschrijving";
"Title, category or location" = "Titel, categorie of plaats";
"Entire content" = "Volledige inhoud";
"Search" = "Zoeken";
"Search attendees" = "Deelnemers zoeken";
@@ -506,7 +522,7 @@ vtodo_class2 = "(Vertrouwelijke taak)";
"Links to this Calendar" = "Koppelingen naar deze agenda";
"Authenticated User Access" = "Toegang voor geauthenticeerde gebruikers";
"CalDAV URL" = "CalDAV url";
"CalDAV URL" = "CalDAV-URL:";
"WebDAV ICS URL" = "WebDAV ICS URL";
"WebDAV XML URL" = "WebDAV XML URL";
UI/Scheduler/Finnish.lproj/Localizable.strings
+19 -3
View File
@@ -5,6 +5,7 @@
"Create a new event" = "Luo uusi tapahtuma";
"Create a new task" = "Luo uusi tehtävä";
"Edit this event or task" = "Muokkaa tapahtumaa tai tehtävää";
"Print the current calendar view" = "Tulosta nykyinen kalenterinäkymä";
"Delete this event or task" = "Poista tapahtuma tai tehtävä";
"Go to today" = "Siirry tähän päivään";
"Switch to day view" = "Siirry päivänäkymään";
@@ -117,7 +118,7 @@
"Name of the Calendar" = "Kalenterin nimi";
"new" = "Uusi";
"printview" = "Tulostusnäkymä";
"Print view" = "Tulostusnäkymä";
"edit" = "Muokkaa";
"delete" = "Poista";
"proposal" = "Ehdotus";
@@ -145,6 +146,16 @@
"Hide already accepted and rejected appointments" = "Piilota hyväksytyt ja hylätyt tapaamiset";
"Show already accepted and rejected appointments" = "Näytä hyväksytyt ja hylätyt tapaamiset";
/* Print view */
"LIST" = "Lista";
"Print Settings" = "Tulostusasetukset";
"Title:" = "Otsikko:";
"Layout:" = "Ulkoasu";
"What to Print" = "Tulostusvalinnat";
"Options" = "Asetukset";
"Tasks with no due date" = "Tehtävät ilman määräpäivää";
"Completed tasks" = "Valmistuneet tehtävät";
/* Appointments */
@@ -225,8 +236,13 @@
"view_future" = "Kaikki tulevat tapahtumat";
"view_selectedday" = "Valittu päivä";
"view_not_started" = "Aloittamattomat tehtävät";
"view_overdue" = "Myöhästyneet tehtävät";
"view_incomplete" = "Keskeneräiset tehtävät";
"View:" = "Näytä:";
"Title or Description" = "Otsikko tai kuvaus";
"Title, category or location" = "Otsikko, luokka tai sijainti";
"Entire content" = "Koko sisältö";
"Search" = "Etsi";
"Search attendees" = "Etsi osallistujia";
@@ -506,7 +522,7 @@ vtodo_class2 = "(Luottamuksellinen tehtävä)";
"Links to this Calendar" = "Linkit tähän kalenteriin";
"Authenticated User Access" = "Kirjautuneiden käyttäjien pääsy";
"CalDAV URL" = "CalDAV URL";
"CalDAV URL" = "CalDAV URL: ";
"WebDAV ICS URL" = "WebDAV ICS URL";
"WebDAV XML URL" = "WebDAV XML URL";
UI/Scheduler/German.lproj/Localizable.strings
+24 -8
View File
@@ -5,6 +5,7 @@
"Create a new event" = "Neuen Termin erstellen";
"Create a new task" = "Neue Aufgabe erstellen";
"Edit this event or task" = "Gewählten Termin oder Aufgabe bearbeiten";
"Print the current calendar view" = "Die aktuelle Kalenderansicht drucken";
"Delete this event or task" = "Gewählten Termin oder Aufgabe löschen ";
"Go to today" = "Zu Heute springen";
"Switch to day view" = "Zur Tagesansicht wechseln";
@@ -117,7 +118,7 @@
"Name of the Calendar" = "Name des Kalenders";
"new" = "Neu";
"printview" = "Druckversion";
"Print view" = "Ansicht drucken";
"edit" = "Bearbeiten";
"delete" = "Löschen";
"proposal" = "Vorschlag";
@@ -145,6 +146,16 @@
"Hide already accepted and rejected appointments" = "Abgelehnte und angenommene Termine ausblenden";
"Show already accepted and rejected appointments" = "Abgelehnte und angenommene Termine anzeigen";
/* Print view */
"LIST" = "Liste";
"Print Settings" = "Druckeinstellungen";
"Title:" = "Titel:";
"Layout:" = "Formatierung:";
"What to Print" = "Was soll gedruckt werden";
"Options" = "Optionen";
"Tasks with no due date" = "Aufgaben ohne Fälligkeitsdatum";
"Completed tasks" = "Abgeschlossene Aufgaben";
/* Appointments */
@@ -177,7 +188,7 @@
"Category:" = "Kategorie:";
"Repeat:" = "Wiederholen:";
"Reminder:" = "Erinnerung:";
"General:" = "Generell:";
"General:" = "Allgemein:";
"Reply:" = "Antwort:";
"Created by:" = "Erstellt von:";
@@ -225,8 +236,13 @@
"view_future" = "Alle zukünftigen Termine";
"view_selectedday" = "Momentan gewählter Tag";
"view_not_started" = "Nicht begonnene Aufgaben";
"view_overdue" = "Überfällige Aufgaben";
"view_incomplete" = "Unvollständige Aufgaben";
"View:" = "Anzeigen:";
"Title or Description" = "Titel oder Beschreibung";
"Title, category or location" = "Titel, Kategorie oder Ort";
"Entire content" = "Gesamter Inhalt";
"Search" = "Suchen";
"Search attendees" = "Teilnehmer suchen";
@@ -269,8 +285,8 @@
"PRIVATE_vtodo" = "Private Aufgabe";
/* status type */
"status_" = "Nicht angegeben";
"status_NOT-SPECIFIED" = "Nicht angegeben";
"status_" = "Nicht festgelegt";
"status_NOT-SPECIFIED" = "Nicht definiert";
"status_TENTATIVE" = "Vorläufig";
"status_CONFIRMED" = "Bestätigt";
"status_CANCELLED" = "Abgebrochen";
@@ -505,8 +521,8 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
"When I modify my calendar, send a mail to:" = "Wenn ich meinen Kalender verändere, schicke eine E-Mail an: ";
"Links to this Calendar" = "Links zu diesem Kalender";
"Authenticated User Access" = "Zugang für angemeldete Benutzer";
"CalDAV URL" = "CalDAV-URL";
"Authenticated User Access" = "Zugang für authentifizierte Benutzer";
"CalDAV URL" = "CalDAV-URL:";
"WebDAV ICS URL" = "WebDAV-ICS-URL";
"WebDAV XML URL" = "WebDAV-XML-URL";
@@ -532,7 +548,7 @@ vtodo_class2 = "(Vertrauliche Aufgabe)";
"Delete Task" = "Aufgabe löschen";
"Delete Event" = "Termin löschen";
"Copy event to my calendar" = "Kopiere diesen Termin in meinen Kalender";
"View Raw Source" = "Roher Quelltext anzeigen";
"View Raw Source" = "Rohen Quelltext anzeigen";
"Subscribe to a web calendar..." = "Einen Webkalender abonnieren...";
"URL of the Calendar" = "URL des Kalenders";
UI/Scheduler/UIxCalListingActions.m
+1 -2
View File
@@ -1057,8 +1057,7 @@ _computeBlocksPosition (NSArray *blocks)
[self _prepareEventBlocks: &blocks withAllDays: &allDayBlocks];
events = [self _fetchFields: eventsFields
forComponentOfType: @"vevent"];
eventsBlocks
= [NSArray arrayWithObjects: events, allDayBlocks, blocks, nil];
eventsBlocks = [NSArray arrayWithObjects: events, allDayBlocks, blocks, nil];
max = [events count];
for (count = 0; count < max; count++)
{
UI/Templates/UIxPageFrame.wox
+1
View File
@@ -20,6 +20,7 @@
<meta name="author" content="SKYRIX Software AG/Inverse inc." />
<meta name="robots" content="stop" />
<meta name="build" var:content="buildDate" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<link href="mailto:support@inverse.ca" rev="made" />
<link rel="shortcut icon" var:href="siteFavicon" type="image/x-icon" />
<link type="text/css" rel="stylesheet" rsrc:href="generic.css" />
Version
+1 -1
View File
@@ -4,4 +4,4 @@
MAJOR_VERSION=2
MINOR_VERSION=2
SUBMINOR_VERSION=4
SUBMINOR_VERSION=5
packaging/rhel/sogo.spec
+1 -1
View File
@@ -12,7 +12,7 @@ Name: sogo
Version: %{sogo_version}
Release: %{dist_suffix}%{?dist}
Vendor: http://www.inverse.ca/
Packager: Wolfgang Sourdeau <support@inverse.ca>
Packager: Inverse inc. <info@inverse.ca>
License: GPL
URL: http://www.inverse.ca/contributions/sogo.html
Group: Productivity/Groupware