Fixes #106 - adds Google Authenticator support (#2842)

* refactor to clean up LDAP login, and make the login method easier to handle.

* Login refactor cleanup

* Google 2FA package

* Adds Google Authenticator two-factor

* Removed unused blade

* Added optin setting in profile

* Removed dumb comments

* Made lock_passwords check more consistent

* Additional two factor strings

* Lock passwords check

* Display feature disabled text if in demo mode

* Two factor admin reset options

* Translation strings

app/Http/Controllers/Auth/AuthController.php

@@ -15,6 +15,7 @@ use Input;
 use Redirect;
 use Log;
 use View;
+use PragmaRX\Google2FA\Google2FA;
 
 
 
@@ -48,7 +49,7 @@ class AuthController extends Controller
      */
     public function __construct()
     {
-        $this->middleware('guest', ['except' => 'logout']);
+        $this->middleware('guest', ['except' => ['logout','postTwoFactorAuth','getTwoFactorAuth','getTwoFactorEnroll']]);
     }
 
 
@@ -63,6 +64,51 @@ class AuthController extends Controller
         return View::make('auth.login');
     }
 
+    private function login_via_ldap(Request $request)
+    {
+        LOG::debug("Binding user to LDAP.");
+        $ldap_user = Ldap::findAndBindUserLdap($request->input('username'), $request->input('password'));
+        if(!$ldap_user) {
+            LOG::debug("LDAP user ".$request->input('username')." not found in LDAP or could not bind");
+            throw new \Exception("Could not find user in LDAP directory");
+        } else {
+            LOG::debug("LDAP user ".$request->input('username')." successfully bound to LDAP");
+        }
+
+        // Check if the user exists in the database
+        $user = User::where('username', '=', Input::get('username'))->whereNull('deleted_at')->first();
+        LOG::debug("Local auth lookup complete");
+
+        // The user does not exist in the database. Try to get them from LDAP.
+        // If user does not exist and authenticates successfully with LDAP we
+        // will create it on the fly and sign in with default permissions
+        if (!$user) {
+            LOG::debug("Local user ".Input::get('username')." does not exist");
+            LOG::debug("Creating local user ".Input::get('username'));
+
+            if ($user = Ldap::createUserFromLdap($ldap_user)) { //this handles passwords on its own
+                LOG::debug("Local user created.");
+            } else {
+                LOG::debug("Could not create local user.");
+                throw new \Exception("Could not create local user");
+            }
+            // If the user exists and they were imported from LDAP already
+        } else {
+            LOG::debug("Local user ".$request->input('username')." exists in database. Updating existing user against LDAP.");
+
+            $ldap_attr = Ldap::parseAndMapLdapAttributes($ldap_user);
+
+            if (Setting::getSettings()->ldap_pw_sync=='1') {
+                $user->password = bcrypt($request->input('password'));
+            }
+
+            $user->email = $ldap_attr['email'];
+            $user->first_name = $ldap_attr['firstname'];
+            $user->last_name = $ldap_attr['lastname'];
+            $user->save();
+        } // End if(!user)
+        return $user;
+    }
 
 
     /**
@@ -77,120 +123,123 @@ class AuthController extends Controller
         if ($validator->fails()) {
             return redirect()->back()->withInput()->withErrors($validator);
         }
-
+        $user = null;
         // Should we even check for LDAP users?
         if (Setting::getSettings()->ldap_enabled=='1') {
-
             LOG::debug("LDAP is enabled.");
-            // Check if the user exists in the database
-            $user = User::where('username', '=', Input::get('username'))->whereNull('deleted_at')->first();
-            LOG::debug("Local auth lookup complete");
-
             try {
-                Ldap::findAndBindUserLdap($request->input('username'), $request->input('password'));
+              $user = $this->login_via_ldap($request);
-                LOG::debug("Binding user to LDAP.");
+              Auth::login($user, true);
             } catch (\Exception $e) {
-                LOG::debug("User ".Input::get('username').' did not authenticate successfully against LDAP.');
+              if(Setting::getSettings()->ldap_pw_sync!='1') {
-                //$ldap_error = $e->getMessage();
+                return redirect()->back()->withInput()->with('error',$e->getMessage());
-                // return redirect()->back()->withInput()->with('error',$e->getMessage());
+              }
             }
-
-
-            // The user does not exist in the database. Try to get them from LDAP.
-            // If user does not exist and authenticates sucessfully with LDAP we
-            // will create it on the fly and sign in with default permissions
-            if (!$user) {
-                LOG::debug("Local user ".Input::get('username')." does not exist");
-
-                try {
-
-                    if ($userattr = Ldap::findAndBindUserLdap($request->input('username'), $request->input('password'))) {
-                        LOG::debug("Creating local user ".Input::get('username'));
-
-                        if ($newuser = Ldap::createUserFromLdap($userattr)) {
-                            LOG::debug("Local user created.");
-                        } else {
-                            LOG::debug("Could not create local user.");
-                        }
-
-                    } else {
-                        LOG::debug("User did not authenticate correctly against LDAP. No local user was created.");
-                    }
-
-                } catch (\Exception $e) {
-                    return redirect()->back()->withInput()->with('error',$e->getMessage());
-                }
-
-            // If the user exists and they were imported from LDAP already
-            } else {
-
-                LOG::debug("Local user ".Input::get('username')." exists in database. Authenticating existing user against LDAP.");
-
-                if ($ldap_user = Ldap::findAndBindUserLdap($request->input('username'), $request->input('password'))) {
-                    $ldap_attr = Ldap::parseAndMapLdapAttributes($ldap_user);
-
-                    LOG::debug("Valid LDAP login. Updating the local data.");
-
-                    if (Setting::getSettings()->ldap_pw_sync=='1') {
-                        $user->password = bcrypt($request->input('password'));
-                    }
-
-                    $user->email = $ldap_attr['email'];
-                    $user->first_name = $ldap_attr['firstname'];
-                    $user->last_name = $ldap_attr['lastname'];
-                    $user->save();
-
-                    if (Setting::getSettings()->ldap_pw_sync!='1') {
-                        Auth::login($user, true);
-                        // Redirect to the users page
-                        return redirect()->to('/home')->with('success', trans('auth/message.signin.success'));
-                    }
-
-                } else {
-                    LOG::debug("User ".Input::get('username')." did not authenticate correctly against LDAP. Local user was not updated.");
-                }// End LDAP auth
-
-            } // End if(!user)
-
-        // NO LDAP enabled - just try to login the user normally
         }
 
-
+        // If the user wasn't authenticated via LDAP, skip to local auth
-        LOG::debug("Authenticating user against database.");
+        if(!$user) {
-        // Try to log the user in
+          LOG::debug("Authenticating user against database.");
-        if (!Auth::attempt(Input::only('username', 'password'), Input::get('remember-me', 0))) {
+          // Try to log the user in
-            LOG::debug("Local authentication failed.");
+          if (!Auth::attempt(Input::only('username', 'password'), Input::get('remember-me', 0))) {
-            // throw new Cartalyst\Sentry\Users\UserNotFoundException();
+              LOG::debug("Local authentication failed.");
-            return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found'));
+              return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found'));
+          }
         }
 
-
-
         // Get the page we were before
         $redirect = \Session::get('loginRedirect', 'home');
 
         // Unset the page we were before from the session
         \Session::forget('loginRedirect');
 
+
+
         // Redirect to the users page
         return redirect()->to($redirect)->with('success', trans('auth/message.signin.success'));
-
-        // Ooops.. something went wrong
-        return redirect()->back()->withInput()->withErrors($this->messageBag);
     }
 
+
+    /**
+     * Two factor enrollment page
+     *
+     * @return Redirect
+     */
+    public function getTwoFactorEnroll()
+    {
+
+        if (!Auth::check()) {
+            return redirect()->route('login')->with('error', 'You must be logged in.');
+        }
+
+        $user = Auth::user();
+        $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');
+
+        if ($user->two_factor_secret=='') {
+            $user->two_factor_secret = $google2fa->generateSecretKey();
+            $user->save();
+        }
+
+
+        $google2fa_url = $google2fa->getQRCodeGoogleUrl(
+            Setting::getSettings()->site_name,
+            $user->username,
+            $user->two_factor_secret
+        );
+
+        return View::make('auth.two_factor_enroll')->with('google2fa_url',$google2fa_url);
+
+    }
+
+
+    /**
+     * Two factor code form page
+     *
+     * @return Redirect
+     */
+    public function getTwoFactorAuth() {
+        return View::make('auth.two_factor');
+    }
+
+    /**
+     * Two factor code submission
+     *
+     * @return Redirect
+     */
+    public function postTwoFactorAuth(Request $request) {
+
+        if (!Auth::check()) {
+            return redirect()->route('login')->with('error', 'You must be logged in.');
+        }
+
+        $user = Auth::user();
+        $secret = $request->get('two_factor_secret');
+        $google2fa = app()->make('PragmaRX\Google2FA\Contracts\Google2FA');
+        $valid = $google2fa->verifyKey($user->two_factor_secret, $secret);
+
+        if ($valid) {
+            $user->two_factor_enrolled = 1;
+            $user->save();
+            $request->session()->put('2fa_authed', 'true');
+            return redirect()->route('home')->with('success', 'You are logged in!');
+        }
+
+        return redirect()->route('two-factor')->with('error', 'Invalid two-factor code');
+
+
+    }
+
+
     /**
      * Logout page.
      *
      * @return Redirect
      */
