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",

fittrackee_client/src/locales/fr/common.json

@@ -3,9 +3,11 @@
   "CONFIRMATION": "Confirmation",
   "CONTACT": "contact",
   "DAY": "jour | jours",
+  "DISPLAYED": "Affiché",
   "DOCUMENTATION": "documentation (en)",
   "HOME": "Accueil",
   "HERE": "ici",
+  "HIDDEN": "Masqué",
   "SELECTS": {
     "ORDER_BY": {
       "LABEL": "trier par "

fittrackee_client/src/locales/fr/user.json

@@ -48,6 +48,7 @@
     "PASSWORD_UPDATED": "Votre mot de passe a été mis à jour. Cliquez {0} pour vous connecter.",
     "PROFILE": {
         "ACCOUNT_EDITION": "Mise à jour du compte",
+        "ASCENT_DATA": "Données relatives au dénivelé positif (records, total)",
         "BACK_TO_PROFILE": "Revenir au profil",
         "BIO": "Bio",
         "BIRTH_DATE": "Date de naissance",

fittrackee_client/src/locales/fr/workouts.json

@@ -43,6 +43,7 @@
   "RECORD": "record | records",
   "RECORD_AS": "Vitesse moy.",
   "RECORD_FD": "Distance la + longue",
+  "RECORD_HA": "Dénivelé positif le + élevé",
   "RECORD_LD": "Durée la + longue",
   "RECORD_MS": "Vitesse max.",
   "REMAINING_CHARS": "nombre de caractères restants ",