diff --git a/resources/lang/en/auth.php b/resources/lang/en/auth.php
index 6ef1a7330..885902c99 100644
--- a/resources/lang/en/auth.php
+++ b/resources/lang/en/auth.php
@@ -13,7 +13,30 @@ return [
     |
     */
 
-    'failed'   => 'These credentials do not match our records.',
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+    'loginTitle'       =>   'Account Login',
+    'failed'           =>   'These credentials do not match our records.',
+    'throttle'         =>   'Too many login attempts. Please try again in :seconds seconds.',
+    'password'         =>   'Password' ,
+    'remember'         =>   'Remember Me',
+    'forgot'           =>   'Forgot Password',
+    'login'            =>   'Login',
+
+    'register'         =>   'Register',
+    'reset'            =>   'Password Reset',
+
+    'name'             =>   'Name',
+    'username'         =>   'Username',
+    'confirm-password' =>   'Confirm Password',
+
+    'age'              =>   'I am at least 16 years old',
+    'terms'            =>   "By signing up, you agree to our <a href=\"".route('site.terms')."\" class=\"font-weight-bold text-dark\">Terms of Use</a> and <a href=\"".route('site.privacy')."\" class=\"font-weight-bold text-dark\">Privacy Policy</a>.",
+
+    'emailAddress'     =>   "E-Mail Address",
+
+    'registerTitle'    =>   'Register a new account',
+
+    'sendReset'        =>   'Send Password Reset Link',
+    'backLogin'        =>   'Back to Login'
+
 
 ];
diff --git a/resources/lang/en/privacy.php b/resources/lang/en/privacy.php
new file mode 100644
index 000000000..e69de29bb
diff --git a/resources/lang/en/site.php b/resources/lang/en/site.php
index bb8a408ba..44cd6da2a 100644
--- a/resources/lang/en/site.php
+++ b/resources/lang/en/site.php
@@ -1,7 +1,9 @@
 <?php
 
 return [
-
+    'title1'            => 'Photo Sharing',
+    'title2'            => 'For Everyone',
+    'mainTitle'         => 'Photo Sharing. For Everyone',
     'about'             => 'About',
     'help'              => 'Help',
     'language'          => 'Language',
diff --git a/resources/lang/pt/auth.php b/resources/lang/pt/auth.php
index 222a98439..b161c718b 100644
--- a/resources/lang/pt/auth.php
+++ b/resources/lang/pt/auth.php
@@ -12,8 +12,30 @@ return [
     | these language lines according to your application's requirements.
     |
     */
+    'loginTitle'       =>   'Acessar conta',
+    'failed'           =>   'As credenciais introduzidas não correspondem aos nossos registos.',
+    'throttle'         =>   'Varias tentativas de login. Tente novamente em :seconds segundos.',
+    'password'         =>   'Senha' ,
+    'remember'         =>   'Lembrar-Me',
+    'forgot'           =>   'Esqueceu a senha? ',
+    'login'            =>   'Entrar',
+    'reset'            =>   'Recuperar Senha',
+    'register'         =>   'Cadastrar',
+
+    'name'             =>   'Nome',
+    'username'         =>   'Usuário',
+    'confirm-password' =>   'Confrime a senha',
+
+    'age'              =>   'Eu tenho pelo menos 16 anos',
+
+    'terms'            =>   "Ao Cadastrar, você concorda com nossos termos <a href=\"".route('site.terms')."\" class=\"font-weight-bold text-dark\">Termos de Uso</a> e <a href=\"".route('site.privacy')."\" class=\"font-weight-bold text-dark\">Politica de Privacidade</a>.",
+
+    'emailAddress'     =>   "Endereço de Email",
+
+    'registerTitle'    =>   'Cadastrar uma nova conta',
+
+    'sendReset'        =>   'Enviar Link de Recuperação de Senha',
+    'backLogin'        =>   'Back to Login'
 
-    'failed'   => 'As credenciais introduzidas não correspondem aos nossos registos.',
-    'throttle' => 'Demasiadas tentativas de login. Tente novamente em :seconds segundos.',
 
 ];
diff --git a/resources/lang/pt/site.php b/resources/lang/pt/site.php
index 2418cc337..2f1399671 100644
--- a/resources/lang/pt/site.php
+++ b/resources/lang/pt/site.php
@@ -1,7 +1,9 @@
 <?php
 
 return [
-
+	'title1'        => 'Partilha de foto',
+    'title2'        => 'Para todos',
+	'mainTitle'     => 'Partilha de foto. Para todos',
 	'about'			=> 'Sobre',
 	'help'			=> 'Ajuda',
 	'language'		=> 'Idioma',
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 549c55ad6..9fc047a98 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -5,7 +5,7 @@
     <div class="row justify-content-center">
         <div class="col-lg-5">
             <div class="">
-                <div class="card-header bg-transparent p-3 text-center font-weight-bold h3">{{ __('Login') }}</div>
+                <div class="card-header bg-transparent p-3 text-center font-weight-bold h3">{{ __('auth.login') }}</div>
 
                 <div class="card-body">
                     <form method="POST" action="{{ route('login') }}">
@@ -27,7 +27,7 @@
                         <div class="form-group row">
 
                             <div class="col-md-12">
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{__('Password')}}" required>
+                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ __('auth.password') }}" required>
 
                                 @if ($errors->has('password'))
                                     <span class="invalid-feedback">
