From aa8782a5defa75dd5af9453e7abf47dfca39005f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 29 Mar 2023 18:44:37 +0200 Subject: [PATCH] fixed merge translations --- front/i18n/Translations.ts | 73 ++++++++++++-------------------------- front/yarn.lock | 19 ---------- 2 files changed, 22 insertions(+), 70 deletions(-) diff --git a/front/i18n/Translations.ts b/front/i18n/Translations.ts index 7053060..8eb261f 100644 --- a/front/i18n/Translations.ts +++ b/front/i18n/Translations.ts @@ -5,7 +5,12 @@ export const en = { signInBtn: 'Sign in', signUpBtn: 'Sign up', changeLanguageBtn: 'Change language', + search: 'Search', + login: 'Login', + signUp: 'Sign up', + signIn: 'Sign in', searchBtn: 'Search', + play: 'Play', playBtn: 'Play', playAgain: 'Play Again', songPageBtn: 'Go to song page', @@ -120,15 +125,14 @@ export const fr: typeof en = { lastScore: 'Dernier Score', langBtn: 'Langage', backBtn: 'Retour', - settingsBtn: 'Réglages', prefBtn: 'Préférences', notifBtn: 'Notifications', privBtn: 'Confidentialité', - goNextStep: 'Prochaine Etape', - mySkillsToImprove: 'Mes Skills', - recentlyPlayed: 'Joués récemment', - lastSearched: 'Dernières recherches', - levelProgress: 'Niveau', + + play: 'Jouer', + changeEmail: 'Changer d\'email', + newEmail: 'Nouvel email', + oldEmail: 'Ancien email', // profile page user: 'Profil', @@ -156,33 +160,10 @@ export const fr: typeof en = { search: "Rechercher", lastSearched: "Dernières recherches", levelProgress: "Niveau", - pedalsCompetency: "Pédales", - rightHandCompetency: "Main droite", - leftHandCompetency: "Main gauche", - accuracyCompetency: "Justesse", - arpegeCompetency: "Arpege", - chordsCompetency: "Accords", - usernameTooShort: 'Le nom d\'utilisateur est trop court', - passwordTooShort: 'Le mot de passe est trop court', - usernameTooLong: 'Le nom d\'utilisateur est trop long', - passwordTooLong: 'Le mot de passe est trop long', - username: 'Nom d\'utilisateur', - password: 'Mot de passe', login: 'Se connecter', - invalidCredentials: "Informations d'identification invalides", - loggedIn: 'Connecté', - usernameTaken: 'Nom d\'utilisateur déjà pris', - forgottenPassword: "Mot de passe oublié", - invalidEmail: "Email invalide", - email: "Email", - repeatPassword: "Confirmer", - passwordsDontMatch: "Mots de passes différents", signUp: "S'inscrire", signIn: "Se connecter", - "Must Contain 8 Characters, One Uppercase, One Lowercase, One Number and One Special Case Character": "", - accountCreated: "Compte créé", - changePassword: 'Modification du mot de passe', oldPassword: 'Ancien mot de passe', newPassword: 'Nouveau mot de passe', confirmNewPassword: 'Confirmer le nouveau mot de passe', @@ -217,6 +198,7 @@ export const fr: typeof en = { email: 'Email', repeatPassword: 'Confirmer', score: 'Score', + changePassword: 'Modification du mot de passe', precisionScore: 'Précision', goodNotesInARow: 'Bonnes notes à la suite', songsToGetBetter: 'Recommendations', @@ -235,7 +217,6 @@ export const fr: typeof en = { }; export const sp: typeof en = { - welcome: 'Benvenido a Chromacase', welcomeMessage: 'Benvenido', signOutBtn: 'Desconectarse', signInBtn: 'Connectarse', @@ -244,6 +225,14 @@ export const sp: typeof en = { googleacctBtn: 'Cuenta Google', goodNotes: 'buenas notas', + search: 'Buscar', + login: 'Iniciar sesión', + signUp: 'Registrarse', + signIn: 'Iniciar sesión', + changeEmail: 'Cambiar el correo electrónico', + newEmail: 'Nuevo correo electrónico', + oldEmail: 'Correo electrónico anterior', + // competencies changeLanguageBtn: 'Cambiar el idioma', searchBtn: 'Buscar', @@ -255,9 +244,6 @@ export const sp: typeof en = { chapters: 'Capítulos', bestScore: 'Mejor puntuación', lastScore: 'Ùltima puntuación', - langBtn: 'idioma', - backBtn: 'Volver', - settingsBtn: 'Ajustes', prefBtn: 'Preferencias', notifBtn: 'Notificaciones', privBtn: 'Privacidad', @@ -267,25 +253,10 @@ export const sp: typeof en = { lastSearched: 'Ultimas búsquedas', welcome: 'Benvenido a Chromacase', - signoutBtn: 'Desconectarse', - signinBtn: 'Connectarse', langBtn: 'Langua', - diffBtn: 'Dificultad', backBtn: 'Volver', - settingsBtn: 'Settings', - prefBtn: 'Préférences', - notifBtn: 'Notifications', - privBtn: 'Confidentialité', - changepasswdBtn: 'Changer le mot de pass', - changeemailBtn: 'Change l\'email', - googleacctBtn: 'Compte Google', - easy: 'Principiante', - medium: 'Intermedio', - hard: 'Avanzado', - dark: 'Oscuro', - system: 'Sistema', - light: 'Claro', - play: 'Jouer', + settingsBtn: 'Ajustes', + play: 'Jugar', // profile page user: 'Perfil', @@ -347,7 +318,7 @@ export const sp: typeof en = { //errors unknownError: 'Error desconocido', errAlrdExst: "Ya existe", - errIncrrct: "credenciales incorrectas" + errIncrrct: "credenciales incorrectas", changePassword: 'Change password', oldPassword: 'Old password', diff --git a/front/yarn.lock b/front/yarn.lock index f459993..8d52035 100644 --- a/front/yarn.lock +++ b/front/yarn.lock @@ -4395,18 +4395,6 @@ dependencies: "@babel/types" "^7.3.0" -"@types/bcrypt@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@types/bcrypt/-/bcrypt-5.0.0.tgz#a835afa2882d165aff5690893db314eaa98b9f20" - integrity sha512-agtcFKaruL8TmcvqbndlqHPSJgsolhf/qPWchFlgnW1gECTN/nKbFcoFnvKAQRFfKbh+BO6A3SWdJu9t+xF3Lw== - dependencies: - "@types/node" "*" - -"@types/bcryptjs@^2.4.2": - version "2.4.2" - resolved "https://registry.yarnpkg.com/@types/bcryptjs/-/bcryptjs-2.4.2.tgz#e3530eac9dd136bfdfb0e43df2c4c5ce1f77dfae" - integrity sha512-LiMQ6EOPob/4yUL66SZzu6Yh77cbzJFYll+ZfaPiPPFswtIlA/Fs1MzdKYA7JApHU49zQTbJGX3PDmCpIdDBRQ== - "@types/cacheable-request@^6.0.1": version "6.0.3" resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.3.tgz#a430b3260466ca7b5ca5bfd735693b36e7a9d183" @@ -5966,11 +5954,6 @@ batch@0.6.1: resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" integrity sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw== -bcryptjs@^2.4.3: - version "2.4.3" - resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb" - integrity sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ== - better-opn@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/better-opn/-/better-opn-2.1.1.tgz#94a55b4695dc79288f31d7d0e5f658320759f7c6" @@ -17553,10 +17536,8 @@ watchpack@^1.6.1, watchpack@^1.7.4: resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.5.tgz#1267e6c55e0b9b5be44c2023aed5437a2c26c453" integrity sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ== dependencies: - chokidar "^3.4.1" graceful-fs "^4.1.2" neo-async "^2.5.0" - watchpack-chokidar2 "^2.0.1" optionalDependencies: chokidar "^3.4.1" watchpack-chokidar2 "^2.0.1"