StarMC/Astral-nook
StarMC/Astral-nook
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

Browse source
This commit is contained in:
Dane Everitt 2017-11-03 20:44:01 -05:00
commit 99aceaca38
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
76 changed files with 2357 additions and 1138 deletions
Download patch file Download diff file Expand all files Collapse all files

1
resources/lang/en/auth.php
View file

@ -18,4 +18,5 @@ return [
'2fa_required' => '2-Factor Authentication',
'2fa_failed' => 'The 2FA token provided was invalid.',
'totp_failed' => 'There was an error while attempting to validate TOTP.',
'2fa_must_be_enabled' => 'The administrator has required that 2-Factor Authentication be enabled for your account in order to use the Panel.',
];

6
resources/lang/es/validation.php
View file

@ -24,9 +24,9 @@ return [
'before_or_equal' => 'El campo :attribute debe ser una fecha antes o igual a :date.',
'between' => [
'numeric' => 'El campo :attribute debe estar entre :min - :max.',
'file' => 'El campo :attribute debe estar entre :min - :max kilobytes.',
'string' => 'El campo :attribute debe estar entre :min - :max caracteres.',
'array' => 'El campo :attribute debe tener entre :min y :max elementos.',
'file' => 'El campo :attribute debe estar entre :min - :max kilobytes.',
'string' => 'El campo :attribute debe estar entre :min - :max caracteres.',
'array' => 'El campo :attribute debe tener entre :min y :max elementos.',
],
'boolean' => 'El campo :attribute debe ser verdadero o falso.',
'confirmed' => 'El campo de confirmación de :attribute no coincide.',