From deb10f1f7efc8317d4da7aaad346087997629722 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 27 Feb 2019 09:51:43 -0500 Subject: [PATCH] (i18n) Add missing localized strings Fixes #4658 --- UI/AdministrationUI/English.lproj/Localizable.strings | 1 + UI/Common/English.lproj/Localizable.strings | 9 +++++++++ UI/MainUI/English.lproj/Localizable.strings | 1 + UI/PreferencesUI/English.lproj/Localizable.strings | 1 + UI/WebServerResources/js/Common/Acl.service.js | 2 +- UI/WebServerResources/js/Common/AclController.js | 2 +- UI/WebServerResources/js/Mailer/Account.service.js | 2 +- UI/WebServerResources/js/Mailer/MailboxesController.js | 2 +- .../js/Preferences/Preferences.service.js | 2 +- UI/WebServerResources/js/Scheduler/Calendar.service.js | 2 +- 10 files changed, 18 insertions(+), 6 deletions(-) diff --git a/UI/AdministrationUI/English.lproj/Localizable.strings b/UI/AdministrationUI/English.lproj/Localizable.strings index 974354349..c7b968e41 100644 --- a/UI/AdministrationUI/English.lproj/Localizable.strings +++ b/UI/AdministrationUI/English.lproj/Localizable.strings @@ -10,6 +10,7 @@ /* Modules descriptions */ "ACLs_description" = "

The Access Control Lists administration module allows to change the ACLs of each user's Calendars and Address books.

To modify the ACLs of a user's folder, type the name of the user in the search field at the top of the window and double-click on the desired folder.

