Updated translations

Modify Snipe-IT v5 AD handling to use the same ldap_host as for LDAP

app/Console/Commands/ImportLocations.php

@@ -120,7 +120,7 @@ class ImportLocations extends Command
             if (array_key_exists('Country', $row)) {
                 $location->country = trim($row['Country']);
             }
-            if (array_key_exists('Country', $row)) {
+            if (array_key_exists('OU', $row)) {
                 $location->ldap_ou = trim($row['OU']);
             }
 

app/Console/Commands/LdapSync.php

@@ -197,14 +197,14 @@ class LdapSync extends Command
             } else {
                 $errors = '';
                 foreach ($user->getErrors()->getMessages() as  $error) {
-                    $errors .= $error[0];
+                    $errors .= implode(", ",$error);
                 }
-                $summary['note']   = $userMsg.' was not imported. REASON: '.$errors;
+                $summary['note']   = $snipeUser->getDN().' was not imported. REASON: '.$errors;
                 $summary['status'] = 'ERROR';
             }
         }
 
-        $summary['note'] = ($user->getOriginal('username') ? 'UPDATED' : 'CREATED');
+        // $summary['note'] = ($user->getOriginal('username') ? 'UPDATED' : 'CREATED'); // this seems, kinda, like, superfluous, relative to the $summary['note'] thing above, yeah?
         $this->summary->push($summary);
     }
 
@@ -265,7 +265,7 @@ class LdapSync extends Command
                 $this->info($msg);
             }
 
-            $this->mappedLocations = $locations->pluck('ldap_ou', 'id');
+            $this->mappedLocations = $locations->pluck('ldap_ou', 'id'); // TODO: this seems ok-ish, but the key-> value is going location_id -> OU name, and the primary action here is the opposite of that - going from OU's to location ID's.
         }
     }
 

app/Console/Commands/ResetDemoSettings.php

@@ -51,9 +51,9 @@ class ResetDemoSettings extends Command
         $settings->header_color = null;
         $settings->barcode_type = 'QRCODE';
         $settings->default_currency = 'USD';
-        $settings->brand = 3;
+        $settings->brand = 2;
         $settings->ldap_enabled = 0;
-        $settings->full_multiple_companies_support = 1;
+        $settings->full_multiple_companies_support = 0;
         $settings->alt_barcode = 'C128';
         $settings->skin = '';
         $settings->email_domain = 'snipeitapp.com';
@@ -65,6 +65,18 @@ class ResetDemoSettings extends Command
         $settings->locale = 'en';
         $settings->version_footer = 'on';
         $settings->support_footer = 'on';
