Skip to content

Commit c1d6d47

Browse files
cgxcgx
committed
Merge to 2.3.23
2 parents 0fe8d0e + 5fbe25e commit c1d6d47

File tree

225 files changed

+5573
-1591
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

225 files changed

+5573
-1591
lines changed

‎.tx/config‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ trans.sr = UI/MailerUI/Serbian.lproj/Localizable.strings
3636
trans.sv = UI/MailerUI/Swedish.lproj/Localizable.strings
3737
trans.tr_TR = UI/MailerUI/TurkishTurkey.lproj/Localizable.strings
3838
trans.uk = UI/MailerUI/Ukrainian.lproj/Localizable.strings
39+
trans.zh_CN = UI/MailerUI/ChineseChina.lproj/Localizable.strings
3940
trans.zh_TW = UI/MailerUI/ChineseTaiwan.lproj/Localizable.strings
4041

4142
[sogo.ui-preferencesui]
@@ -73,6 +74,7 @@ trans.sr = UI/PreferencesUI/Serbian.lproj/Localizable.strings
7374
trans.sv = UI/PreferencesUI/Swedish.lproj/Localizable.strings
7475
trans.tr_TR = UI/PreferencesUI/TurkishTurkey.lproj/Localizable.strings
7576
trans.uk = UI/PreferencesUI/Ukrainian.lproj/Localizable.strings
77+
trans.zh_CN = UI/PreferencesUI/ChineseChina.lproj/Localizable.strings
7678
trans.zh_TW = UI/PreferencesUI/ChineseTaiwan.lproj/Localizable.strings
7779

7880
[sogo.ui-scheduler]
@@ -110,6 +112,7 @@ trans.sr = UI/Scheduler/Serbian.lproj/Localizable.strings
110112
trans.sv = UI/Scheduler/Swedish.lproj/Localizable.strings
111113
trans.tr_TR = UI/Scheduler/TurkishTurkey.lproj/Localizable.strings
112114
trans.uk = UI/Scheduler/Ukrainian.lproj/Localizable.strings
115+
trans.zh_CN = UI/Scheduler/ChineseChina.lproj/Localizable.strings
113116
trans.zh_TW = UI/Scheduler/ChineseTaiwan.lproj/Localizable.strings
114117

115118
[sogo.ui-contacts]
@@ -147,6 +150,7 @@ trans.sr = UI/Contacts/Serbian.lproj/Localizable.strings
147150
trans.sv = UI/Contacts/Swedish.lproj/Localizable.strings
148151
trans.tr_TR = UI/Contacts/TurkishTurkey.lproj/Localizable.strings
149152
trans.uk = UI/Contacts/Ukrainian.lproj/Localizable.strings
153+
trans.zh_CN = UI/Contacts/ChineseChina.lproj/Localizable.strings
150154
trans.zh_TW = UI/Contacts/ChineseTaiwan.lproj/Localizable.strings
151155

152156
[sogo.ui-mainui]
@@ -184,6 +188,7 @@ trans.sr = UI/MainUI/Serbian.lproj/Localizable.strings
184188
trans.sv = UI/MainUI/Swedish.lproj/Localizable.strings
185189
trans.tr_TR = UI/MainUI/TurkishTurkey.lproj/Localizable.strings
186190
trans.uk = UI/MainUI/Ukrainian.lproj/Localizable.strings
191+
trans.zh_CN = UI/MainUI/ChineseChina.lproj/Localizable.strings
187192
trans.zh_TW = UI/MainUI/ChineseTaiwan.lproj/Localizable.strings
188193

189194
[sogo.ui-common]
@@ -221,6 +226,7 @@ trans.sr = UI/Common/Serbian.lproj/Localizable.strings
221226
trans.sv = UI/Common/Swedish.lproj/Localizable.strings
222227
trans.tr_TR = UI/Common/TurkishTurkey.lproj/Localizable.strings
223228
trans.uk = UI/Common/Ukrainian.lproj/Localizable.strings
229+
trans.zh_CN = UI/Common/ChineseChina.lproj/Localizable.strings
224230
trans.zh_TW = UI/Common/ChineseTaiwan.lproj/Localizable.strings
225231