@@ -41,9 +41,9 @@
                             <div class="col-md-12">
                                 <div class="checkbox">
                                     <label>
-                                        <input type="checkbox" name="remember" {{ old('remember') ? 'checked' : '' }}> 
+                                        <input type="checkbox" name="remember" {{ old('remember') ? 'checked' : '' }}>
                                         <span class="font-weight-bold ml-1 text-muted">
-                                            {{ __('Remember Me') }}
+                                            {{ __('auth.remember') }}
                                         </span>
                                     </label>
                                 </div>
@@ -59,7 +59,7 @@
                         <div class="form-group row mb-0">
                             <div class="col-md-12">
                                 <button type="submit" class="btn btn-primary btn-block btn-lg font-weight-bold">
-                                    {{ __('Login') }}
+                                    {{ __('auth.login') }}
                                 </button>
 
                             </div>
@@ -70,7 +70,7 @@
 
                     <p class="text-center font-weight-bold">
                         <a href="{{ route('password.request') }}">
-                            {{ __('Forgot Password') }}
+                            {{ __('auth.forgot') }}
                         </a>
                     </p>
                 </div>
diff --git a/resources/views/auth/passwords/email.blade.php b/resources/views/auth/passwords/email.blade.php
index 2b27a5508..9398a5ede 100644
--- a/resources/views/auth/passwords/email.blade.php
+++ b/resources/views/auth/passwords/email.blade.php
@@ -5,7 +5,7 @@
     <div class="row justify-content-center">
         <div class="col-lg-5">
             <div class="card">
-                <div class="card-header bg-white p-3 text-center font-weight-bold">{{ __('Reset Password') }}</div>
+                <div class="card-header bg-white p-3 text-center font-weight-bold">{{ __('auth.reset') }}</div>
 
                 <div class="card-body">
                     @if (session('status') || $errors->has('email'))
@@ -19,14 +19,14 @@
 
                         <div class="form-group row">
                             <div class="col-md-12">
-                                <input id="email" type="email" class="form-control" name="email" placeholder="{{ __('E-Mail Address') }}" value="{{ old('email') }}" required>
+                                <input id="email" type="email" class="form-control" name="email" placeholder="{{ __('auth.emailAddress') }}" value="{{ old('email') }}" required>
                             </div>
                         </div>
 
                         <div class="form-group row mb-0">
                             <div class="col-md-12">
                                 <button type="submit" class="btn btn-primary btn-block py-0 font-weight-bold">