+        $settings->saml_enabled = '0';
+        $settings->saml_sp_entitiyid = '0';
+        $settings->saml_sp_acs_url = null;
+        $settings->saml_sp_sls_url = null;
+        $settings->saml_sp_x509cert = null;
+        $settings->saml_idp_metadata = null;
+        $settings->saml_attr_mapping_username = null;
+        $settings->saml_forcelogin = '0';
+        $settings->saml_slo = null;
+        $settings->saml_custom_settings = null;
+
+
         $settings->save();
 
         if ($user = User::where('username', '=', 'admin')->first()) {

app/Http/Controllers/Api/ConsumablesController.php

@@ -9,8 +9,7 @@ use App\Http\Transformers\SelectlistTransformer;
 use App\Models\Company;
 use App\Models\Consumable;
 use App\Models\User;
-use App\Http\Transformers\ConsumablesTransformer;
-use App\Helpers\Helper;
+use Illuminate\Http\Request;
 
 class ConsumablesController extends Controller
 {

app/Http/Controllers/Api/SettingsController.php

@@ -6,13 +6,15 @@ use App\Http\Controllers\Controller;
 use App\Http\Transformers\LoginAttemptsTransformer;
 use App\Models\Setting;
 use App\Notifications\MailTest;
-use App\Notifications\SlackTest;
 use App\Services\LdapAd;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\Response;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Notification;
+use GuzzleHttp\Client;
+use Illuminate\Support\Facades\Storage;
 
 class SettingsController extends Controller
 {
@@ -75,6 +77,7 @@ class SettingsController extends Controller
         // Get a sample of 10 users so user can verify the data is correct
         try {
             Log::info('Testing LDAP sync');
+            error_reporting(E_ALL & ~E_DEPRECATED); // workaround for php7.4, which deprecates ldap_control_paged_result
             $users = $ldap->testUserImportSync();
             $message['user_sync']  = [
                 'users' => $users
@@ -90,24 +93,33 @@ class SettingsController extends Controller
         return response()->json($message, 200);
     }
 
-    public function slacktest()
+    public function slacktest(Request $request)
     {
 
-        if ($settings = Setting::getSettings()->slack_channel=='') {
-            \Log::debug('Slack is not enabled. Cannot test.');
-            return response()->json(['message' => 'Slack is not enabled, cannot test.'], 400);
-        }
+        $slack = new Client([
+            'base_url' => e($request->input('slack_endpoint')),
+            'defaults' => [
+                'exceptions' => false
+            ]
+        ]);
 
-        \Log::debug('Preparing to test slack connection');
+
+        $payload = json_encode(
+            [
+                'channel'    => e($request->input('slack_channel')),
+                'text'       => trans('general.slack_test_msg'),
+                'username'    => e($request->input('slack_botname')),
+                'icon_emoji' => ':heart:'
+            ]);
 
         try {
-            Notification::send($settings = Setting::getSettings(), new SlackTest());
+            $slack->post($request->input('slack_endpoint'),['body' => $payload]);
             return response()->json(['message' => 'Success'], 200);
         } catch (\Exception $e) {
-            \Log::debug('Slack connection failed');
-            return response()->json(['message' => $e->getMessage()], 400);
+            return response()->json(['message' => 'Oops! Please check the channel name and webhook endpoint URL. Slack responded with: '.$e->getMessage()], 400);
         }
 
+        return response()->json(['message' => 'Something went wrong :( '], 400);
 
     }
 
@@ -133,6 +145,51 @@ class SettingsController extends Controller
 
     }
 
+
+    /**
+     * Delete server-cached barcodes
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v5.0.0]
+     * @return Response
+     */
+    public function purgeBarcodes()
+    {
+
+        $file_count = 0;
+        $files = Storage::disk('public')->files('barcodes');
+
+        foreach ($files as $file) { // iterate files
+
+            $file_parts = explode(".", $file);
+            $extension = end($file_parts);
+            \Log::debug($extension);
+
+            // Only generated barcodes would have a .png file extension
+            if ($extension =='png') {
+
+                \Log::debug('Deleting: '.$file);
+
+
+                try  {
+                    Storage::disk('public')->delete($file);
+                    \Log::debug('Deleting: '.$file);
+                    $file_count++;
+                } catch (\Exception $e) {
+                    \Log::debug($e);
+                }
+            }
+
+        }
+
+        return response()->json(['message' => 'Deleted '.$file_count.' barcodes'], 200);
+
+    }
+
+
+
+
+
     /**
      * Get a list of login attempts
      *

app/Http/Controllers/Assets/AssetsController.php

@@ -565,7 +565,7 @@ class AssetsController extends Controller
         if (!ini_get("auto_detect_line_endings")) {
             ini_set("auto_detect_line_endings", '1');
         }
-        $csv = Reader::createFromPath(Input::file('user_import_csv'));
+        $csv = Reader::createFromPath($request->file('user_import_csv'));
         $csv->setHeaderOffset(0);
         $results = $csv->getRecords();
         $item = array();

app/Http/Controllers/SettingsController.php

@@ -186,7 +186,7 @@ class SettingsController extends Controller
             Auth::login($user, true);
             $settings->save();
 
-            if ('1' == Input::get('email_creds')) {
+            if ($request->input('email_creds') == '1') {
                 $data               = [];
                 $data['email']      = $user->email;
                 $data['username']   = $user->username;
@@ -347,7 +347,7 @@ class SettingsController extends Controller
 
         $setting->depreciation_method = $request->input('depreciation_method');
 
-        if ('' != Input::get('per_page')) {
+        if ($request->input('per_page') != '') {
             $setting->per_page = $request->input('per_page');
         } else {
             $setting->per_page = 200;
@@ -916,28 +916,32 @@ class SettingsController extends Controller
             return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
         }
 
-        $setting->ldap_enabled            = $request->input('ldap_enabled', '0');
-        $setting->ldap_server             = $request->input('ldap_server');
-        $setting->ldap_server_cert_ignore = $request->input('ldap_server_cert_ignore', false);
-        $setting->ldap_uname              = $request->input('ldap_uname');
-        if ($request->input('ldap_pword') !== '') {
-            $setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword'));
+        if (!config('app.lock_passwords')===true) {
+            $setting->ldap_enabled            = $request->input('ldap_enabled', '0');
+            $setting->ldap_server             = $request->input('ldap_server');
+            $setting->ldap_server_cert_ignore = $request->input('ldap_server_cert_ignore', false);
+            $setting->ldap_uname              = $request->input('ldap_uname');
+            if ($request->input('ldap_pword') !== '') {
+                $setting->ldap_pword = Crypt::encrypt($request->input('ldap_pword'));
+            }
+            $setting->ldap_basedn            = $request->input('ldap_basedn');
+            $setting->ldap_filter            = $request->input('ldap_filter');
+            $setting->ldap_username_field    = $request->input('ldap_username_field');
+            $setting->ldap_lname_field       = $request->input('ldap_lname_field');
+            $setting->ldap_fname_field       = $request->input('ldap_fname_field');
+            $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
+            $setting->ldap_version           = $request->input('ldap_version');
+            $setting->ldap_active_flag       = $request->input('ldap_active_flag');
+            $setting->ldap_emp_num           = $request->input('ldap_emp_num');
+            $setting->ldap_email             = $request->input('ldap_email');
+            $setting->ad_domain              = $request->input('ad_domain');
+            $setting->is_ad                  = $request->input('is_ad', '0');
+            $setting->ad_append_domain       = $request->input('ad_append_domain', '0');
+            $setting->ldap_tls               = $request->input('ldap_tls', '0');
+            $setting->ldap_pw_sync           = $request->input('ldap_pw_sync', '0');
+            $setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url');
+
         }
-        $setting->ldap_basedn            = $request->input('ldap_basedn');
-        $setting->ldap_filter            = $request->input('ldap_filter');
-        $setting->ldap_username_field    = $request->input('ldap_username_field');
-        $setting->ldap_lname_field       = $request->input('ldap_lname_field');
-        $setting->ldap_fname_field       = $request->input('ldap_fname_field');
-        $setting->ldap_auth_filter_query = $request->input('ldap_auth_filter_query');
-        $setting->ldap_version           = $request->input('ldap_version');
-        $setting->ldap_active_flag       = $request->input('ldap_active_flag');
-        $setting->ldap_emp_num           = $request->input('ldap_emp_num');
-        $setting->ldap_email             = $request->input('ldap_email');
-        $setting->ad_domain              = $request->input('ad_domain');
-        $setting->is_ad                  = $request->input('is_ad', '0');
-        $setting->ldap_tls               = $request->input('ldap_tls', '0');
-        $setting->ldap_pw_sync           = $request->input('ldap_pw_sync', '0');
-        $setting->custom_forgot_pass_url = $request->input('custom_forgot_pass_url');
 
         if ($setting->save()) {
             return redirect()->route('settings.ldap.index')
@@ -1146,10 +1150,10 @@ class SettingsController extends Controller
      *
      * @return View
      */
-    public function postPurge()
+    public function postPurge(Request $request)
     {
         if (! config('app.lock_passwords')) {
-            if ('DELETE' == Input::get('confirm_purge')) {
+            if ('DELETE' == $request->input('confirm_purge')) {
                 // Run a backup immediately before processing
                 Artisan::call('backup:run');
                 Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);

app/Http/Controllers/Users/BulkUsersController.php

@@ -42,7 +42,8 @@ class BulkUsersController extends Controller
                     ->with('groups', Group::pluck('name', 'id'));
 
             } elseif ($request->input('bulk_actions') == 'delete') {
-                return view('users/confirm-bulk-delete', compact('users',  Helper::statusLabelList()));
+                return view('users/confirm-bulk-delete')->with('users', $users)->with('statuslabel_list',  Helper::statusLabelList());
+
 
             } elseif ($request->input('bulk_actions') == 'bulkpasswordreset') {
                 foreach ($users as $user) {

app/Http/Transformers/CategoriesTransformer.php

@@ -28,6 +28,7 @@ class CategoriesTransformer
                 'name' => e($category->name),
                 'image' =>   ($category->image) ? Storage::disk('public')->url('categories/'.e($category->image)) : null,
                 'category_type' => ucwords(e($category->category_type)),
+                'has_eula' => ($category->getEula() ? true : false),
                 'eula' => ($category->getEula()),
                 'checkin_email' => ($category->checkin_email =='1'),
                 'require_acceptance' => ($category->require_acceptance == '1'),

app/Http/Transformers/LicensesTransformer.php

@@ -36,6 +36,7 @@ class LicensesTransformer
             'free_seats_count' => (int) $license->free_seats_count,
             'license_name' =>  e($license->license_name),
             'license_email' => e($license->license_email),
+            'reassignable' => ($license->reassignable == 1) ? true : false,
             'maintained' => ($license->maintained == 1) ? true : false,
             'supplier' =>  ($license->supplier) ? ['id' => (int)  $license->supplier->id,'name'=> e($license->supplier->name)] : null,
             'category' =>  ($license->category) ? ['id' => (int)  $license->category->id,'name'=> e($license->category->name)] : null,

app/Listeners/CheckoutableListener.php

@@ -57,22 +57,32 @@ class CheckoutableListener
      * Notify the user about the checked in checkoutable
      */    
     public function onCheckedIn($event) {
+
+        \Log::debug('checkin fired');
+
         /**
          * When the item wasn't checked out to a user, we can't send notifications
          */
         if(!$event->checkedOutTo instanceof User) {
+            \Log::debug('checked out to not a user');
             return;
         }
 
         /**
          * Send the appropriate notification
          */
+
+
+        \Log::debug('checked out to a user');
         if(!$event->checkedOutTo->locale){
+            \Log::debug('Use default settings locale');
             Notification::locale(Setting::getSettings()->locale)->send(
                 $this->getNotifiables($event), 
                 $this->getCheckinNotification($event)
             );
         } else {
+            \Log::debug('Use user locale? I do not think this works as expected yet');
+            // \Log::debug(print_r($this->getNotifiables($event), true));
             Notification::send(
                 $this->getNotifiables($event), 
                 $this->getCheckinNotification($event)
@@ -130,7 +140,9 @@ class CheckoutableListener
      */
     private function getCheckinNotification($event) {
 
-        $model = get_class($event->checkoutable);
+        // $model = get_class($event->checkoutable);
+
+
 
         $notificationClass = null;
 
@@ -145,7 +157,8 @@ class CheckoutableListener
                 $notificationClass = CheckinLicenseSeatNotification::class;
                 break;
         }
- 
+
+        \Log::debug('Notification class: '.$notificationClass);
         return new $notificationClass($event->checkoutable, $event->checkedOutTo, $event->checkedInBy, $event->note);  
     }
 

app/Models/Loggable.php

@@ -4,6 +4,7 @@ namespace App\Models;
 
 use App\Notifications\AuditNotification;
 use Illuminate\Support\Facades\Auth;
+use App\Models\Setting;
 
 trait Loggable
 {
@@ -90,6 +91,7 @@ trait Loggable
      */
     public function logCheckin($target, $note, $action_date = null)
     {
+        $settings = Setting::getSettings();
         $log = new Actionlog;
         $log->target_type = get_class($target);
         $log->target_id = $target->id;
@@ -120,38 +122,38 @@ trait Loggable
         
         $log->logaction('checkin from');
 
-        $params = [
-            'target' => $target,
-            'item' => $log->item,
-            'admin' => $log->user,
-            'note' => $note,
-            'target_type' => $log->target_type,
-            'settings' => $settings,
-        ];
-
-
-        $checkinClass = null;
-
-        if (method_exists($target, 'notify')) {
-            try {
-                $target->notify(new static::$checkinClass($params));
-            } catch (\Exception $e) {
-                \Log::debug($e);
-            }
-            
-        }
-
-        // Send to the admin, if settings dictate
-        $recipient = new \App\Models\Recipients\AdminRecipient();
-
-        if (($settings->admin_cc_email!='') && (static::$checkinClass!='')) {
-            try {
-                $recipient->notify(new static::$checkinClass($params));
-            } catch (\Exception $e) {
-                \Log::debug($e);
-            }
-
-        }
+//        $params = [
+//            'target' => $target,
+//            'item' => $log->item,
+//            'admin' => $log->user,
+//            'note' => $note,
+//            'target_type' => $log->target_type,
+//            'settings' => $settings,
+//        ];
+//
+//
+//        $checkinClass = null;
+//
+//        if (method_exists($target, 'notify')) {
+//            try {
+//                $target->notify(new static::$checkinClass($params));
+//            } catch (\Exception $e) {
+//                \Log::debug($e);
+//            }
+//
+//        }
+//
+//        // Send to the admin, if settings dictate
+//        $recipient = new \App\Models\Recipients\AdminRecipient();
+//
+//        if (($settings->admin_cc_email!='') && (static::$checkinClass!='')) {
+//            try {
+//                $recipient->notify(new static::$checkinClass($params));
+//            } catch (\Exception $e) {
+//                \Log::debug($e);
+//            }
+//
+//        }
 
         return $log;
     }

app/Notifications/CheckinAccessoryNotification.php

@@ -26,6 +26,7 @@ class CheckinAccessoryNotification extends Notification
         $this->admin    = $checkedInby;
         $this->note     = $note;
         $this->settings = Setting::getSettings();
+        \Log::debug('Constructor for notification fired');
     }
 
     /**
@@ -35,23 +36,63 @@ class CheckinAccessoryNotification extends Notification
      */
     public function via()
     {
-
+        \Log::debug('via called');
         $notifyBy = [];
 
         if (Setting::getSettings()->slack_endpoint) {
             $notifyBy[] = 'slack';
         }
 
-        /**
-         * Only send checkin notifications to users if the category 
-         * has the corresponding checkbox checked. 
-         */
-        if ($this->item->checkin_email() && $this->target instanceof User && $this->target->email != '')
-        {
-            \Log::debug('use email');
-            $notifyBy[] = 'mail';
+        if (Setting::getSettings()->slack_endpoint!='') {
+            $notifyBy[] = 'slack';
         }
 
+
+        /**
+         * Only send notifications to users that have email addresses
+         */
+        if ($this->target instanceof User && $this->target->email != '') {
+
+            \Log::debug('The target is a user');
+
+            /**
+             * Send an email if the asset requires acceptance,
+             * so the user can accept or decline the asset
+             */
+            if (($this->item->requireAcceptance()) || ($this->item->getEula()) || ($this->item->checkin_email())) {
+                $notifyBy[] = 'mail';
+            }
+
+
+
+
+
+            /**
+             * Send an email if the asset requires acceptance,
+             * so the user can accept or decline the asset
+             */
+            if ($this->item->requireAcceptance()) {
+               \Log::debug('This accessory requires acceptance');
+            }
+
+            /**
+             * Send an email if the item has a EULA, since the user should always receive it
+             */
+            if ($this->item->getEula()) {
+                \Log::debug('This accessory has a EULA');
+            }
+
+            /**
+             * Send an email if an email should be sent at checkin/checkout
+             */
+            if ($this->item->checkin_email()) {
+                \Log::debug('This accessory has a checkin_email()');
+            }
+
+        }
+
+        \Log::debug('checkin_email on this category is '.$this->item->checkin_email());
+
         return $notifyBy;
     }
 
@@ -86,6 +127,7 @@ class CheckinAccessoryNotification extends Notification
      */
     public function toMail()
     {
+        \Log::debug('to email called');
         return (new MailMessage)->markdown('notifications.markdown.checkin-accessory',
             [
                 'item'          => $this->item,

app/Notifications/SlackTest.php

@@ -1,51 +0,0 @@
-<?php
-
-namespace App\Notifications;
-
-use App\Models\Setting;
-use Illuminate\Bus\Queueable;
-use Illuminate\Notifications\Messages\SlackMessage;
-use Illuminate\Notifications\Notification;
-
-class SlackTest extends Notification
-{
-    use Queueable;
-
-    /**
-     * Create a new notification instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Get the notification's delivery channels.
-     *
-     * @param  mixed  $notifiable
-     * @return array
-     */
-    public function via($notifiable)
-    {
-        return ['slack'];
-    }
-
-    /**
-     * Get the Slack representation of the notification.
-     *
-     * @param  mixed  $notifiable
-     * @return SlackMessage
-     */
-    public function toSlack()
-    {
-        $settings = Setting::getSettings();
-        return (new SlackMessage)
-            ->from($settings->slack_botname, ':heart:')
-            ->to($settings->slack_channel)
-            ->image('https://snipeitapp.com/favicon.ico')
-            ->content('Oh hai! Looks like your Slack integration with Snipe-IT is working!');
-    }
-
-}

app/Presenters/CategoryPresenter.php

@@ -50,12 +50,20 @@ class CategoryPresenter extends Presenter
                 "title" => trans('general.qty'),
                 "visible" => true
             ],[
-                "field" => "eula",
+                "field" => "has_eula",
                 "searchable" => false,
                 "sortable" => false,
                 "title" => trans('admin/categories/table.eula_text'),
                 "visible" => false,
                 "formatter" => 'trueFalseFormatter',
+            ],[
+                "field" => "checkin_email",
+                "searchable" => false,
+                "sortable" => true,
+                "class" => 'css-envelope',
+                "title" => 'Send Email',
+                "visible" => true,
+                "formatter" => 'trueFalseFormatter',
             ],[
                 "field" => "require_acceptance",
                 "searchable" => false,

app/Presenters/CompanyPresenter.php

@@ -82,12 +82,14 @@ class CompanyPresenter extends Presenter
                 "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.updated_at'),
+                "formatter" => 'createdAtFormatter',
             ],[
                 "field" => "created_at",
                 "searchable" => false,
                 "sortable" => true,
                 "visible" => false,
                 "title" => trans('general.created_at'),
+                "formatter" => 'createdAtFormatter',
             ],[
                 "field" => "actions",
                 "searchable" => false,

app/Presenters/LicensePresenter.php

@@ -98,6 +98,21 @@ class LicensePresenter extends Presenter
                 "title" => trans('general.purchase_date'),
                 'formatter' => 'dateDisplayFormatter'
             ], [
+                "field" => "maintained",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('admin/licenses/form.maintained'),
+                "formatter" => "trueFalseFormatter"
+            ], [
+                "field" => "reassignable",
+                "searchable" => false,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('admin/licenses/form.reassignable'),
+                "formatter" => "trueFalseFormatter"
+            ],
+            [
                 "field" => "purchase_cost",
                 "searchable" => true,
                 "sortable" => true,

app/Services/LdapAd.php

@@ -57,7 +57,7 @@ class LdapAd extends LdapAdConfiguration
     public function init()
     {
         // Already initialized
-        if($this->ldap) {
+        if ($this->ldap) {
             return true;
         }
 
@@ -286,13 +286,15 @@ class LdapAd extends LdapAdConfiguration
         // Check to see if the user is in a mapped location
         if ($mappedLocations) {
             $location = $mappedLocations->filter(function ($value, $key) use ($user) {
-                if ($user->inOu($value)) {
-                    return $key;
+                //if ($user->inOu($value)) { // <----- *THIS* seems not to be working, and it seems more 'intelligent' - but it's literally just a strpos() call, and it doesn't work quite right against plain strings
+                $user_ou = substr($user->getDn(), -strlen($value)); // get the LAST chars of the user's DN, the count of those chars being the length of the thing we're checking against
+                if(strcasecmp($user_ou, $value) === 0) { // case *IN*sensitive comparision - some people say OU=blah, some say ou=blah. returns 0 when strings are identical (which is a little odd, yeah)
+                    return $key; // WARNING: we are doing a 'filter' - not a regular for-loop. So the answer(s) get "return"ed into the $location array
                 }
             });
 
             if ($location->count() > 0) {
-                $locationId = $location->keys()->first();
+                $locationId = $location->keys()->first(); // from the returned $location array from the ->filter() method above, we return the first match - there should be only one
             }
         }
 

app/Services/LdapAdConfiguration.php

@@ -52,10 +52,19 @@ class LdapAdConfiguration
      * @since 5.0.0
      */
     public function init() {
-        $this->ldapSettings = $this->getSnipeItLdapSettings();
-        if ($this->isLdapEnabled()) {
-            $this->setSnipeItConfig();
+
+        // This try/catch is dumb, but is necessary to run initial migrations, since
+        // this service provider is booted even during migrations. :( - snipe
+        try {
+            $this->ldapSettings = $this->getSnipeItLdapSettings();
+            if ($this->isLdapEnabled()) {
+                $this->setSnipeItConfig();
+            }
+        } catch (\Exception $e) {
+            \Log::debug($e);
+            $this->ldapSettings = null;
         }
+
     }
 
     /**
@@ -82,33 +91,35 @@ class LdapAdConfiguration
      */
     private function getSnipeItLdapSettings(): Collection
     {
-        $ldapSettings = Setting::getLdapSettings()
-            ->map(function ($item, $key) {
-                // Trim the items
-                if (is_string($item)) {
-                    $item = trim($item);
-                }
-                // Get the boolean value of the LDAP setting, makes it easier to work with them
-                if (in_array($key, self::LDAP_BOOLEAN_SETTINGS)) {
-                    return boolval($item);
-                }
-
-                // Decrypt the admin password
-                if ('ldap_pword' === $key && !empty($item)) {
-                    try {
-                        return decrypt($item);
-                    } catch (Exception $e) {
-                        throw new Exception('Your app key has changed! Could not decrypt LDAP password using your current app key, so LDAP authentication has been disabled. Login with a local account, update the LDAP password and re-enable it in Admin > Settings.');
+        $ldapSettings = collect();
+        if(Setting::first()) { // during early migration steps, there may be no settings table entry to start with
+            $ldapSettings = Setting::getLdapSettings()
+                ->map(function ($item, $key) {
+                    // Trim the items
+                    if (is_string($item)) {
+                        $item = trim($item);
+                    }
+                    // Get the boolean value of the LDAP setting, makes it easier to work with them
+                    if (in_array($key, self::LDAP_BOOLEAN_SETTINGS)) {
+                        return boolval($item);
                     }
-                }
 
-                if ($item && 'ldap_server' === $key) {
-                    return collect(parse_url($item));
-                }
+                    // Decrypt the admin password
+                    if ('ldap_pword' === $key && !empty($item)) {
+                        try {
+                            return decrypt($item);
+                        } catch (Exception $e) {
+                            throw new Exception('Your app key has changed! Could not decrypt LDAP password using your current app key, so LDAP authentication has been disabled. Login with a local account, update the LDAP password and re-enable it in Admin > Settings.');
+                        }
+                    }
 
-                return $item;
-            });
+                    if ($item && 'ldap_server' === $key) {
+                        return collect(parse_url($item));
+                    }
 
+                    return $item;
+                });
+        }
         return $ldapSettings;
     }
 
@@ -237,11 +248,14 @@ class LdapAdConfiguration
      */
     private function getServerUrlBase(): array
     {
-        if ($this->ldapSettings['is_ad']) {
+        /* if ($this->ldapSettings['is_ad']) {
             return collect(explode(',', $this->ldapSettings['ad_domain']))->map(function ($item) {
                 return trim($item);
             })->toArray();
-        }
+        } */ // <- this was the *original* intent of the PR for AdLdap2, but we've been moving away from having
+             // two separate fields - one for "ldap_host" and one for "ad_domain" - towards just using "ldap_host"
+             // ad_domain for us just means "append this domain to your usernames for login, if you click that checkbox"
+             // that's all, nothing more (I hope).
 
         $url = $this->getLdapServerData('host');
         return $url ? [$url] : [];

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.0.0-beta-3',
-  'full_app_version' => 'v5.0.0-beta-3 - build 4352-gec723a3da',
-  'build_version' => '4190',
+  'app_version' => 'v5.0.0-beta-6-GM',
+  'full_app_version' => 'v5.0.0-beta-6-GM - build 4483-',
+  'build_version' => '4483',
   'prerelease_version' => '',
-  'hash_version' => 'gec723a3da',
-  'full_hash' => 'v5.0.0-beta-3-gec723a3da',
+  'hash_version' => '',
+  'full_hash' => 'v5.0.0-beta-6-GM',
   'branch' => 'develop',
-);
+);

database/migrations/2020_02_04_172100_add_ad_append_domain_settings.php

@@ -19,7 +19,7 @@ class AddAdAppendDomainSettings extends Migration
         });
 
         $s = Setting::first(); // we are deliberately *not* using the ::getSettings() method, as it caches things, and our Settings table is being migrated right now
-        if($s->is_ad && $s->ldap_enabled && $s->ad_domain) { //backwards-compatibility setting; < v5 always appended AD Domains
+        if ($s && $s->is_ad && $s->ldap_enabled && $s->ad_domain) { //backwards-compatibility setting; < v5 always appended AD Domains
             $s->ad_append_domain = 1;
             $s->save();
         }

database/seeds/DatabaseSeeder.php

@@ -48,6 +48,9 @@ class DatabaseSeeder extends Seeder
         Model::reguard();
 
         DB::table('imports')->truncate();
+        DB::table('asset_maintenances')->truncate();
+        DB::table('requested_assets')->truncate();
+
 
     }
 }

public/mix-manifest.json

@@ -1,8 +1,8 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=041c2c23e0a7e285999d",
+    "/js/build/app.js": "/js/build/app.js?id=edf4823a58f20c4e41fc",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341",
-    "/css/build/app.css": "/css/build/app.css?id=3911a887c2bdc7d0b528",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=688f59cd273484405f9b",
+    "/css/build/app.css": "/css/build/app.css?id=032fd8c3fce99c7fd862",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=0b4aefd7ef0c117ef23a",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=9fa704134cfacfacab93",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=747948e5f269f64047f7",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=d7996d850e8bcdc4e167",
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=2f665cf40d7348b3f94c",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=71c178700d68294e3413",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b4fc4a74e1f6367dc3e2",
-    "/css/dist/all.css": "/css/dist/all.css?id=cd644954b1fc39b7f25b",
+    "/css/dist/all.css": "/css/dist/all.css?id=23029d15778815d3c35a",
     "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
     "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
     "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=0cfa39cacd9c83b4f53b",
@@ -34,5 +34,5 @@
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=a534edb9f7179f6dcf62",
     "/js/build/vendor.js": "/js/build/vendor.js?id=ac70ab5fd89efc2aa7d0",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=9407782198cbc29f23d1",
-    "/js/dist/all.js": "/js/dist/all.js?id=451bd5a52c473c82fd71"
+    "/js/dist/all.js": "/js/dist/all.js?id=29881ddb42a1bf849280"
 }

resources/assets/js/components/importer/importer-file.vue

@@ -1,17 +1,20 @@
 <template>
+
     <div v-show="processDetail" class="col-md-6 col-md-offset-3">
 
-        <div class="row">
+            <div class="row">
                 <div class="dynamic-form-row">
                     <div class="col-md-5 col-xs-12">
                         <label for="import-type">Import Type:</label>
                     </div>
+
                     <div class="col-md-7 col-xs-12">
                         <select2 :options="options.importTypes" v-model="options.importType" required>
                             <option disabled value="0"></option>
                         </select2>
                     </div>
-                </div>
+
+                </div><!-- /dynamic-form-row -->
                 <div class="dynamic-form-row">
                     <div class="col-md-5 col-xs-12">
                         <label for="import-update">Update Existing Values?:</label>
@@ -19,7 +22,8 @@
                     <div class="col-md-7 col-xs-12">
                         <input type="checkbox" class="minimal" name="import-update" v-model="options.update">
                     </div>
-                </div>
+                </div><!-- /dynamic-form-row -->
+
                 <div class="dynamic-form-row">
                     <div class="col-md-5 col-xs-12">
                         <label for="send-welcome">Send Welcome Email for new Users?</label>
@@ -27,7 +31,8 @@
                     <div class="col-md-7 col-xs-12">
                         <input type="checkbox" class="minimal" name="send-welcome" v-model="options.send_welcome">
                     </div>
-                </div>
+                </div><!-- /dynamic-form-row -->
+
                 <div class="dynamic-form-row">
                     <div class="col-md-5 col-xs-12">
                         <label for="run-backup">Backup before importing?</label>
@@ -35,14 +40,15 @@
                     <div class="col-md-7 col-xs-12">
                         <input type="checkbox" class="minimal" name="run-backup" v-model="options.run_backup">
                     </div>
-                </div>
-            </div>
-            <div class="alert col-md-8 col-md-offset-2" style="text-align:left"
-                 :class="alertClass"
-                 v-if="statusText">
-                {{ this.statusText }}
-            </div>
-        </div>
+                </div><!-- /dynamic-form-row -->
+
+                <div class="alert col-md-8 col-md-offset-2" style="text-align:left"
+                     :class="alertClass"
+                     v-if="statusText">
+                    {{ this.statusText }}
+                </div><!-- /alert -->
+        </div> <!-- /div row -->
+
         <div class="row">
             <div class="col-md-2"></div>
             <div class="col-md-8" style="padding-top: 30px;">
@@ -50,7 +56,7 @@
                 <div class="col-md-4"><h4>Import Field</h4></div>
                 <div class="col-md-4"><h4>Sample Value</h4></div>
             </div>
-        </div>
+        </div><!-- /div row -->
 
         <template v-for="(header, index) in file.header_row">
             <div class="row">
@@ -69,8 +75,8 @@
                     <div class="col-md-4">
                         <p class="form-control-static">{{ activeFile.first_row[index] }}</p>
                     </div>
-                </div>
-            </div>
+                </div><!-- /div col-md-8 -->
+            </div><!-- /div row -->
         </template>
 
         <div class="row">
@@ -79,17 +85,17 @@
                 <button type="submit" class="btn btn-sm btn-primary" @click="postSave">Import</button>
                 <br><br>
             </div>
-        </div>
+        </div><!-- /div row -->
         <div class="row">
             <div class="alert col-md-8 col-md-offset-2" style="padding-top: 20px;"
                  :class="alertClass"
                  v-if="statusText">
                 {{ this.statusText }}
             </div>
-        </div>
+        </div><!-- /div row -->
 
+    </div><!-- /div v-show -->
 
-    </div>
 </template>
 
 <script>

resources/assets/js/components/passport/Clients.vue

@@ -83,7 +83,7 @@
                     <div class="modal-header">
                         <button type="button " class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 
-                        <h4 class="modal-title">
+                        <h2 class="modal-title">
                             Create Client
                         </h2>
                     </div>
@@ -153,7 +153,7 @@
 
                         <h4 class="modal-title">
                             Edit Client
-                        </h2>
+                        </h4>
                     </div>
 
                     <div class="modal-body">

resources/assets/js/snipeit.js

@@ -465,9 +465,13 @@ $(document).ready(function () {
             $(id + '-info').append('<span class="label label-default">' + this.files[i].name + ' (' + formatBytes(this.files[i].size) + ')</span> ');
         }
 
+        console.log('Max size is: ' + max_size);
+        console.log('Real size is: ' + total_size);
+
         if (total_size > max_size) {
             $status.addClass('text-danger').removeClass('help-block').prepend('<i class="badfile fa fa-times"></i> ').append('<span class="previewSize"> Upload is ' + formatBytes(total_size) + '.</span>');
         } else {
+
             $status.addClass('text-success').removeClass('help-block').prepend('<i class="goodfile fa fa-check"></i> ');
             var $preview =  $(id + '-imagePreview');
             readURL(this, $preview);

resources/assets/less/app.less

@@ -137,13 +137,13 @@ a.accordion-header {
   width: 100%;
 }
 .error input {
-  color: #dd4b39;
-  border: 2px solid #dd4b39 !important;
+  color: #a94442;
+  border: 2px solid #a94442 !important;
 }
 
 .error label,
 .alert-msg {
-  color: #dd4b39;
+  color: #a94442;
   display: block;
 }
 

resources/assets/less/overrides.less

@@ -156,12 +156,12 @@ a.accordion-header {
   width: 100%;
 }
 .error input {
-  color: #dd4b39;
-  border: 2px solid #dd4b39 !important;
+  color: #a94442;
+  border: 2px solid #a94442 !important;
 }
 
 .error label, .alert-msg {
-  color: #dd4b39;
+  color: #a94442;
   display: block;
 }
 
@@ -486,6 +486,7 @@ h4 {
 th.css-barcode > .th-inner,
 th.css-license > .th-inner,
 th.css-consumable > .th-inner,
+th.css-envelope > .th-inner,
 th.css-accessory > .th-inner
 {
   font-size: 0px;
@@ -501,6 +502,7 @@ th.css-padlock > .th-inner::before,
 th.css-barcode > .th-inner::before,
 th.css-license > .th-inner::before,
 th.css-consumable > .th-inner::before,
+th.css-envelope > .th-inner::before,
 th.css-accessory > .th-inner::before
 
 {
@@ -530,6 +532,12 @@ th.css-consumable > .th-inner::before
   content: "\f043";
 }
 
+th.css-envelope > .th-inner::before
+{
+  content: "\f003";
+}
+
+
 th.css-accessory > .th-inner::before
 {
   content: "\f11c";
@@ -552,3 +560,7 @@ th.css-accessory > .th-inner::before
   padding: 6px 12px;
   height: 34px;
 }
+
+.form-group.has-error label {
+  color: #a94442;
+}

resources/lang/af/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

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

@@ -119,13 +119,13 @@ return array(
     'slack_endpoint'            => 'نقطة نهاية سلاك',
     'slack_integration'         => 'إعدادات سلاك',
     'slack_integration_help'    => 'الربط مع Slack اختياري، ولكن نقطة النهاية endpoint والقناة channel مطلوبان إذا كنت ترغب في استخدامه. لاعداد الربط مع 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.',
     'snipe_version'  			=> 'قنص-إيت الإصدار',
     'support_footer'            => 'Support Footer Links ',
     'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
     'version_footer'            => 'رقم الاصدار في التذييل ',
-    'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
+    'version_footer_help'       => 'حدد من سوف يرى إصدار Snipe-IT و رقم النسخة.',
     'system'                    => 'معلومات النظام',
     'update'                    => 'إعدادات التحديث',
     'value'                     => 'القيمة',
@@ -181,7 +181,7 @@ return array(
     'bottom'        => 'الأسفل',
     'vertical'        => 'عمودي',
     'horizontal'        => 'أفقي',
-    'unique_serial'                => 'Unique serial numbers',
+    'unique_serial'                => 'أرقام تسلسلية مميزة',
     'unique_serial_help_text'                => 'تحديد المربع سيؤدي الى فرض سياسة التفرد على الرقم التسلسلي للمتلكات',
     'zerofill_count'        => 'طول ترميز الأصل، بما في ذلك تعبئة الاصفار',
 );

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

@@ -3,7 +3,7 @@
 
 return array(
     'activated_help_text' => 'هذا المستخدم تسجيل الدخول',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_disabled_help_text' => 'لا يمكنك تعديل حالة التنشيط لحسابك الخاص.',
     'assets_user'       => 'الأصول التي تم اخراجها إلى :name',
     'bulk_update_warn'	=> 'أنت على وشك تعديل خصائص :user_count من المستخدمين. يرجى ملاحظة أنه لا يمكنك تغيير سمات المستخدم الخاصة بك باستخدام هذا النموذج، ويجب إجراء تعديلات على المستخدم الخاص بك بشكل على حدة.',
     'bulk_update_help'	=> 'يتيح لك هذا النموذج تحديث عدة مستخدمين في وقت واحد. قم بملء الحقول التي تحتاج إلى تغييرها. ستظل أية حقول فارغة فارغة دون تغيير.',
@@ -17,7 +17,7 @@ return array(
     'restore_user'		=> 'انقر هنا لاستعادتها.',
     'last_login'        => 'آخر دخول للمستخدم',
     'ldap_config_text'  => 'يمكن العثور على إعدادات تهيئة لداب المشرف> الإعدادات. سيتم تعيين الموقع (اختياري) المحدد لجميع المستخدمين الذين تم استيرادهم.',
-    'print_assigned'    => 'Print All Assigned',
+    'print_assigned'    => 'طباعة كل الممتلكات',
     'software_user'     => 'البرامج المخرجة الى: :name',
     'view_user'         => 'عرض المستخدم :name',
     'usercsv'           => 'ملف CSV',

resources/lang/ar/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/ar/mail.php

@@ -58,9 +58,9 @@ return array(
     'test_email' => 'اختبار البريد الإلكتروني من قنص-تكنولوجيا المعلومات',
     'test_mail_text' => 'يعتبر هذا اختبارا من نظام إدارة الأصول Snipe-IT. إذا كنت حصلت على هذا، فان البريد يعمل :)',
     'the_following_item' => 'تم ادخال العنصر التالي: ',
-    'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
-    'assets_warrantee_alert' => 'There is :count asset with a warrantee expiring in the next :threshold days.|There are :count assets with warrantees expiring in the next :threshold days.',
-    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
+    'low_inventory_alert' => 'هنالك :count عناصر أقل من الحد الأدنى للمخزون أول سوف تصبح أقل منه قريباً.',
+    'assets_warrantee_alert' => 'هنالك :count أصل سوف تنتهي فترة الضمان الخاصة به في الأيام :threshold القادمة.| هنالك :count أصول سوف تنتهي فترة الضمان الخاصة بهم في الأيام :threshold القادمة.',
+    'license_expiring_alert' => 'هنالك :count رخص سوف تنتهي في الأيام :threshold القادمة.',
     'to_reset' => 'لإعادة تعيين كلمة مرور على :web، رجاءا أكمل هذا النموذج:',
     'type' => 'اكتب',
     'user' => 'المستخدم',

resources/lang/ar/passwords.php

@@ -2,6 +2,6 @@
 
 return [
     'sent'	        => 'تم إرسال رابط كلمة المرور الخاصة بك!',
-    'user'			=> 'No matching active user found with that email.',
+    'user'			=> 'لم يتم العثور على اسم مستخدم فعّال مرتبط بعنوان ذلك البريد الالكتروني.',
 ];
 

resources/lang/bg/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/cs/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/cy/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

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

@@ -16,8 +16,8 @@ return array(
     ),
 
     'restore' => array(
-        'error'   => 'Manufacturer was not restored, please try again',
-        'success' => 'Manufacturer restored successfully.'
+        'error'   => 'Producenten blev ikke gendannet, prøv igen',
+        'success' => 'Producenten blev genoprettet med succes.'
     ),
 
     'delete' => array(

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

@@ -4,9 +4,9 @@ return array(
     'about_models_title'     => 'Om aktiv modeller',
     'about_models_text'           => 'Aktiv modeller er en måde at gruppere identiske aktiver. "MBP 2013", "IPhone 6s", osv.',
     'deleted'  					        => 'Denne model er blevet slettet. <a href="/hardware/models/:model_id/restore"> Klik her for at gendanne den</a>.',
-    'bulk_delete'               => 'Bulk Delete Asset Models',
-    '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_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete'               => 'Slet flere aktivmodeller',
+    'bulk_delete_help'               => 'Brug checkboksene nedenfor til at bekræfte sletning af valgte aktivmodeller. Aktivmodeller med tilknyttede aktiver kan ikke slettes før aktivet er knyttet til en anden model.',
+    'bulk_delete_warn'          => 'Du er ved at slette :model_count aktivmodeller.',
     'restore'                   => 'Gendanne Model',
     'requestable'               => 'Brugere kan anmode om denne model',
 	'show_mac_address'			      => 'Vis MAC adressefelt i aktiver i denne model',
@@ -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',
+    'add_default_values'        => 'Tilføj defaultværdier',
 );

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

@@ -34,9 +34,9 @@ return array(
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'No models were selected, so nothing was deleted.',
-        'success' 		    => ':success_count model(s) deleted!',
-        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+        'error'   		    => 'Ingen modeller blev valgt, så intet blev slettet.',
+        'success' 		    => ':success_count model(ler) slettet!',
+        'success_partial' 	=> ':success_count model(ler) blev slettet; men :fail_count kunne ikke slettes fordi de stadig har aktiver knyttet til sig.'
     ),
 
 );

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

@@ -4,8 +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.',
+    'admin_cc_email'            => 'CC email',
+    'admin_cc_email_help'       => 'Hvis du vil sende en kopi af checkin/checkout emails som er sendt til brugere til en ekstra email konto, så tilføj den her. Ellers efterlad feltet tomt.',
     'is_ad'				        => 'Dette er en Active Directory-server',
 	'alert_email'				=> 'Send advarsler til',
 	'alerts_enabled'			=> 'Advarsler aktiveret',
@@ -25,10 +25,10 @@ return array(
     'confirm_purge_help'		=> 'Indtast teksten "DELETE" i boksen nedenfor for at rense dine slettede poster. Denne handling kan ikke fortrydes.',
 	'custom_css'				=> 'Brugerdefineret CSS',
 	'custom_css_help'			=> 'Indtast eventuelle brugerdefinerede CSS overskridelser, du gerne vil bruge. Indsæt ikke de <style></style> tags.',
-    '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_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'custom_forgot_pass_url'	=> 'Tilpasset Kodeord reset URL',
+    'custom_forgot_pass_url_help'	=> 'Dette anvendes i stedet for den indbyggede URL til "glemt kodeord" på login billedet, anvendelig til at sende besøgende til en intern eller hosted LDAP kodeord reset funktion. Den vil effektivt afstille den lokale "glemt kodeord" funktionalitet.',
+    'dashboard_message'			=> 'Dashboard meddelelse',
+    'dashboard_message_help'	=> 'Denne tekst vil vises på dashboard for alle som har tilladelse til at se dashbordet.',
 	'default_currency'  		=> 'Standardvaluta',
 	'default_eula_text'			=> 'Standard EULA',
   'default_language'			=> 'Standard sprog',
@@ -42,8 +42,8 @@ return array(
 	'alt_barcode_type'			=> '1D stregkode type',
     'eula_settings'				=> 'EULA-indstillinger',
     'eula_markdown'				=> 'Denne EULA tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github smagsmærket 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'               => 'Ekstra footer tekst ',
+    'footer_text_help'          => 'Denne tekst vil vises i footeren i højre side. Der kan anvendes links ved hjælp af <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>. Linjeskift, headere, billeder etc. kan føre til uforudsigelige resultater.',
     'general_settings'			=> 'Generelle indstillinger',
 	'generate_backup'			=> 'Generer sikkerhedskopiering',
     'header_color'              => 'Hovedfarge',
@@ -52,8 +52,8 @@ return array(
     'ldap_enabled'              => 'LDAP aktiveret',
     'ldap_integration'          => 'LDAP Integration',
     'ldap_settings'             => 'LDAP-indstillinger',
-    '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_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_test_help'      => 'Indtast validt LDAP brugernavn og kodeord fra den basis DN du angav ovenfor for at teste om dit LDAP login er korrekt konfigureret. DU SKAL FØRST OPDATERE og GEMME DINE LDAP INDSTILLINGER.',
+    'ldap_login_sync_help'      => 'Dette tester kun om LDAP kan synkronisere korrekt. Hvis din LDAP authentisering ikke er korrekt, er det usikkert om brugere kan logge ind. DU SKAL FØRST OPDATERE OG GEMME DINE LDAP INDSTILLINGER.',
     'ldap_server'               => 'LDAP-server',
     'ldap_server_help'          => 'Dette skal starte med ldap: // (for ukrypteret eller TLS) eller ldaps: // (for SSL)',
 	'ldap_server_cert'			=> 'Validering af LDAP SSL-certifikat',
@@ -75,24 +75,24 @@ return array(
     'ldap_active_flag'          => 'LDAP Active Flag',
     'ldap_emp_num'              => 'LDAP medarbejdernummer',
     'ldap_email'                => 'LDAP Email',
-    'license'                  => 'Software License',
+    'license'                  => 'Software licens',
     'load_remote_text'          => 'Fjernskrifter',
     'load_remote_help_text'		=> 'Denne Snipe-IT-installation kan indlæse scripts fra omverdenen.',
     'login_note'                => 'Login Note',
     'login_note_help'           => 'Indsæt eventuelt nogle sætninger på din loginskærm, for eksempel for at hjælpe personer, der har fundet en tabt eller stjålet enhed. Dette felt accepterer <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_enabled_text' => 'Enable Login with 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_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 a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_text'    => 'Loginoptions for fjernbrugere',
+    'login_remote_user_enabled_text' => 'Tillad login med fjernbrugerheader',
+    'login_remote_user_enabled_help' => 'Denne option tillader authentisering via REMOTE_USER headr jf. "Common Gateway Interface (rfc3875)"',
+    'login_common_disabled_text' => 'Deaktiver andre authentiseringsmekanismer',
+    'login_common_disabled_help' => 'Denne option deaktiverer andre authentiseringsmekanismer. Aktiver denne option, hvis du er sikker på at dit REMOTE_USER login allerede virker',
+    'login_remote_user_custom_logout_url_text' => 'Tilpasset logout URL',
+    'login_remote_user_custom_logout_url_help' => 'Hvis en URL er angivet her, vil brugere blive omstillet til den efter de har logget ud af Snipe-IT. Det er anvendeligt for at lukke bruger sessions i din authentiseringsmekanisme korrekt.',
     'logo'                    	=> 'Logo',
-    'logo_print_assets'         => 'Use in Print',
-    'logo_print_assets_help'    => 'Use branding on printable asset lists ',
+    'logo_print_assets'         => 'Brug i udskrift',
+    'logo_print_assets_help'    => 'Brug branding på udskrevne aktivlister ',
     'full_multiple_companies_support_help_text' => 'Begrænsning af brugere (herunder admins) tildelt virksomheder til deres virksomheds aktiver.',
     'full_multiple_companies_support_text' => 'Fuld flere virksomheder support',
-    'show_in_model_list'   => 'Show in Model Dropdowns',
+    'show_in_model_list'   => 'Vis i modeldropdown',
     'optional'					=> 'valgfri',
     'per_page'                  => 'Resultater pr. Side',
     'php'                       => 'PHP Version',
@@ -108,24 +108,24 @@ return array(
     'qr_text'                   => 'QR Kode Tekst',
     'setting'                   => 'Indstilling',
     'settings'                  => 'Indstillinger',
-    '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.',
+    'show_alerts_in_menu'       => 'Vis meddelelser i top menu',
+    'show_archived_in_list'     => 'Arkiverede aktiver',
+    'show_archived_in_list_text'     => 'Vis arkiverede aktiver i "Alle aktiver" listen',
+    'show_images_in_email'     => 'Vis billeder i emails',
+    'show_images_in_email_help'   => 'Afkryds denne boks hvis din Snipe-IT installation er bag en VPN eller i et lukket netværk og brugere udenfor netværket vil forhinderes i at anvende billeder fra netværket i deres emails.',
     'site_name'                 => 'Side navn',
     'slack_botname'             => 'Slack Botname',
     'slack_channel'             => 'Slack Channel',
     'slack_endpoint'            => 'Slap endepunkt',
     'slack_integration'         => 'Slack Settings',
     'slack_integration_help'    => 'Slap integration er valgfri, men endpoint og kanal er påkrævet, hvis du ønsker at bruge det. For at konfigurere Slack integration skal du først <a href=":slack_link" target="_new">skabe en indgående webhook</a> på din Slack-konto.',
-    'slack_integration_help_button'    => 'Once you have saved your Slack information, a test button will appear.',
-    'slack_test_help'           => 'Test whether your Slack integration is configured correctly. YOU MUST SAVE YOUR UPDATED SLACK SETTINGS FIRST.',
+    'slack_integration_help_button'    => 'Nå du har gemt din Slack information, vil testknappen blive synlig.',
+    'slack_test_help'           => 'Test om din Slack integration er konfigureret korrekt. DU SKAL FØRST OPDATERE OG GEMME DINE SLACK\'s INDSTILLINGER.',
     'snipe_version'  			=> 'Snipe-IT version',
-    'support_footer'            => 'Support Footer Links ',
-    'support_footer_help'       => 'Specify who sees the links to the Snipe-IT Support info and Users Manual',
-    'version_footer'            => 'Version in Footer ',
-    'version_footer_help'       => 'Specify who sees the Snipe-IT version and build number.',
+    'support_footer'            => 'Understøt footer links ',
+    'support_footer_help'       => 'Angiv hvem der kan se links i Snipe-IT Support info og brugermanual',
+    'version_footer'            => 'Version in footer ',
+    'version_footer_help'       => 'Angiv hvem der kan se Snipe-IT versions- og buildnummer.',
     'system'                    => 'Systemoplysninger',
     'update'                    => 'Opdater indstillinger',
     'value'                     => 'Værdi',
@@ -136,9 +136,9 @@ return array(
     'label_dimensions'          => 'Etiket dimensioner (inches)',
     'next_auto_tag_base'        => 'Næste automatisk stigning',
     'page_padding'              => 'Sidemarginer (tommer)',
-    'privacy_policy_link'       => 'Link to Privacy Policy',
-    'privacy_policy'            => 'Privacy Policy',
-    'privacy_policy_link_help'  => 'If a url is included here, a link to your privacy policy will be included in the app footer and in any emails that the system sends out, in compliance with GDPR. ',
+    'privacy_policy_link'       => 'Link til persondatapolitik',
+    'privacy_policy'            => 'Persondatapolitik',
+    'privacy_policy_link_help'  => 'Hvis der inkluderes en URL her, vil der blive inkluderet et link til din persondatapolitik i app\'ens footer og i alle emails systemet sender ud ( overensstemmelse med GDPR). ',
     'purge'                     => 'Ryd slettet poster',
     'labels_display_bgutter'    => 'Etiket bundgitter',
     'labels_display_sgutter'    => 'Label side rende',
@@ -181,7 +181,7 @@ return array(
     'bottom'        => 'bund',
     'vertical'        => 'lodret',
     'horizontal'        => 'vandret',
-    'unique_serial'                => 'Unique serial numbers',
-    'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
+    'unique_serial'                => 'Unikke serienumre',
+    'unique_serial_help_text'                => 'Markering af denne boks medfører en unik begrænsning af aktivserier',
     'zerofill_count'        => 'Længde af aktivetiketter, herunder zerofill',
 );

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

@@ -5,8 +5,8 @@ return array(
     'archived'      	=> 'arkiverede',
     'create'      	=> 'Opret status label',
     'color'      	=> 'Diagramfarve',
-    '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' => 'Default etiket',
+    'default_label_help' => 'Dette anvendes for at sikre at din mest anvendte statusetiket ses øverst i valgene når du opretter/retter aktiver.',
     'deployable'      	=> 'Deployable',
     'info'      	=> 'Statusetiketter bruges til at beskrive de forskellige stater, dine aktiver kan være i. De kan være ude til reparation, tabt / stjålet osv. Du kan oprette nye statusetiketter til implementerbare, ventende og arkiverede aktiver.',
     'name'      	=> 'Status navn',

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

@@ -19,9 +19,9 @@ return array(
         'confirm'   => 'Er du sikker på, at du ønsker at slette denne leverandør?',
         'error'   => 'Der opstod et problem ved at slette leverandøren. Prøv igen.',
         'success' => 'Leverandøren blev slettet med succes.',
-        '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_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_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_assets'	 => 'Denne placering er i øjeblikket forbundet med :asset_count(s) kan ikke slettes. Opdater dine aktiver for ikke længere at henvise til denne placering, og prøv igen. ',
+        'assoc_licenses'	 => 'Denne leverandør er i øjeblikket forbundet med :licenses_count(s) og kan ikke slettes. Opdater dine modeller for ikke længere at henvise til denne leverandør, og prøv igen. ',
+        'assoc_maintenances'	 => 'Denne leverandør er i øjeblikket forbundet med :asset_maintenances_count aktiv vedligeholdelse(r) og kan ikke slettes. Opdater din aktiv vedligeholdelse så der ikke længere refereres til denne leverandør og prøv igen. ',
     )
 
 );

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

@@ -2,8 +2,8 @@
 
 
 return array(
-    'activated_help_text' => 'This user can login',
-    'activated_disabled_help_text' => 'You cannot edit activation status for your own account.',
+    'activated_help_text' => 'Denne bruger kan logge ind',
+    'activated_disabled_help_text' => 'Du kan ikke redigere rettigheder for din egen konto.',
     'assets_user'       => 'Aktiver tildelt :navn',
     'bulk_update_warn'	=> 'Du er ved at redigere egenskaberne for: user_count-brugere. Bemærk, at du ikke kan ændre dine egne brugerattributter ved hjælp af denne formular, og skal foretage ændringer til din egen bruger individuelt.',
     'bulk_update_help'	=> 'Denne formular giver dig mulighed for at opdatere flere brugere på én gang. Udfyld kun de felter, du skal ændre. Alle felter, der er tomt, forbliver uændrede.',
@@ -17,7 +17,7 @@ return array(
     'restore_user'		=> 'Klik her for at gendanne dem.',
     'last_login'        => 'Sidste Login',
     'ldap_config_text'  => 'LDAP-konfigurationsindstillinger kan findes Admin> Indstillinger. Den (valgfrie) valgte placering vil blive indstillet for alle importerede brugere.',
-    'print_assigned'    => 'Print All Assigned',
+    'print_assigned'    => 'Udskriv alle tildelte',
     'software_user'     => 'Software Checket ud til: navn',
     'view_user'         => 'Se bruger :navn',
     'usercsv'           => 'CSV-fil',

resources/lang/da/button.php

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

resources/lang/da/general.php

@@ -41,10 +41,10 @@
     'checkout'  			=> 'Tjek Ud',
     'checkouts_count'       => 'Checkouts',
     'checkins_count'        => 'Checkins',
-    'user_requests_count'   => 'Requests',
+    'user_requests_count'   => 'Forespørgsler',
     'city'  				=> 'By',
 	'click_here'			=> 'Klik her',
-    'clear_selection'		=> 'Clear Selection',
+    'clear_selection'		=> 'Ryd valg',
     'companies'			    => 'Selskaber',
     'company'				=> 'Selskab',
     'component'			    => 'Komponent',
@@ -68,14 +68,14 @@
     '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?',
+    'delete_confirm'  		=> 'Er du sikker på at du vil slette :item?',
     'deleted'  				=> 'Slettet',
     'delete_seats'  		=> 'Slettede pladser',
     'departments'           => 'Afdelinger',
     'department'           => 'Afdeling',
     'deployed'				=> 'Implementeret',
     'depreciation_report'	=> 'Afskrivningsrapport',
-    'details'               => 'Details',
+    'details'               => 'Detaljer',
     'download'				=> 'Hent',
     'depreciation'			=> 'Afskrivning',
     'editprofile'  			=> 'Ret Din Profil',
@@ -85,25 +85,25 @@
     'email_domain_help'		=> 'Dette bruges til at generere email-adresser ved importering',
     'filastname_format'			=> 'Fornavnskarakter Efternavn (jsmith@example.com)',
     'firstname_lastname_format'	=> 'Fornavn Efternavn (jane.smith@example.com)',
-    'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
-    'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
+    'firstname_lastname_underscore_format' => 'Fornavn Efternavn (jane_smith@example.com)',
+    'lastnamefirstinitial_format' =>  'Efternavn Første initial (smithj@example.com)',
     'first'					=> 'Første',
     'first_name'			=> 'Fornavn',
     'first_name_format'		=> 'Fornavn (jane@example.com)',
-    'files'                 => 'Files',
+    'files'                 => 'Filer',
     'file_name'				=> 'Fil',
     'file_uploads'			=> 'Filoverførsel',
     'generate'				=> 'Skab',
-     'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
+     'github_markdown'      => 'Dette felt tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
     'groups'				=> 'Grupper',
     'gravatar_email'        => 'Gravatar email addresse',
     'history'  			    => 'Historik',
     'history_for'  			=> 'Historie for',
     'id'  					=> 'ID',
-    'image'                 => 'Image',
+    'image'                 => 'Billede',
     'image_delete'         	=> 'Slet billede',
     'image_upload'         	=> 'Upload billede',
-    'image_filetypes_help'  => 'Accepted filetypes are jpg, png, gif, and svg. Max upload size allowed is :size.',
+    'image_filetypes_help'  => 'Tilladte filtyper er jpg, png, gif, og svg. Maximalt tilladte upload størrelse er :size.',
     'import'         	    => 'Importér',
     'import-history'        => 'Importhistorik',
     'asset_maintenance'        => 'Vedligeholdelse af aktiv',
@@ -127,7 +127,7 @@
     'locations'				=> 'Lokationer',
     'logout'				=> 'Log ud',
     'lookup_by_tag'     => 'Søg på aktivkode',
-    'maintenances'          => 'Maintenances',
+    'maintenances'          => 'Vedligeholdelse',
     'manufacturer'			=> 'Producent',
     'manufacturers'			=> 'Producenter',
     'markdown'				=> 'Dette felt tillader <a href="https://help.github.com/articles/github-flavored-markdown/">Github koder</a>.',
@@ -162,7 +162,7 @@
     'recent_activity'		=> 'Seneste aktivitet',
     'remove_company'        => 'Fjern association med selskab',
     'reports'				=> 'Rapporter',
-    'restored'				=> 'restored',
+    'restored'				=> 'gendannet',
     'requested'				=> 'Anmodet',
     'request_canceled'      => 'Anmodning Annulleret',
     'save'  				=> 'Gem',
@@ -181,8 +181,8 @@
     'select_company'    	=> 'Vælg firma',
     'select_asset'    		=> 'Vælg Asset',
     'settings'				=> 'Instillinger',
-    'show_deleted'  		=> 'Show Deleted',
-    'show_current'  		=> 'Show Current',
+    'show_deleted'  		=> 'Vis slettede',
+    'show_current'  		=> 'Vis Aktuelle',
     'sign_in'				=> 'Log ind',
     'signature'             => 'Underskrift',
     'skin'       			=> 'Skin',
@@ -206,7 +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, xls, txt, lic, zip, and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Tilladte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, og rar. Maksimalt tilladte upload størrelse er :size.',
     'uploaded'              => 'uploaded',
     'user'					=> 'Bruger',
     'accepted'			    => 'accepteret',

resources/lang/da/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/da/mail.php

@@ -21,7 +21,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_license_delivery' => 'Bekræft modtagelse af licens.',
     'Confirm_asset_delivery' => 'Bekræft levering af aktiver.',
     'Confirm_consumable_delivery' => 'Bekræft levering af forbrugsstoffer.',
     'current_QTY' => 'Nuværende QTY',
@@ -52,19 +52,19 @@ return array(
     'requested' => 'Anmodede om:',
     'reset_link' => 'Din Password Reset Link',
     'reset_password' => 'Klik her for at nulstille adgangskoden:',
-    'serial' => 'Serial',
+    'serial' => 'Seriel',
     'supplier' => 'Leverandør',
     'tag' => 'Mærkat',
     'test_email' => 'Test E-mail fra Snipe-IT',
     'test_mail_text' => 'Dette er en test fra Snipe-IT Asset Management System. Hvis du fik dette, virker mailen :)',
     'the_following_item' => 'Følgende vare er blevet kontrolleret i:',
-    'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.',
-    'assets_warrantee_alert' => 'There is :count asset with a warrantee expiring in the next :threshold days.|There are :count assets with warrantees expiring in the next :threshold days.',
-    'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
+    'low_inventory_alert' => 'Der er :count enhed som er under minimum lagertal eller som snart vil være det.|Der er :count enheder som er under minimum lagertal eller som snart vil være det.',
+    'assets_warrantee_alert' => 'Der er :count aktiv(er) hvor garantien udløber indenfor de næste :threshold dage.',
+    'license_expiring_alert' => 'Der er :count licens(er) der udløber indenfor den/de næste :threshold dag(e).',
     'to_reset' => 'Nulstille din :web-adgangskode, udfylde denne formular:',
     'type' => 'Type',
-    'user' => 'User',
-    'username' => 'Username',
+    'user' => 'Bruger',
+    'username' => 'Brugernavn',
     'welcome' => 'Velkommen :navn',
     'welcome_to' => 'Velkommen til :web!',
     'your_credentials' => 'Dine Snipe-IT Legitimationsoplysninger',

resources/lang/da/passwords.php

@@ -2,6 +2,6 @@
 
 return [
     'sent'	        => 'Dit adgangskode link er blevet sendt!',
-    'user'			=> 'No matching active user found with that email.',
+    'user'			=> 'Der er ikke fundet nogen aktiv bruger med denne email.',
 ];
 

resources/lang/da/validation.php

@@ -67,7 +67,7 @@ return array(
     'not_in'               => 'Den valgte :attribute er ugyldig.',
     'numeric'              => ':attribute skal være et tal.',
     'present'              => 'Attributfeltet skal være til stede.',
-    'valid_regex'          => 'That is not a valid regex. ',
+    'valid_regex'          => 'Det er ikke et validt regex. ',
     'regex'                => ':attribute formatet er ugyldigt.',
     'required'             => ':attribute feltet er krævet.',
     'required_if'          => ':attribute feltet er krævet når :other er :value.',
@@ -88,7 +88,7 @@ return array(
     'unique'               => ':attribute er allerede taget.',
     'uploaded'             => 'Attributtet kunne ikke uploades.',
     'url'                  => ':attribute formatet er ugyldigt.',
-    "unique_undeleted"     => "The :attribute must be unique.",
+    "unique_undeleted"     => ":attribute skal være unik.",
 
     /*
     |--------------------------------------------------------------------------

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

@@ -4,9 +4,6 @@ return array(
     'ad'				        => 'Active Directory',
     'ad_domain'				    => 'Active Directory Domäne',
     'ad_domain_help'			=> 'Meistens dieselbe wie die E-Mail Domäne.',
-    'ad_append_domain_label'    => 'Domäne hinzufügen',
-    'ad_append_domain'          => 'Automatisch dem Benutzernamen den Domänennamen anhängen',
-    'ad_append_domain_help'     => 'Benutzer müssen lediglich „username“ schreiben, statt „username@domain.local“' ,
     'admin_cc_email'            => 'CC Email',
     'admin_cc_email_help'       => 'Wenn Sie eine Kopie der Rücknahme- / Herausgabe-E-Mails, die an Benutzer gehen auch an zusätzliche E-Mail-Empfänger versenden möchten, geben Sie sie hier ein. Ansonsten lassen Sie dieses Feld leer.',
     'is_ad'				        => 'Dies ist ein Active Directory Server',

resources/lang/de/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

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

@@ -5,8 +5,8 @@ return array(
     'about_categories'  				=> 'Οι κατηγορίες σας βοηθούν να οργανώσετε τα στοιχεία σας. Ορισμένες κατηγορίες παραδειγμάτων ενδέχεται να είναι "Desktops", "Laptops", "Mobile Phones", "Tablets" κ.ο.κ., αλλά μπορείτε να χρησιμοποιήσετε κατηγορίες με οποιονδήποτε τρόπο που έχει νόημα για εσάς.',
     'asset_categories' 					=> 'Κατηγορίες στοιχείων παγίων',
     'category_name'  					=> 'Όνομα κατηγορίας',
-    'checkin_email'                     => 'Send email to user on checkin/checkout.',
-    'checkin_email_notification'        => 'This user will be sent an email on checkin/checkout.',
+    'checkin_email'                     => 'Αποστολή email στον χρήστη κατά την χρέωση/αποδέσμευση.',
+    'checkin_email_notification'        => 'Θα αποστέλεται email σε αυτόν τον χρήστη κατά την χρέωαη/αποδέσμευση.',
     'clone'                             => 'Αντιγραφή Κατηγορίας',
     'create'  							=> 'Δημιουργία Κατηγορίας',
     'edit'                              => 'Επεξεργασία Κατηγορίας',

resources/lang/el/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 για επικύρωση. Πρέπει να ξεκινάει με "regex:" - για παράδειγμα, για την επικύρωση ενός προσαρμοσμένου πεδίου IMEI (15 αριθμητικά ψηφία), θα ήταν <code>regex:/^[0-9]{15}$/</code>.',
     'required'   		          => 'Απαιτείται',
     'req'   		              => 'Req.',
     'used_by_models'   		    => 'Χρησιμοποιήθηκε από τα μοντέλα',
@@ -28,5 +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.',
+    'show_in_email'     => 'Να περιλαμβάνεται η τιμή αυτού του πεδίου στα emails χρέωσης ου αποστέλονται στους χρήστες; Κρυπτογραφημένα πεδία δεν μπορούν να περιληφθούν σε emails.',
 );

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

@@ -63,7 +63,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/el/admin/manufacturers/message.php

@@ -16,8 +16,8 @@ return array(
     ),
 
     'restore' => array(
-        'error'   => 'Manufacturer was not restored, please try again',
-        'success' => 'Manufacturer restored successfully.'
+        'error'   => 'Ο κατασκευαστής δεν αποκαταστάθηκε. Δοκιμάστε ξανά',
+        'success' => 'Ο κατασκευαστής δημιουργήθηκε με επιτυχία.'
     ),
 
     'delete' => array(

resources/lang/el/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_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_warn'          => 'You are about to delete :model_count asset models.',
+    'bulk_delete'               => 'Μαζική διαγραφή μοντέλου Asset',
+    'bulk_delete_help'               => 'Χρησιμοποιήστε τα παρακάτω πλαίσια ελέγχου για να επιβεβαιώσετε τη διαγραφή των επιλεγμένων μοντέλων στοιχείων. Τα μοντέλα στοιχείων που έχουν στοιχεία που σχετίζονται με αυτά δεν μπορούν να διαγραφούν έως ότου τα στοιχεία συσχετιστούν με διαφορετικό μοντέλο.',
+    'bulk_delete_warn'          => 'Πρόκειται να διαγράψετε: asset_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',
+    'add_default_values'        => 'Προσθέστε προεπιλεγμένες τιμές',
 );

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

@@ -34,9 +34,9 @@ return array(
     ),
 
     'bulkdelete' => array(
-        'error'   		    => 'No models were selected, so nothing was deleted.',
-        'success' 		    => ':success_count model(s) deleted!',
-        'success_partial' 	=> ':success_count model(s) were deleted, however :fail_count were unable to be deleted because they still have assets associated with them.'
+        'error'   		    => 'Δεν επιλέχθηκαν πεδία, επομένως τίποτα δεν διαγράφηκε.',
+        'success' 		    => ':success_count model(s) Διαγράφηκε!',
+        'success_partial' 	=> ':success_count model(s) μοντέλα διαγράφηκαν, ωστόσο το :fail_count δεν μπόρεσε να διαγραφεί επειδή εξακολουθούν να έχουν στοιχεία που σχετίζονται με αυτά.'
     ),
 
 );

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

@@ -4,8 +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.',
+    'admin_cc_email'            => 'Επασύναψη email',
+    'admin_cc_email_help'       => 'Εάν θέλετε να στείλετε ένα αντίγραφο checkin/checkout emails που αποστέλλονται στους χρήστες σε έναν επιπλέον λογαριασμό email, εισαγάγετέ το εδώ. Διαφορετικά, αφήστε αυτό το πεδίο κενό.',
     'is_ad'				        => 'Αυτός είναι ένας διακομιστής υπηρεσίας καταλόγου Active Directory',
 	'alert_email'				=> 'Αποστολή ειδοποιήσεων προς',
 	'alerts_enabled'			=> 'Ειδοποιήσεις ενεργοποιημένες',
@@ -25,10 +25,10 @@ return array(
     'confirm_purge_help'		=> 'Εισάγετε το κείμενο «Διαγραφή» στο πλαίσιο παρακάτω για να καθαρίσει τις διαγραμμένες εγγραφές σας. Αυτή η ενέργεια δεν μπορεί να αναιρεθεί.',
 	'custom_css'				=> 'Προσαρμοσμένο CSS',
 	'custom_css_help'			=> 'Εισαγάγετε τυχόν προσαρμοσμένες επικαλύψεις CSS που θέλετε να χρησιμοποιήσετε. Μην συμπεριλάβετε τις ετικέτες <style></style>.',
-    '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_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
+    'custom_forgot_pass_url'	=> 'URL επαναφοράς προσαρμοσμένου κωδικού πρόσβασης',
+    'custom_forgot_pass_url_help'	=> 'Αυτό αντικαθιστά την ενσωματωμένη ξεχασμένη διεύθυνση URL κωδικού πρόσβασης στην οθόνη σύνδεσης, χρήσιμη για να κατευθύνει τα άτομα σε λειτουργία εσωτερικής ή φιλοξενούμενης επαναφοράς κωδικού πρόσβασης LDAP. Θα απενεργοποιήσει αποτελεσματικά τη λειτουργικότητα ξεχασμένου κωδικού πρόσβασης τοπικού χρήστη.',
+    'dashboard_message'			=> 'Όνομα Εμφάνισης Στο Μενού',
+    'dashboard_message_help'	=> 'Αυτό το κείμενο θα εμφανίζεται στον πίνακα ελέγχου για οποιονδήποτε έχει άδεια να δει τον πίνακα ελέγχου.',
 	'default_currency'  		=> 'Προεπιλεγμένο νόμισμα',
 	'default_eula_text'			=> 'Προεπιλογή EULA',
   'default_language'			=> 'Προκαθορισμένη γλώσσα',
@@ -42,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_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'               => 'Πρόσθετο κείμενο Footer',
+    'footer_text_help'          => 'Αυτό το κείμενο θα εμφανιστεί στο υποσέλιδο στη δεξιά πλευρά. Οι σύνδεσμοι επιτρέπονται χρησιμοποιώντας την <a href="https://help.github.com/articles/github-flavored-markdown/"> Github flavored markdown </a>. Διακοπή γραμμής, κεφαλίδες, εικόνες κ.λπ. μπορεί να οδηγήσουν σε απρόβλεπτα αποτελέσματα.',
     'general_settings'			=> 'Γενικές ρυθμίσεις',
 	'generate_backup'			=> 'Δημιουργία Αντίγραφου Ασφαλείας',
     'header_color'              => 'Χρώμα επικεφαλίδας',
@@ -52,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_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_test_help'      => 'Εισαγάγετε ένα έγκυρο όνομα χρήστη και κωδικό πρόσβασης LDAP από τη βάση DN που καθορίσατε παραπάνω για να ελέγξετε εάν η σύνδεσή LDAP έχει ρυθμιστεί σωστά. ΠΡΩΤΑ ΑΠΟΘΗΚΕΥΣΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΣΑΣ ΣΤΟ LDAP.',
+    'ldap_login_sync_help'      => 'Αυτό ελέγχει μόνο ότι το LDAP μπορεί να συγχρονιστεί σωστά. Εάν το Authentication στο LDAP δεν είναι σωστό, οι χρήστες ενδέχεται να μην μπορούν να συνδεθούν. ΠΡΩΤΑ ΑΠΟΘΗΚΕΥΣΤΕ ΤΙΣ ΡΥΘΜΙΣΕΙΣ ΣΑΣ ΣΤΟ LDAP.',
     'ldap_server'               => 'LDAP Server',
     'ldap_server_help'          => 'Αυτό θα πρέπει να ξεκινά με το ldap: // (για μη κρυπτογραφημένο ή TLS) ή ldaps: // (για SSL)',
 	'ldap_server_cert'			=> 'Πιστοποίηση πιστοποιητικού SSL για LDAP',
@@ -75,20 +75,20 @@ return array(
     'ldap_active_flag'          => 'Ενεργή σημαία LDAP',
     'ldap_emp_num'              => 'Αριθμός υπαλλήλου LDAP',
     'ldap_email'                => 'LDAP Email',
-    'license'                  => 'Software License',
+    'license'                  => 'Άδειες λογισμικού',
     'load_remote_text'          => 'Απομακρυσμένα Scripts',
     '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_enabled_text' => 'Enable Login with 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_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 a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
+    'login_remote_user_text'    => 'Επιλογές σύνδεσης απομακρυσμένου χρήστη',
+    'login_remote_user_enabled_text' => 'Ενεργοποίηση απομακρησμένου χρήστη',
+    'login_remote_user_enabled_help' => 'Αυτή η επιλογή επιτρέπει το Authentication μέσω του REMOTE_USER σύμφωνα με το "Common Gateway Interface (rfc3875)"',
+    'login_common_disabled_text' => 'Απενεργοποιήστε άλλους μηχανισμούς authentication',
+    'login_common_disabled_help' => 'Αυτή η επιλογή απενεργοποιεί άλλους μηχανισμούς authentication. Απλώς ενεργοποιήστε αυτήν την επιλογή εάν είστε βέβαιοι ότι η σύνδεση REMOTE_USER λειτουργεί ήδη',
+    'login_remote_user_custom_logout_url_text' => 'Προσαρμοσμένη διεύθυνση URL αποσύνδεσης',
+    'login_remote_user_custom_logout_url_help' => 'Εάν παρέχεται ένα url εδώ, οι χρήστες θα ανακατευθυνθούν σε αυτήν τη διεύθυνση URL αφού ο χρήστης αποσυνδεθεί από το Snipe-IT. Σε περίπτωση που χρησιμοποιήτε κάποιο συγκεκριμένο πάρωχο Authentication.',
     'logo'                    	=> 'Λογότυπο',
-    'logo_print_assets'         => 'Use in Print',
+    'logo_print_assets'         => 'Χρήση σε Εκτύπωση',
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
     'full_multiple_companies_support_help_text' => 'Περιορισμός των χρηστών (συμπεριλαμβανομένων των διαχειριστών) που εκχωρούνται σε εταιρείες στα περιουσιακά στοιχεία της εταιρείας τους.',
     'full_multiple_companies_support_text' => 'Πλήρης υποστήριξη πολλαπλών εταιρειών',

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

@@ -19,7 +19,7 @@ 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 και δεν μπορεί να διαγραφεί. Παρακαλούμε να ενημερώσετε τα asset σας να μην αναφέρονται σε αυτόν τον προμηθευτή και δοκιμάστε ξανά. ',
         '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_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. ',
     )

resources/lang/el/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/en-GB/general.php

@@ -88,9 +88,6 @@
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
     'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',  'first'					=> 'First',
     'first_name'			=> 'First Name',
     'first_name_format'		=> 'First Name (jane@example.com)',
     'files'                 => 'Files',
@@ -209,7 +206,7 @@
     'unknown_admin'			=> 'Unknown Admin',
     'username_format'		=> 'Username Format',
     'update'                => 'Update',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'accepted'			    => 'accepted',

resources/lang/en-GB/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/en-ID/general.php

@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Admin tidak diketahui',
     'username_format'		=> 'Format nama pengguna',
     'update'                => 'Perbarui',
-    'upload_filetypes_help'      => 'Tipe file yang diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rtf dan rar. Maksimal ukuran file upload adalah :size.',
+    'upload_filetypes_help'      => 'Tipe file yang diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar. Maksimal ukuran file upload adalah :size.',
     'uploaded'              => 'Unggah',
     'user'					=> 'Pengguna',
     'accepted'			    => 'diterima',

resources/lang/en-ID/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

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

@@ -1,7 +1,9 @@
 <?php
 
 return array(
-    'archived'  				=> 'Archived',
+    'about_assets_title'           => 'About Assets',
+    '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',
     'checkin'  					=> 'Checkin Asset',

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

@@ -43,12 +43,11 @@ return array(
     ),
 
     'import' => array(
-        'error'                     => 'Some items did not import correctly.',
-        'errorDetail'               => 'The following Items were not imported because of errors.',
-        'success'                   => "Your file has been imported",
+        'error'                 => 'Some items did not import correctly.',
+        'errorDetail'           => 'The following Items were not imported because of errors.',
+        'success'               => "Your file has been imported",
         'file_delete_success'   => "Your file has been been successfully deleted",
-        'file_delete_error'         => "The file was unable to be deleted",
-        'file_not_deleted_warning'  => 'The import record was deleted, however the file was unable to be deleted. Check that the file exists in storage/private_uploads/imports/ and manually delete it.',
+        'file_delete_error'      => "The file was unable to be deleted",
     ),
 
 

resources/lang/en/admin/hardware/table.php

@@ -19,7 +19,6 @@ return array(
     'status'   		=> 'Status',
     'title'      	=> 'Asset ',
     'image'		=> 'Device Image',
-    'days_without_acceptance' => 'Days Without Acceptance',
-    'monthly_depreciation' => 'Monthly Depreciation'
+    'days_without_acceptance' => 'Days Without Acceptance'
 
 );

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

@@ -1,7 +1,8 @@
 <?php
 
 return array(
-    'about_kits'                        => 'About Predefined Kits',
+    'about_kits_title'                  => 'About Predefined Kits',
+    'about_kits_text'                   => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
     'checkout'                          => 'Checkout Kit ',
     'create_success'                    => 'Kit was successfully created.',
     'create'                            => 'Create Predefined Kit',

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

@@ -8,7 +8,6 @@ return array(
     'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
     'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
     'select_asset_or_person' => 'You must select an asset or a user, but not both.',
-    'not_found' => 'License not found',
 
 
     'create' => array(

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

@@ -4,60 +4,50 @@ 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.',
-    'ad_append_domain_label'    => 'Append domain name',
-    'ad_append_domain'          => 'Append domain name to username field',
-    'ad_append_domain_help'     => 'User doesn\'t require to write "username@domain.local", they can just type "username".' ,
     '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'			=> 'Email Alerts Enabled',
-    'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
-    'alert_inv_threshold'		=> 'Inventory Alert Threshold',
-    'asset_ids'					=> 'Asset IDs',
-    'audit_interval'            => 'Audit Interval',
+	'alert_email'				=> 'Send alerts to',
+	'alerts_enabled'			=> 'Email Alerts Enabled',
+	'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
+	'alert_inv_threshold'		=> 'Inventory Alert Threshold',
+	'asset_ids'					=> 'Asset IDs',
+	'audit_interval'            => 'Audit Interval',
     'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months.',
-    'audit_warning_days'        => 'Audit Warning Threshold',
+	'audit_warning_days'        => 'Audit Warning Threshold',
     'audit_warning_days_help'   => 'How many days in advance should we warn you when assets are due for auditing?',
-    'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
-    'auto_increment_prefix'		=> 'Prefix (optional)',
-    'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
-    'backups'					=> 'Backups',
-    'barcode_settings'			=> 'Barcode Settings',
+	'auto_increment_assets'		=> 'Generate auto-incrementing asset IDs',
+	'auto_increment_prefix'		=> 'Prefix (optional)',
+	'auto_incrementing_help'    => 'Enable auto-incrementing asset IDs first to set this',
+	'backups'					=> 'Backups',
+	'barcode_settings'			=> 'Barcode Settings',
     'confirm_purge'			    => 'Confirm Purge',
     'confirm_purge_help'		=> 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.',
-    'custom_css'				=> 'Custom CSS',
-    'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
+	'custom_css'				=> 'Custom CSS',
+	'custom_css_help'			=> 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.',
     '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_help'	=> 'This text will appear on the dashboard for anyone with permission to view the dashboard.',
-    'default_currency'  		=> 'Default Currency',
-    'default_eula_text'			=> 'Default EULA',
-    'default_language'			=> 'Default Language',
-    'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
+	'default_currency'  		=> 'Default Currency',
+	'default_eula_text'			=> 'Default EULA',
+  'default_language'			=> 'Default Language',
+	'default_eula_help_text'	=> 'You can also associate custom EULAs to specific asset categories.',
     'display_asset_name'        => 'Display Asset Name',
     'display_checkout_date'     => 'Display Checkout Date',
     'display_eol'               => 'Display EOL in table view',
     'display_qr'                => 'Display Square Codes',
-    'display_alt_barcode'		=> 'Display 1D barcode',
-    'email_logo'                => 'Email Logo',
-    'barcode_type'				=> '2D Barcode Type',
-    'alt_barcode_type'			=> '1D barcode type',
-    'email_logo_size'       => 'Square logos in email look best. ',
+	'display_alt_barcode'		=> 'Display 1D barcode',
+	'barcode_type'				=> '2D Barcode Type',
+	'alt_barcode_type'			=> '1D barcode type',
     'eula_settings'				=> 'EULA Settings',
     'eula_markdown'				=> 'This EULA allows <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
-    'favicon'                   => 'Favicon',
-    'favicon_format'            => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.',
-    'favicon_size'          => 'Favicons should be square images, 16x16 pixels.',
     '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.',
     'general_settings'			=> 'General Settings',
-    'generate_backup'			=> 'Generate Backup',
+	'generate_backup'			=> 'Generate Backup',
     'header_color'              => 'Header Color',
     'info'                      => 'These settings let you customize certain aspects of your installation.',
-    'label_logo'                => 'Label Logo',
-    'label_logo_size'           => 'Square logos look best - will be displayed in the top right of each asset label. ',
     'laravel'                   => 'Laravel Version',
     'ldap_enabled'              => 'LDAP enabled',
     'ldap_integration'          => 'LDAP Integration',
@@ -66,9 +56,9 @@ return array(
     '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_server'               => 'LDAP Server',
     'ldap_server_help'          => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
-    'ldap_server_cert'			=> 'LDAP SSL certificate validation',
-    'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
-    'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
+	'ldap_server_cert'			=> 'LDAP SSL certificate validation',
+	'ldap_server_cert_ignore'	=> 'Allow invalid SSL Certificate',
+	'ldap_server_cert_help'		=> 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.',
     'ldap_tls'                  => 'Use TLS',
     'ldap_tls_help'             => 'This should be checked only if you are running STARTTLS on your LDAP server. ',
     'ldap_uname'                => 'LDAP Bind Username',
@@ -97,8 +87,6 @@ return array(
     '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 a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
-    'login_remote_user_header_name_text' => 'Custom user name header',
-    'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
     'logo'                    	=> 'Logo',
     'logo_print_assets'         => 'Use in Print',
     'logo_print_assets_help'    => 'Use branding on printable asset lists ',
@@ -118,31 +106,11 @@ return array(
     'pwd_secure_uncommon_help'  => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
     'qr_help'                   => 'Enable QR Codes first to set this',
     'qr_text'                   => 'QR Code Text',
-    'saml_enabled'              => 'SAML enabled',
-    'saml_integration'          => 'SAML Integration',
-    'saml_sp_entityid'          => 'Entity ID',
-    'saml_sp_acs_url'           => 'Assertion Consumer Service (ACS) URL',
-    'saml_sp_sls_url'           => 'Single Logout Service (SLS) URL',
-    'saml_sp_x509cert'          => 'Public Certificate',
-    'saml_idp_metadata'         => 'SAML IdP Metadata',
-    'saml_idp_metadata_help'    => 'You can specify the IdP metadata using a URL or XML file.',
-    'saml_attr_mapping_username' => 'Attribute Mapping - Username',
-    'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
-    'saml_forcelogin_label'     => 'SAML Force Login',
-    'saml_forcelogin'           => 'Make SAML the primary login',
-    'saml_forcelogin_help'      => 'You can use \'/login?nosaml\' to get to the normal login page.',
-    'saml_slo_label'            => 'SAML Single Log Out',
-    'saml_slo'                  => 'Send a LogoutRequest to IdP on Logout',
-    'saml_slo_help'             => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
-    'saml_custom_settings'      => 'SAML Custom Settings',
-    'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
     'setting'                   => 'Setting',
     'settings'                  => 'Settings',
     '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_assigned_assets'      => 'Show assets assigned to assets',
-    'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
     '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',
@@ -162,7 +130,6 @@ return array(
     'update'                    => 'Update Settings',
     'value'                     => 'Value',
     'brand'                     => 'Branding',
-    'web_brand'                 => 'Web Branding Type',
     'about_settings_title'      => 'About Settings',
     'about_settings_text'       => 'These settings let you customize certain aspects of your installation.',
     'labels_per_page'           => 'Labels per page',
@@ -217,5 +184,4 @@ return array(
     'unique_serial'                => 'Unique serial numbers',
     'unique_serial_help_text'                => 'Checking this box will enforce a uniqueness constraint on asset serials',
     'zerofill_count'        => 'Length of asset tags, including zerofill',
-    'username_format_help'   => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
 );

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

@@ -19,7 +19,6 @@ return array(
     'ldap_config_text'  => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
     'print_assigned'    => 'Print All Assigned',
     'software_user'     => 'Software Checked out to :name',
-    'send_email_help'   => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
     'view_user'         => 'View User :name',
     'usercsv'           => 'CSV file',
     'two_factor_admin_optin_help' => 'Your current admin settings allow selective enforcement of two-factor authentication.  ',

resources/lang/en/admin/users/message.php

@@ -12,7 +12,6 @@ return array(
     'insufficient_permissions'  => 'Insufficient Permissions.',
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
-    'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
 
 
     'success' => array(
@@ -38,10 +37,10 @@ return array(
         'asset_already_accepted' => 'This asset has already been accepted.',
         'accept_or_decline' => 'You must either accept or decline this asset.',
         'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.',
-        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD <br>Error from LDAP Server:',
-        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD<br>Error from LDAP Server: ',
-        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
-        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in Admin Settings > LDAP/AD and any Locations that may have additional OUs associated with them. <br>Error from LDAP Server:',
+        'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server: ',
+        'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
+        'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file. <br>Error from LDAP Server:',
         'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
     ),
 

resources/lang/en/auth/general.php

@@ -4,7 +4,6 @@ return [
     'send_password_link'	        => 'Send Password Reset Link',
     'email_reset_password'			=> 'Email Password Reset',
     'reset_password'			    => 'Reset Password',
-    'saml_login'                    => 'Login via SAML',
     'login'                         => 'Login',
     'login_prompt'                  => 'Please Login',
     'forgot_password'               => 'I forgot my password',

resources/lang/en/auth/message.php

@@ -9,37 +9,29 @@ return array(
     'account_banned'         => 'This user account is banned.',
     'throttle'               => 'Too many failed login attempts. Please try again in :seconds seconds.',
 
-    'two_factor' => array(
-        'already_enrolled'      => 'Your device is already enrolled.',
-        'success'               => 'You have successfully logged in.',
-        'code_required'         => 'Two-factor code is required.',
-        'invalid_code'          => 'Two-factor code is invalid.',
-    ),
-
     'signin' => array(
         'error'   => 'There was a problem while trying to log you in, please try again.',
         'success' => 'You have successfully logged in.',
     ),
 
-    'logout' => array(
-        'error'   => 'There was a problem while trying to log you out, please try again.',
-        'success' => 'You have successfully logged out.',
-    ),
-
     'signup' => array(
         'error'   => 'There was a problem while trying to create your account, please try again.',
         'success' => 'Account sucessfully created.',
     ),
 
-    'forgot-password' => array(
-        'error'   => 'There was a problem while trying to get a reset password code, please try again.',
-        'success' => 'If that email address exists in our system, a password recovery email has been sent.',
-    ),
+        'forgot-password' => array(
+            'error'   => 'There was a problem while trying to get a reset password code, please try again.',
+            'success' => 'Password recovery email successfully sent.',
+        ),
 
-    'forgot-password-confirm' => array(
-        'error'   => 'There was a problem while trying to reset your password, please try again.',
-        'success' => 'Your password has been successfully reset.',
-    ),
+        'forgot-password-confirm' => array(
+            'error'   => 'There was a problem while trying to reset your password, please try again.',
+            'success' => 'Your password has been successfully reset.',
+        ),
 
+    'activate' => array(
+        'error'   => 'There was a problem while trying to activate your account, please try again.',
+        'success' => 'Your account has been successfully activated.',
+    ),
 
 );

resources/lang/en/button.php

@@ -13,5 +13,4 @@ return array(
     'upload'                    => 'Upload',
 	'select_file'				=> 'Select File...',
     'select_files'				=> 'Select Files...',
-    'generate_labels'           => '{1} Generate Label|[2,*] Generate Labels',
 );

resources/lang/en/general.php

@@ -30,7 +30,6 @@
     'bulkaudit'             => 'Bulk Audit',
     'bulkaudit_status'      => 'Audit Status',
     'bulk_checkout'  		=> 'Bulk Checkout',
-    'bystatus'              => 'by Status',
     'cancel'  				=> 'Cancel',
     'categories'			=> 'Categories',
     'category'				=> 'Category',
@@ -58,7 +57,6 @@
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
     'created_at' 			=> 'Created at',
-    'record_created' 		=> 'Record Created',
     'updated_at' 			=> 'Updated at',
     'currency'  			=> '$', // this is deprecated
     'current'  				=> 'Current',
@@ -89,23 +87,11 @@
     'firstname_lastname_format'	=> 'First Name Last Name (jane.smith@example.com)',
     'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
     'lastnamefirstinitial_format' =>  'Last Name First Initial (smithj@example.com)',
-    'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
-    'first'					=> 'First',
-    'firstnamelastname'     => 'First Name Last Name (janesmith@example.com)',
-    'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
-    'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
-    'firstnamelastinitial'  => 'First Name Last Initial (janes@example.com)',
     'first'					=> 'First',
     'first_name'			=> 'First Name',
     'first_name_format'		=> 'First Name (jane@example.com)',
     'files'                 => 'Files',
     'file_name'				=> 'File',
-    'file_type'             => 'File Type',
     'file_uploads'			=> 'File Uploads',
     'generate'				=> 'Generate',
      'github_markdown'      => 'This field accepts <a href="https://help.github.com/articles/github-flavored-markdown/">Github flavored markdown</a>.',
@@ -125,7 +111,6 @@
     'asset_maintenances'       => 'Asset Maintenances',
     'item'  				=> 'Item',
     'insufficient_permissions' => 'Insufficient permissions!',
-    'kits'       			=> 'Predefined Kits',
     'language'				=> 'Language',
     'last'					=> 'Last',
     'last_login'            => 'Last Login',
@@ -140,7 +125,6 @@
     'feature_disabled'      => 'This feature has been disabled for the demo installation.',
     'location'              => 'Location',
     'locations'				=> 'Locations',
-    'logo_size'				=> 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide.  ',
     'logout'				=> 'Logout',
     'lookup_by_tag'     => 'Lookup by Asset Tag',
     'maintenances'          => 'Maintenances',
@@ -222,23 +206,19 @@
     'unknown_admin'			=> 'Unknown Admin',
     'username_format'		=> 'Username Format',
     'update'                => 'Update',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, and rar. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'accepted'			    => 'accepted',
     'declined'			    => 'declined',
     'unaccepted_asset_report' => 'Unaccepted Assets',
     'users'                 => 'Users',
-    'viewall'				=> 'View All',
     'viewassets'  			=> 'View Assigned Assets',
     'website'               => 'Website',
     'welcome'				=> 'Welcome, :name',
     'years'					=> 'years',
     'yes' 					=> 'Yes',
     'zip'  					=> 'Zip',
-    'noimage'				=> 'No image uploaded or image not found.',
-    'token_expired'         => 'Your form session has expired. Please try again.',
-    'login_enabled'         => 'Login Enabled',
-    'audit_due'             => 'Due for Audit',
-    'audit_overdue'         => 'Overdue for Audit',
+    'noimage'					=> 'No image uploaded or image not found.',
+    'token_expired'             => 'Your form session has expired. Please try again.',
     ];

resources/lang/en/mail.php

@@ -64,11 +64,9 @@ return array(
     'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
     'to_reset' => 'To reset your :web password, complete this form:',
     'type' => 'Type',
-    'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
     'user' => 'User',
     'username' => 'Username',
     'welcome' => 'Welcome :name',
     'welcome_to' => 'Welcome to :web!',
     'your_credentials' => 'Your Snipe-IT credentials',
-
 );

resources/lang/en/passwords.php

@@ -1,11 +1,7 @@
 <?php
 
 return [
-    'sent'	        => 'If a matching username and email address is found, a password reset link will be sent!',
+    'sent'	        => 'Your password link has been sent!',
     'user'			=> 'No matching active user found with that email.',
-    'user_inactive'	=> 'If that email address exists in our system, a password recovery email has been sent.',
-    'token'         => 'The password reset token you have provided is invalid',
-    'password'      => 'Passwords must be at least eight characters and match the confirmation.',
-    'reset'         => 'Your password has been reset'
 ];
 

resources/lang/en/validation.php

@@ -30,7 +30,6 @@ return array(
         'array'   => 'The :attribute must have between :min and :max items.',
     ],
     'boolean'              => 'The :attribute must be true or false.',
-    'case_diff'            => 'The :attribute must contain at least one uppercase and one lowercase letter.',
     'confirmed'            => 'The :attribute confirmation does not match.',
     'date'                 => 'The :attribute is not a valid date.',
     'date_format'          => 'The :attribute does not match the format :format.',
@@ -39,15 +38,10 @@ return array(
     'digits_between'       => 'The :attribute must be between :min and :max digits.',
     'dimensions'           => 'The :attribute has invalid image dimensions.',
     'distinct'             => 'The :attribute field has a duplicate value.',
-    'dumbpwd'             => 'That password is too common. Please choose another one.',
     'email'                => 'The :attribute format is invalid.',
     'exists'               => 'The selected :attribute is invalid.',
     'file'                 => 'The :attribute must be a file.',
     'filled'               => 'The :attribute field must have a value.',
-    'gt'                   => [
-        'numeric' => 'The :attribute field must be greater than :value.'
-    ],
-    'hashed_pass'          => 'Your password is incorrect.',
     'image'                => 'The :attribute must be an image.',
     'in'                   => 'The selected :attribute is invalid.',
     'in_array'             => 'The :attribute field does not exist in :other.',
@@ -64,7 +58,6 @@ return array(
     ],
     'mimes'                => 'The :attribute must be a file of type: :values.',
     'mimetypes'            => 'The :attribute must be a file of type: :values.',
-    'letters'              => 'The :attribute must contain letters',
     'min'                  => [
         'numeric' => 'The :attribute must be at least :min.',
         'file'    => 'The :attribute must be at least :min kilobytes.',
@@ -73,7 +66,6 @@ return array(
     ],
     'not_in'               => 'The selected :attribute is invalid.',
     'numeric'              => 'The :attribute must be a number.',
-    'numbers'              => 'The :attribute must contain at least one number.',
     'present'              => 'The :attribute field must be present.',
     'valid_regex'          => 'That is not a valid regex. ',
     'regex'                => 'The :attribute format is invalid.',
@@ -92,13 +84,23 @@ return array(
         'array'   => 'The :attribute must contain :size items.',
     ],
     'string'               => 'The :attribute must be a string.',
-    'symbols'              => 'The :attribute must contain at least one symbol.',
     'timezone'             => 'The :attribute must be a valid zone.',
     'unique'               => 'The :attribute has already been taken.',
     'uploaded'             => 'The :attribute failed to upload.',
     'url'                  => 'The :attribute format is invalid.',
     "unique_undeleted"     => "The :attribute must be unique.",
-    "import_field_empty"   => "The value of the Import Field shouldn't be empty",
+
+    /*
+    |--------------------------------------------------------------------------
+    | Custom Validation Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | Here you may specify custom validation messages for attributes using the
+    | convention "attribute.rule" to name the lines. This makes it quick to
+    | specify a specific custom language line for a given attribute rule.
+    |
+    */
+
 
     /*
     |--------------------------------------------------------------------------
@@ -115,6 +117,7 @@ return array(
         'alpha_space' => "The :attribute field contains a character that is not allowed.",
         "email_array"      => "One or more email addresses is invalid.",
         "hashed_pass"      => "Your current password is incorrect",
+        'dumbpwd'          => 'That password is too common.',
         "statuslabel_type" => "You must select a valid status label type",
     ],
 

resources/lang/es-CO/admin/depreciations/message.php

@@ -12,14 +12,14 @@ return array(
     ),
 
     'update' => array(
-        'error'   => 'Amortización no actualizada, intentalo de nuevo.',
-        'success' => 'Amortización actualizada correctamente.'
+        'error'   => 'La clase de depreciación no fue actualizada, por favor, inténtalo de nuevo',
+        'success' => 'La clase de depreciación fue creada con éxito.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Estas seguro que quieres eliminar la Amortización?',
-        'error'   => 'Amortización no eliminada, intentalo de nuevo.',
-        'success' => 'Amortización eliminada correctamente.'
+        'confirm'   => '¿Está seguro que desea eliminar esta clase de depreciación?',
+        'error'   => 'Ha sucedido un error eliminando la clase de depreciación, por favor intente de nuevo.',
+        'success' => 'La clase de depreciación fue eliminada con éxito.'
     )
 
 );

resources/lang/es-CO/general.php

@@ -11,41 +11,41 @@
     'admin'					=> 'Admin',
     'administrator'			=> 'Administrador',
     'add_seats'             => 'Sitios añadidos',
-    'all_assets'			=> 'Todos los Equipos',
-    'all'       			=> 'Todos los',
+    'all_assets'			=> 'Todos los activos',
+    'all'       			=> 'Todo',
     'archived'              => 'Archivado',
-    'asset_models'			=> 'Modelos',
+    'asset_models'			=> 'Modelos de activos',
     'asset_model'			=> 'Modelo',
-    'asset'					=> 'Equipo',
-    'asset_report'          => 'Reporte de Equipos',
-    'asset_tag'				=> 'Etiqueta',
-    'assets_available'		=> 'equipos disponibles',
+    'asset'					=> 'Activo',
+    'asset_report'          => 'Reporte de Activos',
+    'asset_tag'				=> 'Etiqueta de activo',
+    'assets_available'		=> 'activos disponibles',
     'audit'				    => 'Auditoría',
     'audit_report'			=> 'Registro de auditoría',
-    'assets'				=> 'Equipos',
+    'assets'				=> 'Activos',
     'avatar_delete'         => 'Eliminar Avatar',
     'avatar_upload'         => 'Subir Avatar',
-    'back'      			=> 'Atras',
-    'bad_data'      		=> 'Ningún resultado. ¿Quizá un dato incorrecto?',
+    'back'      			=> 'Atrás',
+    'bad_data'      		=> 'No se ha encontrado nada. ¿Tal vez datos erróneos?',
     'bulkaudit'             => 'Auditoría masiva',
     'bulkaudit_status'      => 'Estado de auditoría',
     'bulk_checkout'  		=> 'Procesar en Lote',
     'cancel'  				=> 'Cancelar',
     'categories'			=> 'Categorías',
     'category'				=> 'Categoría',
-    'change' 		        => 'Entrada / salida',
-    'changeemail'  			=> 'Cambiar Email',
-    'changepassword'  		=> 'Cambiar Password',
-    'checkin'  				=> 'Quitar Equipo',
+    'change' 		        => 'Entrada/Salida',
+    'changeemail'  			=> 'Cambiar dirección de email',
+    'changepassword'  		=> 'Cambiar contraseña',
+    'checkin'  				=> 'Entrada',
     'checkin_from'  		=> 'Devolución de',
-    'checkout'  			=> 'Asignar a un usuario',
+    'checkout'  			=> 'Asignar',
     'checkouts_count'       => 'Dar de Baja',
     'checkins_count'        => 'Dar de Alta',
     'user_requests_count'   => 'Solicitudes',
     'city'  				=> 'Ciudad',
-	'click_here'			=> 'Pulsa aquí',
-    'clear_selection'		=> 'Eliminar Selección',
-    'companies'			    => 'Empresas',
+	'click_here'			=> 'Haz clic aquí',
+    'clear_selection'		=> 'Borrar selección',
+    'companies'			    => 'Compañías',
     'company'				=> 'Empresa',
     'component'			    => 'Componente',
     'components'			=> 'Componentes',
@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Admin Desconocido',
     'username_format'		=> 'Formato del nombre de usuario',
     'update'                => 'Actualizar',
-    'upload_filetypes_help'      => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
+    'upload_filetypes_help'      => 'Tipos de archivos permitidos: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.
 El tamaño máximo de archivo es :size.',
     'uploaded'              => 'Subido',
     'user'					=> 'Usuario',

resources/lang/es-CO/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/es-CO/validation.php

@@ -89,7 +89,6 @@ return array(
     'uploaded'             => 'El atributo: no se pudo cargar.',
     'url'                  => ':attribute formato incorrecto.',
     "unique_undeleted"     => "El :atrribute debe ser único.",
-    "import_field_empty"   => "El valor del Import Field no puede estar vacío.",
 
     /*
     |--------------------------------------------------------------------------

resources/lang/es-ES/general.php

@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Admin Desconocido',
     'username_format'		=> 'Formato del nombre de usuario',
     'update'                => 'Actualizar',
-    'upload_filetypes_help'      => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
+    'upload_filetypes_help'      => 'Tipos de archivos permitidos: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.
 El tamaño máximo de archivo es :size.',
     'uploaded'              => 'Subido',
     'user'					=> 'Usuario',

resources/lang/es-ES/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/es-ES/validation.php

@@ -89,7 +89,6 @@ return array(
     'uploaded'             => 'El atributo: no se pudo cargar.',
     'url'                  => ':attribute formato incorrecto.',
     "unique_undeleted"     => "El :atrribute debe ser único.",
-    "import_field_empty"   => "El valor del Import Field no puede estar vacío.",
 
     /*
     |--------------------------------------------------------------------------

resources/lang/es-MX/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/es-MX/validation.php

@@ -89,7 +89,6 @@ return array(
     'uploaded'             => 'El atributo: no se pudo cargar.',
     'url'                  => ':attribute formato incorrecto.',
     "unique_undeleted"     => "El :atrribute debe ser único.",
-    "import_field_empty"   => "El valor del Import Field no puede estar vacío.",
 
     /*
     |--------------------------------------------------------------------------

resources/lang/es-VE/admin/categories/general.php

@@ -6,7 +6,7 @@ return array(
     'asset_categories' 					=> 'Categorías de Activos',
     'category_name'  					=> 'Nombre de la Categoría',
     'checkin_email'                     => 'Enviar un correo al usuario al asignar/desasignar.',
-    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al asignar/desasignar.',
+    'checkin_email_notification'        => 'A este usuario se le enviará un correo electrónico al asignar/devolver.',
     'clone'                             => 'Clonar Categoría',
     'create'  							=> 'Crear Catergoría',
     'edit'                              => 'Editar Categoría',

resources/lang/es-VE/admin/custom_fields/general.php

@@ -28,5 +28,5 @@ return array(
     'create_fieldset'         => 'Nuevo Fieldset',
     'create_field'            => 'Nuevo Campo Personalizado',
     'value_encrypted'      	        => 'El valor de este campo está encriptado en la base de datos. Sólo los administradores podrán ver el valor desencriptado',
-    'show_in_email'     => '¿Incluir el valor de este campo en las notificaciones por correo de asignaciones de activos? Ten en cuenta que los campos encriptados no se pueden incluir en los correos electrónicos.',
+    'show_in_email'     => '¿Incluirá el valor de este campo en las notificaciones por correo de asignaciones de activos? Ten en cuenta que los campos cifrados no se pueden incluir en los correos electrónicos.',
 );

resources/lang/es-VE/general.php

@@ -206,7 +206,7 @@
     'unknown_admin'			=> 'Administrador Desconocido',
     'username_format'		=> 'Formato de Nombre de Usuario',
     'update'                => 'Actualizar',
-    'upload_filetypes_help'      => 'Algunos tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, rtf y rar. Tamaño máximo permitido: :size.',
+    'upload_filetypes_help'      => 'Tipos de archivos permitidos: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.
 El tamaño máximo de archivo es :size.',
     'uploaded'              => 'Actualizado',
     'user'					=> 'Usuario',

resources/lang/es-VE/help.php

@@ -0,0 +1,36 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Password Reminder Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are the default lines which match reasons
+    | that are given by the password broker for a password update attempt
+    | has failed, such as for an invalid token or invalid new password.
+    |
+    */
+
+    "more_info_title" => "More Info",
+
+    "audit_help" => "Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.<br><br>Note that is this asset is checked out, it will not change the location of the person, asset or location it is checked out to.",
+
+    'assets' => 'Assets are items tracked by serial number or asset tag.  They tend to be higher value items where identifying a specific item matters.',
+
+    'categories' => 'Categories help you organize your items. Some example categories might be &quot;Desktops&quot;, &quot;Laptops&quot;, &quot;Mobile Phones&quot;, &quot;Tablets&quot;, and so on, but you can use categories any way that makes sense for you.',
+
+    'accessories' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.',
+
+    'companies'     => 'Companies can be used as a simple identifier field, or can be used to limit visibility of assets, users, etc if full company support is enabled in your Admin settings.',
+
+    'components'    => 'Components are items that are part of an asset, for example HDD, RAM, etc.',
+
+    'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
+
+    'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
+
+
+
+);

resources/lang/es-VE/passwords.php

@@ -2,6 +2,6 @@
 
 return [
     'sent'	        => '¡El enlace de tu contraseña ha sido enviado!',
-    'user'			=> 'No se ha encontrado ningún usuario activo con ese correo electrónico.',
+    'user'			=> 'No se encontró ningún usuario activo con este correo electrónico.',
 ];
 

resources/lang/es-VE/validation.php

@@ -89,7 +89,6 @@ return array(
     'uploaded'             => 'El :attribute fallo al cargar.',
     'url'                  => 'El formato :attribute es inválido.',
     "unique_undeleted"     => "El :atrribute debe ser único.",
-    "import_field_empty"   => "El valor del Import Field no puede estar vacío.",
 
     /*
     |--------------------------------------------------------------------------