Skip to content

Commit

Permalink
Merge pull request #10651 from creative-commoners/pulls/5/merge-up-fr…
Browse files Browse the repository at this point in the history
…om-4

Merge up from 4 to 5
  • Loading branch information
GuySartorelli authored Jan 18, 2023
2 parents a65d470 + b6b0bce commit a8c374b
Show file tree
Hide file tree
Showing 19 changed files with 337 additions and 34 deletions.
4 changes: 2 additions & 2 deletions lang/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ en:
EDITINFO: 'Edit this file'
REMOVE: Remove
SilverStripe\Control\ChangePasswordEmail_ss:
CHANGEPASSWORDFOREMAIL: 'The password for account with email address {email} has been changed. If you didn''t change your password please change your password using the link below'
CHANGEPASSWORDFOREMAIL: 'The password for account with email address {email} has been changed. If you didn\''t change your password please change your password using the link below'
CHANGEPASSWORDTEXT1: 'You changed your password for'
CHANGEPASSWORDTEXT3: 'Change password'
HELLO: Hi
Expand Down Expand Up @@ -143,12 +143,12 @@ en:
SilverStripe\Forms\TimeField:
VALIDATEFORMAT: 'Please enter a valid time format ({format})'
SilverStripe\ORM\DataObject:
GENERALSEARCH: 'General Search'
PLURALNAME: 'Data Objects'
PLURALS:
one: 'A Data Object'
other: '{count} Data Objects'
SINGULARNAME: 'Data Object'
GENERALSEARCH: 'General Search'
SilverStripe\ORM\FieldType\DBBoolean:
ANY: Any
NOANSWER: 'No'
Expand Down
1 change: 1 addition & 0 deletions lang/eo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,7 @@ eo:
Sort: 'Ordiga Ordo'
has_many_Permissions: Permesoj
many_many_Members: Membroj
ValidationIdentifierAlreadyExists: 'Jam ekzistas grupo ({group}) kun la sama {identifier}'
SilverStripe\Security\LoginAttempt:
Email: 'Retpoŝta adreso'
EmailHashed: 'Retpoŝta adreso (haketa)'
Expand Down
15 changes: 15 additions & 0 deletions lang/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ es:
PLURALS:
one: 'Un Objeto de Dato'
other: '{count} Objetos de Datos'
many: '{count} Objetos de Datos'
SINGULARNAME: 'Objeto de Dato'
SilverStripe\ORM\FieldType\DBBoolean:
ANY: Cualquiera
Expand All @@ -87,24 +88,30 @@ es:
DAYS_SHORT_PLURALS:
one: '{count} día'
other: '{count} días'
many: '{count} días'
HOURS_SHORT_PLURALS:
one: '{count} hora'
other: '{count} horas'
many: '{count} horas'
LessThanMinuteAgo: 'Hace menos de un minuto'
MINUTES_SHORT_PLURALS:
one: '{count} minuto'
other: '{count} minutos'
many: '{count} minutos'
MONTHS_SHORT_PLURALS:
one: '{count} mes'
other: '{count} meses'
many: '{count} meses'
SECONDS_SHORT_PLURALS:
one: '{count} segundo'
other: '{count} segundos'
many: '{count} segundos'
TIMEDIFFAGO: 'hace {difference}'
TIMEDIFFIN: 'en {difference}'
YEARS_SHORT_PLURALS:
one: '{count} año'
other: '{count} años'
many: '{count} años'
SilverStripe\ORM\FieldType\DBEnum:
ANY: Cualquiera
SilverStripe\ORM\Hierarchy\Hierarchy:
Expand Down Expand Up @@ -135,6 +142,7 @@ es:
PLURALS:
one: 'Un Grupo'
other: '{count} Grupos'
many: '{count} Grupos'
Parent: 'Grupo Padre'
RolesAddEditLink: 'Gestionar Roles'
SINGULARNAME: Grupo
Expand All @@ -147,6 +155,7 @@ es:
PLURALS:
one: 'Un intento de inicio de sesión'
other: '{count} Intentos de inicios de sesión'
many: '{count} Intentos de inicios de sesión'
SINGULARNAME: 'Intento de ingreso'
Status: Estado
SilverStripe\Security\Member:
Expand Down Expand Up @@ -176,6 +185,7 @@ es:
PLURALS:
one: 'Un Miembro'
other: '{count} Miembros'
many: '{count} Miembros'
SINGULARNAME: Miembro
SUBJECTPASSWORDCHANGED: 'Su contraseña ha sido cambiada'
SUBJECTPASSWORDRESET: 'Enlace para restaurar su contraseña'
Expand All @@ -192,6 +202,7 @@ es:
PLURALS:
one: 'Una Contraseña de Miembro'
other: '{count} Contraseñas de Miembros'
many: '{count} Contraseñas de Miembros'
SINGULARNAME: 'Contraseña del Miembro'
SilverStripe\Security\PasswordValidator:
LOWCHARSTRENGTH: 'Necesitas aumentar la complejidad de tu contraseña agregando los siguientes caracteres: {chars}'
Expand All @@ -206,6 +217,7 @@ es:
PLURALS:
one: 'Un Permiso'
other: '{count} Permisos'
many: '{count} Permisos'
SINGULARNAME: Permiso
UserPermissionsIntro: 'Asignar grupos a este usuario ajustará los permisos que tienen. Vea la sección de grupos para obtener información sobre permisos en grupos individuales.'
SilverStripe\Security\PermissionCheckboxSetField:
Expand All @@ -219,20 +231,23 @@ es:
PLURALS:
one: 'Un Rol'
other: '{count} Roles'
many: '{count} Roles'
SINGULARNAME: Rol
Title: Título
SilverStripe\Security\PermissionRoleCode:
PLURALNAME: 'Códigos de Roles de Permiso'
PLURALS:
one: 'Un Código de Rol de Permiso'
other: '{count} Códigos de Roles de Permiso'
many: '{count} Códigos de Roles de Permiso'
PermsError: 'No se puede asignar permisos privilegiados al código "% s" (requiere acceso de administrador)'
SINGULARNAME: 'Código del Rol de Permiso'
SilverStripe\Security\RememberLoginHash:
PLURALNAME: 'Hashes de inicio de sesión'
PLURALS:
one: 'Un Hash de inicio de sesión'
other: '{count} Hashes de inicio de sesión'
many: '{count} Hashes de inicio de sesión'
SINGULARNAME: 'Hash de inicio de sesión'
SilverStripe\Security\Security:
ALREADYLOGGEDIN: 'No tiene acceso a esta página. Si posee otra cuenta con los privilegios para acceder a esta página, puede iniciar sesión a continuación.'
Expand Down
15 changes: 15 additions & 0 deletions lang/fr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ fr:
PLURALS:
one: 'Un modèle de donnée'
other: '{count} modèles de donnée'
many: '{count} modèles de donnée'
SINGULARNAME: 'Modèle de donnée'
SilverStripe\ORM\FieldType\DBBoolean:
ANY: Tout
Expand All @@ -122,24 +123,30 @@ fr:
DAYS_SHORT_PLURALS:
one: '{count} jour'
other: '{count} jours'
many: '{count} jours'
HOURS_SHORT_PLURALS:
one: '{count} heure'
other: '{count} heures'
many: '{count} heures'
LessThanMinuteAgo: 'moins d''une minute'
MINUTES_SHORT_PLURALS:
one: '{count} min.'
other: '{count} min.'
many: '{count} min.'
MONTHS_SHORT_PLURALS:
one: '{count} mois'
other: '{count} mois'
many: '{count} mois'
SECONDS_SHORT_PLURALS:
one: '{count} sec.'
other: '{count} sec.'
many: '{count} sec.'
TIMEDIFFAGO: 'Il y a {difference}'
TIMEDIFFIN: 'Dans {difference}'
YEARS_SHORT_PLURALS:
one: '{count} année'
other: '{count} années'
many: '{count} années'
SilverStripe\ORM\FieldType\DBEnum:
ANY: Tout
SilverStripe\ORM\Hierarchy:
Expand Down Expand Up @@ -182,6 +189,7 @@ fr:
PLURALS:
one: 'Un groupe'
other: '{count} groupes'
many: '{count} groupes'
Parent: 'Groupe parent'
ROLES: Rôles
ROLESDESCRIPTION: 'Les rôles sont des ensembles de permissions prédéfinies, et ils peuvent être attribués à des groupes. <br />Si nécessaire, ils peuvent hériter de groupes parents.'
Expand All @@ -198,6 +206,7 @@ fr:
PLURALS:
one: 'Une tentative de connexion'
other: '{count} tentatives de connexion'
many: '{count} tentatives de connexion'
SINGULARNAME: 'Tentative de connexion'
Status: Statut
SilverStripe\Security\Member:
Expand Down Expand Up @@ -228,6 +237,7 @@ fr:
PLURALS:
one: 'Un membre'
other: '{count} membres'
many: '{count} membres'
SINGULARNAME: Membre
SUBJECTPASSWORDCHANGED: 'Votre mot de passe a été changé'
SUBJECTPASSWORDRESET: 'Lien pour modifier votre mot de passe'
Expand Down Expand Up @@ -255,6 +265,7 @@ fr:
PLURALS:
one: 'Un mot de passe utilisateur'
other: '{count} mots de passe utilisateur'
many: '{count} mots de passe utilisateur'
SINGULARNAME: 'Mot de passe utilisateur'
SilverStripe\Security\PasswordValidator:
LOWCHARSTRENGTH: 'Veuillez renforcer votre mot de passe en ajoutant certains des caractères suivants : {chars}'
Expand All @@ -271,6 +282,7 @@ fr:
PLURALS:
one: 'Une autorisation'
other: '{count} autorisations'
many: '{count} autorisations'
SINGULARNAME: Permission
UserPermissionsIntro: "Assigner des groupes à cet utilisateur modifiera les autorisations dont il dispose. Consultez la section «\_Groupes\_» pour plus de détails sur les autorisations associées à chaque groupe."
SilverStripe\Security\PermissionCheckboxSetField:
Expand All @@ -284,20 +296,23 @@ fr:
PLURALS:
one: 'Un rôle'
other: '{count} rôles'
many: '{count} rôles'
SINGULARNAME: Rôle
Title: Titre
SilverStripe\Security\PermissionRoleCode:
PLURALNAME: 'Codes d''autorisations liés au rôle'
PLURALS:
one: 'Un code d''autorisation lié au rôle'
other: '{count} codes d''autorisation liés au rôle'
many: '{count} codes d''autorisation liés au rôle'
PermsError: 'Impossible d''attribuer le code "{code}" (requiert un accès en tant qu''administrateur)'
SINGULARNAME: 'Code d''autorisation lié au rôle'
SilverStripe\Security\RememberLoginHash:
PLURALNAME: 'Signatures de mot de passe'
PLURALS:
one: 'Une signature de mot de passe'
other: '{count} signatures de mot de passe'
many: '{count} signatures de mot de passe'
SINGULARNAME: 'Signature de mot de passe'
SilverStripe\Security\Security:
ALREADYLOGGEDIN: 'Vous n''avez pas accès à cette page. Si un autre de vos identifiants vous permet d''accéder à cette page, merci de vous reconnecter ci-dessous en l''utilisant.'
Expand Down
16 changes: 16 additions & 0 deletions lang/it.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@ it:
PLURALS:
one: 'Un Data Object'
other: '{count} Data Object'
many: '{count} Data Object'
SINGULARNAME: 'Data Object'
SilverStripe\ORM\FieldType\DBBoolean:
ANY: Qualsiasi
Expand All @@ -158,24 +159,30 @@ it:
DAYS_SHORT_PLURALS:
one: '{count} giorno'
other: '{count} giorni'
many: '{count} giorni'
HOURS_SHORT_PLURALS:
one: '{count} ora'
other: '{count} ore'
many: '{count} ore'
LessThanMinuteAgo: 'meno di un minuto'
MINUTES_SHORT_PLURALS:
one: '{count} minuto'
other: '{count} minuti'
many: '{count} minuti'
MONTHS_SHORT_PLURALS:
one: '{count} mese'
other: '{count} mesi'
many: '{count} mesi'
SECONDS_SHORT_PLURALS:
one: '{count} secondo'
other: '{count} secondi'
many: '{count} secondi'
TIMEDIFFAGO: '{difference} fa'
TIMEDIFFIN: 'in {difference}'
YEARS_SHORT_PLURALS:
one: '{count} anno'
other: '{count} anni'
many: '{count} anni'
SilverStripe\ORM\FieldType\DBEnum:
ANY: Qualsiasi
SilverStripe\ORM\FieldType\DBForeignKey:
Expand Down Expand Up @@ -228,6 +235,7 @@ it:
PLURALS:
one: 'Un Gruppo'
other: '{count} Gruppi'
many: '{count} Gruppi'
Parent: 'Gruppo padre'
ROLES: Ruoli
ROLESDESCRIPTION: 'I ruoli sono insiemi predefiniti di permessi che possono essere assegnati ai gruppi.<br />Se richiesto possono essere ereditati dai gruppi padre.'
Expand All @@ -236,6 +244,7 @@ it:
Sort: 'Tipo ordinamento'
has_many_Permissions: Permessi
many_many_Members: Membri
ValidationIdentifierAlreadyExists: 'Esiste già un gruppo ({group}) con lo stesso {identifier}'
SilverStripe\Security\LoginAttempt:
Email: 'Indirizzo e-mail'
EmailHashed: 'Indirizzo email (hash)'
Expand All @@ -244,6 +253,7 @@ it:
PLURALS:
one: 'Un tentativo d''accesso'
other: '{count} tentativi d''accesso'
many: '{count} tentativi d''accesso'
SINGULARNAME: 'Tentativo d''accesso'
Status: Stato
SilverStripe\Security\Member:
Expand Down Expand Up @@ -276,6 +286,7 @@ it:
PLURALS:
one: 'Un Utente'
other: '{count} Utenti'
many: '{count} Utenti'
SINGULARNAME: Utente
SUBJECTPASSWORDCHANGED: 'La tua password è stata cambiata'
SUBJECTPASSWORDRESET: 'Link per azzerare la tua password'
Expand Down Expand Up @@ -305,6 +316,7 @@ it:
PLURALS:
one: 'Una password utente'
other: '{count} password utente'
many: '{count} password utente'
SINGULARNAME: 'Password utente'
SilverStripe\Security\PasswordValidator:
LOWCHARSTRENGTH: 'Perfavore aumenta la sicurezza della password aggiungendo alcuni dei seguenti caratteri: {chars}'
Expand All @@ -321,6 +333,7 @@ it:
PLURALS:
one: 'Un Permesso'
other: '{count} Permessi'
many: '{count} Permessi'
SINGULARNAME: Permesso
UserPermissionsIntro: 'Assegnando gruppi a questo utente modificherà i suoi permessi. Vedi la sezione gruppi per dettagli sui permessi dei singoli gruppi.'
SilverStripe\Security\PermissionCheckboxSetField:
Expand All @@ -334,20 +347,23 @@ it:
PLURALS:
one: 'Un Ruolo'
other: '{count} Ruoli'
many: '{count} Ruoli'
SINGULARNAME: Ruolo
Title: Titolo
SilverStripe\Security\PermissionRoleCode:
PLURALNAME: 'Codici di ruolo'
PLURALS:
one: 'Un codice di ruolo'
other: '{count} codici di ruolo'
many: '{count} codici di ruolo'
PermsError: 'Non posso assegnare permessi privilegiati al codice "{code}" (richiede accesso ADMIN)'
SINGULARNAME: 'Codice di ruolo'
SilverStripe\Security\RememberLoginHash:
PLURALNAME: 'Hash di Login'
PLURALS:
one: 'Un Hash di Login'
other: '{count} Hash di Login'
many: '{count} Hash di Login'
SINGULARNAME: 'Hash di Login'
SilverStripe\Security\Security:
ALREADYLOGGEDIN: 'Non hai accesso a questa pagina. Se hai un altro account che può accederci, puoi autenticarti qui sotto.'
Expand Down
Loading

0 comments on commit a8c374b

Please sign in to comment.