Merged with dev and fixed conflicts

This commit is contained in:
Fmstrat
2022-07-18 09:16:17 -04:00
349 changed files with 17812 additions and 7523 deletions

View File

@ -0,0 +1,6 @@
{
"CONTACT_ADMIN": "Contact the administrator",
"FITTRACKEE_DESCRIPTION": "<strong>FitTrackee</strong> is a self-hosted outdoor activity tracker.",
"FITTRACKEE_LICENSE": "under {0} license ",
"SOURCE_CODE": "Source code"
}

View File

@ -1,23 +1,33 @@
{
"ACTION": "Action",
"ACTIVATE_USER_ACCOUNT": "Activate account",
"ACTIVE": "Active",
"ADMIN_RIGHTS_DELETE_USER_ACCOUNT": "Add/remove admin rights, delete user account.",
"ADMIN": "Admin",
"ADMINISTRATION": "Administration",
"APPLICATION": "Application",
"APP_CONFIG": {
"ADMIN_CONTACT": "Administrator email for contact",
"MAX_USERS_LABEL": "Max. number of active users",
"MAX_USERS_HELP": "If 0, no limitation on registration.",
"MAX_FILES_IN_ZIP_LABEL": "Max. files of zip archive",
"NO_CONTACT_EMAIL": "no contact email",
"SINGLE_UPLOAD_MAX_SIZE_LABEL": "Max. size of uploaded files (in Mb)",
"TITLE": "Application configuration",
"ZIP_UPLOAD_MAX_SIZE_LABEL": "Max. size of zip archive (in Mb)"
},
"BACK_TO_ADMIN": "Back to admin",
"CONFIRM_USER_ACCOUNT_DELETION": "Are you sure you want to delete {0} account? All data will be deleted, this cannot be undone.",
"CONFIRM_USER_PASSWORD_RESET": "Are you sure you want to reset {0} password?",
"CURRENT_EMAIL": "Current email",
"DELETE_USER": "Delete user",
"EMAIL_SENDING_DISABLED": "Email sending is disabled.",
"ENABLE_DISABLE_SPORTS": "Enable/disable sports.",
"NEW_EMAIL": "New email",
"PASSWORD_RESET_SUCCESSFUL": "The password has been reset.",
"REGISTRATION_DISABLED": "Registration is currently disabled.",
"REGISTRATION_ENABLED": "Registration is currently enabled.",
"RESET_USER_PASSWORD": "Reset password",
"SPORTS": {
"TABLE": {
"ACTIVE": "Active",
@ -28,7 +38,9 @@
"TITLE": "Sports administration"
},
"UPDATE_APPLICATION_DESCRIPTION": "Update application configuration (maximum number of registered users, maximum files size).",
"UPDATE_USER_EMAIL": "Update email",
"USER": "user | users",
"USER_EMAIL_UPDATE_SUCCESSFUL": "The email address has been updated.",
"USERS": {
"TABLE": {
"ADD_ADMIN_RIGHTS": "Add admin rights",
@ -38,6 +50,7 @@
"ORDER_BY": {
"ADMIN": "admin status",
"CREATED_AT": "registration date",
"IS_ACTIVE": "account status",
"USERNAME": "username",
"WORKOUTS_COUNT": "workout count"
}

View File

@ -2,6 +2,8 @@
"ERROR": {
"UNKNOWN": "Error. Please try again or contact the administrator.",
"email: valid email must be provided": "Email: valid email must be provided.",
"error during gpx processing": "Error during gpx processing.",
"error during gpx file parsing": "Error during gpx file parsing.",
"error on getting configuration": "Error on getting configuration.",
"error when updating configuration": "Error when updating configuration",
"error, please try again or contact the administrator": "Error, please try again or contact the administrator.",
@ -13,15 +15,17 @@
"invalid token, please log in again": "Invalid token, please log in again.",
"invalid token, please request a new token": "Invalid token, please log in again.",
"Network Error": "Network Error.",
"new email must be different than curent email": "The new email must be different than curent email",
"no file part": "No file provided.",
"no selected file": "No selected file.",
"password: password and password confirmation do not match": "Password: password and password confirmation don't match.",
"provide a valid auth token": "Provide a valid auth token.",
"sorry, that user already exists": "Sorry, that user already exists.",
"sorry, that username is already taken": "Sorry, that username is already taken.",
"sport does not exist": "Sport does not exist.",
"signature expired, please log in again": "Signature expired. Please log in again.",
"successfully registered": "Successfully registered.",
"user does not exist": "User does not exist.",
"valid email must be provided for admin contact": "A valid email must be provided for administrator contact",
"you can not delete your account, no other user has admin rights": "You can not delete your account, no other user has admin rights.",
"you do not have permissions": "You do not have permissions."
},

View File

@ -1,4 +1,5 @@
{
"ACCOUNT-CONFIRMATION-RESEND": "Resend confirmation email",
"BACK": "Back",
"CANCEL": "Cancel",
"CLEAR_FILTER": "Clear filters",

View File

@ -1,6 +1,9 @@
{
"ABOUT": "about",
"CONFIRMATION": "Confirmation",
"CONTACT": "contact",
"DAY": "day | days",
"DOCUMENTATION": "documentation",
"HOME": "Home",
"HERE": "here",
"SELECTS": {

View File

@ -1,3 +1,4 @@
import AboutTranslations from './about.json'
import AdministrationTranslations from './administration.json'
import ApiTranslations from './api.json'
import ButtonsTranslations from './buttons.json'
@ -10,6 +11,7 @@ import UserTranslations from './user.json'
import WorkoutsTranslations from './workouts.json'
export default {
about: AboutTranslations,
admin: AdministrationTranslations,
api: ApiTranslations,
buttons: ButtonsTranslations,

View File

@ -1,8 +1,9 @@
{
"UNKNOWN": "Error. Please try again or contact the administrator.",
"APP_ERROR": "The application seems encounter some issues.<br />Please try later or contact the administrator.",
"APP_ERROR": "The application seems to have encountered some issues.<br />Please try again later or contact the administrator.",
"NOT_FOUND": {
"PAGE": "Page not found",
"WORKOUT": "Workout not found"
}
},
"SOMETHING_WRONG": "Something went wrong"
}

View File

@ -1,29 +1,60 @@
{
"ACCOUNT_CONFIRMATION_NOT_RECEIVED": "Didn't received instructions?",
"ACCOUNT_CONFIRMATION_SENT": "Check your email. A new confirmation email has been sent to the address provided.",
"ADMIN": "Admin",
"ALREADY_HAVE_ACCOUNT": "Already have an account?",
"CONFIRM_ACCOUNT_DELETION": "Are you sure you want to delete your account? All data will be deleted, this cannot be undone",
"CURRENT_PASSWORD": "Current password",
"EMAIL": "Email",
"ENTER_EMAIL": "Enter an email address",
"EMAIL_INFO": "Enter a valid email address.",
"ENTER_PASSWORD": "Enter a password",
"ENTER_PASSWORD_CONFIRMATION": "Confirm the password",
"FILTER_ON_USERNAME": "Filter on username",
"HIDE_PASSWORD": "hide password",
"INVALID_TOKEN": "Invalid token, please request a new password reset.",
"LANGUAGE": "Language",
"LOG_IN": "log in",
"LOGIN": "Login",
"LOGOUT": "Logout",
"NEW_PASSWORD": "New password",
"NO_USERS_FOUND": "No users found.",
"PASSWORD": "Password",
"PASSWORD_CONFIRM": "Confirm Password",
"PASSWORD_CONFIRMATION": "Password confirmation",
"PASSWORD_INFO": "At least 8 characters required.",
"PASSWORD_FORGOTTEN": "Forgot password?",
"PASSWORD_RESET": "Password reset",
"PASSWORD_SENT_EMAIL_TEXT": "Check your email. If your address is in our database, you'll received an email with a link to reset your password.",
"PASSWORD_STRENGTH": {
"WEAK": "weak",
"AVERAGE": "average",
"GOOD": "good",
"STRONG": "strong",
"LABEL": "password strength",
"SUGGESTIONS": {
"l33t": "Avoid predictable letter substitutions like {'@'} for a.",
"reverseWords": "Avoid reversed spellings of common words.",
"allUppercase": "Capitalize some, but not all letters.",
"capitalization": "Capitalize more than the first letter.",
"dates": "Avoid dates and years that are associated with you.",
"recentYears": "Avoid recent years.",
"associatedYears": "Avoid years that are associated with you.",
"sequences": "Avoid common character sequences.",
"repeated": "Avoid repeated words and characters.",
"longerKeyboardPattern": "Use longer keyboard patterns and change typing direction multiple times.",
"anotherWord": "Add more words that are less common.",
"useWords": "Use multiple words, but avoid common phrases.",
"noNeed": "You can create strong passwords without using symbols, numbers, or uppercase letters.",
"pwned": "If you use this password elsewhere, you should change it."
}
},
"PASSWORD_UPDATED": "Your password have been updated. Click {0} to log in.",
"PROFILE": {
"ACCOUNT_EDITION": "Account edition",
"BACK_TO_PROFILE": "Back to profile",
"BIO": "Bio",
"BIRTH_DATE": "Birth date",
"EDIT": "Edit profile",
"EDIT_PREFERENCES": "Edit preferences",
"EDIT_SPORTS_PREFERENCES": "Edit sports preferences",
"ERRORED_EMAIL_UPDATE": "Please {0} to change your email address again or contact the administrator",
"FIRST_NAME": "First name",
"FIRST_DAY_OF_WEEK": "First day of week",
"LANGUAGE": "Language",
@ -40,6 +71,7 @@
"SPORTS_EDITION": "Sports preferences edition",
"SUNDAY": "Sunday",
"TABS": {
"ACCOUNT": "account",
"PICTURE": "picture",
"PREFERENCES": "preferences",
"PROFILE": "profile",
@ -53,6 +85,10 @@
"LABEL": "label",
"STOPPED_SPEED_THRESHOLD": "stopped speed threshold"
},
"SUCCESSFUL_EMAIL_UPDATE": "Your account has been updated successfully. Please check your email to confirm your new email address.",
"SUCCESSFUL_REGISTRATION": "Your account has been created successfully.",
"SUCCESSFUL_REGISTRATION_WITH_EMAIL": "A link to activate your account has been emailed to the address provided.",
"SUCCESSFUL_UPDATE": "Your account has been updated successfully.",
"UNITS": {
"LABEL": "Units for distance",
"IMPERIAL": "Imperial system (ft, mi)",
@ -61,8 +97,12 @@
"TIMEZONE": "Timezone"
},
"REGISTER": "Register",
"RESENT_ACCOUNT_CONFIRMATION": "Resend account confirmation email",
"REGISTER_DISABLED": "Sorry, registration is disabled.",
"RESET_PASSWORD": "Reset your password",
"SHOW_PASSWORD": "show password",
"THIS_USER_ACCOUNT_IS_INACTIVE": "This user account is inactive.",
"USER_PICTURE": "user picture",
"USERNAME": "Username"
"USERNAME": "Username",
"USERNAME_INFO": "3 to 30 characters required, only alphanumeric characters and the underscore character \"_\" allowed."
}

View File

@ -42,7 +42,7 @@
"PREVIOUS_WORKOUT": "Previous workout",
"RECORD": "record | records",
"RECORD_AS": "Ave. speed",
"RECORD_FD": "Farest distance",
"RECORD_FD": "Farthest distance",
"RECORD_HA": "Highest ascent",
"RECORD_LD": "Longest duration",
"RECORD_MS": "Max. speed",