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