-    public function logout()
+    public function logout(Request $request)
     {
-        // Log the user out
+        $request->session()->forget('2fa_authed');
         Auth::logout();
-
+        return redirect()->route('login')->with('success', 'You have successfully logged out!');
-        // Redirect to the users page
-        return redirect()->route('home')->with('success', 'You have successfully logged out!');
     }
 
 

app/Http/Controllers/ProfileController.php

@@ -8,6 +8,7 @@ use App\Models\Location;
 use View;
 use Auth;
 use App\Helpers\Helper;
+use App\Models\Setting;
 
 /**
  * This controller handles all actions related to User Profiles for
@@ -53,6 +54,10 @@ class ProfileController extends Controller
         $user->gravatar   = e(Input::get('gravatar'));
         $user->locale = e(Input::get('locale'));
 
+        if ((Setting::getSettings()->two_factor_enabled=='1') && (!config('app.lock_passwords'))) {
+            $user->two_factor_optin = e(Input::get('two_factor_optin', '0'));
+        }
+        
         if (Input::file('avatar')) {
             $image = Input::file('avatar');
             $file_name = str_slug($user->first_name."-".$user->last_name).".".$image->getClientOriginalExtension();

app/Http/Controllers/SettingsController.php

@@ -260,10 +260,7 @@ class SettingsController extends Controller
     */
     public function getIndex()
     {
-        // Grab all the settings
         $settings = Setting::all();
-
-        // Show the page
         return View::make('settings/index', compact('settings'));
     }
 
@@ -316,10 +313,11 @@ class SettingsController extends Controller
         }
 
 
-        if (config('app.lock_passwords')==false) {
+        if (!config('app.lock_passwords')) {
             $setting->site_name = e(Input::get('site_name'));
             $setting->brand = e(Input::get('brand'));
             $setting->custom_css = e(Input::get('custom_css'));
+            $setting->two_factor_enabled = e(Input::get('two_factor_enabled'));
         }
 
         if (Input::get('per_page')!='') {
@@ -379,7 +377,7 @@ class SettingsController extends Controller
         }
 
         $alert_email = rtrim(Input::get('alert_email'), ',');
-        $alert_email = trim(Input::get('alert_email'));
+        $alert_email = trim($alert_email);
 
         $setting->alert_email = e($alert_email);
         $setting->alerts_enabled = e(Input::get('alerts_enabled', '0'));

app/Http/Controllers/UsersController.php

@@ -1365,4 +1365,23 @@ class UsersController extends Controller
         return $response;
 
     }
+
+
+    public function postTwoFactorReset(Request $request)
+    {
+        if (Gate::denies('users.edit')) {
+            return response()->json(['message' => trans('general.insufficient_permissions')], 500);
+        }
+
+        try {
+            $user = User::find($request->get('id'));
+            $user->two_factor_secret = null;
+            $user->two_factor_enrolled = 0;
+            $user->save();
+            return response()->json(['message' => trans('admin/settings/general.two_factor_reset_success')], 200);
+        } catch (\Exception $e) {
+            return response()->json(['message' => trans('admin/settings/general.two_factor_reset_error')], 500);
+        }
+
+    }
 }

app/Http/Kernel.php

@@ -35,6 +35,7 @@ class Kernel extends HttpKernel
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \App\Http\Middleware\CheckLocale::class,
+            \App\Http\Middleware\CheckForTwoFactor::class,
         ],
 
         'api' => [

app/Http/Middleware/CheckForTwoFactor.php

@@ -0,0 +1,51 @@
+<?php
+namespace App\Http\Middleware;
+use Closure;
+use Auth;
+use Log;
+use App\Models\Setting;
+
+class CheckForTwoFactor
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+
+        // Skip the logic if the user is on the two factor pages
+        if (($request->route()->getName()=='two-factor') || ($request->route()->getName()=='two-factor-enroll') || ($request->route()->getName()=='logout')) {
+            return $next($request);
+        }
+
+        // Two-factor is enabled (either optional or required)
+        if (Auth::check() && (Setting::getSettings()->two_factor_enabled!='')) {
+
+            // This user is already 2fa-authed
+            if ($request->session()->get('2fa_authed')){
+                return $next($request);
+            }
+
+            // Two-factor is optional and the user has NOT opted in, let them through
+            if ((Setting::getSettings()->two_factor_enabled=='1') && (Auth::user()->two_factor_optin!='1')) {
+                return $next($request);
+            }
+
+            // Otherwise make sure they're enrolled and show them the 2FA code screen
+            if ((Auth::user()->two_factor_secret!='') && (Auth::user()->two_factor_enrolled=='1')) {
+                return redirect()->route('two-factor')->with('info', 'Please enter your two-factor authentication code.');
+            } else {
+                return redirect()->route('two-factor-enroll')->with('success', 'Please enroll a device in two-factor authentication.');
+            }
+
+
+        }
+
+        return $next($request);
+
+    }
+}

app/Http/Middleware/CheckPermissions.php

