diff --git a/resources/views/auth/2fa.blade.php b/resources/views/auth/2fa.blade.php
index f9d4fae..d29e6cc 100755
--- a/resources/views/auth/2fa.blade.php
+++ b/resources/views/auth/2fa.blade.php
@@ -17,15 +17,15 @@
-
+
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 25b9216..b01b1b2 100755
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -27,30 +27,32 @@
staffmember@example.com
enduser@example.com
- {{ __('The password is ":password" for all accounts.', ['password' => 'password']) }}
+ {{ __('The password is ":demoPassword" for all accounts.', ['demoPassword' => 'password']) }}
@endif
- {{__('messages.contactlabel_email')}}
-
+ {{__('Email')}}
+
- {{__('messages.password')}}
+ {{__('Password')}}
- {{__('messages.remember_me')}}
+ {{__('Remember me')}}
-
+
- {{__('messages.forgot_pw')}}
-
+ {{__('Forgot password?')}}
+
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 9a25a65..a193902 100755
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -23,16 +23,18 @@
{{__('Back to login')}}
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index 7ebafdd..70f3faf 100755
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -68,10 +68,12 @@
- {{__('Back to login')}}
+ {{__('Back to sign in')}}
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index c2071ba..98c92fc 100755
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -13,34 +13,34 @@
{{ config('adminlte.logo') }}
- {{__('messages.register_acc')}}
+ {{__('Sign up for an account')}}
@if(\App\Facades\Options::getOption('pw_security_policy') !== 'off')
×
-
{{__('messages.pwsec.line1')}}
-
{{__('messages.pwsec.line2')}}
+
{{__('Basic password security')}}
+
{{__("For your security, we implement strict password policies. It's also advisable to let your password manager or browser generate and save passwords for you (if it's a private device).")}}
-
{{__('messages.pwsec.line3')}}
+
{{__('Passwords must be a combination of:')}}
@switch(\App\Facades\Options::getOption('pw_security_policy'))
@case('low')
- A minimum of 10 characters
+ {{ __('A minimum of 10 characters') }}
@break
@case('medium')
- A minimum of 12 characters;
- At least one special character;
- Lower case and upper case characters
+ {{ __('A minimum of 12 characters;') }}
+ {{ __('At least one special character;') }}
+ {{ __('Lower case and upper case characters') }}
@break
@case('high')
- A minimum of 20 characters;
- At least one special character;
- Lower case and upper case characters
- At least one numerical character
+ {{ __('A minimum of 20 characters;') }}
+ {{ __('At least one special character;') }}
+ {{ __('Lower case and upper case characters') }}
+ {{ __('At least one numerical character') }}
@break
@endswitch
@@ -54,43 +54,44 @@
{{ __('Warning') }}
{{ __('Do not use real credentials here. The application is in demo mode. Additionally, the database is wiped every six hours.') }}
- {{ __('Also note: If a game license is required to sign up, you may find valid MC usernames at NameMC') }}
+ {{ __("Also note: If a game license is required to sign up, you may find valid MC usernames at NameMC. No special validation is performed other than contacting Mojang's authentication servers to verify the username's existence, therefore, you can use any username for testing purposes.") }}
@endif
-
+
diff --git a/resources/views/auth/verify.blade.php b/resources/views/auth/verify.blade.php
index 4474c97..703368a 100755
--- a/resources/views/auth/verify.blade.php
+++ b/resources/views/auth/verify.blade.php
@@ -32,6 +32,8 @@
diff --git a/resources/views/breadcrumbs/auth/main.blade.php b/resources/views/breadcrumbs/auth/main.blade.php
index e41e288..a0dca99 100755
--- a/resources/views/breadcrumbs/auth/main.blade.php
+++ b/resources/views/breadcrumbs/auth/main.blade.php
@@ -1,5 +1,5 @@
-
+
diff --git a/resources/views/breadcrumbs/dashboard/footer.blade.php b/resources/views/breadcrumbs/dashboard/footer.blade.php
index abb7736..34a2cf2 100755
--- a/resources/views/breadcrumbs/dashboard/footer.blade.php
+++ b/resources/views/breadcrumbs/dashboard/footer.blade.php
@@ -6,8 +6,8 @@
- Gitea
- Issue Tracker
+ {{ __('Gitea') }}
+ {{ __('Issue Tracker') }}
@@ -16,7 +16,7 @@
diff --git a/resources/views/breadcrumbs/footer.blade.php b/resources/views/breadcrumbs/footer.blade.php
index b2f4fc6..28d1b08 100755
--- a/resources/views/breadcrumbs/footer.blade.php
+++ b/resources/views/breadcrumbs/footer.blade.php
@@ -3,7 +3,7 @@
diff --git a/resources/views/breadcrumbs/header.blade.php b/resources/views/breadcrumbs/header.blade.php
index 6c77061..240511f 100755
--- a/resources/views/breadcrumbs/header.blade.php
+++ b/resources/views/breadcrumbs/header.blade.php
@@ -1,6 +1,6 @@
-
+
@@ -25,8 +25,8 @@
{{config('app.name')}} | {{ __('Home') }}
-
-
+
+
@@ -79,23 +79,23 @@
@guest
- {{__('messages.login')}}
+ {{__('Sign in')}}
- {{__('messages.register')}}
+ {{__('Register')}}
@endguest
@auth
- {{__('messages.dashboard')}}
+ {{__('Dashboard')}}
@endauth
@@ -145,7 +145,7 @@
{{ __('500 - Internal Server Error') }}
- {{ __('Whelp! It looks like our servers went up in flames. Don\'t worry, it\'s not your fault. Our developers have been notified & are already extinguishing the flames and repairing the damage. ') }}
+ {{ __("Whelp! It looks like our servers went up in flames. Don't worry, it's not your fault. Our developers have been notified & are already extinguishing the flames and repairing the damage. ") }}
@break;
@case(401)
diff --git a/resources/views/components/no-permission.blade.php b/resources/views/components/no-permission.blade.php
index 469e4b6..fa9d400 100755
--- a/resources/views/components/no-permission.blade.php
+++ b/resources/views/components/no-permission.blade.php
@@ -4,7 +4,7 @@
-
+
@@ -16,12 +16,12 @@
-
{{__('messages.component_accessdenied')}}
+
{{__('Access Denied')}}
- {{__('messages.component_nopermission')}}
+ {{__("We're sorry, but you do not have sufficient permission to access this web page.")}}
- {{__('messages.component_contact')}}
+ {{__('Please contact your administrator if you believe this was in error.')}}
@@ -31,10 +31,10 @@
@else
@extends('adminlte::page')
- @section('title', 'Raspberry Network | Access Denied')
+ @section('title', config('app.name') . ' | ' . __('Access Denied'))
@section('content_header')
-
Access Denied - HTTP 403
+
{{ __('Access Denied - HTTP 403') }}
@stop
@section('content')
@@ -43,7 +43,7 @@
-
+
@@ -54,17 +54,17 @@
-
Access Denied
+ {{ __('Access Denied') }}
@if (isset($slot))
{{ $slot }}
@endif
- We're sorry, but you do not have permission to access this web page.
+ {{ __("We're sorry, but you do not have permission to access this web page.") }}
- Please contact your administrator if you believe this was in error.
+ {{ __('Please contact your administrator if you believe this was in error.') }}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 4eaee05..da22051 100755
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -41,15 +41,15 @@