Merge branch 'develop'

# Conflicts:
#	config/version.php

.travis.yml

@@ -16,7 +16,7 @@ services:
 php:
   - 5.6
   - 7.0
-  # - 7.2 DISABLE Temporarily until we fix the count(null) bugs
+  - 7.2 
   - 7.1.4
 
 # execute any number of scripts before the test run, custom env's are available as variables

Vagrantfile

@@ -0,0 +1,76 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+SNIPEIT_SH_URL= "https://raw.githubusercontent.com/snipe/snipe-it/master/snipeit.sh"
+NETWORK_BRIDGE= "en0: Wi-Fi (AirPort)"
+
+Vagrant.configure("2") do |config|
+  config.vm.define "xenial" do |xenial|
+    xenial.vm.box = "ubuntu/xenial64"
+    xenial.vm.hostname = 'xenial'
+    xenial.vm.network "public_network", bridge: NETWORK_BRIDGE
+    xenial.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    xenial.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+  end
+
+  config.vm.define "trusty" do |trusty|
+    trusty.vm.box = "ubuntu/trusty32"
+    trusty.vm.hostname = 'trusty'
+    trusty.vm.network "public_network", bridge: NETWORK_BRIDGE
+    trusty.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    trusty.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+  end
+
+  config.vm.define "centos7" do |centos7|
+    centos7.vm.box = "centos/7"
+    centos7.vm.hostname = 'centos7'
+    centos7.vm.network "public_network", bridge: NETWORK_BRIDGE
+    centos7.vm.provision :shell, :inline => "sudo yum -y update"
+    centos7.vm.provision :shell, :inline => "yum install -y wget"
+    centos7.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    centos7.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+  end
+
+  config.vm.define "centos6" do |centos6|
+    centos6.vm.box = "centos/6"
+    centos6.vm.hostname = 'centos6'
+    centos6.vm.network "public_network", bridge: NETWORK_BRIDGE
+    centos6.vm.provision :shell, :inline => "sudo yum -y update"
+    centos6.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    centos6.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+  end
+
+  config.vm.define "jessie" do |jessie|
+    jessie.vm.box = "debian/jessie64"
+    jessie.vm.hostname = 'debian8'
+    jessie.vm.network "public_network", bridge: NETWORK_BRIDGE
+    jessie.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    jessie.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+  end
+
+  config.vm.define "stretch" do |stretch|
+    stretch.vm.box = "debian/stretch64"
+    stretch.vm.hostname = 'debian9'
+    stretch.vm.network "public_network", bridge: NETWORK_BRIDGE
+    stretch.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    stretch.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+  end
+
+  config.vm.define "fedora27" do |fedora27|
+    fedora27.vm.box = "fedora/27-cloud-base"
+    fedora27.vm.hostname = 'fedora27'
+    fedora27.vm.network "public_network", bridge: NETWORK_BRIDGE
+    fedora27.vm.provision :shell, :inline => "dnf -y install wget"
+    fedora27.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    fedora27.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+  end
+
+    config.vm.define "fedora26" do |fedora26|
+    fedora26.vm.box = "fedora/26-cloud-base"
+    fedora26.vm.hostname = 'fedora26'
+    fedora26.vm.network "public_network", bridge: NETWORK_BRIDGE
+    fedora26.vm.provision :shell, :inline => "dnf -y install wget"
+    fedora26.vm.provision :shell, :inline => "wget #{SNIPEIT_SH_URL}"
+    fedora26.vm.provision :shell, :inline => "chmod 755 snipeit.sh"
+  end
+end

app/Console/Commands/SendExpirationAlerts.php

@@ -77,7 +77,7 @@ class SendExpirationAlerts extends Command
         $this->info(count($expiring_licenses).' expiring licenses');
 
 
-        $license_data['count'] =  count($expiring_licenses);
+        $license_data['count'] =  $expiring_licenses->count();
         $license_data['email_content'] = '';
 
         foreach ($expiring_licenses as $license) {

app/Helpers/Helper.php

@@ -787,6 +787,66 @@ class Helper
     }
 
 
+    public static function filetype_icon($filename) {
+
+        $extension = substr(strrchr($filename,'.'),1);
+
+        if ($extension) {
+            switch ($extension) {
+                case 'jpg':
+                case 'jpeg':
+                case 'gif':
+                case 'png':
+                    return "fa fa-file-image-o";
+                    break;
+                case 'doc':
+                case 'docx':
+                    return "fa fa-file-word-o";
+                    break;
+                case 'xls':
+                case 'xlsx':
+                    return "fa fa-file-excel-o";
+                    break;
+                case 'zip':
+                case 'rar':
+                    return "fa fa-file-archive-o";
+                    break;
+                case 'pdf':
+                    return "fa fa-file-pdf-o";
+                    break;
+                case 'txt':
+                    return "fa fa-file-text-o";
+                    break;
+                case 'lic':
+                    return "fa fa-floppy-o";
+                    break;
+                default:
+                    return "fa fa-file-o";
+            }
+        }
+        return "fa fa-file-o";
+    }
+
+    public static function show_file_inline($filename) {
+
+        $extension = substr(strrchr($filename,'.'),1);
+
+        if ($extension) {
+            switch ($extension) {
+                case 'jpg':
+                case 'jpeg':
+                case 'gif':
+                case 'png':
+                    return true;
+                    break;
+                default:
+                    return false;
+            }
+        }
+        return false;
+    }
+
+
 
 
 }

app/Http/Controllers/Api/AssetsController.php

@@ -85,7 +85,7 @@ class AssetsController extends Controller
         $filter = array();
 
         if ($request->has('filter')) {
-            $filter = json_decode($request->input('filter'));
+            $filter = json_decode($request->input('filter'), true);
         }
 
         $all_custom_fields = CustomField::all(); //used as a 'cache' of custom fields throughout this page load
@@ -217,7 +217,8 @@ class AssetsController extends Controller
 
         }
 
-        if (count($filter) > 0) {
+
+        if ((!is_null($filter)) && (count($filter)) > 0) {
             $assets->ByFilter($filter);
         } elseif ($request->has('search')) {
             $assets->TextSearch($request->input('search'));
@@ -354,6 +355,9 @@ class AssetsController extends Controller
             'assets.status_id'
             ])->with('model', 'assetstatus', 'assignedTo')->NotArchived());
 