@@ -23,6 +23,7 @@ class CheckPermissions
     public function handle($request, Closure $next, $section = null)
     {
 
+
         if (Gate::allows($section)) {
             return $next($request);
         }

app/Http/routes.php

@@ -90,6 +90,7 @@ Route::group([ 'prefix' => 'api', 'middleware' => 'auth' ], function () {
     /*---Users API---*/
     Route::group([ 'prefix' => 'users' ], function () {
         Route::post('/', [ 'as' => 'api.users.store', 'uses' => 'UsersController@store' ]);
+        Route::post('two_factor_reset', [ 'as' => 'api.users.two_factor_reset', 'uses' => 'UsersController@postTwoFactorReset' ]);
         Route::get('list/{status?}', [ 'as' => 'api.users.list', 'uses' => 'UsersController@getDatatable' ]);
         Route::get('{userId}/assets', [ 'as' => 'api.users.assetlist', 'uses' => 'UsersController@getAssetList' ]);
         Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'UsersController@postUpload' ]);
@@ -997,6 +998,29 @@ Route::group([ 'prefix' => 'setup', 'middleware' => 'web'], function () {
 
 });
 
+Route::get(
+    'two-factor-enroll',
+    [
+        'as' => 'two-factor-enroll',
+        'middleware' => ['web'],
+        'uses' => 'Auth\AuthController@getTwoFactorEnroll' ]
+);
+
+Route::get(
+    'two-factor',
+    [
+        'as' => 'two-factor',
+        'middleware' => ['web'],
+        'uses' => 'Auth\AuthController@getTwoFactorAuth' ]
+);
+
+Route::post(
+    'two-factor',
+    [
+        'as' => 'two-factor',
+        'middleware' => ['web'],
+        'uses' => 'Auth\AuthController@postTwoFactorAuth' ]
+);
 
 Route::get(
     '/',
@@ -1006,8 +1030,24 @@ Route::get(
     'uses' => 'DashboardController@getIndex' ]
 );
 
+
+
 Route::group(['middleware' => 'web'], function () {
     Route::auth();
+    Route::get(
+        'login',
+        [
+            'as' => 'login',
+            'middleware' => ['web'],
+            'uses' => 'Auth\AuthController@showLoginForm' ]
+    );
+    Route::get(
+        'logout',
+        [
+            'as' => 'logout',
+            'uses' => 'Auth\AuthController@logout' ]
+    );
+
 });
 
 Route::get('home', function () {

app/Models/Ldap.php

@@ -222,7 +222,7 @@ class Ldap extends Model
                 return true;
             } else {
                 LOG::debug('Could not create user.'.$user->getErrors());
-                exit;
+                throw new Exception("Could not create user: ".$user->getErrors());
             }
         }
 

composer.json

@@ -23,7 +23,8 @@
       "barryvdh/laravel-debugbar": "^2.1",
       "spatie/laravel-backup": "3.8.1",
       "misterphilip/maintenance-mode": "1.0.*",
-      "neitanod/forceutf8": "dev-master"
+      "neitanod/forceutf8": "dev-master",
+      "pragmarx/google2fa": "^1.0"
     },
     "require-dev": {
       "fzaninotto/faker": "~1.4",

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "ed9f8700f2dcd943ff662a82e4d8314f",
+    "hash": "a188b3cf19debb9f4ad80016cb02bacd",
-    "content-hash": "9c0251ddc1a110d83a762483abeea079",
+    "content-hash": "d05155478c07249acdb2fed3d47189e6",
     "packages": [
         {
             "name": "aws/aws-sdk-php",
@@ -197,6 +197,60 @@
             ],
             "time": "2016-07-29 15:00:36"
         },
+        {
+            "name": "christian-riesen/base32",
+            "version": "1.3.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ChristianRiesen/base32.git",
+                "reference": "0a31e50c0fa9b1692d077c86ac188eecdcbaf7fa"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ChristianRiesen/base32/zipball/0a31e50c0fa9b1692d077c86ac188eecdcbaf7fa",
+                "reference": "0a31e50c0fa9b1692d077c86ac188eecdcbaf7fa",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "4.*",
+                "satooshi/php-coveralls": "0.*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Base32\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Riesen",
+                    "email": "chris.riesen@gmail.com",
+                    "homepage": "http://christianriesen.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Base32 encoder/decoder according to RFC 4648",
+            "homepage": "https://github.com/ChristianRiesen/base32",
+            "keywords": [
+                "base32",
+                "decode",
+                "encode",
+                "rfc4648"
+            ],
+            "time": "2016-05-05 11:49:03"
+        },
         {
             "name": "classpreloader/classpreloader",
             "version": "3.0.0",
@@ -2056,6 +2110,67 @@
             ],
             "time": "2016-03-18 20:34:03"
         },
+        {
+            "name": "pragmarx/google2fa",
+            "version": "v1.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/antonioribeiro/google2fa.git",
+                "reference": "b346dc138339b745c5831405d00cff7c1351aa0d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/antonioribeiro/google2fa/zipball/b346dc138339b745c5831405d00cff7c1351aa0d",
+                "reference": "b346dc138339b745c5831405d00cff7c1351aa0d",
+                "shasum": ""
+            },
+            "require": {
+                "christian-riesen/base32": "~1.3",
+                "paragonie/random_compat": "~1.4|~2.0",
+                "php": ">=5.4",
+                "symfony/polyfill-php56": "~1.2"
+            },
+            "require-dev": {
+                "phpspec/phpspec": "~2.1"
+            },
+            "suggest": {
+                "bacon/bacon-qr-code": "Required to generate inline QR Codes."
+            },
+            "type": "library",
+            "extra": {
+                "component": "package",
+                "frameworks": [
+                    "Laravel"
+                ],
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PragmaRX\\Google2FA\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Antonio Carlos Ribeiro",
+                    "email": "acr@antoniocarlosribeiro.com",
+                    "role": "Creator & Designer"
+                }
+            ],
+            "description": "A One Time Password Authentication package, compatible with Google Authenticator.",
+            "keywords": [
+                "Authentication",
+                "Two Factor Authentication",
+                "google2fa",
+                "laravel"
+            ],
+            "time": "2016-07-18 20:25:04"
+        },
         {
             "name": "psr/http-message",
             "version": "1.0.1",

config/app.php

@@ -212,7 +212,7 @@ return [
         Fideloper\Proxy\TrustedProxyServiceProvider::class,
         MisterPhilip\MaintenanceMode\MaintenanceModeServiceProvider::class,
         MisterPhilip\MaintenanceMode\MaintenanceCommandServiceProvider::class,
-
+        PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class,
         /*
          * Custom service provider
          */
@@ -269,6 +269,7 @@ return [
         'View'      => Illuminate\Support\Facades\View::class,
         'Form'      => 'Collective\Html\FormFacade',
         'Html'      => 'Collective\Html\HtmlFacade',
+        'Google2FA' => PragmaRX\Google2FA\Vendor\Laravel\Facade::class,
     ],
 
 ];

database/migrations/2016_10_29_002724_enable_2fa_fields.php

@@ -0,0 +1,43 @@
+<?php
+
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class Enable2faFields extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('settings', function ($table) {
+            $table->tinyInteger('two_factor_enabled')->nullable()->default(null);
+        });
+
+        Schema::table('users', function ($table) {
+            $table->string('two_factor_secret', 32)->nullable()->default(null);
+            $table->boolean('two_factor_enrolled')->default(0);
+            $table->boolean('two_factor_optin')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('settings', function ($table) {
+            $table->dropColumn('two_factor_enabled');
+        });
+
+        Schema::table('users', function ($table) {
+            $table->dropColumn('two_factor_secret');
+            $table->dropColumn('two_factor_enrolled');
+            $table->dropColumn('two_factor_optin');
+        });
+    }
+}

resources/lang/ar/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/ar/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'عرض الكل',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'الموقع',
     'locations'				=> 'المواقع',
     'logout'				=> 'تسجيل خروج',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'بطاقات الحالة',
     'status'    			=> 'الحالة',
     'suppliers'  			=> 'الموردون',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'إجمالي الأصول',
     'total_licenses'		=> 'إجمالي الرخص',
     'total_accessories'		=> 'total accessories',

resources/lang/bg/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/bg/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Преглед на всички',
     'loading'				=> 'Зареждане',
     'lock_passwords'        => 'Полето не може да бъде редактирано в тази конфигурация.',
-    'feature_disabled'      => 'Функционалността е неактивна в тази конфигурация.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Местоположение',
     'locations'				=> 'Местоположения',
     'logout'				=> 'Изход',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Статус етикети',
     'status'    			=> 'Статус',
     'suppliers'  			=> 'Доставчици',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'общо активи',
     'total_licenses'		=> 'общо лицензи',
     'total_accessories'		=> 'total accessories',

resources/lang/cs/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/cs/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Vypsat vše',
     'loading'				=> 'Nahrávání',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Lokalita',
     'locations'				=> 'Umístění',
     'logout'				=> 'Odhlásit',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Označení stavu',
     'status'    			=> 'Stav',
     'suppliers'  			=> 'Dodavatelé',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'celkem zařízení',
     'total_licenses'		=> 'celkem licencí',
     'total_accessories'		=> 'total accessories',

resources/lang/da/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/da/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Vis alle',
     'loading'				=> 'Indlæser',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Lokation',
     'locations'				=> 'Lokationer',
     'logout'				=> 'Log ud',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Leverandører',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'totale aktiver',
     'total_licenses'		=> 'totale licenser',
     'total_accessories'		=> 'total accessories',

resources/lang/de/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'b',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'links',
     'right'        => 'rechts',
     'top'        => 'Oben',

resources/lang/de/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Alle auflisten',
     'loading'				=> 'Am laden',
     'lock_passwords'        => 'Dieses Feld kann in dieser Installation nicht bearbeitet werden.',
-    'feature_disabled'      => 'Die Funktion wurde in dieser Installation deaktiviert.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Standort',
     'locations'				=> 'Standorte',
     'logout'				=> 'Abmelden',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Statusbezeichnungen',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Lieferanten',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'Gesamte Assets',
     'total_licenses'		=> 'Lizenzen insgesamt',
     'total_accessories'		=> 'gesamtes Zubehör',

resources/lang/el/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/el/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Suppliers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
     'total_accessories'		=> 'total accessories',

resources/lang/en-GB/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/en-GB/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Suppliers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
     'total_accessories'		=> 'total accessories',

resources/lang/en-ID/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/en-ID/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Suppliers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
     'total_accessories'		=> 'total accessories',

resources/lang/en/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/en/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Suppliers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
     'total_accessories'		=> 'total accessories',

resources/lang/es-CO/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/es-CO/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Suppliers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
     'total_accessories'		=> 'total accessories',

resources/lang/es-ES/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'an',
     'height_h'        => 'al',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'izquierda',
     'right'        => 'derecha',
     'top'        => 'arriba',

resources/lang/es-ES/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Listar Todo',
     'loading'				=> 'Cargando',
     'lock_passwords'        => 'Este campo no puede ser editado en ésta instalación.',
-    'feature_disabled'      => 'Esta funcionalidad ha sido deshabilitada para esta instalación.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Localización',
     'locations'				=> 'Localizaciones',
     'logout'				=> 'Desconexión',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Etiquetas Estados',
     'status'    			=> 'Estados',
     'suppliers'  			=> 'Proveedores',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'Equipos',
     'total_licenses'		=> 'licencias totales',
     'total_accessories'		=> 'total accessories',

resources/lang/fa/admin/settings/general.php

@@ -105,6 +105,22 @@ return array(
     'width_w'        => 'عرض',
     'height_h'        => 'ارتفاع',
     'text_pt'        => 'بالای صفحه',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'چپ',
     'right'        => 'راست',
     'top'        => 'بالا',

resources/lang/fa/general.php

@@ -97,7 +97,7 @@
     'loading'				=> 'بارگزاری',
     'lock_passwords'        => 'در این زمینه می توانید  نصب و راه اندازی را ویرایش کنید.
 ',
-    'feature_disabled'      => 'این قابلیت برای این نصب و راه اندازی غیر فعال است.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'مکان',
     'locations'				=> 'مکانها',
     'logout'				=> 'خروج',
@@ -155,6 +155,7 @@
     'status_labels'			=> 'برچسب های وضعیت',
     'status'    			=> 'وضعیت',
     'suppliers'  			=> 'تامین کننده',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'کل دارایی',
     'total_licenses'		=> 'کل مجوزهای',
     'total_accessories'		=> 'total accessories',

resources/lang/fi/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/fi/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Listaa Kaikki',
     'loading'				=> 'Ladataan',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Sijainti',
     'locations'				=> 'Sijainnit',
     'logout'				=> 'Kirjaudu Ulos',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Tilamerkinnät',
     'status'    			=> 'Tila',
     'suppliers'  			=> 'Toimittajat',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'laitteita yhteensä',
     'total_licenses'		=> 'lisenssejä yhteensä',
     'total_accessories'		=> 'total accessories',

resources/lang/fr/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'l',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'gauche',
     'right'        => 'droite',
     'top'        => 'haut',

resources/lang/fr/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Lister tout',
     'loading'				=> 'Chargement',
     'lock_passwords'        => 'Ce champ ne peut pas être modifié dans cette installation.',
-    'feature_disabled'      => 'Cette option n\'est pas disponible pour cette installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Lieu',
     'locations'				=> 'Lieux',
     'logout'				=> 'Se déconnecter',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Étiquette de statut',
     'status'    			=> 'Statut',
     'suppliers'  			=> 'Fournisseurs',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'actifs au total',
     'total_licenses'		=> 'licences au total',
     'total_accessories'		=> 'accessoires au total',

resources/lang/he/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/he/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Suppliers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
     'total_accessories'		=> 'total accessories',

resources/lang/hr/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/hr/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Suppliers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
     'total_accessories'		=> 'total accessories',

resources/lang/hu/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/hu/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Listázd mind',
     'loading'				=> 'Betöltés',
     'lock_passwords'        => 'A mező nem módosítható ebben a vezióban.',
-    'feature_disabled'      => 'Ez a képesség le van tíltva ebben a verzióban.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Helyszín',
     'locations'				=> 'Helyek',
     'logout'				=> 'Kijelentkezés',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Státusz címkék',
     'status'    			=> 'Állapot',
     'suppliers'  			=> 'Beszállítók',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'eszköz összesen',
     'total_licenses'		=> 'licensz összesen',
     'total_accessories'		=> 'total accessories',

resources/lang/id/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'l',
     'height_h'        => 't',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'kiri',
     'right'        => 'kanan',
     'top'        => 'atas',

resources/lang/id/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Tampilkan semua',
     'loading'				=> 'Memuat',
     'lock_passwords'        => 'Field ini tidak dapat di edit ketika instalasi.',
-    'feature_disabled'      => 'Fitur ini telah di non-aktifkan untuk instalasi ini.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Lokasi',
     'locations'				=> 'Lokasi',
     'logout'				=> 'Keluar',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status label',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Pemasok',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total aset',
     'total_licenses'		=> 'total lisensi',
     'total_accessories'		=> 'total accessories',

resources/lang/it/admin/models/general.php

@@ -4,7 +4,7 @@ return array(
 
     'deleted'  					        => 'Questo modello è stato eliminato.<a href="/hardware/models/:model_id/restore">Clicca qui per ripristinarlo</a>.',
     'restore'                   => 'Ripristinare il modello',
-    'requestable'               => 'Users may request this model',
+    'requestable'               => 'Gli utenti possono richiedere questo modello',
 	'show_mac_address'			      => 'Mostra MAC Address dei beni in questo modello',
     'view_deleted'              => 'Visualizza Eliminati',
     'view_models'               => 'Visualizza i modelli',

resources/lang/it/admin/settings/general.php

@@ -2,11 +2,11 @@
 
 return array(
     'ad'				        => 'Active Directory',
-    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain'				    => 'Dominio Active Directory',
     'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
     'is_ad'				        => 'This is an Active Directory server',
 	'alert_email'				=> 'Invia avvisi a',
-	'alerts_enabled'			=> 'Alerts Enabled',
+	'alerts_enabled'			=> 'Allarmi Attivati',
 	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
 	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'ID modello',
@@ -15,13 +15,13 @@ return array(
 	'auto_incrementing_help'    => 'Abilita auto-incremento ID beni prima di impostare questa',
 	'backups'					=> 'Backups',
 	'barcode_settings'			=> 'Impostazioni codice a barre',
-    'confirm_purge'			    => 'Confirm Purge',
+    'confirm_purge'			    => 'Conferma Cancellazione',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
 	'custom_css'				=> 'CSS Personalizzato',
 	'custom_css_help'			=> 'Inserisci qualsiasi CSS personalizzato che vuoi utilizzare. Do not include the <style></style> tags.',
 	'default_currency'  		=> 'Valuta predefinita',
 	'default_eula_text'			=> 'EULA Predefinita',
-  'default_language'					=> 'Default Language',
+  'default_language'					=> 'Lingua predefinita',
 	'default_eula_help_text'	=> 'È possibile associare EULAs personalizzati a categorie di beni specifici.',
     'display_asset_name'        => 'Mostra Nome Bene',
     'display_checkout_date'     => 'Mostra Data Estrazione',
@@ -45,13 +45,13 @@ return array(
 	'ldap_server_cert'			=> 'Validazione certificato SSL di LDAP',
 	'ldap_server_cert_ignore'	=> 'Consenti Certificato SSL non valido',
 	'ldap_server_cert_help'		=> 'Seleziona questa casella se stai utilizzando un certificato SSL autofirmato e vuoi accettare un certificato SSL non valido.',
-    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls'                  => 'Usa TLS',
     'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
     'ldap_uname'                => 'Nome utente LDAP',
     'ldap_pword'                => 'Password LDAP',
     'ldap_basedn'               => 'DN Base',
     'ldap_filter'               => 'Filtro LDAP',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync'              => 'Sincronizzazione password LDAP',
     'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
     'ldap_username_field'       => 'Campo nome utente',
     'ldap_lname_field'          => 'Cognome',
@@ -88,7 +88,7 @@ return array(
     'brand'                     => 'Personalizzazione',
     'about_settings_title'      => 'Impostazioni',
     'about_settings_text'       => 'Queste impostazioni ti permettono di personalizzare alcuni aspetti della tua installazione.',
-    'labels_per_page'           => 'Labels per page',
+    'labels_per_page'           => 'Etichetta per pagina',
     'label_dimensions'          => 'Label dimensions (inches)',
     'page_padding'             => 'Page margins (inches)',
     'purge'                    => 'Purge Deleted Records',
@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/it/admin/statuslabels/message.php

@@ -8,18 +8,18 @@ return array(
 
     'create' => array(
         'error'   => 'Status Label was not created, please try again.',
-        'success' => 'Status Label created successfully.'
+        'success' => 'La etichetta di stato è creato correttamente.'
     ),
 
     'update' => array(
         'error'   => 'Status Label was not updated, please try again',
-        'success' => 'Status Label updated successfully.'
+        'success' => 'La etichetta di stato è stato aggiornato correttamente.'
     ),
 
     'delete' => array(
         'confirm'   => 'Are you sure you wish to delete this Status Label?',
         'error'   => 'There was an issue deleting the Status Label. Please try again.',
-        'success' => 'The Status Label was deleted successfully.'
+        'success' => 'L\'etichetta di stato è stata cancellata correttamente.'
     )
 
 );

resources/lang/it/admin/users/general.php

@@ -11,7 +11,7 @@ return array(
     'filetype_info'     => 'I formati di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.',
     'history_user'      => 'Storico di :name',
     'last_login'        => 'Ultimo accesso',
-    'ldap_config_text'  => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
+    'ldap_config_text'  => 'Le impostazioni di configurazione di LDAP possono essere trovate su Admin > Impostazioni. La posizione selezionata (facoltativa) verrà impostata per tutti gli utenti importati.',
     'software_user'     => 'Software estratto a :name',
     'view_user'         => 'Visualizza Utente :name',
     'usercsv'           => 'CSV file',

resources/lang/it/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Visualizza Tutti',
     'loading'				=> 'Caricamento',
     'lock_passwords'        => 'Questo campo non può essere modificato in quest\'installazione.',
-    'feature_disabled'      => 'Questa funzione è stata disabilitata in quest\'installazione.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Luogo',
     'locations'				=> 'Luoghi',
     'logout'				=> 'logout',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Etichetta di Stato',
     'status'    			=> 'Stato',
     'suppliers'  			=> 'Fornitori',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'Assets totali',
     'total_licenses'		=> 'Totale licenze',
     'total_accessories'		=> 'total accessories',

resources/lang/it/passwords.php

@@ -2,6 +2,6 @@
 
 return [
     'sent'	        => 'Your password link has been sent!',
-    'user'			=> 'That user does not exist or does not have an email address associated',
+    'user'			=> 'Questo utente non esiste o non ha una email associata',
 ];
 

resources/lang/it/validation.php

@@ -33,7 +33,7 @@ return array(
     "digits_between"   => "il  :attribute deve essere tra :min e :max digits.",
     "email"            => "il formato del :attribute è invalido.",
     "exists"           => ":attribute selezzionato è invalido.",
-    "email_array"      => "One or more email addresses is invalid.",
+    "email_array"      => "Una o più email sono invalidi.",
     "image"            => "il :attribute deve essere un immagine.",
     "in"               => "Il selezionato :attribute è invalido.",
     "integer"          => "L' :attribute deve essere un numero intero.",
@@ -64,8 +64,8 @@ return array(
     ),
     "unique"           => "L' :attribute è già stato preso.",
     "url"              => "Il formato dell' :attribute è invalido.",
-    "statuslabel_type" => "You must select a valid status label type",
+    "statuslabel_type" => "Devi selezionare un tipo di stato valido",
-    "unique_undeleted" => "The :attribute must be unique.",
+    "unique_undeleted" => "L'attributo deve essere univoco.",
 
 
     /*

resources/lang/ja/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => '左',
     'right'        => '右',
     'top'        => '上',

resources/lang/ja/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> '全ての一覧',
     'loading'				=> '読み込み中…',
     'lock_passwords'        => 'このフィールドは、インストール中に編集できません。',
-    'feature_disabled'      => 'インストール中、この機能は利用できません。',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => '設置場所',
     'locations'				=> '設置場所の数',
     'logout'				=> 'ログアウト',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'ステータスラベル',
     'status'    			=> 'ステータス',
     'suppliers'  			=> '仕入先',
+    'submit'				=> 'Submit',
     'total_assets'			=> '資産の合計',
     'total_licenses'		=> 'ライセンスの合計',
     'total_accessories'		=> 'total accessories',

resources/lang/ko/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => '넓이',
     'height_h'        => '높이',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => '왼쪽',
     'right'        => '오른쪽',
     'top'        => '위',

resources/lang/ko/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> '전체 목록보기',
     'loading'				=> '불러오는 중',
     'lock_passwords'        => '이 설치에서는 이 항목을 수정할 수 없습니다.',
-    'feature_disabled'      => '이 설정에서는 이 기능은 사용 할 수 없습니다.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => '장소',
     'locations'				=> '위치',
     'logout'				=> '로그아웃',
@@ -151,6 +151,7 @@
     'status_labels'			=> '상태 딱지',
     'status'    			=> '상태',
     'suppliers'  			=> '공급자',
+    'submit'				=> 'Submit',
     'total_assets'			=> '총 자산',
     'total_licenses'		=> '총 라이선스',
     'total_accessories'		=> 'total accessories',

resources/lang/lt/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/lt/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Parodyti viską',
     'loading'				=> 'Įkeliama',
     'lock_passwords'        => 'Šis laukelis negali būti keičiamas šiame diegime.',
-    'feature_disabled'      => 'Šis pasirinkimas buvo atjungtas šiame diegime.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Vieta',
     'locations'				=> 'Vietovės',
     'logout'				=> 'Atsijungti',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Būklės kortelės',
     'status'    			=> 'Būklė',
     'suppliers'  			=> 'Tiekėjai',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'įrangos iš viso',
     'total_licenses'		=> 'iš viso licenzijų',
     'total_accessories'		=> 'total accessories',

resources/lang/ms/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/ms/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Senaraikan Semua',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Lokasi',
     'locations'				=> 'Lokasi',
     'logout'				=> 'Log keluar',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Label Status',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Pembekal',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'jumlah harta',
     'total_licenses'		=> 'jumlah lesen',
     'total_accessories'		=> 'total accessories',

resources/lang/nl/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'b',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'links',
     'right'        => 'rechts',
     'top'        => 'bovenkant',

resources/lang/nl/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Toon Alles',
     'loading'				=> 'Bezig met laden',
     'lock_passwords'        => 'Dit veld kan niet worden bewerkt met deze installatie.',
-    'feature_disabled'      => 'Deze functie is uitgeschakeld voor deze installatie.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Locatie',
     'locations'				=> 'Locaties',
     'logout'				=> 'Afmelden',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Statuslabels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Leveranciers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'totaal aantal materialen',
     'total_licenses'		=> 'Totale licenties',
     'total_accessories'		=> 'totaal aantal accessoires',

resources/lang/no/admin/components/message.php

@@ -21,15 +21,15 @@ return array(
     ),
 
      'checkout' => array(
-        'error'   		=> 'Component was not checked out, please try again',
+        'error'   		=> 'Komponent ble ikke sjekket ut. Prøv igjen',
-        'success' 		=> 'Component checked out successfully.',
+        'success' 		=> 'Vellykket utsjekk av komponent.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.'
     ),
 
     'checkin' => array(
-        'error'   		=> 'Component was not checked in, please try again',
+        'error'   		=> 'Komponenten ble ikke sjekket inn, vennligst prøv igjen',
-        'success' 		=> 'Component checked in successfully.',
+        'success' 		=> 'Vellykket innsjekk av komponent.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.'
     )
 
 

resources/lang/no/admin/consumables/general.php

@@ -3,12 +3,12 @@
 return array(
     'about_consumables_title' 			=> 'Om Forbruksvarer',
     'about_consumables_text'  			=> 'Forbruksvarer er alle varer som blir brukt opp over tid. For eksempel, skriver toner eller kopi papir.',
-    'checkout'                          => 'Checkout Consumable to User',
+    'checkout'                          => 'Sjekk ut Forbruksvare til Bruker',
     'consumable_name'                   => 'Navn på forbruksvare',
     'cost'              				=> 'Innkjøpskostnad',
     'create'                            => 'Legg til forbruksvare',
     'date'					            => 'Innkjøpsdato',
-    'item_no'                           => 'Item No.',
+    'item_no'                           => 'Varenr.',
     'order'					            => 'Ordrenummer',
     'remaining' 			            => 'Gjenstår',
     'total' 			                => 'Total',

resources/lang/no/admin/custom_fields/general.php

@@ -5,17 +5,17 @@ return array(
     'field'		                => 'Felt',
     'about_fieldsets_title'		=> 'Om Feltsett',
     'about_fieldsets_text'		=> 'Feltsett lar deg opprette grupper av egendefinerte felt som ofte gjenbrukes brukes til bestemte modelltyper.',
-    'custom_format'             => 'Custom format...',
+    'custom_format'             => 'Egendefinert format...',
-    'encrypt_field'      	        => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.',
+    'encrypt_field'      	        => 'Krypter verdien i dette feltet i databasen for hvert asset. De krypterte verdiene kan bare leses av administratorer.',
-    'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',
+    'encrypt_field_help'      => 'ADVARSEL: Ved å kryptere et felt gjør du at det ikke kan søkes på.',
-    'encrypted'      	        => 'Encrypted',
+    'encrypted'      	        => 'Kryptert',
     'fieldset'      	        => 'Feltsett',
     'qty_fields'      	      => 'Antall Felt',
     'fieldsets'      	        => 'Feltsett',
     'fieldset_name'           => 'Feltsett Navn',
     'field_name'              => 'Felt Navn',
-    'field_values'            => 'Field Values',
+    'field_values'            => 'Felt verdier',
-    'field_values_help'       => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).',
+    'field_values_help'       => 'Legge til alternativer, ett per linje. Tomme linjer utenom den første linjen ignoreres. Skill verdier og etiketter med "pipe" på hver linje (valgfritt).',
     'field_element'           => 'Skjema Element',
     'field_element_short'     => 'Element',
     'field_format'            => 'Format',
@@ -26,5 +26,5 @@ return array(
     'order'   		            => 'Bestill',
     'create_fieldset'         => 'Nytt Feltsett',
     'create_field'            => 'Nytt Egendefinert Felt',
-    'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
+    'value_encrypted'      	        => 'Verdien i dette feltet er kryptert i databasen. Bare administratorer kan se hva som står i dette feltet',
 );

resources/lang/no/admin/hardware/general.php

@@ -3,7 +3,7 @@
 return array(
 	'archived'  				=> 'Arkivert',
     'asset'  					=> 'Eiendel',
-    'bulk_checkout'             => 'Checkout Assets to User',
+    'bulk_checkout'             => 'Sjekk ut Eiendel til Bruker',
     'checkin'  					=> 'Sjekk inn eiendel',
     'checkout'  				=> 'Sjekk ut eiendel til bruker',
     'clone'  					=> 'Klon eiendel',
@@ -13,7 +13,7 @@ return array(
 	'filetype_info'				=> 'Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
     'model_deleted'  			=> 'Denne eiendelsmodellen er slettet. Du må gjenopprette modellen før du kan gjenopprette eiendelen.<br/> <a href="/hardware/models/:model_id/restore">Klikk her for å gjenopprette modellen</a>.',
     'requestable'               => 'Forespørrbar',
-    'requested'				    => 'Requested',
+    'requested'				    => 'Forespurt',
     'restore'  					=> 'Gjenopprett eiendel',
     'pending'  					=> 'Under arbeid',
     'undeployable'  			=> 'Ikke utleverbar',

resources/lang/no/admin/hardware/message.php

@@ -37,11 +37,11 @@ return array(
     ),
 
     'import' => array(
-        'error'                 => 'Some items did not import correctly.',
+        'error'                 => 'Noen elementer ble ikke importert riktig.',
-        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'errorDetail'           => 'Følgende elementer ble ikke importert på grunn av feil.',
-        'success'               => "Your file has been imported",
+        'success'               => "Filen har blitt importert",
-        'file_delete_success'   => "Your file has been been successfully deleted",
+        'file_delete_success'   => "Filen har blitt slettet",
-        'file_delete_error'      => "The file was unable to be deleted",
+        'file_delete_error'      => "Filen kunne ikke bli slettet",
     ),
 
 
@@ -55,21 +55,21 @@ return array(
         'error'   		=> 'Eiendel ble ikke sjekket ut. Prøv igjen',
         'success' 		=> 'Vellykket utsjekk av eiendel.',
         'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
-        'not_available' => 'That asset is not available for checkout!'
+        'not_available' => 'Den eiendelen er ikke tilgjengelig til å sjekkes ut!'
     ),
 
     'checkin' => array(
         'error'   		=> 'Eiendel ble ikke sjekket inn. Prøv igjen',
         'success' 		=> 'Vellykket innsjekk av eiendel.',
         'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.',
-        'already_checked_in'  => 'That asset is already checked in.',
+        'already_checked_in'  => 'Den eiendelen er allerede sjekket inn.',
 
     ),
 
     'requests' => array(
         'error'   		=> 'Eiendelen ble ikke forespurt, prøv igjen',
         'success' 		=> 'Eiendel ble forespurt.',
-        'canceled'      => 'Checkout request successfully canceled'
+        'canceled'      => 'Utsjekkingsforespørselen ble kansellert'
     )
 
 );

resources/lang/no/admin/licenses/form.php

@@ -9,7 +9,7 @@ return array(
     'date'              => 'Innkjøpsdato',
     'depreciation'      => 'Avskrivning',
     'expiration'        => 'Utløpsdato',
-    'license_key'       => 'Product Key',
+    'license_key'       => 'Produktnøkkel',
     'maintained'        => 'Vedlikeholdt',
     'name'              => 'Navn programvare',
     'no_depreciation'   => 'Ingen avskrivning',

resources/lang/no/admin/licenses/message.php

@@ -23,7 +23,7 @@ return array(
         'error'   => 'Fil(er) ble ikke lastet opp. Prøv igjen.',
         'success' => 'Fil(er) ble slettet.',
         'nofiles' => 'Ingen fil er valgt til opplasting, eller filen er for stor',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, txt, zip, rar, and rtf.',
+        'invalidfiles' => 'En eller flere av filene er for stor, eller er en filtype som ikke er tillatt. Tillatte filtyper er png, gif, jpg, doc, docx, pdf, txt, zip, rar og rtf.',
     ),
 
     'update' => array(

resources/lang/no/admin/locations/table.php

@@ -1,7 +1,7 @@
 <?php
 
 return array(
-    'assets_rtd'		=> 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+    'assets_rtd'		=> 'Eiendeler', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
     'assets_checkedout'		=> 'Eiendeler tildelt',
     'id'      		=> 'ID',
     'city'   		=> 'By',

resources/lang/no/admin/models/general.php

@@ -4,7 +4,7 @@ return array(
 
     'deleted'  					        => 'Denne modellen er slettet. <a href="/hardware/models/:model_id/restore">Klikk her for å gjenopprette</a>.',
     'restore'                   => 'Gjenopprett modell',
-    'requestable'               => 'Users may request this model',
+    'requestable'               => 'Brukere kan be om denne modellen',
 	'show_mac_address'			      => 'Vis felt for MAC-adresse for denne modellen',
     'view_deleted'              => 'Vis slettede',
     'view_models'               => 'Vis modeller',

resources/lang/no/admin/settings/general.php

@@ -2,11 +2,11 @@
 
 return array(
     'ad'				        => 'Active Directory',
-    'ad_domain'				    => 'Active Directory domain',
+    'ad_domain'				    => 'Active Directory domene',
-    'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'ad_domain_help'			=> 'Dette er noen ganger det samme som e-post domene, men ikke alltid.',
-    'is_ad'				        => 'This is an Active Directory server',
+    'is_ad'				        => 'Dette er en Active Directory server',
 	'alert_email'				=> 'Send varslinger til',
-	'alerts_enabled'			=> 'Alerts Enabled',
+	'alerts_enabled'			=> 'Varslinger aktivert',
 	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
 	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
 	'asset_ids'					=> 'Eiendels-IDer',
@@ -15,21 +15,21 @@ return array(
 	'auto_incrementing_help'    => 'Aktiver først automatisk øking av eiendels-IDer for å velge dette alternativet',
 	'backups'					=> 'Sikkerhetskopier',
 	'barcode_settings'			=> 'Strekkodeinnstillinger',
-    'confirm_purge'			    => 'Confirm Purge',
+    'confirm_purge'			    => 'Bekreft rensking',
-    'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
+    'confirm_purge_help'		=> 'Skriv "DELETE" i boksen under for å fjerne dine slettende data. Dette kan ikke reverseres.',
 	'custom_css'				=> 'Egendefinert CSS',
 	'custom_css_help'			=> 'Legg til egendefinert CSS. Ikke ta med taggene <style></style>.',
 	'default_currency'  		=> 'Standardvaluta',
 	'default_eula_text'			=> 'Standard EULA',
-  'default_language'					=> 'Default Language',
+  'default_language'					=> 'Standardspråk',
 	'default_eula_help_text'	=> 'Du kan også knytte tilpassede EULAer til bestemte eiendelskategorier.',
     'display_asset_name'        => 'Vis eiendelsnavn',
     'display_checkout_date'     => 'Vis utsjekksdato',
     'display_eol'               => 'Vis levetid i tabellvisning',
-    'display_qr'                => 'Display Square Codes',
+    'display_qr'                => 'Vis Qr-kode',
-	'display_alt_barcode'		=> 'Display 1D barcode',
+	'display_alt_barcode'		=> 'Vis 1D strekkode',
-	'barcode_type'				=> '2D Barcode Type',
+	'barcode_type'				=> '2D strekkodetype',
-	'alt_barcode_type'			=> '1D barcode type',
+	'alt_barcode_type'			=> '1D strekkodetype',
     'eula_settings'				=> 'EULA-innstillinger',
     'eula_markdown'				=> 'Denne EULAen tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored markdown</a>.',
     'general_settings'			=> 'Generelle innstillinger',
@@ -41,18 +41,18 @@ return array(
     'ldap_integration'          => 'LDAP Integrering',
     'ldap_settings'             => 'LDAP Instillinger',
     'ldap_server'               => 'LDAP Server',
-    'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
+    'ldap_server_help'          => 'Dette bør starte med ldap:// (for ukryptert eller TLS) eller ldaps:// (for SSL)',
 	'ldap_server_cert'			=> 'Validering av LDAP SSL sertifikat',
 	'ldap_server_cert_ignore'	=> 'Godta ugyldig SSL sertifikat',
-	'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
+	'ldap_server_cert_help'		=> 'Kryss av denne boksen hvis du bruker et selv-signert SSL sertifikat og vil akkseptere et ugyldig sertifikat.',
-    'ldap_tls'                  => 'Use TLS',
+    'ldap_tls'                  => 'Bruk TLS',
-    'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
+    'ldap_tls_help'             => 'Kryss av denne hvis du kjører STARTTLS på LDAP-serveren. ',
     'ldap_uname'                => 'LDAP Bundet brukernavn',
     'ldap_pword'                => 'LDAP Bind passord',
     'ldap_basedn'               => 'Base Bind DN',
     'ldap_filter'               => 'LDAP Filter',
-    'ldap_pw_sync'              => 'LDAP Password Sync',
+    'ldap_pw_sync'              => 'LDAP-passord Sync',
-    'ldap_pw_sync_help'         => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.',
+    'ldap_pw_sync_help'         => 'Ta bort kryss på denne boksen hvis du ikke vil at LDAP passord skal holdes synkronisert med lokale passord. Ved å skru av dette er det mulig at brukerne ikke vil klare å logge på om de ikke får tak i LDAP serveren.',
     'ldap_username_field'       => 'Brukernavn Felt',
     'ldap_lname_field'          => 'Etternavn',
     'ldap_fname_field'          => 'LDAP Fornavn',
@@ -88,27 +88,43 @@ return array(
     'brand'                     => 'Merkevare',
     'about_settings_title'      => 'Om Innstillinger',
     'about_settings_text'       => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.',
-    'labels_per_page'           => 'Labels per page',
+    'labels_per_page'           => 'Etiketter per side',
-    'label_dimensions'          => 'Label dimensions (inches)',
+    'label_dimensions'          => 'Etikettstørrelsen (inches)',
-    'page_padding'             => 'Page margins (inches)',
+    'page_padding'             => 'Side marger (inches)',
-    'purge'                    => 'Purge Deleted Records',
+    'purge'                    => 'Tømme slettede poster',
     'labels_display_bgutter'    => 'Label bottom gutter',
     'labels_display_sgutter'    => 'Label side gutter',
-    'labels_fontsize'           => 'Label font size',
+    'labels_fontsize'           => 'Label skriftstørrelse',
     'labels_pagewidth'          => 'Label sheet width',
     'labels_pageheight'         => 'Label sheet height',
     'label_gutters'        => 'Label spacing (inches)',
     'page_dimensions'        => 'Page dimensions (inches)',
     'label_fields'          => 'Label visible fields',
     'inches'        => 'inches',
-    'width_w'        => 'w',
+    'width_w'        => 'b',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
-    'left'        => 'left',
+    'two_factor'        => 'Two Factor Authentication',
-    'right'        => 'right',
+    'two_factor_secret'        => 'Two-Factor Code',
-    'top'        => 'top',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
-    'bottom'        => 'bottom',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
-    'vertical'        => 'vertical',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
-    'horizontal'        => 'horizontal',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
-    'zerofill_count'        => 'Length of asset tags, including zerofill',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
+    'left'        => 'venstre',
+    'right'        => 'høyre',
+    'top'        => 'topp',
+    'bottom'        => 'bunn',
+    'vertical'        => 'vertikal',
+    'horizontal'        => 'horisontal',
+    'zerofill_count'        => 'Lengden på ID-merker, inkludert zerofill',
 );

resources/lang/no/admin/users/general.php

@@ -4,14 +4,14 @@
 return array(
 
     'assets_user'       => 'Eiendeler tildelt :name',
-    'current_assets'    => 'Assets currently checked out to this user',
+    'current_assets'    => 'Eiendeler som er sjekket ut til denne brukeren',
     'clone'             => 'Klon bruker',
     'contact_user'      => 'Kontakt :navn',
     'edit'              => 'Rediger bruker',
     'filetype_info'     => 'Gyldige filtyper er png, gif, jpg, jpeg, doc docx, pdf, txt, zip og rar.',
     'history_user'      => 'Historikk for :name',
     'last_login'        => 'Siste innlogging',
-    'ldap_config_text'  => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
+    'ldap_config_text'  => 'LDAP-konfigurasjonsinnstillingene kan finnes på Admin > innstillinger. Den (Valgfrie) valgte plasseringen angis for alle importerte brukere.',
     'software_user'     => 'Programvare utsjekket til :name',
     'view_user'         => 'Vis bruker :name',
     'usercsv'           => 'CSV-fil',

resources/lang/no/auth/general.php

@@ -1,12 +1,12 @@
 <?php
 
 return [
-    'send_password_link'	        => 'Send Password Reset Link',
+    'send_password_link'	        => 'Send Passord Tilbakestillingslink',
-    'email_reset_password'			=> 'Email Password Reset',
+    'email_reset_password'			=> 'E-post Passord Tilbakestill',
-    'reset_password'			    => 'Reset Password',
+    'reset_password'			    => 'Tilbakestill Passord',
-    'login'                         => 'Login',
+    'login'                         => 'Logg inn',
-    'login_prompt'                  => 'Please Login',
+    'login_prompt'                  => 'Vennligst logg inn',
-    'forgot_password'               => 'I forgot my password',
+    'forgot_password'               => 'Jeg har glemt passordet mitt',
-    'remember_me'                   => 'Remember Me',
+    'remember_me'                   => 'Husk meg',
     ];
 

resources/lang/no/general.php

@@ -71,7 +71,7 @@
     'generate'				=> 'Generer',
     'groups'				=> 'Grupper',
     'gravatar_email'        => 'Gravatar e-postadresse',
-    'history'  			    => 'History',
+    'history'  			    => 'Historie',
     'history_for'  			=> 'Historikk for',
     'id'  					=> 'ID',
     'image_delete'         	=> 'Slett bilde',
@@ -83,7 +83,7 @@
     'asset_maintenances'       => 'Vedlikehold av eiendeler',
     'item'  				=> 'Enhet',
     'insufficient_permissions' => 'Utilstrekkelige rettigheter!',
-    'language'				=> 'Language',
+    'language'				=> 'Språk',
     'last'					=> 'Siste',
     'last_name'             => 'Etternavn',
     'license'				=> 'Lisens',
@@ -93,22 +93,22 @@
     'list_all'				=> 'List alle',
     'loading'				=> 'Laster',
     'lock_passwords'        => 'Feltet kan ikke redigeres i denne installasjonen.',
-    'feature_disabled'      => 'Denne funksjonen er deaktivert i denne installasjonen.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Lokasjon',
     'locations'				=> 'Lokasjoner',
     'logout'				=> 'Logg ut',
-    'lookup_by_tag'     => 'Lookup by Asset Tag',
+    'lookup_by_tag'     => 'Søk på ID-merke',
     'manufacturer'			=> 'Produsent',
     'manufacturers'			=> 'Produsenter',
-    'markdown'				=> 'This field allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+    'markdown'				=> 'Dette feltet tillater <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'min_amt'				=> 'Min. QTY',
+    'min_amt'				=> 'Min. antall',
-    'min_amt_help'	=> 'Minimum number of items that should be available before an alert gets triggered.',
+    'min_amt_help'	=> 'Minimum antall varer som skal være tilgjengelig før et varsel blir utløst.',
     'model_no'				=> 'Modellnummer',
     'months'				=> 'måneder',
     'moreinfo'				=> 'Mer info',
     'name'					=> 'Navn',
     'next'					=> 'Neste',
-    'new'					=> 'new!',
+    'new'					=> 'ny!',
     'no_depreciation'		=> 'Ingen avskrivning',
     'no_results'			=> 'Ingen treff.',
     'no'  					=> 'Nummer',
@@ -145,12 +145,13 @@
     'select_asset'    		=> 'Select Asset',
     'settings'				=> 'Innstillinger',
     'sign_in'				=> 'Logg inn',
-    'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.',
+    'some_features_disabled' => 'DEMO MODUS: Noe funksjonalitet er skrudd av i denne installasjonen.',
     'site_name'				=> 'Nettstedsnavn',
     'state'  				=> 'Stat',
     'status_labels'			=> 'Statusmerker',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Leverandører',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'eiendeler totalt',
     'total_licenses'		=> 'lisener totalt',
     'total_accessories'		=> 'total accessories',

resources/lang/no/passwords.php

@@ -1,7 +1,7 @@
 <?php
 
 return [
-    'sent'	        => 'Your password link has been sent!',
+    'sent'	        => 'Din passord link har blitt sendt!',
-    'user'			=> 'That user does not exist or does not have an email address associated',
+    'user'			=> 'Den brukeren eksisterer ikke eller har ikke en e-post assosiert',
 ];
 

resources/lang/pl/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'szerokość',
     'height_h'        => 'wysokość',
     'text_pt'        => 'piksel',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'lewo',
     'right'        => 'prawo',
     'top'        => 'góra',

resources/lang/pl/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Pokaż Wszystkie',
     'loading'				=> 'Wczytywanie',
     'lock_passwords'        => 'Tego pola nie można edytować dla tej instalacji.',
-    'feature_disabled'      => 'Ta funkcja została wyłączona dla tej instalacji.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Lokalizacja',
     'locations'				=> 'Lokalizacje',
     'logout'				=> 'Wyloguj się',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Etykiety Statusu',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Dostawcy',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'Ogółem aktywów',
     'total_licenses'		=> 'Ogółem licencji',
     'total_accessories'		=> 'total accessories',

resources/lang/pt-BR/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'largura',
     'height_h'        => 'altura',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'esquerda',
     'right'        => 'direita',
     'top'        => 'topo',

resources/lang/pt-BR/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Listar Todos',
     'loading'				=> 'Carregando',
     'lock_passwords'        => 'Este campo não pode ser editado nessa instalação.',
-    'feature_disabled'      => 'Esta função foi desabilitada para esta instalação.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Local',
     'locations'				=> 'Locais',
     'logout'				=> 'Sair',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Rótulos de Status',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Fornecedores',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'ativos no total',
     'total_licenses'		=> 'licenças no total',
     'total_accessories'		=> 'total accessories',

resources/lang/pt-PT/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'esquerda',
     'right'        => 'direita',
     'top'        => 'topo',

resources/lang/pt-PT/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Listar todas',
     'loading'				=> 'A carregar',
     'lock_passwords'        => 'Este atributo não pode ser editado nesta instalação.',
-    'feature_disabled'      => 'Esta funcionalidade foi desabilitada neste instalação.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Localização',
     'locations'				=> 'Localizações',
     'logout'				=> 'Sair',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Estados',
     'status'    			=> 'Estado',
     'suppliers'  			=> 'Fornecedores',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'artigos',
     'total_licenses'		=> 'licenças',
     'total_accessories'		=> 'total accessories',

resources/lang/ro/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/ro/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Arata tot',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Locatie',
     'locations'				=> 'Locatii',
     'logout'				=> 'Log out',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Etichete status',
     'status'    			=> 'Stare',
     'suppliers'  			=> 'Furnizori',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'Total active',
     'total_licenses'		=> 'Total licente',
     'total_accessories'		=> 'total accessories',

resources/lang/ru/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'слева',
     'right'        => 'справа',
     'top'        => 'сверху',

resources/lang/ru/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Весь список',
     'loading'				=> 'Загрузка',
     'lock_passwords'        => 'Поле не может быть изменено в этой версии.',
-    'feature_disabled'      => 'Функция отключена в этой версии.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Расположение',
     'locations'				=> 'Места',
     'logout'				=> 'Выйти',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Этикетки',
     'status'    			=> 'Статус',
     'suppliers'  			=> 'Поставщики',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'Всего активов',
     'total_licenses'		=> 'Всего лицензий',
     'total_accessories'		=> 'total accessories',

resources/lang/sv-SE/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/sv-SE/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Lista Alla',
     'loading'				=> 'Laddar',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Plats',
     'locations'				=> 'Platser',
     'logout'				=> 'Logga ut',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Status Labels',
     'status'    			=> 'Status',
     'suppliers'  			=> 'Suppliers',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'total assets',
     'total_licenses'		=> 'total licenses',
     'total_accessories'		=> 'total accessories',

resources/lang/th/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/th/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'รายการทั้งหมด',
     'loading'				=> 'กำลังโหลด',
     'lock_passwords'        => 'ฟิลด์นี้ไม่สามารถแก้ไขได้ในการติดตั้งนี้',
-    'feature_disabled'      => 'ฟีทเจอร์นี้ถูกปิดการใช้งานสำหรับการติดตั้งนี้',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'สถานที่',
     'locations'				=> 'สถานที่',
     'logout'				=> 'ออกจากระบบ',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'ป้ายสถานะ',
     'status'    			=> 'สถานะ',
     'suppliers'  			=> 'ตัวแทนจำหน่าย',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'ทรัพย์สินทั้งหมด',
     'total_licenses'		=> 'ลิขสิทธิ์ทั้งหมด',
     'total_accessories'		=> 'total accessories',

resources/lang/tr/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/tr/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'List All',
     'loading'				=> 'Loading',
     'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Konumlar',
     'logout'				=> 'Çıkış Yap',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Durum Etiketleri',
     'status'    			=> 'Durum',
     'suppliers'  			=> 'Tedarikçiler',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'Toplam Demirbaşlar',
     'total_licenses'		=> 'Toplam Lisanslar',
     'total_accessories'		=> 'total accessories',

resources/lang/vi/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => 'w',
     'height_h'        => 'h',
     'text_pt'        => 'pt',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => 'left',
     'right'        => 'right',
     'top'        => 'top',

resources/lang/vi/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> 'Tất cả',
     'loading'				=> 'Đang tải',
     'lock_passwords'        => 'Trường này không thể chỉnh sửa trong cài đặt này.',
-    'feature_disabled'      => 'Đặc tính này đã bị tắt ở cài đặt này.',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Địa phương',
     'locations'				=> 'Địa phương',
     'logout'				=> 'Thoát',
@@ -151,6 +151,7 @@
     'status_labels'			=> 'Tình trạng nhãn',
     'status'    			=> 'Tình trạng',
     'suppliers'  			=> 'Nhà cung cấp',
+    'submit'				=> 'Submit',
     'total_assets'			=> 'tổng số tài sản',
     'total_licenses'		=> 'tổng số bản quyền',
     'total_accessories'		=> 'total accessories',

resources/lang/zh-CN/admin/settings/general.php

@@ -104,6 +104,22 @@ return array(
     'width_w'        => '宽',
     'height_h'        => '高',
     'text_pt'        => '磅',
+    'two_factor'        => 'Two Factor Authentication',
+    'two_factor_secret'        => 'Two-Factor Code',
+    'two_factor_enrollment'        => 'Two-Factor Enrollment',
+    'two_factor_enabled_text'        => 'Enable Two Factor',
+    'two_factor_reset'        => 'Reset Two-Factor Secret',
+    'two_factor_reset_help'        => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+    'two_factor_reset_success'          => 'Two factor device successfully reset',
+    'two_factor_reset_error'          => 'Two factor device reset failed',
+    'two_factor_enabled_warning'        => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
+    'two_factor_enabled_help'        => 'This will turn on two-factor authentication using Google Authenticator.',
+    'two_factor_optional'        => 'Optional (Users can enable or disable)',
+    'two_factor_required'        => 'Required for all users',
+    'two_factor_disabled'        => 'Disabled',
+    'two_factor_enter_code'	=> 'Enter Two-Factor Code',
+    'two_factor_config_complete'	=> 'Submit Code',
+    'two_factor_enrollment_text'	=> "Two factor authentication is required, however your device has not been enrolled yet. Open your Google Authenticator app and scan the QR code below to enroll your device. Once you've enrolled your device, enter the code below",
     'left'        => '左',
     'right'        => '右',
     'top'        => '顶部',

resources/lang/zh-CN/general.php

@@ -93,7 +93,7 @@
     'list_all'				=> '列出全部',
     'loading'				=> '加载中',
     'lock_passwords'        => '此区域无法编辑',
-    'feature_disabled'      => '此功能已被停用。',
+    'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => '位置',
     'locations'				=> '地理位置',
     'logout'				=> '注销',
@@ -151,6 +151,7 @@
     'status_labels'			=> '状态标签',
     'status'    			=> '状态',
     'suppliers'  			=> '供应商',
+    'submit'				=> 'Submit',
     'total_assets'			=> '共计资产',
     'total_licenses'		=> '共计许可证',
     'total_accessories'		=> 'total accessories',