-                                    {{ __('Send Password Reset Link') }}
+                                    {{ __('auth.sendReset') }}
                                 </button>
                             </div>
                         </div>
@@ -37,7 +37,7 @@
             <div class="card mt-3">
                 <div class="card-body text-center">
                     <a class="btn btn-link font-weight-bold" href="{{ route('login') }}">
-                        {{ __('Back to Login') }}
+                        {{ __('auth.backLogin') }}
                     </a>
                 </div>
             </div>
diff --git a/resources/views/auth/passwords/reset.blade.php b/resources/views/auth/passwords/reset.blade.php
index e160f2109..79e3785e2 100644
--- a/resources/views/auth/passwords/reset.blade.php
+++ b/resources/views/auth/passwords/reset.blade.php
@@ -5,7 +5,7 @@
     <div class="row justify-content-center">
         <div class="col-lg-5">
             <div class="card">
-                <div class="card-header bg-white p-3 text-center font-weight-bold">{{ __('Reset Password') }}</div>
+                <div class="card-header bg-white p-3 text-center font-weight-bold">{{ __('auth.reset') }}</div>
 
                 <div class="card-body">
                     <form method="POST" action="{{ route('password.request') }}">
@@ -15,7 +15,7 @@
 
                         <div class="form-group row">
                             <div class="col-md-12">
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" placeholder="{{ __('E-Mail Address') }}" required autofocus>
+                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ $email ?? old('email') }}" placeholder="{{ __('auth.emailAddress') }}" required autofocus>
                                 @if ($errors->has('email'))
                                     <span class="invalid-feedback">
                                         <strong>{{ $errors->first('email') }}</strong>
@@ -26,7 +26,7 @@
                         <hr>
                         <div class="form-group row">
                             <div class="col-md-12">
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ __('Password') }}" required>
+                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ __('auth.password') }}" required>
 
                                 @if ($errors->has('password'))
                                     <span class="invalid-feedback">
@@ -38,7 +38,7 @@
 
                         <div class="form-group row">
                             <div class="col-md-12">
-                                <input id="password-confirm" type="password" class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}" name="password_confirmation" placeholder="{{ __('Confirm Password') }}" required>
+                                <input id="password-confirm" type="password" class="form-control{{ $errors->has('password_confirmation') ? ' is-invalid' : '' }}" name="password_confirmation" placeholder="{{ __('auth.confirm-password') }}" required>
 
                                 @if ($errors->has('password_confirmation'))
                                     <span class="invalid-feedback">
@@ -51,7 +51,7 @@
                         <div class="form-group row mb-0">
                             <div class="col-md-12">
                                 <button type="submit" class="btn btn-primary btn-block py-0 font-weight-bold">
-                                    {{ __('Reset Password') }}
+                                    {{ __('auth.reset') }}
                                 </button>
                             </div>
                         </div>
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index 5f3b6e503..497519d69 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -5,7 +5,7 @@
     <div class="row justify-content-center">
         <div class="col-lg-5">
             <div class="card">
-                <div class="card-header bg-white p-3 text-center font-weight-bold">{{ __('Register a new account') }}</div>
+                <div class="card-header bg-white p-3 text-center font-weight-bold">{{ __('auth.registerTitle') }}</div>
 
                 <div class="card-body">
                     <form method="POST" action="{{ route('register') }}" class="px-md-3">
@@ -13,7 +13,7 @@
                         <input type="hidden" name="rt" value="{{ (new \App\Http\Controllers\Auth\RegisterController())->getRegisterToken() }}">
                         <div class="form-group row">
                             <div class="col-md-12">
-                                <label class="small font-weight-bold text-lighter">Name</label>
+                                <label class="small font-weight-bold text-lighter">{{ __('auth.name') }}</label>
                                 <input id="name" type="text" class="form-control{{ $errors->has('name') ? ' is-invalid' : '' }}" name="name" value="{{ old('name') }}" placeholder="{{ __('Name') }}" required autofocus>
 
                                 @if ($errors->has('name'))
