From 3a8edfdf5888d71be8ae0831b8b8cdf1f2643b27 Mon Sep 17 00:00:00 2001 From: Daniel Meltzer Date: Fri, 28 Oct 2016 16:15:13 -0500 Subject: [PATCH 01/43] Eager load many more things. Fixes a lot of n+1 queries in ajax/bootstrap tables requests (#2832) --- .../Controllers/AccessoriesController.php | 8 ++- .../Controllers/AssetModelsController.php | 4 +- app/Http/Controllers/CategoriesController.php | 7 +-- .../Controllers/ConsumablesController.php | 7 ++- app/Http/Controllers/LicensesController.php | 5 +- .../Controllers/ManufacturersController.php | 31 +++++++--- app/Http/Controllers/SuppliersController.php | 6 +- app/Models/License.php | 60 +++++++++++++------ app/Models/Supplier.php | 23 ++++++- 9 files changed, 108 insertions(+), 43 deletions(-) diff --git a/app/Http/Controllers/AccessoriesController.php b/app/Http/Controllers/AccessoriesController.php index 6769346361..33d49d35be 100755 --- a/app/Http/Controllers/AccessoriesController.php +++ b/app/Http/Controllers/AccessoriesController.php @@ -530,9 +530,11 @@ class AccessoriesController extends Controller **/ public function getDatatable(Request $request) { - $accessories = Company::scopeCompanyables(Accessory::select('accessories.*')->with('category', 'company')) - ->whereNull('accessories.deleted_at'); - + $accessories = Company::scopeCompanyables( + Accessory::select('accessories.*') + ->whereNull('accessories.deleted_at') + ->with('category', 'company', 'manufacturer', 'users', 'location') + ); if (Input::has('search')) { $accessories = $accessories->TextSearch(e(Input::get('search'))); } diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php index 3bbd9640b3..31411f2a4b 100755 --- a/app/Http/Controllers/AssetModelsController.php +++ b/app/Http/Controllers/AssetModelsController.php @@ -416,7 +416,7 @@ class AssetModelsController extends Controller public function getDatatable($status = null) { - $models = AssetModel::with('category', 'assets', 'depreciation'); + $models = AssetModel::with('category', 'assets', 'depreciation', 'manufacturer'); switch ($status) { case 'Deleted': @@ -491,7 +491,7 @@ class AssetModelsController extends Controller */ public function getDataView($modelID) { - $assets = Asset::where('model_id', '=', $modelID)->with('company'); + $assets = Asset::where('model_id', '=', $modelID)->with('company', 'assetstatus'); if (Input::has('search')) { $assets = $assets->TextSearch(e(Input::get('search'))); diff --git a/app/Http/Controllers/CategoriesController.php b/app/Http/Controllers/CategoriesController.php index f6141c8e05..600336e805 100755 --- a/app/Http/Controllers/CategoriesController.php +++ b/app/Http/Controllers/CategoriesController.php @@ -307,9 +307,9 @@ class CategoriesController extends Controller public function getDataViewAssets($categoryID) { - $category = Category::with('assets.company')->find($categoryID); + $category = Category::find($categoryID); + $category = $category->load('assets.company', 'assets.model', 'assets.assetstatus', 'assets.assigneduser'); $category_assets = $category->assets(); - if (Input::has('search')) { $category_assets = $category_assets->TextSearch(e(Input::get('search'))); } @@ -333,7 +333,6 @@ class CategoriesController extends Controller $count = $category_assets->count(); $category_assets = $category_assets->skip($offset)->take($limit)->get(); $rows = array(); - foreach ($category_assets as $asset) { $actions = ''; @@ -364,7 +363,7 @@ class CategoriesController extends Controller 'assigned_to' => ($asset->assigneduser) ? (string)link_to('/admin/users/'.$asset->assigneduser->id.'/view', $asset->assigneduser->fullName()): '', 'change' => $inout, 'actions' => $actions, - 'companyName' => Company::getName($asset), + 'companyName' => is_null($asset->company) ? '' : e($asset->company->name) ); } diff --git a/app/Http/Controllers/ConsumablesController.php b/app/Http/Controllers/ConsumablesController.php index 07e2ade5dd..e053107461 100644 --- a/app/Http/Controllers/ConsumablesController.php +++ b/app/Http/Controllers/ConsumablesController.php @@ -390,8 +390,11 @@ class ConsumablesController extends Controller */ public function getDatatable() { - $consumables = Company::scopeCompanyables(Consumable::select('consumables.*')->whereNull('consumables.deleted_at') - ->with('company', 'location', 'category', 'users')); + $consumables = Company::scopeCompanyables( + Consumable::select('consumables.*') + ->whereNull('consumables.deleted_at') + ->with('company', 'location', 'category', 'users', 'manufacturer') + ); if (Input::has('search')) { $consumables = $consumables->TextSearch(e(Input::get('search'))); diff --git a/app/Http/Controllers/LicensesController.php b/app/Http/Controllers/LicensesController.php index 221f7a6048..b89d6cad68 100755 --- a/app/Http/Controllers/LicensesController.php +++ b/app/Http/Controllers/LicensesController.php @@ -742,6 +742,7 @@ class LicensesController extends Controller { $license = License::find($licenseId); + $license = $license->load('assignedusers', 'licenseSeats.user', 'licenseSeats.asset'); if (isset($license->id)) { @@ -947,7 +948,7 @@ class LicensesController extends Controller */ public function getDatatable() { - $licenses = Company::scopeCompanyables(License::with('company')); + $licenses = Company::scopeCompanyables(License::with('company', 'licenseSeatsRelation', 'manufacturer')); if (Input::has('search')) { $licenses = $licenses->TextSearch(Input::get('search')); @@ -991,7 +992,7 @@ class LicensesController extends Controller 'id' => $license->id, 'name' => (string) link_to('/admin/licenses/'.$license->id.'/view', $license->name), 'serial' => (string) link_to('/admin/licenses/'.$license->id.'/view', mb_strimwidth($license->serial, 0, 50, "...")), - 'totalSeats' => $license->totalSeatsByLicenseID(), + 'totalSeats' => $license->licenseSeatsCount, 'remaining' => $license->remaincount(), 'license_name' => e($license->license_name), 'license_email' => e($license->license_email), diff --git a/app/Http/Controllers/ManufacturersController.php b/app/Http/Controllers/ManufacturersController.php index 666b8f8ea6..640ae891dc 100755 --- a/app/Http/Controllers/ManufacturersController.php +++ b/app/Http/Controllers/ManufacturersController.php @@ -257,7 +257,7 @@ class ManufacturersController extends Controller */ public function getDataView($manufacturerId, $itemtype = null) { - $manufacturer = Manufacturer::with('assets.company')->find($manufacturerId); + $manufacturer = Manufacturer::find($manufacturerId); switch ($itemtype) { case "assets": @@ -276,6 +276,7 @@ class ManufacturersController extends Controller protected function getDataAssetsView(Manufacturer $manufacturer) { + $manufacturer = $manufacturer->load('assets.model', 'assets.assigneduser', 'assets.assetstatus', 'assets.company'); $manufacturer_assets = $manufacturer->assets; if (Input::has('search')) { @@ -329,20 +330,22 @@ class ManufacturersController extends Controller 'serial' => e($asset->serial), 'assigned_to' => ($asset->assigneduser) ? (string)link_to('/admin/users/'.$asset->assigneduser->id.'/view', e($asset->assigneduser->fullName())): '', 'actions' => $actions, - 'companyName' => e(Company::getName($asset)), + // 'companyName' => e(Company::getName($asset)), + 'companyName' => is_null($asset->company) ? '' : $asset->company->name ); - if (isset($inout)) { - $row['change'] = $inout; - } + if (isset($inout)) { + $row['change'] = $inout; } - + } + $data = array('total' => $count, 'rows' => $rows); return $data; } protected function getDataLicensesView(Manufacturer $manufacturer) { + $manufacturer = $manufacturer->load('licenses.company', 'licenses.manufacturer', 'licenses.licenseSeatsRelation'); $licenses = $manufacturer->licenses; if (Input::has('search')) { @@ -380,7 +383,7 @@ class ManufacturersController extends Controller 'id' => $license->id, 'name' => (string) link_to('/admin/licenses/'.$license->id.'/view', $license->name), 'serial' => (string) link_to('/admin/licenses/'.$license->id.'/view', mb_strimwidth($license->serial, 0, 50, "...")), - 'totalSeats' => $license->totalSeatsByLicenseID(), + 'totalSeats' => $license->licenseSeatCount, 'remaining' => $license->remaincount(), 'license_name' => e($license->license_name), 'license_email' => e($license->license_email), @@ -403,6 +406,13 @@ class ManufacturersController extends Controller public function getDataAccessoriesView(Manufacturer $manufacturer) { + $manufacturer = $manufacturer->load( + 'accessories.location', + 'accessories.company', + 'accessories.category', + 'accessories.manufacturer', + 'accessories.users' + ); $accessories = $manufacturer->accessories; if (Input::has('search')) { @@ -461,6 +471,13 @@ class ManufacturersController extends Controller public function getDataConsumablesView($manufacturer) { + $manufacturer = $manufacturer->load( + 'consumables.location', + 'consumables.company', + 'consumables.category', + 'consumables.manufacturer', + 'consumables.users' + ); $consumables = $manufacturer->consumables; if (Input::has('search')) { diff --git a/app/Http/Controllers/SuppliersController.php b/app/Http/Controllers/SuppliersController.php index 1bf705f3dd..23ecc16f9e 100755 --- a/app/Http/Controllers/SuppliersController.php +++ b/app/Http/Controllers/SuppliersController.php @@ -242,7 +242,7 @@ class SuppliersController extends Controller public function getDatatable() { - $suppliers = Supplier::select(array('id','name','address','address2','city','state','country','fax', 'phone','email','contact')) + $suppliers = Supplier::with('assets', 'licenses')->select(array('id','name','address','address2','city','state','country','fax', 'phone','email','contact')) ->whereNull('deleted_at'); if (Input::has('search')) { @@ -283,8 +283,8 @@ class SuppliersController extends Controller 'phone' => e($supplier->phone), 'fax' => e($supplier->fax), 'email' => ($supplier->email!='') ? ''.e($supplier->email).'' : '', - 'assets' => $supplier->num_assets(), - 'licenses' => $supplier->num_licenses(), + 'assets' => $supplier->assets->count(), + 'licenses' => $supplier->licenses->count(), 'actions' => $actions ); } diff --git a/app/Models/License.php b/app/Models/License.php index 5798347e18..b802c2dade 100755 --- a/app/Models/License.php +++ b/app/Models/License.php @@ -101,6 +101,20 @@ class License extends Depreciable ->count(); } + // We do this to eager load the "count" of seats from the controller. Otherwise calling "count()" on each model results in n+1 + public function licenseSeatsRelation() + { + return $this->hasMany(LicenseSeat::class)->whereNull('deleted_at')->selectRaw('license_id, count(*) as count')->groupBy('license_id'); + } + + public function getLicenseSeatsCountAttribute() + { + if ($this->licenseSeatsRelation->first()) { + return $this->licenseSeatsRelation->first()->count; + } + + return 0; + } /** * Get total licenses not checked out @@ -116,37 +130,47 @@ class License extends Depreciable /** * Get the number of available seats */ - public function availcount() + public function availCount() { - return LicenseSeat::whereNull('assigned_to') - ->whereNull('asset_id') - ->where('license_id', '=', $this->id) - ->whereNull('deleted_at') - ->count(); + return $this->licenseSeatsRelation() + ->whereNull('asset_id'); + } + + public function getAvailSeatsCountAttribute() + { + if ($this->availCount->first()) { + return $this->availCount->first()->count; + } + + return 0; } /** * Get the number of assigned seats * */ - public function assignedcount() + public function assignedCount() { + return $this->licenseSeatsRelation()->where(function ($query) { + $query->whereNotNull('assigned_to') + ->orWhereNotNull('asset_id'); + }); + } - return \App\Models\LicenseSeat::where('license_id', '=', $this->id) - ->where(function ($query) { - - $query->whereNotNull('assigned_to') - ->orWhereNotNull('asset_id'); - }) - ->count(); - + public function getAssignedSeatsCountAttribute() + { + // dd($this->licenseSeatsRelation->first()); + if ($this->assignedCount->first()) { + return $this->assignedCount->first()->count; + } + return 0; } public function remaincount() { - $total = $this->totalSeatsByLicenseID(); - $taken = $this->assignedcount(); + $total = $this->licenseSeatsCount; + $taken = $this->assigned_seats; $diff = ($total - $taken); return $diff; } @@ -156,7 +180,7 @@ class License extends Depreciable */ public function totalcount() { - $avail = $this->availcount(); + $avail = $this->availSeatsCount; $taken = $this->assignedcount(); $diff = ($avail + $taken); return $diff; diff --git a/app/Models/Supplier.php b/app/Models/Supplier.php index 5a6134e794..36cbdab6b6 100755 --- a/app/Models/Supplier.php +++ b/app/Models/Supplier.php @@ -47,6 +47,21 @@ class Supplier extends Model protected $fillable = ['name']; + // Eager load counts. + // We do this to eager load the "count" of seats from the controller. Otherwise calling "count()" on each model results in n+1 + public function assetsRelation() + { + return $this->hasMany(Asset::class)->whereNull('deleted_at')->selectRaw('supplier_id, count(*) as count')->groupBy('supplier_id'); + } + + public function getLicenseSeatsCountAttribute() + { + if ($this->licenseSeatsRelation->first()) { + return $this->licenseSeatsRelation->first()->count; + } + + return 0; + } public function assets() { return $this->hasMany('\App\Models\Asset', 'supplier_id'); @@ -59,7 +74,11 @@ class Supplier extends Model public function num_assets() { - return $this->hasMany('\App\Models\Asset', 'supplier_id')->count(); + if ($this->assetsRelation->first()) { + return $this->assetsRelation->first()->count; + } + + return 0; } public function licenses() @@ -69,7 +88,7 @@ class Supplier extends Model public function num_licenses() { - return $this->hasMany('\App\Models\License', 'supplier_id')->count(); + return $this->licenses()->count(); } public function addhttp($url) From cea255995c60958821b1215cfa32c51a21428238 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 29 Oct 2016 05:50:55 -0700 Subject: [PATCH 02/43] 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 | 225 +++++++++++------- app/Http/Controllers/ProfileController.php | 5 + app/Http/Controllers/SettingsController.php | 8 +- app/Http/Controllers/UsersController.php | 19 ++ app/Http/Kernel.php | 1 + app/Http/Middleware/CheckForTwoFactor.php | 51 ++++ app/Http/Middleware/CheckPermissions.php | 3 +- app/Http/routes.php | 40 ++++ app/Models/Ldap.php | 2 +- composer.json | 3 +- composer.lock | 119 ++++++++- config/app.php | 3 +- .../2016_10_29_002724_enable_2fa_fields.php | 43 ++++ resources/lang/ar/admin/settings/general.php | 16 ++ resources/lang/ar/general.php | 3 +- resources/lang/bg/admin/settings/general.php | 16 ++ resources/lang/bg/general.php | 3 +- resources/lang/cs/admin/settings/general.php | 16 ++ resources/lang/cs/general.php | 3 +- resources/lang/da/admin/settings/general.php | 16 ++ resources/lang/da/general.php | 3 +- resources/lang/de/admin/settings/general.php | 16 ++ resources/lang/de/general.php | 3 +- resources/lang/el/admin/settings/general.php | 16 ++ resources/lang/el/general.php | 3 +- .../lang/en-GB/admin/settings/general.php | 16 ++ resources/lang/en-GB/general.php | 3 +- .../lang/en-ID/admin/settings/general.php | 16 ++ resources/lang/en-ID/general.php | 3 +- resources/lang/en/admin/settings/general.php | 16 ++ resources/lang/en/general.php | 3 +- .../lang/es-CO/admin/settings/general.php | 16 ++ resources/lang/es-CO/general.php | 3 +- .../lang/es-ES/admin/settings/general.php | 16 ++ resources/lang/es-ES/general.php | 3 +- resources/lang/fa/admin/settings/general.php | 16 ++ resources/lang/fa/general.php | 3 +- resources/lang/fi/admin/settings/general.php | 16 ++ resources/lang/fi/general.php | 3 +- resources/lang/fr/admin/settings/general.php | 16 ++ resources/lang/fr/general.php | 3 +- resources/lang/he/admin/settings/general.php | 16 ++ resources/lang/he/general.php | 3 +- resources/lang/hr/admin/settings/general.php | 16 ++ resources/lang/hr/general.php | 3 +- resources/lang/hu/admin/settings/general.php | 16 ++ resources/lang/hu/general.php | 3 +- resources/lang/id/admin/settings/general.php | 16 ++ resources/lang/id/general.php | 3 +- resources/lang/it/admin/models/general.php | 2 +- resources/lang/it/admin/settings/general.php | 30 ++- .../lang/it/admin/statuslabels/message.php | 6 +- resources/lang/it/admin/users/general.php | 2 +- resources/lang/it/general.php | 3 +- resources/lang/it/passwords.php | 2 +- resources/lang/it/validation.php | 6 +- resources/lang/ja/admin/settings/general.php | 16 ++ resources/lang/ja/general.php | 3 +- resources/lang/ko/admin/settings/general.php | 16 ++ resources/lang/ko/general.php | 3 +- resources/lang/lt/admin/settings/general.php | 16 ++ resources/lang/lt/general.php | 3 +- resources/lang/ms/admin/settings/general.php | 16 ++ resources/lang/ms/general.php | 3 +- resources/lang/nl/admin/settings/general.php | 16 ++ resources/lang/nl/general.php | 3 +- .../lang/no/admin/components/message.php | 12 +- .../lang/no/admin/consumables/general.php | 4 +- .../lang/no/admin/custom_fields/general.php | 14 +- resources/lang/no/admin/hardware/general.php | 4 +- resources/lang/no/admin/hardware/message.php | 16 +- resources/lang/no/admin/licenses/form.php | 2 +- resources/lang/no/admin/licenses/message.php | 2 +- resources/lang/no/admin/locations/table.php | 2 +- resources/lang/no/admin/models/general.php | 2 +- resources/lang/no/admin/settings/general.php | 76 +++--- resources/lang/no/admin/users/general.php | 4 +- resources/lang/no/auth/general.php | 14 +- resources/lang/no/general.php | 19 +- resources/lang/no/passwords.php | 4 +- resources/lang/pl/admin/settings/general.php | 16 ++ resources/lang/pl/general.php | 3 +- .../lang/pt-BR/admin/settings/general.php | 16 ++ resources/lang/pt-BR/general.php | 3 +- .../lang/pt-PT/admin/settings/general.php | 16 ++ resources/lang/pt-PT/general.php | 3 +- resources/lang/ro/admin/settings/general.php | 16 ++ resources/lang/ro/general.php | 3 +- resources/lang/ru/admin/settings/general.php | 16 ++ resources/lang/ru/general.php | 3 +- .../lang/sv-SE/admin/settings/general.php | 16 ++ resources/lang/sv-SE/general.php | 3 +- resources/lang/th/admin/settings/general.php | 16 ++ resources/lang/th/general.php | 3 +- resources/lang/tr/admin/settings/general.php | 16 ++ resources/lang/tr/general.php | 3 +- resources/lang/vi/admin/settings/general.php | 16 ++ resources/lang/vi/general.php | 3 +- .../lang/zh-CN/admin/settings/general.php | 16 ++ resources/lang/zh-CN/general.php | 3 +- .../lang/zh-TW/admin/settings/general.php | 16 ++ resources/lang/zh-TW/general.php | 3 +- resources/macros/macros.php | 20 ++ .../views/account/change-email.blade.php | 76 ------ resources/views/account/profile.blade.php | 30 ++- resources/views/auth/two_factor.blade.php | 53 +++++ .../views/auth/two_factor_enroll.blade.php | 64 +++++ resources/views/settings/edit.blade.php | 18 ++ resources/views/settings/index.blade.php | 31 ++- resources/views/users/edit.blade.php | 50 ++++ 110 files changed, 1416 insertions(+), 320 deletions(-) create mode 100644 app/Http/Middleware/CheckForTwoFactor.php create mode 100644 database/migrations/2016_10_29_002724_enable_2fa_fields.php delete mode 100755 resources/views/account/change-email.blade.php create mode 100644 resources/views/auth/two_factor.blade.php create mode 100644 resources/views/auth/two_factor_enroll.blade.php diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index f6cb0ec50a..f76d469e2c 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/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')); - LOG::debug("Binding user to LDAP."); + $user = $this->login_via_ldap($request); + Auth::login($user, true); } catch (\Exception $e) { - LOG::debug("User ".Input::get('username').' did not authenticate successfully against LDAP.'); - //$ldap_error = $e->getMessage(); - // return redirect()->back()->withInput()->with('error',$e->getMessage()); + if(Setting::getSettings()->ldap_pw_sync!='1') { + 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 } - - LOG::debug("Authenticating user against database."); - // Try to log the user in - if (!Auth::attempt(Input::only('username', 'password'), Input::get('remember-me', 0))) { - LOG::debug("Local authentication failed."); - // throw new Cartalyst\Sentry\Users\UserNotFoundException(); - return redirect()->back()->withInput()->with('error', trans('auth/message.account_not_found')); + // If the user wasn't authenticated via LDAP, skip to local auth + if(!$user) { + LOG::debug("Authenticating user against database."); + // Try to log the user in + if (!Auth::attempt(Input::only('username', 'password'), Input::get('remember-me', 0))) { + LOG::debug("Local authentication failed."); + 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(); - - // Redirect to the users page - return redirect()->route('home')->with('success', 'You have successfully logged out!'); + return redirect()->route('login')->with('success', 'You have successfully logged out!'); } diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index 4a176fe4c3..a08e22d0ce 100755 --- a/app/Http/Controllers/ProfileController.php +++ b/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(); diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index c7e209b1df..a936aed24e 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/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')); diff --git a/app/Http/Controllers/UsersController.php b/app/Http/Controllers/UsersController.php index 1c7a48d888..d36a9221a0 100755 --- a/app/Http/Controllers/UsersController.php +++ b/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); + } + + } } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 41d6bb8bd6..61d14dcf58 100644 --- a/app/Http/Kernel.php +++ b/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' => [ diff --git a/app/Http/Middleware/CheckForTwoFactor.php b/app/Http/Middleware/CheckForTwoFactor.php new file mode 100644 index 0000000000..f4d5a13306 --- /dev/null +++ b/app/Http/Middleware/CheckForTwoFactor.php @@ -0,0 +1,51 @@ +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); + + } +} diff --git a/app/Http/Middleware/CheckPermissions.php b/app/Http/Middleware/CheckPermissions.php index d2319580a8..41786776c5 100644 --- a/app/Http/Middleware/CheckPermissions.php +++ b/app/Http/Middleware/CheckPermissions.php @@ -22,7 +22,8 @@ class CheckPermissions */ public function handle($request, Closure $next, $section = null) { - + + if (Gate::allows($section)) { return $next($request); } diff --git a/app/Http/routes.php b/app/Http/routes.php index c9f20768f2..c8cf02d2a9 100755 --- a/app/Http/routes.php +++ b/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 () { diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php index ea92ee3f9d..656f4fc6c3 100644 --- a/app/Models/Ldap.php +++ b/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()); } } diff --git a/composer.json b/composer.json index fff54719a8..94f9527c63 100644 --- a/composer.json +++ b/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", diff --git a/composer.lock b/composer.lock index 94f9422f7d..0062967689 100644 --- a/composer.lock +++ b/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", - "content-hash": "9c0251ddc1a110d83a762483abeea079", + "hash": "a188b3cf19debb9f4ad80016cb02bacd", + "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", diff --git a/config/app.php b/config/app.php index 0535a49e4b..12451ad85e 100755 --- a/config/app.php +++ b/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, ], ]; diff --git a/database/migrations/2016_10_29_002724_enable_2fa_fields.php b/database/migrations/2016_10_29_002724_enable_2fa_fields.php new file mode 100644 index 0000000000..a515771e09 --- /dev/null +++ b/database/migrations/2016_10_29_002724_enable_2fa_fields.php @@ -0,0 +1,43 @@ +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'); + }); + } +} diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php index a365f803c1..fa88f72686 100644 --- a/resources/lang/ar/admin/settings/general.php +++ b/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', diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php index 3bd1e0309f..827eaefcce 100644 --- a/resources/lang/ar/general.php +++ b/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', diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php index 666aa3b564..27918d9c0b 100644 --- a/resources/lang/bg/admin/settings/general.php +++ b/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', diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php index cd2457bac9..0271784638 100644 --- a/resources/lang/bg/general.php +++ b/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', diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php index 0d4711c672..d758d6594f 100644 --- a/resources/lang/cs/admin/settings/general.php +++ b/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', diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php index bb2fdf85d1..9a4032ba8e 100644 --- a/resources/lang/cs/general.php +++ b/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', diff --git a/resources/lang/da/admin/settings/general.php b/resources/lang/da/admin/settings/general.php index a365f803c1..fa88f72686 100644 --- a/resources/lang/da/admin/settings/general.php +++ b/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', diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php index f7f07fb1b2..66d31ebde4 100644 --- a/resources/lang/da/general.php +++ b/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', diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php index 3508dfc457..306ad49903 100644 --- a/resources/lang/de/admin/settings/general.php +++ b/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', diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php index 36ee3abd59..c1f0a1d80f 100644 --- a/resources/lang/de/general.php +++ b/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', diff --git a/resources/lang/el/admin/settings/general.php b/resources/lang/el/admin/settings/general.php index a365f803c1..fa88f72686 100644 --- a/resources/lang/el/admin/settings/general.php +++ b/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', diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php index 075b0c7641..cc6e025607 100644 --- a/resources/lang/el/general.php +++ b/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', diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php index 02dc48a619..ac2cb6ee0e 100644 --- a/resources/lang/en-GB/admin/settings/general.php +++ b/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', diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index 3e7d67011e..759b06dded 100644 --- a/resources/lang/en-GB/general.php +++ b/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', diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php index a365f803c1..fa88f72686 100644 --- a/resources/lang/en-ID/admin/settings/general.php +++ b/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', diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php index 0411b62b0e..0754050738 100644 --- a/resources/lang/en-ID/general.php +++ b/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', diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index a365f803c1..fa88f72686 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/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', diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 075b0c7641..cc6e025607 100644 --- a/resources/lang/en/general.php +++ b/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', diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php index a365f803c1..fa88f72686 100644 --- a/resources/lang/es-CO/admin/settings/general.php +++ b/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', diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php index 075b0c7641..cc6e025607 100644 --- a/resources/lang/es-CO/general.php +++ b/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', diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php index e3feec8de9..47c4b6f294 100644 --- a/resources/lang/es-ES/admin/settings/general.php +++ b/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', diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php index 8060961081..67648d97f7 100644 --- a/resources/lang/es-ES/general.php +++ b/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', diff --git a/resources/lang/fa/admin/settings/general.php b/resources/lang/fa/admin/settings/general.php index 0617217a2a..b8e11e669c 100644 --- a/resources/lang/fa/admin/settings/general.php +++ b/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' => 'بالا', diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php index 1084ed1dff..0d7e1098f3 100644 --- a/resources/lang/fa/general.php +++ b/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', diff --git a/resources/lang/fi/admin/settings/general.php b/resources/lang/fi/admin/settings/general.php index 9fe2684f1c..29c867e73b 100644 --- a/resources/lang/fi/admin/settings/general.php +++ b/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', diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php index 7bf5e9483e..d2410cafb1 100644 --- a/resources/lang/fi/general.php +++ b/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', diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php index 58230b05d5..f02f314350 100644 --- a/resources/lang/fr/admin/settings/general.php +++ b/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', diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php index 77fa7338e2..bcb39c8c79 100644 --- a/resources/lang/fr/general.php +++ b/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', diff --git a/resources/lang/he/admin/settings/general.php b/resources/lang/he/admin/settings/general.php index a365f803c1..fa88f72686 100644 --- a/resources/lang/he/admin/settings/general.php +++ b/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', diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php index 075b0c7641..cc6e025607 100644 --- a/resources/lang/he/general.php +++ b/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', diff --git a/resources/lang/hr/admin/settings/general.php b/resources/lang/hr/admin/settings/general.php index a365f803c1..fa88f72686 100644 --- a/resources/lang/hr/admin/settings/general.php +++ b/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', diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php index 075b0c7641..cc6e025607 100644 --- a/resources/lang/hr/general.php +++ b/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', diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php index 9d479e4dfc..dcbfea60bf 100644 --- a/resources/lang/hu/admin/settings/general.php +++ b/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', diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php index e14f4f4633..3c3ff92d0a 100644 --- a/resources/lang/hu/general.php +++ b/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', diff --git a/resources/lang/id/admin/settings/general.php b/resources/lang/id/admin/settings/general.php index 45717ebbef..0f25db8e14 100644 --- a/resources/lang/id/admin/settings/general.php +++ b/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', diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php index d5c0874928..c57d958116 100644 --- a/resources/lang/id/general.php +++ b/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', diff --git a/resources/lang/it/admin/models/general.php b/resources/lang/it/admin/models/general.php index 41d1b2a997..a1ed759ad3 100644 --- a/resources/lang/it/admin/models/general.php +++ b/resources/lang/it/admin/models/general.php @@ -4,7 +4,7 @@ return array( 'deleted' => 'Questo modello è stato eliminato.Clicca qui per ripristinarlo.', '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', diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php index c871bea9d0..72d203d949 100644 --- a/resources/lang/it/admin/settings/general.php +++ b/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', diff --git a/resources/lang/it/admin/statuslabels/message.php b/resources/lang/it/admin/statuslabels/message.php index 619a5a509c..59c51734e2 100644 --- a/resources/lang/it/admin/statuslabels/message.php +++ b/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.' ) ); diff --git a/resources/lang/it/admin/users/general.php b/resources/lang/it/admin/users/general.php index 802633226f..8301e57de8 100644 --- a/resources/lang/it/admin/users/general.php +++ b/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', diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php index 8651961ddb..97303c706a 100644 --- a/resources/lang/it/general.php +++ b/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', diff --git a/resources/lang/it/passwords.php b/resources/lang/it/passwords.php index 5195a9b77c..91044c55aa 100644 --- a/resources/lang/it/passwords.php +++ b/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', ]; diff --git a/resources/lang/it/validation.php b/resources/lang/it/validation.php index 3f30f25de5..ab4124a6df 100644 --- a/resources/lang/it/validation.php +++ b/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", - "unique_undeleted" => "The :attribute must be unique.", + "statuslabel_type" => "Devi selezionare un tipo di stato valido", + "unique_undeleted" => "L'attributo deve essere univoco.", /* diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php index 4d120e3807..cf9ddf2800 100644 --- a/resources/lang/ja/admin/settings/general.php +++ b/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' => '上', diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php index e78270f68c..48dfb3ffb3 100644 --- a/resources/lang/ja/general.php +++ b/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', diff --git a/resources/lang/ko/admin/settings/general.php b/resources/lang/ko/admin/settings/general.php index 48225849d3..f2e296f984 100644 --- a/resources/lang/ko/admin/settings/general.php +++ b/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' => '위', diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php index 0aacbe0ef3..4056d34773 100644 --- a/resources/lang/ko/general.php +++ b/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', diff --git a/resources/lang/lt/admin/settings/general.php b/resources/lang/lt/admin/settings/general.php index e943733036..c24345ad91 100644 --- a/resources/lang/lt/admin/settings/general.php +++ b/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', diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php index ee9648eba5..2bbd27513a 100644 --- a/resources/lang/lt/general.php +++ b/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', diff --git a/resources/lang/ms/admin/settings/general.php b/resources/lang/ms/admin/settings/general.php index 2acd8d7b71..3776921570 100644 --- a/resources/lang/ms/admin/settings/general.php +++ b/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', diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php index 9b5509ba08..3f96671b00 100644 --- a/resources/lang/ms/general.php +++ b/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', diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php index 0a8b269e8a..d1086e4f55 100644 --- a/resources/lang/nl/admin/settings/general.php +++ b/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', diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php index d8835f068d..a10557c018 100644 --- a/resources/lang/nl/general.php +++ b/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', diff --git a/resources/lang/no/admin/components/message.php b/resources/lang/no/admin/components/message.php index e9809dfb91..be71a737ee 100644 --- a/resources/lang/no/admin/components/message.php +++ b/resources/lang/no/admin/components/message.php @@ -21,15 +21,15 @@ return array( ), 'checkout' => array( - 'error' => 'Component was not checked out, please try again', - 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Komponent ble ikke sjekket ut. Prøv igjen', + 'success' => 'Vellykket utsjekk av komponent.', + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.' ), 'checkin' => array( - 'error' => 'Component was not checked in, please try again', - 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Komponenten ble ikke sjekket inn, vennligst prøv igjen', + 'success' => 'Vellykket innsjekk av komponent.', + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Prøv igjen.' ) diff --git a/resources/lang/no/admin/consumables/general.php b/resources/lang/no/admin/consumables/general.php index 02fab789ef..c1a3530c3c 100644 --- a/resources/lang/no/admin/consumables/general.php +++ b/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', diff --git a/resources/lang/no/admin/custom_fields/general.php b/resources/lang/no/admin/custom_fields/general.php index 8be5df9071..24feab37ec 100644 --- a/resources/lang/no/admin/custom_fields/general.php +++ b/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...', - '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_help' => 'WARNING: Encrypting a field makes it unsearchable.', - 'encrypted' => 'Encrypted', + 'custom_format' => 'Egendefinert format...', + 'encrypt_field' => 'Krypter verdien i dette feltet i databasen for hvert asset. De krypterte verdiene kan bare leses av administratorer.', + 'encrypt_field_help' => 'ADVARSEL: Ved å kryptere et felt gjør du at det ikke kan søkes på.', + 'encrypted' => 'Kryptert', 'fieldset' => 'Feltsett', 'qty_fields' => 'Antall Felt', 'fieldsets' => 'Feltsett', 'fieldset_name' => 'Feltsett Navn', 'field_name' => 'Felt Navn', - 'field_values' => 'Field Values', - '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' => 'Felt verdier', + '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', ); diff --git a/resources/lang/no/admin/hardware/general.php b/resources/lang/no/admin/hardware/general.php index cd2a09bab9..798909164c 100644 --- a/resources/lang/no/admin/hardware/general.php +++ b/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.
Klikk her for å gjenopprette modellen.', 'requestable' => 'Forespørrbar', - 'requested' => 'Requested', + 'requested' => 'Forespurt', 'restore' => 'Gjenopprett eiendel', 'pending' => 'Under arbeid', 'undeployable' => 'Ikke utleverbar', diff --git a/resources/lang/no/admin/hardware/message.php b/resources/lang/no/admin/hardware/message.php index 5a14205997..c689875d7a 100644 --- a/resources/lang/no/admin/hardware/message.php +++ b/resources/lang/no/admin/hardware/message.php @@ -37,11 +37,11 @@ return array( ), 'import' => array( - 'error' => 'Some items did not import correctly.', - 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", - 'file_delete_success' => "Your file has been been successfully deleted", - 'file_delete_error' => "The file was unable to be deleted", + 'error' => 'Noen elementer ble ikke importert riktig.', + 'errorDetail' => 'Følgende elementer ble ikke importert på grunn av feil.', + 'success' => "Filen har blitt importert", + 'file_delete_success' => "Filen har blitt slettet", + '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' ) ); diff --git a/resources/lang/no/admin/licenses/form.php b/resources/lang/no/admin/licenses/form.php index a6ade4fe0f..09982071dc 100644 --- a/resources/lang/no/admin/licenses/form.php +++ b/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', diff --git a/resources/lang/no/admin/licenses/message.php b/resources/lang/no/admin/licenses/message.php index 16555f1792..c7f385c01b 100644 --- a/resources/lang/no/admin/licenses/message.php +++ b/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( diff --git a/resources/lang/no/admin/locations/table.php b/resources/lang/no/admin/locations/table.php index f2a716b4c4..48dd33159f 100644 --- a/resources/lang/no/admin/locations/table.php +++ b/resources/lang/no/admin/locations/table.php @@ -1,7 +1,7 @@ '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', diff --git a/resources/lang/no/admin/models/general.php b/resources/lang/no/admin/models/general.php index 7a3b083443..600923cd31 100644 --- a/resources/lang/no/admin/models/general.php +++ b/resources/lang/no/admin/models/general.php @@ -4,7 +4,7 @@ return array( 'deleted' => 'Denne modellen er slettet. Klikk her for å gjenopprette.', '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', diff --git a/resources/lang/no/admin/settings/general.php b/resources/lang/no/admin/settings/general.php index d55721dee7..dc5d347b24 100644 --- a/resources/lang/no/admin/settings/general.php +++ b/resources/lang/no/admin/settings/general.php @@ -2,11 +2,11 @@ return array( 'ad' => 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad_domain' => 'Active Directory domene', + 'ad_domain_help' => 'Dette er noen ganger det samme som e-post domene, men ikke alltid.', + '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_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.', + 'confirm_purge' => 'Bekreft rensking', + '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_alt_barcode' => 'Display 1D barcode', - 'barcode_type' => '2D Barcode Type', - 'alt_barcode_type' => '1D barcode type', + 'display_qr' => 'Vis Qr-kode', + 'display_alt_barcode' => 'Vis 1D strekkode', + 'barcode_type' => '2D strekkodetype', + 'alt_barcode_type' => '1D strekkodetype', 'eula_settings' => 'EULA-innstillinger', 'eula_markdown' => 'Denne EULAen tillater Github Flavored markdown.', '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_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', + 'ldap_server_cert_help' => 'Kryss av denne boksen hvis du bruker et selv-signert SSL sertifikat og vil akkseptere et ugyldig sertifikat.', + 'ldap_tls' => 'Bruk TLS', + '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_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' => 'LDAP-passord Sync', + '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', - 'label_dimensions' => 'Label dimensions (inches)', - 'page_padding' => 'Page margins (inches)', - 'purge' => 'Purge Deleted Records', + 'labels_per_page' => 'Etiketter per side', + 'label_dimensions' => 'Etikettstørrelsen (inches)', + 'page_padding' => 'Side marger (inches)', + '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', - 'right' => 'right', - 'top' => 'top', - 'bottom' => 'bottom', - 'vertical' => 'vertical', - 'horizontal' => 'horizontal', - 'zerofill_count' => 'Length of asset tags, including zerofill', + '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' => 'venstre', + 'right' => 'høyre', + 'top' => 'topp', + 'bottom' => 'bunn', + 'vertical' => 'vertikal', + 'horizontal' => 'horisontal', + 'zerofill_count' => 'Lengden på ID-merker, inkludert zerofill', ); diff --git a/resources/lang/no/admin/users/general.php b/resources/lang/no/admin/users/general.php index b3ccf1be71..da2f16679f 100644 --- a/resources/lang/no/admin/users/general.php +++ b/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', diff --git a/resources/lang/no/auth/general.php b/resources/lang/no/auth/general.php index bf88cba77a..b179660596 100644 --- a/resources/lang/no/auth/general.php +++ b/resources/lang/no/auth/general.php @@ -1,12 +1,12 @@ 'Send Password Reset Link', - 'email_reset_password' => 'Email Password Reset', - 'reset_password' => 'Reset Password', - 'login' => 'Login', - 'login_prompt' => 'Please Login', - 'forgot_password' => 'I forgot my password', - 'remember_me' => 'Remember Me', + 'send_password_link' => 'Send Passord Tilbakestillingslink', + 'email_reset_password' => 'E-post Passord Tilbakestill', + 'reset_password' => 'Tilbakestill Passord', + 'login' => 'Logg inn', + 'login_prompt' => 'Vennligst logg inn', + 'forgot_password' => 'Jeg har glemt passordet mitt', + 'remember_me' => 'Husk meg', ]; diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php index f7363365be..e8d991f612 100644 --- a/resources/lang/no/general.php +++ b/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 Github flavored markdown.', - 'min_amt' => 'Min. QTY', - 'min_amt_help' => 'Minimum number of items that should be available before an alert gets triggered.', + 'markdown' => 'Dette feltet tillater Github flavored markdown.', + 'min_amt' => 'Min. antall', + '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', diff --git a/resources/lang/no/passwords.php b/resources/lang/no/passwords.php index 5195a9b77c..fb23bffdca 100644 --- a/resources/lang/no/passwords.php +++ b/resources/lang/no/passwords.php @@ -1,7 +1,7 @@ 'Your password link has been sent!', - 'user' => 'That user does not exist or does not have an email address associated', + 'sent' => 'Din passord link har blitt sendt!', + 'user' => 'Den brukeren eksisterer ikke eller har ikke en e-post assosiert', ]; diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php index cc1e9870fa..d1c8f1e25f 100644 --- a/resources/lang/pl/admin/settings/general.php +++ b/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', diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php index bf5284f48e..c5947e4f18 100644 --- a/resources/lang/pl/general.php +++ b/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', diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php index fcac71486b..11a337e2ab 100644 --- a/resources/lang/pt-BR/admin/settings/general.php +++ b/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', diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php index e0ccc0ebfd..848cf838e2 100644 --- a/resources/lang/pt-BR/general.php +++ b/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', diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php index ea7b77c444..50a8e7eec5 100644 --- a/resources/lang/pt-PT/admin/settings/general.php +++ b/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', diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php index f5191124f7..cab6de9370 100644 --- a/resources/lang/pt-PT/general.php +++ b/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', diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php index e3284ef076..09d2710a43 100644 --- a/resources/lang/ro/admin/settings/general.php +++ b/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', diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php index 8fa643d11d..dd8ef95093 100644 --- a/resources/lang/ro/general.php +++ b/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', diff --git a/resources/lang/ru/admin/settings/general.php b/resources/lang/ru/admin/settings/general.php index 1068769b65..65efc05b82 100644 --- a/resources/lang/ru/admin/settings/general.php +++ b/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' => 'сверху', diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php index 1996e7248e..0946dae12e 100644 --- a/resources/lang/ru/general.php +++ b/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', diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php index 2c50795a5c..954e623b03 100644 --- a/resources/lang/sv-SE/admin/settings/general.php +++ b/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', diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php index 9aae7aecbd..4dbdc250b0 100644 --- a/resources/lang/sv-SE/general.php +++ b/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', diff --git a/resources/lang/th/admin/settings/general.php b/resources/lang/th/admin/settings/general.php index 91897a21af..211210a87b 100644 --- a/resources/lang/th/admin/settings/general.php +++ b/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', diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php index 6d82542bb1..379313b202 100644 --- a/resources/lang/th/general.php +++ b/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', diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php index b4bd91d794..5904a5a9fc 100644 --- a/resources/lang/tr/admin/settings/general.php +++ b/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', diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php index 63cd00edc8..a5fb9e2d81 100644 --- a/resources/lang/tr/general.php +++ b/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', diff --git a/resources/lang/vi/admin/settings/general.php b/resources/lang/vi/admin/settings/general.php index 0eb0644a04..c9d10bf883 100644 --- a/resources/lang/vi/admin/settings/general.php +++ b/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', diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php index 07bc57093b..2a54e5e5cb 100644 --- a/resources/lang/vi/general.php +++ b/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', diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php index a5f478e898..c9b82f8867 100644 --- a/resources/lang/zh-CN/admin/settings/general.php +++ b/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' => '顶部', diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php index f9044d8c4f..efd51a98eb 100644 --- a/resources/lang/zh-CN/general.php +++ b/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', diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php index 0f293f24db..3f830384b0 100644 --- a/resources/lang/zh-TW/admin/settings/general.php +++ b/resources/lang/zh-TW/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' => '頂部', diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php index c7ee3054ad..fc42848f23 100644 --- a/resources/lang/zh-TW/general.php +++ b/resources/lang/zh-TW/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' => '配件總計', diff --git a/resources/macros/macros.php b/resources/macros/macros.php index 471c2a8bc0..26db2dad94 100644 --- a/resources/macros/macros.php +++ b/resources/macros/macros.php @@ -474,6 +474,26 @@ Form::macro('username_format', function ($name = "username_format", $selected = }); +Form::macro('two_factor_options', function ($name = "two_factor_enabled", $selected = null, $class = null) { + + $formats = array( + '' => trans('admin/settings/general.two_factor_disabled'), + '1' => trans('admin/settings/general.two_factor_optional'), + '2' => trans('admin/settings/general.two_factor_required'), + + ); + + $select = ''; + + return $select; + +}); + Form::macro('customfield_elements', function ($name = "customfield_elements", $selected = null, $class = null) { diff --git a/resources/views/account/change-email.blade.php b/resources/views/account/change-email.blade.php deleted file mode 100755 index ebde18bd09..0000000000 --- a/resources/views/account/change-email.blade.php +++ /dev/null @@ -1,76 +0,0 @@ -@extends('layouts/default') - -{{-- Page title --}} -@section('title') -Change your Email -@stop - -{{-- Account page content --}} -@section('content') -
- -
-

{{ trans('general.changeemail') }}

-
-
- -
- @if (config('app.lock_passwords') && ($user->id)) -

{{ trans('admin/users/table.lock_passwords') }}

- @endif - - -
- - - - - - - -
- -
- id)) ? ' disabled' : '') }}> - {!! $errors->first('email', ' :message') !!} -
-
- -
- -
- id)) ? ' disabled' : '') }}> - {!! $errors->first('email_confirm', ' :message') !!} -
-
- - -
- -
- id)) ? ' disabled' : '') }}> - {!! $errors->first('current_password', ' :message') !!} -
-
- - -
- -
- -
- {{ trans('button.cancel') }} - -
-
- - - -
-@stop diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index 15d70732fe..79753e0007 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -19,9 +19,8 @@
-
+
{!! $errors->first('first_name', ' :message') !!}
@@ -30,16 +29,16 @@
+ -
+
{!! $errors->first('last_name', ' :message') !!}
-
+
@@ -102,6 +101,27 @@
+ + + @if (\App\Models\Setting::getSettings()->two_factor_enabled=='1') +
+ +
+ + +

