From 0a69733c6279a50d674f923c89c2f88c972b9883 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Sun, 18 Dec 2011 01:54:38 +0000 Subject: [PATCH 01/12] Monotone-Parent: e58b519a51a061b80853202ec91f07ec470a2bf0 Monotone-Revision: 62e33503bd06b9731084aa5fc492080cd0b5dcd4 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-18T01:54:38 --- UI/MailerUI/English.lproj/Localizable.strings | 1 + 1 file changed, 1 insertion(+) diff --git a/UI/MailerUI/English.lproj/Localizable.strings b/UI/MailerUI/English.lproj/Localizable.strings index e6e15cfe6..95ba0390a 100644 --- a/UI/MailerUI/English.lproj/Localizable.strings +++ b/UI/MailerUI/English.lproj/Localizable.strings @@ -19,6 +19,7 @@ "Attach" = "Attach"; "Save" = "Save"; "Options" = "Options"; +"Close" = "Close"; "Size" = "Size"; /* Tooltips */ From fc338931fcff285adf153c81f64b51f0e10adfa4 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 19 Dec 2011 17:16:23 +0000 Subject: [PATCH 02/12] Renamed "DanishDenmark" to "Danish". Monotone-Parent: ab0d6aa948262973d1cb1c1b5c2028965a306451 Monotone-Revision: 724e56b2f3e856f74157f0d3158e24aa3a22c5e9 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-19T17:16:23 --- .tx/config | 20 +++++++++---------- .../Localizable.strings | 0 SoObjects/Appointments/GNUmakefile | 2 +- .../Localizable.strings | 0 SoObjects/Contacts/GNUmakefile | 2 +- SoObjects/Mailer/GNUmakefile | 2 ++ .../SOGoMailDanishForward.html} | 0 .../SOGoMailDanishForward.wod} | 0 .../SOGoMailDanishReply.html} | 0 .../SOGoMailDanishReply.wod} | 0 SoObjects/Mailer/SOGoMailForward.h | 3 +++ SoObjects/Mailer/SOGoMailForward.m | 3 +++ SoObjects/Mailer/SOGoMailReply.h | 3 +++ SoObjects/Mailer/SOGoMailReply.m | 3 +++ SoObjects/SOGo/SOGoDefaults.plist | 2 +- Tests/Integration/preferences.py | 2 +- .../Localizable.strings | 0 UI/AdministrationUI/GNUmakefile | 2 +- .../Localizable.strings | 0 UI/Common/GNUmakefile | 2 +- .../Localizable.strings | 0 UI/Contacts/GNUmakefile | 2 +- .../Localizable.strings | 0 UI/MailPartViewers/GNUmakefile | 2 +- .../Localizable.strings | 0 UI/MailerUI/GNUmakefile | 2 +- .../Localizable.strings | 2 +- UI/MainUI/Catalan.lproj/Localizable.strings | 2 +- UI/MainUI/Czech.lproj/Localizable.strings | 2 +- .../Locale | 4 ++-- .../Localizable.strings | 2 +- UI/MainUI/Dutch.lproj/Localizable.strings | 2 +- UI/MainUI/English.lproj/Localizable.strings | 2 +- UI/MainUI/French.lproj/Localizable.strings | 2 +- UI/MainUI/GNUmakefile | 2 +- UI/MainUI/German.lproj/Localizable.strings | 2 +- UI/MainUI/Hungarian.lproj/Localizable.strings | 2 +- UI/MainUI/Icelandic.lproj/Localizable.strings | 2 +- UI/MainUI/Italian.lproj/Localizable.strings | 2 +- .../NorwegianBokmal.lproj/Localizable.strings | 2 +- .../Localizable.strings | 2 +- UI/MainUI/Polish.lproj/Localizable.strings | 2 +- UI/MainUI/Russian.lproj/Localizable.strings | 2 +- .../Localizable.strings | 2 +- .../SpanishSpain.lproj/Localizable.strings | 2 +- UI/MainUI/Swedish.lproj/Localizable.strings | 2 +- UI/MainUI/Ukrainian.lproj/Localizable.strings | 2 +- UI/MainUI/Welsh.lproj/Localizable.strings | 2 +- .../Localizable.strings | 0 UI/PreferencesUI/GNUmakefile | 2 +- UI/SOGoUI/SOGoACLAdvisory.h | 6 +++--- UI/SOGoUI/SOGoACLAdvisory.m | 6 +++--- UI/SOGoUI/SOGoFolderAdvisory.h | 4 ++-- UI/SOGoUI/SOGoFolderAdvisory.m | 4 ++-- .../Localizable.strings | 0 UI/Scheduler/GNUmakefile | 2 +- ....wox => SOGoACLDanishAdditionAdvisory.wox} | 0 ... => SOGoACLDanishModificationAdvisory.wox} | 0 ...y.wox => SOGoACLDanishRemovalAdvisory.wox} | 0 ...x => SOGoFolderDanishAdditionAdvisory.wox} | 0 ...ox => SOGoFolderDanishRemovalAdvisory.wox} | 0 61 files changed, 68 insertions(+), 54 deletions(-) rename SoObjects/Appointments/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename SoObjects/Contacts/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename SoObjects/Mailer/{SOGoMailDanishDenmarkForward.wo/SOGoMailDanishDenmarkForward.html => SOGoMailDanishForward.wo/SOGoMailDanishForward.html} (100%) rename SoObjects/Mailer/{SOGoMailDanishDenmarkForward.wo/SOGoMailDanishDenmarkForward.wod => SOGoMailDanishForward.wo/SOGoMailDanishForward.wod} (100%) rename SoObjects/Mailer/{SOGoMailDanishDenmarkReply.wo/SOGoMailDanishDenmarkReply.html => SOGoMailDanishReply.wo/SOGoMailDanishReply.html} (100%) rename SoObjects/Mailer/{SOGoMailDanishDenmarkReply.wo/SOGoMailDanishDenmarkReply.wod => SOGoMailDanishReply.wo/SOGoMailDanishReply.wod} (100%) rename UI/AdministrationUI/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename UI/Common/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename UI/Contacts/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename UI/MailPartViewers/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename UI/MailerUI/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename UI/MainUI/{DanishDenmark.lproj => Danish.lproj}/Locale (96%) rename UI/MainUI/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (99%) rename UI/PreferencesUI/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename UI/Scheduler/{DanishDenmark.lproj => Danish.lproj}/Localizable.strings (100%) rename UI/Templates/{SOGoACLDanishDenmarkAdditionAdvisory.wox => SOGoACLDanishAdditionAdvisory.wox} (100%) rename UI/Templates/{SOGoACLDanishDenmarkModificationAdvisory.wox => SOGoACLDanishModificationAdvisory.wox} (100%) rename UI/Templates/{SOGoACLDanishDenmarkRemovalAdvisory.wox => SOGoACLDanishRemovalAdvisory.wox} (100%) rename UI/Templates/{SOGoFolderDanishDenmarkAdditionAdvisory.wox => SOGoFolderDanishAdditionAdvisory.wox} (100%) rename UI/Templates/{SOGoFolderDanishDenmarkRemovalAdvisory.wox => SOGoFolderDanishRemovalAdvisory.wox} (100%) diff --git a/.tx/config b/.tx/config index 2ec5d023a..b6a16ff1d 100644 --- a/.tx/config +++ b/.tx/config @@ -7,7 +7,7 @@ source_lang = en trans.ca = UI/MailerUI/Catalan.lproj/Localizable.strings trans.cs = UI/MailerUI/Czech.lproj/Localizable.strings trans.cy = UI/MailerUI/Welsh.lproj/Localizable.strings -trans.da_DK = UI/MailerUI/DanishDenmark.lproj/Localizable.strings +trans.da_DK = UI/MailerUI/Danish.lproj/Localizable.strings trans.de = UI/MailerUI/German.lproj/Localizable.strings trans.es_AR = UI/MailerUI/SpanishArgentina.lproj/Localizable.strings trans.es_ES = UI/MailerUI/SpanishSpain.lproj/Localizable.strings @@ -30,7 +30,7 @@ source_lang = en trans.ca = UI/PreferencesUI/Catalan.lproj/Localizable.strings trans.cs = UI/PreferencesUI/Czech.lproj/Localizable.strings trans.cy = UI/PreferencesUI/Welsh.lproj/Localizable.strings -trans.da_DK = UI/PreferencesUI/DanishDenmark.lproj/Localizable.strings +trans.da_DK = UI/PreferencesUI/Danish.lproj/Localizable.strings trans.de = UI/PreferencesUI/German.lproj/Localizable.strings trans.es_AR = UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings trans.es_ES = UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings @@ -53,7 +53,7 @@ source_lang = en trans.ca = UI/Scheduler/Catalan.lproj/Localizable.strings trans.cs = UI/Scheduler/Czech.lproj/Localizable.strings trans.cy = UI/Scheduler/Welsh.lproj/Localizable.strings -trans.da_DK = UI/Scheduler/DanishDenmark.lproj/Localizable.strings +trans.da_DK = UI/Scheduler/Danish.lproj/Localizable.strings trans.de = UI/Scheduler/German.lproj/Localizable.strings trans.es_AR = UI/Scheduler/SpanishArgentina.lproj/Localizable.strings trans.es_ES = UI/Scheduler/SpanishSpain.lproj/Localizable.strings @@ -76,7 +76,7 @@ source_lang = en trans.ca = UI/Contacts/Catalan.lproj/Localizable.strings trans.cs = UI/Contacts/Czech.lproj/Localizable.strings trans.cy = UI/Contacts/Welsh.lproj/Localizable.strings -trans.da_DK = UI/Contacts/DanishDenmark.lproj/Localizable.strings +trans.da_DK = UI/Contacts/Danish.lproj/Localizable.strings trans.de = UI/Contacts/German.lproj/Localizable.strings trans.es_AR = UI/Contacts/SpanishArgentina.lproj/Localizable.strings trans.es_ES = UI/Contacts/SpanishSpain.lproj/Localizable.strings @@ -99,7 +99,7 @@ source_lang = en trans.ca = UI/MainUI/Catalan.lproj/Localizable.strings trans.cs = UI/MainUI/Czech.lproj/Localizable.strings trans.cy = UI/MainUI/Welsh.lproj/Localizable.strings -trans.da_DK = UI/MainUI/DanishDenmark.lproj/Localizable.strings +trans.da_DK = UI/MainUI/Danish.lproj/Localizable.strings trans.de = UI/MainUI/German.lproj/Localizable.strings trans.es_AR = UI/MainUI/SpanishArgentina.lproj/Localizable.strings trans.es_ES = UI/MainUI/SpanishSpain.lproj/Localizable.strings @@ -122,7 +122,7 @@ source_lang = en trans.ca = UI/Common/Catalan.lproj/Localizable.strings trans.cs = UI/Common/Czech.lproj/Localizable.strings trans.cy = UI/Common/Welsh.lproj/Localizable.strings -trans.da_DK = UI/Common/DanishDenmark.lproj/Localizable.strings +trans.da_DK = UI/Common/Danish.lproj/Localizable.strings trans.de = UI/Common/German.lproj/Localizable.strings trans.es_AR = UI/Common/SpanishArgentina.lproj/Localizable.strings trans.es_ES = UI/Common/SpanishSpain.lproj/Localizable.strings @@ -145,7 +145,7 @@ source_lang = en trans.ca = UI/AdministrationUI/Catalan.lproj/Localizable.strings trans.cs = UI/AdministrationUI/Czech.lproj/Localizable.strings trans.cy = UI/AdministrationUI/Welsh.lproj/Localizable.strings -trans.da_DK = UI/AdministrationUI/DanishDenmark.lproj/Localizable.strings +trans.da_DK = UI/AdministrationUI/Danish.lproj/Localizable.strings trans.de = UI/AdministrationUI/German.lproj/Localizable.strings trans.es_AR = UI/AdministrationUI/SpanishArgentina.lproj/Localizable.strings trans.es_ES = UI/AdministrationUI/SpanishSpain.lproj/Localizable.strings @@ -168,7 +168,7 @@ source_lang = en trans.ca = SoObjects/Appointments/Catalan.lproj/Localizable.strings trans.cs = SoObjects/Appointments/Czech.lproj/Localizable.strings trans.cy = SoObjects/Appointments/Welsh.lproj/Localizable.strings -trans.da_DK = SoObjects/Appointments/DanishDenmark.lproj/Localizable.strings +trans.da_DK = SoObjects/Appointments/Danish.lproj/Localizable.strings trans.de = SoObjects/Appointments/German.lproj/Localizable.strings trans.es_AR = SoObjects/Appointments/SpanishArgentina.lproj/Localizable.strings trans.es_ES = SoObjects/Appointments/SpanishSpain.lproj/Localizable.strings @@ -191,7 +191,7 @@ source_lang = en trans.ca = SoObjects/Contacts/Catalan.lproj/Localizable.strings trans.cs = SoObjects/Contacts/Czech.lproj/Localizable.strings trans.cy = SoObjects/Contacts/Welsh.lproj/Localizable.strings -trans.da_DK = SoObjects/Contacts/DanishDenmark.lproj/Localizable.strings +trans.da_DK = SoObjects/Contacts/Danish.lproj/Localizable.strings trans.de = SoObjects/Contacts/German.lproj/Localizable.strings trans.es_AR = SoObjects/Contacts/SpanishArgentina.lproj/Localizable.strings trans.es_ES = SoObjects/Contacts/SpanishSpain.lproj/Localizable.strings @@ -214,7 +214,7 @@ source_lang = en trans.ca = UI/MailPartViewers/Catalan.lproj/Localizable.strings trans.cs = UI/MailPartViewers/Czech.lproj/Localizable.strings trans.cy = UI/MailPartViewers/Welsh.lproj/Localizable.strings -trans.da_DK = UI/MailPartViewers/DanishDenmark.lproj/Localizable.strings +trans.da_DK = UI/MailPartViewers/Danish.lproj/Localizable.strings trans.de = UI/MailPartViewers/German.lproj/Localizable.strings trans.es_AR = UI/MailPartViewers/SpanishArgentina.lproj/Localizable.strings trans.es_ES = UI/MailPartViewers/SpanishSpain.lproj/Localizable.strings diff --git a/SoObjects/Appointments/DanishDenmark.lproj/Localizable.strings b/SoObjects/Appointments/Danish.lproj/Localizable.strings similarity index 100% rename from SoObjects/Appointments/DanishDenmark.lproj/Localizable.strings rename to SoObjects/Appointments/Danish.lproj/Localizable.strings diff --git a/SoObjects/Appointments/GNUmakefile b/SoObjects/Appointments/GNUmakefile index 6d1a71db4..dd11b0435 100644 --- a/SoObjects/Appointments/GNUmakefile +++ b/SoObjects/Appointments/GNUmakefile @@ -47,7 +47,7 @@ Appointments_OBJC_FILES = \ Appointments_RESOURCE_FILES += \ product.plist \ -Appointments_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +Appointments_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh Appointments_LOCALIZED_RESOURCE_FILES = Localizable.strings diff --git a/SoObjects/Contacts/DanishDenmark.lproj/Localizable.strings b/SoObjects/Contacts/Danish.lproj/Localizable.strings similarity index 100% rename from SoObjects/Contacts/DanishDenmark.lproj/Localizable.strings rename to SoObjects/Contacts/Danish.lproj/Localizable.strings diff --git a/SoObjects/Contacts/GNUmakefile b/SoObjects/Contacts/GNUmakefile index d31635d9d..3e3ac2ed2 100644 --- a/SoObjects/Contacts/GNUmakefile +++ b/SoObjects/Contacts/GNUmakefile @@ -24,7 +24,7 @@ Contacts_OBJC_FILES = \ Contacts_RESOURCE_FILES += \ product.plist \ -Contacts_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +Contacts_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh Contacts_LOCALIZED_RESOURCE_FILES = Localizable.strings diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile index e009d07cd..69773ba07 100644 --- a/SoObjects/Mailer/GNUmakefile +++ b/SoObjects/Mailer/GNUmakefile @@ -48,6 +48,8 @@ Mailer_RESOURCE_FILES += \ SOGoMailCatalanReply.wo \ SOGoMailCzechForward.wo \ SOGoMailCzechReply.wo \ + SOGoMailDanishForward.wo \ + SOGoMailDanishReply.wo \ SOGoMailDutchForward.wo \ SOGoMailDutchReply.wo \ SOGoMailEnglishForward.wo \ diff --git a/SoObjects/Mailer/SOGoMailDanishDenmarkForward.wo/SOGoMailDanishDenmarkForward.html b/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.html similarity index 100% rename from SoObjects/Mailer/SOGoMailDanishDenmarkForward.wo/SOGoMailDanishDenmarkForward.html rename to SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.html diff --git a/SoObjects/Mailer/SOGoMailDanishDenmarkForward.wo/SOGoMailDanishDenmarkForward.wod b/SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.wod similarity index 100% rename from SoObjects/Mailer/SOGoMailDanishDenmarkForward.wo/SOGoMailDanishDenmarkForward.wod rename to SoObjects/Mailer/SOGoMailDanishForward.wo/SOGoMailDanishForward.wod diff --git a/SoObjects/Mailer/SOGoMailDanishDenmarkReply.wo/SOGoMailDanishDenmarkReply.html b/SoObjects/Mailer/SOGoMailDanishReply.wo/SOGoMailDanishReply.html similarity index 100% rename from SoObjects/Mailer/SOGoMailDanishDenmarkReply.wo/SOGoMailDanishDenmarkReply.html rename to SoObjects/Mailer/SOGoMailDanishReply.wo/SOGoMailDanishReply.html diff --git a/SoObjects/Mailer/SOGoMailDanishDenmarkReply.wo/SOGoMailDanishDenmarkReply.wod b/SoObjects/Mailer/SOGoMailDanishReply.wo/SOGoMailDanishReply.wod similarity index 100% rename from SoObjects/Mailer/SOGoMailDanishDenmarkReply.wo/SOGoMailDanishDenmarkReply.wod rename to SoObjects/Mailer/SOGoMailDanishReply.wo/SOGoMailDanishReply.wod diff --git a/SoObjects/Mailer/SOGoMailForward.h b/SoObjects/Mailer/SOGoMailForward.h index 28f3b7584..c2e4c9134 100644 --- a/SoObjects/Mailer/SOGoMailForward.h +++ b/SoObjects/Mailer/SOGoMailForward.h @@ -48,6 +48,9 @@ @interface SOGoMailCzechForward : SOGoMailForward @end +@interface SOGoMailDanishForward : SOGoMailForward +@end + @interface SOGoMailDutchForward : SOGoMailForward @end diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m index 865583324..66dd03537 100644 --- a/SoObjects/Mailer/SOGoMailForward.m +++ b/SoObjects/Mailer/SOGoMailForward.m @@ -242,6 +242,9 @@ @implementation SOGoMailCzechForward @end +@implementation SOGoMailDanishForward +@end + @implementation SOGoMailDutchForward @end diff --git a/SoObjects/Mailer/SOGoMailReply.h b/SoObjects/Mailer/SOGoMailReply.h index ed933fead..4ee5828d2 100644 --- a/SoObjects/Mailer/SOGoMailReply.h +++ b/SoObjects/Mailer/SOGoMailReply.h @@ -53,6 +53,9 @@ @interface SOGoMailCzechReply : SOGoMailReply @end +@interface SOGoMailDanishReply : SOGoMailReply +@end + @interface SOGoMailDutchReply : SOGoMailReply @end diff --git a/SoObjects/Mailer/SOGoMailReply.m b/SoObjects/Mailer/SOGoMailReply.m index 75b8d5c51..b49bf3800 100644 --- a/SoObjects/Mailer/SOGoMailReply.m +++ b/SoObjects/Mailer/SOGoMailReply.m @@ -110,6 +110,9 @@ @implementation SOGoMailCzechReply @end +@implementation SOGoMailDanishReply +@end + @implementation SOGoMailDutchReply @end diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist index 9fdcb4c6b..e56b05cf3 100644 --- a/SoObjects/SOGo/SOGoDefaults.plist +++ b/SoObjects/SOGo/SOGoDefaults.plist @@ -33,7 +33,7 @@ SOGoLoginModule = "Mail"; SOGoLanguage = "English"; - SOGoSupportedLanguages = ( "Catalan", "Czech", "Dutch", "DanishDenmark", "Welsh", "English", + SOGoSupportedLanguages = ( "Catalan", "Czech", "Dutch", "Danish", "Welsh", "English", "SpanishSpain", "SpanishArgentina", "French", "German", "Icelandic", "Italian", "Hungarian", "BrazilianPortuguese", "NorwegianBokmal", "NorwegianNynorsk", "Polish", "Russian", diff --git a/Tests/Integration/preferences.py b/Tests/Integration/preferences.py index ec919bd8a..28c971a39 100644 --- a/Tests/Integration/preferences.py +++ b/Tests/Integration/preferences.py @@ -7,7 +7,7 @@ import simplejson import sogoLogin SOGoSupportedLanguages = [ "Catalan", "Czech", "Welsh", "English", "SpanishSpain", "SpanishArgentina", - "French", "German", "Icelandic", "Italian", "Hungarian", "DanishDenmark", + "French", "German", "Icelandic", "Italian", "Hungarian", "Danish", "Dutch", "BrazilianPortuguese", "NorwegianBokmal", "NorwegianNynorsk", "Polish", "Russian", "Ukrainian", "Swedish" ] daysBetweenResponseList=[1,2,3,5,7,14,21,30] diff --git a/UI/AdministrationUI/DanishDenmark.lproj/Localizable.strings b/UI/AdministrationUI/Danish.lproj/Localizable.strings similarity index 100% rename from UI/AdministrationUI/DanishDenmark.lproj/Localizable.strings rename to UI/AdministrationUI/Danish.lproj/Localizable.strings diff --git a/UI/AdministrationUI/GNUmakefile b/UI/AdministrationUI/GNUmakefile index a26673bdd..ef8acf8f4 100644 --- a/UI/AdministrationUI/GNUmakefile +++ b/UI/AdministrationUI/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = AdministrationUI AdministrationUI_PRINCIPAL_CLASS = AdministrationUIProduct -AdministrationUI_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +AdministrationUI_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh AdministrationUI_OBJC_FILES = \ AdministrationUIProduct.m \ diff --git a/UI/Common/DanishDenmark.lproj/Localizable.strings b/UI/Common/Danish.lproj/Localizable.strings similarity index 100% rename from UI/Common/DanishDenmark.lproj/Localizable.strings rename to UI/Common/Danish.lproj/Localizable.strings diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile index 4f441ca5d..a8bc5e043 100644 --- a/UI/Common/GNUmakefile +++ b/UI/Common/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = CommonUI CommonUI_PRINCIPAL_CLASS = CommonUIProduct -CommonUI_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +CommonUI_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh CommonUI_OBJC_FILES += \ CommonUIProduct.m \ diff --git a/UI/Contacts/DanishDenmark.lproj/Localizable.strings b/UI/Contacts/Danish.lproj/Localizable.strings similarity index 100% rename from UI/Contacts/DanishDenmark.lproj/Localizable.strings rename to UI/Contacts/Danish.lproj/Localizable.strings diff --git a/UI/Contacts/GNUmakefile b/UI/Contacts/GNUmakefile index 7a92c556d..8ba2a84b2 100644 --- a/UI/Contacts/GNUmakefile +++ b/UI/Contacts/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = ContactsUI ContactsUI_PRINCIPAL_CLASS = ContactsUIProduct -ContactsUI_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +ContactsUI_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh ContactsUI_OBJC_FILES = \ UIxContactsUserFolders.m \ diff --git a/UI/MailPartViewers/DanishDenmark.lproj/Localizable.strings b/UI/MailPartViewers/Danish.lproj/Localizable.strings similarity index 100% rename from UI/MailPartViewers/DanishDenmark.lproj/Localizable.strings rename to UI/MailPartViewers/Danish.lproj/Localizable.strings diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile index 9012c451d..7316f2cc9 100644 --- a/UI/MailPartViewers/GNUmakefile +++ b/UI/MailPartViewers/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = MailPartViewers MailPartViewers_PRINCIPAL_CLASS = MailPartViewersProduct -MailPartViewers_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +MailPartViewers_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh MailPartViewers_OBJC_FILES += \ MailPartViewersProduct.m \ diff --git a/UI/MailerUI/DanishDenmark.lproj/Localizable.strings b/UI/MailerUI/Danish.lproj/Localizable.strings similarity index 100% rename from UI/MailerUI/DanishDenmark.lproj/Localizable.strings rename to UI/MailerUI/Danish.lproj/Localizable.strings diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile index af228b53c..129c46845 100644 --- a/UI/MailerUI/GNUmakefile +++ b/UI/MailerUI/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = MailerUI MailerUI_PRINCIPAL_CLASS = MailerUIProduct -MailerUI_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +MailerUI_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh MailerUI_OBJC_FILES += \ MailerUIProduct.m \ diff --git a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings index b35cb02c2..e1bdde761 100644 --- a/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/MainUI/BrazilianPortuguese.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Escolha ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Catalan.lproj/Localizable.strings b/UI/MainUI/Catalan.lproj/Localizable.strings index 33e1d0f85..a09997b67 100644 --- a/UI/MainUI/Catalan.lproj/Localizable.strings +++ b/UI/MainUI/Catalan.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Choose ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Czech.lproj/Localizable.strings b/UI/MainUI/Czech.lproj/Localizable.strings index fbf9dd105..d15dfd4ea 100644 --- a/UI/MainUI/Czech.lproj/Localizable.strings +++ b/UI/MainUI/Czech.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Vybrat ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/DanishDenmark.lproj/Locale b/UI/MainUI/Danish.lproj/Locale similarity index 96% rename from UI/MainUI/DanishDenmark.lproj/Locale rename to UI/MainUI/Danish.lproj/Locale index 3986b4dcd..61bf77a11 100644 --- a/UI/MainUI/DanishDenmark.lproj/Locale +++ b/UI/MainUI/Danish.lproj/Locale @@ -1,6 +1,6 @@ -/* DanishDenmark */ +/* Danish */ { - NSLanguageName = "DanishDenmark"; + NSLanguageName = "Danish (Denmark)"; NSFormalName = "Danish"; NSLocaleCode = "da_DK"; /* ISO 639-1 */ NSLanguageCode = "dan"; /* ISO 639-2 */ diff --git a/UI/MainUI/DanishDenmark.lproj/Localizable.strings b/UI/MainUI/Danish.lproj/Localizable.strings similarity index 99% rename from UI/MainUI/DanishDenmark.lproj/Localizable.strings rename to UI/MainUI/Danish.lproj/Localizable.strings index 0eda6d92b..fc9aef0e8 100644 --- a/UI/MainUI/DanishDenmark.lproj/Localizable.strings +++ b/UI/MainUI/Danish.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Vælg ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Dutch.lproj/Localizable.strings b/UI/MainUI/Dutch.lproj/Localizable.strings index baf38dbe6..911f6e79c 100644 --- a/UI/MainUI/Dutch.lproj/Localizable.strings +++ b/UI/MainUI/Dutch.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Kies..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings index d0c324d7f..cf33ad670 100644 --- a/UI/MainUI/English.lproj/Localizable.strings +++ b/UI/MainUI/English.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Choose ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/French.lproj/Localizable.strings b/UI/MainUI/French.lproj/Localizable.strings index 52b8e4894..b980700e2 100644 --- a/UI/MainUI/French.lproj/Localizable.strings +++ b/UI/MainUI/French.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Choisir ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/GNUmakefile b/UI/MainUI/GNUmakefile index 8246236dd..bf49f1135 100644 --- a/UI/MainUI/GNUmakefile +++ b/UI/MainUI/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = MainUI MainUI_PRINCIPAL_CLASS = MainUIProduct -MainUI_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +MainUI_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh MainUI_OBJC_FILES += \ MainUIProduct.m \ diff --git a/UI/MainUI/German.lproj/Localizable.strings b/UI/MainUI/German.lproj/Localizable.strings index cdcfd7b72..69798617f 100644 --- a/UI/MainUI/German.lproj/Localizable.strings +++ b/UI/MainUI/German.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Auswählen"; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Hungarian.lproj/Localizable.strings b/UI/MainUI/Hungarian.lproj/Localizable.strings index 24bc67362..6c4f07e34 100644 --- a/UI/MainUI/Hungarian.lproj/Localizable.strings +++ b/UI/MainUI/Hungarian.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Válasszon ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Icelandic.lproj/Localizable.strings b/UI/MainUI/Icelandic.lproj/Localizable.strings index 758e318d7..bb1cdde9a 100644 --- a/UI/MainUI/Icelandic.lproj/Localizable.strings +++ b/UI/MainUI/Icelandic.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Velja..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Italian.lproj/Localizable.strings b/UI/MainUI/Italian.lproj/Localizable.strings index 8381a89bb..28361efb2 100644 --- a/UI/MainUI/Italian.lproj/Localizable.strings +++ b/UI/MainUI/Italian.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Scegli..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings b/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings index ab6609847..8fc406192 100644 --- a/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/MainUI/NorwegianBokmal.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Velg ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings index ab6609847..8fc406192 100644 --- a/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/MainUI/NorwegianNynorsk.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Velg ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Polish.lproj/Localizable.strings b/UI/MainUI/Polish.lproj/Localizable.strings index 1a3af0976..b44ded433 100644 --- a/UI/MainUI/Polish.lproj/Localizable.strings +++ b/UI/MainUI/Polish.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Wybierz ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Russian.lproj/Localizable.strings b/UI/MainUI/Russian.lproj/Localizable.strings index 2b0511a45..fb545692f 100644 --- a/UI/MainUI/Russian.lproj/Localizable.strings +++ b/UI/MainUI/Russian.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Выбрать ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/SpanishArgentina.lproj/Localizable.strings b/UI/MainUI/SpanishArgentina.lproj/Localizable.strings index b967e1db2..8a4885676 100644 --- a/UI/MainUI/SpanishArgentina.lproj/Localizable.strings +++ b/UI/MainUI/SpanishArgentina.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Elija ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/SpanishSpain.lproj/Localizable.strings b/UI/MainUI/SpanishSpain.lproj/Localizable.strings index d0af063c9..fd8502a1a 100644 --- a/UI/MainUI/SpanishSpain.lproj/Localizable.strings +++ b/UI/MainUI/SpanishSpain.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Elija ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Swedish.lproj/Localizable.strings b/UI/MainUI/Swedish.lproj/Localizable.strings index 5c240dff8..531e7a124 100644 --- a/UI/MainUI/Swedish.lproj/Localizable.strings +++ b/UI/MainUI/Swedish.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Välj ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Ukrainian.lproj/Localizable.strings b/UI/MainUI/Ukrainian.lproj/Localizable.strings index 3dde9e366..3af1d28f1 100644 --- a/UI/MainUI/Ukrainian.lproj/Localizable.strings +++ b/UI/MainUI/Ukrainian.lproj/Localizable.strings @@ -21,7 +21,7 @@ "choose" = "Вибрати ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/MainUI/Welsh.lproj/Localizable.strings b/UI/MainUI/Welsh.lproj/Localizable.strings index d9bc57cc3..01cc78989 100644 --- a/UI/MainUI/Welsh.lproj/Localizable.strings +++ b/UI/MainUI/Welsh.lproj/Localizable.strings @@ -20,7 +20,7 @@ "choose" = "Dewis ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/DanishDenmark.lproj/Localizable.strings b/UI/PreferencesUI/Danish.lproj/Localizable.strings similarity index 100% rename from UI/PreferencesUI/DanishDenmark.lproj/Localizable.strings rename to UI/PreferencesUI/Danish.lproj/Localizable.strings diff --git a/UI/PreferencesUI/GNUmakefile b/UI/PreferencesUI/GNUmakefile index 5a6f9e488..596b1d213 100644 --- a/UI/PreferencesUI/GNUmakefile +++ b/UI/PreferencesUI/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = PreferencesUI PreferencesUI_PRINCIPAL_CLASS = PreferencesUIProduct -PreferencesUI_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +PreferencesUI_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh PreferencesUI_OBJC_FILES = \ PreferencesUIProduct.m \ diff --git a/UI/SOGoUI/SOGoACLAdvisory.h b/UI/SOGoUI/SOGoACLAdvisory.h index 34369baa3..afbd9c36e 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.h +++ b/UI/SOGoUI/SOGoACLAdvisory.h @@ -83,13 +83,13 @@ @interface SOGoACLCzechRemovalAdvisory : SOGoACLRemovalAdvisory @end -@interface SOGoACLDanishDenmarkAdditionAdvisory : SOGoACLAdditionAdvisory +@interface SOGoACLDanishAdditionAdvisory : SOGoACLAdditionAdvisory @end -@interface SOGoACLDanishDenmarkModificationAdvisory : SOGoACLModificationAdvisory +@interface SOGoACLDanishModificationAdvisory : SOGoACLModificationAdvisory @end -@interface SOGoACLDanishDenmarkRemovalAdvisory : SOGoACLRemovalAdvisory +@interface SOGoACLDanishRemovalAdvisory : SOGoACLRemovalAdvisory @end @interface SOGoACLDutchAdditionAdvisory : SOGoACLAdditionAdvisory diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m index 6dce9175b..3023d46d7 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.m +++ b/UI/SOGoUI/SOGoACLAdvisory.m @@ -277,13 +277,13 @@ @implementation SOGoACLCzechRemovalAdvisory @end -@implementation SOGoACLDanishDenmarkAdditionAdvisory +@implementation SOGoACLDanishAdditionAdvisory @end -@implementation SOGoACLDanishDenmarkModificationAdvisory +@implementation SOGoACLDanishModificationAdvisory @end -@implementation SOGoACLDanishDenmarkRemovalAdvisory +@implementation SOGoACLDanishRemovalAdvisory @end @implementation SOGoACLDutchAdditionAdvisory diff --git a/UI/SOGoUI/SOGoFolderAdvisory.h b/UI/SOGoUI/SOGoFolderAdvisory.h index e8ec5c314..79426a0a1 100644 --- a/UI/SOGoUI/SOGoFolderAdvisory.h +++ b/UI/SOGoUI/SOGoFolderAdvisory.h @@ -65,10 +65,10 @@ @interface SOGoFolderCzechRemovalAdvisory : SOGoFolderRemovalAdvisory @end -@interface SOGoFolderDanishDenmarkAdditionAdvisory : SOGoFolderAdditionAdvisory +@interface SOGoFolderDanishAdditionAdvisory : SOGoFolderAdditionAdvisory @end -@interface SOGoFolderDanishDenmarkRemovalAdvisory : SOGoFolderRemovalAdvisory +@interface SOGoFolderDanishRemovalAdvisory : SOGoFolderRemovalAdvisory @end @interface SOGoFolderDutchAdditionAdvisory : SOGoFolderAdditionAdvisory diff --git a/UI/SOGoUI/SOGoFolderAdvisory.m b/UI/SOGoUI/SOGoFolderAdvisory.m index d580fe962..83fe5f434 100644 --- a/UI/SOGoUI/SOGoFolderAdvisory.m +++ b/UI/SOGoUI/SOGoFolderAdvisory.m @@ -236,10 +236,10 @@ @implementation SOGoFolderCzechRemovalAdvisory @end -@implementation SOGoFolderDanishDenmarkAdditionAdvisory +@implementation SOGoFolderDanishAdditionAdvisory @end -@implementation SOGoFolderDanishDenmarkRemovalAdvisory +@implementation SOGoFolderDanishRemovalAdvisory @end @implementation SOGoFolderDutchAdditionAdvisory diff --git a/UI/Scheduler/DanishDenmark.lproj/Localizable.strings b/UI/Scheduler/Danish.lproj/Localizable.strings similarity index 100% rename from UI/Scheduler/DanishDenmark.lproj/Localizable.strings rename to UI/Scheduler/Danish.lproj/Localizable.strings diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile index 57044154e..f71bcd6cd 100644 --- a/UI/Scheduler/GNUmakefile +++ b/UI/Scheduler/GNUmakefile @@ -6,7 +6,7 @@ BUNDLE_NAME = SchedulerUI SchedulerUI_PRINCIPAL_CLASS = SchedulerUIProduct -SchedulerUI_LANGUAGES = BrazilianPortuguese Catalan Czech DanishDenmark Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh +SchedulerUI_LANGUAGES = BrazilianPortuguese Catalan Czech Danish Dutch English French German Hungarian Icelandic Italian NorwegianBokmal NorwegianNynorsk Polish Russian SpanishSpain SpanishArgentina Swedish Ukrainian Welsh SchedulerUI_OBJC_FILES = \ SchedulerUIProduct.m \ diff --git a/UI/Templates/SOGoACLDanishDenmarkAdditionAdvisory.wox b/UI/Templates/SOGoACLDanishAdditionAdvisory.wox similarity index 100% rename from UI/Templates/SOGoACLDanishDenmarkAdditionAdvisory.wox rename to UI/Templates/SOGoACLDanishAdditionAdvisory.wox diff --git a/UI/Templates/SOGoACLDanishDenmarkModificationAdvisory.wox b/UI/Templates/SOGoACLDanishModificationAdvisory.wox similarity index 100% rename from UI/Templates/SOGoACLDanishDenmarkModificationAdvisory.wox rename to UI/Templates/SOGoACLDanishModificationAdvisory.wox diff --git a/UI/Templates/SOGoACLDanishDenmarkRemovalAdvisory.wox b/UI/Templates/SOGoACLDanishRemovalAdvisory.wox similarity index 100% rename from UI/Templates/SOGoACLDanishDenmarkRemovalAdvisory.wox rename to UI/Templates/SOGoACLDanishRemovalAdvisory.wox diff --git a/UI/Templates/SOGoFolderDanishDenmarkAdditionAdvisory.wox b/UI/Templates/SOGoFolderDanishAdditionAdvisory.wox similarity index 100% rename from UI/Templates/SOGoFolderDanishDenmarkAdditionAdvisory.wox rename to UI/Templates/SOGoFolderDanishAdditionAdvisory.wox diff --git a/UI/Templates/SOGoFolderDanishDenmarkRemovalAdvisory.wox b/UI/Templates/SOGoFolderDanishRemovalAdvisory.wox similarity index 100% rename from UI/Templates/SOGoFolderDanishDenmarkRemovalAdvisory.wox rename to UI/Templates/SOGoFolderDanishRemovalAdvisory.wox From 7a6dc1e6afba3181118df50c16dc4d09047e0457 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 19 Dec 2011 18:52:06 +0000 Subject: [PATCH 03/12] Updated Ukrainian translation. Monotone-Parent: 724e56b2f3e856f74157f0d3158e24aa3a22c5e9 Monotone-Revision: f8a9127ce4567079d226dd65ec439833020d0432 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-19T18:52:06 --- .../Ukrainian.lproj/Localizable.strings | 14 +++-- SoObjects/Mailer/GNUmakefile | 2 + UI/Common/Ukrainian.lproj/Localizable.strings | 7 ++- .../Ukrainian.lproj/Localizable.strings | 8 +-- .../Ukrainian.lproj/Localizable.strings | 4 +- .../Ukrainian.lproj/Localizable.strings | 10 +++- .../Ukrainian.lproj/Localizable.strings | 45 +++++++++++++--- .../Ukrainian.lproj/Localizable.strings | 51 ++++++++++++++----- 8 files changed, 109 insertions(+), 32 deletions(-) diff --git a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings index 7fe4ca8ba..cbd54ea48 100644 --- a/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings +++ b/SoObjects/Appointments/Ukrainian.lproj/Localizable.strings @@ -35,12 +35,20 @@ vtodo_class2 = "(Конфіденційне завдання)"; /* Invitation */ "Event Invitation: \"%{Summary}\"" = "Запрошення на подію: \"%{Summary}\""; "(sent by %{SentBy}) " = "(надіслано %{SentBy}) "; -"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} запросив вас до %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"; +"%{Organizer} %{SentByText}has invited you to %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" = "%{Organizer} %{SentByText} запросив вас до %{Summary}. + +Start: %{StartDate} at %{StartTime} +End: %{EndDate} at %{EndTime} +Description: %{Description}"; /* Deletion */ "Event Cancelled: \"%{Summary}\"" = "Подію скасовано: \"%{Summary}\""; "%{Organizer} %{SentByText}has cancelled this event: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}" -= "%{Organizer} %{SentByText} скасував подію: %{Summary}.\n\nStart: %{StartDate} at %{StartTime}\nEnd: %{EndDate} at %{EndTime}\nDescription: %{Description}"; += "%{Organizer} %{SentByText} скасував подію: %{Summary}. + +Start: %{StartDate} at %{StartTime} +End: %{EndDate} at %{EndTime} +Description: %{Description}"; /* Update */ "The appointment \"%{Summary}\" for the %{OldStartDate} at %{OldStartTime} has changed" @@ -62,4 +70,4 @@ vtodo_class2 = "(Конфіденційне завдання)"; = "%{Attendee} %{SentByText} поки не визначився з участю в події."; /* Resources */ -"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file +"Maximum number of simultaneous bookings (%{NumberOfSimultaneousBookings}) reached for resource \"%{Cn} %{SystemEmail}\"." = "Максимальне число одночасного резервування (%{NumberOfSimultaneousBookings}) для ресурсу досягло \"%{Cn} %{SystemEmail}\"."; \ No newline at end of file diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile index 69773ba07..f4bbae9b2 100644 --- a/SoObjects/Mailer/GNUmakefile +++ b/SoObjects/Mailer/GNUmakefile @@ -78,6 +78,8 @@ Mailer_RESOURCE_FILES += \ SOGoMailSpanishArgentinaReply.wo \ SOGoMailSwedishForward.wo \ SOGoMailSwedishReply.wo \ + SOGoMailUkrainianForward.wo \ + SOGoMailUkrainianReply.wo \ SOGoMailWelshForward.wo \ SOGoMailWelshReply.wo diff --git a/UI/Common/Ukrainian.lproj/Localizable.strings b/UI/Common/Ukrainian.lproj/Localizable.strings index b81809a57..edfb66669 100644 --- a/UI/Common/Ukrainian.lproj/Localizable.strings +++ b/UI/Common/Ukrainian.lproj/Localizable.strings @@ -28,9 +28,13 @@ "Add..." = "Додати..."; "Remove" = "Вилучити"; -"Default Roles" = "Контроль доступу для всіх"; "Subscribe User" = "Підписати користувача"; +"Any Authenticated User" = "Будь-який авторизований користувач"; +"Public Access" = "Публічний доступ"; +"Any user not listed above" = "Будь-який користувач, крім зазначених вище"; +"Anybody accessing this resource from the public area" = "Будь-який користувач, що бажає отримати доступ з публічного простору"; + "Sorry, the user rights can not be configured for that object." = "Вибачте, для цього об’єкту неможливо налаштувати права доступу."; /* generic.js */ @@ -50,7 +54,6 @@ "A folder by that name already exists." = "Тека з такою назвою вже існує."; "You cannot create a list in a shared address book." = "Ви не можете створювати перелік у спільній адресній книзі."; - "Warning" = "Увага"; "You are not allowed to access this module or this system. Please contact your system administrator." diff --git a/UI/Contacts/Ukrainian.lproj/Localizable.strings b/UI/Contacts/Ukrainian.lproj/Localizable.strings index 99f38373b..6dbd2d4aa 100644 --- a/UI/Contacts/Ukrainian.lproj/Localizable.strings +++ b/UI/Contacts/Ukrainian.lproj/Localizable.strings @@ -2,8 +2,8 @@ "Contact" = "Контакт"; "Address" = "Адреси"; -"Other" = "Інше"; "Photos" = "Світлини"; +"Other" = "Інше"; "Address Books" = "Адресні книги"; "Addressbook" = "Адресна книга"; @@ -36,11 +36,12 @@ "delete" = "вилучити"; "edit" = "редагувати"; "invalidemailwarn" = "Неправильно зазначена електронна адреса"; +"invaliddatewarn" = "Зазначена дата неправильна."; "new" = "новий"; "Preferred Phone" = "Основний телефон"; -"Copy To" = "Скопіювати до"; "Move To" = "Пересунути до"; +"Copy To" = "Скопіювати до"; "Add to:" = "Додати до:"; /* Tooltips */ @@ -50,6 +51,7 @@ "Edit the selected card" = "Зміна вибраної картки"; "Send a mail message" = "Створення повідомлення"; "Delete selected card or address book" = "Вилучення вибраної картки або адресної книги"; +"Reload all contacts" = "Перезавантажити усі контакти"; "htmlMailFormat_UNKNOWN" = "Невідомо"; "htmlMailFormat_FALSE" = "Звичайний текст"; @@ -74,7 +76,6 @@ "No possible subscription" = "Відсутні підписки"; "Preferred" = "Найзручніше"; -"Card for %@" = "Картка для %@"; "Display:" = "Відображати як:"; "Display Name:" = "Ім’я, що відображається:"; "Email:" = "Електронна пошта:"; @@ -153,7 +154,6 @@ "Unable to subscribe to that folder!" = "Неможливо підписатись на цю теку."; -"Default Roles" = "Ролі за замовчанням"; "User rights for:" = "Права доступу користувача до:"; "Any Authenticated User" = "Будь-який авторизований користувач"; diff --git a/UI/MailPartViewers/Ukrainian.lproj/Localizable.strings b/UI/MailPartViewers/Ukrainian.lproj/Localizable.strings index 924f91afc..eca071ba8 100644 --- a/UI/MailPartViewers/Ukrainian.lproj/Localizable.strings +++ b/UI/MailPartViewers/Ukrainian.lproj/Localizable.strings @@ -7,7 +7,7 @@ DELEGATED = "делеговано"; TENTATIVE = "попереднє погодження"; organized_by_you = "організоване Вами"; you_are_an_attendee = "за Вашої участі"; -add_info_text = "iMIP 'ADD' requests are not yet supported by SOGo."; +add_info_text = "запити iMIP 'ADD' ще не підтримуються у SOGo."; publish_info_text = "Відправник повідомляє про вкладену подію."; cancel_info_text = "Ваше запрошення або всі заходи скасовано."; request_info_no_attendee = "пропонує учасникам зустрітись. Ви отримали це повідомлення як запрошена особа. Ви ще не долучені до списку підтверджених учасників."; @@ -26,7 +26,7 @@ Tentative = "попередьно погодитись"; "Delegate ..." = "Делегуват ..."; "Delegated to" = "Делегувати"; "Update status in calendar" = "Поновити статус в календарі"; -"delegated from" = "delegated from"; +"delegated from" = "делеговано від"; reply_info_no_attendee = "Ви отримали відповідь на запланований захід, але відправник повідомлення відсутній серед запрошених."; reply_info = "Це відповідь на Ваше запрошення взяти участь у заході."; diff --git a/UI/MailerUI/Ukrainian.lproj/Localizable.strings b/UI/MailerUI/Ukrainian.lproj/Localizable.strings index 856b3d318..a1df09193 100644 --- a/UI/MailerUI/Ukrainian.lproj/Localizable.strings +++ b/UI/MailerUI/Ukrainian.lproj/Localizable.strings @@ -19,6 +19,7 @@ "Attach" = "Вкладення"; "Save" = "Зберегти"; "Options" = "Налаштування"; +"Close" = "Закрити"; "Size" = "Розмір"; /* Tooltips */ @@ -112,7 +113,9 @@ "Return Receipt" = "Сповіщення про доставку"; "The sender of this message has asked to be notified when you read this message. Do you with to notify the sender?" = "Відправник цього листа попросив сповістити, як ви переглянете лист. Чи ви бажаєте повідомити?"; "Return Receipt (displayed) - %@"= "Повідомлення про отримання (показано) - %@"; -"This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents." = "Це зворотнє повідомлення підтверджує, що ви надіслали лист%@.\n\nУвага: Це зворотнє повідомлення лише підтверджує, що лист було відкрито на комп’ютері отримувача. Це не означає, що отримувач прочитав або зрозумів його зміст."; +"This is a Return Receipt for the mail that you sent to %@.\n\nNote: This Return Receipt only acknowledges that the message was displayed on the recipient's computer. There is no guarantee that the recipient has read or understood the message contents." = "Це зворотнє повідомлення підтверджує, що ви надіслали лист%@. + +Увага: Це зворотнє повідомлення лише підтверджує, що лист було відкрито на комп’ютері отримувача. Це не означає, що отримувач прочитав або зрозумів його зміст."; "Priority" = "Важливість"; "highest" = "Найвища"; @@ -123,6 +126,9 @@ "This mail is being sent from an unsecure network!" = "Це повідомлення надсилається з небезпечної мережі!"; +"Address Book:" = "Адресна книга:"; +"Search For:" = "Шукати:"; + /* Popup "show" */ "all" = "всі"; @@ -278,7 +284,7 @@ /* Message operations */ "The messages could not be moved to the trash folder. Would you like to delete them immediately?" -= "The messages could not be moved to the trash folder. Would you like to delete them immediately?"; += "Неможливо перемістити повідомлення до кошику. "; /* Message editing */ "error_validationfailed" = "Перевірка зазнала невдачі"; diff --git a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings index c47618d1b..430d36177 100644 --- a/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Ukrainian.lproj/Localizable.strings @@ -17,9 +17,6 @@ "Add" = "Додати"; "Delete" = "Вилучити"; -/* "Cancel" = "Скасувати"; */ -/* "OK" = "Добре"; */ - /* contacts categories */ "contacts_category_labels" = "Робота, Конкуренти, Клієнти, Друзі, Родина, Партнери, Постачальники, Преса, ВІП"; @@ -30,8 +27,11 @@ "Add default email addresses" = "Додати адреси за замовчанням"; "Days between responses :" = "Днів між відповідями :"; "Do not send responses to mailing lists" = "Не надсилати автоматичні відповіді на адреси розсилок"; +"Disable auto reply on" = "Вимкнути автоматичну відповідь"; "Please specify your message and your email addresses for which you want to enable auto reply." = "Будь ласка, зазначте Ваше повідомлення та Ваші елекронні адреси, для яких потрібно увімкнути автоматичну відповідь."; +"End date of your auto reply must be in the future." += "Кінцева дата автоматичної відповіді має бути у майбутньому."; /* forward messages */ "Forward incoming messages" = "Перенаправляти вхідні повідомлення"; @@ -85,6 +85,7 @@ "Day start time :" = "Робочий день починається о :"; "Day end time :" = "Робочий день закінчується о :"; "Day start time must be prior to day end time." = "Початок дня має бути ранішим за кінець дня."; +"Show time as busy outside working hours" = "Показувати час зайнятим якщо поза межами робочих годин"; "First week of year :" = "Перший тиждень року :"; "Enable reminders for Calendar items" = "Увімкнути нагадування подій календаря"; "Play a sound when a reminder comes due" @@ -95,6 +96,12 @@ "firstWeekOfYear_First4DayWeek" = "Перший чотириденний тиждень"; "firstWeekOfYear_FirstFullWeek" = "Перший повний тиждень"; +/* Default Calendar */ +"Default calendar :" = "Типовий календар"; +"selectedCalendar" = "Вибраний календар"; +"personalCalendar" = "Особистий календар"; +"firstCalendar" = "Перший активний календар"; + "reminderTime_0000" = "0 хвилин"; "reminderTime_0005" = "5 хвилин"; "reminderTime_0010" = "10 хвилин"; @@ -110,6 +117,7 @@ /* Mailer */ "Show subscribed mailboxes only" = "Показувати лише поштові скриньки, на які я підписаний"; +"Sort messages by threads" = "Сортувати повідомлення за гілками"; "Check for new mail:" = "Перевіряти нову пошту:"; "messagecheck_manually" = "Вручну"; "messagecheck_every_minute" = "Щохвилини"; @@ -170,8 +178,9 @@ "Language :" = "Мова :"; "choose" = "Choose ..."; +"Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; @@ -200,6 +209,18 @@ "Always send" = "Завжди відправляти"; "Ask me" = "Спитати"; +/* Return receipts */ +"When I receive a request for a return receipt:" = "Коли я отримую запит на сповіщення про прочитання:"; +"Never send a return receipt" = "Ніколи не відправляти сповіщення"; +"Allow return receipts for some messages" = "Дозволити надсилати сповіщення для окремих повідомлень"; +"If I'm not in the To or Cc of the message:" = "Якщо я не серед адресатів та у копії листа:"; +"If the sender is outside my domain:" = "Якщо відправник не з мого домену:"; +"In all other cases:" = "У всіх інших випадках:"; + +"Never send" = "Ніколи не відправляти"; +"Always send" = "Завжди відправляти"; +"Ask me" = "Спитати"; + /* Filters - UIxPreferences */ "Filters" = "Фільтри"; "Active" = "Увімкнено"; @@ -253,5 +274,17 @@ "Label 4" = "Позначка 4"; "Label 5" = "Позначка 5"; -"Encryption:" = "Безпека з’єднання:"; -"None" = "жодної"; +"Password must not be empty." = "Пароль не має бути порожнім"; +"The passwords do not match. Please try again." = "Паролі не співпадають. Спробуйте ще раз."; +"Password change failed" = "Помилка під час зміни пароля."; +"Password change failed - Permission denied" = "Помилка під час зміни пароля: доступ заборонено."; +"Password change failed - Insufficient password quality" = "Помилка під час зміни пароля: недостатня стійкість пароля"; +"Password change failed - Password is too short" = "Помилка під час зміни пароля: пароль замалий"; +"Password change failed - Password is too young" = "Помилка під час зміни пароля: такий пароль нещодавно вже встановлювався"; +"Password change failed - Password is in history" = "Помилка під час зміни пароля: такий пароль вже встановлювався"; +"Unhandled policy error: %{0}" = "Невідома помилка політик: %{0}"; +"Unhandled error response" = "Невідома помилка"; +"Password change is not supported." = "Зміна паролю не підтримується."; +"Unhandled HTTP error code: %{0}" = "Невідомий код помилки HTTP: %{0}"; +"New password:" = "Новий пароль:"; +"Confirmation:" = "Повтор нового пароля:"; \ No newline at end of file diff --git a/UI/Scheduler/Ukrainian.lproj/Localizable.strings b/UI/Scheduler/Ukrainian.lproj/Localizable.strings index 070303f33..7f586380e 100644 --- a/UI/Scheduler/Ukrainian.lproj/Localizable.strings +++ b/UI/Scheduler/Ukrainian.lproj/Localizable.strings @@ -58,9 +58,8 @@ "Previous Week" = "Один тиждень назад"; "Next Week" = "Один тиждень вперед"; -/* Month */ -"this month" = "this month"; +/* Month */ "this month" = "цей місяць"; @@ -114,7 +113,6 @@ "Publish Calendar..." = "Опублікувати календар..."; "Reload Remote Calendars" = "Перевантажити віддалені календарі"; "Properties" = "Властивості"; - "Done" = "Зроблено"; "An error occured while importing calendar." = "Виникла помилка під час імпорту календаря."; "No event was imported." = "Жодну подію не було імпортовано."; @@ -133,9 +131,11 @@ /* acls */ -"Default Roles" = "Ролі за замовчанням"; "User rights for:" = "Права користувача для:"; +"Any Authenticated User" = "Будь-який авторизований користувач"; +"Public Access" = "Публічний доступ"; + "label_Public" = "Публічна подія"; "label_Private" = "Особиста подія"; "label_Confidential" = "Показувати лише час та дату"; @@ -146,6 +146,12 @@ "label_Responder" = "Відповісти на"; "label_None" = "Нічого"; +"View All" = "Дивитись все"; +"View the Date & Time" = "Дивитись дату та час"; +"Modify" = "Змінити"; +"Respond To" = "Відповісти"; +"None" = "Жодне"; + "This person can create objects in my calendar." = "Цей учасник може додавати записи до мого календаря."; "This person can erase objects from my calendar." @@ -173,6 +179,7 @@ "show_rejected_apts" = "Показати відхилені зустрічі"; "hide_rejected_apts" = "Сховати відхилені зустрічі"; + /* Schedule */ "Schedule" = "Розклад"; @@ -187,6 +194,7 @@ "Hide already accepted and rejected appointments" = "Приховати учасників, які погодились або відмовились."; "Show already accepted and rejected appointments" = "Показати учасників, які погодились або відмовились."; + /* Appointments */ "Appointment viewer" = "Перегляд зустрічі"; @@ -229,11 +237,9 @@ /* checkbox title */ "is private" = "особисте"; - /* classification */ "Public" = "Загальна"; "Private" = "Особиста"; - /* text used in overviews and tooltips */ "empty title" = "Порожній заголовок"; "private appointment" = "Особисте запрошення"; @@ -344,7 +350,7 @@ "Every" = "Кожні"; "Days" = "День(дні)"; "Week(s)" = "Тиждень(ні)"; -"On" = ""; +"On" = "Увімкнено"; "Month(s)" = "Місяць(і)"; "The" = "The"; "Recur on day(s)" = "Повторювати по днях"; @@ -453,8 +459,11 @@ validate_endbeforestart = "Дата закінчення передує да "Workweek days only" = "Лише робочі дні"; "Tasks in View" = "Перегляд завдань"; -"eventDeleteConfirmation" = "Ці події буде вилучено: \n%{0}\nПродовжити?"; -"taskDeleteConfirmation" = "Завдання буде вилучено назавжди.\nПродовжити?"; +"eventDeleteConfirmation" = "Ці події буде вилучено: +%{0} +Продовжити?"; +"taskDeleteConfirmation" = "Завдання буде вилучено назавжди. +Продовжити?"; "You cannot remove nor unsubscribe from your personal calendar." = "Ви не можете вилучити персональнтй календар,а також відписатись від нього."; @@ -464,8 +473,8 @@ validate_endbeforestart = "Дата закінчення передує да /* Legend */ "Participant" = "Учасник"; "Optional Participant" = "Необов’язковий учасник"; -"Chair" = "Ведучий"; "Non Participant" = "Не є учасником"; +"Chair" = "Ведучий"; "Needs action" = "Вимагає дії"; "Accepted" = "Прийнято"; @@ -489,6 +498,9 @@ validate_endbeforestart = "Дата закінчення передує да "Between" = "між"; "and" = "та"; +"A time conflict exists with one or more attendees.\nWould you like to keep the current settings anyway?" += "Неузгоджений час з одним з учасників. +Ігнорувати та зберегти поточні налаштування?"; /* apt list */ "Title" = "Назва"; @@ -518,6 +530,8 @@ vtodo_class2 = "(Конфіденційне завдання)"; "Name:" = "Назва:"; "Color:" = "Колір:"; +"Include in free-busy" = "Вставити до free-busy"; + "Synchronization" = "Синхронізація"; "Synchronize" = "Синхронізувати"; "Tag:" = "Теґ:"; @@ -526,6 +540,12 @@ vtodo_class2 = "(Конфіденційне завдання)"; "Show alarms" = "Сповіщення"; "Show tasks" = "Завдання"; +"Links to this Calendar" = "Посилання на цей Календар"; +"Authenticated User Access" = "Доступ для авторизованих користувачів"; +"CalDAV URL" = "CalDAV URL"; +"WebDAV ICS URL" = "WebDAV ICS URL"; +"WebDAV XML URL" = "WebDAV XML URL"; + /* Error messages */ "dayFieldInvalid" = "Будь ласка, зазначте числове значення в полі дні, що більше або рівно 1."; "weekFieldInvalid" = "Будь ласка, зазначте числове значення в полі тиждень(і), що більше або рівно 1."; @@ -534,11 +554,15 @@ vtodo_class2 = "(Конфіденційне завдання)"; "yearFieldInvalid" = "Будь ласка, зазначте числове значення в полі рік, що більше або рівно 1."; "appointmentFieldInvalid" = "Будь ласка, зазначте числове значення в полі запрошення, що більше або рівно 1."; "recurrenceUnsupported" = "Цей тип повторення наразі не підтримується."; +"Please specify a calendar name." = "Будь ласка, зазначте назву календаря."; "tagNotDefined" = "Вам потрібно зазначити теґ, щоб синхронізувати цей календар."; "tagAlreadyExists" = "Зазначений теґ вже співставлено з іншим календарем."; -"tagHasChanged" = "Якщо Ви змінете теґ вашого календаря, то потрібно буде перевантажити дані на Вашому мобільному пристрої.\nПродовжити?"; -"tagWasAdded" = "Якшр Ви хочете синхронізувати цей календар, то потрібно буде перевантажити дані на Вашому мобільному пристрої.\nПродовжити?"; -"tagWasRemoved" = "Якщо Ви скасуєте режим синхронізації для цього календаря, то потрібно буде перевантажити дані на Вашому мобільному пристрої.\nПродовжити?"; +"tagHasChanged" = "Якщо Ви змінете теґ вашого календаря, то потрібно буде перевантажити дані на Вашому мобільному пристрої. +Продовжити?"; +"tagWasAdded" = "Якшр Ви хочете синхронізувати цей календар, то потрібно буде перевантажити дані на Вашому мобільному пристрої. +Продовжити?"; +"tagWasRemoved" = "Якщо Ви скасуєте режим синхронізації для цього календаря, то потрібно буде перевантажити дані на Вашому мобільному пристрої. +Продовжити?"; "DestinationCalendarError" = "Календарі співпадають. Спробуйте скопіювати до іншого календаря."; "EventCopyError" = "Помилка під час копіювання. Спробуйте скопіювати до іншого календаря."; @@ -546,6 +570,7 @@ vtodo_class2 = "(Конфіденційне завдання)"; "Mark Completed" = "Позначити виконаним"; "Delete Task" = "Вилучити завдання"; "Delete Event" = "Вилучити подію"; +"Copy event to my calendar" = "Копіювати подію до мого календаря"; "Subscribe to a web calendar..." = "Підписатись на веб-календар..."; "URL of the Calendar" = "URL календаря"; From 1d1af6bc04584ec1bd2ebca3b1c4f6d71aecc568 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 19 Dec 2011 19:03:45 +0000 Subject: [PATCH 04/12] Renamed "DanishDenmark" to "Danish" -- cont'd. Monotone-Parent: f8a9127ce4567079d226dd65ec439833020d0432 Monotone-Revision: f05a28854fca7f10afb958ecb7b60275cafd475b Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-19T19:03:45 --- UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Catalan.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Czech.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Danish.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Dutch.lproj/Localizable.strings | 2 +- UI/PreferencesUI/English.lproj/Localizable.strings | 2 +- UI/PreferencesUI/French.lproj/Localizable.strings | 2 +- UI/PreferencesUI/German.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Hungarian.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Icelandic.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Italian.lproj/Localizable.strings | 2 +- UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings | 2 +- UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Polish.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Russian.lproj/Localizable.strings | 2 +- UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings | 2 +- UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Swedish.lproj/Localizable.strings | 2 +- UI/PreferencesUI/Welsh.lproj/Localizable.strings | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings index d095dea3f..105fd0379 100644 --- a/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings +++ b/UI/PreferencesUI/BrazilianPortuguese.lproj/Localizable.strings @@ -176,7 +176,7 @@ "choose" = "Escolha ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Catalan.lproj/Localizable.strings b/UI/PreferencesUI/Catalan.lproj/Localizable.strings index 91bca3a86..6536accca 100644 --- a/UI/PreferencesUI/Catalan.lproj/Localizable.strings +++ b/UI/PreferencesUI/Catalan.lproj/Localizable.strings @@ -171,7 +171,7 @@ "choose" = "Choose ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Czech.lproj/Localizable.strings b/UI/PreferencesUI/Czech.lproj/Localizable.strings index 4fb00df84..06f30fbe3 100644 --- a/UI/PreferencesUI/Czech.lproj/Localizable.strings +++ b/UI/PreferencesUI/Czech.lproj/Localizable.strings @@ -171,7 +171,7 @@ "choose" = "Vybrat ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Danish.lproj/Localizable.strings b/UI/PreferencesUI/Danish.lproj/Localizable.strings index 6da92ee8b..cc5198d72 100644 --- a/UI/PreferencesUI/Danish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Danish.lproj/Localizable.strings @@ -180,7 +180,7 @@ "choose" = "Vælg ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Dutch.lproj/Localizable.strings b/UI/PreferencesUI/Dutch.lproj/Localizable.strings index 88a56aa2f..4dba5ca3e 100644 --- a/UI/PreferencesUI/Dutch.lproj/Localizable.strings +++ b/UI/PreferencesUI/Dutch.lproj/Localizable.strings @@ -169,7 +169,7 @@ "choose" = "Kies..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index b6bb8ba55..47ab60c26 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -187,7 +187,7 @@ "choose" = "Choose ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/French.lproj/Localizable.strings b/UI/PreferencesUI/French.lproj/Localizable.strings index f0c026d57..55b7d0a5d 100644 --- a/UI/PreferencesUI/French.lproj/Localizable.strings +++ b/UI/PreferencesUI/French.lproj/Localizable.strings @@ -180,7 +180,7 @@ "choose" = "Choisir ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/German.lproj/Localizable.strings b/UI/PreferencesUI/German.lproj/Localizable.strings index 884981266..fbdab8875 100644 --- a/UI/PreferencesUI/German.lproj/Localizable.strings +++ b/UI/PreferencesUI/German.lproj/Localizable.strings @@ -179,7 +179,7 @@ "choose" = "Auswählen"; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings index ceacfa1a6..33c54b294 100644 --- a/UI/PreferencesUI/Hungarian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Hungarian.lproj/Localizable.strings @@ -176,7 +176,7 @@ "choose" = "Válasszon ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings index a793f61c7..8a4c31f15 100644 --- a/UI/PreferencesUI/Icelandic.lproj/Localizable.strings +++ b/UI/PreferencesUI/Icelandic.lproj/Localizable.strings @@ -169,7 +169,7 @@ "choose" = "Velja..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Italian.lproj/Localizable.strings b/UI/PreferencesUI/Italian.lproj/Localizable.strings index c490253b4..7d289c8c3 100644 --- a/UI/PreferencesUI/Italian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Italian.lproj/Localizable.strings @@ -159,7 +159,7 @@ "choose" = "Scegli..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings index 99a64af28..27d7fae06 100644 --- a/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings +++ b/UI/PreferencesUI/NorwegianBokmal.lproj/Localizable.strings @@ -176,7 +176,7 @@ "choose" = "Velg ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings index edc6e1177..987ee2cf6 100644 --- a/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings +++ b/UI/PreferencesUI/NorwegianNynorsk.lproj/Localizable.strings @@ -176,7 +176,7 @@ "choose" = "Velg ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Polish.lproj/Localizable.strings b/UI/PreferencesUI/Polish.lproj/Localizable.strings index 00ae4af77..3633e9e2a 100644 --- a/UI/PreferencesUI/Polish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Polish.lproj/Localizable.strings @@ -159,7 +159,7 @@ "choose" = "Wybierz ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Russian.lproj/Localizable.strings b/UI/PreferencesUI/Russian.lproj/Localizable.strings index 04eef5e98..c73630948 100644 --- a/UI/PreferencesUI/Russian.lproj/Localizable.strings +++ b/UI/PreferencesUI/Russian.lproj/Localizable.strings @@ -185,7 +185,7 @@ "choose" = "Выбрать ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings index 4378d8917..408d37484 100644 --- a/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings +++ b/UI/PreferencesUI/SpanishArgentina.lproj/Localizable.strings @@ -182,7 +182,7 @@ "choose" = "Elija ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings index 8e624f85d..34b81d435 100644 --- a/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings +++ b/UI/PreferencesUI/SpanishSpain.lproj/Localizable.strings @@ -182,7 +182,7 @@ "choose" = "Elija ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Swedish.lproj/Localizable.strings b/UI/PreferencesUI/Swedish.lproj/Localizable.strings index 00d90c12f..38c3ccea3 100644 --- a/UI/PreferencesUI/Swedish.lproj/Localizable.strings +++ b/UI/PreferencesUI/Swedish.lproj/Localizable.strings @@ -178,7 +178,7 @@ Servernamn:"; "choose" = "Välj ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; diff --git a/UI/PreferencesUI/Welsh.lproj/Localizable.strings b/UI/PreferencesUI/Welsh.lproj/Localizable.strings index 7e8026e50..c368cc708 100644 --- a/UI/PreferencesUI/Welsh.lproj/Localizable.strings +++ b/UI/PreferencesUI/Welsh.lproj/Localizable.strings @@ -176,7 +176,7 @@ "choose" = "Dewis ..."; "Catalan" = "Català"; "Czech" = "Česky"; -"DanishDenmark" = "Dansk (Danmark)"; +"Danish" = "Dansk (Danmark)"; "Dutch" = "Nederlands"; "English" = "English"; "French" = "Français"; From 7cac0b9d5c8fa62cbd418591a6061018ec584805 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Mon, 19 Dec 2011 20:22:57 +0000 Subject: [PATCH 05/12] Mail editor : show scrollbar in contacts pane when necessary. Monotone-Parent: f05a28854fca7f10afb958ecb7b60275cafd475b Monotone-Revision: 299e375e68f6404ffcb338c6e279d3da6123b87d Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-19T20:22:57 --- UI/WebServerResources/UIxMailEditor.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css index 49ee656ee..f6345dc2a 100644 --- a/UI/WebServerResources/UIxMailEditor.css +++ b/UI/WebServerResources/UIxMailEditor.css @@ -222,10 +222,11 @@ DIV#contactsListContent top: 9em; left: 0px; right: 0px; - bottom: 0px; + bottom: 110px; margin: 0; border-right: 1px solid #fff; - background-color: #fff; } + background-color: #fff; + overflow-y: auto; } TABLE#contactsList { width: 100%; } From c99642e256a0587fec539c85da158a06c7a9a8d4 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 22 Dec 2011 14:44:50 +0000 Subject: [PATCH 06/12] Increased minimum space above horizontal drag handle bar. Monotone-Parent: 299e375e68f6404ffcb338c6e279d3da6123b87d Monotone-Revision: c7ba56b63e2f4ecf7da169cccef30b4c8ebeb0ad Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-22T14:44:50 --- UI/WebServerResources/SOGoDragHandles.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/WebServerResources/SOGoDragHandles.js b/UI/WebServerResources/SOGoDragHandles.js index b7f789402..b0b9ebb96 100644 --- a/UI/WebServerResources/SOGoDragHandles.js +++ b/UI/WebServerResources/SOGoDragHandles.js @@ -2,7 +2,7 @@ var SOGoDragHandlesInterface = { leftMargin: 180, - topMargin: 160, + topMargin: 180, dhType: null, dhLimit: -1, origX: -1, From 5d5691229a14e8d2843c41331f213a105d3c99ba Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Thu, 22 Dec 2011 18:02:59 +0000 Subject: [PATCH 07/12] See ChangeLog. Monotone-Parent: c7ba56b63e2f4ecf7da169cccef30b4c8ebeb0ad Monotone-Revision: e4a697198e9d44e460b6a4c27b94149145803430 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-22T18:02:59 --- ChangeLog | 8 ++++++++ NEWS | 11 +++++++++++ SoObjects/SOGo/SOGoDefaults.plist | 2 +- SoObjects/SOGo/WOResourceManager+SOGo.m | 2 ++ UI/Scheduler/UIxTaskEditor.m | 8 ++++---- UI/WebServerResources/UIxTaskEditor.js | 4 ++-- 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8dc03aba..429a2362b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-12-22 Francis Lachapelle + + * UI/Scheduler/UIxTaskEditor.m (-takeValuesFromRequest:inContext:): remove alarms + when no start date is defined. + + * UI/WebServerResources/UIxTaskEditor.js (onTimeControlCheck): + disable the reminder popup menu when no start date is defined. + 2011-12-15 Ludovic Marcotte * SoObjects/SOGo/SOGoSieveManager.m - slightly reworked diff --git a/NEWS b/NEWS index 665af3526..27e17967a 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +1.3-YYYYMMDD (1.3.12) +--------------------- +New Features + - + +Enhancements + - updated Ukrainian translation + +Bug Fixes + - alarms for tasks now depend on the start date and instead of the due date + 1.3-20111212 (1.3.11) --------------------- New Features diff --git a/SoObjects/SOGo/SOGoDefaults.plist b/SoObjects/SOGo/SOGoDefaults.plist index e56b05cf3..296024c62 100644 --- a/SoObjects/SOGo/SOGoDefaults.plist +++ b/SoObjects/SOGo/SOGoDefaults.plist @@ -37,7 +37,7 @@ "SpanishSpain", "SpanishArgentina", "French", "German", "Icelandic", "Italian", "Hungarian", "BrazilianPortuguese", "NorwegianBokmal", "NorwegianNynorsk", "Polish", "Russian", - "Ukrainian", "Swedish"); + "Ukrainian", "Swedish" ); SOGoTimeZone = "UTC"; SOGoDayStartTime = "8"; diff --git a/SoObjects/SOGo/WOResourceManager+SOGo.m b/SoObjects/SOGo/WOResourceManager+SOGo.m index 79a112785..37c2bc665 100644 --- a/SoObjects/SOGo/WOResourceManager+SOGo.m +++ b/SoObjects/SOGo/WOResourceManager+SOGo.m @@ -34,6 +34,8 @@ static Class MainProduct = Nil; NSString *lpath; +#warning TODO: create method "languagesBeginingWith:" + lpath = [self pathForResourceNamed: @"Locale" inFramework: nil languages: [NSArray arrayWithObject:_name]]; diff --git a/UI/Scheduler/UIxTaskEditor.m b/UI/Scheduler/UIxTaskEditor.m index 8d07b7d3f..426e4ee1b 100644 --- a/UI/Scheduler/UIxTaskEditor.m +++ b/UI/Scheduler/UIxTaskEditor.m @@ -511,15 +511,15 @@ if (hasStartDate) [todo setStartDate: taskStartDate]; else - [todo setStartDate: nil]; + { + [todo setStartDate: nil]; + [todo removeAllAlarms]; + } if (hasDueDate) [todo setDue: taskDueDate]; else - { [todo setDue: nil]; - [todo removeAllAlarms]; - } if ([status isEqualToString: @"COMPLETED"]) [todo setCompleted: statusDate]; diff --git a/UI/WebServerResources/UIxTaskEditor.js b/UI/WebServerResources/UIxTaskEditor.js index 3c7d8b36a..84eab59bb 100644 --- a/UI/WebServerResources/UIxTaskEditor.js +++ b/UI/WebServerResources/UIxTaskEditor.js @@ -178,7 +178,7 @@ function onTimeControlCheck(checkBox) { for (var i = 0; i < selects.length; i++) if (selects[i] != checkBox) selects[i].disabled = !checkBox.checked; - if (checkBox.id == "dueDateCB") + if (checkBox.id == "startDateCB") $("reminderList").disabled = !checkBox.checked; } } @@ -323,7 +323,7 @@ function onTaskEditorLoad() { } // Enable or disable the reminder list - onTimeControlCheck($("dueDateCB")); + onTimeControlCheck($("startDateCB")); initializeStatusLine(); } From 1f38df80e1b6657498ee4cae38d4c0a0a587d0c4 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 23 Dec 2011 16:10:38 +0000 Subject: [PATCH 08/12] See ChangeLog. Monotone-Parent: e4a697198e9d44e460b6a4c27b94149145803430 Monotone-Revision: 1f603d18ef908652156b3dbae521f53c6527c63c Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-23T16:10:38 --- ChangeLog | 5 +++++ Tools/SOGoToolUserPreferences.m | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 429a2362b..06348ca15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-12-23 Francis Lachapelle + + * Tools/SOGoToolUserPreferences.m (-run): fixed possible out of + bound exception when parsing arguments. + 2011-12-22 Francis Lachapelle * UI/Scheduler/UIxTaskEditor.m (-takeValuesFromRequest:inContext:): remove alarms diff --git a/Tools/SOGoToolUserPreferences.m b/Tools/SOGoToolUserPreferences.m index 6a2e1db88..6aaf3867a 100644 --- a/Tools/SOGoToolUserPreferences.m +++ b/Tools/SOGoToolUserPreferences.m @@ -192,10 +192,10 @@ typedef enum } key = [arguments objectAtIndex: i++]; - value = [arguments objectAtIndex: i++]; if (max > i) { + value = [arguments objectAtIndex: i++]; if ([value caseInsensitiveCompare: @"-f"] == NSOrderedSame) { if (max > i) From c37208db81b5ca71645e0e38fde7bd4ae51278cb Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 23 Dec 2011 16:12:14 +0000 Subject: [PATCH 09/12] See ChangeLog. Monotone-Parent: 1f603d18ef908652156b3dbae521f53c6527c63c Monotone-Revision: 13364682a0f8ae52e3545893494b2a7ec0a88529 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-23T16:12:14 --- ChangeLog | 3 +++ UI/PreferencesUI/UIxPreferences.m | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 06348ca15..130f76ba7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-12-23 Francis Lachapelle + * UI/PreferencesUI/UIxPreferences.m (-vacationEndDate): return + current date when no end date is defined. + * Tools/SOGoToolUserPreferences.m (-run): fixed possible out of bound exception when parsing arguments. diff --git a/UI/PreferencesUI/UIxPreferences.m b/UI/PreferencesUI/UIxPreferences.m index c68246962..91ad95ca4 100644 --- a/UI/PreferencesUI/UIxPreferences.m +++ b/UI/PreferencesUI/UIxPreferences.m @@ -914,7 +914,10 @@ time = [[vacationOptions objectForKey: @"endDate"] intValue]; - return [NSCalendarDate dateWithTimeIntervalSince1970: time]; + if (time > 0) + return [NSCalendarDate dateWithTimeIntervalSince1970: time]; + else + return [NSCalendarDate calendarDate]; } /* mail forward */ From 49c5a107db867239d43a6acb0b8f00e0ea2ef113 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 23 Dec 2011 16:18:10 +0000 Subject: [PATCH 10/12] Monotone-Parent: 13364682a0f8ae52e3545893494b2a7ec0a88529 Monotone-Revision: 8eceeb42b5cb1a0094d0a14d7ddb5f819096dce4 Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-23T16:18:10 --- UI/Templates/ContactsUI/UIxContactsUserFolders.wox | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox index 5b34b2f37..139bcd420 100644 --- a/UI/Templates/ContactsUI/UIxContactsUserFolders.wox +++ b/UI/Templates/ContactsUI/UIxContactsUserFolders.wox @@ -16,7 +16,7 @@
From 6371bc29474c812ed3f6a4938b7dff2d0aa95222 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Fri, 23 Dec 2011 19:55:05 +0000 Subject: [PATCH 11/12] See ChangeLog. Monotone-Parent: 8eceeb42b5cb1a0094d0a14d7ddb5f819096dce4 Monotone-Revision: 00dcc1dc8b8b274e7cf85d53a4fa495b97e1c52c Monotone-Author: flachapelle@inverse.ca Monotone-Date: 2011-12-23T19:55:05 --- ChangeLog | 3 +++ NEWS | 2 +- UI/Templates/SchedulerUI/UIxCalMainView.wox | 2 +- UI/WebServerResources/SchedulerUI.js | 9 +++++---- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 130f76ba7..c554ed6d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-12-23 Francis Lachapelle + * UI/Scheduler/UIxAppointmentEditor.m (-viewAction): the end + date/time is now also returned. + * UI/PreferencesUI/UIxPreferences.m (-vacationEndDate): return current date when no end date is defined. diff --git a/NEWS b/NEWS index 27e17967a..a2b419631 100644 --- a/NEWS +++ b/NEWS @@ -1,7 +1,7 @@ 1.3-YYYYMMDD (1.3.12) --------------------- New Features - - + - show end time in bubble box of events Enhancements - updated Ukrainian translation diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox index 6cb0de48a..4dc0fe4f1 100644 --- a/UI/Templates/SchedulerUI/UIxCalMainView.wox +++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox @@ -96,8 +96,8 @@

-

+

diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 63381b8b6..44afeee19 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -733,15 +733,15 @@ function onViewEventCallback(http) { para.hide(); para = $(paras[1]); - if (parseInt(data["isAllDay"]) == 0) { - para.down("SPAN", 1).update(data["startTime"]); + if (data["location"].length) { + para.down("SPAN", 1).update(data["location"]); para.show(); } else para.hide(); para = $(paras[2]); - if (data["location"].length) { - para.down("SPAN", 1).update(data["location"]); + if (parseInt(data["isAllDay"]) == 0) { + para.down("SPAN").update(data["startTime"] + " - " + data["endTime"]); para.show(); } else para.hide(); @@ -2774,6 +2774,7 @@ function onCalendarRemove(event) { } else { var folderUrl = ApplicationBaseURL + folderId; + nodes[i].deselect(); unsubscribeFromFolder(folderUrl, owner, onFolderUnsubscribeCB, folderId); } From 5799804274c178c846f50c2aa8f405feeac26ec3 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 29 Dec 2011 12:24:43 +0000 Subject: [PATCH 12/12] See ChangeLog Monotone-Parent: 00dcc1dc8b8b274e7cf85d53a4fa495b97e1c52c Monotone-Revision: a4f6c377a41454eb21ed5b253cb7d07fc2c1a55e Monotone-Author: ludovic@Sophos.ca Monotone-Date: 2011-12-29T12:24:43 --- ChangeLog | 6 ++++++ SoObjects/SOGo/SOGoSQLUserProfile.m | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c554ed6d9..9cec3647b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-12-29 Ludovic Marcotte + + * SoObjects/SOGo/SOGoSQLUserProfile.m (_sqlJsonRepresentation:): + don't escape the / character as it's generating invalid JSON + output on newer versions of PostgreSQL. + 2011-12-23 Francis Lachapelle * UI/Scheduler/UIxAppointmentEditor.m (-viewAction): the end diff --git a/SoObjects/SOGo/SOGoSQLUserProfile.m b/SoObjects/SOGo/SOGoSQLUserProfile.m index fe51966fd..4f571d92c 100644 --- a/SoObjects/SOGo/SOGoSQLUserProfile.m +++ b/SoObjects/SOGo/SOGoSQLUserProfile.m @@ -145,7 +145,6 @@ static NSString *uidColumnName = @"c_uid"; sql = [jsonRepresentation mutableCopy]; [sql autorelease]; - [sql replaceString: @"\\" withString: @"\\\\"]; [sql replaceString: @"'" withString: @"''"]; return sql;