@@ -26,8 +26,8 @@
 
                         <div class="form-group row">
                             <div class="col-md-12">
-                                <label class="small font-weight-bold text-lighter">Username</label>
-                                <input id="username" type="text" class="form-control{{ $errors->has('username') ? ' is-invalid' : '' }}" name="username" value="{{ old('username') }}" placeholder="{{ __('Username') }}" required>
+                                <label class="small font-weight-bold text-lighter">{{ __('auth.username') }}</label>
+                                <input id="username" type="text" class="form-control{{ $errors->has('username') ? ' is-invalid' : '' }}" name="username" value="{{ old('username') }}" placeholder="{{ __('auth.username') }}" required>
 
                                 @if ($errors->has('username'))
                                     <span class="invalid-feedback">
@@ -40,7 +40,7 @@
                         <div class="form-group row">
                             <div class="col-md-12">
                                 <label class="small font-weight-bold text-lighter">Email</label>
-                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="{{ __('E-Mail Address') }}" required>
+                                <input id="email" type="email" class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}" name="email" value="{{ old('email') }}" placeholder="{{ __('auth.emailAddress') }}" required>
 
                                 @if ($errors->has('email'))
                                     <span class="invalid-feedback">
@@ -52,8 +52,8 @@
 
                         <div class="form-group row">
                             <div class="col-md-12">
-                                <label class="small font-weight-bold text-lighter">Password</label>
-                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ __('Password') }}" required>
+                                <label class="small font-weight-bold text-lighter">{{ __('auth.password') }}</label>
+                                <input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{ __('auth.password') }}" required>
 
                                 @if ($errors->has('password'))
                                     <span class="invalid-feedback">
@@ -65,8 +65,8 @@
 
                         <div class="form-group row">
                             <div class="col-md-12">
-                                <label class="small font-weight-bold text-lighter">Confirm Password</label>
-                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="{{ __('Confirm Password') }}" required>
+                                <label class="small font-weight-bold text-lighter">{{ __('auth.confirm-password')}}</label>
+                                <input id="password-confirm" type="password" class="form-control" name="password_confirmation" placeholder="{{ __('auth.confirm-password') }}" required>
                             </div>
                         </div>
 
@@ -75,7 +75,7 @@
                                 <div class="form-check">
                                   <input class="form-check-input" name="agecheck" type="checkbox" value="true" id="ageCheck" required>
                                   <label class="form-check-label" for="ageCheck">
-                                    I am at least 16 years old
+                                  {{ __('auth.age') }}
                                   </label>
                                 </div>
                             </div>
@@ -87,12 +87,12 @@
                         </div>
                         @endif
 
-                        <p class="small">By signing up, you agree to our <a href="{{route('site.terms')}}" class="font-weight-bold text-dark">Terms of Use</a> and <a href="{{route('site.privacy')}}" class="font-weight-bold text-dark">Privacy Policy</a>.</p>
-                        
+                        <p class="small">{!! __('auth.terms') !!}</p>
+
                         <div class="form-group row">
                             <div class="col-md-12">
                                 <button type="submit" class="btn btn-primary btn-block py-0 font-weight-bold">
-                                    {{ __('Register') }}
+                                    {{ __('auth.register') }}
                                 </button>
                             </div>
                         </div>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 4cd507820..389c7a78e 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -87,7 +87,7 @@
 @endauth
 
 @guest
-<html lang="en">
+<html lang="{{ app()->getLocale() }}">
 <head>
 	<meta charset="utf-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