+        if ($request->has('assetStatusType') && $request->input('assetStatusType') === 'RTD') {
+            $assets = $assets->RTD();
+        }
 
         if ($request->has('search')) {
             $assets = $assets->AssignedSearch($request->input('search'));

app/Http/Controllers/Api/CustomFieldsController.php

@@ -26,9 +26,7 @@ class CustomFieldsController extends Controller
     {
         $this->authorize('index', CustomFields::class);
         $fields = CustomField::get();
-
+        return (new CustomFieldsTransformer)->transformCustomFields($fields, $fields->count());
-        $total = count($fields);
-        return (new CustomFieldsTransformer)->transformCustomFields($fields, $total);
     }
 
     /**

app/Http/Controllers/Api/CustomFieldsetsController.php

@@ -44,9 +44,7 @@ class CustomFieldsetsController extends Controller
     {
         $this->authorize('index', CustomFieldset::class);
         $fieldsets = CustomFieldset::withCount(['fields', 'models'])->get();
-
+        return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $fieldsets->count());
-        $total = count($fieldsets);
-        return (new CustomFieldsetsTransformer)->transformCustomFieldsets($fieldsets, $total);
 
     }
 

app/Http/Controllers/Api/ReportsController.php

@@ -28,7 +28,6 @@ class ReportsController extends Controller
         if (($request->has('target_type'))  && ($request->has('target_id'))) {
             $actionlogs = $actionlogs->where('target_id','=',$request->input('target_id'))
                 ->where('target_type','=',"App\\Models\\".ucwords($request->input('target_type')));
-
         }
 
         if (($request->has('item_type'))  && ($request->has('item_id'))) {
@@ -40,6 +39,10 @@ class ReportsController extends Controller
             $actionlogs = $actionlogs->where('action_type','=',$request->input('action_type'))->orderBy('created_at', 'desc');
         }
 
+        if ($request->has('uploads')) {
+            $actionlogs = $actionlogs->whereNotNull('filename')->orderBy('created_at', 'desc');
+        }
+
         $allowed_columns = [
             'id',
             'created_at',

app/Http/Controllers/AssetsController.php

@@ -1004,17 +1004,18 @@ class AssetsController extends Controller
     * @since [v1.0]
     * @return View
     */
-    public function displayFile($assetId = null, $fileId = null)
+    public function displayFile($assetId = null, $fileId = null, $download = true)
     {
+
         $asset = Asset::find($assetId);
-        // the asset is valid
+
         if (isset($asset->id)) {
+
             $this->authorize('view', $asset);
 
             if (!$log = Actionlog::find($fileId)) {
                 return response('No matching record for that asset/file', 500)
                     ->header('Content-Type', 'text/plain');
-
             }
 
             $file = $log->get_src('assets');
@@ -1023,14 +1024,13 @@ class AssetsController extends Controller
                 $file = $log->get_src('audits');
             }
 
-            $filetype = Helper::checkUploadIsImage($file);
 
             if (!file_exists($file)) {
                 return response('File '.$file.' not found on server', 404)
                     ->header('Content-Type', 'text/plain');
             }
 
-            if ($filetype) {
+            if ($download != 'true') {
                   if ($contents = file_get_contents($file)) {
                       return Response::make($contents)->header('Content-Type', $filetype);
                   }

app/Http/Controllers/LicensesController.php

@@ -508,7 +508,7 @@ class LicensesController extends Controller
                 foreach (Input::file('licensefile') as $file) {
 
                     $rules = array(
-                    'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt,zip,rar,rtf,xml,lic|max:2000'
+                    'licensefile' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt,zip,rar,rtf,xml,lic'
                     );
                     $validator = Validator::make(array('licensefile'=> $file), $rules);
 
@@ -516,8 +516,7 @@ class LicensesController extends Controller
                          return redirect()->back()->with('error', trans('admin/licenses/message.upload.invalidfiles'));
                     }
                     $extension = $file->getClientOriginalExtension();
-                    $filename = 'license-'.$license->id.'-'.str_random(8);
+                    $filename = 'license-'.$license->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension;
-                    $filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension;
                     $upload_success = $file->move($destinationPath, $filename);
 
                     //Log the upload to the log
@@ -583,7 +582,7 @@ class LicensesController extends Controller
     * @param int $fileId
     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
      */
-    public function displayFile($licenseId = null, $fileId = null)
+    public function displayFile($licenseId = null, $fileId = null, $download = true)
     {
 
         $license = License::find($licenseId);
@@ -593,8 +592,31 @@ class LicensesController extends Controller
             $this->authorize('view', $license);
             $log = Actionlog::find($fileId);
             $file = $log->get_src('licenses');
+
+
+            if ($file =='') {
+                return response('File not found on server', 404)
+                    ->header('Content-Type', 'text/plain');
+            }
+
+            $mimetype = \File::mimeType($file);
+
+
+            if (!file_exists($file)) {
+                return response('File '.$file.' not found on server', 404)
+                    ->header('Content-Type', 'text/plain');
+            }
+
+            if ($download != 'true') {
+                if ($contents = file_get_contents($file)) {
+                    return Response::make($contents)->header('Content-Type', $mimetype);
+                }
+                return JsonResponse::create(["error" => "Failed validation: "], 500);
+            }
             return Response::download($file);
         }
+
+
         return redirect()->route('licenses.index')->with('error', trans('admin/licenses/message.does_not_exist', compact('id')));
     }
 

app/Http/Controllers/ReportsController.php

@@ -82,136 +82,6 @@ class ReportsController extends Controller
         return $response;
     }
 
-    /**
-    * Display asset report view.
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return View
-    */
-    public function getAssetsReport()
-    {
-        $settings = \App\Models\Setting::first();
-        return view('reports/asset', compact('assets'))->with('settings', $settings);
-    }
-
-
-
-    /**
-    * Exports the assets to CSV
-    *
-    * @author [A. Gianotto] [<snipe@snipe.net>]
-    * @since [v1.0]
-    * @return \Illuminate\Http\Response
-    */
-    public function exportAssetReport(Request $request)
-    {
-
-         \Debugbar::disable();
-
-        $customfields = CustomField::get();
-
-        $response = new StreamedResponse(function () use ($customfields, $request) {
-            // Open output stream
-            $handle = fopen('php://output', 'w');
-
-            $assets = Asset::with('assignedTo', 'location','defaultLoc','assignedTo','model','supplier','assetstatus','model.manufacturer');
-
-                // This is used by the sidenav, mostly
-            switch ($request->input('status')) {
-                case 'Deleted':
-                    $assets->withTrashed()->Deleted();
-                    break;
-                case 'Pending':
-                    $assets->Pending();
-                    break;
-                case 'RTD':
-                    $assets->RTD();
-                    break;
-                case 'Undeployable':
-                    $assets->Undeployable();
-                    break;
-                case 'Archived':
-                    $assets->Archived();
-                    break;
-                case 'Requestable':
-                    $assets->RequestableAssets();
-                    break;
-                case 'Deployed':
-                    $assets->Deployed();
-                    break;
-            }
-
-            $headers=[
-                trans('general.company'),
-                trans('admin/hardware/table.asset_tag'),
-                trans('admin/hardware/form.manufacturer'),
-                trans('general.category'),
-                trans('admin/hardware/form.model'),
-                trans('general.model_no'),
-                trans('general.name'),
-                trans('admin/hardware/table.serial'),
-                trans('general.status'),
-                trans('admin/hardware/table.purchase_date'),
-                trans('admin/hardware/table.purchase_cost'),
-                trans('admin/hardware/form.order'),
-                trans('general.supplier'),
-                trans('admin/hardware/table.checkoutto'),
-                trans('general.type'),
-                trans('admin/hardware/table.checkout_date'),
-                trans('admin/hardware/table.location'),
-                trans('general.notes'),
-            ];
-            foreach ($customfields as $field) {
-                $headers[]=$field->name;
-            }
-            fputcsv($handle, $headers);
-
-            $assets->orderBy('created_at', 'DESC')->chunk(500, function($assets) use($handle, $customfields) {
-
-
-                foreach ($assets as $asset) {
-
-                    // Add a new row with data
-                    $values=[
-                        ($asset->company) ? $asset->company->name : '',
-                        $asset->asset_tag,
-                        ($asset->model->manufacturer) ? $asset->model->manufacturer->name : '',
-                        ($asset->model->category) ? $asset->model->category->name : '',
-                        ($asset->model) ? $asset->model->name : '',
-                        ($asset->model->model_number) ? $asset->model->model_number : '',
-                        ($asset->name) ? $asset->name : '',
-                        ($asset->serial) ? $asset->serial : '',
-                        ($asset->assetstatus) ? e($asset->present()->statusText) : '',
-                        ($asset->purchase_date) ? e($asset->purchase_date) : '',
-                        ($asset->purchase_cost > 0) ? Helper::formatCurrencyOutput($asset->purchase_cost) : '',
-                        ($asset->order_number) ? e($asset->order_number) : '',
-                        ($asset->supplier) ? e($asset->supplier->name) : '',
-                        ($asset->checkedOutToUser() && $asset->assigned) ? e($asset->assigned->getFullNameAttribute()) : ($asset->assigned ? e($asset->assigned->display_name) : ''),
-                        ($asset->checkedOutToUser() && $asset->assigned) ? 'user' : e($asset->assignedType()),
-                        ($asset->last_checkout!='') ? e($asset->last_checkout) : '',
-                        ($asset->location) ? e($asset->location->name) : '',
-                        ($asset->notes) ? e($asset->notes) : '',
-                    ];
-                    foreach ($customfields as $field) {
-                        $values[]=$asset->{$field->db_column_name()};
-                    }
-                    fputcsv($handle, $values);
-                }
-            });
-
-            // Close the output stream
-            fclose($handle);
-        }, 200, [
-            'Content-Type' => 'text/csv',
-            'Content-Disposition'
-                => 'attachment; filename="'.(($request->has('status')) ? trim($request->input('status')) : 'all').'-assets-'.date('Y-m-d-his').'.csv"',
-        ]);
-
-        return $response;
-
-    }
-
     /**
     * Show depreciation report for assets.
     *

app/Http/Controllers/UsersController.php

@@ -392,9 +392,9 @@ class UsersController extends Controller
                 return redirect()->route('users.index')->with('error', 'This user still has ' . $user->assets()->count() . ' assets associated with them.');
             }
 
-            if (count($user->assets) > 0) {
+            if ($user->assets->count() > 0) {
                 // Redirect to the user management page
-                return redirect()->route('users.index')->with('error', 'This user still has ' . count($user->assets) . ' assets associated with them.');
+                return redirect()->route('users.index')->with('error', 'This user still has ' . count($user->assets->count()) . ' assets associated with them.');
             }
 
             if ($user->licenses()->count() > 0) {
@@ -438,23 +438,19 @@ class UsersController extends Controller
     public function postBulkEdit(Request $request)
     {
         $this->authorize('update', User::class);
-        if ((!Input::has('ids')) || (count(Input::input('ids')) == 0)) {
-            return redirect()->back()->with('error', 'No users selected');
-        } else {
 
+        if (($request->has('ids')) && (count($request->input('ids')) > 0)) {
             $statuslabel_list = Helper::statusLabelList();
             $user_raw_array = array_keys(Input::get('ids'));
-            $licenses = DB::table('license_seats')->whereIn('assigned_to', $user_raw_array)->get();
-
             $users = User::whereIn('id', $user_raw_array)->with('groups', 'assets', 'licenses', 'accessories')->get();
-            if ($request->input('bulk_actions')=='edit') {
+            if ($request->input('bulk_actions') == 'edit') {
-
                 return view('users/bulk-edit', compact('users'))
                     ->with('groups', Group::pluck('name', 'id'));
             }
-
             return view('users/confirm-bulk-delete', compact('users', 'statuslabel_list'));
         }
+
+        return redirect()->back()->with('error', 'No users selected');
     }
 
 
@@ -468,15 +464,13 @@ class UsersController extends Controller
     public function postBulkEditSave(Request $request)
     {
         $this->authorize('update', User::class);
-        if ((!Input::has('ids')) || (count(Input::input('ids')) == 0)) {
-            return redirect()->back()->with('error', 'No users selected');
-        } else {
 
-            $user_raw_array = Input::get('ids');
+        if (($request->has('ids')) && (count($request->input('ids')) > 0)) {
+
+            $user_raw_array = $request->input('ids');
             $update_array = array();
             $manager_conflict = false;
-
+            $users = User::whereIn('id', $user_raw_array)->where('id', '!=', Auth::user()->id)->get();
-            $users = User::whereIn('id', $user_raw_array)->where('id','!=',Auth::user()->id)->get();
 
             if ($request->has('location_id')) {
                 $update_array['location_id'] = $request->input('location_id');
@@ -492,14 +486,12 @@ class UsersController extends Controller
             }
 
 
-
             if ($request->has('manager_id')) {
 
                 // Do not allow a manager update if the selected manager is one of the users being
                 // edited.
                 if (!array_key_exists($request->input('manager_id'), $user_raw_array)) {
                     $update_array['manager_id'] = $request->input('manager_id');
-
                 } else {
                     $manager_conflict = true;
                 }
@@ -509,8 +501,9 @@ class UsersController extends Controller
                 $update_array['activated'] = $request->input('activated');
             }
 
+            // Save the updated info
             if (count($update_array) > 0) {
-                User::whereIn('id', $user_raw_array)->where('id','!=',Auth::user()->id)->update($update_array);
+                User::whereIn('id', $user_raw_array)->where('id', '!=', Auth::user()->id)->update($update_array);
             }
 
             // Only sync groups if groups were selected
@@ -520,13 +513,17 @@ class UsersController extends Controller
                 }
             }
 
-        }
+            if ($manager_conflict) {
-        if ($manager_conflict) {
+                return redirect()->route('users.index')
+                    ->with('warning', trans('admin/users/message.bulk_manager_warn'));
+            }
+
             return redirect()->route('users.index')
-                ->with('warning', trans('admin/users/message.bulk_manager_warn'));
+                ->with('success', trans('admin/users/message.success.update_bulk'));
         }
-        return redirect()->route('users.index')
+
-            ->with('success', trans('admin/users/message.success.update_bulk'));
+        return redirect()->back()->with('error', 'No users selected');
+
 
 
     }

app/Http/Controllers/ViewAssetsController.php

@@ -61,7 +61,7 @@ class ViewAssetsController extends Controller
             $error = trans('admin/users/message.user_not_found', compact('id'));
 
             // Redirect to the user management page
-            return redirect()->route('users')->with('error', $error);
+            return redirect()->route('users.index')->with('error', $error);
         }
 
     }

app/Http/Requests/AssetFileRequest.php

@@ -23,8 +23,9 @@ class AssetFileRequest extends Request
      */
     public function rules()
     {
+        $max_file_size = \App\Helpers\Helper::file_upload_max_size();
         return [
-          'file.*' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt,zip,rar|max:2000'
+          'file.*' => 'required|mimes:png,gif,jpg,jpeg,doc,docx,pdf,txt,zip,rar|max:'.$max_file_size,
         ];
     }
 

app/Http/Transformers/ActionlogsTransformer.php

@@ -22,11 +22,20 @@ class ActionlogsTransformer
 
     public function transformActionlog (Actionlog $actionlog, $settings = null)
     {
+        $icon = $actionlog->present()->icon();
+        if ($actionlog->filename!='') {
+            $icon =  e(\App\Helpers\Helper::filetype_icon($actionlog->filename));
+        }
         $array = [
             'id'          => (int) $actionlog->id,
-            'icon'          => $actionlog->present()->icon(),
+            'icon'          => $icon,
-            'image' => (method_exists($actionlog->item, 'getImageUrl')) ? $actionlog->item->getImageUrl() : null,
+            'file' => ($actionlog->filename!='') ?
-            'file' => ($actionlog->filename!='') ? route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]) : null,
+                [
+                    'url' => route('show/assetfile', ['assetId' => $actionlog->item->id, 'fileId' => $actionlog->id]),
+                    'filename' => $actionlog->filename,
+                    'inlineable' => (bool) \App\Helpers\Helper::show_file_inline($actionlog->filename),
+                ] : null,
+
             'item' => ($actionlog->item) ? [
                 'id' => (int) $actionlog->item->id,
                 'name' => e($actionlog->item->getDisplayNameAttribute()),
@@ -60,12 +69,11 @@ class ActionlogsTransformer
 
         ];
 
-
-
         return $array;
     }
 
 
+
     public function transformCheckedoutActionlog (Collection $accessories_users, $total)
     {
 

app/Http/Transformers/AssetsTransformer.php

@@ -84,7 +84,7 @@ class AssetsTransformer
         ];
 
 
-        if (($asset->model) && ($asset->model->fieldset) && (count($asset->model->fieldset->fields)> 0)) {
+        if (($asset->model) && ($asset->model->fieldset) && ($asset->model->fieldset->fields->count() > 0)) {
             $fields_array = array();
 
             foreach ($asset->model->fieldset->fields as $field) {

app/Http/Transformers/UsersTransformer.php

@@ -73,7 +73,7 @@ class UsersTransformer
         $array += $permissions_array;
 
 
-        $numGroups = count($user->groups);
+        $numGroups = $user->groups->count();
         if($numGroups > 0)
         {
             $groups["total"] = $numGroups;

app/Models/Actionlog.php

@@ -133,8 +133,11 @@ class Actionlog extends SnipeModel
        **/
     public function get_src($type = 'assets', $fieldname = 'filename')
     {
-        $file = config('app.private_uploads') . '/' . $type . '/' . $this->{$fieldname};
+        if ($this->filename!='') {
-        return $file;
+            $file = config('app.private_uploads') . '/' . $type . '/' . $this->{$fieldname};
+            return $file;
+        }
+        return false;
     }
 
 

app/Models/Asset.php

@@ -649,7 +649,7 @@ class Asset extends Depreciable
 
     public function scopeRTD($query)
     {
-        return $query->whereNULL('assigned_to')
+        return $query->whereNULL('assets.assigned_to')
                    ->whereHas('assetstatus', function ($query) {
                        $query->where('deployable', '=', 1)
                              ->where('pending', '=', 0)
@@ -1050,9 +1050,17 @@ class Asset extends Depreciable
                         });
                     });
                 }
+
+                if ($fieldname =='supplier') {
+                    $query->where(function ($query) use ($search_val) {
+                        $query->whereHas('supplier', function ($query) use ($search_val) {
+                            $query->where('suppliers.name', 'LIKE', '%' . $search_val . '%');
+                        });
+                    });
+                }
             }
 
-            if (($fieldname!='category')  && ($fieldname!='location')
+            if (($fieldname!='category')  && ($fieldname!='location') && ($fieldname!='supplier')
                 && ($fieldname!='status_label') && ($fieldname!='model') && ($fieldname!='company') && ($fieldname!='manufacturer')) {
                     $query->orWhere('assets.'.$fieldname, 'LIKE', '%' . $search_val . '%');
             }

app/Models/Ldap.php

@@ -262,13 +262,13 @@ class Ldap extends Model
             $search_results = ldap_search($ldapconn, $base_dn, '('.$filter.')');
 
             if (!$search_results) {
-                return redirect()->route('users')->with('error', trans('admin/users/message.error.ldap_could_not_search').ldap_error($ldapconn));
+                return redirect()->route('users.index')->with('error', trans('admin/users/message.error.ldap_could_not_search').ldap_error($ldapconn));
             }
 
             // Get results from page
             $results = ldap_get_entries($ldapconn, $search_results);
             if (!$results) {
-                return redirect()->route('users')->with('error', trans('admin/users/message.error.ldap_could_not_get_entries').ldap_error($ldapconn));
+                return redirect()->route('users.index')->with('error', trans('admin/users/message.error.ldap_could_not_get_entries').ldap_error($ldapconn));
             }
 
             // Add results to result set

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v4.2.0',
+  'app_version' => 'v4.3.0',
-  'full_app_version' => 'v4.2.0 - build 3508-g086711e46',
+  'full_app_version' => 'v4.3.0 - build 3559-g9eab9ad40',
-  'build_version' => '3508',
+  'build_version' => '3559',
   'prerelease_version' => '',
-  'hash_version' => 'g590938f',
+  'hash_version' => 'g9eab9ad40',
-  'full_hash' => 'v4.2.0-4-g590938f',
+  'full_hash' => 'v4.3.0-66-g9eab9ad40',
   'branch' => 'master',
 );

package.json

@@ -14,7 +14,7 @@
     "babel-preset-latest": "^6.24.1",
     "cross-env": "^5.0.5",
     "jquery": "^3.1.1",
-    "laravel-mix": "1.7",
+    "laravel-mix": "2.1",
     "lodash": "^4.17.4",
     "vue": "2.4.4",
     "vue-loader": "^13.6.1",
@@ -33,8 +33,8 @@
     "jquery-ui": "^1.12.1",
     "jquery-ui-bundle": "^1.12.1",
     "jquery.iframe-transport": "^1.0.0",
-    "less": "^2.7.2",
+    "less": "less/less.js#efa6eb5306f28a7ef7e235d79ce854b780345591",
-    "less-loader": "^4.0.5",
+    "less-loader": "^4.1.0",
     "papaparse": "^4.3.3",
     "select2": "^4.0.3",
     "tether": "^1.4.0",

public/mix-manifest.json

@@ -1,14 +1,14 @@
 {
-    "/js/build/vue.js": "/js/build/vue.js?id=88921ad9bb64a0915ebb",
+    "/js/build/vue.js": "/js/build/vue.js?id=992bcb968a7f2da998b5",
     "/css/AdminLTE.css": "/css/AdminLTE.css?id=5e72463a66acbcc740d5",
     "/css/app.css": "/css/app.css?id=407edb63cc6b6dc62405",
-    "/css/overrides.css": "/css/overrides.css?id=c289c71c08df753ebc45",
+    "/css/overrides.css": "/css/overrides.css?id=d85394a0b4f58e81bb78",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=0b7679d18eb22094e3b7",
+    "/js/build/vue.js.map": "/js/build/vue.js.map?id=e0eb0edc0b761965973f",
     "/css/AdminLTE.css.map": "/css/AdminLTE.css.map?id=99f5a5a03c4155cf69f6",
     "/css/app.css.map": "/css/app.css.map?id=bdbe05e6ecd70ccfac72",
     "/css/overrides.css.map": "/css/overrides.css.map?id=898c91d4a425b01b589b",
-    "/css/dist/all.css": "/css/dist/all.css?id=e3ae07b03a1d53657a1e",
+    "/css/dist/all.css": "/css/dist/all.css?id=0e3642f1b6a8a436d558",
-    "/js/dist/all.js": "/js/dist/all.js?id=3f7017ebedf1da0319ef",
+    "/js/dist/all.js": "/js/dist/all.js?id=39b95992f478d68c44a8",
-    "/css/build/all.css": "/css/build/all.css?id=e3ae07b03a1d53657a1e",
+    "/css/build/all.css": "/css/build/all.css?id=0e3642f1b6a8a436d558",
-    "/js/build/all.js": "/js/build/all.js?id=3f7017ebedf1da0319ef"
+    "/js/build/all.js": "/js/build/all.js?id=39b95992f478d68c44a8"
 }

resources/assets/js/snipeit.js

@@ -206,7 +206,8 @@ $(document).ready(function () {
                 data: function (params) {
                     var data = {
                         search: params.term,
-                        page: params.page || 1
+                        page: params.page || 1,
+                        assetStatusType: link.data("asset-status-type"),
                     };
                     return data;
                 },

resources/assets/less/overrides.less

@@ -336,3 +336,8 @@ img.navbar-brand-img, .navbar-brand>img {
   border-width: 1px;
   border-style: solid
 }
+
+.icon-med {
+  font-size: 20px;
+  color: #889195;
+}

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

@@ -28,4 +28,5 @@ return array(
     'create_fieldset'         => 'Nuwe Fieldset',
     'create_field'            => 'Nuwe aangepaste veld',
     'value_encrypted'      	        => 'Die waarde van hierdie veld is geïnkripteer in die databasis. Slegs admingebruikers sal die gedecodeerde waarde kan sien',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
 );

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

@@ -5,14 +5,13 @@ return array(
     'about_assets_text'            => 'Bates is items opgespoor volgens reeksnommer of bate-tag. Hulle is geneig om hoër waarde items te wees waar die identifisering van \'n spesifieke item saak maak.',
 	'archived'  				=> 'argief',
     'asset'  					=> 'bate',
-    'bulk_checkout'             => 'Checkout Bates aan gebruiker',
+    'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'Kontrole bate',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klone Bate',
     'deployable'  				=> 'verbintenis',
     'deleted'  					=> 'Hierdie bate is verwyder. <a href="/hardware/:asset_id/restore">Klik hier om dit te herstel</a>.',
     'edit'  					=> 'Wysig bate',
-	'filetype_info'				=> 'Toegelate filetipes is png, gif, jpg, jpeg, doc, docx, pdf, txt, zip en rar.',
     'model_deleted'  			=> 'Hierdie batesmodel is uitgevee. Jy moet die model herstel voordat jy die Bate kan herstel. <br/> <a href="/hardware/models/:model_id/restore">Klik hier om die model</a> te herstel.',
     'requestable'               => 'Requestable',
     'requested'				    => 'versoek',

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

@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Kyk Modelle',
     'fieldset'                  => 'fieldset',
     'no_custom_field'           => 'Geen persoonlike velde nie',
-
+    'add_default_values'        => 'Add default values',
 );

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

@@ -4,6 +4,8 @@ return array(
     'ad'				        => 'Aktiewe gids',
     'ad_domain'				    => 'Active Directory-domein',
     'ad_domain_help'			=> 'Dit is soms dieselfde as jou e-pos domein, maar nie altyd nie.',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Dit is \'n Active Directory-bediener',
 	'alert_email'				=> 'Stuur kennisgewings aan',
 	'alerts_enabled'			=> 'Alerts aangeskakel',
@@ -107,6 +109,8 @@ return array(
     'show_alerts_in_menu'       => 'Show alerts in top menu',
     'show_archived_in_list'     => 'Archived Assets',
     'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Naam',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/af/button.php

@@ -12,4 +12,5 @@ return array(
     'submit'  	                => 'Indien',
     'upload'                    => 'oplaai',
 	'select_file'				=> 'Kies lêer ...',
+    'select_files'				=> 'Select Files...',
 );

resources/lang/af/general.php

@@ -9,6 +9,7 @@
     'activity_report'		=> 'Aktiwiteitsverslag',
     'address'				=> 'adres',
     'admin'					=> 'admin',
+    'administrator'			=> 'Administrator',
     'add_seats'             => 'Bykomende sitplekke',
     'all_assets'			=> 'Alle bates',
     'all'       			=> 'Almal',
@@ -38,6 +39,9 @@
     'checkin'  				=> 'Inboek',
     'checkin_from'  		=> 'Kontroleer vanaf',
     'checkout'  			=> 'Uitteken',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'user_requests_count'   => 'Requests',
     'city'  				=> 'Stad',
 	'click_here'			=> 'Klik hier',
     'clear_selection'		=> 'Clear Selection',
@@ -64,6 +68,7 @@
     'debug_warning'         => 'Waarskuwing!',
     'debug_warning_text'    => 'Hierdie program word uitgevoer in die produksiemodus met debugging aangeskakel. Dit kan sensitiewe data blootstel indien u aansoek vir die buitewêreld toeganklik is. Deaktiveer debug-modus deur die <code>APP_DEBUG</code>-waarde in jou <code>.env</code>-lêer te stel na <code>false</code>.',
     'delete'  				=> 'verwyder',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'geskrap',
     'delete_seats'  		=> 'Plekke verwyder',
     'departments'           => 'departemente',
@@ -201,6 +206,7 @@
     'unknown_admin'			=> 'Onbekende Admin',
     'username_format'		=> 'Gebruikernaam',
     'update'                => 'Opdateer',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'opgelaai',
     'user'					=> 'gebruiker',
     'accepted'			    => 'aanvaarde',

resources/lang/af/mail.php

@@ -22,6 +22,7 @@ return array(
     'Confirm_Asset_Checkin' => 'Bevestig Asset Checkin.',
     'Confirm_Accessory_Checkin' => 'Bevestig Accessoire Checkin.',
     'Confirm_accessory_delivery' => 'Bevestig toebehore-aflewering.',
+    'Confirm_license_delivery' => 'Confirm license delivery.',
     'Confirm_asset_delivery' => 'Bevestig bate aflewering.',
     'Confirm_consumable_delivery' => 'Bevestig verbruikslewering.',
     'current_QTY' => 'Huidige QTY',
@@ -54,7 +55,7 @@ return array(
     'requested' => 'versoek:',
     'reset_link' => 'Jou wagwoord herstel skakel',
     'reset_password' => 'Klik hier om jou wagwoord terug te stel:',
-    'serial' => 'Serial:',
+    'serial' => 'Serial',
     'supplier' => 'verskaffer',
     'tag' => 'tag',
     'test_email' => 'Toets e-pos van Snipe-IT',
@@ -63,8 +64,8 @@ return array(
     'There_are' => '{1} Daar is | [2, Inf] Daar is',
     'to_reset' => 'Om jou webadres te herstel, voltooi hierdie vorm:',
     'type' => 'tipe',
-    'user' => 'gebruiker:',
+    'user' => 'User',
-    'username' => 'Gebruikersnaam:',
+    'username' => 'Username',
     'welcome' => 'Welkom: naam',
     'welcome_to' => 'Welkom by: web!',
     'your_credentials' => 'Jou Snipe-IT-referenties',

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

@@ -28,4 +28,5 @@ return array(
     'create_fieldset'         => 'مجموعة حقول جديدة',
     'create_field'            => 'حقل جديد مخصص',
     'value_encrypted'      	        => 'هذا الحقل مشفر في قاعدة البيانات. يمكن قرائته من قبل مدراء النظام فقط',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
 );

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

@@ -5,14 +5,13 @@ return array(
     'about_assets_text'            => 'الأصول هي العناصر التي يتم تتبعها بواسطة الرقم التسلسلي أو ترميز الأصل. وهي تميل إلى أن تكون ممتلكات ذات قيمة أعلى حيث انه من المهم توثيقها.',
 	'archived'  				=> 'مؤرشفة',
     'asset'  					=> 'أصل',
-    'bulk_checkout'             => 'اخراج الأصل إلى مستخدم',
+    'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'ادخال الأصل',
     'checkout'  				=> 'اخراج الأصل',
     'clone'  					=> 'استنساخ الأصل',
     'deployable'  				=> 'قابل للتوزيع',
     'deleted'  					=> 'تم حذف هذا الأصل. <a href="/hardware/:asset_id/restore"> انقر هنا لاستعادته </a>.',
     'edit'  					=> 'تعديل الأصل',
-	'filetype_info'				=> 'انواع صيغ الملفات المسوح بها هي png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
     'model_deleted'  			=> 'تم حذف موديل الأصل هذا. يجب عليك استعادة الموديل قبل أن تتمكن من استعادة الأصل.<br/> <a href="/hardware/models/:model_id/restore"> انقر هنا لاستعادة الموديل</a>.',
     'requestable'               => 'قابل للطلب',
     'requested'				    => 'تم الطلب',

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

@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'عرض الموديلات',
     'fieldset'                  => 'مجموعة حقول',
     'no_custom_field'           => 'لا يوجد حقول مخصصة',
-
+    'add_default_values'        => 'Add default values',
 );

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

@@ -4,6 +4,8 @@ return array(
     'ad'				        => 'الدليل النشط',
     'ad_domain'				    => 'مجال الدليل النشط',
     'ad_domain_help'			=> 'هذا هو أحيانا نفس نطاق البريد الإلكتروني الخاص بك، ولكن ليس دائما.',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'هذا هو ملقم أكتيف ديركتوري',
 	'alert_email'				=> 'إرسال تنبيهات إلى',
 	'alerts_enabled'			=> 'التنبيهان ممكنه',
@@ -107,6 +109,8 @@ return array(
     'show_alerts_in_menu'       => 'Show alerts in top menu',
     'show_archived_in_list'     => 'Archived Assets',
     'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'اسم الموقع',
     'slack_botname'             => 'سلاك بوتنام',
     'slack_channel'             => 'قناة سلاك',

resources/lang/ar/button.php

@@ -12,4 +12,5 @@ return array(
     'submit'  	                => 'إرسال',
     'upload'                    => 'رفع',
 	'select_file'				=> 'حدد ملف ...',
+    'select_files'				=> 'Select Files...',
 );

resources/lang/ar/general.php

@@ -9,6 +9,7 @@
     'activity_report'		=> 'تقرير الأنشطة',
     'address'				=> 'العنوان',
     'admin'					=> 'الإدارة',
+    'administrator'			=> 'Administrator',
     'add_seats'             => 'المقاعد المضافة',
     'all_assets'			=> 'كل الأصول',
     'all'       			=> 'الكل',
@@ -38,6 +39,9 @@
     'checkin'  				=> 'تسجيل',
     'checkin_from'  		=> 'تحقق من',
     'checkout'  			=> 'ترجيع',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'user_requests_count'   => 'Requests',
     'city'  				=> 'المدينة',
 	'click_here'			=> 'انقر هنا',
     'clear_selection'		=> 'مسح التحديد',
@@ -64,6 +68,7 @@
     'debug_warning'         => 'تحذير!',
     'debug_warning_text'    => 'هذا التطبيق يعمل في وضع الإنتاج مع تمكين التصحيح. هذا يمكن أن يعرض البيانات الحساسة إذا كان التطبيق الخاص بك هو في متناول العالم الخارجي. تعطيل وضع التصحيح عن طريق تعيين قيمة <code>APP_DEBUG</code> في ملف <code>.env</code> إلى <code>false</code>.',
     'delete'  				=> 'حذف',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'تم حذفها',
     'delete_seats'  		=> 'المقاعد المحذوفة',
     'departments'           => 'الإدارات',
@@ -201,6 +206,7 @@
     'unknown_admin'			=> 'إداري غير معروف',
     'username_format'		=> 'تنسيق اسم المستخدم',
     'update'                => 'تحديث',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'تم تحميلها',
     'user'					=> 'المستخدم',
     'accepted'			    => 'قبلت',

resources/lang/ar/mail.php

@@ -22,6 +22,7 @@ return array(
     'Confirm_Asset_Checkin' => 'تأكيد فحص الأصول.',
     'Confirm_Accessory_Checkin' => 'تأكيد الإيداع المساعد.',
     'Confirm_accessory_delivery' => 'تأكيد التسليم التبعي.',
+    'Confirm_license_delivery' => 'Confirm license delivery.',
     'Confirm_asset_delivery' => 'تأكيد تسليم الأصول.',
     'Confirm_consumable_delivery' => 'تأكيد التسليم المستهلكة.',
     'current_QTY' => 'الكمية الحالية',
@@ -54,7 +55,7 @@ return array(
     'requested' => 'تم الطلب:',
     'reset_link' => 'رابط إعادة تعيين كلمة المرور',
     'reset_password' => 'انقر هنا لإعادة تعيين كلمة المرور:',
-    'serial' => 'التسلسل:',
+    'serial' => 'Serial',
     'supplier' => 'المورد',
     'tag' => 'الترميز',
     'test_email' => 'اختبار البريد الإلكتروني من قنص-تكنولوجيا المعلومات',
@@ -63,8 +64,8 @@ return array(
     'There_are' => '{1} هناك | [2، إنف] هناك',
     'to_reset' => 'لإعادة تعيين كلمة مرور على :web، رجاءا أكمل هذا النموذج:',
     'type' => 'اكتب',
-    'user' => 'المستخدم:',
+    'user' => 'User',
-    'username' => 'اسم المستخدم:',
+    'username' => 'Username',
     'welcome' => 'مرحباً :name',
     'welcome_to' => 'مرحبا بكم في :web!',
     'your_credentials' => 'أوراق اعتماد قنص-إيت الخاص بك',

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

@@ -20,7 +20,7 @@ return array(
     'field_element_short'     => 'Елемент',
     'field_format'            => 'Формат',
     'field_custom_format'     => 'Персонализиран формат',
-    'field_custom_format_help'     => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use <code>regex:/^[0-9]{15}$/</code>.',
+    'field_custom_format_help'     => 'Това поле позволява да използвате регулярен израз за валидация. За да го използвате, валидацията трябва да започва с "regex:" - например, за да потвърдите, че стойността на персонализираното поле съдържа валиден IMEI (15 цифри), можете да използвате <code>regex: / ^[0-9]{15}$ /</code>.',
     'required'   		          => 'Задължителен',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Използвани от модели ',
@@ -28,4 +28,5 @@ return array(
     'create_fieldset'         => 'Нов Fieldset',
     'create_field'            => 'Ново персонализирано поле',
     'value_encrypted'      	        => 'Стойността на това поле е криптирана в базата данни. Само администратор потребители ще бъде в състояние да видят дешифрираната стойност',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
 );

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

@@ -5,14 +5,13 @@ return array(
     'about_assets_text'            => 'Активите са елементи, проследен от сериен номер или етикет. По-често, те са елементи с висока стойност, където идентифицирането на специфичен елемент е от значение.',
 	'archived'  				=> 'Архивиран',
     'asset'  					=> 'Актив',
-    'bulk_checkout'             => 'Отписване на активи към потребител',
+    'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'Връщане на актив',
     'checkout'  				=> 'Проверка на активите',
     'clone'  					=> 'Копиране на актив',
     'deployable'  				=> 'Може да бъде предоставен',
     'deleted'  					=> 'Активът беше изтрит. <a href="/hardware/:asset_id/restore">Възстановяване</a>.',
     'edit'  					=> 'Редакция на актив',
-	'filetype_info'				=> 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
     'model_deleted'  			=> 'Моделът актив беше изтрит.Необходимо е да възстановите моделът, преди да възстановите актива.<br/> <a href="/hardware/models/:model_id/restore">Възстановяване на модел</a>.',
     'requestable'               => 'Може да бъде изискван',
     'requested'				    => 'Изискан',

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

@@ -62,7 +62,7 @@ return array(
         'success' 		=> 'Активът изписан успешно.',
         'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.',
         'not_available' => 'Този актив не е наличен за отписване!',
-        'no_assets_selected' => 'You must select at least one asset from the list'
+        'no_assets_selected' => 'Трябва да изберете поне един елемент към списъка'
     ),
 
     'checkin' => array(

resources/lang/bg/admin/manufacturers/message.php

@@ -16,8 +16,8 @@ return array(
     ),
 
     'restore' => array(
-        'error'   => 'Manufacturer was not restored, please try again',
+        'error'   => 'Производителят не беше възстановен. Моля, опитайте отново',
-        'success' => 'Manufacturer restored successfully.'
+        'success' => 'Производителят възстановен успешно.'
     ),
 
     'delete' => array(

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

@@ -4,9 +4,9 @@ return array(
     'about_models_title'     => 'Относно модели на актив',
     'about_models_text'           => 'Модели на актив са начин за групиране на идентични активи. "MBP 2013", "IPhone 6s" и др.',
     'deleted'  					        => 'Моделът беше изтрит. <a href="/hardware/models/:model_id/restore">Възстановяване</a>.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
+    'bulk_delete'               => 'Масово изтриване на модели на активите',
-    'bulk_delete_help'               => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.',
+    'bulk_delete_help'               => 'Използвайте квадратчетата за отметка по-долу, за да потвърдите изтриването на избраните модели на активи. Моделите, за които има асоциирани активи, не могат да бъдат изтрити, докато активите не се асоциират с друг модел.',
-    'bulk_delete_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete_warn'          => 'Ще бъдат изтрити :model_count модели на активи.',
     'restore'                   => 'Възстановяване на модел',
     'requestable'               => 'Потребителите могат да поискат този модел',
 	'show_mac_address'			      => 'Визуализиране на поле за MAC адрес в активите за този модел',
@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Преглед на моделите',
     'fieldset'                  => 'Полета',
     'no_custom_field'           => 'Няма потребителски полета',
-
+    'add_default_values'        => 'Add default values',
 );

resources/lang/bg/admin/models/message.php

@@ -34,9 +34,9 @@ return array(
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'No models were selected, so nothing was deleted.',
+        'error'   		    => 'Няма избрани модели, така че нищо не бе изтрито.',
-        'success' 		    => ':success_count model(s) deleted!',
+        'success' 		    => ':success_count модела бяха изтрити!',
-        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+        'success_partial' 	=> ':success_count модела бяха изтрити, но :fail_count не бяха, тъй като към тях има асоциирани активи.'
     ),
 
 );

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

@@ -4,6 +4,8 @@ return array(
     'ad'				        => 'Активна директория',
     'ad_domain'				    => 'Домейн на активна директория',
     'ad_domain_help'			=> 'Това е понякога еднакво с вашия email домейн, но не винаги.',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Това е активна директория на сървър',
 	'alert_email'				=> 'Изпращане на нотификации към',
 	'alerts_enabled'			=> 'Включване на известията',
@@ -23,10 +25,10 @@ return array(
     'confirm_purge_help'		=> 'Въдете текста "DELETE" в клетката отдолу за да пречистите изтритите записи. Това действие не може да бъде отменено.',
 	'custom_css'				=> 'Потребителски CSS',
 	'custom_css_help'			=> 'Включете вашите CSS правила тук. Не използвайте <style></style> тагове.',
-    'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
+    'custom_forgot_pass_url'	=> 'Персонализиран адрес за възстановяване на паролата',
-    'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
+    'custom_forgot_pass_url_help'	=> 'Това URL ще замени вградения механизъм за възстановяване на паролата на входния екран, което е полезно за потребителите, използващи външни оторизации като LDAP. Това ефективно ще спре възможността за възстановяване на паролата за потребителите, управлявани през Sinpe-it.',
-    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message'			=> 'Съобщение на таблото',
-    'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'dashboard_message_help'	=> 'Този текст ще се появи на таблото на всички потребители с права за достъп до таблото.',
 	'default_currency'  		=> 'Валута по подразбиране',
 	'default_eula_text'			=> 'EULA по подразбиране',
   'default_language'			=> 'Език по подразбиране',
@@ -40,8 +42,8 @@ return array(
 	'alt_barcode_type'			=> '1D тип на баркод',
     'eula_settings'				=> 'Настройки на EULA',
     'eula_markdown'				=> 'Съдържанието на EULA може да бъде форматирано с <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'footer_text'               => 'Additional Footer Text ',
+    'footer_text'               => 'Допълнителен текст във футъра',
-    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_help'          => 'Този текст ще се визуализира в дясната част на футъра. Връзки могат да бъдат добавяни с използването на <a href="https://help.github.com/articles/github-flavored-markdown/">Github тип markdown</a>. Нови редове, хедър тагове, изображения и т.н. могат да доведат до непредвидими резултати.',
     'general_settings'			=> 'Общи настройки',
 	'generate_backup'			=> 'Създаване на архив',
     'header_color'              => 'Цвят на хедъра',
@@ -50,8 +52,8 @@ return array(
     'ldap_enabled'              => 'LDAP включен',
     'ldap_integration'          => 'LDAP интеграция',
     'ldap_settings'             => 'LDAP настройки',
-    'ldap_login_test_help'      => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_test_help'      => 'Въведете валидни LDAP потребител и парола от базовия DN, който указахте по-горе, за да тествате коректната конфигурация. НЕОБХОДИМО Е ДА ЗАПИШЕТЕ LDAP НАСТРОЙКИТЕ ПРЕДИ ТОВА.',
-    'ldap_login_sync_help'      => 'This only tests that LDAP can sync correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
+    'ldap_login_sync_help'      => 'Това единствено проверява дали LDAP може да се синхронизира успешно. Ако вашата LDAP заявка за оторизация не е коректна е възможно потребителите да не могат да влязат. НЕОБХОДИМО Е ДА ЗАПИШЕТЕ LDAP НАСТРОЙКИТЕ ПРЕДИ ТОВА.',
     'ldap_server'               => 'LDAP сървър',
     'ldap_server_help'          => 'Това трябва да започва с Idap:// (for unencrypted or TLS) или Idaps:// (for SSL)',
 	'ldap_server_cert'			=> 'Валидация на LDAP SSL сертификата',
@@ -73,22 +75,22 @@ return array(
     'ldap_active_flag'          => 'LDAP флаг за активност',
     'ldap_emp_num'              => 'LDAP номер на служител',
     'ldap_email'                => 'LDAP електронна поща',
-    'license'                  => 'Software License',
+    'license'                  => 'Софтуерен лиценз',
     'load_remote_text'          => 'Отдалечени скриптове',
     'load_remote_help_text'		=> 'Тази Snipe-IT инсталация може да зарежда и изпълнява външни скриптове.',
     'login_note'                => 'Вход забележка',
     'login_note_help'           => 'По избор включете няколко изречения на екрана за вход, например, за да помогнете на хора, които са намерили изгубено или откраднато устройство. Това поле приема <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>',
-    'login_remote_user_text'    => 'Remote User login options',
+    'login_remote_user_text'    => 'Опции за вход с Remote User',
-    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
+    'login_remote_user_enabled_text' => 'Включване на вход с HTTP хедър Remote User',
-    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
+    'login_remote_user_enabled_help' => 'Тази опция включва автентификация с HTTP хедър REMOTE_USER в съответствие с "Common Gateway Interface (rfc3875)"',
-    'login_common_disabled_text' => 'Disable other authentication mechanisms',
+    'login_common_disabled_text' => 'Изключване на други оторизационни механизми',
-    'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
+    'login_common_disabled_help' => 'Тази опция изключва останалите оторизационни механизми. Преди да включите тази настройка моля проверете дали REMOTE_USER механизмът работи',
-    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+    'login_remote_user_custom_logout_url_text' => 'Персонализиран адрес за изход',
-    'login_remote_user_custom_logout_url_help' => 'If filled users will get redirected to this URL after the Session of SnipeIT is closed (Logout). This is usefull to close the user sessions of your Authenticationprovider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'Ако е попълнено, потребителите ще бъдат пренасочвани към този адрес след затваряне на потребителската им сесия при изход. Полезно е за затваряне на потребителската сесия при използването на външен оторизационен провайдър.',
     'logo'                    	=> 'Лого',
     'full_multiple_companies_support_help_text' => 'Ограничаване на потребителите (включително административните) до активите на собствената им компания.',
     'full_multiple_companies_support_text' => 'Поддръжка на множество компании',
-    'show_in_model_list'   => 'Show in Model Dropdowns',
+    'show_in_model_list'   => 'Показване в падащите менюта на моделите',
     'optional'					=> 'незадължително',
     'per_page'                  => 'Резултати на страница',
     'php'                       => 'PHP версия',
@@ -104,20 +106,22 @@ return array(
     'qr_text'                   => 'Съдържание на QR код',
     'setting'                   => 'Настройка',
     'settings'                  => 'Настройки',
-    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_alerts_in_menu'       => 'Показва съобщения в главното меню',
-    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list'     => 'Архивирани активи',
-    'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_archived_in_list_text'     => 'Показва архивираните активи в списъка "Всички активи"',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Име на системата',
     'slack_botname'             => 'Име на Slack bot',
     'slack_channel'             => 'Slack канал',
     'slack_endpoint'            => 'Slack Endpoint',
     'slack_integration'         => 'Slack настройки',
     'slack_integration_help'    => 'Интеграцията със Slack е незадължителна. Ако желаете да я използвате е необходимо да настроите endpoint и канал. За да конфигурирате Slack интеграцията, първо <a href=":slack_link" target="_new">създайте входящ webhook</a> във Вашия Slack акаунт.',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
+    'slack_integration_help_button'    => 'След запис на Slack информацията ще бъде показан бутон за тест.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'slack_test_help'           => 'Тест за коректна конфигурация на интеграцията със Slack. НЕОБХОДИМО Е ПЪРВО ДА ЗАПИШЕТЕ SLACK НАСТРОЙКИТЕ.',
     'snipe_version'  			=> 'Snipe-IT версия',
-    'support_footer'            => 'Support Footer Links ',
+    'support_footer'            => 'Връзки към Snipe-it поддръжката във футъра',
-    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
+    'support_footer_help'       => 'Указва визуализацията на връзки към поддръжката на Snipe-IT и потребителската документация',
     'system'                    => 'Информация за системата',
     'update'                    => 'Обновяване на настройките',
     'value'                     => 'Стойност',

resources/lang/bg/admin/statuslabels/table.php

@@ -5,8 +5,8 @@ return array(
     'archived'      	=> 'Архивирани',
     'create'      	=> 'Създаване на статус етикет',
     'color'      	=> 'Цвят на диаграма',
-    'default_label' => 'Default Label',
+    'default_label' => 'Етикет по подразбиране',
-    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'default_label_help' => 'Позиционира най-често използваните етикети в началото на падащото меню за избор при създаване и редактиране на активи.',
     'deployable'      	=> 'Може да бъде предоставен',
     'info'      	=> 'Статусите се използват за описване на различните състояния на Вашите активи. Например, това са Предаден за ремонт, Изгубен/откраднат и др. Можете да създавате нови статуси за активите, които могат да бъдат предоставяни, очакващи набавяне и архивирани.',
     'name'      	=> 'Статус',

resources/lang/bg/admin/suppliers/message.php

@@ -19,9 +19,9 @@ return array(
         'confirm'   => 'Сигурни ли сте, че искате да изтриете този доставчик?',
         'error'   => 'Възникна проблем при изтриване на доставчика. Моля, опитайте отново.',
         'success' => 'Доставчикът е изтрит.',
-        'assoc_assets'	 => 'This supplier is currently associated with :asset_count asset(s) and cannot be deleted. Please update your assets to no longer reference this supplier and try again. ',
+        'assoc_assets'	 => 'Този доставчик е текущо асоцииран с :asset_count актива и не може да бъде изтрит. Моля, променете връзките на моделите по отношение на този доставчик и опитайте отново. ',
-        'assoc_licenses'	 => 'This supplier is currently associated with :licenses_count licences(s) and cannot be deleted. Please update your licenses to no longer reference this supplier and try again. ',
+        'assoc_licenses'	 => 'Този доставчик е текущо асоцииран с :licenses_count лиценза и не може да бъде изтрит. Моля, променете връзките на лицензите по отношение на този доставчик и опитайте отново. ',
-        'assoc_maintenances'	 => 'This supplier is currently associated with :asset_maintenances_count asset maintenances(s) and cannot be deleted. Please update your asset maintenances to no longer reference this supplier and try again. ',
+        'assoc_maintenances'	 => 'Този доставчик е текущо асоцииран с :asset_maintenances_count инвентаризации и не може да бъде изтрит. Моля, променете връзките на инвентаризациите по отношение на този доставчик и опитайте отново. ',
     )
 
 );

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

@@ -16,7 +16,7 @@ return array(
     'restore_user'		=> 'Кликнете тук, за да ги възстановите.',
     'last_login'        => 'Последен достъп до системата',
     'ldap_config_text'  => 'LDAP конфигурационните настройки могат да бъдат намерени в  Admin > Settings. Избраното (по изобр) местоположение ще бъде настроено за всички въведени потребители.',
-    'print_assigned'    => 'Print All Assigned',
+    'print_assigned'    => 'Печат на всички отдадени',
     'software_user'     => 'Софтуерни продукти, изписани на :name',
     'view_user'         => 'Преглед на потребител :name',
     'usercsv'           => 'CSV файл',

resources/lang/bg/button.php

@@ -12,4 +12,5 @@ return array(
     'submit'  	                => 'Потвърди',
     'upload'                    => 'Качване',
 	'select_file'				=> 'Изберете файл...',
+    'select_files'				=> 'Select Files...',
 );

resources/lang/bg/general.php

@@ -9,6 +9,7 @@
     'activity_report'		=> 'Справка за дейностите',
     'address'				=> 'Aдрес',
     'admin'					=> 'Администриране',
+    'administrator'			=> 'Administrator',
     'add_seats'             => 'Добавени работни места',
     'all_assets'			=> 'Всички активи',
     'all'       			=> 'Всички',
@@ -38,6 +39,9 @@
     'checkin'  				=> 'Вписване',
     'checkin_from'  		=> 'Форма за вписване',
     'checkout'  			=> 'Изписване',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'user_requests_count'   => 'Requests',
     'city'  				=> 'Град',
 	'click_here'			=> 'Натиснете тук',
     'clear_selection'		=> 'Изчистване на селектираното',
@@ -64,6 +68,7 @@
     'debug_warning'         => 'Предупреждение!',
     'debug_warning_text'    => 'Това приложение се изпълнява в режим на производство с разрешено отстраняване на грешки. Това може да изложи чувствителни данни, ако приложението ви е достъпно за външния свят. Забранете режим отстраняване на грешки чрез задаване на стойността <code>APP_DEBUF</code>  <code>.env</code> във файла <code>false</code>.',
     'delete'  				=> 'Изтриване',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'Изтрито',
     'delete_seats'  		=> 'Изтрити работни места за лиценз',
     'departments'           => 'Катедри',
@@ -81,7 +86,7 @@
     'filastname_format'			=> 'Инициал на името Фамилия (jsmith@example.com)',
     'firstname_lastname_format'	=> 'Име Фамилия (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'Име Фамилия (jane.smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+    'lastnamefirstinitial_format' =>  'Фамилно име Инициал на собствено (smithj@example.com)',
     'first'					=> 'Първа',
     'first_name'			=> 'Собствено име',
     'first_name_format'		=> 'Име (jane@example.com)',
@@ -89,16 +94,16 @@
     'file_name'				=> 'Файл',
     'file_uploads'			=> 'Качени файлове',
     'generate'				=> 'Генериране',
-     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+     'github_markdown'      => 'Това поле позволява въвеждането на <a href="https://help.github.com/articles/github-flavored-markdown/">Github вид markdown</a>.',
     'groups'				=> 'Групи',
     'gravatar_email'        => 'Gravatar email адрес',
     'history'  			    => 'История',
     'history_for'  			=> 'История за',
     'id'  					=> 'ID',
-    'image'                 => 'Image',
+    'image'                 => 'Изображение',
     'image_delete'         	=> 'Изтриване на изображението',
     'image_upload'         	=> 'Качване на изображение',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, png, gif, and svg. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Приеманите типове файлове са jpg, png, gif и svg. Максималният размер за качване е: :size.',
     'import'         	    => 'Зареждане',
     'import-history'        => 'История на въвеждане',
     'asset_maintenance'        => 'Поддръжка на активи',
@@ -122,7 +127,7 @@
     'locations'				=> 'Местоположения',
     'logout'				=> 'Изход',
     'lookup_by_tag'     => 'Търсене по етикет на актив',
-    'maintenances'          => 'Maintenances',
+    'maintenances'          => 'Профилактики',
     'manufacturer'			=> 'Производител',
     'manufacturers'			=> 'Производители',
     'markdown'				=> 'Това поле позволява <a href="https://help.github.com/articles/github-flavored-markdown/"Github flavored markdown<a/>',
@@ -157,7 +162,7 @@
     'recent_activity'		=> 'Последни действия',
     'remove_company'        => 'Премахване на асоциация към компания',
     'reports'				=> 'Справки',
-    'restored'				=> 'restored',
+    'restored'				=> 'възстановени',
     'requested'				=> 'Изискан',
     'request_canceled'      => 'Заявка отменена',
     'save'  				=> 'Запис',
@@ -176,11 +181,11 @@
     'select_company'    	=> 'Изберете компания',
     'select_asset'    		=> 'Изберете актив',
     'settings'				=> 'Настройки',
-    'show_deleted'  		=> 'Show Deleted',
+    'show_deleted'  		=> 'Покажи изтритите',
-    'show_current'  		=> 'Show Current',
+    'show_current'  		=> 'Покажи текущите',
     'sign_in'				=> 'Вход',
     'signature'             => 'Подпис',
-    'skin'       			=> 'Skin',
+    'skin'       			=> 'Тема',
     'some_features_disabled' => 'DEMO MODE: Някои свойства не са разрешени за тази инсталация.',
     'site_name'				=> 'Име на системата',
     'state'  				=> 'Област',
@@ -201,6 +206,7 @@
     'unknown_admin'			=> 'Непознат администратор',
     'username_format'		=> 'Формат на потребителско име',
     'update'                => 'Обновяване',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Качен',
     'user'					=> 'Потребител',
     'accepted'			    => 'приет',

resources/lang/bg/mail.php

@@ -22,6 +22,7 @@ return array(
     'Confirm_Asset_Checkin' => 'Потвърдете вписване на актив.',
     'Confirm_Accessory_Checkin' => 'Потвърдете вписване на аксесоар.',
     'Confirm_accessory_delivery' => 'Потвърдете доставка на аксесоар.',
+    'Confirm_license_delivery' => 'Confirm license delivery.',
     'Confirm_asset_delivery' => 'Подвърдете доставка на актив.',
     'Confirm_consumable_delivery' => 'Потвърдете доставка на консуматив.',
     'current_QTY' => 'Текуща наличност',
@@ -54,7 +55,7 @@ return array(
     'requested' => 'Изискан:',
     'reset_link' => 'Вашата връзка за повторно задаване на паролата',
     'reset_password' => 'Щракнете тук, за да нулирате паролата си:',
-    'serial' => 'Сериен:',
+    'serial' => 'Serial',
     'supplier' => 'Доставчик',
     'tag' => 'Етикет',
     'test_email' => 'Тест Email от Snipe-IT',
@@ -63,8 +64,8 @@ return array(
     'There_are' => '{1} има | [2, Inf] Имат',
     'to_reset' => 'За да нулирате вашата :web password, попълнете този формуляр:',
     'type' => 'Вид',
-    'user' => 'Потребител:',
+    'user' => 'User',
-    'username' => 'Потребителско име:',
+    'username' => 'Username',
     'welcome' => 'Добре дошли, :name',
     'welcome_to' => 'Добре дошли: уеб!',
     'your_credentials' => 'Вашите идентификационни данни за Snipe-IT',

resources/lang/bg/validation.php

@@ -67,7 +67,7 @@ return array(
     'not_in'               => 'Избраният :attribute е невалиден.',
     'numeric'              => ':attribute трябва да бъде число.',
     'present'              => 'Полето на атрибута трябва да е налице.',
-    'valid_regex'          => 'That is not a valid regex. ',
+    'valid_regex'          => 'Това не е валиден регулярен израз.',
     'regex'                => 'Форматът на :attribute е невалиден.',
     'required'             => 'Полето :attribute е задължително.',
     'required_if'          => 'Полето :attribute е задължително, когато :other е :value.',
@@ -88,7 +88,7 @@ return array(
     'unique'               => ':attribute вече е вписан.',
     'uploaded'             => 'Атрибутът: не успя да качи.',
     'url'                  => 'Форматът на :attribute е невалиден.',
-    "unique_undeleted"     => "The :attribute must be unique.",
+    "unique_undeleted"     => ":attribute трябва да бъде уникален.",
 
     /*
     |--------------------------------------------------------------------------

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

@@ -28,4 +28,5 @@ return array(
     'create_fieldset'         => 'Nová sada',
     'create_field'            => 'Nové vlastní pole',
     'value_encrypted'      	        => 'Hodnota tohoto pole je zašifrována v databázi. Pouze administrátoři budou moci zobrazit dešifrovanou hodnotu',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
 );

resources/lang/cs/admin/hardware/form.php

@@ -38,7 +38,7 @@ return array(
     'tag'				=> 'Označení majetku',
     'update'			=> 'Úprava majetku',
     'warranty'			=> 'Záruka',
-		'warranty_expires'		=> 'Warranty Expires',
+		'warranty_expires'		=> 'Záruka končí',
     'years'				=> 'roky',
 )
 ;

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

@@ -5,14 +5,13 @@ return array(
     'about_assets_text'            => 'Majetky jsou položky sledované sériovým číslem nebo značkou. Mají tendenci mít vyšší hodnotou, tam kde je důležitá identifikace určité položky.',
 	'archived'  				=> 'Archivováno',
     'asset'  					=> 'Majetek',
-    'bulk_checkout'             => 'Předat majetek uživateli',
+    'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'Převzít majetek',
     'checkout'  				=> 'Pokladní majetek',
     'clone'  					=> 'Klonovat majetek',
     'deployable'  				=> 'Připraveno k nasazení',
     'deleted'  					=> 'Toto zařízení bylo odstraněno. <a href="/hardware/:asset_id/restore">Klepněte zde pro jeho obnovení</a>.',
     'edit'  					=> 'Upravit majetek',
-	'filetype_info'				=> 'Povolené soubory jsou png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, a rar.',
     'model_deleted'  			=> 'Tento model majetku byl odstraněn. Přejete-li si obnovit zařízení, <a href="/hardware/models/:model_id/restore">klepněte zde</a><br/> a obnovte nejdříve jeho model.',
     'requestable'               => 'Lze vyžádat',
     'requested'				    => 'Požadováno',

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

@@ -63,7 +63,7 @@ return array(
         'success' 		=> 'Majetek byl v pořádku předán.',
         'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.',
         'not_available' => 'Tento majetek není k dispozici pro výdej!',
-        'no_assets_selected' => 'You must select at least one asset from the list'
+        'no_assets_selected' => 'Je třeba vybrat ze seznamu alespoň jeden majetek'
     ),
 
     'checkin' => array(

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

@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Zobrazit Modely',
     'fieldset'                  => 'Sada polí',
     'no_custom_field'           => 'Bez vlastních polí',
-
+    'add_default_values'        => 'Add default values',
 );

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

@@ -4,6 +4,8 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Doména služby Active Directory',
     'ad_domain_help'			=> 'Toto je někdy stejné jako vaše emailová doména, ale ne vždy.',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Toto je server služby Active Directory',
 	'alert_email'				=> 'Zasílat upozornění na',
 	'alerts_enabled'			=> 'Upozornění zapnutá',
@@ -25,7 +27,7 @@ return array(
 	'custom_css_help'			=> 'Zadejte libovolné vlastní CSS, které chcete použít. Nezahrnujte <style></style> tagy.',
     'custom_forgot_pass_url'	=> 'Custom Password Reset URL',
     'custom_forgot_pass_url_help'	=> 'This replaces the built-in forgotten password URL on the login screen, useful to direct people to internal or hosted LDAP password reset functionality. It will effectively disable local user forgotten password functionality.',
-    'dashboard_message'			=> 'Dashboard Message',
+    'dashboard_message'			=> 'Hlášení na nástěnce',
     'dashboard_message_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
 	'default_currency'  		=> 'Výchozí měna',
 	'default_eula_text'			=> 'Výchozí EULA',
@@ -73,7 +75,7 @@ return array(
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_emp_num'              => 'LDAP číslo zaměstnance',
     'ldap_email'                => 'LDAP email',
-    'license'                  => 'Software License',
+    'license'                  => 'Softwarová licence',
     'load_remote_text'          => 'Vzdálené skripty',
     'load_remote_help_text'		=> 'Tato instalace Snipe-IT může nahrávat skripty z vnějšího světa.',
     'login_note'                => 'Přihlásit se Poznámka',
@@ -83,7 +85,7 @@ return array(
     'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
     'login_common_disabled_text' => 'Disable other authentication mechanisms',
     'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
-    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+    'login_remote_user_custom_logout_url_text' => 'Uživatelsky určená URL adresa odhlašování',
     'login_remote_user_custom_logout_url_help' => 'If filled users will get redirected to this URL after the Session of SnipeIT is closed (Logout). This is usefull to close the user sessions of your Authenticationprovider correctly.',
     'logo'                    	=> 'Logo',
     'full_multiple_companies_support_help_text' => 'Omezení uživatelů (včetně správců) jsou přiřazená ke společnostem s majetkem společnosti.',
@@ -104,9 +106,11 @@ return array(
     'qr_text'                   => 'Text QR kódu',
     'setting'                   => 'Nastavení',
     'settings'                  => 'Nastavení',
-    'show_alerts_in_menu'       => 'Show alerts in top menu',
+    'show_alerts_in_menu'       => 'Zobrazovat upozornění v horní nabídce',
-    'show_archived_in_list'     => 'Archived Assets',
+    'show_archived_in_list'     => 'Archivovaný majetek',
     'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Název stránky',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack kanál',

resources/lang/cs/admin/statuslabels/table.php

@@ -5,7 +5,7 @@ return array(
     'archived'      	=> 'Archivováno',
     'create'      	=> 'Vytvořit označení stavu',
     'color'      	=> 'Barva grafu',
-    'default_label' => 'Default Label',
+    'default_label' => 'Výchozí štítek',
     'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
     'deployable'      	=> 'Připraveno k nasazení',
     'info'      	=> 'Označení stavu se používá k popisu různých stavů majetku. Můžou být v opravě, ztracení atd. Lze vytvořit nové stavy pro další možné stavy.',

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

@@ -16,7 +16,7 @@ return array(
     'restore_user'		=> 'Klikněte zde pro obnovení.',
     'last_login'        => 'Poslední přihlášení',
     'ldap_config_text'  => 'Nastavení konfigurace LDAP lze nalézt v menu Správce> Nastavení. Vybrané (volitelně) místo bude nastaven pro všechny importované uživatele.',
-    'print_assigned'    => 'Print All Assigned',
+    'print_assigned'    => 'Vypsat všechna přiřazení',
     'software_user'     => 'Software vydaný pro :name',
     'view_user'         => 'Zobraz uživatele',
     'usercsv'           => 'CSV soubor',

resources/lang/cs/button.php

@@ -12,4 +12,5 @@ return array(
     'submit'  	                => 'Odeslat',
     'upload'                    => 'Nahrát',
 	'select_file'				=> 'Vybrat soubor...',
+    'select_files'				=> 'Select Files...',
 );

resources/lang/cs/general.php

@@ -9,6 +9,7 @@
     'activity_report'		=> 'Report aktivity',
     'address'				=> 'Adresa',
     'admin'					=> 'Admin',
+    'administrator'			=> 'Administrator',
     'add_seats'             => 'Přidaná licenční místa',
     'all_assets'			=> 'Všechna zařízení',
     'all'       			=> 'Vše',
@@ -38,9 +39,12 @@
     'checkin'  				=> 'Příjem',
     'checkin_from'  		=> 'Převzít od',
     'checkout'  			=> 'Výdej',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'user_requests_count'   => 'Requests',
     'city'  				=> 'Město',
 	'click_here'			=> 'Klikněte zde',
-    'clear_selection'		=> 'Clear Selection',
+    'clear_selection'		=> 'Vyprázdnit výběr',
     'companies'			    => 'Firmy',
     'company'				=> 'Společnost',
     'component'			    => 'Komponent',
@@ -64,13 +68,14 @@
     'debug_warning'         => 'Varování!',
     'debug_warning_text'    => 'Tato aplikace běží ve výrobním režimu s povoleným laděním. To znamená že citlivá data mohou být přístupná vnějšímu světu. Deaktivujte režim ladění nastavením hodnoty <code>APP_DEBUG</code> v souboru <code>.env</code> na <code>false</code>.',
     'delete'  				=> 'Odstranit',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'Odstraněno',
     'delete_seats'  		=> 'Vymazaná licenční místa',
     'departments'           => 'Oddělení',
     'department'           => 'Oddělení',
     'deployed'				=> 'Vydané',
     'depreciation_report'	=> 'Report zastarání',
-    'details'               => 'Details',
+    'details'               => 'Podrobnosti',
     'download'				=> 'Stáhnout',
     'depreciation'			=> 'Amortizace',
     'editprofile'  			=> 'Upravit profil',
@@ -85,7 +90,7 @@
     'first'					=> 'První',
     'first_name'			=> 'Jméno',
     'first_name_format'		=> 'Jméno (jane@example.com)',
-    'files'                 => 'Files',
+    'files'                 => 'Soubory',
     'file_name'				=> 'Soubor',
     'file_uploads'			=> 'Nahrání souboru',
     'generate'				=> 'Vytvořit',
@@ -176,7 +181,7 @@
     'select_company'    	=> 'Zvolte společnost',
     'select_asset'    		=> 'Zvolte majetek',
     'settings'				=> 'Nastavení',
-    'show_deleted'  		=> 'Show Deleted',
+    'show_deleted'  		=> 'Zobrazit smazané',
     'show_current'  		=> 'Show Current',
     'sign_in'				=> 'Přihlásit se',
     'signature'             => 'Podpis',
@@ -201,6 +206,7 @@
     'unknown_admin'			=> 'Neznámy správce',
     'username_format'		=> 'Formát uživatelského jména',
     'update'                => 'Aktualizace',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Nahráno',
     'user'					=> 'Uživatel',
     'accepted'			    => 'přijato',

resources/lang/cs/mail.php

@@ -22,6 +22,7 @@ return array(
     'Confirm_Asset_Checkin' => 'Potvrďte převzetí majetku.',
     'Confirm_Accessory_Checkin' => 'Potvrďte převzetí příslušenství.',
     'Confirm_accessory_delivery' => 'Potvrďte dodání příslušenství.',
+    'Confirm_license_delivery' => 'Confirm license delivery.',
     'Confirm_asset_delivery' => 'Potvrďte dodání produktu.',
     'Confirm_consumable_delivery' => 'Potvrďte dodání spotřebního zboží.',
     'current_QTY' => 'Aktuální množství',
@@ -54,7 +55,7 @@ return array(
     'requested' => 'Zažádáno:',
     'reset_link' => 'Váš odkaz pro resetování hesla',
     'reset_password' => 'Pro zresetování vašeho hesla klikněte na odkaz:',
-    'serial' => 'Sériové číslo:',
+    'serial' => 'Serial',
     'supplier' => 'Dodavatelé',
     'tag' => 'Značka',
     'test_email' => 'Testovací email od Snipe-IT',
@@ -63,8 +64,8 @@ return array(
     'There_are' => '{1} Tady je|[2,inf] Tady jsou',
     'to_reset' => 'Pro resetování vašeho hesla vyplňte tento formulář:',
     'type' => 'Typ',
-    'user' => 'Uživatel:',
+    'user' => 'User',
-    'username' => 'Uživatelské jméno:',
+    'username' => 'Username',
     'welcome' => 'Vítej uživateli :name',
     'welcome_to' => 'Vítejte na :web!',
     'your_credentials' => 'Vaše pověření Snipe-IT',

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

@@ -28,4 +28,5 @@ return array(
     'create_fieldset'         => 'Nyt Feltsæt',
     'create_field'            => 'Nyt Brugerdefinerede Felt',
     'value_encrypted'      	        => 'Værdien af dette felt er krypteret i databasen. Kun admins vil være i stand til at se den krypteret værdi',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
 );

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

@@ -5,14 +5,13 @@ return array(
     'about_assets_text'            => 'Aktiver er poster sporet af serienummer eller aktiv tag. De har tendens til at være højere værdi elementer, hvor identifikation af en bestemt genstand betyder noget.',
 	'archived'  				=> 'arkiverede',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkoutaktiver til bruger',
+    'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Klonaktiver',
     'deployable'  				=> 'Deployable',
     'deleted'  					=> 'Dette aktiv er blevet slettet. <a href="/hardware/:asset_id/restore">Klik her for at gendanne det</a>.',
     'edit'  					=> 'Rediger aktiv',
-	'filetype_info'				=> 'Tilladte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, txt, zip og rar.',
     'model_deleted'  			=> 'Denne aktivmodel er blevet slettet. Du skal gendanne modellen, før du kan gendanne Asset.<br/> <a href="/hardware/models/:model_id/restore">Klik her for at gendanne model</a>.',
     'requestable'               => 'kan anmodes',
     'requested'				    => 'Anmodet',

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

@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Se modeller',
     'fieldset'                  => 'Feltsæt',
     'no_custom_field'           => 'Ingen brugerdefinerede felter',
-
+    'add_default_values'        => 'Add default values',
 );

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

@@ -4,6 +4,8 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Active Directory domæne',
     'ad_domain_help'			=> 'Dette er nogle gange det samme som dit e-mail-domæne, men ikke altid.',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Dette er en Active Directory-server',
 	'alert_email'				=> 'Send advarsler til',
 	'alerts_enabled'			=> 'Advarsler aktiveret',
@@ -107,6 +109,8 @@ return array(
     'show_alerts_in_menu'       => 'Show alerts in top menu',
     'show_archived_in_list'     => 'Archived Assets',
     'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Side navn',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/da/button.php

@@ -12,4 +12,5 @@ return array(
     'submit'  	                => 'Send',
     'upload'                    => 'Upload',
 	'select_file'				=> 'Vælg fil ...',
+    'select_files'				=> 'Select Files...',
 );

resources/lang/da/general.php

@@ -9,6 +9,7 @@
     'activity_report'		=> 'Aktivitetsrapport',
     'address'				=> 'Addresse',
     'admin'					=> 'Admin',
+    'administrator'			=> 'Administrator',
     'add_seats'             => 'Tilføjede pladser',
     'all_assets'			=> 'Alle aktiver',
     'all'       			=> 'Alle',
@@ -38,6 +39,9 @@
     'checkin'  				=> 'Tjek Ind',
     'checkin_from'  		=> 'Tjek ind fra',
     'checkout'  			=> 'Tjek Ud',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'user_requests_count'   => 'Requests',
     'city'  				=> 'By',
 	'click_here'			=> 'Klik her',
     'clear_selection'		=> 'Clear Selection',
@@ -64,6 +68,7 @@
     'debug_warning'         => 'Advarsel!',
     'debug_warning_text'    => 'Denne applikation kører i produktionstilstand med debugging aktiveret. Dette kan udsætte følsomme data, hvis din ansøgning er tilgængelig for omverdenen. Deaktiver fejlsøgningsmodus ved at indstille værdien <code>APP_DEBUG</code> i din <code>.env</code> fil til <code>false</code>.',
     'delete'  				=> 'Slet',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'Slettet',
     'delete_seats'  		=> 'Slettede pladser',
     'departments'           => 'Afdelinger',
@@ -201,6 +206,7 @@
     'unknown_admin'			=> 'Ukendt Admin',
     'username_format'		=> 'Brugernavn Format',
     'update'                => 'Opdatering',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'uploaded',
     'user'					=> 'Bruger',
     'accepted'			    => 'accepteret',

resources/lang/da/mail.php

@@ -22,6 +22,7 @@ return array(
     'Confirm_Asset_Checkin' => 'Bekræft Asset Checkin.',
     'Confirm_Accessory_Checkin' => 'Bekræft tilbehørskontrol.',
     'Confirm_accessory_delivery' => 'Bekræft levering af tilbehør.',
+    'Confirm_license_delivery' => 'Confirm license delivery.',
     'Confirm_asset_delivery' => 'Bekræft levering af aktiver.',
     'Confirm_consumable_delivery' => 'Bekræft levering af forbrugsstoffer.',
     'current_QTY' => 'Nuværende QTY',
@@ -54,7 +55,7 @@ return array(
     'requested' => 'Anmodede om:',
     'reset_link' => 'Din Password Reset Link',
     'reset_password' => 'Klik her for at nulstille adgangskoden:',
-    'serial' => 'Seriel:',
+    'serial' => 'Serial',
     'supplier' => 'Leverandør',
     'tag' => 'Mærkat',
     'test_email' => 'Test E-mail fra Snipe-IT',
@@ -63,8 +64,8 @@ return array(
     'There_are' => '{1} Der er| [2,Inf] Der er',
     'to_reset' => 'Nulstille din :web-adgangskode, udfylde denne formular:',
     'type' => 'Type',
-    'user' => 'Bruger:',
+    'user' => 'User',
-    'username' => 'Brugernavn:',
+    'username' => 'Username',
     'welcome' => 'Velkommen :navn',
     'welcome_to' => 'Velkommen til :web!',
     'your_credentials' => 'Dine Snipe-IT Legitimationsoplysninger',

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

@@ -28,4 +28,5 @@ return array(
     'create_fieldset'         => 'Neuer Feldsatz',
     'create_field'            => 'Neues benutzerdefiniertes Feld',
     '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'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
 );

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

@@ -5,14 +5,13 @@ return array(
     'about_assets_text'            => 'Assets sind Gegenstände die durch eine Seriennummer oder Bezeichnung identifiziert werden. Meistens sind diese von höherem Wert, wobei es Sinn macht diese spezifisch zu kennzeichnen.',
 	'archived'  				=> 'Archiviert',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Assets an Benutzer herausgeben',
+    'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'Asset zurücknehmen',
     'checkout'  				=> 'Asset herausgeben',
     'clone'  					=> 'Asset duplizieren',
     'deployable'  				=> 'Einsetzbar',
     'deleted'  					=> 'Dieses Asset wurde gelöscht. <a href="/hardware/:asset_id/restore">Zur Wiederherstellung hier klicken</a>.',
     'edit'  					=> 'Asset bearbeiten',
-	'filetype_info'				=> 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, oder rar.',
     'model_deleted'  			=> 'Dieses Asset wurde gelöscht. Sie müssen das Modell Wiederherstellen bevor Sie das Asset Wiederherstellen können <br/><a href="/hardware/models/:model_id/restore">klicken Sie hier um das Modell wiederherzustellen</a>.',
     'requestable'               => 'Anforderbar',
     'requested'				    => 'Angefordert',

resources/lang/de/admin/manufacturers/message.php

@@ -16,8 +16,8 @@ return array(
     ),
 
     'restore' => array(
-        'error'   => 'Manufacturer was not restored, please try again',
+        'error'   => 'Der Hersteller wurde nicht wiederhergestellt. Bitte versuchen Sie es erneut',
-        'success' => 'Manufacturer restored successfully.'
+        'success' => 'Hersteller wurde erfolgreich wiederhergestellt.'
     ),
 
     'delete' => array(

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

@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Modelle anzeigen',
     'fieldset'                  => 'Feldsatz',
     'no_custom_field'           => 'Keine benutzerdefinierten Felder',
-
+    'add_default_values'        => 'Add default values',
 );

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

@@ -4,9 +4,11 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Active Directory Domäne',
     'ad_domain_help'			=> 'Meistens dieselbe wie die E-Mail Domäne.',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Dies ist ein Active Directory Server',
 	'alert_email'				=> 'Alarme senden an',
-	'alerts_enabled'			=> 'Alarme aktiviert',
+	'alerts_enabled'			=> 'E-Mail-Benachrichtigungen aktiviert',
 	'alert_interval'			=> 'Ablauf Alarmschwelle (in Tagen)',
 	'alert_inv_threshold'		=> 'Inventar Alarmschwelle',
 	'asset_ids'					=> 'Asset IDs',
@@ -78,13 +80,13 @@ return array(
     'load_remote_help_text'		=> 'Diese Installation von Snipe-IT kann Skripte von außerhalb laden.',
     '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 User login options',
+    'login_remote_user_text'    => 'Remote Benutzer Login Optionen',
-    'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
+    'login_remote_user_enabled_text' => 'Aktiviere Login mit Remote User Header',
-    'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
+    'login_remote_user_enabled_help' => 'Diese Option aktiviert die Authentifizierung über den REMOTE_USER header gemäss dem "Common Gateway Interface (rfc3875)"',
-    'login_common_disabled_text' => 'Disable other authentication mechanisms',
+    'login_common_disabled_text' => 'Deaktiviere andere Authentifizierungsmethoden',
-    'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
+    'login_common_disabled_help' => 'Diese Option deaktiviert andere Authentifizierungsmethoden. Aktivieren Sie diese Option nur, wenn Sie sich sicher sind, dass REMOTE_USER Login bereits funktioniert',
-    'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
+    'login_remote_user_custom_logout_url_text' => 'Benutzerdefinierte Abmelde-URL',
-    'login_remote_user_custom_logout_url_help' => 'If filled users will get redirected to this URL after the Session of SnipeIT is closed (Logout). This is usefull to close the user sessions of your Authenticationprovider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'Gelistete Benutzer werden nach dem Schließen der Sitzung von SnipeIT zu dieser URL weitergeleitet (Logout). Dies ist nützlich, um die Benutzersitzungen des verwendeten Authentifizierungsmechanismus korrekt zu beenden.',
     'logo'                    	=> 'Logo',
     'full_multiple_companies_support_help_text' => 'Beschränkung von Benutzern (inklusive Administratoren) die einer Firma zugewiesen sind zu den Assets der Firma.',
     'full_multiple_companies_support_text' => 'Volle Mehrmandanten-Unterstützung für Firmen',
@@ -107,14 +109,16 @@ return array(
     'show_alerts_in_menu'       => 'Warnungen im oberen Menü anzeigen',
     'show_archived_in_list'     => 'Archivierte Assets',
     'show_archived_in_list_text'     => 'Zeige archivierte Assets in der "Alle auflisten" Liste',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Seitenname',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Kanal',
     'slack_endpoint'            => 'Slack Endpunkt',
     'slack_integration'         => 'Slack Einstellungen',
     'slack_integration_help'    => 'Die Slackintegration ist optional. Der Endpunkt und kanal werden benötigt, wenn man Slack benutzen will. Um Slack zu konfigurieren muss zuerst <a href=":slack_link" target="_new"> einen eingehenden Webhook</a> in seinem Slackkonto einrichten.',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
+    'slack_integration_help_button'    => 'Sobald Sie Ihre Slack-Informationen gespeichert haben, erscheint eine Test-Schaltfläche.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'slack_test_help'           => 'Testen Sie, ob die Slack-Integration korrekt konfiguriert ist. ZUERST MÜSSEN DIE AKTUALISIERTEN SLACK EINSTELLUNGEN GESPEICHERT WERDEN.',
     'snipe_version'  			=> 'Snipe-IT Version',
     'support_footer'            => 'Fußzeile Support-Link ',
     'support_footer_help'       => 'Geben Sie an, wer die Links zum Snipe-IT Support-Info und Benutzerhandbuch sieht',

resources/lang/de/admin/statuslabels/table.php

@@ -5,8 +5,8 @@ return array(
     'archived'      	=> 'Archiviert',
     'create'      	=> 'Statusbezeichnung erstellen',
     'color'      	=> 'Diagrammfarbe',
-    'default_label' => 'Default Label',
+    'default_label' => 'Standardbezeichnung',
-    'default_label_help' => 'This is used to ensure your most commonly used status labels appear at the top of the select box when creating/editing assets.',
+    'default_label_help' => 'Dies wird verwendet, um sicherzustellen, dass die am häufigsten verwendeten Statusbeschriftungen beim Erstellen / Bearbeiten von Assets oben im Auswahlfeld angezeigt werden.',
     'deployable'      	=> 'Einsetzbar',
     'info'      	=> 'Status Label werden eingesetzt um diverse Stati Ihrer Assets zu beschreiben. Diese können zB. in Reparatur sein, Gestohlen oder Verlohren worden sein. Sie können neue Status Labels für Einsetzbare, Unerledigte und Archivierte Assets erstellen.',
     'name'      	=> 'Statusname',

resources/lang/de/button.php

@@ -12,4 +12,5 @@ return array(
     'submit'  	                => 'Abschicken',
     'upload'                    => 'Hochladen',
 	'select_file'				=> 'Datei auswählen...',
+    'select_files'				=> 'Select Files...',
 );

resources/lang/de/general.php

@@ -9,14 +9,15 @@
     'activity_report'		=> 'Aktivitätsreport',
     'address'				=> 'Adresse',
     'admin'					=> 'Administrator',
+    'administrator'			=> 'Administrator',
     'add_seats'             => 'Lizenzen hinzugefügt',
     'all_assets'			=> 'Alle Assets',
     'all'       			=> 'Alle',
     'archived'              => 'Archiviert',
-    'asset_models'			=> 'Asset Modelle',
+    'asset_models'			=> 'Modellbezeichnungen',
     'asset_model'			=> 'Modell',
     'asset'					=> 'Asset',
-    'asset_report'          => 'Asset Bericht',
+    'asset_report'          => 'Bestandsbericht',
     'asset_tag'				=> 'Kennzeichnung',
     'assets_available'		=> 'verfügbare Assets',
     'audit'				    => 'Prüfung',
@@ -38,6 +39,9 @@
     'checkin'  				=> 'Zurücknehmen',
     'checkin_from'  		=> 'Zurücknehmen von',
     'checkout'  			=> 'Herausgeben',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'user_requests_count'   => 'Requests',
     'city'  				=> 'Stadt',
 	'click_here'			=> 'Hier klicken',
     'clear_selection'		=> 'Auswahl löschen',
@@ -64,6 +68,7 @@
     'debug_warning'         => 'Warnung!',
     'debug_warning_text'    => 'Diese Anwendung läuft im Produktionsmodus mit debugging aktiviert. Dies kann sensible Daten verfügbar machen, wenn Ihre Anwendung öffentlich zugänglich ist. Deaktivieren Sie den Debug-Modus, indem Sie den <code>APP_DEBUG</code>-Wert in der <code>.env</code> Datei auf <code>false</code> setzen.',
     'delete'  				=> 'Löschen',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'Gelöscht',
     'delete_seats'  		=> 'Gelöschte Lizenzen',
     'departments'           => 'Abteilungen',
@@ -81,7 +86,7 @@
     'filastname_format'			=> 'Initial des Vornamen + Nachname (jsmith@example.com)',
     'firstname_lastname_format'	=> 'Vorname Nachname (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'Vorname Nachname (max_mustermann@beispiel.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+    'lastnamefirstinitial_format' =>  'Nachname & Initiale des Vornamens (musterm@beispiel.com)',
     'first'					=> 'Erste',
     'first_name'			=> 'Vorname',
     'first_name_format'		=> 'Vorname (jane@example.com)',
@@ -176,8 +181,8 @@
     'select_company'    	=> 'Firma auswählen',
     'select_asset'    		=> 'Asset auswählen',
     'settings'				=> 'Einstellungen',
-    'show_deleted'  		=> 'Show Deleted',
+    'show_deleted'  		=> 'Gelöschte anzeigen',
-    'show_current'  		=> 'Show Current',
+    'show_current'  		=> 'Aktuelles anzeigen',
     'sign_in'				=> 'Anmelden',
     'signature'             => 'Unterschrift',
     'skin'       			=> 'Skin',
@@ -201,6 +206,7 @@
     'unknown_admin'			=> 'Unbekannter Administrator',
     'username_format'		=> 'Format der Benutzernamen',
     'update'                => 'Aktualisieren',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Hochgeladen',
     'user'					=> 'Benutzer',
     'accepted'			    => 'angenommen',

resources/lang/de/mail.php

@@ -22,6 +22,7 @@ return array(
     'Confirm_Asset_Checkin' => 'Zurücknehmen von Asset bestätigen.',
     'Confirm_Accessory_Checkin' => 'Zurücknehmen von Zubehör bestätigen.',
     'Confirm_accessory_delivery' => 'Zubehör Zustellung bestätigen.',
+    'Confirm_license_delivery' => 'Confirm license delivery.',
     'Confirm_asset_delivery' => 'Gegenstands Lieferung bestätigen.',
     'Confirm_consumable_delivery' => 'Verbrauchsmaterial Lieferung bestätigen.',
     'current_QTY' => 'Aktuelle Menge',
@@ -54,7 +55,7 @@ return array(
     'requested' => 'Angefordert:',
     'reset_link' => 'Ihr Link zum Zurücksetzen des Kennworts',
     'reset_password' => 'Klicken Sie hier, um Ihr Passwort zurückzusetzen:',
-    'serial' => 'Seriennummer:',
+    'serial' => 'Serial',
     'supplier' => 'Lieferant',
     'tag' => 'Kennzeichnung',
     'test_email' => 'Test E-Mail von Snipe-IT',
@@ -63,8 +64,8 @@ return array(
     'There_are' => 'Es existiert {1} | [2, Inf] Es existieren',
     'to_reset' => 'Zum Zurücksetzen Ihres :web Passwortes, füllen Sie bitte dieses Formular aus:',
     'type' => 'Typ',
-    'user' => 'Benutzer:',
+    'user' => 'User',
-    'username' => 'Benutzername:',
+    'username' => 'Username',
     'welcome' => 'Wilkommen, :name',
     'welcome_to' => 'Willkommen bei: Web!',
     'your_credentials' => 'Ihre Snipe-IT Anmeldedaten',

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

@@ -28,4 +28,5 @@ return array(
     'create_fieldset'         => 'Νέο σύνολο πεδίων',
     'create_field'            => 'Νέο προσαρμοσμένο πεδίο',
     'value_encrypted'      	        => 'Η τιμή αυτού του πεδίου είναι κρυπτογραφημένη στη βάση δεδομένων. Μόνο οι διαχειριστές θα μπορούν να δουν την αποκρυπτογραφημένη τιμή',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
 );

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

@@ -5,14 +5,13 @@ return array(
     'about_assets_text'            => 'Τα στοιχεία ενεργητικού είναι στοιχεία που παρακολουθούνται με αύξοντα αριθμό ή ετικέτα στοιχείων. Έχουν την τάση να είναι στοιχεία υψηλότερης αξίας, όπου ο εντοπισμός ενός συγκεκριμένου στοιχείου έχει σημασία.',
 	'archived'  				=> 'Αρχειοθετημένα',
     'asset'  					=> 'Πάγιο',
-    'bulk_checkout'             => 'Checkout παγίων σε χρήστη',
+    'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Ταμείο ελέγχου',
     'clone'  					=> 'Κλώνος χρήστη',
     'deployable'  				=> 'Προς ανάπτυξη',
     'deleted'  					=> 'Αυτό το στοιχείο έχει διαγραφεί. <a href="/hardware/:asset_id/restore">Κάντε κλικ εδώ για να την επαναφέρετε</a>.',
     'edit'  					=> 'Επεξεργασία παγίων',
-	'filetype_info'				=> 'Επιτρεπόμενοι τύποι αρχείων είναι png, gif, jpg, jpeg, doc, docx, pdf, txt, zip και rar.',
     'model_deleted'  			=> 'Αυτό το μοντέλο περιουσιακών στοιχείων έχει διαγραφεί. Πρέπει να επαναφέρετε το μοντέλο για να μπορέσετε να επαναφέρετε το Asset.<br/> <a href="/hardware/models/:model_id/restore">Κάντε κλικ εδώ για να επαναφέρετε το μοντέλο</a>.',
     'requestable'               => 'Επαναληπτικό',
     'requested'				    => 'Ζητήθηκαν',

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

@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'Προβολή μοντέλων',
     'fieldset'                  => 'Σύνολο πεδίων',
     'no_custom_field'           => 'Δεν υπάρχουν προσαρμοσμένα πεδία',
-
+    'add_default_values'        => 'Add default values',
 );

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

@@ -4,6 +4,8 @@ return array(
     'ad'				        => 'Υπηρεσία καταλόγου Active Directory',
     'ad_domain'				    => 'Τομέα Active Directory',
     'ad_domain_help'			=> 'Αυτό είναι μερικές φορές το ίδιο με τον τομέα ηλεκτρονικού ταχυδρομείου σας, αλλά όχι πάντα.',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'Αυτός είναι ένας διακομιστής υπηρεσίας καταλόγου Active Directory',
 	'alert_email'				=> 'Αποστολή ειδοποιήσεων προς',
 	'alerts_enabled'			=> 'Ειδοποιήσεις ενεργοποιημένες',
@@ -107,6 +109,8 @@ return array(
     'show_alerts_in_menu'       => 'Show alerts in top menu',
     'show_archived_in_list'     => 'Archived Assets',
     'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Όνομα ιστότοπου',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Χωρίς κανάλι',

resources/lang/el/button.php

@@ -12,4 +12,5 @@ return array(
     'submit'  	                => 'Υποβολή',
     'upload'                    => 'Μεταφόρτωση',
 	'select_file'				=> 'Επιλέξτε Αρχείο ...',
+    'select_files'				=> 'Select Files...',
 );

resources/lang/el/general.php

@@ -9,6 +9,7 @@
     'activity_report'		=> 'Έκθεση Δραστηριότητας',
     'address'				=> 'Διεύθυνση',
     'admin'					=> 'Διαχειριστής',
+    'administrator'			=> 'Administrator',
     'add_seats'             => 'Προστέθηκαν θέσεις',
     'all_assets'			=> 'Όλα τα περουσιακά στοιχεία',
     'all'       			=> 'Ολα',
@@ -38,6 +39,9 @@
     'checkin'  				=> 'Μεταβίβαση ελέγχου',
     'checkin_from'  		=> 'Μεταβίβαση ελέγχου από',
     'checkout'  			=> 'Ολοκλήρωση αγοράς',
+    'checkouts_count'       => 'Checkouts',
+    'checkins_count'        => 'Checkins',
+    'user_requests_count'   => 'Requests',
     'city'  				=> 'Πόλη',
 	'click_here'			=> 'Κάντε κλικ ΕΔΩ',
     'clear_selection'		=> 'Clear Selection',
@@ -64,6 +68,7 @@
     'debug_warning'         => 'Προσοχή!',
     'debug_warning_text'    => 'Αυτή η εφαρμογή εκτελείται σε λειτουργία παραγωγής με ενεργοποιημένο τον εντοπισμό σφαλμάτων. Αυτό μπορεί να εκθέσει τα ευαίσθητα δεδομένα, εάν η εφαρμογή σας είναι προσβάσιμη στον έξω κόσμο. Απενεργοποιήσετε την κατάσταση λειτουργίας εντοπισμού σφαλμάτων, ορίζοντας την τιμή <code>APP_DEBUG</code> στο αρχείο <code>.env</code> για να <code>false</code>.',
     'delete'  				=> 'Διαγραφή',
+    'delete_confirm'  		=> 'Are you sure you wish to delete :item?',
     'deleted'  				=> 'Διαγράφηκε',
     'delete_seats'  		=> 'Διαγραμμένα καθίσματα',
     'departments'           => 'Τμήματα',
@@ -201,6 +206,7 @@
     'unknown_admin'			=> 'Άγνωστο Admin',
     'username_format'		=> 'Τύπος ονόματος',
     'update'                => 'Ενημέρωση',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Ανέβηκε',
     'user'					=> 'Χρήστης',
     'accepted'			    => 'αποδεκτή',

resources/lang/el/mail.php

@@ -22,6 +22,7 @@ return array(
     'Confirm_Asset_Checkin' => 'Επιβεβαιώσετε τη μεταβίβαση παγίου.',
     'Confirm_Accessory_Checkin' => 'Επιβεβαίωση επιβεβαίωσης του εξαρτήματος.',
     'Confirm_accessory_delivery' => 'Επιβεβαιώστε την παράδοση των εξαρτημάτων.',
+    'Confirm_license_delivery' => 'Confirm license delivery.',
     'Confirm_asset_delivery' => 'Επιβεβαίωση παράδοσης στοιχείου.',
     'Confirm_consumable_delivery' => 'Επιβεβαιώστε την κατανάλωση.',
     'current_QTY' => 'Τρέχουσα ποσότητα',
@@ -54,7 +55,7 @@ return array(
     'requested' => 'Ζητήθηκαν:',
     'reset_link' => 'Αποστολή συνδέσμου ακύρωσης κωδικού',
     'reset_password' => 'Κάντε κλικ εδώ για να επαναφέρετε τον κωδικό πρόσβασής σας:',
-    'serial' => 'Σειριακός:',
+    'serial' => 'Serial',
     'supplier' => 'Προμηθευτές',
     'tag' => 'Ετικέτα',
     'test_email' => 'Έλεγχος email για Snipe-IT',
@@ -63,8 +64,8 @@ return array(
     'There_are' => '{1} Υπάρχει | [2, Inf] Υπάρχουν',
     'to_reset' => 'Για να επαναφέρετε τον κωδικό πρόσβασης στον ιστό, συμπληρώστε αυτήν τη φόρμα:',
     'type' => 'Τύπος',
-    'user' => 'Χρήστης:',
+    'user' => 'User',
-    'username' => 'Όνομα χρήστη:',
+    'username' => 'Username',
     'welcome' => 'Καλώς ήρθατε, %name',
     'welcome_to' => 'Καλώς ήλθατε στο!',
     'your_credentials' => 'Τα διαπιστευτήρια σας Snipe-IT',

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

@@ -28,4 +28,5 @@ return array(
     'create_fieldset'         => 'New Fieldset',
     'create_field'            => 'New Custom Field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
 );

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

@@ -5,14 +5,13 @@ return array(
     'about_assets_text'            => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
 	'archived'  				=> 'Archived',
     'asset'  					=> 'Asset',
-    'bulk_checkout'             => 'Checkout Assets to User',
+    'bulk_checkout'             => 'Checkout Assets',
     'checkin'  					=> 'Checkin Asset',
     'checkout'  				=> 'Checkout Asset',
     'clone'  					=> 'Clone Asset',
     'deployable'  				=> 'Deployable',
     'deleted'  					=> 'This asset has been deleted. <a href="/hardware/:asset_id/restore">Click here to restore it</a>.',
     'edit'  					=> 'Edit Asset',
-	'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
     'model_deleted'  			=> 'This Assets model has been deleted. You must restore the model before you can restore the Asset.<br/> <a href="/hardware/models/:model_id/restore">Click here to restore the model</a>.',
     'requestable'               => 'Requestable',
     'requested'				    => 'Requested',

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

@@ -14,5 +14,5 @@ return array(
     'view_models'               => 'View Models',
     'fieldset'                  => 'Fieldset',
     'no_custom_field'           => 'No custom fields',
-
+    'add_default_values'        => 'Add default values',
 );

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

@@ -4,6 +4,8 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Active Directory domain',
     'ad_domain_help'			=> 'This is sometimes the same as your email domain, but not always.',
+    'admin_cc_email'            => 'CC Email',
+    'admin_cc_email_help'       => 'If you would like to send a copy of checkin/checkout emails that are sent to users to an additional email account, enter it here. Otherwise leave this field blank.',
     'is_ad'				        => 'This is an Active Directory server',
 	'alert_email'				=> 'Send alerts to',
 	'alerts_enabled'			=> 'Alerts Enabled',
@@ -41,7 +43,7 @@ return array(
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'footer_text'               => 'Additional Footer Text ',
-    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
+    'footer_text_help'          => 'This text will appear in the right-side footer. Links are allowed using <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavoured markdown</a>. Line breaks, headers, images, etc may result in unpredictable results.',
     'general_settings'			=> 'General Settings',
 	'generate_backup'			=> 'Generate Backup',
     'header_color'              => 'Header Color',
@@ -84,7 +86,7 @@ return array(
     'login_common_disabled_text' => 'Disable other authentication mechanisms',
     'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
     'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
-    'login_remote_user_custom_logout_url_help' => 'If filled users will get redirected to this URL after the Session of SnipeIT is closed (Logout). This is usefull to close the user sessions of your Authenticationprovider correctly.',
+    'login_remote_user_custom_logout_url_help' => 'If filled users will get redirected to this URL after the Session of SnipeIT is closed (Logout). This is useful to close the user sessions of your Authentication provider correctly.',
     'logo'                    	=> 'Logo',
     'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
     'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
@@ -107,6 +109,8 @@ return array(
     'show_alerts_in_menu'       => 'Show alerts in top menu',
     'show_archived_in_list'     => 'Archived Assets',
     'show_archived_in_list_text'     => 'Show archived assets in the "all assets" listing',
+    'show_images_in_email'     => 'Show images in emails',
+    'show_images_in_email_help'   => 'Uncheck this box if your Snipe-IT installation is behind a VPN or closed network and users outside the network will not be able to load images served from this installation in their emails.',
     'site_name'                 => 'Site Name',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',

resources/lang/en-GB/button.php

@@ -12,4 +12,5 @@ return array(
     'submit'  	                => 'Submit',
     'upload'                    => 'Upload',
 	'select_file'				=> 'Select File...',
+    'select_files'				=> 'Select Files...',
 );