Bumped version

Updated language strings
Fixes #1102 - default currency stored as htmlentities in the DB
2015-08-25 19:40:08 -07:00 · 2015-08-24 12:59:35 -07:00 · 2015-08-21 18:11:23 -07:00 · 2015-08-21 16:00:03 -07:00 · 2015-08-21 12:19:25 -07:00 · 2015-08-21 10:42:37 -04:00
280 changed files with 2810 additions and 949 deletions
@@ -29,3 +29,5 @@ tests/_support/_generated/*
 tests/_data/scenarios
 nbproject/*
 app/config/local/ldap.php
+app/storage/dumps/*
+app/config/packages/schickling/backup/config.php
@@ -18,7 +18,7 @@ class SystemBackup extends Command {
 	 *
 	 * @var string
 	 */
-	protected $description = 'This commandcreates a database dump and zips up all of the uploaded files in the upload directories.';
+	protected $description = 'This command creates a database dump and zips up all of the uploaded files in the upload directories.';

 	/**
 	 * Create a new command instance.
@@ -7,7 +7,8 @@ return array(
    | URL
    |--------------------------------------------------------------------------
    |
-    | URL for the LDAP server.
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
    |
    */
    'url' => "",
@@ -18,7 +19,8 @@ return array(
    | Username
    |--------------------------------------------------------------------------
    |
-    | Username to use to connect authenticate to LDAP.
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
    |
    */
 	'username' => "",
@@ -38,7 +40,8 @@ return array(
    | Basedn
    |--------------------------------------------------------------------------
    |
-    | The base where the search for users will be executed.
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
    |
    */
 	'basedn'   => "",
@@ -49,7 +52,8 @@ return array(
    | Filter
    |--------------------------------------------------------------------------
    |
-    | The search filter for the LDAP query.
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
    |
    */
 	'filter' => "&(cn=*)",
@@ -71,24 +75,25 @@ return array(
    |
    */
    'result.username' => "",
-    'result.emp.num'  => "",
    'result.last.name'  => "",
    'result.first.name' => "",
-    'result.email' => "",

    /*
-    | This field is optional as not all LDAP directories will have it.  If yours
-    | does not have it, just leave this field blank and the extra check will
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
    | be omitted.
    */
    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",

    /*
    |--------------------------------------------------------------------------
    | LDAP filter query for authentication
    |--------------------------------------------------------------------------
    |
-    | The LDAP query that we want to execute when authenticating a user
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
    |
    */
    'authentication.filter.query' => "uid=",
@@ -98,7 +103,7 @@ return array(
    | LDAP Version
    |--------------------------------------------------------------------------
    |
-    | The LDAP query that we want to execute when authenticating a user
+    | Version of LDAP you are using.
    |
    */
    'version' => 3,
@@ -1,6 +1,6 @@
 <?php
 return array(
-	'path' => storage_path() . '/dumps/',
+	'path' => 'app/storage/dumps/',

 	'mysql' => array(
 		'dump_command_path' => '',
@@ -7,7 +7,8 @@ return array(
    | URL
    |--------------------------------------------------------------------------
    |
-    | URL for the LDAP server.
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
    |
    */
    'url' => "",
@@ -18,7 +19,8 @@ return array(
    | Username
    |--------------------------------------------------------------------------
    |
-    | Username to use to connect authenticate to LDAP.
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
    |
    */
 	'username' => "",
@@ -38,7 +40,8 @@ return array(
    | Basedn
    |--------------------------------------------------------------------------
    |
-    | The base where the search for users will be executed.
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
    |
    */
 	'basedn'   => "",
@@ -49,7 +52,8 @@ return array(
    | Filter
    |--------------------------------------------------------------------------
    |
-    | The search filter for the LDAP query.
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
    |
    */
 	'filter' => "&(cn=*)",
@@ -71,24 +75,25 @@ return array(
    |
    */
    'result.username' => "",
-    'result.emp.num'  => "",
    'result.last.name'  => "",
    'result.first.name' => "",
-    'result.email' => "",

    /*
-    | This field is optional as not all LDAP directories will have it.  If yours
-    | does not have it, just leave this field blank and the extra check will
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
    | be omitted.
    */
    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",

    /*
    |--------------------------------------------------------------------------
    | LDAP filter query for authentication
    |--------------------------------------------------------------------------
    |
-    | The LDAP query that we want to execute when authenticating a user
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
    |
    */
    'authentication.filter.query' => "uid=",
@@ -98,7 +103,7 @@ return array(
    | LDAP Version
    |--------------------------------------------------------------------------
    |
-    | The LDAP query that we want to execute when authenticating a user
+    | Version of LDAP you are using.
    |
    */
    'version' => 3,
@@ -7,7 +7,8 @@ return array(
    | URL
    |--------------------------------------------------------------------------
    |
-    | URL for the LDAP server.
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
    |
    */
    'url' => "",
@@ -18,7 +19,8 @@ return array(
    | Username
    |--------------------------------------------------------------------------
    |
-    | Username to use to connect authenticate to LDAP.
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
    |
    */
 	'username' => "",
@@ -38,7 +40,8 @@ return array(
    | Basedn
    |--------------------------------------------------------------------------
    |
-    | The base where the search for users will be executed.
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
    |
    */
 	'basedn'   => "",
@@ -49,7 +52,8 @@ return array(
    | Filter
    |--------------------------------------------------------------------------
    |
-    | The search filter for the LDAP query.
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
    |
    */
 	'filter' => "&(cn=*)",
@@ -71,24 +75,25 @@ return array(
    |
    */
    'result.username' => "",
-    'result.emp.num'  => "",
    'result.last.name'  => "",
    'result.first.name' => "",
-    'result.email' => "",

    /*
-    | This field is optional as not all LDAP directories will have it.  If yours
-    | does not have it, just leave this field blank and the extra check will
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
    | be omitted.
    */
    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",

    /*
    |--------------------------------------------------------------------------
    | LDAP filter query for authentication
    |--------------------------------------------------------------------------
    |
-    | The LDAP query that we want to execute when authenticating a user
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
    |
    */
    'authentication.filter.query' => "uid=",
@@ -98,7 +103,7 @@ return array(
    | LDAP Version
    |--------------------------------------------------------------------------
    |
-    | The LDAP query that we want to execute when authenticating a user
+    | Version of LDAP you are using.
    |
    */
    'version' => 3,
@@ -7,7 +7,8 @@ return array(
    | URL
    |--------------------------------------------------------------------------
    |
-    | URL for the LDAP server.
+    | URL for the LDAP server. This should start with ldap://, for example:
+    | ldap://ldap.yourserver.com
    |
    */
    'url' => "",
@@ -18,7 +19,8 @@ return array(
    | Username
    |--------------------------------------------------------------------------
    |
-    | Username to use to connect authenticate to LDAP.
+    | Username to use to connect authenticate to LDAP, for example:
+    | cn=read-only-admin,dc=example,dc=com
    |
    */
 	'username' => "",
@@ -38,7 +40,8 @@ return array(
    | Basedn
    |--------------------------------------------------------------------------
    |
-    | The base where the search for users will be executed.
+    | The base where the search for users will be executed, for example:
+    | dc=example,dc=com
    |
    */
 	'basedn'   => "",
@@ -49,7 +52,8 @@ return array(
    | Filter
    |--------------------------------------------------------------------------
    |
-    | The search filter for the LDAP query.
+    | The search filter for the LDAP query. This probably does not have to be
+    | changed.
    |
    */
 	'filter' => "&(cn=*)",
@@ -71,24 +75,25 @@ return array(
    |
    */
    'result.username' => "",
-    'result.emp.num'  => "",
    'result.last.name'  => "",
    'result.first.name' => "",
-    'result.email' => "",

    /*
-    | This field is optional as not all LDAP directories will have it.  If yours
-    | does not have it, just leave this field blank and the extra check will
+    | These fields are optional as not all LDAP directories will have it.  If yours
+    | does not have them, just leave these blank and the extra check will
    | be omitted.
    */
    'result.active.flag' => "",
+    'result.emp.num'  => "",
+    'result.email' => "",

    /*
    |--------------------------------------------------------------------------
    | LDAP filter query for authentication
    |--------------------------------------------------------------------------
    |
-    | The LDAP query that we want to execute when authenticating a user
+    | The LDAP query that we want to execute when authenticating a user. This
+    | should not have to be changed.
    |
    */
    'authentication.filter.query' => "uid=",
@@ -98,7 +103,7 @@ return array(
    | LDAP Version
    |--------------------------------------------------------------------------
    |
-    | The LDAP query that we want to execute when authenticating a user
+    | Version of LDAP you are using.
    |
    */
    'version' => 3,
@@ -1,5 +1,5 @@
 <?php
 return array (
-  'app_version' => 'v2.0-pre',
-  'hash_version' => 'v2.0-pre-beta-391-ge49cfb4',
-);
+  'app_version' => 'v2.0',
+  'hash_version' => 'v2.0-RC-1-11-gda6770c',
+);
@@ -18,24 +18,26 @@ class AuthController extends BaseController
        return View::make('frontend.auth.signin');
    }

-    
+
    /**
     * Authenticates a user to LDAP
-     * 
+     *
     * @return  true    if the username and/or password provided are valid
     *          false   if the username and/or password provided are invalid
-     * 
+     *
     */
    function ldap($username, $password) {
-        
+
        $ldaphost    = Config::get('ldap.url');
        $ldaprdn     = Config::get('ldap.username');
        $ldappass    = Config::get('ldap.password');
        $baseDn      = Config::get('ldap.basedn');
        $filterQuery = Config::get('ldap.authentication.filter.query') . $username;
-	
+
 	// Connecting to LDAP
 	$connection = ldap_connect($ldaphost) or die("Could not connect to {$ldaphost}");
+    // Needed for AD
+    ldap_set_option($connection, LDAP_OPT_REFERRALS, 0);

        try {
            if ($connection) {
@@ -54,10 +56,10 @@ class AuthController extends BaseController
            LOG::error($e->getMessage());
        }
 	ldap_close($connection);
-	return false;	
+	return false;
    }
-    
-    
+
+
    /**
     * Account sign in form processing.
     *
@@ -81,15 +83,15 @@ class AuthController extends BaseController
        }

        try {
-            
+
            /**
             * =================================================================
             * Hack in LDAP authentication
             */
-            
+
            // Try to get the user from the database.
            $user = (array) DB::table('users')->where('username', Input::get('username'))->first();
-            
+
            if ($user && strpos($user["notes"],'LDAP') !== false) {
                LOG::debug("Authenticating user against LDAP.");
                if( $this->ldap(Input::get('username'), Input::get('password')) ) {
@@ -114,7 +116,7 @@ class AuthController extends BaseController
                // Try to log the user in
                Sentry::authenticate(Input::only('username', 'password'), Input::get('remember-me', 0));
            }
-            
+
            // Get the page we were before
            $redirect = Session::get('loginRedirect', 'account');

@@ -12,6 +12,9 @@ use Actionlog;
 use Lang;
 use Accessory;
 use DB;
+use Slack;
+use Setting;
+use Config;

 class ViewAssetsController extends AuthorizedController
 {
@@ -66,7 +69,38 @@ class ViewAssetsController extends AuthorizedController
            $logaction->user_id = Sentry::getUser()->id;
            $log = $logaction->logaction('requested');

-            return Redirect::route('requestable-assets')->with('success')->with('success', Lang::get('admin/hardware/message.asset_requested'));
+            $settings = Setting::getSettings();
+
+			if ($settings->slack_endpoint) {
+
+
+				$slack_settings = [
+				    'username' => $settings->botname,
+				    'channel' => $settings->slack_channel,
+				    'link_names' => true
+				];
+
+				$client = new \Maknz\Slack\Client($settings->slack_endpoint,$slack_settings);
+
+				try {
+						$client->attach([
+						    'color' => 'good',
+						    'fields' => [
+						        [
+						            'title' => 'REQUESTED:',
+						            'value' => strtoupper($logaction->asset_type).' asset <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.$asset->showAssetName().'> requested by <'.Config::get('app.url').'/hardware/'.$asset->id.'/view'.'|'.Sentry::getUser()->fullName().'>.'
+						        ]
+
+						    ]
+						])->send('Asset Requested');
+
+					} catch (Exception $e) {
+
+					}
+
+			}
+
+            return Redirect::route('requestable-assets')->with('success')->with('success', Lang::get('admin/hardware/message.requests.success'));
        }


@@ -62,7 +62,7 @@ class AssetsController extends AdminController
        $manufacturer_list = manufacturerList();
        $category_list = categoryList();
        $supplier_list = suppliersList();
-        $assigned_to = assignedToList();
+        $assigned_to = usersList();
        $statuslabel_types = statusTypeList();

        $view = View::make('backend/hardware/edit');
@@ -213,7 +213,7 @@ class AssetsController extends AdminController
        $manufacturer_list = manufacturerList();
        $category_list = categoryList();
        $supplier_list = suppliersList();
-        $assigned_to = assignedToList();
+        $assigned_to = usersList();
        $statuslabel_types = statusTypeList();

        return View::make('backend/hardware/edit', compact('asset'))
@@ -372,7 +372,7 @@ class AssetsController extends AdminController
        }

        // Get the dropdown of users and then pass it to the checkout view
-        $users_list = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+        $users_list = usersList();

        return View::make('backend/hardware/checkout', compact('asset'))->with('users_list',$users_list);

@@ -427,7 +427,7 @@ class AssetsController extends AdminController
        }


-        if ($asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')))) {
+        if ($asset->checkOutToUser($user, $admin, $checkout_at, $expected_checkin, e(Input::get('note')), e(Input::get('name')))) {
            // Redirect to the new asset page
            return Redirect::to("hardware")->with('success', Lang::get('admin/hardware/message.checkout.success'));
        }
@@ -655,7 +655,8 @@ class AssetsController extends AdminController
        $manufacturer_list = manufacturerList();
        $category_list = categoryList();
        $supplier_list = suppliersList();
-        $assigned_to = assignedToList();
+        $assigned_to = usersList();
+        $statuslabel_types = statusTypeList();

        $asset = clone $asset_to_clone;
        $asset->id = null;
@@ -667,6 +668,7 @@ class AssetsController extends AdminController
        ->with('supplier_list',$supplier_list)
        ->with('model_list',$model_list)
        ->with('statuslabel_list',$statuslabel_list)
+        ->with('statuslabel_types',$statuslabel_types)
        ->with('assigned_to',$assigned_to)
        ->with('asset',$asset)
        ->with('location_list',$location_list)
@@ -1019,7 +1021,7 @@ class AssetsController extends AdminController
      	{
        	if ($assets->deleted_at=='') {
        		return '<div style=" white-space: nowrap;"><a href="'.route('clone/hardware', $assets->id).'" class="btn btn-info btn-sm" title="Clone asset"><i class="fa fa-files-o"></i></a> <a href="'.route('update/hardware', $assets->id).'" class="btn btn-warning btn-sm"><i class="fa fa-pencil icon-white"></i></a> <a data-html="false" class="btn delete-asset btn-danger btn-sm" data-toggle="modal" href="'.route('delete/hardware', $assets->id).'" data-content="'.Lang::get('admin/hardware/message.delete.confirm').'" data-title="'.Lang::get('general.delete').' '.htmlspecialchars($assets->asset_tag).'?" onClick="return false;"><i class="fa fa-trash icon-white"></i></a></div>';
-        	} elseif ($assets->model->deleted_at=='') {
+        	} elseif ($assets->deleted_at!='') {
        		return '<a href="'.route('restore/hardware', $assets->id).'" class="btn btn-warning btn-sm"><i class="fa fa-recycle icon-white"></i></a>';
        	}

@@ -36,7 +36,7 @@ class CategoriesController extends AdminController
    public function getCreate()
    {
        // Show the page
-         $category_types= array('' => '', 'asset' => 'Asset', 'accessory' => 'Accessory', 'consumable' => 'Consumable');
+         $category_types= categoryTypeList();
        return View::make('backend/categories/edit')->with('category',new Category)
        ->with('category_types',$category_types);
    }
@@ -909,9 +909,12 @@ class LicensesController extends AdminController
        ->addColumn('purchase_date', function($licenses) {
            return $licenses->purchase_date;
        })
+        ->addColumn('notes', function($licenses) {
+            return $licenses->notes;
+        })
        ->addColumn($actions)
-        ->searchColumns('name','serial','totalSeats','remaining','purchase_date','actions')
-        ->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions')
+        ->searchColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes')
+        ->orderColumns('name','serial','totalSeats','remaining','purchase_date','actions','notes')
        ->make();
    }

@@ -75,7 +75,7 @@ class LocationsController extends AdminController
            } else {
                $location->parent_id		= e(Input::get('parent_id'));
            }
-            $location->currency			= e(Input::get('currency'));
+            $location->currency			= Input::get('currency','$');
            $location->address			= e(Input::get('address'));
            $location->address2			= e(Input::get('address2'));
            $location->city    			= e(Input::get('city'));
@@ -202,7 +202,7 @@ class LocationsController extends AdminController
            } else {
                $location->parent_id		= e(Input::get('parent_id',''));
            }
-            $location->currency			= e(Input::get('currency'));
+            $location->currency			= Input::get('currency','$');
            $location->address			= e(Input::get('address'));
            $location->address2			= e(Input::get('address2'));
            $location->city    			= e(Input::get('city'));
@@ -40,9 +40,9 @@ class ModelsController extends AdminController
    public function getCreate()
    {
        // Show the page
-        $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::lists('name', 'id');
-        $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
-        $category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
+        $depreciation_list = depreciationList();
+        $manufacturer_list = manufacturerList();
+        $category_list = categoryList();
        $view = View::make('backend/models/edit');
        $view->with('category_list',$category_list);
        $view->with('depreciation_list',$depreciation_list);
@@ -18,6 +18,7 @@ use Location;
 use Model;
 use Redirect;
 use Setting;
+use User;

 class ReportsController extends AdminController
 {
@@ -119,7 +119,7 @@ class SettingsController extends AdminController
            $setting->qr_code = e(Input::get('qr_code', '0'));
            $setting->barcode_type = e(Input::get('barcode_type'));
            $setting->load_remote = e(Input::get('load_remote', '0'));
-            $setting->default_currency = e(Input::get('default_currency', '$'));
+            $setting->default_currency = Input::get('default_currency', '$');
            $setting->qr_text = e(Input::get('qr_text'));
            $setting->auto_increment_prefix = e(Input::get('auto_increment_prefix'));
            $setting->auto_increment_assets = e(Input::get('auto_increment_assets', '0'));
@@ -80,13 +80,8 @@ class UsersController extends AdminController {
        $userPermissions = Input::old('permissions', array('superuser' => -1));
        $this->encodePermissions($userPermissions);

-        $location_list = array('' => '') + Location::lists('name', 'id');
-        $manager_list = array('' => '') + DB::table('users')
-                        ->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))
-                        ->whereNull('deleted_at', 'and')
-                        ->orderBy('last_name', 'asc')
-                        ->orderBy('first_name', 'asc')
-                        ->lists('full_name', 'id');
+        $location_list = locationsList();
+        $manager_list = managerList();

        /* echo '<pre>';
          print_r($userPermissions);
@@ -1048,12 +1043,17 @@ class UsersController extends AdminController {
        // Selected permissions
        $selectedPermissions = Input::old('permissions', array('superuser' => -1));
        $this->encodePermissions($selectedPermissions);
+        
+        $location_list = locationsList();
+                        
        // Show the page
-        return View::make('backend/users/ldap', compact('groups', 'selectedGroups', 'permissions', 'selectedPermissions'));
+        return View::make('backend/users/ldap', compact('groups', 'selectedGroups', 'permissions', 'selectedPermissions'))
+                        ->with('location_list', $location_list);
+        
    }

    /**
-     * Declare the rules for the form validation
+     * Declare the rules for the ldap fields validation.
     *
     * @var array
     */
@@ -1064,6 +1064,15 @@ class UsersController extends AdminController {
        'username' => 'required|min:2|unique:users,username',
        'email' => 'email|unique:users,email',
    );
+    
+    /**
+     * Declare the rules for the form validation.
+     *
+     * @var array
+     */
+    protected $ldapFormInputValidationRules = array(
+        'location_id' => 'required|numeric'
+    );

    /**
     * LDAP form processing.
@@ -1073,6 +1082,15 @@ class UsersController extends AdminController {
     */
    public function postLDAP() {

+        $location_id = Input::get('location_id');
+        
+        $formValidator = Validator::make(Input::all(), $this->ldapFormInputValidationRules);
+        // If validation fails, we'll exit the operation now.
+        if ($formValidator->fails()) {
+            // Ooops.. something went wrong
+            return Redirect::back()->withInput()->withErrors($formValidator);
+        }
+        
        $ldap_version = Config::get('ldap.version');
        $url = Config::get('ldap.url');
        $username = Config::get('ldap.username');
@@ -1090,6 +1108,10 @@ class UsersController extends AdminController {

        // Connect to LDAP server
        $ldapconn = @ldap_connect($url);
+
+        // Needed for AD
+        ldap_set_option($ldapconn, LDAP_OPT_REFERRALS, 0);
+
        if (!$ldapconn) {
            return Redirect::route('users')->with('error', Lang::get('admin/users/message.error.ldap_could_not_connect'));
        }
@@ -1138,7 +1160,15 @@ class UsersController extends AdminController {

                    $validator = Validator::make($item, $this->ldapValidationRules);
                    if ($validator->fails()) {
-                        $item["note"] = "Validator failed: " . $validator->messages();
+                        $validator_msg = '';
+
+                		foreach($validator->messages()->all() as $key)
+                		{
+                			$validator_msg .= '<li>'.$key;
+                		}
+
+                        $item["note"] = '<span class="alert-msg">Validator failed: <br>'.$validator_msg.'</span>';
+
                    } else {

                        // Create the user if they don't exist.
@@ -1152,7 +1182,7 @@ class UsersController extends AdminController {
                            'employee_num' => $item["employee_number"],
                            'password' => $pass,
                            'activated' => 1,
-                            'location_id' => 1,
+                            'location_id' => $location_id,
                            'permissions' => '{"user":1}',
                            'notes' => 'Imported from LDAP'
                        );
@@ -16,40 +16,43 @@ function ParseFloat($floatString){

 function modelList() {
    $model_list = array('' => Lang::get('general.select_model')) + DB::table('models')
-    ->select(DB::raw('IF (modelno="" OR modelno IS NULL,name,concat(name, " / ",modelno)) as name, id'))->orderBy('name', 'asc')
-    ->orderBy('modelno', 'asc')
+    ->select(DB::raw('IF (modelno="" OR modelno IS NULL,name,concat(name, " / ",modelno)) as name, id'))
+    ->orderBy('name', 'asc')
    ->whereNull('deleted_at')
    ->lists('name', 'id');
    return $model_list;
 }

 function categoryList() {
-    $category_list = array('' => '') + DB::table('categories')->whereNull('deleted_at')->lists('name', 'id');
+    $category_list = array('' => '') + DB::table('categories')
+    ->whereNull('deleted_at')
+    ->orderBy('name', 'asc')
+    ->lists('name', 'id');
    return $category_list;
 }

 function suppliersList() {
-    $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')->lists('name', 'id');
+    $supplier_list = array('' => Lang::get('general.select_supplier')) + Supplier::orderBy('name', 'asc')
+    ->orderBy('name', 'asc')
+    ->lists('name', 'id');
    return $supplier_list;
 }

-function assignedToList() {
-    $assigned_to = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(first_name," ",last_name) as full_name, id'))->whereNull('deleted_at')->lists('full_name', 'id');
-    return $assigned_to;
-}
-
 function statusLabelList() {
-    $statuslabel_list = Statuslabel::lists('name', 'id');
+    $statuslabel_list = Statuslabel::orderBy('name', 'asc')
+    ->lists('name', 'id');
    return $statuslabel_list;
 }

 function locationsList() {
-    $location_list = array('' => Lang::get('general.select_location')) + Location::lists('name', 'id');
+    $location_list = array('' => Lang::get('general.select_location')) + Location::orderBy('name', 'asc')
+    ->lists('name', 'id');
    return $location_list;
 }

 function manufacturerList() {
-    $manufacturer_list = array('' => 'Select One') + Manufacturer::lists('name', 'id');
+    $manufacturer_list = array('' => 'Select One') + Manufacturer::orderBy('name', 'asc')
+    ->lists('name', 'id');
    return $manufacturer_list;
 }

@@ -57,3 +60,28 @@ function statusTypeList() {
    $statuslabel_types = array('' => Lang::get('admin/hardware/form.select_statustype')) + array('undeployable' => Lang::get('admin/hardware/general.undeployable')) + array('pending' => Lang::get('admin/hardware/general.pending')) + array('archived' => Lang::get('admin/hardware/general.archived')) + array('deployable' => Lang::get('admin/hardware/general.deployable'));
    return $statuslabel_types;
 }
+
+function managerList() {
+    $manager_list = array('' => '') + DB::table('users')
+    ->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))
+    ->whereNull('deleted_at', 'and')
+    ->orderBy('last_name', 'asc')
+    ->orderBy('first_name', 'asc')
+    ->lists('full_name', 'id');
+    return $manager_list;
+}
+
+function depreciationList() {
+    $depreciation_list = array('' => 'Do Not Depreciate') + Depreciation::orderBy('name', 'asc')->lists('name', 'id');
+    return $depreciation_list;
+}
+
+function categoryTypeList() {
+     $category_types= array('' => '','accessory' => 'Accessory', 'asset' => 'Asset', 'consumable' => 'Consumable');
+     return $category_types;
+}
+
+function usersList() {
+    $users_list = array('' => Lang::get('general.select_user')) + DB::table('users')->select(DB::raw('concat(last_name,", ",first_name," (",username,")") as full_name, id'))->whereNull('deleted_at')->orderBy('last_name', 'asc')->orderBy('first_name', 'asc')->lists('full_name', 'id');
+    return $users_list;
+}
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'الأرشيف الخاص بـ :name',
    'last_login'        => 'آخر دخول للمستخدم',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'البرامج المسجلة لـ :name',
    'view_user'         => 'عرض المستخدم :name',
    'usercsv'           => 'ملف CSV',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'كلمة السر مطلوبة.',
    'insufficient_permissions'  => 'صلاحيات غير كافية.',
    'user_deleted_warning'      => 'تم حذف المستخدم. سيكون عليك استعادة هذا المستخدم للتعديل عليه او تسليمه اجهزة جديدة.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'حدث خطأ أثناء استيراد المستخدمين. حاول مرة أخرى.',
        'asset_already_accepted' => 'هذا الجهاز تم قبوله مسبقاً.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accessories',
    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'العنوان',
@@ -59,6 +60,7 @@
    'id'  					=> 'الرقم',
    'image_delete'         	=> 'حذف الصورة',
    'image_upload'         	=> 'رفع صورة',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Povolené přílohy: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'Historie:',
    'last_login'        => 'Poslední přihlášení',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software vydaný pro :name',
    'view_user'         => 'Zobraz uživatele',
    'usercsv'           => 'CSV soubor',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'Je vyžadováno heslo.',
    'insufficient_permissions'  => 'Nedostatečná oprávnění.',
    '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.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Příslušenství',
    'accessory'				=> 'Příslušenství',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Akce',
    'activity_report'		=> 'Report aktivity',
    'address'				=> 'Adresa',
@@ -59,6 +60,7 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Smazat obrázek',
    'image_upload'         	=> 'Nahrát obrázek',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
    'usercsv'           => 'CSV file',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'The password is required.',
    '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.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Tilbehør',
    'accessory'				=> 'Tilbehør',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Addresse',
@@ -59,6 +60,7 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Slet billede',
    'image_upload'         	=> 'Upload billede',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -20,7 +20,7 @@ return array(
    'expected_checkin'  => 'Erwartetes Liederdatum',
    'expires'			=> 'Gültig bis',
    'fully_depreciated'	=> 'Komplett Abgeschrieben',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
+    'help_checkout'		=> 'Um das Asset sofort zu zuweisen, "bereit zum Aufstellen" in der Status-Liste unten auswählen. ',
    'mac_address'		=> 'MAC Adresse',
    'manufacturer'		=> 'Hersteller',
    'model'				=> 'Modell',
@@ -5,7 +5,7 @@ return array(
    'undeployable' 		=> '<strong>Achtung:</strong>Dieses Asset wurde kürzlich als nicht verteilbar markiert.
                        Falls sich dieser Status verändert hat, aktualisieren Sie bitte den Asset Status.',
    'does_not_exist' 	=> 'Asset existiert nicht.',
-    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
+    'does_not_exist_or_not_requestable' => 'Netter Versuch. Das Asset existiert nicht oder ist nicht abrufbar.',
    'assoc_users'	 	=> 'Dieses Asset ist im Moment an einen Benutzer herausgegeben und kann nicht entfernt werden. Bitte buchen sie das Asset wieder ein und versuchen Sie dann erneut es zu entfernen. ',

    'create' => array(
@@ -32,7 +32,7 @@ return array(
    'upload' => array(
        'error'   => 'Datei(en) wurde nicht hochgeladen. Bitte noch einmal Probieren.',
        'success' => 'Datei(en) erfolgreich hochgeladen.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'nofiles' => 'Es wurde keine Datei für den Upload ausgewählt, oder die Datei ist zu groß',
        'invalidfiles' => 'Eine oder mehrere Ihrer Dateien ist zu groß oder deren Dateityp ist nicht zugelassen. Zugelassene Dateitypen sind png, gif, jpg, doc, docx, pdf, und txt.',
    ),

@@ -18,6 +18,6 @@ return array(
    'serial'   		=> 'Seriennummer',
    'status'   		=> 'Status',
    'title'      	=> 'Asset ',
-    'days_without_acceptance' => 'Days Without Acceptance'
+    'days_without_acceptance' => 'Tage ohne Akzeptierung'

 );
@@ -22,7 +22,7 @@ return array(
    'upload' => array(
        'error'   => 'Datei(en) wurden nicht hochgeladen. Bitte versuchen Sie es noch einmal.',
        'success' => 'Datei(en) erfolgreich hochgeladen.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'nofiles' => 'Es wurde keine Datei für den Upload ausgewählt, oder die Datei ist zu groß',
        'invalidfiles' => 'Eine oder mehrere Ihrer Datei(en) sind zu groß oder ein Dateityp ist nicht erlaubt. Erlaubte Dateitypen sind png, gif, jpg, doc, docx, pdf, and txt.',
    ),

@@ -4,8 +4,8 @@ return array(

    'does_not_exist' => 'Standort nicht verfügbar.',
    'assoc_users'	 => 'Dieser Standort ist mit mindestens einem Benutzer verknüpft und kann nicht gelöscht werden. Bitte Benutzer updaten, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ',
-    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
-    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assoc_assets'	 => 'Dieser Ort ist mit mindestens einem Asset verknüpft und kann nicht gelöscht werden. Bitte Asset updaten, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ',
+    'assoc_child_loc'	 => 'Dieser Ort ist mit mindestens einem anderen Ort übergeordnet und kann nicht gelöscht werden. Bitte Orte aktualisieren, so dass dieser Standort nicht mehr verknüpft ist und erneut versuchen. ',


    'create' => array(
@@ -9,7 +9,7 @@ return array(
    'create' => array(
        'error'   => 'Modell wurde nicht erstellt. Bitte versuch es noch einmal.',
        'success' => 'Modell wurde erfolgreich erstellt.',
-        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
+        'duplicate_set' => 'Ein Asset Modell mit diesem Namen, Hersteller und Modell Nummer existiert bereits.',
    ),

    'update' => array(
@@ -10,7 +10,7 @@ return array(
 	'backups'					=> 'Sicherungen',
 	'barcode_type'				=> 'Barcode Typ',
 	'barcode_settings'			=> 'Barcode Einstellungen',
-	'default_currency'  		=> 'Default Currency',
+	'default_currency'  		=> 'Standard Währung',
 	'default_eula_text'			=> 'Standard EULA',
 	'default_eula_help_text'	=> 'Sie können ebenfalls eigene EULA\'s mit spezifischen Asset Kategorien verknüpfen.',
    'display_asset_name'        => 'Zeige Assetname an',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, und rar.',
    'history_user'      => 'Historie von :name',
    'last_login'        => 'Letzte Anmeldung',
+    'ldap_config_text'  => 'LDAP Einstellungen befinden sich im app/config Ordner in der Datei LDAP.php',
+    'ldap_text'         => 'Mit LDAP verbinden und Benutzer anlegen. Passwörter werden automatisch generiert.',
    'software_user'     => 'Software herausgegeben an :name',
    'view_user'         => 'Benutze :name ansehen',
    'usercsv'           => 'CSV Datei',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'Das Passswortfeld ist erforderlich.',
    'insufficient_permissions'  => 'Unzureichende Berechtigungen.',
    'user_deleted_warning'      => 'Dieser Benutzer wurde gelöscht. Sie müssen ihn wiederherstellen, um ihn zu bearbeiten oder neue Assets zuzuweisen.',
+    'ldap_not_configured'        => 'LDAP Integration wurde für diese Installation nicht konfiguriert.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'Es gab ein Problem beim importieren der Benutzer. Bitte noch einmal versuchen.',
        'asset_already_accepted' => 'Dieses Asset wurde bereits akzeptiert.',
        'accept_or_decline' => 'Sie müssen diesen Gegenstand entweder annehmen oder ablehnen.',
+        'ldap_could_not_connect' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
+        'ldap_could_not_bind' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server: ',
+        'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
+        'ldap_could_not_get_entries' => 'Konnte keine Einträge vom LDAP Server abrufen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen. <br>Fehler vom LDAP Server:',
    ),

    'deletefile' => array(
@@ -8,7 +8,7 @@ return array(
    'delete'  	=> 'Löschen',
    'edit'    	=> 'Bearbeiten',
    'restore' 	=> 'Wiederherstellen',
-    'request'   => 'Request',
+    'request'   => 'Anfragen',
    'submit'  	=> 'Abschicken',
    'upload'    => 'Hochladen',

@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Zubehör',
    'accessory'				=> 'Zubehör',
+    'accessory_report'			=> 'Zubehör Bericht',
    'action'                => 'Aktion',
    'activity_report'		=> 'Aktivitätsreport',
    'address'				=> 'Supplier Address',
@@ -19,7 +20,7 @@
    'avatar_delete'         => 'Avatar löschen',
    'avatar_upload'         => 'Avatar hochladen',
    'back'      			=> 'Zurück',
-    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'bad_data'      		=> 'Nichts gefunden. Vielleicht defekte Daten?',
    'cancel'  				=> 'Abbrechen',
    'categories'			=> 'Kategorien',
    'category'				=> 'Kategorie',
@@ -59,9 +60,10 @@
    'id'  					=> 'Id',
    'image_delete'         	=> 'Bild löschen',
    'image_upload'         	=> 'Bild hinzufügen',
-    'asset_maintenance'        => 'Asset Maintenance',
-    'asset_maintenance_report' => 'Asset Maintenance Report',
-    'asset_maintenances'       => 'Asset Maintenances',
+    'import'         	    => 'Import',
+    'asset_maintenance'        => 'Asset Wartung',
+    'asset_maintenance_report' => 'Asset Wartungsbericht',
+    'asset_maintenances'       => 'Asset Wartungen',
    'item'  				=> 'Gegenstand',
    'last'					=> 'Letztes',
    'last_name'				=> 'Familienname',
@@ -71,8 +73,8 @@
    'licenses'				=> 'Lizenzen',
    'list_all'				=> 'Alle auflisten',
    'loading'				=> 'Am laden',
-    'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'lock_passwords'        => 'Dieses Feld kann in dieser Installation nicht bearbeitet werden.',
+    'feature_disabled'      => 'Die Funktion wurde in dieser Installation deaktiviert.',
    'location'              => 'Standort',
    'locations'				=> 'Standorte',
    'logout'				=> 'Abmelden',
@@ -100,7 +102,7 @@
    'ready_to_deploy'		=> 'Fertig zum herausgeben',
    'recent_activity'		=> 'Letzte Aktivität',
    'reports'				=> 'Berichte',
-    'requested'				=> 'Requested',
+    'requested'				=> 'Angefragt',
    'save'  				=> 'Speichern',
    'select'				=> 'auswählen',
    'search'				=> 'Suche',
@@ -111,7 +113,7 @@
    'select_supplier'		=> 'wählen Sie einen Lieferant',
    'select_user'			=> 'wähle einen Benutzer',
    'select_date'			=> 'Datum auswählen',
-    'select_statuslabel'	=> 'Select Status',
+    'select_statuslabel'	=> 'Status auswählen',
    'settings'				=> 'Einstellungen',
    'sign_in'				=> 'Einloggen',
    'site_name'				=> 'Seitenname',
@@ -124,12 +126,12 @@
    'type'  				=> 'Typ',
    'undeployable'			=> 'Nicht herausgebbar',
    'unknown_admin'			=> 'Unbekannter Administrator',
-    'update'                => 'Update',
+    'update'                => 'Aktualisieren',
    'uploaded'              => 'Hochgeladen',
    'user'					=> 'Nutzer',
-    'accepted'			    => 'accepted',
-    'declined'			    => 'declined',
-    'unaccepted_asset_report' => 'Unaccepted Assets',
+    'accepted'			    => 'angenommen',
+    'declined'			    => 'abgelehnt',
+    'unaccepted_asset_report' => 'Nicht akzeptierte Assets',
    'users'                 => 'Benutzer',
    'viewassets'  			=> 'Zugeordnete Assets anzeigen',
    'website'               => 'Webseite',
@@ -77,7 +77,7 @@ return array(
    */

    'custom' => array(),
-    'alpha_space' => "The :attribute field contains a character that is not allowed.",
+    'alpha_space' => "Das :attribute Feld enthält ein nicht erlaubtes Zeichen.",

    /*
    |--------------------------------------------------------------------------
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
    'usercsv'           => 'CSV file',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'The password is required.',
    '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.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accessories',
    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Address',
@@ -59,6 +60,7 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Delete Image',
    'image_upload'         	=> 'Upload Image',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
    'usercsv'           => 'CSV file',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'The password is required.',
    '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.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accessories',
    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Address',
@@ -59,6 +60,7 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Delete Image',
    'image_upload'         	=> 'Upload Image',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -1,10 +1,9 @@
 <?php

 return array(
-    'dl_csv'			=> 'Download CSV',
-    'eula_text'			=> 'EULA',
-    'id'			=> 'ID',
-    'require_acceptance'	=> 'Acceptance',
-    'title'			=> 'Accessory Name',
+	'eula_text'      			=> 'EULA',
+    'id'      					=> 'ID',
+    'require_acceptance'      	=> 'Acceptance',
+    'title'      				=> 'Accessory Name',

 );
@@ -10,7 +10,7 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
-    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.',
    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
@@ -33,10 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
-        '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_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: ',
+        '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:',
    ),

    'deletefile' => array(
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
    'usercsv'           => 'CSV file',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'The password is required.',
    '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.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accessories',
    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Address',
@@ -59,6 +60,7 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Delete Image',
    'image_upload'         	=> 'Upload Image',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
    'history_user'      => 'Historial de :name',
    'last_login'        => 'Último acceso',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software asignado a :name',
    'view_user'         => 'Ver Usuario :name',
    'usercsv'           => 'Archivo CSV',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'El password es obligatorio.',
    'insufficient_permissions'  => 'No tiene permiso.',
    'user_deleted_warning'      => 'Este usuario ha sido eliminado. Deberá restaurarlo para editarlo o asignarle nuevos Equipos.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'Ha habido un problema importando los usuarios. Por favor intente nuevamente.',
        'asset_already_accepted' => 'Este equipo ya ha sido aceptado.',
        'accept_or_decline' => 'Debe aceptar o declinar este equipo.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accesorios',
    'accessory'				=> 'Accesorio',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Acción',
    'activity_report'		=> 'Reporte de Actividad',
    'address'				=> 'Dirección',
@@ -59,6 +60,7 @@
    'id'  					=> 'Id',
    'image_delete'         	=> 'Borrar imagen',
    'image_upload'         	=> 'Enviar imagen',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Mantenimiento de Equipo',
    'asset_maintenance_report' => 'Reporte de Mantenimiento de Equipo',
    'asset_maintenances'       => 'Mantenimientos de Equipo',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'Historia käyttäjälle :name',
    'last_login'        => 'Viimeisin kirjautuminen',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Käyttäjälle :name luovutetut ohjelmistot',
    'view_user'         => 'Näytä Käyttäjä :name',
    'usercsv'           => 'CSV file',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'Salasana vaaditaan.',
    'insufficient_permissions'  => 'Riittämättömät Oikeudet.',
    'user_deleted_warning'      => 'Käyttäjä on jo poistettu. Mikäli haluat muokata tai luovuttaa laitteita hänelle sinun tulee palauttaa käyttäjä.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accessories',
    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Osoite',
@@ -59,6 +60,7 @@
    'id'  					=> 'Tunnus',
    'image_delete'         	=> 'Poista Kuva',
    'image_upload'         	=> 'Lähetä Kuva',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'Historique pour :name',
    'last_login'        => 'Dernière connexion',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Logiciels associés avec :name',
    'view_user'         => 'Voir l\'utilisateur :name',
    'usercsv'           => 'CSV file',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'Le mot de passe est obligatoire.',
    'insufficient_permissions'  => 'Droits insuffisants.',
    'user_deleted_warning'      => 'Cet utilisateur a été supprimé. Vous devez le restaurer pour pouvoir l\'éditer ou lui assigner de nouveaux actifs.',
+    'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accessories',
    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Adresse',
@@ -59,6 +60,7 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Supprimer l\'image',
    'image_upload'         	=> 'Charger une image',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
    'usercsv'           => 'CSV file',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'The password is required.',
    '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.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accessories',
    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Address',
@@ -59,6 +60,7 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Delete Image',
    'image_upload'         	=> 'Upload Image',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -10,6 +10,8 @@ return array(
    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
    'history_user'      => 'History for :name',
    'last_login'        => 'Last Login',
+    'ldap_config_text'  => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php',
+    'ldap_text'         => 'Connect to LDAP and create users.  Passwords will be auto-generated.',
    'software_user'     => 'Software Checked out to :name',
    'view_user'         => 'View User :name',
    'usercsv'           => 'CSV file',
@@ -10,6 +10,7 @@ return array(
    'user_password_required'    => 'The password is required.',
    '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.',


    'success' => array(
@@ -32,6 +33,10 @@ return array(
        'import'    => 'There was an issue importing users. Please try again.',
        'asset_already_accepted' => 'This asset has already been accepted.',
        'accept_or_decline' => 'You must either accept or decline this asset.',
+        '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:',
    ),

    'deletefile' => array(
@@ -3,6 +3,7 @@
    return [
    'accessories'			=> 'Accessories',
    'accessory'				=> 'Accessory',
+    'accessory_report'			=> 'Accessory Report',
    'action'                => 'Action',
    'activity_report'		=> 'Activity Report',
    'address'				=> 'Cím',
@@ -59,6 +60,7 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Delete Image',
    'image_upload'         	=> 'Upload Image',
+    'import'         	    => 'Import',
    'asset_maintenance'        => 'Asset Maintenance',
    'asset_maintenance_report' => 'Asset Maintenance Report',
    'asset_maintenances'       => 'Asset Maintenances',
@@ -5,7 +5,7 @@ return array(
    'about_accessories_text'  			=> 'Gli accessori sono tutto quello che si rilascia agli utenti, ma che non hanno un numero di serie (o non si cura del loro monitoraggio in modo univoco). Ad esempio, mouse o tastiere.',
    'accessory_category' 				=> 'Categoria Accessorio',
    'accessory_name'  					=> 'Nome Accessorio',
-    'create'  							=> 'Create Accessory',
+    'create'  							=> 'Crea Accessorio',
    'eula_text'							=> 'Categoria EULA',
    'eula_text_help'					=> 'Questo campo consente di personalizzare le EULA per specifici tipi di attività. Se avete solo un EULA per tutti i vostri beni, è possibile controllare la casella di seguito per utilizzare il valore predefinito.',
    'require_acceptance'				=> 'Richiedere agli utenti di confermare l\'accettazione di attività in questa categoria.',
@@ -13,7 +13,7 @@ return array(
    'qty'  								=> 'QT',
    'total'  							=> 'Totale',
    'remaining'  						=> 'Utilità',
-    'update'  							=> 'Update Accessory',
+    'update'  							=> 'Aggiorna Accessorio',
    'use_default_eula'					=> 'Usa <a href="#" data-toggle="modal" data-target="#eulaModal">L\'EULA predefinita</a> invece.',
    'use_default_eula_disabled'			=> '<del>Usa L\'EULA predefinita.</del> Nessuna EULA predefinita è in uso. Per favore aggiungine una nei Settaggi.',

@@ -1,14 +1,14 @@
 <?php

    return [
-        'asset_maintenance_type' => 'Asset Maintenance Type',
-        'title'                  => 'Title',
-        'start_date'             => 'Start Date',
-        'completion_date'        => 'Completion Date',
-        'cost'                   => 'Cost',
-        'is_warranty'            => 'Warranty Improvement',
-        'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
-        'notes'                  => 'Notes',
-        'update'                 => 'Update Asset Maintenance',
-        'create'                 => 'Create Asset Maintenance'
+        'asset_maintenance_type' => 'Tipo Manutenzione Prodotto',
+        'title'                  => 'Titolo',
+        'start_date'             => 'Data Inizio',
+        'completion_date'        => 'Data Completamento',
+        'cost'                   => 'Costo',
+        'is_warranty'            => 'Aumento Garanzia',
+        'asset_maintenance_time' => 'Tempo Manutenzione Prodotto (in giorni)',
+        'notes'                  => 'Note',
+        'update'                 => 'Aggiorna Manutenzione Prodotto',
+        'create'                 => 'Crea Manutenzione Prodotto'
    ];
@@ -1,11 +1,11 @@
 <?php

    return [
-        'asset_maintenances' => 'Asset Maintenances',
-        'edit'               => 'Edit Asset Maintenance',
-        'delete'             => 'Delete Asset Maintenance',
-        'view'               => 'View Asset Maintenance Details',
-        'repair'             => 'Repair',
-        'maintenance'        => 'Maintenance',
-        'upgrade'            => 'Upgrade'
+        'asset_maintenances' => 'Manutenzione Prodotto',
+        'edit'               => 'Modifica Manutenzione Prodotto',
+        'delete'             => 'Elimina Manutenzione Prodotto',
+        'view'               => 'Controlla Dettagli Manutenzione Prodotto',
+        'repair'             => 'Ripara',
+        'maintenance'        => 'Manutenzione',
+        'upgrade'            => 'Aggiorna'
    ];
@@ -1,17 +1,17 @@
 <?php

    return [
-        'not_found'                    => 'Asset Maintenance you were looking for was not found!',
+        'not_found'                    => 'La manutenzione garanzia che stavi cercando non è stata trovata!',
        'delete'                       => [
-            'confirm' => 'Are you sure you wish to delete this asset maintenance?',
-            'error'   => 'There was an issue deleting the asset maintenance. Please try again.',
-            'success' => 'The asset maintenance was deleted successfully.'
+            'confirm' => 'Sei sicuro di voler eliminare questa manutenzione garanzia?',
+            'error'   => 'C\'è stato un problema eliminando la manutenzione garanzia. Riprova.',
+            'success' => 'Manutenzione prodotto eliminata con successo.'
        ],
        'create'                       => [
-            'error'   => 'Asset Maintenance was not created, please try again.',
-            'success' => 'Asset Maintenance created successfully.'
+            'error'   => 'Manutenzione prodotto non creata, riprova.',
+            'success' => 'Manutenzione prodotto creata con successo.'
        ],
-        'asset_maintenance_incomplete' => 'Not Completed Yet',
-        'warranty'                     => 'Warranty',
-        'not_warranty'                 => 'Not Warranty',
+        'asset_maintenance_incomplete' => 'Non ancora completato',
+        'warranty'                     => 'Garanzia',
+        'not_warranty'                 => 'Senza garanzia',
    ];
@@ -1,9 +1,9 @@
 <?php

    return [
-        'title'         => 'Asset Maintenance',
-        'asset_name'    => 'Asset Name',
-        'supplier_name' => 'Supplier Name',
-        'is_warranty'   => 'Warranty',
-        'dl_csv'        => 'Download CSV'
+        'title'         => 'Manutenzione Prodotto',
+        'asset_name'    => 'Nome Prodotto',
+        'supplier_name' => 'Nome Fornitore',
+        'is_warranty'   => 'Garanzia',
+        'dl_csv'        => 'Scarica CSV'
    ];
@@ -5,7 +5,7 @@ return array(
    'about_categories'  				=> 'Le categorie degli assets ti aiutano ad organizzare i tuoi beni. Alcuni esempi di categorie possono essere "Desktop", "Laptop", "Mobile Phone" e così via, ma puoi usare le categorie degli assets in qualsiasi modo abbia senso per te. ',
    'asset_categories' 					=> 'Categorie degli Assets',
    'category_name'  					=> 'Nome categoria',
-    'checkin_email'                     => 'Send email to user on checkin.',
+    'checkin_email'                     => 'Invia email all\'utente al momento della registrazione.',
    'clone'                             => 'Copia Categoria',
    'create'  							=> 'Crea Categoria',
    'edit'                              => 'Modifica Categoria',
@@ -1,11 +1,11 @@
 <?php

 return array(
-    'about_consumables_title' 			=> 'About Consumables',
-    'about_consumables_text'  			=> 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
-    'consumable_name'                  => 'Consumable Name',
-    'create'                             => 'Create Consumable',
-    'remaining' 			             => 'Remaining',
-    'total' 			                 => 'Total',
-    'update'                            => 'Update Consumable',
+    'about_consumables_title' 			=> 'Controlla Consumabili',
+    'about_consumables_text'  			=> 'I consumabili sono qualcosa che una volta acquistati saranno completamente consumati. Per esempio, inchiostro per stampante o fogli di carta.',
+    'consumable_name'                  => 'Nome Consumabile',
+    'create'                             => 'Crea Consumabile',
+    'remaining' 			             => 'Rimanenti',
+    'total' 			                 => 'Totale',
+    'update'                            => 'Aggiorna Consumabile',
 );
@@ -2,34 +2,34 @@

 return array(

-    'does_not_exist' => 'Consumable does not exist.',
+    'does_not_exist' => 'Il consumabile non esiste.',

    'create' => array(
-        'error'   => 'Consumable was not created, please try again.',
-        'success' => 'Consumable created successfully.'
+        'error'   => 'Il consumabile non è stato creato, prova di nuovo.',
+        'success' => 'Il consumabile è stato creato con successo.'
    ),

    'update' => array(
-        'error'   => 'Consumable was not updated, please try again',
-        'success' => 'Consumable updated successfully.'
+        'error'   => 'Il consumabile non è stato aggiornato, prova di nuovo',
+        'success' => 'Il consumabile è stato aggiornato con successo.'
    ),

    'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this accessory?',
-        'error'   => 'There was an issue deleting the consumable. Please try again.',
-        'success' => 'The accessory was deleted successfully.'
+        'confirm'   => 'Sei sicuro di voler eliminare quest\'accessorio?',
+        'error'   => 'C\'è stato un problema durante l\'eliminazione del consumabile. Prova di nuovo.',
+        'success' => 'L\'accessorio è stato eliminato con successo.'
    ),

     'checkout' => array(
-        'error'   		=> 'Consumable was not checked out, please try again',
-        'success' 		=> 'Consumable checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Il consumabile non è stato controllato, prova di nuovo',
+        'success' 		=> 'Il consumabile è stato controllato con successo.',
+        'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
    ),

    'checkin' => array(
-        'error'   		=> 'Consumable was not checked in, please try again',
-        'success' 		=> 'Consumable checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> 'Il consumabile non è stato controllato, prova di nuovo',
+        'success' 		=> 'Il consumabile è stato controllato con successo.',
+        'user_does_not_exist' => 'Questo utente non è valido. Riprova.'
    )


@@ -1,5 +1,5 @@
 <?php

 return array(
-    'title'      				=> 'Consumable Name',
+    'title'      				=> 'Nome Consumabile',
 );
@@ -17,10 +17,10 @@ return array(
    'default_location'	=> 'Posizione predefinita',
    'eol_date'			=> 'Data EOL',
    'eol_rate'			=> 'Tasso EOL',
-    'expected_checkin'  => 'Expected Checkin Date',
+    'expected_checkin'  => 'Richiesta Data di entrata',
    'expires'			=> 'Scade',
    'fully_depreciated'	=> 'Completamente ammortizzato',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
+    'help_checkout'		=> 'Se vuoi assegnare questo prodotto immediatamente, seleziona "Pronto alla spedizione" dalla barra di stato qui sopra. ',
    'mac_address'		=> 'MAC Address',
    'manufacturer'		=> 'Produttore',
    'model'				=> 'Modello',
@@ -9,7 +9,7 @@ return array(
    'deployable'  				=> 'Distribuibile',
    'deleted'  					=> 'Questo asset è stato cancellato. <a href="/hardware/:asset_id/restore">Clicca qui per ripristinarlo</a>.',
    'edit'  					=> 'Modifica Asset',
-	'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+	'filetype_info'				=> 'I formati di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.',
    'model_deleted'  			=> 'Questo modello di Asset è stato cancellato. Devi ripristinare il modello prima di poter ripristinare L\'asset.<br/> <a href="/hardware/models/:model_id/restore">Clicca qui per ripristinare il modello</a>.',
    'requestable'				=> 'Disponibile',
    'restore'  					=> 'Ripristina Asset',
@@ -5,7 +5,7 @@ return array(
    'undeployable' 		=> '<strong>Attenzione: </strong> Questo asset è stato marcato come non distribuibile.
                       Se lo stato è cambiato,aggiorna lo stato dell\'asset.',
    'does_not_exist' 	=> 'Questo Asset non esiste.',
-    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
+    'does_not_exist_or_not_requestable' => 'Ci hai provato. Questo prodotto non esiste o non è disponibile.',
    'assoc_users'	 	=> 'Questo asset è stato assegnato ad un Utente e non può essere cancellato. Per favore Riassegnalo in magazzino,e dopo riprova a cancellarlo.',

    'create' => array(
@@ -32,7 +32,7 @@ return array(
    'upload' => array(
        'error'   => 'File non caricato/i. Riprova.',
        'success' => 'File caricato/i con successo.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'nofiles' => 'Non hai selezionato nessun file per il caricamento, oppure il file selezionato è troppo grande',
        'invalidfiles' => 'Uno o più file è troppo grande o è un tipo di file non consentito. Tipi di file ammessi sono png, gif, jpg, doc, docx, pdf, txt.',
    ),

@@ -18,6 +18,6 @@ return array(
    'serial'   		=> 'Seriale',
    'status'   		=> 'Stato',
    'title'      	=> 'Bene ',
-    'days_without_acceptance' => 'Days Without Acceptance'
+    'days_without_acceptance' => 'Giorni senza accettazione'

 );
@@ -15,7 +15,7 @@ return array(
    'notes'             => 'Note',
    'order'             => 'Ordine Num.',
    'purchase_order'    => 'Acquisto numero d\'ordine',
-    'reassignable'      => 'Reassignable',
+    'reassignable'      => 'Reassegnabile',
    'remaining_seats'   => 'Sedili rimanenti',
    'seats'             => 'Sedili',
    'serial'            => 'Seriale',
@@ -6,7 +6,7 @@ return array(
    'checkout_history'  		=> 'Storico Estrazioni',
    'checkout'  				=> 'Estrazione Licenza Sede',
    'edit'  					=> 'Modifica Licenza',
-    'filetype_info'				=> 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'filetype_info'				=> 'I formati di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.',
    'clone'  					=> 'Clona Licenza',
    'history_for'  				=> 'Storico per ',
    'in_out'  					=> 'Dentro/Fuori',
@@ -22,7 +22,7 @@ return array(
    'upload' => array(
        'error'   => 'File non caricato/i. Riprova.',
        'success' => 'File caricato/i con successo.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'nofiles' => 'Non hai selezionato nessun file per il caricamento, oppure il file selezionato è troppo grande',
        'invalidfiles' => 'Uno o più file è troppo grande o è un tipo di file non consentito. Tipi di file ammessi sono png, gif, jpg, doc, docx, pdf, txt.',
    ),

@@ -4,8 +4,8 @@ return array(

    'does_not_exist' => 'La posizione non esiste.',
    'assoc_users'	 => 'Questa posizione è associata ad almeno un utente e non può essere cancellata. Si prega di aggiornare i vostri utenti di riferimento e riprovare. ',
-    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
-    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assoc_assets'	 => 'Questa posizione è associata ad almeno un prodotto e non può essere cancellata. Si prega di aggiornare i vostri prodotti di riferimento e riprovare. ',
+    'assoc_child_loc'	 => 'Questa posizione è parente di almeno un\'altra posizione e non può essere cancellata. Si prega di aggiornare le vostre posizioni di riferimento e riprovare. ',


    'create' => array(
@@ -12,6 +12,6 @@ return array(
    'address'		=> 'Indirizzo',
    'zip'			=> 'Codice Postale',
    'locations'		=> 'Posizioni',
-    'parent'		=> 'Parent',
-    'currency'  	=> 'Location Currency', // this is deprecated
+    'parent'		=> 'Genitore',
+    'currency'  	=> 'Valuta della Posizione', // this is deprecated
 );
@@ -9,7 +9,7 @@ return array(
    'create' => array(
        'error'   => 'Il modello non è stato creato, si prega di riprovare.',
        'success' => 'Modello creato con successo.',
-        'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.',
+        'duplicate_set' => 'Un modello di prodotto con quel nome, produttore e numero di modello esiste già.',
    ),

    'update' => array(
@@ -3,29 +3,29 @@
 return array(
 	'alert_email'				=> 'Invia avvisi a',
 	'alerts_enabled'			=> 'Avvisi attivati',
-	'asset_ids'					=> 'Asset IDs',
+	'asset_ids'					=> 'ID modello',
 	'auto_increment_assets'		=> 'Genera auto-incremento ID beni',
 	'auto_increment_prefix'		=> 'Prefisso (Opzionale)',
 	'auto_incrementing_help'    => 'Abilita auto-incremento ID beni prima di impostare questa',
 	'backups'					=> 'Backups',
 	'barcode_type'				=> 'Tipo Barcode',
-	'barcode_settings'			=> 'Barcode Settings',
-	'default_currency'  		=> 'Default Currency',
+	'barcode_settings'			=> 'Impostazioni codice a barre',
+	'default_currency'  		=> 'Valuta predefinita',
 	'default_eula_text'			=> 'EULA Predefinita',
 	'default_eula_help_text'	=> 'È possibile associare EULAs personalizzati a categorie di beni specifici.',
    'display_asset_name'        => 'Mostra Nome Bene',
    'display_checkout_date'     => 'Mostra Data Estrazione',
    'display_eol'               => 'Visualizzare EOL in vista tabella',
    'display_qr'                => 'Visualizza QR Codes',
-    'eula_settings'				=> 'EULA Settings',
+    'eula_settings'				=> 'Impostazioni EULA',
    'eula_markdown'				=> 'Questa EULA consente <a href="https://help.github.com/articles/github aromatizzato-markdown/">Github flavored markdown</a>.',
-    'general_settings'			=> 'General Settings',
+    'general_settings'			=> 'Impostazioni Generali',
    'header_color'              => 'Colore intestazione',
    'info'                      => 'Queste impostazioni consentono di personalizzare alcuni aspetti della vostra installazione.',
    'laravel'                   => 'Laravel Version',
    'load_remote'				=> 'Questa installazione di Snipe-IT può caricare script dal mondo esterno.',
    'logo'                    	=> 'Logo',
-    'optional'					=> 'optional',
+    'optional'					=> 'facoltativo',
    'per_page'                  => 'Risultati per Pagina',
    'php'                       => 'PHP Version',
    'php_gd_info'               => 'È necessario installare php-gd per visualizzare i codici QR, consultare le istruzioni di installazione.',
@@ -35,11 +35,11 @@ return array(
    'setting'                   => 'Impostazioni',
    'settings'                  => 'Impostazioni',
    'site_name'                 => 'Nome sito',
-    'slack_botname'             => 'Slack Botname',
-    'slack_channel'             => 'Slack Channel',
-    'slack_endpoint'            => 'Slack Endpoint',
-    'slack_integration'         => 'Slack Settings',
-    'slack_integration_help'    => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first <a href=":slack_link" target="_new">create an incoming webhook</a> on your Slack account.',
+    'slack_botname'             => 'Botname Slack',
+    'slack_channel'             => 'Canale Slack',
+    'slack_endpoint'            => 'Finale Slack',
+    'slack_integration'         => 'Impostazioni Slack',
+    'slack_integration_help'    => 'L\'integrazione con Slack è opzionale, comunque il finale ed il canale sono richiesto se tu vuoi usarlo. Per configurare l\'integrazione con Slack, tu devi prima <a href=":slack_link" target="_new"> creare un webhook </a> nel tuo account di Slack.',
    'snipe_version'  			=> 'Snipe-IT version',
    'system'                    => 'Informazioni di sistema',
    'update'                    => 'Aggiorna impostazioni',
@@ -7,9 +7,11 @@ return array(
    'clone'             => 'Clona Utente',
    'contact_user'      => 'Contatta :name',
    'edit'              => 'Modifica Utente',
-    'filetype_info'     => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
+    'filetype_info'     => 'I formati di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.',
    'history_user'      => 'Storico di :name',
    'last_login'        => 'Ultimo accesso',
+    'ldap_config_text'  => 'Le impostazioni di configurazione LDAP posso essere trovate nella cartella app/configurazione nel file chiamato ldap.php',
+    'ldap_text'         => 'Connettiti a LDAP e crea utenti. Le password saranno generate automaticamente.',
    'software_user'     => 'Software estratto a :name',
    'view_user'         => 'Visualizza Utente :name',
    'usercsv'           => 'CSV file',
@@ -2,14 +2,15 @@

 return array(

-    'accepted'                  => 'You have successfully accepted this asset.',
-    'declined'                  => 'You have successfully declined this asset.',
+    'accepted'                  => 'Hai accettato con successo questo prodotto.',
+    'declined'                  => 'Hai rifiutato con successo questo prodotto.',
    'user_exists'               => 'Utente già esistente!',
    'user_not_found'            => 'L\'utente [:id] non esite.',
    'user_login_required'       => 'È necessario il campo login',
    'user_password_required'    => 'È richiesta la password.',
    'insufficient_permissions'  => 'Permessi Insufficienti.',
    'user_deleted_warning'      => 'Questo utente è stato eliminato. Si dovrà ripristinare questo utente per modificare o assegnare nuovi beni.',
+    'ldap_not_configured'        => 'L\'integrazione con LDAP non è stata configurata per questa installazione.',


    'success' => array(
@@ -31,19 +32,23 @@ return array(
        'unsuspend' => 'C\'è stato un problema durante la riabilitazione dell\'utente. Riprova per favore.',
        'import'    => 'C\'è stato un problema durante l\'importazione degli utenti. Riprova per favore.',
        'asset_already_accepted' => 'Questo bene è già stato accettato.',
-        'accept_or_decline' => 'You must either accept or decline this asset.',
+        'accept_or_decline' => 'Devi accettare o rifiutare questo prodotto.',
+        '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:',
    ),

    'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
-        'success' => 'File successfully deleted.',
+        'error'   => 'File non cancellato. Riprova.',
+        'success' => 'File cancellato con successo.',
    ),

    'upload' => array(
-        'error'   => 'File(s) not uploaded. Please try again.',
-        'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+        'error'   => 'File non caricato/i. Riprova.',
+        'success' => 'File caricato/i con successo.',
+        'nofiles' => 'Non hai selezionato i file per il caricamento',
+        'invalidfiles' => 'Uno o più file è troppo grande o è un tipo di file non consentito. Tipi di file ammessi sono png, gif, jpg, doc, docx, pdf, txt.',
    ),

 );
@@ -3,7 +3,7 @@
 return array(

    'account_already_exists' => 'Un account con questa email già esiste.',
-    'account_not_found'      => 'The username or password is incorrect.',
+    'account_not_found'      => 'Nome utente o password non corretto.',
    'account_not_activated'  => 'Questo account non è attivo.',
    'account_suspended'      => 'Questo account è sospeso.',
    'account_banned'         => 'Questo account è bannato.',
@@ -8,7 +8,7 @@ return array(
    'delete'  	=> 'Cancella',
    'edit'    	=> 'Modifica',
    'restore' 	=> 'Ripristina',
-    'request'   => 'Request',
+    'request'   => 'Richiesta',
    'submit'  	=> 'Invia',
    'upload'    => 'Carica / Upload',

@@ -3,8 +3,9 @@
    return [
    'accessories'			=> 'Accessori',
    'accessory'				=> 'Accessorio',
-    'action'                => 'Action',
-    'activity_report'		=> 'Activity Report',
+    'accessory_report'			=> 'Accessory Report',
+    'action'                => 'Azione',
+    'activity_report'		=> 'Rapporto sull\'attività',
    'address'				=> 'Indirizzo',
    'admin'					=> 'Amministratore',
    'all_assets'			=> 'Tutti gli Asset',
@@ -19,18 +20,18 @@
    'avatar_delete'         => 'Cancella Avatar',
    'avatar_upload'         => 'Carica Avatar',
    'back'      			=> 'Indietro',
-    'bad_data'      		=> 'Nothing found. Maybe bad data?',
+    'bad_data'      		=> 'Non è stato trovato nulla. Forse informazioni errate?',
    'cancel'  				=> 'annulla',
-    'categories'			=> 'Categories',
-    'category'				=> 'Category',
+    'categories'			=> 'Categorie',
+    'category'				=> 'Categoria',
    'changeemail'  			=> 'Modifica indirizzo email',
    'changepassword'  		=> 'Modifica password',
    'checkin'  				=> 'Carica',
    'checkin_from'  		=> 'Carica da',
    'checkout'  			=> 'Scarica',
    'city'  				=> 'Città',
-    'consumable'			=> 'Consumable',
-    'consumables'			=> 'Consumables',
+    'consumable'			=> 'Consumabile',
+    'consumables'			=> 'Consumabili',
    'country'  				=> 'Paese',
    'create'				=> 'Crea',
    'created_asset'			=> 'Asset creato',
@@ -59,10 +60,11 @@
    'id'  					=> 'ID',
    'image_delete'         	=> 'Cancella l\'Immagine',
    'image_upload'         	=> 'Carica immagine',
-    'asset_maintenance'        => 'Asset Maintenance',
-    'asset_maintenance_report' => 'Asset Maintenance Report',
-    'asset_maintenances'       => 'Asset Maintenances',
-    'item'  				=> 'Item',
+    'import'         	    => 'Import',
+    'asset_maintenance'        => 'Manutenzione Prodotto',
+    'asset_maintenance_report' => 'Rapporto manutenzione prodotto',
+    'asset_maintenances'       => 'Manutenzione Prodotto',
+    'item'  				=> 'Articolo',
    'last'					=> 'Ultimo',
    'last_name'				=> 'Cognome',
    'license'				=> 'Licenza',
@@ -70,9 +72,9 @@
    'licenses_available'	=> 'Licenze Disponibili',
    'licenses'				=> 'Licenze',
    'list_all'				=> 'Visualizza Tutti',
-    'loading'				=> 'Loading',
-    'lock_passwords'        => 'This field cannot be edited in this installation.',
-    'feature_disabled'      => 'This feature has been disabled for this installation.',
+    'loading'				=> 'Caricamento',
+    'lock_passwords'        => 'Questo campo non può essere modificato in quest\'installazione.',
+    'feature_disabled'      => 'Questa funzione è stata disabilitata in quest\'installazione.',
    'location'              => 'Luogo',
    'locations'				=> 'Luoghi',
    'logout'				=> 'logout',
@@ -95,12 +97,12 @@
    'previous'				=> 'Precedente',
    'processing'			=> 'In elaborazione',
    'profile'				=> 'Il tuo profilo',
-    'qty'		            => 'QTY',
-    'quanitity'		        => 'Quanitity',
+    'qty'		            => 'Quantità',
+    'quanitity'		        => 'Quantità',
    'ready_to_deploy'		=> 'Pronto per il rilascio',
    'recent_activity'		=> 'Attività Recenti',
    'reports'				=> 'Reports',
-    'requested'				=> 'Requested',
+    'requested'				=> 'Richiesto',
    'save'  				=> 'Salva',
    'select'				=> 'Seleziona',
    'search'				=> 'Cerca',
@@ -111,7 +113,7 @@
    'select_supplier'		=> 'Selezionare un fornitore',
    'select_user'			=> 'Selezionare un utente',
    'select_date'			=> 'Seleziona la data',
-    'select_statuslabel'	=> 'Select Status',
+    'select_statuslabel'	=> 'Seleziona stato',
    'settings'				=> 'Impostazioni',
    'sign_in'				=> 'Accedi',
    'site_name'				=> 'Nome sito',
@@ -124,12 +126,12 @@
    'type'  				=> 'Tipo',
    'undeployable'			=> 'Non consegnabile',
    'unknown_admin'			=> 'Amministratore sconosciuto',
-    'update'                => 'Update',
+    'update'                => 'Aggiorna',
    'uploaded'              => 'Caricato',
    'user'					=> 'Utente',
-    'accepted'			    => 'accepted',
-    'declined'			    => 'declined',
-    'unaccepted_asset_report' => 'Unaccepted Assets',
+    'accepted'			    => 'accettato',
+    'declined'			    => 'rifiutato',
+    'unaccepted_asset_report' => 'Prodotti non accettati',
    'users'                 => 'Utenti',
    'viewassets'  			=> 'Visualizza gli Assets assegnati',
    'website'               => 'Sito Web',
@@ -77,7 +77,7 @@ return array(
    */

    'custom' => array(),
-    'alpha_space' => "The :attribute field contains a character that is not allowed.",
+    'alpha_space' => "Il campo :attribute contiene un carattere che non è permesso.",

    /*
    |--------------------------------------------------------------------------
@@ -7,9 +7,9 @@ return array(
    'accessory_name'  					=> '付属品名',
    'create'  							=> '付属品の作成',
    'eula_text'							=> 'EULAカテゴリー',
-    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
-    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'eula_text_help'					=> 'このフィールドは特殊なタイプの資産のためにEULAをカスタマイズすることが許可されています。全ての資産に一つだけEULAを適用する場合、以下の初期値を利用するにチェックすることも可能です。',
+    'require_acceptance'				=> 'このカテゴリの資産を承認するための利用者が必要です。',
+    'no_default_eula'					=> 'EULAの初期値が見つかりませんでした。最低1つは設定して下さい。',
    'qty'  								=> '数量',
    'total'  							=> '合計',
    'remaining'  						=> '利用可',
@@ -5,18 +5,18 @@ return array(
    'about_categories'  				=> '資産カテゴリーにより資産を分類します。カテゴリーの例としては &quot; デスクトップ &quot;、&quot; ラップトップ &quot; 、&quot； 携帯電話 &quot;、&quot; タブレット&quot; などがあります。資産カテゴリは任意に設定することができます。 ',
    'asset_categories' 					=> '資産カテゴリー',
    'category_name'  					=> 'カテゴリー名',
-    'checkin_email'                     => 'Send email to user on checkin.',
-    'clone'                             => 'Clone Category',
+    'checkin_email'                     => 'チェックインの時に利用者へメールを送信',
+    'clone'                             => 'カテゴリを複製',
    'create'  							=> 'カテゴリーの作成',
-    'edit'                              => 'Edit Category',
-    'eula_text'							=> 'Category EULA',
-    'eula_text_help'					=> 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
-    'require_acceptance'				=> 'Require users to confirm acceptance of assets in this category.',
-    'required_acceptance'				=> 'This user will be emailed with a link to confirm acceptance of this item.',
-    'required_eula'						=> 'This user will be emailed a copy of the EULA',
-    'no_default_eula'					=> 'No primary default EULA found. Add one in Settings.',
+    'edit'                              => 'カテゴリを編集',
+    'eula_text'							=> 'EULAカテゴリー',
+    'eula_text_help'					=> 'このフィールドは特殊なタイプの資産のためにEULAをカスタマイズすることが許可されています。全ての資産に一つだけEULAを適用する場合、以下の初期値を利用するにチェックすることも可能です。',
+    'require_acceptance'				=> 'このカテゴリの資産を承認するための利用者が必要です。',
+    'required_acceptance'				=> 'このアイテムを承認すると、この利用者にメールが送信されます。',
+    'required_eula'						=> 'この利用者はEULAのコピーをメールで受信します。',
+    'no_default_eula'					=> 'EULAの初期値が見つかりませんでした。最低1つは設定して下さい。',
    'update'  							=> 'カテゴリーの更新',
-    'use_default_eula'					=> 'Use the <a href="#" data-toggle="modal" data-target="#eulaModal">primary default EULA</a> instead.',
-    'use_default_eula_disabled'			=> '<del>Use the primary default EULA instead.</del> No primary default EULA is set. Please add one in Settings.',
+    'use_default_eula'					=> '<a href="#" data-toggle="modal" data-target="#eulaModal">初期設定EULA</a> を代わりに利用する。',
+    'use_default_eula_disabled'			=> '<del>初期設定EULAを代わりに利用する。</del> 初期設定EULAが設定されていません。最低一つは追加してください。',

 );
@@ -2,41 +2,41 @@

 return array(

-	'bulk_update'		=> 'Bulk Update Assets',
-	'bulk_update_help'	=> 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
-	'bulk_update_warn'	=> 'You are about to edit the properties of :asset_count assets.',
-    'checkedout_to'		=> 'Checked Out To',
-    'checkout_date'		=> 'Checkout Date',
-    'checkin_date'		=> 'Checkin Date',
-    'checkout_to'		=> 'Checkout to',
-    'cost'				=> 'Purchase Cost',
-    'create'			=> 'Create Asset',
-    'date'				=> 'Purchase Date',
-    'depreciates_on'	=> 'Depreciates On',
-    'depreciation'		=> 'Depreciation',
-    'default_location'	=> 'Default Location',
-    'eol_date'			=> 'EOL Date',
-    'eol_rate'			=> 'EOL Rate',
-    'expected_checkin'  => 'Expected Checkin Date',
-    'expires'			=> 'Expires',
-    'fully_depreciated'	=> 'Fully Depreciated',
-    'help_checkout'		=> 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ',
-    'mac_address'		=> 'MAC Address',
-    'manufacturer'		=> 'Manufacturer',
-    'model'				=> 'Model',
-    'months'			=> 'months',
-    'name'				=> 'Asset Name',
-    'notes'				=> 'Notes',
-    'order'				=> 'Order Number',
-    'qr'				=> 'QR Code',
-    'requestable'		=> 'Users may request this asset',
-    'select_statustype'	=> 'Select Status Type',
-    'serial'			=> 'Serial',
-    'status'			=> 'Status',
-    'supplier'			=> 'Supplier',
-    'tag'				=> 'Asset Tag',
-    'update'			=> 'Asset Update',
-    'warranty'			=> 'Warranty',
-    'years'				=> 'years',
+	'bulk_update'		=> '資産を一括更新',
+	'bulk_update_help'	=> 'このフォームは一度に複数の資産を更新することが可能です。変更が必要なフィールドにのみ入力をして下さい。ブランクのフィールドは変更されません。 ',
+	'bulk_update_warn'	=> '資産群（:asset_count）のプロパティを編集します。',
+    'checkedout_to'		=> 'チェックアウト先',
+    'checkout_date'		=> 'チェックアウト日',
+    'checkin_date'		=> 'チェックイン日',
+    'checkout_to'		=> 'チェックアウト先',
+    'cost'				=> '購入費用',
+    'create'			=> '資産を作成',
+    'date'				=> '購入日',
+    'depreciates_on'	=> '原価償却対象',
+    'depreciation'		=> '減価償却',
+    'default_location'	=> '既定の設置場所',
+    'eol_date'			=> 'EOL日付',
+    'eol_rate'			=> 'EOL率',
+    'expected_checkin'  => '希望するチェックイン日',
+    'expires'			=> '満期日',
+    'fully_depreciated'	=> '減価償却満了',
+    'help_checkout'		=> 'この資産をすぐに割り当てたい場合、ステイタス一覧から"配備完了"を選択して下さい。 ',
+    'mac_address'		=> 'MACアドレス',
+    'manufacturer'		=> '製造元',
+    'model'				=> 'モデル',
+    'months'			=> '月',
+    'name'				=> '資産名',
+    'notes'				=> '備考',
+    'order'				=> '注文番号',
+    'qr'				=> 'ＱＲコード',
+    'requestable'		=> '利用者がこの資産を要求するかもしれません。',
+    'select_statustype'	=> 'ステータスタイプを選択',
+    'serial'			=> 'シリアル',
+    'status'			=> 'ステータス',
+    'supplier'			=> '仕入先',
+    'tag'				=> '資産タグ',
+    'update'			=> '資産アップデート',
+    'warranty'			=> '保証',
+    'years'				=> '年',
 )
 ;
@@ -2,57 +2,57 @@

 return array(

-    'undeployable' 		=> '<strong>Warning: </strong> This asset has been marked as currently undeployable.
-                        If this status has changed, please update the asset status.',
-    'does_not_exist' 	=> 'Asset does not exist.',
-    'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
-    'assoc_users'	 	=> 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+    'undeployable' 		=> '<strong>警告:</strong>この資産は、現在 未配備としてマークされています。
+                        この状態が変更された場合は、資産のステータスを更新してください。',
+    'does_not_exist' 	=> '資産が存在しません。',
+    'does_not_exist_or_not_requestable' => '申し訳ありません。その資産が存在しないまたはリクエスト可能ではありません。',
+    'assoc_users'	 	=> 'この資産は利用者にチェックされているため削除できません。資産をチェック後、もう一度、やり直して下さい。 ',

    'create' => array(
-        'error'   		=> 'Asset was not created, please try again. :(',
-        'success' 		=> 'Asset created successfully. :)'
+        'error'   		=> '資産は作成されませんでした。もう一度、やり直して下さい。',
+        'success' 		=> '資産は作成されました。'
    ),

    'update' => array(
-        'error'   			=> 'Asset was not updated, please try again',
-        'success' 			=> 'Asset updated successfully.',
-        'nothing_updated'	=>  'No fields were selected, so nothing was updated.',
+        'error'   			=> '資産は更新されませんでした。もう一度、やり直して下さい。',
+        'success' 			=> '資産は正常に更新されました。',
+        'nothing_updated'	=>  'フィールドが選択されていないため、更新されませんでした。',
    ),

    'restore' => array(
-        'error'   		=> 'Asset was not restored, please try again',
-        'success' 		=> 'Asset restored successfully.'
+        'error'   		=> '資産は復元されませんでした。もう一度、やり直して下さい。',
+        'success' 		=> '資産は正常に復元されました。'
    ),

    'deletefile' => array(
-        'error'   => 'File not deleted. Please try again.',
-        'success' => 'File successfully deleted.',
+        'error'   => 'ファイルが削除できませんでした。もう一度、やり直して下さい。',
+        'success' => 'ファイルは正常に削除されました。',
    ),

    'upload' => array(
-        'error'   => 'File(s) not uploaded. Please try again.',
-        'success' => 'File(s) successfully uploaded.',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
-        'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+        'error'   => 'ファイルがアップロードできませんでした。もう一度、やり直して下さい。',
+        'success' => 'ファイルが正常にアップロードされました。',
+        'nofiles' => 'アップロードするファイルが選択されていないか、アップロードしようとしているファイルが大き過ぎます。',
+        'invalidfiles' => 'いずれかのファイルが大き過ぎるか、ファイルタイプが許可されていません。許可されているファイルタイプ（png, gif, jpg, doc, docx, pdf, and txt）',
    ),


    'delete' => array(
-        'confirm'   	=> 'Are you sure you wish to delete this asset?',
-        'error'   		=> 'There was an issue deleting the asset. Please try again.',
-        'success' 		=> 'The asset was deleted successfully.'
+        'confirm'   	=> 'この資産を削除してもよろしいですか？',
+        'error'   		=> '資産を削除する際に問題が発生しました。もう一度やり直して下さい。',
+        'success' 		=> '資産は正常に削除されました。'
    ),

    'checkout' => array(
-        'error'   		=> 'Asset was not checked out, please try again',
-        'success' 		=> 'Asset checked out successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> '資産はチェックアウトされませんでした。もう一度、やり直して下さい。',
+        'success' 		=> '資産は正常にチェックアウトされました。',
+        'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。'
    ),

    'checkin' => array(
-        'error'   		=> 'Asset was not checked in, please try again',
-        'success' 		=> 'Asset checked in successfully.',
-        'user_does_not_exist' => 'That user is invalid. Please try again.'
+        'error'   		=> '資産はチェックインされませんでした。もう一度、やり直して下さい。',
+        'success' 		=> '資産は正常にチェックインされました。',
+        'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。'
    )

 );
@@ -18,6 +18,6 @@ return array(
    'serial'   		=> 'シリアル',
    'status'   		=> '状態',
    'title'      	=> '資産 ',
-    'days_without_acceptance' => 'Days Without Acceptance'
+    'days_without_acceptance' => '未受理期間'

 );
@@ -22,7 +22,7 @@ return array(
    'upload' => array(
        'error'   => 'ファイルがアップロードできませんでした。もう一度、やり直して下さい。',
        'success' => 'ファイルがアップロードされました。',
-        'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
+        'nofiles' => 'アップロードするファイルが選択されていないか、アップロードしようとしているファイルが大き過ぎます。',
        'invalidfiles' => 'いずれかのファイルが大き過ぎるか、ファイルタイプが許可されていません。許可されているファイルタイプ（png, gif, jpg, doc, docx, pdf, and txt）',
    ),

@@ -4,8 +4,8 @@ return array(

    'does_not_exist' => 'ロケーションが存在しません。',
    'assoc_users'	 => 'ロケーションは少なくとも一つの利用者に関連付けされているため、削除できません。ローケーションの関連付けを削除し、もう一度試して下さい。 ',
-    'assoc_assets'	 => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
-    'assoc_child_loc'	 => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
+    'assoc_assets'	 => 'この設置場所は少なくとも一つの利用者に関連付けされているため、削除できません。設置場所の関連付けを削除し、もう一度試して下さい。 ',
+    'assoc_child_loc'	 => 'この設置場所は、少なくとも一つの配下の設置場所があります。この設置場所を参照しないよう更新して下さい。 ',


    'create' => array(
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
snipe	a4a29be868	Bumped version	2015-08-25 19:40:08 -07:00
snipe	2e7fd02f42	Updated language strings	2015-08-24 12:59:35 -07:00
snipe	da6770c9d9	Fixes #1102 - default currency stored as htmlentities in the DB	2015-08-21 18:11:23 -07:00
snipe	7dd2b3d580	Fixes #1104	2015-08-21 16:00:03 -07:00
snipe	e5b80ab423	Merge pull request #1105 from aalaily/develop Remove hardcoded location in favour of a selection dropdown	2015-08-21 12:19:25 -07:00
Aladin Alaily	27efae93ac	Add some explanation about the location field.	2015-08-21 10:42:37 -04:00
Aladin Alaily	960be7c5ae	Replace hardcoded location with a user selection.	2015-08-21 10:40:18 -04:00
Aladin Alaily	0b5f83fc56	add a drop down of locations	2015-08-21 10:39:45 -04:00
snipe	89564b3d2a	Merge pull request #1099 from kobie-chasehansen/fix-for-#1098 fix for #1098	2015-08-20 21:39:00 -07:00
Chase Hansen	610392777b	fix	2015-08-21 00:30:55 -04:00
snipe	e916fdcc89	Fixes #1092 , setting LDAP_OPT_REFERRALS to 0 for Active Directory	2015-08-20 15:54:42 -07:00
snipe	70f7f65394	Fixed path for windows	2015-08-20 15:38:50 -07:00
snipe	8892feea62	Fixed typo	2015-08-20 15:38:35 -07:00
snipe	c7b0ecfac8	Slack notification for requested assets	2015-08-19 17:51:35 -07:00
snipe	d47198086f	Added notes search to licenses	2015-08-19 17:23:55 -07:00
snipe	89f7f50901	Merge pull request #1074 from mtucker6784/develop Installer modified for 2.0 (develop currently)	2015-08-19 17:16:53 -07:00
snipe	8339dd3db2	Fixes #1089 - checkout button on accessory view page	2015-08-19 17:13:14 -07:00
snipe	e63d62d2c8	Fixes #1083	2015-08-19 12:33:16 -07:00
snipe	45c4624d5f	Fixes #1081	2015-08-19 11:14:03 -07:00
snipe	a27a98f4b3	Fixes #1081- include asset name on checkout	2015-08-19 11:13:51 -07:00
snipe	70a7a11324	Switched to user list	2015-08-19 10:54:50 -07:00
snipe	e8f11919f7	Fixes #1077 - ordering of dropdown menus	2015-08-19 10:43:52 -07:00
snipe	1d976ff926	Fixes #1078	2015-08-19 10:23:01 -07:00
snipe	4a086cecfd	Updated composer lock	2015-08-17 11:49:19 -07:00
snipe	890ef1eb1d	Fixes #1038 - clickable links in dashboard	2015-08-17 11:24:10 -07:00
snipe	94e8b5f783	Fixed bug in expected checkin	2015-08-17 11:14:01 -07:00
snipe	21bb2f8b44	Updated language string for asset request	2015-08-17 11:11:09 -07:00
snipe	aae7d4523f	Don't need to float left there	2015-08-17 10:11:03 -07:00
snipe	f7cc9036ea	Added password generator to user creation	2015-08-17 10:06:37 -07:00
snipe	7dd50eddfa	Nicer error messages on validation fail for LDAP	2015-08-14 22:57:32 -07:00
snipe	c1642e3fe9	Examples included in example config files, moved email and employee number out of required fields	2015-08-14 22:27:10 -07:00
mtucker6784	dfa0ddb49f	Installer modified for 2.0 (develop currently)	2015-07-29 01:03:56 -07:00