"; "Name or Email" = "Name or Email"; +"ACLs saved" = "ACLs saved"; /* Rights module: initial search message */ "Start a search to edit the rights" = "Start a search to edit the rights"; /* Rights module: Empty search result */ diff --git a/UI/Common/English.lproj/Localizable.strings b/UI/Common/English.lproj/Localizable.strings index e6fd71a91..117952d1b 100644 --- a/UI/Common/English.lproj/Localizable.strings +++ b/UI/Common/English.lproj/Localizable.strings @@ -143,11 +143,20 @@ /* Error message displayed when a file upload exceeds WOMaxUploadSize */ "File size upload limit reached" = "File size upload limit reached"; +/* Generic server error */ +"An error occured, please try again." = "An error occured, please try again."; + +/* Open datepicker */ +"Open Calendar" = "Open Calendar"; + /* Toggle visibility (ex: mail account in left navigation menu) */ "Toggle visibility" = "Toggle visibility"; "Keyboard Shortcuts" = "Keyboard Shortcuts"; +/* Aria label for avatar button to select and unselect an item */ +"Toggle item" = "Toggle item"; + /* Toggle multiple items at the same time (hotkeys cheatsheet) */ "Toggle range of items" = "Toggle range of items"; diff --git a/UI/MainUI/English.lproj/Localizable.strings b/UI/MainUI/English.lproj/Localizable.strings index adf1086b2..8a9483921 100644 --- a/UI/MainUI/English.lproj/Localizable.strings +++ b/UI/MainUI/English.lproj/Localizable.strings @@ -16,6 +16,7 @@ "Authentication Failed" = "Authentication Failed"; "Wrong username or password." = "Wrong username or password."; "Retry" = "Retry"; +"Login failed due to unhandled error case:" = "Login failed due to unhandled error case:"; "cookiesNotEnabled" = "You cannot login because your browser's cookies are disabled. Please enable cookies in your browser's settings and try again."; "browserNotCompatible" = "We've detected that your browser version is currently not supported on this site. Our recommendation is to use Firefox. Click on the link below to download the most current version of this browser."; "alternativeBrowsers" = "Alternatively, you can also use the following compatible browsers"; diff --git a/UI/PreferencesUI/English.lproj/Localizable.strings b/UI/PreferencesUI/English.lproj/Localizable.strings index 0ac9cbccf..f3c2e4ee9 100644 --- a/UI/PreferencesUI/English.lproj/Localizable.strings +++ b/UI/PreferencesUI/English.lproj/Localizable.strings @@ -219,6 +219,7 @@ "When composing a message" = "When composing a message"; "Digitally sign the message by default" = "Digitally sign the message by default"; "Always try to encrypt the message" = "Always try to encrypt the message"; +"An error occurred while importing the certificate. Verify your password." = "An error occurred while importing the certificate. Verify your password."; /* Additional Parameters */ "Additional Parameters" = "Additional Parameters"; diff --git a/UI/WebServerResources/js/Common/Acl.service.js b/UI/WebServerResources/js/Common/Acl.service.js index 219c1503d..2c87f7561 100644 --- a/UI/WebServerResources/js/Common/Acl.service.js +++ b/UI/WebServerResources/js/Common/Acl.service.js @@ -100,7 +100,7 @@ _this.users.push(user); deferred.resolve(user); }, function(data, status) { - deferred.reject(l('An error occured please try again.')); + deferred.reject(l('An error occured, please try again.')); }); } return deferred.promise; diff --git a/UI/WebServerResources/js/Common/AclController.js b/UI/WebServerResources/js/Common/AclController.js index 1eb9ac079..2de1a656f 100644 --- a/UI/WebServerResources/js/Common/AclController.js +++ b/UI/WebServerResources/js/Common/AclController.js @@ -57,7 +57,7 @@ folder.$acl.$saveUsersRights().then(function() { $mdDialog.hide(); }, function(data, status) { - Dialog.alert(l('Warning'), l('An error occured please try again.')); + Dialog.alert(l('Warning'), l('An error occured, please try again.')); }); } diff --git a/UI/WebServerResources/js/Mailer/Account.service.js b/UI/WebServerResources/js/Mailer/Account.service.js index a316e694a..0638aa25a 100644 --- a/UI/WebServerResources/js/Mailer/Account.service.js +++ b/UI/WebServerResources/js/Mailer/Account.service.js @@ -402,7 +402,7 @@ _this.delegates.push(user); deferred.resolve(_this.users); }, function(data, status) { - deferred.reject(l('An error occured please try again.')); + deferred.reject(l('An error occured, please try again.')); }); } return deferred.promise; diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js index 8bd442213..554220a5c 100644 --- a/UI/WebServerResources/js/Mailer/MailboxesController.js +++ b/UI/WebServerResources/js/Mailer/MailboxesController.js @@ -249,7 +249,7 @@ function removeUser(user) { account.$removeDelegate(user.uid).catch(function(data, status) { - Dialog.alert(l('Warning'), l('An error occured please try again.')); + Dialog.alert(l('Warning'), l('An error occured, please try again.')); }); } diff --git a/UI/WebServerResources/js/Preferences/Preferences.service.js b/UI/WebServerResources/js/Preferences/Preferences.service.js index ee608ad68..cb4c9fb8f 100644 --- a/UI/WebServerResources/js/Preferences/Preferences.service.js +++ b/UI/WebServerResources/js/Preferences/Preferences.service.js @@ -140,7 +140,7 @@ _this.$mdDateLocaleProvider.weekNumberFormatter = function(weekNumber) { return l('Week %d', weekNumber); }; - _this.$mdDateLocaleProvider.msgCalendar = l('Calender'); + _this.$mdDateLocaleProvider.msgCalendar = l('Calendar'); _this.$mdDateLocaleProvider.msgOpenCalendar = l('Open Calendar'); _this.$mdDateLocaleProvider.parseDate = function(dateString) { return dateString? dateString.parseDate(_this.$mdDateLocaleProvider, _this.defaults.SOGoShortDateFormat) : new Date(NaN); diff --git a/UI/WebServerResources/js/Scheduler/Calendar.service.js b/UI/WebServerResources/js/Scheduler/Calendar.service.js index 5fef35e96..97982682a 100644 --- a/UI/WebServerResources/js/Scheduler/Calendar.service.js +++ b/UI/WebServerResources/js/Scheduler/Calendar.service.js @@ -536,7 +536,7 @@ }, function(response) { if (response.status == 401) { // Authentication failed - d.reject(l('Wrong username or password')); + d.reject(l('Wrong username or password.')); } else { d.reject(response.statusText);