amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-01 19:42:48 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:inverse-inc/sogo

Browse Source
This commit is contained in:
InverseBot
2016-08-13 02:22:49 -04:00
parent e4ef3f73cb 287c57c994
commit 155d15e80c
11 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
NEWS
View File

@@ -1,3 +1,15 @@
3.1.6 (2016-MM-DD)
------------------
New features
-
Enhancements
-
Bug fixes
- [web] restored functionality to save unknown recipient emails to address book on send
3.1.5 (2016-08-10)
------------------

2
SoObjects/Mailer/SOGoDraftObject.h
View File

@@ -114,7 +114,7 @@
- (NSArray *) allBareRecipients;
- (NSException *) delete;
/* - (NSException *) sendMail; */
- (NSException *) sendMail;
- (NSException *) sendMailAndCopyToSent: (BOOL) copyToSent; /* default: YES */
- (NSException *) save;

5
SoObjects/Mailer/SOGoDraftObject.m
View File

@@ -58,6 +58,7 @@
#import <NGCards/NGVCard.h>
#import <Contacts/SOGoContactFolder.h>
#import <Contacts/SOGoContactFolders.h>
#import <Contacts/SOGoContactGCSEntry.h>
@@ -1823,7 +1824,6 @@ static NSString *userAgent = nil;
//
//
//
/*
- (NSException *) sendMail
{
SOGoUserDefaults *ud;
@@ -1838,7 +1838,7 @@ static NSString *userAgent = nil;
SOGoContactGCSEntry *newContact;
NGMailAddress *parsedRecipient;
NGMailAddressParser *parser;
SOGoContactFolder *folder;
SOGoFolder <SOGoContactFolder> *folder;
NGVCard *card;
int i;
@@ -1885,7 +1885,6 @@ static NSString *userAgent = nil;
}
return [self sendMailAndCopyToSent: YES];
}
*/
//
//

2
UI/MailerUI/Finnish.lproj/Localizable.strings
View File

@@ -276,7 +276,7 @@
"%{0} message(s) copied" = "%{0} viesti(ä) kopioitu";
/* Notification on the number of messages successfuly movied */
"%{0} message(s) copied" = "%{0} viesti(ä) kopioitu";
"%{0} message(s) moved" = "%{0} viesti(ä) siirretty";
"Please select a message." = "Ole hyvä ja valitse viesti.";
"Please select a message to print." = "Ole hyvä ja valitse tulostettava viesti.";

2
UI/MailerUI/French.lproj/Localizable.strings
View File

@@ -276,7 +276,7 @@
"%{0} message(s) copied" = "%{0} message(s) copié(s)";
/* Notification on the number of messages successfuly movied */
"%{0} message(s) copied" = "%{0} message(s) copié(s)";
"%{0} message(s) moved" = "%{0} message(s) déplacé(s)";
"Please select a message." = "Veuillez sélectionner un message.";
"Please select a message to print." = "Veuillez sélectionner un message à imprimer.";

2
UI/MailerUI/German.lproj/Localizable.strings
View File

@@ -276,7 +276,7 @@
"%{0} message(s) copied" = "%{0} Nachrichten kopiert";
/* Notification on the number of messages successfuly movied */
"%{0} message(s) copied" = "%{0} Nachrichten kopiert";
"%{0} message(s) moved" = "%{0} Nachrichten verschoben";
"Please select a message." = "Sie müssen eine Nachricht auswählen.";
"Please select a message to print." = "Sie müssen eine Nachricht zum Drucken auswählen.";

2
UI/MailerUI/Italian.lproj/Localizable.strings
View File

@@ -276,7 +276,7 @@
"%{0} message(s) copied" = "%{0} messaggi copiati";
/* Notification on the number of messages successfuly movied */
"%{0} message(s) copied" = "%{0} messaggi copiati";
"%{0} message(s) moved" = "%{0} messaggi spostati";
"Please select a message." = "Per favore seleziona un messaggio.";
"Please select a message to print." = "Per favore seleziona un messaggio da stampare.";

2
UI/MailerUI/Polish.lproj/Localizable.strings
View File

