Merge branch 'dev' into oauth2

fittrackee_client/src/locales/en/common.json

@@ -3,9 +3,11 @@
   "CONFIRMATION": "Confirmation",
   "CONTACT": "contact",
   "DAY": "day | days",
+  "DISPLAYED": "Displayed",
   "DOCUMENTATION": "documentation",
   "HOME": "Home",
   "HERE": "here",
+  "HIDDEN": "Hidden",
   "SELECTS": {
     "ORDER_BY": {
       "LABEL": "order by"

fittrackee_client/src/locales/en/user.json

@@ -48,6 +48,7 @@
   "PASSWORD_UPDATED": "Your password have been updated. Click {0} to log in.",
   "PROFILE": {
     "ACCOUNT_EDITION": "Account edition",
+    "ASCENT_DATA": "Ascent-related data (records, total)",
     "BACK_TO_PROFILE": "Back to profile",
     "BIO": "Bio",
     "BIRTH_DATE": "Birth date",

fittrackee_client/src/locales/en/workouts.json

@@ -43,6 +43,7 @@
   "RECORD": "record | records",
   "RECORD_AS": "Ave. speed",
   "RECORD_FD": "Farthest distance",
+  "RECORD_HA": "Highest ascent",
   "RECORD_LD": "Longest duration",
   "RECORD_MS": "Max. speed",
   "REMAINING_CHARS": "remaining characters",