diff --git a/resources/views/layouts/partial/nav.blade.php b/resources/views/layouts/partial/nav.blade.php
index 1d89902bf..db1ab5784 100644
--- a/resources/views/layouts/partial/nav.blade.php
+++ b/resources/views/layouts/partial/nav.blade.php
@@ -19,13 +19,13 @@
 				<ul class="navbar-nav ml-auto">
 					<li>
 						<a class="nav-link font-weight-bold text-dark" href="/login" title="Login">
-							{{ __('Login') }}
+							{{ __('auth.login') }}
 						</a>
 					</li>
 				@if(config_cache('pixelfed.open_registration') && in_array(config_cache('system.user_mode'), ['default', 'admin']))
 					<li>
 						<a class="ml-3 nav-link font-weight-bold text-dark" href="/register" title="Register">
-							{{ __('Register') }}
+							{{ __('auth.register') }}
 						</a>
 					</li>
 				@endif
diff --git a/resources/views/site/index.blade.php b/resources/views/site/index.blade.php
index 314e549d3..e5b42f688 100644
--- a/resources/views/site/index.blade.php
+++ b/resources/views/site/index.blade.php
@@ -50,8 +50,8 @@
 			<div class="row pt-md-5 mt-5">
 				<div class="col-12 col-md-6 d-none d-md-block">
 					<div class="m-my-4">
-						<p class="display-2 font-weight-bold">Photo Sharing</p>
-						<p class="h1 font-weight-bold">For Everyone.</p>
+						<p class="display-2 font-weight-bold">{{ __('site.title1') }}</p>
+						<p class="h1 font-weight-bold">{{ __('site.title2') }}</p>
 					</div>
 				</div>
 				<div class="col-12 col-md-5 offset-md-1">
@@ -61,12 +61,12 @@
 							<span class="font-weight-bold h3 ml-2 pt-2">Pixelfed</span>
 						</div>
 						<div class="d-block d-md-none">
-							<p class="font-weight-bold mb-0 text-center">Photo Sharing. For Everyone</p>
+							<p class="font-weight-bold mb-0 text-center">__('site.mainTitle')</p>
 						</div>
 						<div class="card my-4 shadow-none border">
 							<div class="card-body px-lg-5">
 								<div class="text-center">
-									<p class="small text-uppercase font-weight-bold text-muted">Account Login</p>
+									<p class="small text-uppercase font-weight-bold text-muted">{{ __('auth.loginTitle') }} </p>
 								</div>
 								<div>
 									<form class="px-1" method="POST" action="{{ route('login') }}" id="login_form">
@@ -87,7 +87,7 @@
 										<div class="form-group row">
 
 											<div class="col-md-12">
-												<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{__('Password')}}" required>
+												<input id="password" type="password" class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}" name="password" placeholder="{{__('auth.password')}}" required>
 
 												@if ($errors->has('password'))
 													<span class="invalid-feedback">
@@ -103,7 +103,7 @@
 													<label>
 														<input type="checkbox" name="remember" {{ old('remember') ? 'checked' : '' }}>
 														<span class="font-weight-bold small ml-1 text-muted">
-															{{ __('Remember Me') }}
+															{{ __('auth.remember') }}
 														</span>
 													</label>
 												</div>
@@ -117,7 +117,7 @@
 										<div class="form-group row mb-0">
 											<div class="col-md-12">
 												<button type="submit" class="btn btn-primary btn-block btn-lg font-weight-bold text-uppercase">
-													{{ __('Login') }}
+													{{ __('auth.login') }}
 												</button>
 
 											</div>
@@ -129,10 +129,10 @@
 						<div class="card shadow-none border card-body">
 							<p class="text-center mb-0 font-weight-bold">
 								@if(config_cache('pixelfed.open_registration'))
-								<a href="/register">Register</a>
+								<a href="/register">{{ __('auth.register')}}</a>
 								<span class="px-1">·</span>
 								@endif
-								<a href="/password/reset">Password Reset</a>
+								<a href="/password/reset">{{ __('auth.reset') }}</a>
 							</p>
 						</div>
 					</div>