@@ -276,7 +276,7 @@
"%{0} message(s) copied" = "Skopiowano %{0} wiadomości";
/* Notification on the number of messages successfuly movied */
"%{0} message(s) copied" = "Skopiowano %{0} wiadomości";
"%{0} message(s) moved" = "Przeniesiono %{0} wiadomości";
"Please select a message." = "Zaznacz wiadomość.";
"Please select a message to print." = "Zaznacz wiadomość do drukowania.";

2
UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
View File

@@ -276,7 +276,7 @@
"%{0} message(s) copied" = "%{0} ileti kopyalandı";
/* Notification on the number of messages successfuly movied */
"%{0} message(s) copied" = "%{0} ileti kopyalandı";
"%{0} message(s) moved" = "%{0} ileti taşındı";
"Please select a message." = "Lütfen bir ileti seçin.";
"Please select a message to print." = "Lütfen yazdırılacak iletiyi seçin.";

2
UI/MailerUI/UIxMailEditor.m
View File

@@ -864,7 +864,7 @@ static NSArray *infoKeys = nil;
{
error = [self validateForSend];
if (!error)
error = [co sendMailAndCopyToSent: YES];
error = [co sendMail];
else
error = [self failedToSaveFormResponse: [error reason]];
}

26
UI/PreferencesUI/Finnish.lproj/Localizable.strings
View File

@@ -63,8 +63,8 @@
/* d & t */
"Current Time Zone" = "Nykyinen aikavyöhyke";
"Short Date Format" = "Lyhyt ajan esitysmuoto";
"Long Date Format" = "Pitkä ajan esitysmuoto";
"Short Date Format" = "Lyhyt päivämäärän esitysmuoto";
"Long Date Format" = "Pitkä päivämäärän esitysmuoto";
"Time Format" = "Ajan esitysmuoto";
"default" = "Oletus";
"Default Module" = "Oletusmoduli";
@@ -121,7 +121,7 @@
"firstWeekOfYear_First4DayWeek" = "Ensimmäinen nelipäiväinen viikko";
"firstWeekOfYear_FirstFullWeek" = "Ensimmäinen täysi viikko";
"Prevent from being invited to appointments" = "Estä tapaamiskutsut";
"White list for appointment invitations" = "Valkoinen lista kalenterikutsuille";
"White list for appointment invitations" = "Valkoinen lista tapaamiskutsuille";
"Contacts Names" = "Yhteystietojen Nimet";
/* Default Calendar */
@@ -130,17 +130,17 @@
"personalCalendar" = "Henkilökohtainen kalenteri";
"firstCalendar" = "Ensimmäinen käyttöönotettu kalenteri";
"reminder_NONE" = "Ei muistutusta";
"reminder_5_MINUTES_BEFORE" = "5 minuuttia";
"reminder_10_MINUTES_BEFORE" = "10 minuuttia";
"reminder_15_MINUTES_BEFORE" = "15 minuuttia";
"reminder_30_MINUTES_BEFORE" = "30 minuuttia";
"reminder_5_MINUTES_BEFORE" = "5 minuuttia ennen";
"reminder_10_MINUTES_BEFORE" = "10 minuuttia ennen";
"reminder_15_MINUTES_BEFORE" = "15 minuuttia ennen";
"reminder_30_MINUTES_BEFORE" = "30 minuuttia ennen";
"reminder_45_MINUTES_BEFORE" = "45 minuuttia ennen";
"reminder_1_HOUR_BEFORE" = "1 tunti";
"reminder_2_HOURS_BEFORE" = "2 tuntia";
"reminder_5_HOURS_BEFORE" = "5 tuntia";
"reminder_15_HOURS_BEFORE" = "15 tuntia";
"reminder_1_DAY_BEFORE" = "1 päivä";
"reminder_2_DAYS_BEFORE" = "2 päivää";
"reminder_1_HOUR_BEFORE" = "1 tunti ennen";
"reminder_2_HOURS_BEFORE" = "2 tuntia ennen";
"reminder_5_HOURS_BEFORE" = "5 tuntia ennen";
"reminder_15_HOURS_BEFORE" = "15 tuntia ennen";
"reminder_1_DAY_BEFORE" = "1 päivä ennen";
"reminder_2_DAYS_BEFORE" = "2 päivää ennen";
"reminder_1_WEEK_BEFORE" = "Viikkoa ennen";
/* Mailer */