226232
[sogo.ui-administrationui]
@@ -258,6 +264,7 @@ trans.sr = UI/AdministrationUI/Serbian.lproj/Localizable.strings
258264
trans.sv = UI/AdministrationUI/Swedish.lproj/Localizable.strings
259265
trans.tr_TR = UI/AdministrationUI/TurkishTurkey.lproj/Localizable.strings
260266
trans.uk = UI/AdministrationUI/Ukrainian.lproj/Localizable.strings
267+
trans.zh_CN = UI/AdministrationUI/ChineseChina.lproj/Localizable.strings
261268
trans.zh_TW = UI/AdministrationUI/ChineseTaiwan.lproj/Localizable.strings
262269

263270
[sogo.soobjects-appointments]
@@ -295,6 +302,7 @@ trans.sr = SoObjects/Appointments/Serbian.lproj/Localizable.strings
295302
trans.sv = SoObjects/Appointments/Swedish.lproj/Localizable.strings
296303
trans.tr_TR = SoObjects/Appointments/TurkishTurkey.lproj/Localizable.strings
297304
trans.uk = SoObjects/Appointments/Ukrainian.lproj/Localizable.strings
305+
trans.zh_CN = SoObjects/Appointments/ChineseChina.lproj/Localizable.strings
298306
trans.zh_TW = SoObjects/Appointments/ChineseTaiwan.lproj/Localizable.strings
299307

300308
[sogo.soobjects-contacts]
@@ -332,6 +340,7 @@ trans.sr = SoObjects/Contacts/Serbian.lproj/Localizable.strings
332340
trans.sv = SoObjects/Contacts/Swedish.lproj/Localizable.strings
333341
trans.tr_TR = SoObjects/Contacts/TurkishTurkey.lproj/Localizable.strings
334342
trans.uk = SoObjects/Contacts/Ukrainian.lproj/Localizable.strings
343+
trans.zh_CN = SoObjects/Contacts/ChineseChina.lproj/Localizable.strings
335344
trans.zh_TW = SoObjects/Contacts/ChineseTaiwan.lproj/Localizable.strings
336345

337346
[sogo.soobjects-mailer]
@@ -369,6 +378,7 @@ trans.sr = SoObjects/Mailer/Serbian.lproj/Localizable.strings
369378
trans.sv = SoObjects/Mailer/Swedish.lproj/Localizable.strings
370379
trans.tr_TR = SoObjects/Mailer/TurkishTurkey.lproj/Localizable.strings
371380
trans.uk = SoObjects/Mailer/Ukrainian.lproj/Localizable.strings
381+
trans.zh_CN = SoObjects/Mailer/ChineseChina.lproj/Localizable.strings
372382
trans.zh_TW = SoObjects/Mailer/ChineseTaiwan.lproj/Localizable.strings
373383

374384
[sogo.ui-mailpartviewers]
@@ -406,4 +416,5 @@ trans.sr = UI/MailPartViewers/Serbian.lproj/Localizable.strings
406416
trans.sv = UI/MailPartViewers/Swedish.lproj/Localizable.strings
407417
trans.tr_TR = UI/MailPartViewers/TurkishTurkey.lproj/Localizable.strings
408418
trans.uk = UI/MailPartViewers/Ukrainian.lproj/Localizable.strings
419+
trans.zh_CN = UI/MailPartViewers/ChineseChina.lproj/Localizable.strings
409420
trans.zh_TW = UI/MailPartViewers/ChineseTaiwan.lproj/Localizable.strings

‎ActiveSync/SOGoActiveSyncDispatcher+Sync.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2592,7 +2592,7 @@ - (void) processSync: (id <DOMElement>) theDocumentElement
25922592
{
25932593
int t;
25942594

2595-
[self logWithFormat: @"Sleeping %d seconds while detecting changes in Sync...", internalInterval-total_sleep];
2595+
[self logWithFormat: @"Sleeping %d seconds while detecting changes for user %@ in Sync...", internalInterval-total_sleep, [[context activeUser] login]];
25962596

25972597
for (t = 0; t < sleepInterval; t++)
25982598
{

‎ActiveSync/SOGoActiveSyncDispatcher.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2465,7 +2465,7 @@ - (void) processPing: (id <DOMElement>) theDocumentElement
24652465
{
24662466
int t;
24672467

2468-
[self logWithFormat: @"Sleeping %d seconds while detecting changes in Ping...", internalInterval-total_sleep];
2468+
[self logWithFormat: @"Sleeping %d seconds while detecting changes for user %@ in Ping...", internalInterval-total_sleep, [[context activeUser] login]];
24692469

24702470
for (t = 0; t < sleepInterval; t++)
24712471
{

0 commit comments

Comments
 (0)