{{ trans('admin/settings/general.two_factor_enabled_warning') }}

+ @if (config('app.lock_passwords')) +

{{ trans('general.feature_disabled') }}

+ @endif +
+
+ @endif + + + +
diff --git a/resources/views/auth/two_factor.blade.php b/resources/views/auth/two_factor.blade.php new file mode 100644 index 0000000000..c4a8f46d56 --- /dev/null +++ b/resources/views/auth/two_factor.blade.php @@ -0,0 +1,53 @@ +@extends('layouts/basic') + + +{{-- Page content --}} +@section('content') +
+
+ + + +
+
+ + +
+
+
+ + +@stop diff --git a/resources/views/auth/two_factor_enroll.blade.php b/resources/views/auth/two_factor_enroll.blade.php new file mode 100644 index 0000000000..1fe9c89c9b --- /dev/null +++ b/resources/views/auth/two_factor_enroll.blade.php @@ -0,0 +1,64 @@ +@extends('layouts/basic') + + +{{-- Page content --}} +@section('content') +
+
+ + + +
+
+ + +
+ +
+
+ + +@stop diff --git a/resources/views/settings/edit.blade.php b/resources/views/settings/edit.blade.php index d0969818f1..3e9d177a48 100755 --- a/resources/views/settings/edit.blade.php +++ b/resources/views/settings/edit.blade.php @@ -71,6 +71,24 @@
+ +
+
+ {{ Form::label('two_factor_enabled', trans('admin/settings/general.two_factor_enabled_text')) }} +
+
+ + {!! Form::two_factor_options('two_factor_enabled', Input::old('two_factor_enabled', $setting->two_factor_enabled), 'select2') !!} +

