Updated translations

Signed-off-by: snipe <snipe@snipe.net>
Bumped version
2022-04-11 15:40:58 +01:00 · 2022-04-11 15:37:38 +01:00 · 2022-04-11 15:08:39 +01:00 · 2022-04-11 15:03:08 +01:00 · 2022-04-11 14:29:59 +01:00 · 2022-04-07 19:41:01 +01:00
494 changed files with 4286 additions and 3153 deletions
@@ -2549,6 +2549,15 @@
      "contributions": [
        "test"
      ]
+    },
+    {
+      "login": "QveenSi",
+      "name": "Yevhenii Huzii",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19945501?v=4",
+      "profile": "https://github.com/QveenSi",
+      "contributions": [
+        "code"
+      ]
    }
  ]
 }
@@ -1,5 +1,5 @@
 ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp)  [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=snipe/snipe-it&amp;utm_campaign=Badge_Grade)
-[![All Contributors](https://img.shields.io/badge/all_contributors-280-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)
+[![All Contributors](https://img.shields.io/badge/all_contributors-281-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev)

 ## Snipe-IT - Open Source Asset Management System

@@ -131,6 +131,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars.githubusercontent.com/u/8735148?v=4" width="110px;"/><br /><sub>Petri Asikainen</sub>](https://github.com/PetriAsi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [<img src="https://avatars.githubusercontent.com/u/11424540?v=4" width="110px;"/><br /><sub>derdeagle</sub>](https://github.com/derdeagle)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [<img src="https://avatars.githubusercontent.com/u/176950?v=4" width="110px;"/><br /><sub>Mike Frysinger</sub>](https://wh0rd.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [<img src="https://avatars.githubusercontent.com/u/22044358?v=4" width="110px;"/><br /><sub>ALPHA</sub>](https://github.com/AL4AL)<br />[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [<img src="https://avatars.githubusercontent.com/u/1042587?v=4" width="110px;"/><br /><sub>FliegenKLATSCH</sub>](https://www.ifern.de)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [<img src="https://avatars.githubusercontent.com/u/442138?v=4" width="110px;"/><br /><sub>Jeremy Price</sub>](https://github.com/jerm)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [<img src="https://avatars.githubusercontent.com/u/84392209?v=4" width="110px;"/><br /><sub>Toreg87</sub>](https://github.com/Toreg87)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/67638596?v=4" width="110px;"/><br /><sub>Matthew Nickson</sub>](https://github.com/Computroniks)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [<img src="https://avatars.githubusercontent.com/u/1646397?v=4" width="110px;"/><br /><sub>Jethro Nederhof</sub>](https://jethron.id.au)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [<img src="https://avatars.githubusercontent.com/u/23289826?v=4" width="110px;"/><br /><sub>Oskar Stenberg</sub>](https://github.com/01ste02)<br />[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [<img src="https://avatars.githubusercontent.com/u/82208283?v=4" width="110px;"/><br /><sub>Robert-Azelis</sub>](https://github.com/Robert-Azelis)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [<img src="https://avatars.githubusercontent.com/u/60648387?v=4" width="110px;"/><br /><sub>Alexander William Smith</sub>](https://github.com/alwism)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | [<img src="https://avatars.githubusercontent.com/u/24418301?v=4" width="110px;"/><br /><sub>LEITWERK AG</sub>](https://www.leitwerk.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=leitwerk-ag "Code") | [<img src="https://avatars.githubusercontent.com/u/1911435?v=4" width="110px;"/><br /><sub>Adam</sub>](http://www.aboutcher.co.uk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamboutcher "Code") |
 | [<img src="https://avatars.githubusercontent.com/u/16104273?v=4" width="110px;"/><br /><sub>Ian</sub>](https://snksrv.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sneak-it "Code") | [<img src="https://avatars.githubusercontent.com/u/4023909?v=4" width="110px;"/><br /><sub>Shao Yu-Lung (Allen)</sub>](http://blog.bestlong.idv.tw/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bestlong "Code") | [<img src="https://avatars.githubusercontent.com/u/76475453?v=4" width="110px;"/><br /><sub>Haxatron</sub>](https://github.com/Haxatron)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Haxatron "Code") | [<img src="https://avatars.githubusercontent.com/u/3842948?v=4" width="110px;"/><br /><sub>Bradley Coudriet</sub>](http://bjcpgd.cias.rit.edu)<br />[💻](https://github.com/snipe/snipe-it/commits?author=exula "Code") | [<img src="https://avatars.githubusercontent.com/u/21966173?v=4" width="110px;"/><br /><sub>Dalton Durst</sub>](https://daltondur.st)<br />[💻](https://github.com/snipe/snipe-it/commits?author=UniversalSuperBox "Code") | [<img src="https://avatars.githubusercontent.com/u/48162670?v=4" width="110px;"/><br /><sub>TenOfTens</sub>](https://github.com/TenOfTens)<br />[💻](https://github.com/snipe/snipe-it/commits?author=TenOfTens "Code") | [<img src="https://avatars.githubusercontent.com/u/917232?v=4" width="110px;"/><br /><sub>Simona Avornicesei</sub>](http://www.avornicesei.com)<br />[⚠️](https://github.com/snipe/snipe-it/commits?author=savornicesei "Tests") |
+| [<img src="https://avatars.githubusercontent.com/u/19945501?v=4" width="110px;"/><br /><sub>Yevhenii Huzii</sub>](https://github.com/QveenSi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=QveenSi "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
@@ -0,0 +1,59 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+
+class KillAllSessions extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'snipeit:global-logout  {--force : Skip the danger prompt; assuming you enter "y"} ';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'This command will destroy all web sessions on disk and will force a re-login for all users.';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return mixed
+     */
+    public function handle()
+    {
+
+        if (!$this->option('force') && !$this->confirm("****************************************************\nTHIS WILL FORCE A LOGIN FOR ALL LOGGED IN USERS.\n\nAre you SURE you wish to continue? ")) {
+            return $this->error("Session loss not confirmed");
+        }
+
+        $session_files = glob(storage_path("framework/sessions/*"));
+
+        $count = 0;
+        foreach ($session_files as $file) {
+
+            if (is_file($file))
+                unlink($file);
+                $count++;
+        }
+        \DB::table('users')->update(['remember_token' => null]);
+
+        $this->info($count. ' sessions cleared!');
+
+    }
+}
@@ -47,18 +47,18 @@ class MoveUploadsToNewDisk extends Command
        }
        $delete_local = $this->argument('delete_local');

-        $public_uploads['accessories'] = glob('public/accessories'."/*.*");
-        $public_uploads['assets'] = glob('public/assets'."/*.*");
-        $public_uploads['avatars'] = glob('public/avatars'."/*.*");
-        $public_uploads['categories'] = glob('public/categories'."/*.*");
-        $public_uploads['companies'] = glob('public/companies'."/*.*");
-        $public_uploads['components'] = glob('public/components'."/*.*");
-        $public_uploads['consumables'] = glob('public/consumables'."/*.*");
-        $public_uploads['departments'] = glob('public/departments'."/*.*");
-        $public_uploads['locations'] = glob('public/locations'."/*.*");
-        $public_uploads['manufacturers'] = glob('public/manufacturers'."/*.*");
-        $public_uploads['suppliers'] = glob('public/suppliers'."/*.*");
-        $public_uploads['assetmodels'] = glob('public/models'."/*.*");
+        $public_uploads['accessories'] = glob('public/uploads/accessories'."/*.*");
+        $public_uploads['assets'] = glob('public/uploads/assets'."/*.*");
+        $public_uploads['avatars'] = glob('public/uploads/avatars'."/*.*");
+        $public_uploads['categories'] = glob('public/uploads/categories'."/*.*");
+        $public_uploads['companies'] = glob('public/uploads/companies'."/*.*");
+        $public_uploads['components'] = glob('public/uploads/components'."/*.*");
+        $public_uploads['consumables'] = glob('public/uploads/consumables'."/*.*");
+        $public_uploads['departments'] = glob('public/uploads/departments'."/*.*");
+        $public_uploads['locations'] = glob('public/uploads/locations'."/*.*");
+        $public_uploads['manufacturers'] = glob('public/uploads/manufacturers'."/*.*");
+        $public_uploads['suppliers'] = glob('public/uploads/suppliers'."/*.*");
+        $public_uploads['assetmodels'] = glob('public/uploads/models'."/*.*");


        // iterate files
@@ -72,7 +72,7 @@ class MoveUploadsToNewDisk extends Command
                $filename = basename($public_upload[$i]);

                try  {
-                    Storage::disk('public')->put('uploads/'.public_type.'/'.$filename, file_get_contents($public_upload[$i]));
+                    Storage::disk('public')->put('uploads/'.$public_type.'/'.$filename, file_get_contents($public_upload[$i]));
                    $new_url = Storage::disk('public')->url('uploads/'.$public_type.'/'.$filename, $filename);
                    $this->info($type_count.'. PUBLIC: '.$filename.' was copied to '.$new_url);
                } catch (\Exception $e) {
@@ -103,7 +103,7 @@ class MoveUploadsToNewDisk extends Command
        $private_uploads['imports'] = glob('storage/private_uploads/imports'."/*.*");
        $private_uploads['licenses'] = glob('storage/private_uploads/licenses'."/*.*");
        $private_uploads['users'] = glob('storage/private_uploads/users'."/*.*");
-        $private_uploads['backups'] = glob('storage/private_uploads/users'."/*.*");
+        $private_uploads['backups'] = glob('storage/private_uploads/backups'."/*.*");


        foreach($private_uploads as $private_type => $private_upload)
@@ -14,7 +14,7 @@ class RestoreFromBackup extends Command
     * @var string
     */
    protected $signature = 'snipeit:restore 
-                                            {--force : Skip the danger prompt; assuming you hit "y"} 
+                                            {--force : Skip the danger prompt; assuming you enter "y"} 
                                            {filename : The zip file to be migrated}
                                            {--no-progress : Don\'t show a progress bar}';

@@ -9,10 +9,21 @@ class ActionlogController extends Controller
 {
    public function displaySig($filename)
    {
+        // PHP doesn't let you handle file not found errors well with 
+        // file_get_contents, so we set the error reporting for just this class
+        error_reporting(0);
+
        $this->authorize('view', \App\Models\Asset::class);
-        $file = config('app.private_uploads') . '/signatures/' . $filename;
+        $file = config('app.private_uploads').'/signatures/'.$filename;
        $filetype = Helper::checkUploadIsImage($file);
-        $contents = file_get_contents($file);
-        return Response::make($contents)->header('Content-Type', $filetype);
+
+        $contents = file_get_contents($file, false, stream_context_create(['http' => ['ignore_errors' => true]]));
+        if ($contents === false) {
+            \Log::warn('File '.$file.' not found');
+            return false;
+        } else {
+            return Response::make($contents)->header('Content-Type', $filetype);
+        }
+       
    }
 }
@@ -30,6 +30,19 @@ class StatuslabelsController extends Controller
            $statuslabels = $statuslabels->TextSearch($request->input('search'));
        }

+        // if a status_type is passed, filter by that
+        if ($request->filled('status_type')) {
+            if (strtolower($request->input('status_type')) == 'pending') {
+                $statuslabels = $statuslabels->Pending();
+            } elseif (strtolower($request->input('status_type')) == 'archived') {
+                $statuslabels = $statuslabels->Archived();
+            } elseif (strtolower($request->input('status_type')) == 'deployable') {
+                $statuslabels = $statuslabels->Deployable();
+            } elseif (strtolower($request->input('status_type')) == 'undeployable') {
+                $statuslabels = $statuslabels->Undeployable();
+            }
+        }
+
        // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
        // case we override with the actual count, so we should return 0 items.
        $offset = (($statuslabels) && ($request->get('offset') > $statuslabels->count())) ? $statuslabels->count() : $request->get('offset', 0);
@@ -105,9 +105,9 @@ class AssetCheckinController extends Controller
            $asset->location_id =  e($request->get('location_id'));
        }

-        $checkin_at = date('Y-m-d');
-        if($request->filled('checkin_at')){
-            $checkin_at = $request->input('checkin_at');
+        $checkin_at = date('Y-m-d H:i:s');
+        if (($request->filled('checkin_at')) && ($request->get('checkin_at') != date('Y-m-d'))) {
+            $checkin_at = $request->get('checkin_at');
        }

        // Was the asset updated?
@@ -410,7 +410,23 @@ class AssetsController extends Controller
        return redirect()->route('hardware.index')->with('success', trans('admin/hardware/message.delete.success'));
    }

+    /**
+     * Searches the assets table by serial, and redirects if it finds one
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v3.0]
+     * @return Redirect
+     */
+    public function getAssetBySerial(Request $request)
+    {
+        $topsearch = ($request->get('topsearch')=="true");

+        if (!$asset = Asset::where('serial', '=', $request->get('serial'))->first()) {
+            return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.does_not_exist'));
+        }
+        $this->authorize('view', $asset);
+        return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
+    }

    /**
     * Searches the assets table by asset tag, and redirects if it finds one
@@ -429,6 +445,8 @@ class AssetsController extends Controller
        $this->authorize('view', $asset);
        return redirect()->route('hardware.show', $asset->id)->with('topsearch', $topsearch);
    }
+
+
    /**
     * Return a QR code for the asset
     *
@@ -109,12 +109,15 @@ class BulkUsersController extends Controller
        if (!$manager_conflict) {
            $this->conditionallyAddItem('manager_id');
        }
-
-
        // Save the updated info
        User::whereIn('id', $user_raw_array)
            ->where('id', '!=', Auth::id())->update($this->update_array);

+        if(array_key_exists('location_id', $this->update_array)){
+            Asset::where('assigned_type', User::class)
+                ->whereIn('assigned_to', $user_raw_array)
+                ->update(['location_id' => $this->update_array['location_id']]);
+        }
        // Only sync groups if groups were selected
        if ($request->filled('groups')) {
            foreach ($users as $user) {
@@ -39,6 +39,7 @@ class Kernel extends HttpKernel
            \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
            \App\Http\Middleware\VerifyCsrfToken::class,
            \App\Http\Middleware\CheckLocale::class,
+            \App\Http\Middleware\CheckUserIsActivated::class,
            \App\Http\Middleware\CheckForTwoFactor::class,
            \Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
            \App\Http\Middleware\AssetCountForSidebar::class,
@@ -4,8 +4,9 @@ namespace App\Http\Middleware;

 use Closure;
 use Illuminate\Contracts\Auth\Guard;
+use Auth;

-class Authenticate
+class CheckUserIsActivated
 {
    /**
     * The Guard implementation.
@@ -34,14 +35,16 @@ class Authenticate
     */
    public function handle($request, Closure $next)
    {
-        if ($this->auth->guest()) {
-            if ($request->ajax()) {
-                return response('Unauthorized.', 401);
-            } else {
-                return redirect()->guest('login');
-            }
+
+        // If there is a user AND the user is NOT activated, send them to the login page
+        // This prevents people who still have active sessions logged in and their status gets toggled
+        // to inactive (aka unable to login)
+        if (($request->user()) && (!$request->user()->isActivated())) {
+            Auth::logout();
+            return redirect()->guest('login');
        }

        return $next($request);
+
    }
 }
@@ -3,6 +3,7 @@ namespace App\Http\Transformers;

 use App\Helpers\Helper;
 use App\Models\Asset;
+use App\Models\Setting;
 use Gate;
 use Illuminate\Database\Eloquent\Collection;

@@ -20,6 +21,9 @@ class AssetsTransformer

    public function transformAsset(Asset $asset)
    {
+        // This uses the getSettings() method so we're pulling from the cache versus querying the settings on single asset
+        $setting = Setting::getSettings();
+
        $array = [
            'id' => (int) $asset->id,
            'name' => e($asset->name),
@@ -64,6 +68,8 @@ class AssetsTransformer
                'name'=> e($asset->defaultLoc->name)
            ]  : null,
            'image' => ($asset->getImageUrl()) ? $asset->getImageUrl() : null,
+            'qr' => ($setting->qr_code=='1') ? config('app.url').'/uploads/barcodes/qr-'.str_slug($asset->asset_tag).'-'.str_slug($asset->id).'.png' : null,
+            'alt_barcode' => ($setting->alt_barcode_enabled=='1') ? config('app.url').'/uploads/barcodes/'.str_slug($setting->alt_barcode).'-'.str_slug($asset->asset_tag).'.png' : null,
            'assigned_to' => $this->transformAssignedTo($asset),
            'warranty_months' =>  ($asset->warranty_months > 0) ? e($asset->warranty_months . ' ' . trans('admin/hardware/form.months')) : null,
            'warranty_expires' => ($asset->warranty_months > 0) ?  Helper::getFormattedDateObject($asset->warranty_expires, 'date') : null,
@@ -46,14 +46,22 @@ class LicenseImporter extends ItemImporter
            $license = new License;
        }
        $asset_tag = $this->item['asset_tag'] = $this->findCsvMatch($row, 'asset_tag'); // used for checkout out to an asset.
-        $this->item['expiration_date'] = $this->findCsvMatch($row, 'expiration_date');
+        
+        $this->item["expiration_date"] = null;
+        if ($this->findCsvMatch($row, "expiration_date")!='') {
+            $this->item["expiration_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "expiration_date")));
+        }
        $this->item['license_email'] = $this->findCsvMatch($row, "license_email");
        $this->item['license_name'] = $this->findCsvMatch($row, "license_name");
        $this->item['maintained'] = $this->findCsvMatch($row, 'maintained');
        $this->item['purchase_order'] = $this->findCsvMatch($row, 'purchase_order');
        $this->item['reassignable'] = $this->findCsvMatch($row, 'reassignable');
        $this->item['seats'] = $this->findCsvMatch($row, 'seats');
-        $this->item['termination_date'] = $this->findCsvMatch($row, 'termination_date');
+        
+        $this->item["termination_date"] = null;
+        if ($this->findCsvMatch($row, "termination_date")!='') {
+            $this->item["termination_date"] = date("Y-m-d 00:00:01", strtotime($this->findCsvMatch($row, "termination_date")));
+        }

        if ($editingLicense) {
            $license->update($this->sanitizeItemForUpdating($license));
@@ -30,7 +30,7 @@ class Actionlog extends SnipeModel
     * 
     * @var array
     */
-    protected $searchableAttributes = ['action_type', 'note', 'log_meta'];
+    protected $searchableAttributes = ['action_type', 'note', 'log_meta','user_id'];

    /**
     * The relations and their attributes that should be included when searching the model.
@@ -38,7 +38,8 @@ class Actionlog extends SnipeModel
     * @var array
     */
    protected $searchableRelations = [
-        'company' => ['name']
+        'company' => ['name'],
+        'user' => ['first_name','last_name','username'],
    ];

    /**
@@ -185,10 +185,19 @@ class Asset extends Depreciable
            $model = AssetModel::find($this->model_id);

            if (($model) && ($model->fieldset)) {
+
+                foreach ($model->fieldset->fields as $field){
+                    if($field->format == 'BOOLEAN'){
+                        $this->{$field->db_column} = filter_var($this->{$field->db_column}, FILTER_VALIDATE_BOOLEAN);
+                    }
+                }
+
                $this->rules += $model->fieldset->validation_rules();
            }
        }

+
+
        return parent::save($params);
    }

@@ -116,6 +116,9 @@ trait Loggable
        $log->location_id = null;
        $log->note = $note;
        $log->action_date = $action_date;
+        if (! $log->action_date) {
+            $log->action_date = date('Y-m-d H:i:s');
+        }

        if (Auth::user()) {
            $log->user_id = Auth::user()->id;
@@ -121,6 +121,18 @@ class Statuslabel extends SnipeModel
            ->where('deployable', '=', 1);
    }

+    /**
+     * Query builder scope for undeployable status types
+     *
+     * @return \Illuminate\Database\Query\Builder Modified query builder
+     */
+    public function scopeUndeployable()
+    {
+        return $this->where('pending', '=', 0)
+            ->where('archived', '=', 0)
+            ->where('deployable', '=', 0);
+    }
+
    /**
     * Helper function to determine type attributes
     *
@@ -70,7 +70,6 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     * @var array
     */

-    // 'username' => 'required|string|min:1|unique:users,username,NULL,id,deleted_at,NULL',
    protected $rules = [
        'first_name'              => 'required|string|min:1',
        'username'                => 'required|string|min:1|unique_undeleted',
@@ -306,7 +305,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     */
    public function consumables()
    {
-        return $this->belongsToMany('\App\Models\Consumable', 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id')->withTrashed();
+        return $this->belongsToMany('\App\Models\Consumable', 'consumables_users', 'assigned_to', 'consumable_id')->withPivot('id', 'created_at')->withTrashed();
    }

    /**
@@ -318,7 +317,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
     */
    public function licenses()
    {
-        return $this->belongsToMany('\App\Models\License', 'license_seats', 'assigned_to', 'license_id')->withPivot('id');
+        return $this->belongsToMany('\App\Models\License', 'license_seats', 'assigned_to', 'license_id')->withPivot('id', 'created_at');
    }

    /**
@@ -27,7 +27,7 @@
    "doctrine/inflector": "^1.3",
    "doctrine/instantiator": "^1.3",
    "eduardokum/laravel-mail-auto-embed": "^1.0",
-    "enshrined/svg-sanitize": "^0.13.3",
+    "enshrined/svg-sanitize": "^0.15.0",
    "erusev/parsedown": "^1.7",
    "fideloper/proxy": "^4.3",
    "fruitcake/laravel-cors": "^2.2",
@@ -70,6 +70,7 @@
    "overtrue/phplint": "^2.2",
    "phpunit/php-token-stream": "^3.1",
    "phpunit/phpunit": "^8.5",
+    "roave/security-advisories": "dev-latest",
    "squizlabs/php_codesniffer": "^3.5",
    "symfony/css-selector": "^4.4",
    "symfony/dom-crawler": "^4.4"
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'vV5.4.1',
-  'full_app_version' => 'vV5.4.1 - build 6746-g3e22dce11',
-  'build_version' => '6746',
+  'app_version' => 'v5.4.2',
+  'full_app_version' => 'v5.4.2 - build 6805-g5314ef97e',
+  'build_version' => '6805',
  'prerelease_version' => '',
-  'hash_version' => 'g3e22dce11',
-  'full_hash' => 'V5.4.1-20-g3e22dce11',
+  'hash_version' => 'g5314ef97e',
+  'full_hash' => 'v5.4.2-52-g5314ef97e',
  'branch' => 'master',
 );
@@ -14,13 +14,14 @@ class CreateCustomFieldCustomFieldset extends Migration {
 	{
 		Schema::create('custom_field_custom_fieldset', function(Blueprint $table)
 		{
+            $table->bigIncrements('id');
 			$table->integer('custom_field_id');
 			$table->integer('custom_fieldset_id');
-
 			$table->integer('order');
 			$table->boolean('required');
-      $table->engine = 'InnoDB';
+            $table->engine = 'InnoDB';
 		});
+
 	}

 	/**
@@ -13,20 +13,22 @@ class CreateCheckoutAcceptancesTable extends Migration
     */
    public function up()
    {
-        Schema::create('checkout_acceptances', function (Blueprint $table) {
-            $table->increments('id');
+        if (!Schema::hasTable('checkout_acceptances')) {
+            Schema::create('checkout_acceptances', function (Blueprint $table) {
+                $table->increments('id');

-            $table->morphs('checkoutable');
-            $table->integer('assigned_to_id')->nullable();
+                $table->morphs('checkoutable');
+                $table->integer('assigned_to_id')->nullable();

-            $table->string('signature_filename')->nullable();
+                $table->string('signature_filename')->nullable();

-            $table->timestamp('accepted_at')->nullable();
-            $table->timestamp('declined_at')->nullable();
+                $table->timestamp('accepted_at')->nullable();
+                $table->timestamp('declined_at')->nullable();

-            $table->timestamps();
-            $table->softDeletes();
-        });
+                $table->timestamps();
+                $table->softDeletes();
+            });
+        }
    }

    /**
@@ -36,6 +38,8 @@ class CreateCheckoutAcceptancesTable extends Migration
     */
    public function down()
    {
-        Schema::dropIfExists('checkout_acceptances');
+        if (Schema::hasTable('checkout_acceptances')) {
+            Schema::dropIfExists('checkout_acceptances');
+        }
    }
 }
@@ -12,14 +12,15 @@ class AddKitsLicensesTable extends Migration {
 	 */
 	public function up()
 	{
-		//
-		Schema::create('kits_licenses', function ($table) {
-            $table->increments('id');
-            $table->integer('kit_id')->nullable()->default(NULL); 
-            $table->integer('license_id')->nullable()->default(NULL);    
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
+		if (!Schema::hasTable('kits_licenses')) {
+			Schema::create('kits_licenses', function ($table) {
+				$table->increments('id');
+				$table->integer('kit_id')->nullable()->default(NULL); 
+				$table->integer('license_id')->nullable()->default(NULL);    
+				$table->integer('quantity')->default(1);
+				$table->timestamps();
+			});
+		}
 	}

 	/**
@@ -29,8 +30,9 @@ class AddKitsLicensesTable extends Migration {
 	 */
 	public function down()
 	{
-		//
-		Schema::drop('kits_licenses');
+		if (Schema::hasTable('kits_licenses')) {
+			Schema::drop('kits_licenses');
+		}
 	}

 }
@@ -12,13 +12,14 @@ class AddKitsTable extends Migration {
 	 */
 	public function up()
 	{
-		//
-		 Schema::create('kits', function ($table) {
-            $table->increments('id');
-            $table->string('name')->nullable()->default(NULL);
-            $table->timestamps();
-            $table->engine = 'InnoDB';
-        });
+		if (!Schema::hasTable('kits')) {
+			Schema::create('kits', function ($table) {
+				$table->increments('id');
+				$table->string('name')->nullable()->default(NULL);
+				$table->timestamps();
+				$table->engine = 'InnoDB';
+			});
+		}

 	}

@@ -29,8 +30,9 @@ class AddKitsTable extends Migration {
 	 */
 	public function down()
 	{
-		//
-		Schema::drop('kits');
+		if (Schema::hasTable('kits')) {
+			Schema::drop('kits');
+		}

 	}

@@ -12,14 +12,15 @@ class AddKitsModelsTable extends Migration {
 	 */
 	public function up()
 	{
-		//
-		Schema::create('kits_models', function ($table) {
-            $table->increments('id');
-            $table->integer('kit_id')->nullable()->default(NULL); 
-            $table->integer('model_id')->nullable()->default(NULL);    
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
+		if (!Schema::hasTable('kits_models')) {
+			Schema::create('kits_models', function ($table) {
+				$table->increments('id');
+				$table->integer('kit_id')->nullable()->default(NULL); 
+				$table->integer('model_id')->nullable()->default(NULL);    
+				$table->integer('quantity')->default(1);
+				$table->timestamps();
+			});
+		}
 	}

 	/**
@@ -29,8 +30,9 @@ class AddKitsModelsTable extends Migration {
 	 */
 	public function down()
 	{
-		//
-		Schema::drop('kits_models');
+		if (Schema::hasTable('kits_models')) {
+			Schema::drop('kits_models');
+		}
 	}

 }
@@ -13,14 +13,15 @@ class AddKitsConsumablesTable extends Migration
     */
    public function up()
    {
-        //
-        Schema::create('kits_consumables', function ($table) {
-            $table->increments('id');
-            $table->integer('kit_id')->nullable()->default(NULL); 
-            $table->integer('consumable_id')->nullable()->default(NULL);    
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
+        if (!Schema::hasTable('kits_consumables')) {
+            Schema::create('kits_consumables', function ($table) {
+                $table->increments('id');
+                $table->integer('kit_id')->nullable()->default(NULL); 
+                $table->integer('consumable_id')->nullable()->default(NULL);    
+                $table->integer('quantity')->default(1);
+                $table->timestamps();
+            });
+        }
    }

    /**
@@ -30,7 +31,8 @@ class AddKitsConsumablesTable extends Migration
     */
    public function down()
    {
-        //
-		Schema::drop('kits_consumables');
+        if (Schema::hasTable('kits_consumables')) {
+		    Schema::drop('kits_consumables');
+        }
    }
 }
@@ -13,14 +13,15 @@ class AddKitsAccessoriesTable extends Migration
     */
    public function up()
    {
-        //
-        Schema::create('kits_accessories', function ($table) {
-            $table->increments('id');
-            $table->integer('kit_id')->nullable()->default(NULL); 
-            $table->integer('accessory_id')->nullable()->default(NULL);    
-            $table->integer('quantity')->default(1);
-            $table->timestamps();
-        });
+        if (!Schema::hasTable('kits_accessories')) {
+            Schema::create('kits_accessories', function ($table) {
+                $table->increments('id');
+                $table->integer('kit_id')->nullable()->default(NULL); 
+                $table->integer('accessory_id')->nullable()->default(NULL);    
+                $table->integer('quantity')->default(1);
+                $table->timestamps();
+            });
+        }
    }

    /**
@@ -30,7 +31,8 @@ class AddKitsAccessoriesTable extends Migration
     */
    public function down()
    {
-        //
-		Schema::drop('kits_accessories');
+        if (Schema::hasTable('kits_accessories')) {
+		    Schema::drop('kits_accessories');
+        }
    }
 }
@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class AddPrimaryKeyToCustomFieldsPivot extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+
+        // Check if the ID primary key already exists, if not, add it
+        Schema::table('custom_field_custom_fieldset', function (Blueprint $table) {
+            if (!Schema::hasColumn('custom_field_custom_fieldset', 'id')) {
+                $table->bigIncrements('id')->first();
+            }
+        });
+
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('custom_field_custom_fieldset', function (Blueprint $table) {
+            if (Schema::hasColumn('custom_field_custom_fieldset', 'id')) {
+                $table->dropColumn('id');
+            }
+        });
+    }
+}
@@ -2693,9 +2693,9 @@
      "integrity": "sha1-EQPWvADPv6jPyaJZmrUYxVZD2j8="
    },
    "bootstrap-table": {
-      "version": "1.19.1",
-      "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.19.1.tgz",
-      "integrity": "sha512-WvV+l1AI/C+zThaKmfHmi/IuayVNB0qdFyEhFx1jyZhO0oLtNJNANkCR3rvJf6Dkh72dsLElxpE/bzK9seEQLA=="
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.18.3.tgz",
+      "integrity": "sha512-/eFLkldDlNFi37qC/d9THfRVxMUGD34E8fQBFtXJLDHLBOVKWDTq7BV+udoP7k3FfCEyhM1jWQnQ0rMQdBv//w=="
    },
    "brace-expansion": {
      "version": "1.1.11",
@@ -32,7 +32,7 @@
    "bootstrap-colorpicker": "^2.5.3",
    "bootstrap-datepicker": "^1.9.0",
    "bootstrap-less": "^3.3.8",
-    "bootstrap-table": "^1.19.1",
+    "bootstrap-table": "1.18.x",
    "chart.js": "^2.9.4",
    "css-loader": "^3.6.0",
    "ekko-lightbox": "^5.1.1",
@@ -18,14 +18,14 @@
    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=0409748eb4bb77fe171a",
    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=7abb3dcd41ad0d4700b7",
    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=96477616f4a4b4ff1db8",
-    "/css/dist/all.css": "/css/dist/all.css?id=23d12dde43fa52cbc84d",
+    "/css/dist/all.css": "/css/dist/all.css?id=19b5eace0db8c1559925",
    "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
    "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
    "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
    "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
-    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=810d7e520c3057ee500e",
+    "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=93c24b4c89490bbfd73e",
    "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=473d249fc27f1b907d07",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=75760107ce879b26f156",
    "/js/dist/all.js": "/js/dist/all.js?id=1b9488168279292af5c4",
    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=1f137fd2dcbac676d291",
    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=af88a4cc8e58dc298963",
@@ -41,5 +41,7 @@ return [
    'make_required' => 'Optional - click to make required',
    'reorder' => 'Reorder',
    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'argief',
    'asset'  					=> 'bate',
    'bulk_checkout'             => 'Checkout Assets',
+    'bulk_checkin'              => 'Checkin Assets',
    'checkin'  					=> 'Kontrole bate',
    'checkout'  				=> 'Checkout Asset',
    'clone'  					=> 'Klone Bate',
@@ -17,11 +17,11 @@ return [
    'alerts_enabled'			=> 'Alerts aangeskakel',
    'alert_interval'			=> 'Uitgaande Alert Drempel (in dae)',
    'alert_inv_threshold'		=> 'Voorraadwaarskuwingsdrempel',
-    'allow_user_skin'           => 'Allow user skin',
+    'allow_user_skin'           => 'Allow User Skin',
    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
    'asset_ids'					=> 'Bate ID\'s',
    'audit_interval'            => 'Ouditinterval',
-    'audit_interval_help'       => 'As u gereeld u bates fisies moet kontroleer, vul die interval in maande in.',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.',
    'audit_warning_days'        => 'Oudit Waarskuwing Drempel',
    'audit_warning_days_help'   => 'Hoeveel dae vooruit moet ons u waarsku wanneer bates verskuldig is vir ouditering?',
    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
    'backups_upload'            => 'Upload Backup',
    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
    'barcode_settings'			=> 'Barcode-instellings',
    'confirm_purge'			    => 'Bevestig skoonmaak',
@@ -96,6 +96,7 @@
    'eol'					=> 'EOL',
    'email_domain'			=> 'E-pos Domein',
    'email_format'			=> 'E-pos formaat',
+    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'Dit word gebruik om e-posadresse te genereer wanneer u dit invoer',
    'error'				    => 'Error',
    'filastname_format'			=> 'Eerste Voorletter (jsmith@voorbeeld.com)',
@@ -192,6 +193,8 @@
    'qty'		            => 'HOEV',
    'quantity'		        => 'hoeveelheid',
    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
    'ready_to_deploy'		=> 'Klaar om te implementeer',
    'recent_activity'		=> 'Onlangse aktiwiteite',
    'remaining'             => 'Remaining',
@@ -1,6 +1,6 @@
 <?php

 return [
-    'sent'	        => 'Jou wagwoord skakel is gestuur!',
+    'sent'	        => 'Success: If that email address exists in our system, a password recovery email has been sent.',
    'user'			=> 'No matching active user found with that email.',
 ];
@@ -41,5 +41,7 @@ return [
    'make_required' => 'Optional - click to make required',
    'reorder' => 'Reorder',
    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'Archived',
    'asset'  					=> 'Asset',
    'bulk_checkout'             => 'Checkout Assets',
+    'bulk_checkin'              => 'Checkin Assets',
    'checkin'  					=> 'Checkin Asset',
    'checkout'  				=> 'Checkout Asset',
    'clone'  					=> 'Clone Asset',
@@ -17,11 +17,11 @@ return [
    'alerts_enabled'			=> 'Email Alerts Enabled',
    'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
    'alert_inv_threshold'		=> 'Inventory Alert Threshold',
-    'allow_user_skin'           => 'Allow user skin',
+    'allow_user_skin'           => 'Allow User Skin',
    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
    'asset_ids'					=> 'Asset IDs',
    'audit_interval'            => 'Audit Interval',
-    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.',
    'audit_warning_days'        => 'Audit Warning Threshold',
    'audit_warning_days_help'   => 'How many days in advance should we warn you when assets are due for auditing?',
    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
    'backups_upload'            => 'Upload Backup',
    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
    'barcode_settings'			=> 'Barcode Settings',
    'confirm_purge'			    => 'Confirm Purge',
@@ -96,6 +96,7 @@
    'eol'					=> 'EOL',
    'email_domain'			=> 'Email Domain',
    'email_format'			=> 'Email Format',
+    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'This is used to generate email addresses when importing',
    'error'				    => 'Error',
    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
@@ -192,6 +193,8 @@
    'qty'		            => 'QTY',
    'quantity'		        => 'Quantity',
    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
    'ready_to_deploy'		=> 'Ready to Deploy',
    'recent_activity'		=> 'Recent Activity',
    'remaining'             => 'Remaining',
@@ -1,6 +1,6 @@
 <?php

 return [
-    'sent'	        => 'Your password link has been sent!',
+    'sent'	        => 'Success: If that email address exists in our system, a password recovery email has been sent.',
    'user'			=> 'No matching active user found with that email.',
 ];
@@ -41,5 +41,7 @@ return [
    'make_required' => 'Optional - click to make required',
    'reorder' => 'Reorder',
    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.',
+    'is_unique' => 'يجب أن تكون هذه القيمة فريدة من نوعها عبر جميع الأصول',
+    'unique' => 'غير مكرر',
 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'مؤرشفة',
    'asset'  					=> 'أصل',
    'bulk_checkout'             => 'إخراج الأصول',
+    'bulk_checkin'              => 'ادخال الأصل',
    'checkin'  					=> 'ادخال الأصل',
    'checkout'  				=> 'اخراج الأصل',
    'clone'  					=> 'استنساخ الأصل',
@@ -21,7 +21,7 @@ return [
    'allow_user_skin_help_text' => 'التحقق من هذا المربع سيسمح للمستخدم باستخدام مظهر واجهة المستخدم بمظهر آخر.',
    'asset_ids'					=> 'ارقام تعريف الاصول',
    'audit_interval'            => 'مدة التدقيق',
-    'audit_interval_help'       => 'إذا كان مطلوبا منك مراجعة أصولك الفعلية بشكل دوري، قم بإدخال المدة بالأشهر.',
+    'audit_interval_help'       => 'إذا كان مطلوبا منك التدقيق المادي بانتظام في الأصول الخاصة بك، قم بإدخال الفاصل الزمني بالأشهر التي تستخدمها. إذا قمت بتحديث هذه القيمة، كل "تواريخ المراجعة التالية" للأصول مع تاريخ مراجعة الحسابات المقبل.',
    'audit_warning_days'        => 'عتبة تحذير التدقيق',
    'audit_warning_days_help'   => 'كم يوما مقدما يجب أن نحذركم عندما تكون الأصول مستحقة للتدقيق؟',
    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
    'backups_upload'            => 'Upload Backup',
    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_logged_out'         => 'سيتم تسجيل الخروج من جميع المستخدمين الحاليين، بما في ذلك انت، بمجرد اكتمال الاستعادة.',
    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
    'barcode_settings'			=> 'إعدادات الباركود',
    'confirm_purge'			    => 'تأكيد التطهير',
@@ -30,7 +30,7 @@ return [
    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
    'remove_group_memberships' => 'Remove Group Memberships',
-    'warning_deletion' => 'WARNING:',
+    'warning_deletion' => 'تحذير:',
    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
    'update_user_asssets_status' => 'Update all assets for these users to this status',
    'checkin_user_properties' => 'Check in all properties associated with these users',
@@ -8,7 +8,7 @@ return [
    'delete'  	                => 'حذف',
    'edit'    	                => 'تعديل',
    'restore' 	                => 'إستعادة',
-    'remove'                    => 'إزالة',
+    'remove'                    => 'حذف',
    'request'                   => 'طلب',
    'submit'  	                => 'إرسال',
    'upload'                    => 'رفع',
@@ -17,8 +17,8 @@ return [
    'generate_labels'           => '{1} انشاء تسميات [2,*] توليد تسميات',
    'send_password_link'        => 'إرسال رابط إعادة تعيين كلمة السر',
    'go'                        => 'انطلق',
-    'bulk_actions'              => 'Bulk Actions',
-    'add_maintenance'           => 'Add Maintenance',
-    'append'                    => 'Append',
+    'bulk_actions'              => 'مجموعة إجراءات',
+    'add_maintenance'           => 'إضافة صيانة',
+    'append'                    => 'إلحاق',
    'new'                       => 'جديد',
 ];
@@ -19,10 +19,10 @@
    'asset'					=> 'الأصول',
    'asset_report'          => 'تقرير الأصول',
    'asset_tag'				=> 'ترميز الأصل',
-    'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Assets available',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'asset_tags'            => 'وسم الأصل',
+    'assets_available'		=> 'الأصول المتاحة',
+    'accept_assets'         => 'قبول الأصول :name',
+    'accept_assets_menu'    => 'قبول الأصول',
    'audit'				    => 'تدقيق',
    'audit_report'			=> 'سجل التدقيق',
    'assets'				=> 'الأصول',
@@ -33,10 +33,10 @@
    'bulkaudit'             => 'تدقيق متعدد',
    'bulkaudit_status'      => 'حالة التدقيق',
    'bulk_checkout'  		=> 'اخراج متعدد',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
+    'bulk_edit'             => 'تحرير بالجملة',
+    'bulk_delete'           => 'حذف بالجملة',
+    'bulk_actions'          => 'مجموعة إجراءات',
+    'bulk_checkin_delete'   => 'التدقيق بالجملة &amp; حذف',
    'bystatus'              => 'حسب الحالة',
    'cancel'  				=> 'إلغاء',
    'categories'			=> 'التصنيفات',
@@ -69,8 +69,8 @@
    'updated_at' 			=> 'تم التحديث في',
    'currency'  			=> '$', // this is deprecated
    'current'  				=> 'الحالي',
-    'current_password'      => 'Current Password',
-    'customize_report'      => 'Customize Report',
+    'current_password'      => 'كلمة المرور الحالية',
+    'customize_report'      => 'تخصيص التقرير',
    'custom_report'         => 'تقرير مخصص للأصول',
    'dashboard'				=> 'لوحة القيادة',
    'days'      			=> 'أيام',
@@ -82,12 +82,12 @@
    'delete_confirm'  		=> 'هل أنت متأكد من حذف :المنتج؟',
    'deleted'  				=> 'تم حذفها',
    'delete_seats'  		=> 'المقاعد المحذوفة',
-    'deletion_failed'       => 'Deletion failed',
+    'deletion_failed'       => 'فشل الحذف',
    'departments'           => 'الإدارات',
    'department'            => ' قسم، أقسام',
    'deployed'				=> 'مُوزعة',
    'depreciation'			=> 'الإستهلاك',
-    'depreciations'         => 'Depreciations',
+    'depreciations'         => 'الاستهلاكات',
    'depreciation_report'	=> 'تقرير الإستهلاك',
    'details'               => 'التفاصيل',
    'download'				=> 'تحميل',
@@ -96,8 +96,9 @@
    'eol'					=> 'نهاية العمر',
    'email_domain'			=> 'نطاق البريد الإلكتروني',
    'email_format'			=> 'تنسيق البريد الإلكتروني',
+    'employee_number'       => 'رقم الموظف',
    'email_domain_help'		=> 'يتم استخدام هذا لتوليد عناوين البريد الإلكتروني عند الاستيراد',
-    'error'				    => 'Error',
+    'error'				    => 'خطأ',
    'filastname_format'			=> 'الاسم الأخير الأول (jsmith@example.com)',
    'firstname_lastname_format'	=> 'الاسم الأول الاسم الأخير (jane.smith@example.com)',
    'firstname_lastname_underscore_format' => 'الاسم الأول الاسم الأخير (jane_smith@example.com)',
@@ -114,13 +115,13 @@
    'file_name'				=> 'ملف',
    'file_type'             => 'نوع الملف',
    'file_uploads'			=> 'تحميلات الملفات',
-    'file_upload'           => 'File Upload',
+    'file_upload'           => 'رفع الملف',
    'generate'				=> 'توفير',
-    'generate_labels'       => 'Generate Labels',
+    'generate_labels'       => 'إنشاء تسميات',
    'github_markdown'      => 'يتيح هذا الحقل <a href="https://help.github.com/articles/github-flavored-markdown/">بتطبيق نمط الكتابة من Github</a>.',
    'groups'				=> 'المجموعات',
    'gravatar_email'        => 'البريد الإلكتروني لخدمة Gravatar',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>غيّر صورتك الرمزية في Gravatar.com</small></a>.',
    'history'  			    => 'الأرشيف',
    'history_for'  			=> 'السجل لـ',
    'id'  					=> 'رقم التعريف',
@@ -128,7 +129,7 @@
    'image_delete'         	=> 'حذف الصورة',
    'image_upload'         	=> 'رفع صورة',
    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
+    'filetypes_size_help'   => 'الحد الأقصى لحجم الرفع المسموح به هو :size.',
    'image_filetypes_help'  => 'أنواع الملفات المقبولة هي jpg، webpp، png، gif، svg. الحد الأقصى المسموح به للتحميل هو :size.',
    'import'         	    => 'استيراد',
    'importing'         	=> 'الاستيراد',
@@ -138,7 +139,7 @@
    'asset_maintenance_report' => 'تقرير صيانة الأصول',
    'asset_maintenances'       => 'صيانة الأصول',
    'item'  				=> 'بند',
-    'item_name'             => 'Item Name',
+    'item_name'             => 'إسم العنصر',
    'insufficient_permissions' => 'صلاحيات غير كافية!',
    'kits'       			=> 'مجموعات محددة مسبقاً',
    'language'				=> 'لغة',
@@ -150,7 +151,7 @@
    'licenses_available'	=> 'التراخيص المتاحة',
    'licenses'				=> 'التراخيص',
    'list_all'				=> 'عرض الكل',
-    'loading'				=> 'Loading... please wait....',
+    'loading'				=> 'جار التحميل. أرجو الإنتظار....',
    'lock_passwords'        => 'لن يتم حفظ قيمة الحقل هذه في تثبيت تجريبي.',
    'feature_disabled'      => 'تم تعطيل هذه الميزة للتثبيت التجريبي.',
    'location'              => 'الموقع',
@@ -169,7 +170,7 @@
    'months'				=> 'أشهر',
    'moreinfo'				=> 'المزيد من المعلومات',
    'name'					=> 'الإسم',
-    'new_password'          => 'New Password',
+    'new_password'          => 'كلمة المرور الجديدة',
    'next'					=> 'التالى',
    'next_audit_date'		=> 'تاريخ التدقيق التالي',
    'last_audit'		    => 'آخر مراجعة',
@@ -191,23 +192,25 @@
    'purchase_date'         => 'تاريخ الشراء',
    'qty'		            => 'الكمية',
    'quantity'		        => 'كمية',
-    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quantity_minimum'      => 'لديك :count عناصر أقل أو قريبة من الحد الأدنى لمستويات الكمية',
+    'quickscan_checkin'  	=> 'فحص سريع للادخال',
+    'quickscan_checkin_status'  	=> 'فحص حالة الادخال',
    'ready_to_deploy'		=> 'جاهزة للتوزيع',
    'recent_activity'		=> 'آخر نشاط',
-    'remaining'             => 'Remaining',
+    'remaining'             => 'المتبقية',
    'remove_company'        => 'إزالة جمعية الشركة',
    'reports'				=> 'التقارير',
    'restored'				=> 'المعاد',
    'restore'				=> 'إستعادة',
-    'requestable_models'    => 'Requestable Models',
+    'requestable_models'    => 'النماذج المطلوبة',
    'requested'				=> 'طلب',
-    'requested_date'        => 'Requested Date',
-    'requested_assets'      => 'Requested Assets',
-    'requested_assets_menu' => 'Requested Assets',
+    'requested_date'        => 'تاريخ الطلب',
+    'requested_assets'      => 'الأصول المطلوبة',
+    'requested_assets_menu' => 'الأصول المطلوبة',
    'request_canceled'      => 'تم إلغاء الطلب',
    'save'  				=> 'حفظ',
    'select'				=> 'تحديد',
-    'select_all'            => 'Select All',
+    'select_all'            => 'اختر الكل',
    'search'				=> 'بحث',
    'select_category'       => 'اختر تصنيف',
    'select_department'     => 'حدد قسم',
@@ -273,26 +276,26 @@
    'accept'                => 'قبول :asset',
    'i_accept'              => 'قبول',
    'i_decline'             => 'أنا أرفض',
-    'accept_decline'        => 'Accept/Decline',
+    'accept_decline'        => 'قبول/رفض',
    'sign_tos'              => 'قم بتسجيل الدخول أدناه للإشارة إلى أنك توافق على شروط الخدمة:',
    'clear_signature'       => 'مسح التوقيع',
    'show_help'             => 'إظهار المساعدة',
    'hide_help'             => 'إخفاء المساعدة',
-    'view_all'              => 'view all',
-    'hide_deleted'          => 'Hide Deleted',
-    'email'                 => 'Email',
-    'do_not_change'         => 'Do Not Change',
-    'bug_report'            => 'Report a Bug',
-    'user_manual'           => 'User\'s Manual',
-    'setup_step_1'          => 'Step 1',
-    'setup_step_2'          => 'Step 2',
-    'setup_step_3'          => 'Step 3',
-    'setup_step_4'          => 'Step 4',
-    'setup_config_check'    => 'Configuration Check',
-    'setup_create_database' => 'Create Database Tables',
-    'setup_create_admin'    => 'Create Admin User',
-    'setup_done'            => 'Finished!',
-    'bulk_edit_about_to'    => 'You are about to edit the following: ',
+    'view_all'              => 'عرض الكل',
+    'hide_deleted'          => 'إخفاء المحذوفة',
+    'email'                 => 'البريد الالكتروني',
+    'do_not_change'         => 'لا تقم بالتغيير',
+    'bug_report'            => 'الإبلاغ عن خلل',
+    'user_manual'           => 'دليل المستخدم',
+    'setup_step_1'          => 'الخطوة 1',
+    'setup_step_2'          => 'الخطوة 2',
+    'setup_step_3'          => 'الخطوة 3',
+    'setup_step_4'          => 'الخطوة 4',
+    'setup_config_check'    => 'التحقق من الاعدادات',
+    'setup_create_database' => 'إنشاء جداول قاعدة البيانات',
+    'setup_create_admin'    => 'إنشاء مستخدم مسؤول',
+    'setup_done'            => 'إنتهى!',
+    'bulk_edit_about_to'    => 'أنت على وشك تحرير ما يلي: ',
    'checked_out'           => 'Checked Out',
    'checked_out_to'        => 'Checked out to',
    'fields'                => 'Fields',
@@ -1,6 +1,6 @@
 <?php

 return [
-    'sent'	        => 'تم إرسال رابط كلمة المرور الخاصة بك!',
+    'sent'	        => 'تم بنجاح: إذا كان عنوان البريد الإلكتروني هذا موجودًا في نظامنا ، فقد تم إرسال بريد إلكتروني لاستعادة كلمة المرور.',
    'user'			=> 'لم يتم العثور على اسم مستخدم فعّال مرتبط بعنوان ذلك البريد الالكتروني.',
 ];
@@ -41,5 +41,7 @@ return [
    'make_required' => 'Optional - click to make required',
    'reorder' => 'Reorder',
    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'Архивиран',
    'asset'  					=> 'Актив',
    'bulk_checkout'             => 'Изписване на активи',
+    'bulk_checkin'              => 'Checkin Assets',
    'checkin'  					=> 'Връщане на актив',
    'checkout'  				=> 'Проверка на активите',
    'clone'  					=> 'Копиране на актив',
@@ -21,7 +21,7 @@ return [
    'allow_user_skin_help_text' => 'Поставянето на отметка тук, ще позволи на потребителя да ползва различна UI тема от основната.',
    'asset_ids'					=> 'ID на активи',
    'audit_interval'            => 'Одитен интервал',
-    'audit_interval_help'       => 'Ако се изисква редовно да извършвате физически одит на активите си, въведете интервала в месеци.',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.',
    'audit_warning_days'        => 'Праг за предупреждение за одит',
    'audit_warning_days_help'   => 'Колко дни предварително трябва да ви предупреждаваме, когато активите са дължими за одит?',
    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
    'backups_upload'            => 'Upload Backup',
    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
    'barcode_settings'			=> 'Настройки на баркод',
    'confirm_purge'			    => 'Потвърдете пречистване ',
@@ -271,30 +271,30 @@ return [
    'unique_serial_help_text'                => 'Отмятането на този чек, ще задължи ползването на уникални сериини номера на артикулите',
    'zerofill_count'        => 'Дължина на етикети на актив, включително zerofill',
    'username_format_help'   => 'Тази настройка се изпозлва само при импортиране, ако потребителя не е въведен и ние трябва да му генерираме потребителско име.',
-    'oauth_title' => 'OAuth API Settings',
+    'oauth_title' => 'OAuth API Настройки',
    'oauth' => 'OAuth',
    'oauth_help' => 'Oauth Endpoint Settings',
    'asset_tag_title' => 'Update Asset Tag Settings',
    'barcode_title' => 'Update Barcode Settings',
-    'barcodes' => 'Barcodes',
+    'barcodes' => 'Баркоди',
    'barcodes_help_overview' => 'Barcode &amp; QR settings',
    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
    'barcodes_spinner' => 'Attempting to delete files...',
-    'barcode_delete_cache' => 'Delete Barcode Cache',
+    'barcode_delete_cache' => 'Изтрий баркод кеша',
    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
+    'general_title' => 'Обнови общите настройки',
+    'mail_test' => 'Изпрати Тест',
    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
+    'security' => 'Сигурност',
+    'security_title' => 'Обнови настройките за сигурност',
+    'security_keywords' => 'парола, парили, изисквания, двустепенна идентификация, двустепенна-идентификация, общи пароли, отдалечен вход, изход, идентификация',
+    'security_help' => 'Двустепенна идентификация, ограничения на пароли',
+    'groups_keywords' => 'права за достъп, групи за достъп, упълномощаване',
+    'groups_help' => 'Групи с разрешения за акаунт',
+    'localization' => 'Локализация',
+    'localization_title' => 'Обнови настройките за локализация',
+    'localization_keywords' => 'локализация, валута, местен, място, часова зона, международен, интернационализация, език, езици, превод',
    'localization_help' => 'Language, date display',
    'notifications' => 'Notifications',
    'notifications_help' => 'Email alerts, audit settings',
@@ -20,5 +20,5 @@ return [
    'bulk_actions'              => 'Bulk Actions',
    'add_maintenance'           => 'Add Maintenance',
    'append'                    => 'Append',
-    'new'                       => 'New',
+    'new'                       => 'Нов',
 ];
@@ -19,10 +19,10 @@
    'asset'					=> 'Актив',
    'asset_report'          => 'Справка за активите',
    'asset_tag'				=> 'Инвентарен номер',
-    'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Assets available',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'asset_tags'            => 'Етикет на актив',
+    'assets_available'		=> 'Налични активи',
+    'accept_assets'         => 'Приеми Актив :name',
+    'accept_assets_menu'    => 'Приеми активите',
    'audit'				    => 'проверка',
    'audit_report'			=> 'Отчет за одита',
    'assets'				=> 'Активи',
@@ -33,8 +33,8 @@
    'bulkaudit'             => 'Групов одит',
    'bulkaudit_status'      => 'Статус на одита',
    'bulk_checkout'  		=> 'Общо отписване',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
+    'bulk_edit'             => 'Групово редактиране',
+    'bulk_delete'           => 'Групово изтриване',
    'bulk_actions'          => 'Bulk Actions',
    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
    'bystatus'              => 'по Статус',
@@ -96,6 +96,7 @@
    'eol'					=> 'EOL',
    'email_domain'			=> 'Email домейн',
    'email_format'			=> 'Email формат',
+    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'Използвайте това за да генерирате email адреси при въвеждане',
    'error'				    => 'Error',
    'filastname_format'			=> 'Инициал на името Фамилия (jsmith@example.com)',
@@ -192,6 +193,8 @@
    'qty'		            => 'Количество',
    'quantity'		        => 'Kоличество',
    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
    'ready_to_deploy'		=> 'Готово за предоставяне',
    'recent_activity'		=> 'Последни действия',
    'remaining'             => 'Remaining',
@@ -1,6 +1,6 @@
 <?php

 return [
-    'sent'	        => 'Линк към вашата парола бе изпратен!',
+    'sent'	        => 'Success: If that email address exists in our system, a password recovery email has been sent.',
    'user'			=> 'Не са намерени активни потребители с този е-майл.',
 ];
@@ -41,5 +41,7 @@ return [
    'make_required' => 'Optional - click to make required',
    'reorder' => 'Reorder',
    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'Archived',
    'asset'  					=> 'Asset',
    'bulk_checkout'             => 'Checkout Assets',
+    'bulk_checkin'              => 'Checkin Assets',
    'checkin'  					=> 'Checkin Asset',
    'checkout'  				=> 'Checkout Asset',
    'clone'  					=> 'Clone Asset',
@@ -17,11 +17,11 @@ return [
    'alerts_enabled'			=> 'Email Alerts Enabled',
    'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
    'alert_inv_threshold'		=> 'Inventory Alert Threshold',
-    'allow_user_skin'           => 'Allow user skin',
+    'allow_user_skin'           => 'Allow User Skin',
    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
    'asset_ids'					=> 'Asset IDs',
    'audit_interval'            => 'Audit Interval',
-    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.',
    'audit_warning_days'        => 'Audit Warning Threshold',
    'audit_warning_days_help'   => 'How many days in advance should we warn you when assets are due for auditing?',
    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
    'backups_upload'            => 'Upload Backup',
    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
    'barcode_settings'			=> 'Barcode Settings',
    'confirm_purge'			    => 'Confirm Purge',
@@ -96,6 +96,7 @@
    'eol'					=> 'EOL',
    'email_domain'			=> 'Email Domain',
    'email_format'			=> 'Email Format',
+    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'This is used to generate email addresses when importing',
    'error'				    => 'Error',
    'filastname_format'			=> 'First Initial Last Name (jsmith@example.com)',
@@ -192,6 +193,8 @@
    'qty'		            => 'QTY',
    'quantity'		        => 'Quantity',
    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
    'ready_to_deploy'		=> 'Ready to Deploy',
    'recent_activity'		=> 'Recent Activity',
    'remaining'             => 'Remaining',
@@ -1,6 +1,6 @@
 <?php

 return [
-    'sent'	        => 'Your password link has been sent!',
+    'sent'	        => 'Success: If that email address exists in our system, a password recovery email has been sent.',
    'user'			=> 'No matching active user found with that email.',
 ];
@@ -18,6 +18,6 @@ return array(
    'update'  							=> 'Upravit kategorii',
    'use_default_eula'					=> 'Použijte raději <a href="#" data-toggle="modal" data-target="#eulaModal">primární výchozí EULA</a>.',
    'use_default_eula_disabled'			=> '<del>Použijte raději primární výchozí EULA.</del> Nenalezena primární výchozí EULA. Přidejte ji v Nastaveních prosím.',
-    'use_default_eula_column'			=> 'Use default EULA',
+    'use_default_eula_column'			=> 'Použít výchozí EULA',

 );
@@ -41,5 +41,7 @@ return [
    'make_required' => 'Optional - click to make required',
    'reorder' => 'Reorder',
    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
 ];
@@ -45,5 +45,5 @@ return [
    'asset_location_update_default' => 'Update only default location',
    'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
    'asset_deployable' => 'That status is deployable. This asset can be checked out.',
-    'processing_spinner' => 'Processing...',
+    'processing_spinner' => 'Zpracovává se...',
 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'Archivováno',
    'asset'  					=> 'Majetek',
    'bulk_checkout'             => 'Vyskladnit majetek',
+    'bulk_checkin'              => 'Checkin Assets',
    'checkin'  					=> 'Převzít majetek',
    'checkout'  				=> 'Pokladní majetek',
    'clone'  					=> 'Klonovat majetek',
@@ -39,5 +40,5 @@ return [
    'error_messages' => 'Error messages:',
    'success_messages' => 'Success messages:',
    'alert_details' => 'Please see below for details.',
-    'custom_export' => 'Custom Export'
+    'custom_export' => 'Uživatelsky definovaný export'
 ];
@@ -26,5 +26,5 @@ return [
    'requesting_user' => 'Requesting User',
    'requested_date' => 'Requested Date',
    'changed'       => 'Changed',
-    'icon' => 'Icon',
+    'icon' => 'Ikona',
 ];
@@ -20,19 +20,19 @@ return [
    'parent'                    => 'Nadřazené',
    'currency'                  => 'Měna',
    'ldap_ou'                   => 'LDAP Vyhledat OU',
-    'user_name'                 => 'User Name',
-    'department'                => 'Department',
-    'location'                  => 'Location',
-    'asset_tag'                 => 'Assets Tag',
-    'asset_name'                => 'Name',
-    'asset_category'            => 'Category',
-    'asset_manufacturer'        => 'Manufacturer',
+    'user_name'                 => 'Uživatelské Jméno',
+    'department'                => 'Oddělení',
+    'location'                  => 'Umístění',
+    'asset_tag'                 => 'Označení majetku',
+    'asset_name'                => 'Název',
+    'asset_category'            => 'Kategorie',
+    'asset_manufacturer'        => 'Výrobce',
    'asset_model'               => 'Model',
-    'asset_serial'              => 'Serial',
-    'asset_location'            => 'Location',
+    'asset_serial'              => 'Sériové číslo',
+    'asset_location'            => 'Umístění',
    'asset_checked_out'         => 'Checked Out',
    'asset_expected_checkin'    => 'Expected Checkin',
-    'date'                      => 'Date:',
+    'date'                      => 'Datum:',
    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
    'signed_by_location_manager' => 'Signed By (Location Manager):',
@@ -21,7 +21,7 @@ return [
    'allow_user_skin_help_text' => 'Zaškrtnutí tohoto políčka umožní uživateli přepsat vzhled uživatelského rozhraní jiným.',
    'asset_ids'					=> 'ID majetku',
    'audit_interval'            => 'Interval auditu',
-    'audit_interval_help'       => 'Pokud budete muset pravidelně fyzicky kontrolovat svůj majetek, zadejte interval v měsících.',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.',
    'audit_warning_days'        => 'Prah výstrahy auditu',
    'audit_warning_days_help'   => 'Kolik dní předem bychom vás měli varovat, když jsou aktiva splatná pro audit?',
    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
    'backups_upload'            => 'Upload Backup',
    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
    'barcode_settings'			=> 'Nastavení čárového kódu',
    'confirm_purge'			    => 'Potvrdit vyčištění',
@@ -24,7 +24,7 @@ return [
    'two_factor_admin_optin_help' => 'Vaše současná nastavení administrátora umožňují selektivní vynucení dvoufaktorového ověřování.  ',
    'two_factor_enrolled' => 'Přihlášeno zařízení 2FA ',
    'two_factor_active'   => '2FA aktivní ',
-    'user_deactivated'  => 'User is de-activated',
+    'user_deactivated'  => 'Uživatel je deaktivován',
    'activation_status_warning' => 'Do not change activation status',
    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
@@ -8,17 +8,17 @@ return [
    'delete'  	                => 'Smazat',
    'edit'    	                => 'Upravit',
    'restore' 	                => 'Obnovit',
-    'remove'                    => 'Remove',
+    'remove'                    => 'Odebrat',
    'request'                   => 'Požadavek',
    'submit'  	                => 'Odeslat',
    'upload'                    => 'Nahrát',
    'select_file'				=> 'Vybrat soubor...',
    'select_files'				=> 'Vybrat soubory…',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
-    'send_password_link'        => 'Send Password Reset Link',
-    'go'                        => 'Go',
-    'bulk_actions'              => 'Bulk Actions',
+    'generate_labels'           => '{1} Generovat štítek|[2,*] Generovat štítky',
+    'send_password_link'        => 'Poslat odkaz na obnovení hesla',
+    'go'                        => 'Spustit',
+    'bulk_actions'              => 'Hromadné operace',
    'add_maintenance'           => 'Add Maintenance',
-    'append'                    => 'Append',
-    'new'                       => 'New',
+    'append'                    => 'Připojit',
+    'new'                       => 'Nový',
 ];
@@ -19,10 +19,10 @@
    'asset'					=> 'Zařízeni',
    'asset_report'          => 'Report majetku',
    'asset_tag'				=> 'Označení majetku',
-    'asset_tags'            => 'Asset Tags',
-    'assets_available'		=> 'Assets available',
-    'accept_assets'         => 'Accept Assets :name',
-    'accept_assets_menu'    => 'Accept Assets',
+    'asset_tags'            => 'Označení majetku',
+    'assets_available'		=> 'Dostupný majatek',
+    'accept_assets'         => 'Příjmout majetek :name',
+    'accept_assets_menu'    => 'Přijmout majetek',
    'audit'				    => 'Audit',
    'audit_report'			=> 'Záznamy auditu',
    'assets'				=> 'Zařízení',
@@ -33,11 +33,11 @@
    'bulkaudit'             => 'Hromadný audit',
    'bulkaudit_status'      => 'Stav auditu',
    'bulk_checkout'  		=> 'Hromadný výdej',
-    'bulk_edit'             => 'Bulk Edit',
-    'bulk_delete'           => 'Bulk Delete',
-    'bulk_actions'          => 'Bulk Actions',
-    'bulk_checkin_delete'   => 'Bulk Checkin &amp; Delete',
-    'bystatus'              => 'by Status',
+    'bulk_edit'             => 'Hromadná úprava',
+    'bulk_delete'           => 'Hromadné odstranění',
+    'bulk_actions'          => 'Hromadné akce',
+    'bulk_checkin_delete'   => 'Hromadné odepsání &amp; Odstranit',
+    'bystatus'              => 'podle stavu',
    'cancel'  				=> 'Storno',
    'categories'			=> 'Kategorie',
    'category'				=> 'Kategorie',
@@ -65,12 +65,12 @@
    'created'               => 'Položka vytvořena',
    'created_asset'			=> 'vytvořit majetek',
    'created_at' 			=> 'Vytvořeno',
-    'record_created' 		=> 'Record Created',
+    'record_created' 		=> 'Záznam vytvořen',
    'updated_at' 			=> 'Aktualizováno',
    'currency'  			=> 'Kč', // this is deprecated
    'current'  				=> 'Aktuální',
-    'current_password'      => 'Current Password',
-    'customize_report'      => 'Customize Report',
+    'current_password'      => 'Stávající heslo',
+    'customize_report'      => 'Přizpůsobit report',
    'custom_report'         => 'Vlastní report majetku',
    'dashboard'				=> 'Nástěnka',
    'days'      			=> 'dnů',
@@ -82,56 +82,57 @@
    'delete_confirm'  		=> 'Opravdu chcete smazat :item?',
    'deleted'  				=> 'Odstraněno',
    'delete_seats'  		=> 'Vymazaná licenční místa',
-    'deletion_failed'       => 'Deletion failed',
+    'deletion_failed'       => 'Odstranění se nezdařilo',
    'departments'           => 'Oddělení',
    'department'            => 'Oddělení',
    'deployed'				=> 'Vydané',
    'depreciation'			=> 'Amortizace',
-    'depreciations'         => 'Depreciations',
+    'depreciations'         => 'Odpisy',
    'depreciation_report'	=> 'Report zastarání',
    'details'               => 'Podrobnosti',
    'download'				=> 'Stáhnout',
-    'download_all'		    => 'Download All',
+    'download_all'		    => 'Stáhnout vše',
    'editprofile'  			=> 'Upravit profil',
    'eol'					=> 'Konec životnosti',
    'email_domain'			=> 'Doména e-mailu',
    'email_format'			=> 'Formát e-mailu',
+    'employee_number'       => 'Číslo zaměstnance',
    'email_domain_help'		=> 'Toto je použito na generování e-mailových adres při importu',
-    'error'				    => 'Error',
+    'error'				    => 'Chyba',
    'filastname_format'			=> 'Iniciál Jména Příjmení (jsmith@example.com)',
    'firstname_lastname_format'	=> 'Jméno Příjmení (jane.smith@example.com)',
    'firstname_lastname_underscore_format' => 'Jméno Příjmení (jan_novak@example.com)',
    'lastnamefirstinitial_format' =>  'Příjmení první písmeno ze jména (novakj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+    'firstintial_dot_lastname_format' => 'Iniciál Príjmení (j.novak@example.com)',
    'first'					=> 'První',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
+    'firstnamelastname'     => 'Jméno Příjmení (jozefnovak@example.com)',
+    'lastname_firstinitial' => 'Příjmení Iniciál (novak_j@example.com)',
+    'firstinitial.lastname' => 'Iniciál Príjmení (j.novak@example.com)',
+    'firstnamelastinitial'  => 'Jméno Iniciál(josefn@example.com)',
    'first_name'			=> 'Jméno',
    'first_name_format'		=> 'Jméno (jane@example.com)',
    'files'                 => 'Soubory',
    'file_name'				=> 'Soubor',
-    'file_type'             => 'File Type',
+    'file_type'             => 'Typ souboru',
    'file_uploads'			=> 'Nahrání souboru',
-    'file_upload'           => 'File Upload',
+    'file_upload'           => 'Nahrání souboru',
    'generate'				=> 'Vytvořit',
-    'generate_labels'       => 'Generate Labels',
+    'generate_labels'       => 'Generovat štítky',
    'github_markdown'      => 'V kolonce je možné použít <a href="https://help.github.com/articles/github-flavored-markdown/">Github variantu markdown</a>.',
    'groups'				=> 'Skupiny',
    'gravatar_email'        => 'Emailová adresa Gravatar',
-    'gravatar_url'          => '<a href="http://gravatar.com"><small>Change your avatar at Gravatar.com</small></a>.',
+    'gravatar_url'          => '<a href="http://gravatar.com"><small>Změňte svůj avatar na Gravatar.com</small></a>.',
    'history'  			    => 'Historie',
    'history_for'  			=> 'Historie uživatele',
    'id'  					=> 'ID',
    'image'                 => 'Obrázek',
    'image_delete'         	=> 'Smazat obrázek',
    'image_upload'         	=> 'Nahrát obrázek',
-    'filetypes_accepted_help'    => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
-    'filetypes_size_help'   => 'Max upload size allowed is :size.',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+    'filetypes_accepted_help'    => 'Přijatý typ souboru je :types. Maximální povolená velikost nahrávání je :size.|Přijaté typy souborů jsou :types. Maximální povolená velikost nahrávání je :size.',
+    'filetypes_size_help'   => 'Maximální povolená velikost nahrávání je :size.',
+    'image_filetypes_help'  => 'Podporované typy souborů jsou jpg, png, gif, a svg. Velikost může být nejvýše :size.',
    'import'         	    => 'Import',
-    'importing'         	=> 'Importing',
+    'importing'         	=> 'Importování',
    'importing_help'        => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. <br><br>The CSV should be comma-delimited and formatted with headers that match the ones in the <a href="https://snipe-it.readme.io/docs/importing" target="_new">sample CSVs in the documentation</a>.',
    'import-history'        => 'Historie importu',
    'asset_maintenance'        => 'Údržba zařízení',
@@ -140,7 +141,7 @@
    'item'  				=> 'Položka',
    'item_name'             => 'Item Name',
    'insufficient_permissions' => 'Nedostatečná oprávnění!',
-    'kits'       			=> 'Predefined Kits',
+    'kits'       			=> 'Předdefinované sady',
    'language'				=> 'Jazyk',
    'last'					=> 'Poslední',
    'last_login'            => 'Poslední přihlášení',
@@ -150,8 +151,8 @@
    'licenses_available'	=> 'dostupných licencí',
    'licenses'				=> 'Licence',
    'list_all'				=> 'Vypsat vše',
-    'loading'				=> 'Loading... please wait....',
-    'lock_passwords'        => 'This field value will not be saved in a demo installation.',
+    'loading'				=> 'Načítání, čekejte prosím...',
+    'lock_passwords'        => 'Tato hodnota pole nebude uložena v ukázkové instalaci.',
    'feature_disabled'      => 'Tato funkce byla deaktivována pro demo instalaci.',
    'location'              => 'Lokalita',
    'locations'				=> 'Umístění',
@@ -159,7 +160,7 @@
    'logout'				=> 'Odhlásit',
    'lookup_by_tag'     => 'Vyhledávání podle značky majetku',
    'maintenances'          => 'Údržby',
-    'manage_api_keys'       => 'Manage API Keys',
+    'manage_api_keys'       => 'Spravovat API klíče',
    'manufacturer'			=> 'Výrobce',
    'manufacturers'			=> 'Výrobci',
    'markdown'				=> 'Toto pole umožňuje <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -169,7 +170,7 @@
    'months'				=> 'měsíce',
    'moreinfo'				=> 'Další informace',
    'name'					=> 'Název',
-    'new_password'          => 'New Password',
+    'new_password'          => 'Nové heslo',
    'next'					=> 'Další',
    'next_audit_date'		=> 'Další datum auditu',
    'last_audit'		    => 'Poslední audit',
@@ -192,6 +193,8 @@
    'qty'		            => 'Množství',
    'quantity'		        => 'Množství',
    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
    'ready_to_deploy'		=> 'Připraveno k přidělení',
    'recent_activity'		=> 'Nedávná aktivita',
    'remaining'             => 'Remaining',
@@ -207,7 +210,7 @@
    'request_canceled'      => 'Žádost zrušena',
    'save'  				=> 'Uložit',
    'select'				=> 'Zvolit',
-    'select_all'            => 'Select All',
+    'select_all'            => 'Vybrat vše',
    'search'				=> 'Hledat',
    'select_category'       => 'Vyberte kategorii',
    'select_department'     => 'Vyberte Oddělení',
@@ -1,6 +1,6 @@
 <?php

 return [
-    'sent'	        => 'Váš odkaz s heslem byl odeslán!',
+    'sent'	        => 'Úspěch: Pokud tato e-mailová adresa existuje v našem systému, byl odeslán e-mail pro obnovení hesla.',
    'user'			=> 'Nebyl nalezen žádný aktivní uživatel s takovým e-mailem.',
 ];
@@ -64,7 +64,7 @@ return [
        'string'  => ':attribute musí mít minimálně :min znaků.',
        'array'   => 'Atribut musí mít alespoň: min položky.',
    ],
-    'starts_with'          => 'The :attribute must start with one of the following: :values.',
+    'starts_with'          => ':attribute musí končit jednou z následujících hodnot: :values.',
    'not_in'               => 'Zvolený :attribute je neplatný.',
    'numeric'              => ':attribute musí být číslo.',
    'present'              => 'Pole atributu musí být přítomno.',
@@ -90,7 +90,7 @@ return [
    'uploaded'             => 'Atribut: se nepodařilo nahrát.',
    'url'                  => 'Formát :attribute je neplatný.',
    'unique_undeleted'     => 'Je třeba, aby se :attribute neopakoval.',
-    'non_circular'         => 'The :attribute must not create a circular reference.',
+    'non_circular'         => ':attribute nesmí vytvořit kruhový odkaz.',

    /*
    |--------------------------------------------------------------------------
@@ -41,5 +41,7 @@ return [
    'make_required' => 'Optional - click to make required',
    'reorder' => 'Reorder',
    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'Archifwyd',
    'asset'  					=> 'Ased',
    'bulk_checkout'             => 'Nodi Asedau Allan',
+    'bulk_checkin'              => 'Checkin Assets',
    'checkin'  					=> 'Nodi Asedau I Mewn',
    'checkout'  				=> 'Nodi Asedau Allan',
    'clone'  					=> 'Dyblygu Ased',
@@ -17,11 +17,11 @@ return [
    'alerts_enabled'			=> 'Rhybuddion ebost wedi alluogi',
    'alert_interval'			=> 'Trothwy Rhybuddion sy\'n Dod i Ben (mewn dyddiau)',
    'alert_inv_threshold'		=> 'Trothwy Rhybudd Rhestr',
-    'allow_user_skin'           => 'Allow user skin',
+    'allow_user_skin'           => 'Allow User Skin',
    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
    'asset_ids'					=> 'Rhifau Unigryw Asedau',
    'audit_interval'            => 'Cyfnod Awdit',
-    'audit_interval_help'       => 'Os ydych angen gwneud awdit ffisegol, rhowch y cyfnod mewn misoedd.',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.',
    'audit_warning_days'        => 'Trothwy Rhybuddio Awdit',
    'audit_warning_days_help'   => 'Sawl diwrnod o flaen llaw ddylswn rhybuddio chi o asedau sydd angen awdit?',
    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
    'backups_upload'            => 'Upload Backup',
    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
    'barcode_settings'			=> 'Gosodiadau Barcode',
    'confirm_purge'			    => 'Cadarnhau Clirio',
@@ -96,6 +96,7 @@
    'eol'					=> 'DB',
    'email_domain'			=> 'Parth Ebost',
    'email_format'			=> 'Fformat Ebost',
+    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'Defnyddir hwn i gynhyrchu cyfeiriadau e-bost wrth fewnforio',
    'error'				    => 'Error',
    'filastname_format'			=> 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
@@ -192,6 +193,8 @@
    'qty'		            => 'Nifer',
    'quantity'		        => 'Nifer',
    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
    'ready_to_deploy'		=> 'Barod i\'w defnyddio',
    'recent_activity'		=> 'Gweithgareddau Diweddar',
    'remaining'             => 'Remaining',
@@ -1,6 +1,6 @@
 <?php

 return [
-    'sent'	        => 'Mae eich linc cyfrinair wedi\'i yrru!',
+    'sent'	        => 'Success: If that email address exists in our system, a password recovery email has been sent.',
    'user'			=> 'Dim defnyddiwr wedi\'i ddarganfod hefo\'r cyfeiriad ebost yna.',
 ];
@@ -41,5 +41,7 @@ return [
    'make_required' => 'Optional - click to make required',
    'reorder' => 'Reorder',
    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.',
+    'is_unique' => 'This value must be unique across all assets',
+    'unique' => 'Unique',
 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'arkiverede',
    'asset'  					=> 'Asset',
    'bulk_checkout'             => 'Udtjek aktiv',
+    'bulk_checkin'              => 'Checkin Assets',
    'checkin'  					=> 'Checkin Asset',
    'checkout'  				=> 'Checkout Asset',
    'clone'  					=> 'Klonaktiver',
@@ -21,7 +21,7 @@ return [
    'allow_user_skin_help_text' => 'Afkrydsning her giver brugeren afgang til at overskrive UI skin med et andet skin.',
    'asset_ids'					=> 'Aktiv-id\'er',
    'audit_interval'            => 'Revisionsinterval',
-    'audit_interval_help'       => 'Hvis du skal regelmæssigt kontrollere dine aktiver fysisk, skal du indtaste intervallet i måneder.',
+    'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.',
    'audit_warning_days'        => 'Audit Warning Threshold',
    'audit_warning_days_help'   => 'Hvor mange dage i forvejen skal vi advare dig, når aktiver skal betales for revision?',
    'auto_increment_assets'		=> 'Generate auto-incrementing asset tags',
@@ -32,7 +32,7 @@ return [
    'backups_upload'            => 'Upload Backup',
    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
+    'backups_logged_out'         => 'All existing users, including you, will be logged out once your restore is complete.',
    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
    'barcode_settings'			=> 'Stregkodeindstillinger',
    'confirm_purge'			    => 'Bekræft rensning',
@@ -96,6 +96,7 @@
    'eol'					=> 'EOL',
    'email_domain'			=> 'Email domæne',
    'email_format'			=> 'Email formattering',
+    'employee_number'       => 'Employee Number',
    'email_domain_help'		=> 'Dette bruges til at generere email-adresser ved importering',
    'error'				    => 'Error',
    'filastname_format'			=> 'Fornavnskarakter Efternavn (jsmith@example.com)',
@@ -192,6 +193,8 @@
    'qty'		            => 'STK',
    'quantity'		        => 'Antal',
    'quantity_minimum'      => 'You have :count items below or almost below minimum quantity levels',
+    'quickscan_checkin'  	=> 'Quick Scan Checkin',
+    'quickscan_checkin_status'  	=> 'Checkin Status',
    'ready_to_deploy'		=> 'Klar til Implementering',
    'recent_activity'		=> 'Seneste aktivitet',
    'remaining'             => 'Remaining',
@@ -1,6 +1,6 @@
 <?php

 return [
-    'sent'	        => 'Dit adgangskode link er blevet sendt!',
+    'sent'	        => 'Success: If that email address exists in our system, a password recovery email has been sent.',
    'user'			=> 'Der er ikke fundet nogen aktiv bruger med denne email.',
 ];
@@ -3,5 +3,5 @@
 return [
    'select_company' => 'Firma auswählen',
    'about_companies' => 'Über Unternehmen',
-    'about_companies_description' => '        You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+    'about_companies_description' => '        Unternehmen können als ein einfaches Informationsfeld verwendet werden, oder um die Sichtbarkeit und Verfügbarkeit von Vermögenswerten auf Benutzer eines bestimmten Unternehmens zu beschränken. Hierfür muss die Mehrmandanten-Unterstützung für Firmen in den Admin-Einstellungen aktiviert werden.',
 ];
@@ -5,7 +5,7 @@ return [
    'manage'                    => 'Verwalten',
    'field'		                => 'Feld',
    'about_fieldsets_title'		=> 'Über Feldsätze',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Ein Feldsatz ist eine Gruppe von benutzerdefinierten Feldern, die häufig für bestimmte Asset-Modelltypen wiederverwendet werden.',
    'custom_format'             => 'Benutzerdefiniertes Regex-Format...',
    'encrypt_field'      	        => 'Den Wert dieses Feldes in der Datenbank verschlüsseln',
    'encrypt_field_help'      => 'WARNUNG: Ein verschlüsseltes Feld kann nicht durchsucht werden.',
@@ -27,19 +27,21 @@ return [
    'used_by_models'   		    => 'Von Modellen benutzt',
    'order'   		            => 'Reihenfolge',
    'create_fieldset'         => 'Neuer Feldsatz',
-    'create_fieldset_title' => 'Create a new fieldset',
+    'create_fieldset_title' => 'Neuen Feldsatz erstellen',
    'create_field'            => 'Neues benutzerdefiniertes Feld',
    'create_field_title' => 'Neues benutzerdefiniertes Feld erstellen',
    'value_encrypted'      	        => 'Der Wert dieses Feldes ist in der Datenbank verschlüsselt. Nur Benutzer mit Administratorrechten können den entschlüsselten Wert anzeigen',
    'show_in_email'     => 'Feld miteinbeziehen bei Herausgabe-Emails an die Benutzer? Verschlüsselte Felder können nicht miteinbezogen werden.',
    'help_text' => 'Hilfetext',
-    'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
+    'help_text_description' => 'Dies ist ein optionaler Text, der unter den Formularelementen erscheint, während eine Datei bearbeitet wird, um Kontext für das Feld bereitzustellen.',
    'about_custom_fields_title' => 'Über benutzerdefinierte Felder',
-    'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
-    'add_field_to_fieldset' => 'Add Field to Fieldset',
-    'make_optional' => 'Required - click to make optional',
-    'make_required' => 'Optional - click to make required',
+    'about_custom_fields_text' => 'Benutzerdefinierte Felder ermöglichen es, beliebige Attribute zu Assets hinzuzufügen.',
+    'add_field_to_fieldset' => 'Feld zum Feldsatz hinzufügen',
+    'make_optional' => 'Benötigt - klicken, um optional zu machen',
+    'make_required' => 'Optional - Klicken, um erforderlich zu machen',
    'reorder' => 'Sortieren',
-    'db_field' => 'DB Field',
-    'db_convert_warning' => 'WARNING. This field is in the custom fields table as <code> :db_column </code> but should be :expected </code>.'
+    'db_field' => 'Datenbankfeld',
+    'db_convert_warning' => 'WARNUNG. Dieses Feld befindet sich in der Tabelle mit benutzerdefinierten Feldern wie <code> :db_column </code> aber sollte: </code> sein.',
+    'is_unique' => 'Dieser Wert muss für jedes Asset eindeutig sein',
+    'unique' => 'Einzigartig',
 ];
@@ -10,7 +10,7 @@ return [
    'number_of_months'  					=> 'Anzahl der Monate',
    'update'  					            => 'Abschreibung aktualisieren',
    'depreciation_min'                      => 'Minimaler Wert nach Abschreibung',
-    'no_depreciations_warning'               => '<strong>Warning: </strong>
-                      You do not currently have any depreciations set up.
-                      Please set up at least one depreciation to view the depreciation report.',
+    'no_depreciations_warning'               => '<strong>Warnung: </strong>
+                      Sie haben derzeit keine Abschreibungen eingerichtet.
+                      Bitte richten Sie mindestens eine Abschreibung ein, um den Abschreibungsbericht anzuzeigen.',
 ];
@@ -6,6 +6,6 @@ return [
    'months'   => 'Monate',
    'term'   => 'Laufzeit',
    'title'      => 'Name ',
-    'depreciation_min' => 'Floor Value',
+    'depreciation_min' => 'Minimalwert',

 ];
@@ -6,6 +6,7 @@ return [
    'archived'  				=> 'Archiviert',
    'asset'  					=> 'Asset',
    'bulk_checkout'             => 'Assets herausgeben',
+    'bulk_checkin'              => 'Assets zurücknehmen',
    'checkin'  					=> 'Asset zurücknehmen',
    'checkout'  				=> 'Asset herausgeben',
    'clone'  					=> 'Asset duplizieren',
@@ -16,7 +17,7 @@ return [
    'requestable'               => 'Anforderbar',
    'requested'				    => 'Angefordert',
    'not_requestable'           => 'Kann nicht angefordert werden',
-    'requestable_status_warning' => 'Do not change  requestable status',
+    'requestable_status_warning' => 'Anforderbaren Status nicht ändern',
    'restore'  					=> 'Asset wiederherstellen',
    'pending'  					=> 'Ausstehend',
    'undeployable'  			=> 'Nicht einsetzbar',
@@ -33,9 +34,9 @@ return [
    ',
    'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format',
    'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format',
-    'csv_import_match_first' => 'Try to match users by first name (jane) format',
-    'csv_import_match_email' => 'Try to match users by email as username',
-    'csv_import_match_username' => 'Try to match users by username',
+    'csv_import_match_first' => 'Versuchen Sie, Benutzer nach dem Vornamenformat (Jane) abzugleichen',
+    'csv_import_match_email' => 'Versuchen Sie, Benutzer per E-Mail als Benutzername zu vergleichen',
+    'csv_import_match_username' => 'Versuche Benutzer mit Benutzername zu vergleichen',
    'error_messages' => 'Fehlermeldungen:',
    'success_messages' => 'Erfolgsmeldungen:',
    'alert_details' => 'Siehe unten für Details.',
@@ -4,11 +4,11 @@ return [

    'asset_tag'   	=> 'Asset Tag',
    'asset_model'       => 'Modell',
-    'book_value'  	=> 'Current Value',
+    'book_value'  	=> 'Aktueller Wert',
    'change' 		=> 'Zurücknehmen/Herausgeben',
    'checkout_date' => 'Herausgabedatum',
    'checkoutto' 	=> 'Herausgegeben',
-    'current_value' => 'Current Value',
+    'current_value' => 'Aktueller Wert',
    'diff' 			=> 'Differenz',
    'dl_csv' 		=> 'CSV Herunterladen',
    'eol' 			=> 'EOL',
@@ -23,8 +23,8 @@ return [
    'days_without_acceptance' => 'Tage ohne Akzeptierung',
    'monthly_depreciation' => 'Monatliche Abschreibung',
    'assigned_to'    => 'Zugewiesen an',
-    'requesting_user' => 'Requesting User',
-    'requested_date' => 'Requested Date',
+    'requesting_user' => 'Benutzer anfordern',
+    'requested_date' => 'Angefordertes Datum',
    'changed'       => 'Geändert',
    'icon' => 'Symbol',
 ];
@@ -13,29 +13,29 @@ return [
    'none_licenses'                     => 'Es gibt nicht genügend Lizenzen für :license zum Herausgeben. :qty sind erforderlich. ',
    'none_consumables'                  => 'Es gibt nicht genügend verfügbare Einheiten von :consumable zum Herausgeben. :qty sind erforderlich. ',
    'none_accessory'                    => 'Es gibt nicht genügend verfügbare Einheiten von :accessory zum Herausgeben. :qty werden benötigt. ',
-    'append_accessory'                  => 'Append Accessory',
-    'update_appended_accessory'         => 'Update appended Accessory',
-    'append_consumable'                 => 'Append Consumable',
-    'update_appended_consumable'        => 'Update appended Consumable',
-    'append_license'                    => 'Append license',
-    'update_appended_license'           => 'Update appended license',
-    'append_model'                      => 'Append model',
-    'update_appended_model'             => 'Update appended model',
-    'license_error'                     => 'License already attached to kit',
-    'license_added_success'             => 'License added successfully',
-    'license_updated'                   => 'License was successfully updated',
-    'license_none'                      => 'License does not exist',
-    'license_detached'                  => 'License was successfully detached',
-    'consumable_added_success'          => 'Consumable added successfully',
-    'consumable_updated'                => 'Consumable was successfully updated',
-    'consumable_error'                  => 'Consumable already attached to kit',
-    'consumable_deleted'                => 'Delete was successful',
-    'consumable_none'                   => 'Consumable does not exist',
-    'consumable_detached'               => 'Consumable was successfully detached',
-    'accessory_added_success'           => 'Accessory added successfully',
-    'accessory_updated'                 => 'Accessory was successfully updated',
-    'accessory_detached'                => 'Accessory was successfully detached',
-    'accessory_error'                   => 'Accessory already attached to kit',
+    'append_accessory'                  => 'Zubehör anhängen',
+    'update_appended_accessory'         => 'Angefügtes Zubehör aktualisieren',
+    'append_consumable'                 => 'Verbrauchsmaterial anhängen',
+    'update_appended_consumable'        => 'Angehängtes Verbrauchsmaterial aktualisieren',
+    'append_license'                    => 'Lizenz anhängen',
+    'update_appended_license'           => 'Angefügte Lizenz aktualisieren',
+    'append_model'                      => 'Modell anhängen',
+    'update_appended_model'             => 'Angefügte Lizenz aktualisieren',
+    'license_error'                     => 'Lizenz bereits mit Kit verbunden',
+    'license_added_success'             => 'Die Lizenz wurde erfolgreich hinzugefügt',
+    'license_updated'                   => 'Die Lizenz wurde erfolgreich aktualisiert',
+    'license_none'                      => 'Die Lizenz existiert nicht',
+    'license_detached'                  => 'Die Lizenz wurde erfolgreich gelöst',
+    'consumable_added_success'          => 'Verbrauchsmaterial erfolgreich hinzugefügt',
+    'consumable_updated'                => 'Verbrauchsmaterial wurde erfolgreich aktualisiert',
+    'consumable_error'                  => 'Verbrauchsmaterial bereits an Kit angehängt',
+    'consumable_deleted'                => 'Erfolgreich gelöscht',
+    'consumable_none'                   => 'Verbrauchsmaterial existiert nicht',
+    'consumable_detached'               => 'Verbrauchsmaterial wurde erfolgreich gelöst',
+    'accessory_added_success'           => 'Zubehör erfolgreich hinzugefügt',
+    'accessory_updated'                 => 'Zubehör wurde erfolgreich aktualisiert',
+    'accessory_detached'                => 'Zubehör wurde erfolgreich getrennt',
+    'accessory_error'                   => 'Zubehör bereits an Kit angeschlossen',
    'accessory_deleted'                 => 'Löschen war erfolgreich',
    'accessory_none'                    => 'Zubehör existiert nicht',
    'checkout_success'                  => 'Herausgabe war erfolgreich',
@@ -46,5 +46,5 @@ return [
    'kit_not_found'                     => 'Kit nicht gefunden',
    'kit_deleted'                       => 'Kit wurde erfolgreich gelöscht',
    'kit_model_updated'                 => 'Modell wurde erfolgreich aktualisiert',
-    'kit_model_detached'                => 'Model was successfully detached',
+    'kit_model_detached'                => 'Modell wurde erfolgreich gelöst',
 ];
@@ -31,10 +31,10 @@ return [
    'asset_serial'              => 'Seriennummer',
    'asset_location'            => 'Standort',
    'asset_checked_out'         => 'Herausgegeben',
-    'asset_expected_checkin'    => 'Expected Checkin',
+    'asset_expected_checkin'    => 'Erwartete Rückgabe',
    'date'                      => 'Datum:',
-    'signed_by_asset_auditor'   => 'Signed By (Asset Auditor):',
-    'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
-    'signed_by_location_manager' => 'Signed By (Location Manager):',
+    'signed_by_asset_auditor'   => 'Unterschrieben von (Assetprüfer):',
+    'signed_by_finance_auditor' => 'Unterschrieben von (Finanzprüfer):',
+    'signed_by_location_manager' => 'Unterschrieben von (Standortmanager):',
    'signed_by'                 => 'Unterschrieben von:',
 ];
@@ -5,6 +5,6 @@ return [
    'deleted_user' => 'Gelöschter Benutzer',
    'send_reminder' => 'Erinnerung senden',
    'reminder_sent' => 'Erinnerung gesendet',
-    'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request'
+    'acceptance_deleted' => 'Akzeptanzanfrage gelöscht',
+    'acceptance_request' => 'Akzeptierungsanfrage'
 ];
@@ -10,10 +10,10 @@ return [
    'admin_cc_email'            => 'CC Email',
    'admin_cc_email_help'       => 'Wenn Sie eine Kopie der Rücknahme- / Herausgabe-E-Mails, die an Benutzer gehen auch an zusätzliche E-Mail-Empfänger versenden möchten, geben Sie sie hier ein. Ansonsten lassen Sie dieses Feld leer.',
    'is_ad'				        => 'Dies ist ein Active Directory Server',
-    'alerts'                	=> 'Alerts',
-    'alert_title'               => 'Update Alert Settings',
+    'alerts'                	=> 'Alarme',
+    'alert_title'               => 'Alarm-Einstellungen aktualisieren',
    'alert_email'				=> 'Alarme senden an',
-    'alert_email_help'    => 'Email addresses or distribution lists you want alerts to be sent to, comma separated',
+    'alert_email_help'    => 'E-Mail-Adressen oder Verteilerlisten an die Warnungen gesendet werden sollen, durch Komma getrennt',
    'alerts_enabled'			=> 'E-Mail-Benachrichtigungen aktiviert',
    'alert_interval'			=> 'Ablauf Alarmschwelle (in Tagen)',
    'alert_inv_threshold'		=> 'Inventar Alarmschwelle',
@@ -21,19 +21,19 @@ return [
    'allow_user_skin_help_text' => 'Wenn Sie dieses Kästchen aktivieren, kann ein Benutzer das Design mit einem anderen überschreiben.',
    'asset_ids'					=> 'Asset IDs',
    'audit_interval'            => 'Auditintervall',
-    'audit_interval_help'       => 'Wenn Sie Ihre Assets regelmäßig physisch überprüfen müssen, geben Sie das Intervall in Monaten ein.',
+    'audit_interval_help'       => 'Wenn Sie verpflichtet sind, Ihre Assets regelmäßig physisch zu überprüfen, geben Sie das Intervall in Monaten an. Wenn Sie diesen Wert aktualisieren, werden alle "nächsten Audittermine" für Assets mit einem anstehenden Prüfungsdatum aktualisiert.',
    'audit_warning_days'        => 'Audit-Warnschwelle',
    'audit_warning_days_help'   => 'Wie viele Tage im Voraus sollten wir Sie warnen, wenn Vermögenswerte zur Prüfung fällig werden?',
    'auto_increment_assets'		=> 'Erzeugen von fortlaufenden Asset Tags',
    'auto_increment_prefix'		=> 'Präfix (optional)',
    'auto_incrementing_help'    => 'Aktiviere zuerst fortlaufende Asset Tags um dies zu setzen',
    'backups'					=> 'Sicherungen',
-    'backups_restoring'         => 'Restoring from Backup',
+    'backups_restoring'         => 'Aus Backup wiederherstellen',
    'backups_upload'            => 'Backup hochladen',
-    'backups_path'              => 'Backups on the server are stored in <code>:path</code>',
+    'backups_path'              => 'Sicherungen auf dem Server werden in <code>:path</code> gespeichert',
    'backups_restore_warning'   => 'Use the restore button <small><span class="btn btn-xs btn-warning"><i class="text-white fas fa-retweet" aria-hidden="true"></i></span></small> to restore from a previous backup. (This does not currently work with S3 file storage or Docker.<br><br>Your <strong>entire :app_name database and any uploaded files will be completely replaced</strong> by what\'s in the backup file.  ',
-    'backups_logged_out'         => 'You will be logged out once your restore is complete.',
-    'backups_large'             => 'Very large backups may time out on the restore attempt and may still need to be run via command line. ',
+    'backups_logged_out'         => 'Alle vorhandenen Benutzer, auch Sie, werden abgemeldet, sobald Ihre Wiederherstellung abgeschlossen ist.',
+    'backups_large'             => 'Sehr große Sicherungen können beim Wiederherstellungsversuch ausfallen (Time-Out) und müssen eventuell über die Kommandozeile ausgeführt werden. ',
    'barcode_settings'			=> 'Barcode Einstellungen',
    'confirm_purge'			    => 'Bereinigung bestätigen',
    'confirm_purge_help'		=> 'Geben Sie den Text "DELETE" in das Feld unten ein, um die gelöschten Datensätze zu löschen. Diese Aktion kann nicht rückgängig gemacht werden. Alle Einträge und Benutzer werden DAUERHAFT gelöscht. (Um sicher zu gehen, sollten Sie zuerst ein Backup erstellen)',
@@ -56,7 +56,7 @@ return [
    'barcode_type'				=> '2D Barcode Typ',
    'alt_barcode_type'			=> '1D Barcode Typ',
    'email_logo_size'       => 'Quadratische Logos in E-Mails sehen am besten aus. ',
-    'enabled'                   => 'Enabled',
+    'enabled'                   => 'Aktiviert',
    'eula_settings'				=> 'EULA Einstellungen',
    'eula_markdown'				=> 'Diese EULA <a href="https://help.github.com/articles/github-flavored-markdown/"> erlaubt Github Flavored Markdown</a>.',
    'favicon'                   => 'Favicon',
@@ -65,8 +65,8 @@ return [
    'footer_text'               => 'Zusätzlicher Fußzeilentext ',
    'footer_text_help'          => 'Dieser Text wird in der rechten Fußzeile angezeigt. Links sind erlaubt mit <a href="https://help.github.com/articles/github-flavored-markdown/">Github Flavored Markdown</a>. Zeilenumbrüche, Kopfzeilen, Bilder usw. können zu unvorhersehbaren Verhalten führen.',
    'general_settings'			=> 'Allgemeine Einstellungen',
-    'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula,  tos, dashboard, privacy',
-    'general_settings_help'     => 'Default EULA and more',
+    'general_settings_keywords' => 'Firmenunterstützung, Unterschrift, Akzeptanz, E-Mail-Format, Benutzername-Format, Bilder pro Seite, Vorschaubilder, EULA, AGB, Dashboard, Privatsphäre',
+    'general_settings_help'     => 'Standard EULA und mehr',
    'generate_backup'			=> 'Backup erstellen',
    'header_color'              => 'Farbe der Kopfzeile',
    'info'                      => 'Mit diesen Einstellungen können Sie verschiedene Bereiche Ihrer Installation anpassen.',
@@ -118,9 +118,9 @@ return [
    'login'                     => 'Anmeldeversuche',
    'login_attempt'             => 'Anmeldeversuch',
    'login_ip'                  => 'IP-Adresse',
-    'login_success'             => 'Success?',
+    'login_success'             => 'Erfolg?',
    'login_user_agent'          => 'User Agent',
-    'login_help'                => 'List of attempted logins',
+    'login_help'                => 'Liste der versuchten Logins',
    'login_note'                => 'Anmeldenotiz',
    'login_note_help'           => 'Fügen Sie optional ein paar Sätze zu Ihrem Anmeldebildschirm hinzu, beispielsweise um Personen zu helfen, welche ein verlorenes oder gestohlenes Gerät gefunden haben. Dieses Feld akzeptiert <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
    'login_remote_user_text'    => 'Remote Benutzer Login Optionen',
@@ -143,17 +143,17 @@ return [
    'php'                       => 'PHP Version',
    'php_info'                  => 'PHP Info',
    'php_overview'              => 'PHP',
-    'php_overview_keywords'     => 'phpinfo, system, info',
+    'php_overview_keywords'     => 'phpinfo, System, Info',
    'php_overview_help'         => 'PHP-Systeminfo',
    'php_gd_info'               => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
    'php_gd_warning'            => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
    'pwd_secure_complexity'     => 'Passwortkomplexität',
    'pwd_secure_complexity_help' => 'Wählen Sie aus, welche Komplexitätsregeln Sie für Passwörter erzwingen möchten.',
-    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
-    'pwd_secure_complexity_letters' => 'Require at least one letter',
-    'pwd_secure_complexity_numbers' => 'Require at least one number',
-    'pwd_secure_complexity_symbols' => 'Require at least one symbol',
-    'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
+    'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Passwort darf nicht mit Vorname, Nachname, E-Mail oder Benutzername identisch sein',
+    'pwd_secure_complexity_letters' => 'Mindestens einen Buchstaben erforderlich',
+    'pwd_secure_complexity_numbers' => 'Mindestens eine Zahl erforderlich',
+    'pwd_secure_complexity_symbols' => 'Mindestens ein Symbol erforderlich',
+    'pwd_secure_complexity_case_diff' => 'Mindestens ein Großbuchstaben und ein Kleinbuchstaben erforderlich',
    'pwd_secure_min'            => 'Minimale Passwortlänge',
    'pwd_secure_min_help'       => 'Minimal zulässiger Wert ist 8',
    'pwd_secure_uncommon'       => 'Gebräuchliche Passwörter verhindern',
@@ -161,8 +161,8 @@ return [
    'qr_help'                   => 'Schalte zuerst QR Codes an um dies zu setzen',
    'qr_text'                   => 'QR Code Text',
    'saml'                      => 'SAML',
-    'saml_title'                => 'Update SAML settings',
-    'saml_help'                 => 'SAML settings',
+    'saml_title'                => 'SAML-Einstellungen aktualisieren',
+    'saml_help'                 => 'SAML-Einstellungen',
    'saml_enabled'              => 'SAML aktiviert',
    'saml_integration'          => 'SAML-Integration',
    'saml_sp_entityid'          => 'Entity ID',
@@ -182,7 +182,7 @@ return [
    'saml_slo_help'             => 'Dies wird dazu führen, dass der Benutzer beim Abmelden zuerst zum IdP weitergeleitet wird. Nicht aktivieren, wenn der IdP SP-initiated SAML SLO nicht korrekt unterstützt.',
    'saml_custom_settings'      => 'SAML Einstellungen',
    'saml_custom_settings_help' => 'Sie können zusätzliche Einstellungen für die onelogin/php-saml Bibliothek festlegen. Benutzung auf eigene Gefahr.',
-    'saml_download'             => 'Download Metadata',
+    'saml_download'             => 'Metadaten herunterladen',
    'setting'                   => 'Einstellung',
    'settings'                  => 'Einstellungen',
    'show_alerts_in_menu'       => 'Warnungen im oberen Menü anzeigen',
@@ -194,8 +194,8 @@ return [
    'show_images_in_email_help'   => 'Deaktivieren Sie dieses Kontrollkästchen, wenn sich Ihre Snipe-IT-Installation hinter einem VPN oder einem geschlossenen Netzwerk befindet und Benutzer außerhalb des Netzwerks keine Bilder von dieser Installation in ihre E-Mails laden können.',
    'site_name'                 => 'Seitenname',
    'slack'                     => 'Slack',
-    'slack_title'               => 'Update Slack Settings',
-    'slack_help'                => 'Slack settings',
+    'slack_title'               => 'Slack Einstellungen aktualisieren',
+    'slack_help'                => 'Slack Einstellungen',
    'slack_botname'             => 'Slack Botname',
    'slack_channel'             => 'Slack Kanal',
    'slack_endpoint'            => 'Slack Endpunkt',
@@ -213,7 +213,7 @@ return [
    'value'                     => 'Wert',
    'brand'                     => 'Branding',
    'brand_keywords'            => 'footer, logo, print, theme, skin, header, colors, color, css',
-    'brand_help'                => 'Logo, Site Name',
+    'brand_help'                => 'Logo, Seitenname',
    'web_brand'                 => 'Web Branding Typ',
    'about_settings_title'      => 'Über Einstellungen',
    'about_settings_text'       => 'Mit diesen Einstellungen können Sie verschiedene Aspekte Ihrer Installation anpassen.',
@@ -271,51 +271,51 @@ return [
    'unique_serial_help_text'                => 'Wenn dieses Kontrollkästchen aktiviert wird, müssen Seriennummern von Assets eindeutig sein',
    'zerofill_count'        => 'Länge der Asset Tags, inklusive zerofill',
    'username_format_help'   => 'Diese Einstellung wird nur beim Import benutzt, wenn kein Benutzername angegeben wurde und ein Benutzername generiert werden muss.',
-    'oauth_title' => 'OAuth API Settings',
+    'oauth_title' => 'OAuth API Einstellungen',
    'oauth' => 'OAuth',
-    'oauth_help' => 'Oauth Endpoint Settings',
-    'asset_tag_title' => 'Update Asset Tag Settings',
-    'barcode_title' => 'Update Barcode Settings',
+    'oauth_help' => 'OAuth Endpunkt Einstellungen',
+    'asset_tag_title' => 'Asset Tag Einstellungen aktualisieren',
+    'barcode_title' => 'Barcode Einstellungen aktualisieren',
    'barcodes' => 'Barcodes',
-    'barcodes_help_overview' => 'Barcode &amp; QR settings',
-    'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
-    'barcodes_spinner' => 'Attempting to delete files...',
-    'barcode_delete_cache' => 'Delete Barcode Cache',
-    'branding_title' => 'Update Branding Settings',
-    'general_title' => 'Update General Settings',
-    'mail_test' => 'Send Test',
-    'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
-    'filter_by_keyword' => 'Filter by setting keyword',
-    'security' => 'Security',
-    'security_title' => 'Update Security Settings',
-    'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
-    'security_help' => 'Two-factor, Password Restrictions',
-    'groups_keywords' => 'permissions, permission groups, authorization',
-    'groups_help' => 'Account permission groups',
-    'localization' => 'Localization',
-    'localization_title' => 'Update Localization Settings',
-    'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
-    'localization_help' => 'Language, date display',
-    'notifications' => 'Notifications',
-    'notifications_help' => 'Email alerts, audit settings',
-    'asset_tags_help' => 'Incrementing and prefixes',
-    'labels' => 'Labels',
-    'labels_title' => 'Update Label Settings',
-    'labels_help' => 'Label sizes &amp; settings',
-    'purge' => 'Purge',
-    'purge_keywords' => 'permanently delete',
-    'purge_help' => 'Purge Deleted Records',
-    'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+    'barcodes_help_overview' => 'Barcode &amp; QR Einstellungen',
+    'barcodes_help' => 'Dies wird versuchen, zwischengespeicherte Barcodes zu löschen. Dies wird in der Regel nur verwendet werden, wenn sich die Barcode-Einstellungen geändert haben oder sich Ihre Snipe-IT-URL geändert hat. Barcodes werden beim nächsten Zugriff neu generiert.',
+    'barcodes_spinner' => 'Versuche Dateien zu löschen...',
+    'barcode_delete_cache' => 'Barcode-Cache löschen',
+    'branding_title' => 'Branding Einstellungen aktualisieren',
+    'general_title' => 'Allgemeine Einstellungen aktualisieren',
+    'mail_test' => 'Test senden',
+    'mail_test_help' => 'Dies wird versuchen, eine Testmail an :replyto zu senden.',
+    'filter_by_keyword' => 'Nach Stichwort filtern',
+    'security' => 'Sicherheit',
+    'security_title' => 'Sicherheitseinstellungen aktualisieren',
+    'security_keywords' => 'Passwort, Passwörter, Anforderungen, Zwei-Faktor, Zwei-Faktor, übliche Passwörter, Remote-Login, Logout, Authentifizierung',
+    'security_help' => 'Zwei-Faktor, Passwort-Einschränkungen',
+    'groups_keywords' => 'Berechtigungen, Berechtigungsgruppen, Autorisierung',
+    'groups_help' => 'Account-Berechtigungsgruppen',
+    'localization' => 'Lokalisierung',
+    'localization_title' => 'Lokalisierungseinstellungen aktualisieren',
+    'localization_keywords' => 'Lokalisierung, Währung, lokal, Lokal, Zeitzone, International, Internationalisierung, Sprache, Sprachen, Übersetzung',
+    'localization_help' => 'Sprache, Datumsanzeige',
+    'notifications' => 'Benachrichtigungen',
+    'notifications_help' => 'E-Mail-Benachrichtigungen, Audit-Einstellungen',
+    'asset_tags_help' => 'Inkrementieren und Präfixe',
+    'labels' => 'Etiketten',
+    'labels_title' => 'Etiketten-Einstellungen aktualisieren',
+    'labels_help' => 'Labelgrößen &amp; Einstellungen',
+    'purge' => 'Alles löschen',
+    'purge_keywords' => 'Endgültig löschen',
+    'purge_help' => 'Gelöschte Einträge bereinigen',
+    'ldap_extension_warning' => 'Es sieht nicht so aus, als ob die LDAP-Erweiterung auf diesem Server installiert oder aktiviert ist. Sie können Ihre Einstellungen trotzdem speichern, aber Sie müssen die LDAP-Erweiterung für PHP aktivieren, bevor die LDAP-Synchronisierung oder der Login funktioniert.',
    'ldap_ad' => 'LDAP/AD',
-    'employee_number' => 'Employee Number',
-    'create_admin_user' => 'Create a User ::',
-    'create_admin_success' => 'Success! Your admin user has been added!',
-    'create_admin_redirect' => 'Click here to go to your app login!',
-    'setup_migrations' => 'Database Migrations ::',
-    'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
-    'setup_successful_migrations' => 'Your database tables have been created',
-    'setup_migration_output' => 'Migration output:',
-    'setup_migration_create_user' => 'Next: Create User',
-    'ldap_settings_link' => 'LDAP Settings Page',
-    'slack_test' => 'Test <i class="fab fa-slack"></i> Integration',
+    'employee_number' => 'Mitarbeiternummer',
+    'create_admin_user' => 'Benutzer erstellen ::',
+    'create_admin_success' => 'Erfolgreich! Ihr Admin-Benutzer wurde hinzugefügt!',
+    'create_admin_redirect' => 'Klicke hier, um zu deinem App-Login zu gelangen!',
+    'setup_migrations' => 'Datenbankmigrationen ::',
+    'setup_no_migrations' => 'Es gab nichts zu migrieren. Ihre Datenbanktabellen wurden bereits eingerichtet!',
+    'setup_successful_migrations' => 'Ihre Datenbanktabellen wurden erstellt',
+    'setup_migration_output' => 'Migrationsausgabe:',
+    'setup_migration_create_user' => 'Weiter: Benutzer erstellen',
+    'ldap_settings_link' => 'LDAP Einstellungsseite',
+    'slack_test' => '<i class="fab fa-slack"></i> Integration testen',
 ];
@@ -11,8 +11,8 @@ return [
        'file_deleted'          => 'Backup Datei erfolgreich gelöscht. ',
        'generated'             => 'Backup Datei erfolgreich erstellt.',
        'file_not_found'        => 'Backup Datei konnte nicht gefunden werden.',
-        'restore_warning'       => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
-        'restore_confirm'       => 'Are you sure you wish to restore your database from :filename?'
+        'restore_warning'       => 'Ja, wiederherstellen. Ich bestätige, dass dies alle vorhandenen Daten überschreibt, die derzeit in der Datenbank vorhanden sind. Diese Aktion wird auch alle bestehenden Benutzer abmelden (einschließlich Ihnen).',
+        'restore_confirm'       => 'Sind Sie sicher, dass Sie Ihre Datenbank aus :filename wiederherstellen möchten?'
    ],
    'purge' => [
        'error'     => 'Beim Bereinigen ist ein Fehler augetreten. ',
@@ -20,24 +20,24 @@ return [
        'success'               => 'Gelöschte Einträge erfolgreich bereinigt.',
    ],
    'mail' => [
-        'sending' => 'Sending Test Email...',
-        'success' => 'Mail sent!',
-        'error' => 'Mail could not be sent.',
-        'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+        'sending' => 'Test E-Mail wird gesendet...',
+        'success' => 'Mail gesendet!',
+        'error' => 'E-Mail konnte nicht gesendet werden.',
+        'additional' => 'Keine zusätzliche Fehlermeldung vorhanden. Überprüfen Sie Ihre E-Mail-Einstellungen und Ihr App-Protokoll.'
    ],
    'ldap' => [
-        'testing' => 'Testing LDAP Connection, Binding & Query ...',
-        '500' => '500 Server Error. Please check your server logs for more information.',
-        'error' => 'Something went wrong :(',
-        'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
-        'testing_authentication' => 'Testing LDAP Authentication...',
-        'authentication_success' => 'User authenticated against LDAP successfully!'
+        'testing' => 'Teste LDAP Verbindung, Binding & Abfrage ...',
+        '500' => '500 Serverfehler. Bitte überprüfen Sie Ihre Server-Logs für weitere Informationen.',
+        'error' => 'Etwas ist schiefgelaufen :(',
+        'sync_success' => 'Ein Beispiel von 10 Benutzern, die vom LDAP-Server basierend auf Ihren Einstellungen zurückgegeben wurden:',
+        'testing_authentication' => 'LDAP-Authentifizierung wird getestet...',
+        'authentication_success' => 'Benutzer wurde erfolgreich gegen LDAP authentifiziert!'
    ],
    'slack' => [
-        'sending' => 'Sending Slack test message...',
-        'success_pt1' => 'Success! Check the ',
-        'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+        'sending' => 'Slack Testnachricht wird gesendet...',
+        'success_pt1' => 'Erfolgreich! Überprüfen Sie die ',
+        'success_pt2' => ' Kanal für Ihre Testnachricht und klicken Sie auf Speichern unten, um Ihre Einstellungen zu speichern.',
        '500' => '500 Server Fehler.',
-        'error' => 'Something went wrong.',
+        'error' => 'Etwas ist schiefgelaufen.',
    ]
 ];
@@ -23,7 +23,7 @@ return [

    'help' => [
        'undeployable'   => 'Diese Assets können niemandem zugeordnet werden.',
-        'deployable'   => 'These assets can be checked out. Once they are assigned, they will assume a meta status of <i class="fas fa-circle text-blue"></i> <strong>Deployed</strong>.',
+        'deployable'   => 'Diese Assets können ausgecheckt werden. Sobald sie zugewiesen sind, nehmen sie den Meta-Status <i class="fas fa-circle text-blue"></i> <strong>Platziert</strong> an.',
        'archived'   => 'Diese Assets können nicht ausgecheckt werden und erscheinen nur in der Ansicht "Archiviert". Dies ist nützlich, um Informationen zu Assets für Budgetierungs- / historische Zwecke beizubehalten, aber sie aus der täglichen Assetliste herauszuhalten.',
        'pending'   => 'Diese Vermögenswerte können noch niemandem zugewiesen werden, die oft für Gegenstände verwendet werden, die nicht repariert werden können, aber voraussichtlich in den Kreislauf zurückkehren werden.',
    ],
@@ -25,13 +25,13 @@ return [
    'two_factor_enrolled' => '2FA Gerät eingeschrieben ',
    'two_factor_active'   => '2FA aktiv ',
    'user_deactivated'  => 'Benutzer ist deaktiviert',
-    'activation_status_warning' => 'Do not change activation status',
-    'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
-    'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
-    'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
+    'activation_status_warning' => 'Aktivierungsstatus nicht ändern',
+    'group_memberships_helpblock' => 'Nur Superadministratoren können Gruppenmitgliedschaften bearbeiten.',
+    'superadmin_permission_warning' => 'Nur Superadmins dürfen einem Benutzer Superadmin Zugriff gewähren.',
+    'admin_permission_warning' => 'Nur Benutzer mit Administratorrechten oder höher dürfen einem Benutzer Administratorzugriff gewähren.',
    'remove_group_memberships' => 'Gruppenmitgliedschaften entfernen',
    'warning_deletion' => 'WARNUNG:',
-    'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
-    'update_user_asssets_status' => 'Update all assets for these users to this status',
-    'checkin_user_properties' => 'Check in all properties associated with these users',
+    'warning_deletion_information' => 'Sie sind dabei, die :count unten aufgelisteten Benutzer zu löschen. Super-Admin-Namen sind rot markiert.',
+    'update_user_asssets_status' => 'Alle Assets für diese Benutzer auf diesen Status aktualisieren',
+    'checkin_user_properties' => 'Alle diesen Benutzern zugeordneten Objekte zurücknehmen',
 ];
@@ -96,6 +96,7 @@
    'eol'					=> 'EOL',
    'email_domain'			=> 'E-Mail-Domain',
    'email_format'			=> 'E-Mail-Format',
+    'employee_number'       => 'Mitarbeiternummer',
    'email_domain_help'		=> 'Dies wird verwendet, um E-Mail-Adressen beim Importieren zu generieren',
    'error'				    => 'Fehler',
    'filastname_format'			=> 'Initial des Vornamen + Nachname (jsmith@example.com)',
@@ -192,6 +193,8 @@
    'qty'		            => 'Menge',
    'quantity'		        => 'Anzahl',
    'quantity_minimum'      => ':count Artikel sind unter oder fast unter der Mindestmenge',
+    'quickscan_checkin'  	=> 'Schnell Rücknahme',
+    'quickscan_checkin_status'  	=> 'Rückgabe Status',
    'ready_to_deploy'		=> 'Bereit zum Herausgeben',
    'recent_activity'		=> 'Letzte Aktivität',
    'remaining'             => 'Übrig',
@@ -339,11 +342,11 @@
    'asset_information'     => 'Asset-Informationen',
    'model_name'            => 'Modelname:',
    'asset_name'            => 'Assetname:',
-    'consumable_information' => 'Consumable Information:',
-    'consumable_name'       => 'Consumable Name:',
-    'accessory_information' => 'Accessory Information:',
-    'accessory_name'       => 'Accessory Name:',
-    'clone_item'            => 'Clone Item',
+    'consumable_information' => 'Informationen zum Verbrauchsmaterial:',
+    'consumable_name'       => 'Name des Verbrauchsmaterials:',
+    'accessory_information' => 'Zubehör Information:',
+    'accessory_name'       => 'Zubehörname:',
+    'clone_item'            => 'Element klonen',
    'checkout_tooltip' => 'Diesen Gegenstand zuweisen',
    'checkin_tooltip' => 'Diesen Artikel zurücknehmen',
    'checkout_user_tooltip' => 'Diesen Artikel an einen Benutzer herausgeben',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	5fba8202d6	Updated translations Signed-off-by: snipe <snipe@snipe.net>	2022-04-11 15:40:58 +01:00
snipe	61f5825c69	Bumped version Signed-off-by: snipe <snipe@snipe.net>	2022-04-11 15:37:38 +01:00
snipe	5314ef97e5	Updated assets Signed-off-by: snipe <snipe@snipe.net>	2022-04-11 15:08:39 +01:00
snipe	b7fbc5d018	Merge pull request #10927 from uberbrady/fix_columns_master Fixes #10482 - Downgrade bootstrap-table so columns stay remembered	2022-04-11 15:03:08 +01:00
Brady Wetherington	211a0820e5	Downgrade bootstrap-table so columns stay remembered	2022-04-11 14:29:59 +01:00
snipe	7b891f0952	Merge pull request #10913 from inietov/fixes/bulk_user_edit_not_updating_asset_locations Fixes Bulk user edit not updating checked out asset locations	2022-04-07 19:41:01 +01:00
snipe	6c1bb89776	Merge pull request #10920 from Godmartinz/Fixed_#10866_-_Checkin_time_always_shows_12am-master Fixed #10866 - action_date for check-in not including H:i:s	2022-04-07 19:39:59 +01:00
Godfrey M	3eb7a87a66	fixes action_date for check-in not including H:i:s	2022-04-07 11:24:12 -07:00
snipe	0cb4caa4cf	Merge pull request #10918 from uberbrady/bs_tables_export_without_html_master This disables the display of HTML content during exports (cherry-picked for master)	2022-04-07 16:44:21 +01:00
Brady Wetherington	4db7cb0e21	This disables the display of HTML content during exports, without enabling XSS attacks	2022-04-07 16:37:32 +01:00
Ivan Nieto Vivanco	6529a75683	Update Assets locations when user's location changes whey they got bulk-edited	2022-04-06 19:12:02 -05:00
snipe	4b255ada70	Removed first() Signed-off-by: snipe <snipe@snipe.net>	2022-04-06 12:08:51 +01:00
snipe	01342ca266	Fixed activity report Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 22:58:25 +01:00
snipe	87fc856361	Merge pull request #10902 from snipe/fixes/added_primary_key_to_custom_fields_pivot Fixed #10892 - MySQL 8 compatibilty requires primary key	2022-04-05 20:35:14 +01:00
snipe	3dd7c00a0b	Update migration back in time Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 20:31:17 +01:00
snipe	0c31e840c4	Merge pull request #10903 from inietov/fixes/erroneous_checkout_date_in_print_all_assigned_report Fixes Dates in Print All Assigned report doesn't match to history	2022-04-05 20:19:10 +01:00
snipe	c12ef19fcc	Fixed #10892 - MySQL 8 compatibilty requires primary key Signed-off-by: snipe <snipe@snipe.net>	2022-04-05 18:58:14 +01:00
Ivan Nieto Vivanco	2d213a9c77	Make the report take the dates of pivot table instead of asset log	2022-04-05 12:57:49 -05:00
snipe	0882cfede2	Merge pull request #10895 from ubc-cpsc/master Security fixes to master branch	2022-04-05 18:29:25 +01:00
Joël Pittet	96cd90f842	Security fixes to master branch	2022-04-04 11:04:06 -07:00
snipe	d56552a8af	Merge pull request #10876 from snipe/fixes/huntr_ebc26354_logout_user_when_deactivated Logout user when their activated status is switched to off	2022-03-29 15:57:24 +01:00
snipe	bdabbbd4e9	Logout user when their activated status is switched to off Signed-off-by: snipe <snipe@snipe.net>	2022-03-29 13:44:53 +01:00
snipe	ab18ceb2f9	Add @QveenSi as a contributor	2022-03-29 11:54:51 +01:00
snipe	e046db6d1e	Merge pull request #10874 from QveenSi/patch-1 Fix problem with static paths	2022-03-29 11:52:32 +01:00
Yevhenii Huzii	863ea62551	Fix problem with static paths	2022-03-27 23:12:38 +03:00
snipe	70059f6f80	Merge pull request #10873 from uberbrady/fix_dashboard Don't crash JS when there are no data-export-options (as is true in Dashboard) Fixes #10872	2022-03-27 07:21:34 +01:00
Brady Wetherington	e50ad8a442	Don't crash JS when there are no data-export-options (as is true in Dashboard)	2022-03-27 07:18:12 +01:00
snipe	639409fb3f	Backporting #10829 to master Signed-off-by: snipe <snipe@snipe.net>	2022-03-25 13:00:16 +00:00
snipe	20e65804ef	Removed comment Signed-off-by: snipe <snipe@snipe.net>	2022-03-22 18:12:08 +00:00
snipe	729b23c0cf	Merge pull request #10857 from uberbrady/fix_bs_tables_export_options Fix bs tables export options	2022-03-22 17:03:18 +00:00
Brady Wetherington	af9f3d5e1e	Clean up the bootstrap table export options	2022-03-22 16:05:08 +00:00
Brady Wetherington	00ca30a205	WIP: fix bootstrap table export options	2022-03-22 15:12:11 +00:00
snipe	8c92198636	Possible fix for boolean field check Signed-off-by: snipe <snipe@snipe.net>	2022-03-22 13:47:43 +00:00
snipe	169973e697	Merge pull request #10853 from inietov/fixes/customfields_boolean_format_not_saving_master Fixes Customfields with boolean format not saving master[sc-9973]	2022-03-22 00:57:41 +00:00
Ivan Nieto Vivanco	7571c0b850	Add support for boolean type customfields	2022-03-21 18:48:42 -06:00
snipe	7cbcd2d95c	Merge pull request #10814 from snipe/features/add_clear_sessions_artisan_command Added session killer artisan command	2022-03-10 13:35:55 -08:00
snipe	1ac293a12a	Add a force override Signed-off-by: snipe <snipe@snipe.net>	2022-03-10 13:30:03 -08:00
snipe	3e3c277a3f	Better phrasing Signed-off-by: snipe <snipe@snipe.net>	2022-03-10 13:29:52 -08:00
snipe	93d6ce1a6a	Added session killer artisan command Signed-off-by: snipe <snipe@snipe.net>	2022-03-10 13:20:23 -08:00
snipe	dadc80d558	Merge pull request #10811 from inietov/fixes/CarbonExceptions_InvalidFormatException_DateTime Fixes Carbon\Exceptions\InvalidFormatException: DateTime::__construct(): Failed to parse time string	2022-03-10 10:40:46 -08:00
Ivan Nieto Vivanco	9caf27ce60	Sanitize dates input in the importer before saving	2022-03-10 11:48:57 -06:00
snipe	968de7e469	Merge pull request #10804 from inietov/fixes/date_localization_not_working_custom_fields Fixes #8143 Date localization not work in custom fields	2022-03-08 20:11:49 -08:00
Ivan Nieto Vivanco	2410b1a146	Add a condition to show customfields as the user wants in localization settings	2022-03-08 18:25:15 -06:00
snipe	ed39df349f	Merge pull request #10799 from snipe/fixes/check_if_tables_exist_before_trying_to_create Check if table exists before trying to create in migrations	2022-03-07 20:22:28 -08:00
snipe	86a2312a31	Check if table exists before trying to create Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 20:13:10 -08:00
snipe	e30d814ece	Merge pull request #10798 from snipe/features/add_qr_and_barcode_urls_to_asset_transformer Added QR and alt barcode urls to asset transformer	2022-03-07 19:53:08 -08:00
snipe	e9d297e97d	Added cache comment Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 19:37:06 -08:00
snipe	9269d5945e	Added QR and alt barcode urls to asset transformer Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 19:32:18 -08:00
snipe	33ee63f985	Merge pull request #10797 from snipe/features/use_max_results_in_pagination Use the max_results env value in the paginator	2022-03-07 19:14:49 -08:00
snipe	def570db4b	Finer grain for > 200 Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 18:51:49 -08:00
snipe	fcb81b9505	Use the max_results env value in the paginator Signed-off-by: snipe <snipe@snipe.net>	2022-03-07 18:39:39 -08:00
snipe	3e2fe10480	Fixed getAssetBySerial Signed-off-by: snipe <snipe@snipe.net>	2022-03-05 09:03:29 -08:00
snipe	f840652395	Suppress errors for missing signatures Signed-off-by: snipe <snipe@snipe.net>	2022-03-04 03:18:28 -08:00
snipe	afd83311aa	Fixed version number (vV) Signed-off-by: snipe <snipe@snipe.net>	2022-03-03 20:58:54 -08:00