{{ trans('admin/settings/general.two_factor_enabled_warning') }}

+ + @if (config('app.lock_passwords')) +

{{ trans('general.feature_disabled') }}

+ @endif + + {!! $errors->first('two_factor_enabled', ':message') !!} +
+
+
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 2739afad35..609aa70b1a 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -37,17 +37,28 @@ {{ trans('admin/settings/general.site_name') }} {{ $setting->site_name }} - - - {{ trans('admin/settings/general.full_multiple_companies_support_text') }} - + + + {{ trans('admin/settings/general.full_multiple_companies_support_text') }} + - @if ($setting->full_multiple_companies_support == 1) - {{ trans('general.yes') }} - @else - {{ trans('general.no') }} - @endif - + @if ($setting->full_multiple_companies_support == 1) + {{ trans('general.yes') }} + @else + {{ trans('general.no') }} + @endif + + + {{ trans('admin/settings/general.two_factor_enabled_text') }} + + @if ($setting->two_factor_enabled == '') + {{ trans('admin/settings/general.two_factor_disabled') }} + @elseif ($setting->two_factor_enabled == '1') + {{ trans('admin/settings/general.two_factor_optional') }} + @elseif ($setting->two_factor_enabled == '2') + {{ trans('admin/settings/general.two_factor_required') }} + @endif + {{ trans('admin/settings/general.default_currency') }} {{ $setting->default_currency }} diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index a929350893..3962c3fcba 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -318,6 +318,27 @@
+ @if (\App\Models\Setting::getSettings()->two_factor_enabled!='') + + +
+
+ {{ trans('admin/settings/general.two_factor_reset') }} + + + + + + + +
+
+

{{ trans('admin/settings/general.two_factor_reset_help') }}

+
+
+ + @endif +
@@ -544,5 +565,34 @@ $(document).ready(function(){ } }); }); + + $("#two_factor_reset").click(function(){ + $("#two_factor_resetrow").removeClass('success'); + $("#two_factor_resetrow").removeClass('danger'); + $("#two_factor_resetstatus").html(''); + $("#two_factor_reseticon").html(''); + $.ajax({ + url: '{{ route('api.users.two_factor_reset', ['id'=> $user->id]) }}', + type: 'POST', + data: {}, + dataType: 'json', + + success: function (data) { + $("#two_factor_reseticon").html(''); + $("#two_factor_resetstatus").html('' + data.message); + }, + + error: function (data) { + $("#two_factor_reseticon").html(''); + $("#two_factor_reseticon").html(''); + $('#two_factor_resetstatus').text(data.message); + } + + + }); + }); + + + @stop From 2f6fcadd05aac323937a6d2f280be017b47aef06 Mon Sep 17 00:00:00 2001 From: snipe Date: Sat, 29 Oct 2016 05:53:50 -0700 Subject: [PATCH 03/43] Fixes #2838 - removed duplicate requestabe field in asset models --- resources/views/models/edit.blade.php | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php index a9605871b5..5c21242d50 100755 --- a/resources/views/models/edit.blade.php +++ b/resources/views/models/edit.blade.php @@ -120,16 +120,8 @@
- -
-
- -
-
- - + +