diff --git a/app/commands/AssetImportCommand.php b/app/commands/AssetImportCommand.php index 8b74920661..99e171a68d 100644 --- a/app/commands/AssetImportCommand.php +++ b/app/commands/AssetImportCommand.php @@ -256,9 +256,11 @@ class AssetImportCommand extends Command { $this->comment('Location '.$user_asset_location.' already exists'); } else { + $location = new Location(); + if ($user_asset_location!='') { - $location = new Location(); + $location->name = e($user_asset_location); $location->address = ''; $location->city = ''; diff --git a/app/config/version.php b/app/config/version.php index d755447b75..789b9589c9 100644 --- a/app/config/version.php +++ b/app/config/version.php @@ -1,5 +1,5 @@ 'v2.0-353', - 'hash_version' => 'v2.0-353-gb6f4080', + 'app_version' => 'v2.0.5-pre', + 'hash_version' => 'v2.0.5-pre-3-gc1961c0', ); \ No newline at end of file diff --git a/app/controllers/AuthController.php b/app/controllers/AuthController.php index 4121faa042..8d06b83843 100755 --- a/app/controllers/AuthController.php +++ b/app/controllers/AuthController.php @@ -22,11 +22,14 @@ class AuthController extends BaseController /** * 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 - * + * @param $username + * @param $password + * @param bool|false $returnUser + * @return bool true if the username and/or password provided are valid + * false if the username and/or password provided are invalid + * array of ldap_attributes if $returnUser is true */ - function ldap($username, $password) { + function ldap($username, $password, $returnUser = false) { $ldaphost = Config::get('ldap.url'); $ldaprdn = Config::get('ldap.username'); @@ -35,11 +38,11 @@ class AuthController extends BaseController $filterQuery = Config::get('ldap.authentication.filter.query') . $username; $ldapversion = Config::get('ldap.version'); - // 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); - ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION,$ldapversion); + // 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); + ldap_set_option($connection, LDAP_OPT_PROTOCOL_VERSION,$ldapversion); try { if ($connection) { @@ -49,7 +52,9 @@ class AuthController extends BaseController $entry = ldap_first_entry($connection, $results); if ( ($userDn = @ldap_get_dn($connection, $entry)) !== false ) { if( ($isBound = ldap_bind($connection, $userDn, $password)) == "true") { - return true; + return $returnUser ? + array_change_key_case(ldap_get_attributes($connection, $entry),CASE_LOWER) + : true; } } } @@ -61,6 +66,65 @@ class AuthController extends BaseController return false; } + /** + * Create user from LDAP attributes + * + * @param $ldapatttibutes + * @return array|bool + */ + function createUserFromLdap($ldapatttibutes){ + //Get LDAP attribute config + $ldap_result_username = Config::get('ldap.result.username'); + $ldap_result_emp_num = Config::get('ldap.result.emp.num'); + $ldap_result_last_name = Config::get('ldap.result.last.name'); + $ldap_result_first_name = Config::get('ldap.result.first.name'); + $ldap_result_email = Config::get('ldap.result.email'); + + //Get LDAP user data + $item = array(); + $item["username"] = isset( $ldapatttibutes[$ldap_result_username][0] ) ? $ldapatttibutes[$ldap_result_username][0] : ""; + $item["employee_number"] = isset( $ldapatttibutes[$ldap_result_emp_num][0] ) ? $ldapatttibutes[$ldap_result_emp_num][0] : ""; + $item["lastname"] = isset( $ldapatttibutes[$ldap_result_last_name][0] ) ? $ldapatttibutes[$ldap_result_last_name][0] : ""; + $item["firstname"] = isset( $ldapatttibutes[$ldap_result_first_name][0] ) ? $ldapatttibutes[$ldap_result_first_name][0] : ""; + $item["email"] = isset( $ldapatttibutes[$ldap_result_email][0] ) ? $ldapatttibutes[$ldap_result_email][0] : "" ; + + //create user + if(!empty($item["username"]) && !empty($item['email'])) { + $pass = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 10); + + $newuser = array( + 'first_name' => $item["firstname"], + 'last_name' => $item["lastname"], + 'username' => $item["username"], + 'email' => $item["email"], + 'employee_num' => $item["employee_number"], + 'password' => $pass, + 'activated' => 1, + 'location_id' => null, + 'permissions' => '{"user":1}', + 'notes' => 'Imported from LDAP' + ); + + DB::table('users')->insert($newuser); + $updateuser = Sentry::findUserByLogin($item["username"]); + + // Update the user details + $updateuser->password = $pass; + + // Update the user + $updateuser->save(); + } else { + throw new Cartalyst\Sentry\Users\UserNotFoundException(); + } + + //$item["note"] = "created"; + $credentials = array( + 'username' => $item["username"], + 'password' => $pass, + ); + return $credentials; + } + /** * Account sign in form processing. @@ -83,7 +147,6 @@ class AuthController extends BaseController // Ooops.. something went wrong return Redirect::back()->withInput()->withErrors($validator); } - try { /** @@ -93,8 +156,18 @@ class AuthController extends BaseController // Try to get the user from the database. $user = (array) DB::table('users')->where('username', Input::get('username'))->first(); + //If user does not exist and authenticates sucessfully with LDAP we will create it onf the fly and sign in with default permissions + if(!$user){ + if($userattr = $this->ldap(Input::get('username'), Input::get('password'),true) ){ + LOG::debug("Creating LDAP authenticated user."); + $credentials = $this->createUserFromLdap($userattr); + Sentry::authenticate($credentials, Input::get('remember-me', 0)); - if ($user && strpos($user["notes"],'LDAP') !== false) { + + } + } + + else if ($user && strpos($user["notes"],'LDAP') !== false) { LOG::debug("Authenticating user against LDAP."); if( $this->ldap(Input::get('username'), Input::get('password')) ) { LOG::debug("valid login"); diff --git a/app/controllers/admin/AssetMaintenancesController.php b/app/controllers/admin/AssetMaintenancesController.php index 85147a24b1..c7431df7c7 100644 --- a/app/controllers/admin/AssetMaintenancesController.php +++ b/app/controllers/admin/AssetMaintenancesController.php @@ -5,7 +5,6 @@ use AdminController; use AssetMaintenance; use Carbon\Carbon; - use Datatable; use DB; use Input; use Lang; @@ -20,6 +19,7 @@ use TCPDF; use Validator; use View; + use Setting; class AssetMaintenancesController extends AdminController { @@ -48,7 +48,9 @@ public function getDatatable() { - $maintenances = AssetMaintenance::with('asset','supplier') + + + $maintenances = AssetMaintenance::with('asset','supplier') ->whereNull('deleted_at'); if (Input::has('search')) { @@ -77,18 +79,25 @@ $maintenances = $maintenances->skip($offset)->take($limit)->get(); $rows = array(); + $settings = Setting::getSettings(); foreach($maintenances as $maintenance) { $actions = ''; + if (($maintenance->cost) && ($maintenance->asset->assetloc) && ($maintenance->asset->assetloc->currency!='')) { + $maintenance_cost = $maintenance->asset->assetloc->currency.$maintenance->cost; + } else { + $maintenance_cost = $settings->default_currency.$maintenance->cost; + } + $rows[] = array( 'id' => $maintenance->id, - 'asset_name' => $maintenance->asset->showAssetName(), + 'asset_name' => link_to('/hardware/'.$maintenance->asset->id.'/view', $maintenance->asset->showAssetName()) , 'title' => $maintenance->title, 'notes' => $maintenance->notes, 'supplier' => $maintenance->supplier->name, - 'cost' => ($maintenance->cost) ? $maintenance->asset->assetloc->currency.''.$maintenance->cost : $maintenance->cost , + 'cost' => $maintenance_cost, 'asset_maintenance_type' => e($maintenance->asset_maintenance_type), 'start_date' => $maintenance->start_date, 'time' => $maintenance->asset_maintenance_time, diff --git a/app/controllers/admin/AssetsController.php b/app/controllers/admin/AssetsController.php index 51978a9995..c2de106483 100755 --- a/app/controllers/admin/AssetsController.php +++ b/app/controllers/admin/AssetsController.php @@ -23,7 +23,6 @@ use Config; use Location; use Log; use Mail; -use Datatable; use TCPDF; use Slack; use Paginator; @@ -578,17 +577,34 @@ class AssetsController extends AdminController public function getView($assetId = null) { $asset = Asset::withTrashed()->find($assetId); + $settings = Setting::getSettings(); + + + if ($asset->userloc) { + $use_currency = $asset->userloc->currency; + } elseif ($asset->assetloc) { + $use_currency = $asset->assetloc->currency; + } else { + $default_currency = Setting::first()->default_currency; + + if ($settings->default_currency!='') { + $use_currency = $settings->default_currency; + } else { + $use_currency = Lang::get('general.currency'); + } + + } if (isset($asset->id)) { - $settings = Setting::getSettings(); + $qr_code = (object) array( 'display' => $settings->qr_code == '1', 'url' => route('qr_code/hardware', $asset->id) ); - return View::make('backend/hardware/view', compact('asset', 'qr_code')); + return View::make('backend/hardware/view', compact('asset', 'qr_code','settings'))->with('use_currency',$use_currency); } else { // Prepare the error message $error = Lang::get('admin/hardware/message.does_not_exist', compact('id')); @@ -1130,18 +1146,18 @@ class AssetsController extends AdminController } $allowed_columns = [ - 'id', - 'name', - 'asset_tag', - 'serial', - 'model', - 'last_checkout', - 'category', - 'notes', - 'expected_checkin', - 'order_number', - 'location' - ]; + 'id', + 'name', + 'asset_tag', + 'serial', + 'model', + 'last_checkout', + 'category', + 'notes', + 'expected_checkin', + 'order_number', + 'location' + ]; $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'asset_tag'; @@ -1195,7 +1211,7 @@ class AssetsController extends AdminController 'name' => ''.$asset->name.'', 'asset_tag' => ''.$asset->asset_tag.'', 'serial' => $asset->serial, - 'model' => ($asset->model) ? $asset->model->name : 'No model', + 'model' => ($asset->model) ? link_to('/hardware/models/'.$asset->model->id.'/view', $asset->model->name) : 'No model', 'status' => ($asset->assigneduser) ? link_to('../admin/users/'.$asset->assigned_to.'/view', $asset->assigneduser->fullName()) : (($asset->assetstatus) ? $asset->assetstatus->name : ''), 'location' => (($asset->assigneduser) && ($asset->assigneduser->userloc!='')) ? link_to('admin/settings/locations/'.$asset->assigneduser->userloc->id.'/edit', $asset->assigneduser->userloc->name) : (($asset->defaultLoc!='') ? link_to('admin/settings/locations/'.$asset->defaultLoc->id.'/edit', $asset->defaultLoc->name) : ''), 'category' => (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : '', diff --git a/app/controllers/admin/CategoriesController.php b/app/controllers/admin/CategoriesController.php index ded6aa1e88..0ffeb6e9b3 100755 --- a/app/controllers/admin/CategoriesController.php +++ b/app/controllers/admin/CategoriesController.php @@ -11,7 +11,6 @@ use Sentry; use Str; use Validator; use View; -use Datatable; class CategoriesController extends AdminController { @@ -237,10 +236,6 @@ class CategoriesController extends AdminController } - $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function($categories) { - return ''; - }); - $allowed_columns = ['id','name','category_type']; $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at'; @@ -257,9 +252,9 @@ class CategoriesController extends AdminController $rows[] = array( 'id' => $category->id, - 'name' => $category->name, + 'name' => link_to('/admin/settings/categories/'.$category->id.'/view', $category->name) , 'category_type' => ucwords($category->category_type), - 'count' => ($category->category_type=='asset') ? link_to('/admin/settings/categories/'.$category->id.'/view', $category->assetscount()) : $category->accessoriescount(), + 'count' => ($category->category_type=='asset') ? $category->assetscount() : $category->accessoriescount(), 'acceptance' => ($category->require_acceptance=='1') ? '' : '', //EULA is still not working correctly 'eula' => ($category->getEula()) ? '' : '', @@ -273,34 +268,69 @@ class CategoriesController extends AdminController } public function getDataView($categoryID) { - $category = Category::find($categoryID); - $categoryassets = $category->assets; - $actions = new \Chumper\Datatable\Columns\FunctionColumn('actions', function ($categoryassets) - { - if (($categoryassets->assigned_to !='') && ($categoryassets->assigned_to > 0)) { - return ''.Lang::get('general.checkin').''; + $category = Category::find($categoryID); + $category_assets = $category->assets; + + if (Input::has('search')) { + $category_assets = $category_assets->TextSearch(e(Input::get('search'))); + } + + if (Input::has('offset')) { + $offset = e(Input::get('offset')); + } else { + $offset = 0; + } + + if (Input::has('limit')) { + $limit = e(Input::get('limit')); + } else { + $limit = 50; + } + + $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; + + $allowed_columns = ['id','name','serial','asset_tag']; + $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at'; + $count = $category_assets->count(); + + $rows = array(); + + foreach ($category_assets as $asset) { + + $actions = ''; + if ($asset->deleted_at=='') { + $actions = '
'; + } elseif ($asset->deleted_at!='') { + $actions = ''; + } + + if ($asset->assetstatus) { + if ($asset->assetstatus->deployable != 0) { + if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) { + $inout = ''.Lang::get('general.checkin').''; } else { - return ''.Lang::get('general.checkout').''; + $inout = ''.Lang::get('general.checkout').''; } - }); - - return Datatable::collection($categoryassets) - ->addColumn('name', function ($categoryassets) { - return link_to('/hardware/'.$categoryassets->id.'/view', $categoryassets->name); - }) - ->addColumn('asset_tag', function ($categoryassets) { - return link_to('/hardware/'.$categoryassets->id.'/view', $categoryassets->asset_tag); - }) - ->addColumn('assigned_to', function ($categoryassets) { - if ($categoryassets->assigned_to) { - return link_to('/admin/users/'.$categoryassets->assigned_to.'/view', $categoryassets->assigneduser->fullName()); } - }) - ->addColumn($actions) - ->searchColumns('name','asset_tag','assigned_to','actions') - ->orderColumns('name','asset_tag','assigned_to','actions') - ->make(); + } + + $rows[] = array( + 'id' => $asset->id, + 'name' => link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()), + 'model' => $asset->model->name, + 'asset_tag' => $asset->asset_tag, + 'serial' => $asset->serial, + 'assigned_to' => ($asset->assigneduser) ? link_to('/admin/users/'.$asset->assigneduser->id.'/view', $asset->assigneduser->fullName()): '', + 'change' => $inout, + 'actions' => $actions, + + + ); + } + + $data = array('total' => $count, 'rows' => $rows); + return $data; } diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php index e1d27421bd..06219e988a 100755 --- a/app/controllers/admin/LocationsController.php +++ b/app/controllers/admin/LocationsController.php @@ -254,10 +254,41 @@ class LocationsController extends AdminController } + + /** + * Get the location page detail page + * + * @param int $locationID + * @return View + **/ + public function getView($locationId = null) + { + $location = Location::find($locationId); + + if (isset($location->id)) { + return View::make('backend/locations/view', compact('location')); + } else { + // Prepare the error message + $error = Lang::get('admin/locations/message.does_not_exist', compact('id')); + + // Redirect to the user management page + return Redirect::route('locations')->with('error', $error); + } + + + } + + + /** + * Get the locations API information to present to the location view page + * + * @param int $locationID + * @return JSON + **/ public function getDatatable() { - $locations = Location::select(array('id','name','address','address2','city','state','zip','country','parent_id','currency'))->with('assets') - ->whereNull('deleted_at'); + $locations = Location::select(array('locations.id','locations.name','locations.address','locations.address2','locations.city','locations.state','locations.zip','locations.country','locations.parent_id','locations.currency'))->with('assets'); + if (Input::has('search')) { $locations = $locations->TextSearch(e(Input::get('search'))); @@ -275,11 +306,23 @@ class LocationsController extends AdminController $limit = 50; } - $allowed_columns = ['id','name','address','city','state','country','currency']; $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; - $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at'; - $locations->orderBy($sort, $order); + + + switch (Input::get('sort')) + { + case 'parent': + $locations = $locations->OrderParent($order); + break; + default: + $allowed_columns = ['id','name','address','city','state','country','currency']; + + $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at'; + $locations = $locations->orderBy($sort, $order); + break; + } + $locationsCount = $locations->count(); $locations = $locations->skip($offset)->take($limit)->get(); @@ -287,13 +330,15 @@ class LocationsController extends AdminController $rows = array(); foreach($locations as $location) { - $actions = ''; + $actions = ''; $rows[] = array( 'id' => $location->id, - 'name' => link_to('admin/locations/'.$location->id.'/view', $location->name), + 'name' => link_to('admin/settings/locations/'.$location->id.'/view', $location->name), 'parent' => ($location->parent) ? $location->parent->name : '', - 'assets' => ($location->assets->count() + $location->assignedassets->count()), + // 'assets' => ($location->assets->count() + $location->assignedassets->count()), + 'assets_default' => $location->assignedassets->count(), + 'assets_checkedout' => $location->assets->count(), 'address' => ($location->address) ? $location->address: '', 'city' => $location->city, 'state' => $location->state, @@ -310,5 +355,59 @@ class LocationsController extends AdminController } + /** + * Get the location user listing information to present to the location details page + * + * @param int $locationID + * @return JSON + **/ + public function getDataViewUsers($locationID) + { + $location = Location::find($locationID); + $location_users = $location->users; + $count = $location_users->count(); + + $rows = array(); + + foreach ($location_users as $user) { + $rows[] = array( + 'name' => link_to('/admin/users/'.$user->id.'/view', $user->fullName()) + ); + } + + $data = array('total' => $count, 'rows' => $rows); + + return $data; + } + + + /** + * Get the location asset information to present to the location details page + * + * @param int $locationID + * @return JSON + **/ + public function getDataViewAssets($locationID) + { + $location = Location::find($locationID); + $count = $location->assets->count(); + + $rows = array(); + + foreach ($location->assets as $asset) { + $rows[] = array( + 'name' => link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()), + 'asset_tag' => $asset->asset_tag, + 'serial' => $asset->serial, + 'model' => $asset->model->name, + + ); + } + + $data = array('total' => $count, 'rows' => $rows); + return $data; + + } + } diff --git a/app/controllers/admin/ManufacturersController.php b/app/controllers/admin/ManufacturersController.php index 0b4c8a34c6..eb405082a8 100755 --- a/app/controllers/admin/ManufacturersController.php +++ b/app/controllers/admin/ManufacturersController.php @@ -226,7 +226,7 @@ class ManufacturersController extends AdminController $rows[] = array( 'id' => $manufacturer->id, - 'name' => link_to('admin/manufacturers/'.$manufacturer->id.'/view', $manufacturer->name), + 'name' => link_to('admin/settings/manufacturers/'.$manufacturer->id.'/view', $manufacturer->name), 'assets' => $manufacturer->assetscount(), 'actions' => $actions ); @@ -239,4 +239,72 @@ class ManufacturersController extends AdminController } + + public function getDataView($manufacturerID) { + + $manufacturer = Manufacturer::find($manufacturerID); + $manufacturer_assets = $manufacturer->assets; + + if (Input::has('search')) { + $manufacturer_assets = $manufacturer_assets->TextSearch(e(Input::get('search'))); + } + + if (Input::has('offset')) { + $offset = e(Input::get('offset')); + } else { + $offset = 0; + } + + if (Input::has('limit')) { + $limit = e(Input::get('limit')); + } else { + $limit = 50; + } + + $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; + + $allowed_columns = ['id','name','serial','asset_tag']; + $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at'; + $count = $manufacturer_assets->count(); + + $rows = array(); + + foreach ($manufacturer_assets as $asset) { + + $actions = ''; + if ($asset->deleted_at=='') { + $actions = '
'; + } elseif ($asset->deleted_at!='') { + $actions = ''; + } + + if ($asset->assetstatus) { + if ($asset->assetstatus->deployable != 0) { + if (($asset->assigned_to !='') && ($asset->assigned_to > 0)) { + $inout = ''.Lang::get('general.checkin').''; + } else { + $inout = ''.Lang::get('general.checkout').''; + } + } + } + + $rows[] = array( + 'id' => $asset->id, + 'name' => link_to('/hardware/'.$asset->id.'/view', $asset->showAssetName()), + 'model' => $asset->model->name, + 'asset_tag' => $asset->asset_tag, + 'serial' => $asset->serial, + 'assigned_to' => ($asset->assigneduser) ? link_to('/admin/users/'.$asset->assigneduser->id.'/view', $asset->assigneduser->fullName()): '', + 'change' => $inout, + 'actions' => $actions, + + + ); + } + + $data = array('total' => $count, 'rows' => $rows); + return $data; + } + + } diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index 46a1965d8d..d92cfa5392 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -382,7 +382,7 @@ class ModelsController extends AdminController public function getDatatable($status = null) { - $models = Model::orderBy('created_at', 'DESC')->with('category','assets','depreciation'); + $models = Model::with('category','assets','depreciation'); ($status != 'Deleted') ?: $models->withTrashed()->Deleted();; if (Input::has('search')) { @@ -402,7 +402,7 @@ class ModelsController extends AdminController } - $allowed_columns = ['name']; + $allowed_columns = ['id','name','modelno']; $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'created_at'; @@ -415,13 +415,14 @@ class ModelsController extends AdminController foreach ($models as $model) { if ($model->deleted_at == '') { - $actions = ''; + $actions = '
'; } else { $actions = ''; } $rows[] = array( - 'manufacturer' => $model->manufacturer->name, + 'id' => $model->id, + 'manufacturer' => link_to('/admin/settings/manufacturers/'.$model->manufacturer->id.'/view', $model->manufacturer->name), 'name' => link_to('/hardware/models/'.$model->id.'/view', $model->name), 'modelnumber' => $model->modelno, 'numassets' => $model->assets->count(), diff --git a/app/controllers/admin/StatuslabelsController.php b/app/controllers/admin/StatuslabelsController.php index 1266a8dfb0..c184fbd700 100755 --- a/app/controllers/admin/StatuslabelsController.php +++ b/app/controllers/admin/StatuslabelsController.php @@ -271,7 +271,7 @@ class StatuslabelsController extends AdminController $label_type = Lang::get('admin/statuslabels/table.undeployable'); } - $actions = ''; + $actions = ''; $rows[] = array( 'id' => $statuslabel->id, diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index a509cf35f1..d719fcdc7d 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -43,7 +43,7 @@ class UsersController extends AdminController { 'first_name' => 'required|alpha_space|min:2', 'last_name' => 'required|alpha_space|min:2', 'location_id' => 'numeric', - 'username' => 'required|min:2|unique:users,username', + 'username' => 'required|min:2|unique:users,username, ', 'email' => 'email|unique:users,email', 'password' => 'required|min:6', 'password_confirm' => 'required|min:6|same:password', @@ -486,8 +486,8 @@ class UsersController extends AdminController { if ((!Input::has('edit_user')) || (count(Input::has('edit_user')) == 0)) { return Redirect::back()->with('error', 'No users selected'); } else { - $statuslabel_list = array('' => Lang::get('general.select_statuslabel')) + Statuslabel::orderBy('name', 'asc')->lists('name', 'id'); - $user_raw_array = Input::get('edit_user'); + $statuslabel_list = statusLabelList(); + $user_raw_array = array_keys(Input::get('edit_user')); $users = User::whereIn('id', $user_raw_array)->with('groups')->get(); return View::make('backend/users/confirm-bulk-delete', compact('users', 'statuslabel_list')); } @@ -845,7 +845,7 @@ class UsersController extends AdminController { $sort = e(Input::get('sort')); } - $users = User::with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'sentryThrottle', 'groups', 'userloc'); + $users = User::select(array('users.id','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes'))->with('assets', 'accessories', 'consumables', 'licenses', 'manager', 'sentryThrottle', 'groups', 'userloc'); switch ($status) { case 'deleted': @@ -853,21 +853,31 @@ class UsersController extends AdminController { break; } - - if (Input::has('search')) { $users = $users->TextSearch(Input::get('search')); } - $allowed_columns = ['last_name','first_name','email','username','manager','location','assets','accessories', 'consumables','licenses','groups']; - $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; - $sort = in_array($sort, $allowed_columns) ? $sort : 'first_name'; + $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; + switch (Input::get('sort')) + { + case 'manager': + $users = $users->OrderManager($order); + break; + default: + $allowed_columns = + [ + 'last_name','first_name','email','username','location', + 'assets','accessories', 'consumables','licenses','groups' + ]; + + $sort = in_array($sort, $allowed_columns) ? $sort : 'first_name'; + $users = $users->orderBy($sort, $order); + break; + } $userCount = $users->count(); - $users = $users->skip($offset)->take($limit)->orderBy($sort, $order)->get(); - - + $users = $users->skip($offset)->take($limit)->get(); $rows = array(); foreach ($users as $user) diff --git a/app/database/seeds/LocationsSeeder.php b/app/database/seeds/LocationsSeeder.php index c316a7dc28..5dc457ebba 100755 --- a/app/database/seeds/LocationsSeeder.php +++ b/app/database/seeds/LocationsSeeder.php @@ -17,6 +17,7 @@ class LocationsSeeder extends Seeder 'state' => 'NY', 'country' => 'US', 'zip' => '10004', + 'currency' => '$', 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, @@ -31,6 +32,7 @@ class LocationsSeeder extends Seeder 'state' => 'NY', 'country' => 'US', 'zip' => '10004', + 'currency' => '$', 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, @@ -45,6 +47,7 @@ class LocationsSeeder extends Seeder 'state' => 'CA', 'country' => 'US', 'zip' => '94111', + 'currency' => '$', 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, @@ -59,6 +62,7 @@ class LocationsSeeder extends Seeder 'state' => 'CA', 'country' => 'US', 'zip' => '90028', + 'currency' => '$', 'created_at' => $date->modify('-10 day'), 'updated_at' => $date->modify('-3 day'), 'user_id' => 1, diff --git a/app/helpers.php b/app/helpers.php index 4c1fece3ed..a643c5f830 100755 --- a/app/helpers.php +++ b/app/helpers.php @@ -39,7 +39,7 @@ function suppliersList() { } function statusLabelList() { - $statuslabel_list = Statuslabel::orderBy('name', 'asc') + $statuslabel_list = array('' => Lang::get('general.select_statuslabel')) + Statuslabel::orderBy('name', 'asc') ->lists('name', 'id'); return $statuslabel_list; } diff --git a/app/lang/ar/admin/accessories/general.php b/app/lang/ar/admin/accessories/general.php index 02e5a8c418..3867e1a69a 100755 --- a/app/lang/ar/admin/accessories/general.php +++ b/app/lang/ar/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'الملحقات هي أي شيء تقوم بتسليمه للمستخدمين لكنه لا يحتوي على رقم تسلسلي (أو أنك لست بحاجة إلى تتبعه بشكل خاص). مثال: فأرة الحاسوب أو لوحة المفاتيح.', 'accessory_category' => 'فئة الملحق', 'accessory_name' => 'اسم الملحق', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', 'eula_text' => 'إنشاء اتفاقية جديدة', 'eula_text_help' => 'يسمح لك هذا الحقل بتخصيص الاتفاقيات لأنواع معينة من الأصول. اذا كنت تمتلك اتفاقية واحدة لجميع أصولك يمكنك أن تقوم بتأشير المربع في الأسفل لاستخدام الاتفاقية الافتراضية.', 'require_acceptance' => 'مطالبة المستخدمين بتأكيد قبولهم الأصول في هذه الفئة.', 'no_default_eula' => 'ليس هناك اتفاقيات. قم باضافة واحدة من "الاعدادات".', + 'order' => 'Order Number', 'qty' => 'الكمية', 'total' => 'المجموع', 'remaining' => 'المتاح', diff --git a/app/lang/ar/admin/asset_maintenances/form.php b/app/lang/ar/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/ar/admin/asset_maintenances/form.php +++ b/app/lang/ar/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/ar/admin/asset_maintenances/table.php b/app/lang/ar/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/ar/admin/asset_maintenances/table.php +++ b/app/lang/ar/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/ar/admin/consumables/general.php b/app/lang/ar/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/ar/admin/consumables/general.php +++ b/app/lang/ar/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/ar/admin/locations/table.php b/app/lang/ar/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/ar/admin/locations/table.php +++ b/app/lang/ar/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/ar/admin/settings/general.php b/app/lang/ar/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/ar/admin/settings/general.php +++ b/app/lang/ar/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ar/general.php b/app/lang/ar/general.php index 5c885e7d5d..f6ee6a7eba 100755 --- a/app/lang/ar/general.php +++ b/app/lang/ar/general.php @@ -43,6 +43,7 @@ 'date' => 'التاريخ', 'delete' => 'حذف', 'deleted' => 'تم حذفها', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'مُوزعة', 'depreciation_report' => 'تقرير الإستهلاك', 'download' => 'Download', diff --git a/app/lang/bg/admin/accessories/general.php b/app/lang/bg/admin/accessories/general.php index e9ed3e0b13..2ec1b90cf5 100755 --- a/app/lang/bg/admin/accessories/general.php +++ b/app/lang/bg/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Аксесоарите са всички неща, които се изписват на потребителите, но нямат сериен номер (или няма нужда да бъдат конкретно проследявани). Например, това са мишки, клавиатури и др.', 'accessory_category' => 'Категория аксесоари', 'accessory_name' => 'Аксесоар', + 'cost' => 'Purchase Cost', 'create' => 'Създаване на аксесоар', + 'date' => 'Purchase Date', 'eula_text' => 'EULA на категорията', 'eula_text_help' => 'Това поле позволява да задавате различни EULA за всеки тип активи. Ако имате обща EULA за всички активи, можете да използвате кутийката по-долу за да използвате една обща по подразбиране.', 'require_acceptance' => 'Задължаване на потребителите да потвърждават приемането на активи от тази категория.', 'no_default_eula' => 'Няма EULA по подразбиране. Добавете я в Настройки.', + 'order' => 'Order Number', 'qty' => 'Количество', 'total' => 'Oбщо', 'remaining' => 'Наличност', diff --git a/app/lang/bg/admin/asset_maintenances/table.php b/app/lang/bg/admin/asset_maintenances/table.php index e4288d511c..e9fd2cb0d6 100755 --- a/app/lang/bg/admin/asset_maintenances/table.php +++ b/app/lang/bg/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Доставчик', 'is_warranty' => 'Гаранция', 'dl_csv' => 'Сваляне на CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/bg/admin/consumables/general.php b/app/lang/bg/admin/consumables/general.php index f0b06adc57..31bd321427 100755 --- a/app/lang/bg/admin/consumables/general.php +++ b/app/lang/bg/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Относно консумативите', 'about_consumables_text' => 'Консумативите са всички неща, купувани във времето. Например тонер за принтер или хартия.', 'consumable_name' => 'Консуматив', + 'cost' => 'Purchase Cost', 'create' => 'Създаване на консуматив', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Остава', 'total' => 'Oбщо', 'update' => 'Обновяване на консуматив', diff --git a/app/lang/bg/admin/locations/table.php b/app/lang/bg/admin/locations/table.php index e5fdbfbc57..44de80b405 100755 --- a/app/lang/bg/admin/locations/table.php +++ b/app/lang/bg/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Град', 'state' => 'Област', @@ -13,5 +14,5 @@ return array( 'zip' => 'Пощенски код', 'locations' => 'Местоположения', 'parent' => 'Присъединено към', - 'currency' => 'Валута на местоположението', // this is deprecated + 'currency' => 'Валута на местоположението', ); diff --git a/app/lang/bg/admin/settings/general.php b/app/lang/bg/admin/settings/general.php index 392a84a902..d1a89dd1e5 100755 --- a/app/lang/bg/admin/settings/general.php +++ b/app/lang/bg/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Цвят на хедъра', 'info' => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.', 'laravel' => 'Версия на Laravel', - 'load_remote' => 'Тази Snipe-IT инсталация може да зарежда и изпълнява външни скриптове.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Лого', 'optional' => 'незадължително', 'per_page' => 'Резултати на страница', @@ -47,4 +48,7 @@ return array( 'system' => 'Информация за системата', 'update' => 'Обновяване на настройките', 'value' => 'Стойност', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/bg/general.php b/app/lang/bg/general.php index f9db546a5b..4e607ac469 100755 --- a/app/lang/bg/general.php +++ b/app/lang/bg/general.php @@ -43,6 +43,7 @@ 'date' => 'Дата', 'delete' => 'Изтриване', 'deleted' => 'Изтрито', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Изписани', 'depreciation_report' => 'Справка за амортизации', 'download' => 'Изтегляне', diff --git a/app/lang/cs/admin/accessories/general.php b/app/lang/cs/admin/accessories/general.php index 0f3217c9a8..1a335c5f8b 100755 --- a/app/lang/cs/admin/accessories/general.php +++ b/app/lang/cs/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Příslušenství je cokoliv, co předáte uživatelům, ale nemá to sérivoé číslo (nebo to neevidujete). Např. myš, klávesnice.', 'accessory_category' => 'Kategorie příslušenství', 'accessory_name' => 'Název příslušenství', + 'cost' => 'Purchase Cost', 'create' => 'Vytvoř příslušenství', + 'date' => 'Purchase Date', 'eula_text' => 'Kategorie EULA', 'eula_text_help' => 'Toto pole umožňuje upravit EULA pro různé druhy majetku. Pokud máte pouze jeden typ pro všechen majetek, můžete zaškrtnout položku níže pro použití jako výchozí.', 'require_acceptance' => 'Požadovat potvrzení převzetí majetku v této kategorii.', 'no_default_eula' => 'Žádná primární EULA. Přidat novou v Nastavení.', + 'order' => 'Order Number', 'qty' => 'Množství', 'total' => 'CELKEM', 'remaining' => 'Dostupný', diff --git a/app/lang/cs/admin/asset_maintenances/form.php b/app/lang/cs/admin/asset_maintenances/form.php index 70ce7bf1fe..f8602213f9 100755 --- a/app/lang/cs/admin/asset_maintenances/form.php +++ b/app/lang/cs/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', 'start_date' => 'Začátek', - 'completion_date' => 'Completion Date', + 'completion_date' => 'Completed', 'cost' => 'Cena', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Poznámky', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/cs/admin/asset_maintenances/table.php b/app/lang/cs/admin/asset_maintenances/table.php index 6de98380f6..f139230b09 100755 --- a/app/lang/cs/admin/asset_maintenances/table.php +++ b/app/lang/cs/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Dodavatel', 'is_warranty' => 'Záruka', 'dl_csv' => 'Stáhnout CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/cs/admin/consumables/general.php b/app/lang/cs/admin/consumables/general.php index 97296cd53f..5057fcd7b3 100755 --- a/app/lang/cs/admin/consumables/general.php +++ b/app/lang/cs/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Zbývá', 'total' => 'Celkem', 'update' => 'Update Consumable', diff --git a/app/lang/cs/admin/locations/table.php b/app/lang/cs/admin/locations/table.php index 8a1fa9e5ef..fbe7c7f73c 100755 --- a/app/lang/cs/admin/locations/table.php +++ b/app/lang/cs/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Město', 'state' => 'Stát', @@ -13,5 +14,5 @@ return array( 'zip' => 'PSČ', 'locations' => 'Umístění', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/cs/admin/settings/general.php b/app/lang/cs/admin/settings/general.php index 5e1c4a9bb2..18314e9518 100755 --- a/app/lang/cs/admin/settings/general.php +++ b/app/lang/cs/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Barva záhlaví', 'info' => 'Tato nastavení umožňují zvolit určité prvky instalace.', 'laravel' => 'Verze Laravel', - 'load_remote' => 'Tato instalace Snipe-IT může nahrávat skripty z vnějšího světa.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'volitelný', 'per_page' => 'Výsledků na stránku', @@ -47,4 +48,7 @@ return array( 'system' => 'Systémové informace', 'update' => 'Upravit nastavení', 'value' => 'Hodnota', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/cs/general.php b/app/lang/cs/general.php index 153e45766d..57a8dd82a1 100755 --- a/app/lang/cs/general.php +++ b/app/lang/cs/general.php @@ -43,6 +43,7 @@ 'date' => 'Datum', 'delete' => 'Odstranit', 'deleted' => 'Odstraněno', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Vydané', 'depreciation_report' => 'Report zastarání', 'download' => 'Stáhnout', diff --git a/app/lang/da/admin/accessories/general.php b/app/lang/da/admin/accessories/general.php index f98b5f530e..aa3600b071 100755 --- a/app/lang/da/admin/accessories/general.php +++ b/app/lang/da/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Tilbehør er alt du udleverer til brugere men som ikke har et serienummer (eller som du er ligeglad med følge præcist). For eksempel, computermus eller tastaturer.', 'accessory_category' => 'Tilbehør Kategori', 'accessory_name' => 'Tilbehør Navn', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', 'eula_text' => 'Slutbrugerlicenskategori', 'eula_text_help' => 'Dette felt tillader dig at tilpasse din slutbrugerlicens til specifikke typer af tilbehør. Hvis du kun har en slutbrugerlicens for alle dine tilbehør, kan du afkrydse boksen nedenfor for at bruge den primære standardlicens.', 'require_acceptance' => 'Kræver brugere at bekræfte accept af tilbehør i denne kategori.', 'no_default_eula' => 'Ingen primær standard slutbrugerlicens blev fundet. Tilføj en under Indstillinger.', + 'order' => 'Order Number', 'qty' => 'STK', 'total' => 'I alt', 'remaining' => 'Tilgængelig', diff --git a/app/lang/da/admin/asset_maintenances/form.php b/app/lang/da/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/da/admin/asset_maintenances/form.php +++ b/app/lang/da/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/da/admin/asset_maintenances/table.php b/app/lang/da/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/da/admin/asset_maintenances/table.php +++ b/app/lang/da/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/da/admin/consumables/general.php b/app/lang/da/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/da/admin/consumables/general.php +++ b/app/lang/da/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/da/admin/locations/table.php b/app/lang/da/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/da/admin/locations/table.php +++ b/app/lang/da/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/da/admin/settings/general.php b/app/lang/da/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/da/admin/settings/general.php +++ b/app/lang/da/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/da/general.php b/app/lang/da/general.php index 4e21731556..27ff485e9b 100755 --- a/app/lang/da/general.php +++ b/app/lang/da/general.php @@ -43,6 +43,7 @@ 'date' => 'Dato', 'delete' => 'Slet', 'deleted' => 'Slettet', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Implementeret', 'depreciation_report' => 'Afskrivningsrapport', 'download' => 'Hent', diff --git a/app/lang/de/admin/accessories/general.php b/app/lang/de/admin/accessories/general.php index 12685f12c9..5c14a69d14 100755 --- a/app/lang/de/admin/accessories/general.php +++ b/app/lang/de/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Ein Zubehör ist alles was Sie an einem Benutzer ausgeben können, jedoch keine Seriennummer besitzt (oder wo es keinen Sinn macht eben diese zu verwalten). Zum Beispiel: Computer Mäuse und Tastaturen.', 'accessory_category' => 'Züberhor Kategorie', 'accessory_name' => 'Zubehör Name', + 'cost' => 'Purchase Cost', 'create' => 'Zubehör neu erstellen', + 'date' => 'Purchase Date', 'eula_text' => 'Kategorie EULA', 'eula_text_help' => 'Dieses Feld erlaubt Ihnen die EULA Ihren Bedürfnissen nach Asset Typ anzupassen.Wenn Sie nur eine EULA für alle Assets haben, aktivieren Sie die Checkbox unterhalb um die Standard EULA zu verwenden.', 'require_acceptance' => 'Erfordert die Zustimmung der Assets in dieser Kategorie durch den Benutzer.', 'no_default_eula' => 'Keine Standard EULA gefunden. Fügen Sie eine in den Einstellungen hinzu.', + 'order' => 'Order Number', 'qty' => 'Anzahl', 'total' => 'Gesamt', 'remaining' => 'Verfügbar', diff --git a/app/lang/de/admin/asset_maintenances/table.php b/app/lang/de/admin/asset_maintenances/table.php index aed17740a8..f382b11a7c 100755 --- a/app/lang/de/admin/asset_maintenances/table.php +++ b/app/lang/de/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Hersteller', 'is_warranty' => 'Garantie', 'dl_csv' => 'Als CSV herunterladen' - ]; \ No newline at end of file + ]; diff --git a/app/lang/de/admin/consumables/general.php b/app/lang/de/admin/consumables/general.php index b3ebad14ce..9829afd7a4 100755 --- a/app/lang/de/admin/consumables/general.php +++ b/app/lang/de/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Details Verbrauchsmaterialien', 'about_consumables_text' => 'Verbrauchsmaterialien sind alle Dinge, die gekauft und mit der Zeit aufgebraucht werden, wie z.B. Druckerpatronen oder Kopierpapier.', 'consumable_name' => 'Name des Verbrauchsmaterials', + 'cost' => 'Purchase Cost', 'create' => 'Verbrauchsmaterial erstellen', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'übrig', 'total' => 'Gesamt', 'update' => 'Verbrauchsmaterial überarbeiten', diff --git a/app/lang/de/admin/locations/table.php b/app/lang/de/admin/locations/table.php index 077240f274..baab63b170 100755 --- a/app/lang/de/admin/locations/table.php +++ b/app/lang/de/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Stadt', 'state' => 'Bundesland', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postleitzahl', 'locations' => 'Standorte', 'parent' => 'Hauptkategorie', - 'currency' => 'Landeswährung', // this is deprecated + 'currency' => 'Landeswährung', ); diff --git a/app/lang/de/admin/settings/general.php b/app/lang/de/admin/settings/general.php index 9e6401c5a9..4b95bf6b80 100755 --- a/app/lang/de/admin/settings/general.php +++ b/app/lang/de/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Farbe der Kopfzeile', 'info' => 'Mit diesen Einstellungen können Sie verschieden Aspekte Ihrer Installation bearbeiten.', 'laravel' => 'Laravel Version', - 'load_remote' => 'Diese Installation von Snipe-IT kann Skripte aus der Aussenwelt laden.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Ergebnisse pro Seite', @@ -47,4 +48,7 @@ return array( 'system' => 'Systeminformationen', 'update' => 'Einstellungen übernehmen', 'value' => 'Wert', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/de/general.php b/app/lang/de/general.php index a40f880998..d541c09e10 100755 --- a/app/lang/de/general.php +++ b/app/lang/de/general.php @@ -43,6 +43,7 @@ 'date' => 'Purchase Date', 'delete' => 'Löschen', 'deleted' => 'Gelöscht', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Herausgegeben', 'depreciation_report' => 'Abschreibunsgreport', 'download' => 'Download', diff --git a/app/lang/en-GB/admin/accessories/general.php b/app/lang/en-GB/admin/accessories/general.php index 7d68dcabc5..85a199dbfc 100755 --- a/app/lang/en-GB/admin/accessories/general.php +++ b/app/lang/en-GB/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Accessory Category', 'accessory_name' => 'Accessory Name', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', + 'order' => 'Order Number', 'qty' => 'QTY', 'total' => 'Total', 'remaining' => 'Avail', diff --git a/app/lang/en-GB/admin/asset_maintenances/table.php b/app/lang/en-GB/admin/asset_maintenances/table.php index 02e9060bf6..49d5efa0fe 100755 --- a/app/lang/en-GB/admin/asset_maintenances/table.php +++ b/app/lang/en-GB/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Supplier Name', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/en-GB/admin/consumables/general.php b/app/lang/en-GB/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/en-GB/admin/consumables/general.php +++ b/app/lang/en-GB/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/en-GB/admin/locations/table.php b/app/lang/en-GB/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/en-GB/admin/locations/table.php +++ b/app/lang/en-GB/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/en-GB/admin/settings/general.php b/app/lang/en-GB/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/en-GB/admin/settings/general.php +++ b/app/lang/en-GB/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/en-GB/general.php b/app/lang/en-GB/general.php index 9e170e953c..cdad4e1b78 100755 --- a/app/lang/en-GB/general.php +++ b/app/lang/en-GB/general.php @@ -43,6 +43,7 @@ 'date' => 'Date', 'delete' => 'Delete', 'deleted' => 'Deleted', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Deployed', 'depreciation_report' => 'Depreciation Report', 'download' => 'Download', diff --git a/app/lang/en-ID/admin/accessories/general.php b/app/lang/en-ID/admin/accessories/general.php index fa51207664..a908d4e149 100755 --- a/app/lang/en-ID/admin/accessories/general.php +++ b/app/lang/en-ID/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Aksesoris adalah Aset yang tidak memiliki nomor seri (atau Anda tidak peduli tentang pelacakan mereka secara unik). Misalnya, mouse komputer atau keyboard.', 'accessory_category' => 'Kategori Aksesoris', 'accessory_name' => 'Nama Aksesoris', + 'cost' => 'Purchase Cost', 'create' => 'Buat Aksesoris', + 'date' => 'Purchase Date', 'eula_text' => 'Kategori EULA', 'eula_text_help' => 'Bidang ini memungkinkan Anda untuk menyesuaikan EULA Anda untuk jenis tertentu dari aset. Jika Anda hanya memiliki satu EULA untuk semua aset Anda, Anda dapat memeriksa kotak di bawah untuk menggunakan default primer.', 'require_acceptance' => 'Mengharuskan pengguna untuk mengkonfirmasi penerimaan aset dalam kategori ini.', 'no_default_eula' => 'Tidak ada EULA standar utama yang ditemukan. Tambahkan satu di Settings.', + 'order' => 'Order Number', 'qty' => 'QTY', 'total' => 'Total', 'remaining' => 'Tersedia', diff --git a/app/lang/en-ID/admin/asset_maintenances/table.php b/app/lang/en-ID/admin/asset_maintenances/table.php index 3a174faf48..6e34d9ab98 100755 --- a/app/lang/en-ID/admin/asset_maintenances/table.php +++ b/app/lang/en-ID/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Nama Suplayer', 'is_warranty' => 'Jaminan', 'dl_csv' => 'Unduh CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/en-ID/admin/consumables/general.php b/app/lang/en-ID/admin/consumables/general.php index db67771963..9c0f05e1d9 100755 --- a/app/lang/en-ID/admin/consumables/general.php +++ b/app/lang/en-ID/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Tentang Consumables', 'about_consumables_text' => 'Consumables adalah sesuatu yang dibeli yang akan digunakan dari waktu ke waktu. Misalnya, tinta printer atau kertas fotokopi.', 'consumable_name' => 'Nama Consumable', + 'cost' => 'Purchase Cost', 'create' => 'Buat Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Tersisa', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/en-ID/admin/locations/table.php b/app/lang/en-ID/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/en-ID/admin/locations/table.php +++ b/app/lang/en-ID/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/en-ID/admin/settings/general.php b/app/lang/en-ID/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/en-ID/admin/settings/general.php +++ b/app/lang/en-ID/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/en-ID/general.php b/app/lang/en-ID/general.php index a24ad5ffe7..697f285dae 100755 --- a/app/lang/en-ID/general.php +++ b/app/lang/en-ID/general.php @@ -43,6 +43,7 @@ 'date' => 'Date', 'delete' => 'Delete', 'deleted' => 'Deleted', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Deployed', 'depreciation_report' => 'Depreciation Report', 'download' => 'Download', diff --git a/app/lang/en/admin/asset_maintenances/form.php b/app/lang/en/admin/asset_maintenances/form.php index 2aa005c45f..785d06b08f 100755 --- a/app/lang/en/admin/asset_maintenances/form.php +++ b/app/lang/en/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Maintenance Type', + 'asset_maintenance_type' => 'Asset Maintenance Type', 'title' => 'Title', - 'start_date' => 'Started', - 'completion_date' => 'Completed', + 'start_date' => 'Start Date', + 'completion_date' => 'Completion Date', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Days', + 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', 'notes' => 'Notes', - 'update' => 'Update', - 'create' => 'Create' + 'update' => 'Update Asset Maintenance', + 'create' => 'Create Asset Maintenance' ]; diff --git a/app/lang/en/admin/asset_maintenances/table.php b/app/lang/en/admin/asset_maintenances/table.php index 5b83539914..49d5efa0fe 100755 --- a/app/lang/en/admin/asset_maintenances/table.php +++ b/app/lang/en/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset', - 'supplier_name' => 'Supplier', + 'asset_name' => 'Asset Name', + 'supplier_name' => 'Supplier Name', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' ]; diff --git a/app/lang/en/admin/locations/table.php b/app/lang/en/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/en/admin/locations/table.php +++ b/app/lang/en/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/en/general.php b/app/lang/en/general.php index e1fc1fe930..c9ddda5ab5 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -43,6 +43,7 @@ 'date' => 'Date', 'delete' => 'Delete', 'deleted' => 'Deleted', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Deployed', 'depreciation_report' => 'Depreciation Report', 'download' => 'Download', diff --git a/app/lang/es-CO/admin/accessories/general.php b/app/lang/es-CO/admin/accessories/general.php index 7ac1f68cc6..b7955c5d22 100755 --- a/app/lang/es-CO/admin/accessories/general.php +++ b/app/lang/es-CO/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accesorios son cualquier cosa que entregues a los usuarios pero que no tenga numero de serie (o no te interese seguirlos). Por ejemplo, ratones o teclados.', 'accessory_category' => 'Categoría de accesorio', 'accessory_name' => 'Nombre de accesorio', + 'cost' => 'Purchase Cost', 'create' => 'Crear Accesorio', + 'date' => 'Purchase Date', 'eula_text' => 'Categoría EULA', 'eula_text_help' => 'Este campo permite personalizar sus EULAs para tipos específicos de equipos. Si solo tiene un EULA para todos sus equipos, puede seleccionar la siguiente opción para usar el valor por defecto.', 'require_acceptance' => 'Requerir confirmación de usuarios para la aceptación de equipos en esta categoría.', 'no_default_eula' => 'No se encontró un EULA por defecto. Agregue uno en Configuración.', + 'order' => 'Order Number', 'qty' => 'Cantidad', 'total' => 'Total ', 'remaining' => 'Disponibles', diff --git a/app/lang/es-CO/admin/asset_maintenances/form.php b/app/lang/es-CO/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/es-CO/admin/asset_maintenances/form.php +++ b/app/lang/es-CO/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/es-CO/admin/asset_maintenances/table.php b/app/lang/es-CO/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/es-CO/admin/asset_maintenances/table.php +++ b/app/lang/es-CO/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/es-CO/admin/consumables/general.php b/app/lang/es-CO/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/es-CO/admin/consumables/general.php +++ b/app/lang/es-CO/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/es-CO/admin/locations/table.php b/app/lang/es-CO/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/es-CO/admin/locations/table.php +++ b/app/lang/es-CO/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/es-CO/admin/settings/general.php b/app/lang/es-CO/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/es-CO/admin/settings/general.php +++ b/app/lang/es-CO/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/es-CO/general.php b/app/lang/es-CO/general.php index e1fc1fe930..c9ddda5ab5 100755 --- a/app/lang/es-CO/general.php +++ b/app/lang/es-CO/general.php @@ -43,6 +43,7 @@ 'date' => 'Date', 'delete' => 'Delete', 'deleted' => 'Deleted', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Deployed', 'depreciation_report' => 'Depreciation Report', 'download' => 'Download', diff --git a/app/lang/es-ES/admin/accessories/general.php b/app/lang/es-ES/admin/accessories/general.php index b16ecc3512..e7ebc7b2fb 100755 --- a/app/lang/es-ES/admin/accessories/general.php +++ b/app/lang/es-ES/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accesorios son cualquier cosa que entregues a los usuarios pero que no tenga numero de serie (o no te interese seguirlos en forma unívoca). Por ejemplo, ratones o teclados.', 'accessory_category' => 'Categoría de accesorio', 'accessory_name' => 'Nombre de accesorio', + 'cost' => 'Purchase Cost', 'create' => 'Crear Accesorio', + 'date' => 'Purchase Date', 'eula_text' => 'Categoría EULA', 'eula_text_help' => 'Este campo permite personalizar sus EULAs para tipos específicos de equipos. Si solo tiene un EULA para todos sus equipos, puede seleccionar la siguiente opción para usar el valor por defecto.', 'require_acceptance' => 'Requerir confirmación de usuarios para la aceptación de equipos en esta categoría.', 'no_default_eula' => 'No se encontró un EULA por defecto. Agregue uno en Configuración.', + 'order' => 'Order Number', 'qty' => 'Cant', 'total' => 'Total ', 'remaining' => 'Disponibles', diff --git a/app/lang/es-ES/admin/asset_maintenances/table.php b/app/lang/es-ES/admin/asset_maintenances/table.php index 5d22858909..a3821219d8 100755 --- a/app/lang/es-ES/admin/asset_maintenances/table.php +++ b/app/lang/es-ES/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Nombre del Proveedor', 'is_warranty' => 'Garantía', 'dl_csv' => 'Descargar CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/es-ES/admin/consumables/general.php b/app/lang/es-ES/admin/consumables/general.php index 184be35a29..53e7a3ba6f 100755 --- a/app/lang/es-ES/admin/consumables/general.php +++ b/app/lang/es-ES/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Acerca de los consumibles', 'about_consumables_text' => 'Consumibles son cualquier cosa comprada que puede ser usada a lo largo del tiempo. Por ejemplo, tinta para impresora o papel para copiadora.', 'consumable_name' => 'Nombre del Consumible', + 'cost' => 'Purchase Cost', 'create' => 'Crear Consumible', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Actualizar Consumible', diff --git a/app/lang/es-ES/admin/locations/table.php b/app/lang/es-ES/admin/locations/table.php index cc77aa157b..0d5731555f 100755 --- a/app/lang/es-ES/admin/locations/table.php +++ b/app/lang/es-ES/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Ciudad', 'state' => 'Provincia', @@ -13,5 +14,5 @@ return array( 'zip' => 'Códio Postal', 'locations' => 'Localizaciones', 'parent' => 'Padre', - 'currency' => 'Divisa de la Localización', // this is deprecated + 'currency' => 'Divisa de la Localización', ); diff --git a/app/lang/es-ES/admin/settings/general.php b/app/lang/es-ES/admin/settings/general.php index 5bf7c74d3c..210bc25220 100755 --- a/app/lang/es-ES/admin/settings/general.php +++ b/app/lang/es-ES/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Color de encabezado', 'info' => 'Estos parámetros permirten personalizar ciertos aspectos de la aplicación.', 'laravel' => 'Versión de Laravel', - 'load_remote' => 'Esta instalación de Snipe-IT puede cargar scripts del mundo exterior.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'opcional', 'per_page' => 'Resultados por página', @@ -47,4 +48,7 @@ return array( 'system' => 'Información del Sistema', 'update' => 'Actualizar Parámetros', 'value' => 'Valor', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/es-ES/general.php b/app/lang/es-ES/general.php index 70caadda9d..7c4cc529dd 100755 --- a/app/lang/es-ES/general.php +++ b/app/lang/es-ES/general.php @@ -43,6 +43,7 @@ 'date' => 'Fecha Compra', 'delete' => 'Borrar', 'deleted' => 'Borrado', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Instalados - ', 'depreciation_report' => 'Informe de amortización', 'download' => 'Descargar', diff --git a/app/lang/fi/admin/accessories/general.php b/app/lang/fi/admin/accessories/general.php index 7d68dcabc5..1818dc0c94 100755 --- a/app/lang/fi/admin/accessories/general.php +++ b/app/lang/fi/admin/accessories/general.php @@ -5,13 +5,16 @@ return array( 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Accessory Category', 'accessory_name' => 'Accessory Name', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', - 'qty' => 'QTY', - 'total' => 'Total', + 'order' => 'Order Number', + 'qty' => 'KPL', + 'total' => 'Yhteensä', 'remaining' => 'Avail', 'update' => 'Update Accessory', 'use_default_eula' => 'Use the primary default EULA instead.', diff --git a/app/lang/fi/admin/accessories/message.php b/app/lang/fi/admin/accessories/message.php index 62f179c5a1..f000bd921c 100755 --- a/app/lang/fi/admin/accessories/message.php +++ b/app/lang/fi/admin/accessories/message.php @@ -2,7 +2,7 @@ return array( - 'does_not_exist' => 'Category does not exist.', + 'does_not_exist' => 'Luokkaa ei löydy.', 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', 'create' => array( @@ -11,8 +11,8 @@ return array( ), 'update' => array( - 'error' => 'Category was not updated, please try again', - 'success' => 'Category updated successfully.' + 'error' => 'Luokkaa ei päivitetty, yritä uudelleen', + 'success' => 'Luokka päivitettiin onnistuneesti.' ), 'delete' => array( @@ -24,7 +24,7 @@ return array( 'checkout' => array( 'error' => 'Accessory was not checked out, please try again', 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.' ), 'checkin' => array( diff --git a/app/lang/fi/admin/accessories/table.php b/app/lang/fi/admin/accessories/table.php index e02d9f22e4..b49ecb3f00 100755 --- a/app/lang/fi/admin/accessories/table.php +++ b/app/lang/fi/admin/accessories/table.php @@ -1,7 +1,7 @@ 'Download CSV', + 'dl_csv' => 'Lataa CSV', 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Acceptance', diff --git a/app/lang/fi/admin/asset_maintenances/form.php b/app/lang/fi/admin/asset_maintenances/form.php index 785d06b08f..7a482bc3a7 100755 --- a/app/lang/fi/admin/asset_maintenances/form.php +++ b/app/lang/fi/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', - 'cost' => 'Cost', + 'start_date' => 'Aloituspäivä', + 'completion_date' => 'Completed', + 'cost' => 'Kustannus', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', - 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'asset_maintenance_time' => 'Days', + 'notes' => 'Muistiinpanot', + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/fi/admin/asset_maintenances/general.php b/app/lang/fi/admin/asset_maintenances/general.php index c7ae42d41a..dceef3fa7d 100755 --- a/app/lang/fi/admin/asset_maintenances/general.php +++ b/app/lang/fi/admin/asset_maintenances/general.php @@ -6,6 +6,6 @@ 'delete' => 'Delete Asset Maintenance', 'view' => 'View Asset Maintenance Details', 'repair' => 'Repair', - 'maintenance' => 'Maintenance', - 'upgrade' => 'Upgrade' + 'maintenance' => 'Huoltotila', + 'upgrade' => 'Päivitä' ]; diff --git a/app/lang/fi/admin/asset_maintenances/message.php b/app/lang/fi/admin/asset_maintenances/message.php index ca4256efbe..9d328d6133 100755 --- a/app/lang/fi/admin/asset_maintenances/message.php +++ b/app/lang/fi/admin/asset_maintenances/message.php @@ -12,6 +12,6 @@ 'success' => 'Asset Maintenance created successfully.' ], 'asset_maintenance_incomplete' => 'Not Completed Yet', - 'warranty' => 'Warranty', - 'not_warranty' => 'Not Warranty', + 'warranty' => 'Takuu', + 'not_warranty' => 'Takuu päättynyt', ]; \ No newline at end of file diff --git a/app/lang/fi/admin/asset_maintenances/table.php b/app/lang/fi/admin/asset_maintenances/table.php index 02e9060bf6..4d1f82a97e 100755 --- a/app/lang/fi/admin/asset_maintenances/table.php +++ b/app/lang/fi/admin/asset_maintenances/table.php @@ -1,9 +1,9 @@ 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', - 'is_warranty' => 'Warranty', - 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + 'title' => 'Laitteen ylläpito', + 'asset_name' => 'Laitenimi', + 'supplier_name' => 'Toimittajan Nimi', + 'is_warranty' => 'Takuu', + 'dl_csv' => 'Lataa CSV' + ]; diff --git a/app/lang/fi/admin/consumables/general.php b/app/lang/fi/admin/consumables/general.php index 01ab4eb692..e09fc1cb98 100755 --- a/app/lang/fi/admin/consumables/general.php +++ b/app/lang/fi/admin/consumables/general.php @@ -4,8 +4,11 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', - 'remaining' => 'Remaining', - 'total' => 'Total', + 'date' => 'Purchase Date', + 'order' => 'Order Number', + 'remaining' => 'Jäljellä', + 'total' => 'Yhteensä', 'update' => 'Update Consumable', ); diff --git a/app/lang/fi/admin/hardware/general.php b/app/lang/fi/admin/hardware/general.php index d269d956b5..5f8f0e1856 100755 --- a/app/lang/fi/admin/hardware/general.php +++ b/app/lang/fi/admin/hardware/general.php @@ -9,7 +9,7 @@ return array( 'deployable' => 'Käyttööotettavissa', 'deleted' => 'Tämä laite on poistettu. Klikkaa tästä palauttaaksesi sen.', 'edit' => 'Muokkaa Laitetta', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', + 'filetype_info' => 'Sallitut tiedostotyypit ovat png, gif, jpg, jpeg, doc, docx, pdf, txt, zip ja rar.', 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.', 'requestable' => 'Pyydettävissä', 'restore' => 'Palauta Laite', diff --git a/app/lang/fi/admin/locations/table.php b/app/lang/fi/admin/locations/table.php index 9643ebfc23..652558898b 100755 --- a/app/lang/fi/admin/locations/table.php +++ b/app/lang/fi/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'Tunnus', 'city' => 'Kaupunki', 'state' => 'Lääni', @@ -12,6 +13,6 @@ return array( 'address' => 'Osoite', 'zip' => 'Postinumero', 'locations' => 'Sijainnit', - 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'parent' => 'Ylempi kategoria', + 'currency' => 'Valuutta', ); diff --git a/app/lang/fi/admin/settings/general.php b/app/lang/fi/admin/settings/general.php index 954e22fee3..30354ee2e9 100755 --- a/app/lang/fi/admin/settings/general.php +++ b/app/lang/fi/admin/settings/general.php @@ -7,10 +7,10 @@ return array( 'auto_increment_assets' => 'Luo automaattisesti kasvavat laite-ID:t', 'auto_increment_prefix' => 'Etuliite (valinnainen)', 'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this', - 'backups' => 'Backups', + 'backups' => 'Varmuuskopiointi', 'barcode_type' => 'Barcode Type', 'barcode_settings' => 'Barcode Settings', - 'custom_css' => 'Custom CSS', + 'custom_css' => 'Oma CSS', 'custom_css_help' => 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.', 'default_currency' => 'Default Currency', 'default_eula_text' => 'Default EULA', @@ -23,12 +23,13 @@ return array( 'eula_markdown' => 'This EULA allows Github flavored markdown.', 'general_settings' => 'General Settings', 'generate_backup' => 'Generate Backup', - 'header_color' => 'Header Color', + 'header_color' => 'Yläosion logo', 'info' => 'Näiden asetusten avulla voit mukauttaa tiettyjä toimintoja.', 'laravel' => 'Versio Laravel', - 'load_remote' => 'Tämä Snipe-IT asennus voi ladata scriptejä ulkopuolisesta maailmasta.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', - 'optional' => 'optional', + 'optional' => 'valinnainen', 'per_page' => 'Tuloksia Per Sivu', 'php' => 'Versio PHP', 'php_gd_info' => 'Sinun tulee asentaa php-gd paketti näyttääksesi QR-koodit, katso lisätietoja asennusohjeista.', @@ -47,4 +48,7 @@ return array( 'system' => 'Järjestelmän Tiedot', 'update' => 'Päivitä Asetukset', 'value' => 'Arvo', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/fi/admin/users/general.php b/app/lang/fi/admin/users/general.php index 8fcceac05e..f790c0b6f5 100755 --- a/app/lang/fi/admin/users/general.php +++ b/app/lang/fi/admin/users/general.php @@ -7,12 +7,12 @@ return array( 'clone' => 'Monista Käyttäjä', 'contact_user' => 'Ota yhteyttä käyttäjään :name', 'edit' => 'Muokkaa käyttäjää', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', + 'filetype_info' => 'Sallitut tiedostotyypit ovat png, gif, jpg, jpeg, doc, docx, pdf, txt, zip ja 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. 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' => 'Käyttäjälle :name luovutetut ohjelmistot', 'view_user' => 'Näytä Käyttäjä :name', - 'usercsv' => 'CSV file', + 'usercsv' => 'CSV-tiedosto', ); diff --git a/app/lang/fi/admin/users/message.php b/app/lang/fi/admin/users/message.php index c37e4619b6..dd1a0df7ca 100755 --- a/app/lang/fi/admin/users/message.php +++ b/app/lang/fi/admin/users/message.php @@ -22,7 +22,7 @@ return array( 'suspend' => 'Käyttäjä jäädytettiin onnistuneesti.', 'unsuspend' => 'Käyttäjän jäädytys poistettiin onnistuneesti.', 'restored' => 'Käyttäjä palautettiin onnistuneesti.', - 'import' => 'Users imported successfully.', + 'import' => 'Käyttäjät tuotiin onnistuneesti.', ), 'error' => array( @@ -41,13 +41,13 @@ return array( 'deletefile' => array( 'error' => 'File not deleted. Please try again.', - 'success' => 'File successfully deleted.', + 'success' => 'Tiedosto poistettiin onnistuneesti.', ), 'upload' => array( 'error' => 'File(s) not uploaded. Please try again.', - 'success' => 'File(s) successfully uploaded.', - 'nofiles' => 'You did not select any files for upload', + 'success' => 'Tiedostot lähetettiin onnistuneesti.', + 'nofiles' => 'Et valinnut yhtään tiedostoa lähetettäväksi', '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.', ), diff --git a/app/lang/fi/general.php b/app/lang/fi/general.php index 925cd2bac0..958662acce 100755 --- a/app/lang/fi/general.php +++ b/app/lang/fi/general.php @@ -43,6 +43,7 @@ 'date' => 'Päivä', 'delete' => 'Poista', 'deleted' => 'Poistettu', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Käyttöönotettu', 'depreciation_report' => 'Poistoraportti', 'download' => 'Lataa', diff --git a/app/lang/fr/admin/accessories/general.php b/app/lang/fr/admin/accessories/general.php index a5c0c21f3d..aa5ab0d6b5 100755 --- a/app/lang/fr/admin/accessories/general.php +++ b/app/lang/fr/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Les accessoires sont des items que vous assignerai à des utilisateurs mais qui n\'ont pas de numéro de série (ou que vous ne désirez pas en faire un suivi). Par exemple, une souris ou un clavier.', 'accessory_category' => 'Catégorie d\'accessoire', 'accessory_name' => 'Nom de l\'accessoire', + 'cost' => 'Purchase Cost', 'create' => 'Création d\'accessoire', + 'date' => 'Purchase Date', 'eula_text' => 'License de catégorie', 'eula_text_help' => 'Ce champ vous permet de configurer vos licenses d\'utilisation pour chaque type d\'items. Si vous avez seulement une license pour tout vos items, vous pouvez cochez la case ci-dessous pour utiliser celle par défaut.', 'require_acceptance' => 'L\'utilisateur doit confirmer qu\'il accepte les items dans cette catégorie.', 'no_default_eula' => 'Aucune licence d\'utilisation par défaut trouvée. Ajoutez-en une dans la section "Réglages".', + 'order' => 'Order Number', 'qty' => 'Quantité', 'total' => 'Total', 'remaining' => 'Dispo', diff --git a/app/lang/fr/admin/asset_maintenances/table.php b/app/lang/fr/admin/asset_maintenances/table.php index a286b826ea..0428252053 100755 --- a/app/lang/fr/admin/asset_maintenances/table.php +++ b/app/lang/fr/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Nom du fournisseur', 'is_warranty' => 'Garantie', 'dl_csv' => 'Télécharger en CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/fr/admin/consumables/general.php b/app/lang/fr/admin/consumables/general.php index b3eff74ce4..447eea4e4d 100755 --- a/app/lang/fr/admin/consumables/general.php +++ b/app/lang/fr/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'À propos des fournitures', 'about_consumables_text' => 'Les fournitures sont des biens qui seront utilisés au fil du temps. Par exemple de l\'encre ou du papier pour les imprimantes.', 'consumable_name' => 'Nom de la fourniture', + 'cost' => 'Purchase Cost', 'create' => 'Créer une fourniture', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Quantité restante', 'total' => 'Total', 'update' => 'Actualiser la fourniture', diff --git a/app/lang/fr/admin/locations/table.php b/app/lang/fr/admin/locations/table.php index ab136bb492..414809580c 100755 --- a/app/lang/fr/admin/locations/table.php +++ b/app/lang/fr/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Ville', 'state' => 'État', @@ -13,5 +14,5 @@ return array( 'zip' => 'Code postal', 'locations' => 'Lieux', 'parent' => 'Parent', - 'currency' => 'Devise de l\'emplacement', // this is deprecated + 'currency' => 'Devise de l\'emplacement', ); diff --git a/app/lang/fr/admin/settings/general.php b/app/lang/fr/admin/settings/general.php index 245f3d64ea..8d7e40030c 100755 --- a/app/lang/fr/admin/settings/general.php +++ b/app/lang/fr/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Couleur de l\'en-tête', 'info' => 'Ces paramètres vous permettent de personnaliser certains aspects de votre installation.', 'laravel' => 'Version de Laravel', - 'load_remote' => 'Cette installation permet de charger des scripts du monde extérieur.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'facultatif', 'per_page' => 'Résultats par page', @@ -47,4 +48,7 @@ return array( 'system' => 'Information du système', 'update' => 'Mettre à jour les paramètres', 'value' => 'Valeur', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/fr/general.php b/app/lang/fr/general.php index 5d02e44f7d..7ffbcbfbdb 100755 --- a/app/lang/fr/general.php +++ b/app/lang/fr/general.php @@ -43,6 +43,7 @@ 'date' => 'Date', 'delete' => 'Supprimer', 'deleted' => 'Supprimé', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Déployé', 'depreciation_report' => 'Rapport d’amortissement', 'download' => 'Télécharger', diff --git a/app/lang/hr/admin/accessories/general.php b/app/lang/hr/admin/accessories/general.php index 7d68dcabc5..85a199dbfc 100755 --- a/app/lang/hr/admin/accessories/general.php +++ b/app/lang/hr/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Accessory Category', 'accessory_name' => 'Accessory Name', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', + 'order' => 'Order Number', 'qty' => 'QTY', 'total' => 'Total', 'remaining' => 'Avail', diff --git a/app/lang/hr/admin/asset_maintenances/form.php b/app/lang/hr/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/hr/admin/asset_maintenances/form.php +++ b/app/lang/hr/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/hr/admin/asset_maintenances/table.php b/app/lang/hr/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/hr/admin/asset_maintenances/table.php +++ b/app/lang/hr/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/hr/admin/consumables/general.php b/app/lang/hr/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/hr/admin/consumables/general.php +++ b/app/lang/hr/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/hr/admin/locations/table.php b/app/lang/hr/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/hr/admin/locations/table.php +++ b/app/lang/hr/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/hr/admin/settings/general.php b/app/lang/hr/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/hr/admin/settings/general.php +++ b/app/lang/hr/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/hr/general.php b/app/lang/hr/general.php index e1fc1fe930..c9ddda5ab5 100755 --- a/app/lang/hr/general.php +++ b/app/lang/hr/general.php @@ -43,6 +43,7 @@ 'date' => 'Date', 'delete' => 'Delete', 'deleted' => 'Deleted', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Deployed', 'depreciation_report' => 'Depreciation Report', 'download' => 'Download', diff --git a/app/lang/hu/admin/accessories/general.php b/app/lang/hu/admin/accessories/general.php index 7d68dcabc5..85a199dbfc 100755 --- a/app/lang/hu/admin/accessories/general.php +++ b/app/lang/hu/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Accessory Category', 'accessory_name' => 'Accessory Name', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', + 'order' => 'Order Number', 'qty' => 'QTY', 'total' => 'Total', 'remaining' => 'Avail', diff --git a/app/lang/hu/admin/asset_maintenances/form.php b/app/lang/hu/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/hu/admin/asset_maintenances/form.php +++ b/app/lang/hu/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/hu/admin/asset_maintenances/table.php b/app/lang/hu/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/hu/admin/asset_maintenances/table.php +++ b/app/lang/hu/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/hu/admin/consumables/general.php b/app/lang/hu/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/hu/admin/consumables/general.php +++ b/app/lang/hu/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/hu/admin/locations/table.php b/app/lang/hu/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/hu/admin/locations/table.php +++ b/app/lang/hu/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/hu/admin/settings/general.php b/app/lang/hu/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/hu/admin/settings/general.php +++ b/app/lang/hu/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/hu/general.php b/app/lang/hu/general.php index 92ea1de88f..ac3922f6ed 100755 --- a/app/lang/hu/general.php +++ b/app/lang/hu/general.php @@ -43,6 +43,7 @@ 'date' => 'Dátum', 'delete' => 'Törlés', 'deleted' => 'Törölve', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Deployed', 'depreciation_report' => 'Depreciation Report', 'download' => 'Download', diff --git a/app/lang/it/admin/accessories/general.php b/app/lang/it/admin/accessories/general.php index 5f4c24a1d7..6d8bb7a45c 100755 --- a/app/lang/it/admin/accessories/general.php +++ b/app/lang/it/admin/accessories/general.php @@ -5,11 +5,14 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Crea Accessorio', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'Non è stata trovata EULA predefinita. Aggiungine un altra nei settaggi.', + 'order' => 'Order Number', 'qty' => 'QT', 'total' => 'Totale', 'remaining' => 'Utilità', diff --git a/app/lang/it/admin/asset_maintenances/table.php b/app/lang/it/admin/asset_maintenances/table.php index 38d6fec32b..c96d130868 100755 --- a/app/lang/it/admin/asset_maintenances/table.php +++ b/app/lang/it/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Nome Fornitore', 'is_warranty' => 'Garanzia', 'dl_csv' => 'Scarica CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/it/admin/consumables/general.php b/app/lang/it/admin/consumables/general.php index c2ac4bce5b..52862f9b0f 100755 --- a/app/lang/it/admin/consumables/general.php +++ b/app/lang/it/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( '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', + 'cost' => 'Purchase Cost', 'create' => 'Crea Consumabile', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Rimanenti', 'total' => 'Totale', 'update' => 'Aggiorna Consumabile', diff --git a/app/lang/it/admin/locations/table.php b/app/lang/it/admin/locations/table.php index b94ab2d0c3..c48af3109c 100755 --- a/app/lang/it/admin/locations/table.php +++ b/app/lang/it/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Città', 'state' => 'Stato', @@ -13,5 +14,5 @@ return array( 'zip' => 'Codice Postale', 'locations' => 'Posizioni', 'parent' => 'Genitore', - 'currency' => 'Valuta della Posizione', // this is deprecated + 'currency' => 'Valuta della Posizione', ); diff --git a/app/lang/it/admin/settings/general.php b/app/lang/it/admin/settings/general.php index 7484a1844e..b42f7f04e3 100755 --- a/app/lang/it/admin/settings/general.php +++ b/app/lang/it/admin/settings/general.php @@ -26,7 +26,8 @@ return array( '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.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'facoltativo', 'per_page' => 'Risultati per Pagina', @@ -47,4 +48,7 @@ return array( 'system' => 'Informazioni di sistema', 'update' => 'Aggiorna impostazioni', 'value' => 'Valore', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/it/general.php b/app/lang/it/general.php index 7d10f82b75..8fb99ee80b 100755 --- a/app/lang/it/general.php +++ b/app/lang/it/general.php @@ -43,6 +43,7 @@ 'date' => 'Data', 'delete' => 'elimina', 'deleted' => 'Eliminata', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Distribuita', 'depreciation_report' => 'Report degli Obsoleti', 'download' => 'Scarica', diff --git a/app/lang/ja/admin/accessories/general.php b/app/lang/ja/admin/accessories/general.php index b2a5b3d7a7..44367f923c 100755 --- a/app/lang/ja/admin/accessories/general.php +++ b/app/lang/ja/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => '付属品は利用者に支給されますが、シリアル番号がありません。（付属品を厳密に追跡する必要はありません。）例えば、マウスやキーボードなど。', 'accessory_category' => '付属品カテゴリー', 'accessory_name' => '付属品名', + 'cost' => 'Purchase Cost', 'create' => '付属品の作成', + 'date' => 'Purchase Date', 'eula_text' => 'EULAカテゴリー', 'eula_text_help' => 'このフィールドは特殊なタイプの資産のためにEULAをカスタマイズすることが許可されています。全ての資産に一つだけEULAを適用する場合、以下の初期値を利用するにチェックすることも可能です。', 'require_acceptance' => 'このカテゴリの資産を承認するための利用者が必要です。', 'no_default_eula' => 'EULAの初期値が見つかりませんでした。最低1つは設定して下さい。', + 'order' => 'Order Number', 'qty' => '数量', 'total' => '合計', 'remaining' => '利用可', diff --git a/app/lang/ja/admin/asset_maintenances/table.php b/app/lang/ja/admin/asset_maintenances/table.php index 4b6402e78d..f721d2a06f 100755 --- a/app/lang/ja/admin/asset_maintenances/table.php +++ b/app/lang/ja/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => '仕入先名', 'is_warranty' => '保証書', 'dl_csv' => 'CSVダウンロード' - ]; \ No newline at end of file + ]; diff --git a/app/lang/ja/admin/consumables/general.php b/app/lang/ja/admin/consumables/general.php index 5ae64cd25c..b2c4d8cc8b 100755 --- a/app/lang/ja/admin/consumables/general.php +++ b/app/lang/ja/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => '消耗品について', 'about_consumables_text' => '消耗品は購入時から使い切るまで存在します。例えば、プリンターのインクやコピー用紙など', 'consumable_name' => '消耗品名', + 'cost' => 'Purchase Cost', 'create' => '消耗品を作成', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => '残数', 'total' => '合計', 'update' => '消耗品を更新', diff --git a/app/lang/ja/admin/locations/table.php b/app/lang/ja/admin/locations/table.php index 8db69caae5..1b6f5a61d6 100755 --- a/app/lang/ja/admin/locations/table.php +++ b/app/lang/ja/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => '市区町村', 'state' => '都道府県', @@ -13,5 +14,5 @@ return array( 'zip' => '郵便番号', 'locations' => 'ロケーション', 'parent' => '上位', - 'currency' => '現地通貨', // this is deprecated + 'currency' => '現地通貨', ); diff --git a/app/lang/ja/admin/settings/general.php b/app/lang/ja/admin/settings/general.php index 6bd430822e..e074bddfc0 100755 --- a/app/lang/ja/admin/settings/general.php +++ b/app/lang/ja/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'ヘッダーカラー', 'info' => 'これらの設定は、あなたの設備の特性に合わせてカスタマイズできます。', 'laravel' => 'Laravelバージョン', - 'load_remote' => 'Snipe-ITのインストールは、外部からスクリプトを読み込むことが可能です。', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'ロゴ', 'optional' => 'オプション', 'per_page' => 'ページ毎の結果', @@ -47,4 +48,7 @@ return array( 'system' => 'システム情報', 'update' => '設定を更新', 'value' => '価値', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ja/general.php b/app/lang/ja/general.php index 43106056d9..2019b9f096 100755 --- a/app/lang/ja/general.php +++ b/app/lang/ja/general.php @@ -43,6 +43,7 @@ 'date' => '日付', 'delete' => '削除', 'deleted' => '削除しました。', + 'delete_seats' => 'Deleted Seats', 'deployed' => '配備済', 'depreciation_report' => '減価償却レポート', 'download' => 'ダウンロード', diff --git a/app/lang/ko/admin/accessories/general.php b/app/lang/ko/admin/accessories/general.php index e5ec8d89a4..3a6c0a7beb 100755 --- a/app/lang/ko/admin/accessories/general.php +++ b/app/lang/ko/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => '부속품들이란 사용자들에게 지급은 하지만 일련 번호가 없는(또는 특별히 추적할 필요가 없는) 것을 뜻합니다. 예를 들면, 컴퓨터의 마우스나 키보드들입니다.', 'accessory_category' => '부속품 분류', 'accessory_name' => '부속품 명', + 'cost' => 'Purchase Cost', 'create' => '부속품 생성', + 'date' => 'Purchase Date', 'eula_text' => '분류 사용권 계약서', 'eula_text_help' => '이 필드는 특정 유형의 자산들에 대한 사용권 계약서들을 지정할 수 있게 해 줍니다. 당신의 모든 자산들에게 단 하나의 사용권 계약서만 가지고 있다면, 첫번째를 기본으로 사용하도록 아래의 상자에 체크할 수 있습니다.', 'require_acceptance' => '이 분류의 자산 승인을 확인하는 사용자가 필요합니다.', 'no_default_eula' => '기본 사용권 계약서가 없습니다. 설정에서 추가하세요.', + 'order' => 'Order Number', 'qty' => '수량', 'total' => '총계', 'remaining' => '사용가능', diff --git a/app/lang/ko/admin/asset_maintenances/table.php b/app/lang/ko/admin/asset_maintenances/table.php index 6fc050ea1d..af17dd280d 100755 --- a/app/lang/ko/admin/asset_maintenances/table.php +++ b/app/lang/ko/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => '공급자 명', 'is_warranty' => '보증', 'dl_csv' => 'CSV로 내려받기' - ]; \ No newline at end of file + ]; diff --git a/app/lang/ko/admin/consumables/general.php b/app/lang/ko/admin/consumables/general.php index 58e08711ed..5f6d150f9a 100755 --- a/app/lang/ko/admin/consumables/general.php +++ b/app/lang/ko/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => '소모품이란', 'about_consumables_text' => '소모품은 시간이 지남에 따라 소진되어 구매해야 하는 것들 입니다. 예로, 프린터 잉크나 복사 용지가 있습니다.', 'consumable_name' => '소모품 명', + 'cost' => 'Purchase Cost', 'create' => '소모품 생성', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => '잔여수량', 'total' => '총계', 'update' => '소모품 갱신', diff --git a/app/lang/ko/admin/consumables/message.php b/app/lang/ko/admin/consumables/message.php index 11d25b7054..2044042eae 100755 --- a/app/lang/ko/admin/consumables/message.php +++ b/app/lang/ko/admin/consumables/message.php @@ -15,9 +15,9 @@ return array( ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this consumable?', + 'confirm' => '이 소모품을 삭제하시겠습니까?', 'error' => '소모품 삭제시 문제가 발생했습니다. 다시 시도해 주세요.', - 'success' => 'The consumable was deleted successfully.' + 'success' => '소모품이 삭제 되었습니다.' ), 'checkout' => array( diff --git a/app/lang/ko/admin/locations/table.php b/app/lang/ko/admin/locations/table.php index 1e68cf721e..d5e0bcaab6 100755 --- a/app/lang/ko/admin/locations/table.php +++ b/app/lang/ko/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => '아이디', 'city' => '시', 'state' => '주', @@ -13,5 +14,5 @@ return array( 'zip' => '우편번호', 'locations' => '위치', 'parent' => '상위', - 'currency' => '현지 통화', // this is deprecated + 'currency' => '현지 통화', ); diff --git a/app/lang/ko/admin/settings/general.php b/app/lang/ko/admin/settings/general.php index 250cd7cef5..aa53988bc4 100755 --- a/app/lang/ko/admin/settings/general.php +++ b/app/lang/ko/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => '머릿말 색상', 'info' => '이 설정들은 설치본의 특정 분야를 설정하는 것입니다.', 'laravel' => 'Laravel 버전', - 'load_remote' => '이 Snipe-IT 설치는 인터넷에서 스크립트들을 읽어 올 수 있습니다.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => '로고', 'optional' => '선택 사항', 'per_page' => '페이지 당 결과', @@ -47,4 +48,7 @@ return array( 'system' => '시스템 정보', 'update' => '갱신 설정', 'value' => '가치', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ko/general.php b/app/lang/ko/general.php index 9618cf7177..e49b3af7b8 100755 --- a/app/lang/ko/general.php +++ b/app/lang/ko/general.php @@ -43,6 +43,7 @@ 'date' => '날짜', 'delete' => '삭제', 'deleted' => '삭제됨', + 'delete_seats' => 'Deleted Seats', 'deployed' => '사용중', 'depreciation_report' => '감가상각 보고서', 'download' => '내려받기', diff --git a/app/lang/lt/admin/accessories/general.php b/app/lang/lt/admin/accessories/general.php index 143990eaf2..4a93a97092 100755 --- a/app/lang/lt/admin/accessories/general.php +++ b/app/lang/lt/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Įranga yra viskas, kas yra išduodama naudotojams ir suteikiamas ar nesuteikiamas inventorizacinis numeris. Pvz. kompiuteris, kompiuterio pelė, programinė iranga ir t. t.', 'accessory_category' => 'Įrangos kategorija', 'accessory_name' => 'Įrangos pavadinimas', + 'cost' => 'Purchase Cost', 'create' => 'Pridėti įrangą', + 'date' => 'Purchase Date', 'eula_text' => 'EULA kategorija', 'eula_text_help' => 'Šis laukelis leidžia koreguoti EULA specifinėms irangos grupėms. Jei jūs turite vieną EULA visai įrangai, tuomet galite pažymeti žemiau esantį laukelį, kad būtų visuomet naudojama numatytoji.', 'require_acceptance' => 'Reikalaujama naudotojo patvirtinti šios kategorijos įrangos priėmimą.', 'no_default_eula' => 'Nerasta pirminė nustatyta EULA. Pridėkite ją nustatymuose.', + 'order' => 'Order Number', 'qty' => 'Vnt', 'total' => 'Viso', 'remaining' => 'Laisva', diff --git a/app/lang/lt/admin/accessories/table.php b/app/lang/lt/admin/accessories/table.php index 85df04b3ae..7fcc14ad80 100755 --- a/app/lang/lt/admin/accessories/table.php +++ b/app/lang/lt/admin/accessories/table.php @@ -1,7 +1,7 @@ 'Download CSV', + 'dl_csv' => 'Atsisiūsti CSV', 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Priėmimas', diff --git a/app/lang/lt/admin/asset_maintenances/table.php b/app/lang/lt/admin/asset_maintenances/table.php index a3f2c1e0bc..d103e3dd14 100755 --- a/app/lang/lt/admin/asset_maintenances/table.php +++ b/app/lang/lt/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Tiekėjo pavadinimas', 'is_warranty' => 'Garantija', 'dl_csv' => 'Atsisiųti CSV fromatu' - ]; \ No newline at end of file + ]; diff --git a/app/lang/lt/admin/consumables/general.php b/app/lang/lt/admin/consumables/general.php index 823ebfb155..348d25ff62 100755 --- a/app/lang/lt/admin/consumables/general.php +++ b/app/lang/lt/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Apie suvartojamą įrangą', 'about_consumables_text' => 'Suvartojama įranga, tai tokia įranga, kuri perkama ir suvartojama per tam tikrą laiką. Pvz. spausdintuvo kasetės ar popierius.', 'consumable_name' => 'Suvartojamos įrangos pavadinimas', + 'cost' => 'Purchase Cost', 'create' => 'Sukurti suvartojamą įrangą', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Likutis', 'total' => 'Viso', 'update' => 'Atnaujinti suvartojamą irangą', diff --git a/app/lang/lt/admin/consumables/message.php b/app/lang/lt/admin/consumables/message.php index 45b3a14c35..8fc47a10d5 100755 --- a/app/lang/lt/admin/consumables/message.php +++ b/app/lang/lt/admin/consumables/message.php @@ -15,9 +15,9 @@ return array( ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this consumable?', + 'confirm' => 'Ar tikrai norite ištrinti pasirinktą įrangą?', 'error' => 'Nepavyko ištrinti suvartojamos įrangos. Prašome bandykite dar kartą.', - 'success' => 'The consumable was deleted successfully.' + 'success' => 'Įranga buvo ištrinta sėkmingai.' ), 'checkout' => array( diff --git a/app/lang/lt/admin/locations/table.php b/app/lang/lt/admin/locations/table.php index 24d20914b9..94423dbae5 100755 --- a/app/lang/lt/admin/locations/table.php +++ b/app/lang/lt/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Miestas', 'state' => 'Rajonas', @@ -13,5 +14,5 @@ return array( 'zip' => 'Pašto kodas', 'locations' => 'Vietovės', 'parent' => 'Pagrindinė', - 'currency' => 'Vietos valiuta', // this is deprecated + 'currency' => 'Vietos valiuta', ); diff --git a/app/lang/lt/admin/settings/general.php b/app/lang/lt/admin/settings/general.php index fecf6f3a8f..c5b0f8145e 100755 --- a/app/lang/lt/admin/settings/general.php +++ b/app/lang/lt/admin/settings/general.php @@ -10,8 +10,8 @@ return array( 'backups' => 'Atsarginė kopija', 'barcode_type' => 'Prekės kodo tipas', 'barcode_settings' => 'Prekės kodo nustatymai', - 'custom_css' => 'Custom CSS', - 'custom_css_help' => 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.', + 'custom_css' => 'Užsakytas CSS', + 'custom_css_help' => 'Įveskite bet kokį užsakytą CSS peržiūrėjimo norėtumėte naudoti. Neįtraukite <style></Stilius> žymės.', 'default_currency' => 'Numatytoji valiuta', 'default_eula_text' => 'Numatytasis EULA', 'default_eula_help_text' => 'Jūs taip pat galite susieti pritaikytą EULĄ specifinėms įrangos grupėms.', @@ -22,11 +22,12 @@ return array( 'eula_settings' => 'EULA nustatymai', 'eula_markdown' => 'Šis EULA leidžia Github flavored markdown.', 'general_settings' => 'Bendrieji nustatymai', - 'generate_backup' => 'Generate Backup', + 'generate_backup' => 'Atsarginė kopija', 'header_color' => 'Atraštės spalva', 'info' => 'Šie nustatymai leidžia jums pasirinkti savus diegimo nustatymus.', 'laravel' => 'Laravel versija', - 'load_remote' => 'Šis Snipe-IT įdiegimas gali įtraukti programinius kodus iš interneto.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logotipas', 'optional' => 'pasirinktinai', 'per_page' => 'Rezultatai puslapyje', @@ -47,4 +48,7 @@ return array( 'system' => 'Sistemos informacija', 'update' => 'Atnaujinti nustatymus', 'value' => 'Vertė', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/lt/admin/settings/message.php b/app/lang/lt/admin/settings/message.php index ab4037a04b..52e09352b7 100755 --- a/app/lang/lt/admin/settings/message.php +++ b/app/lang/lt/admin/settings/message.php @@ -8,10 +8,10 @@ return array( 'success' => 'Nustatymai sėkmingai atnaujinti.' ), 'backup' => array( - 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', - 'file_deleted' => 'The backup file was successfully deleted. ', - 'generated' => 'A new backup file was successfully created.', - 'file_not_found' => 'That backup file could not be found on the server.', + 'delete_confirm' => 'Ar tikrai norite ištrinti atsarginę kopiją? Šis veiksmas negalimas. ', + 'file_deleted' => 'Atsarginė kopija sėkmingai ištrinta. ', + 'generated' => 'Atsarginė kopija sėkmingai sukurta.', + 'file_not_found' => 'Atsarginė kopija nerasta.', ), ); diff --git a/app/lang/lt/admin/users/general.php b/app/lang/lt/admin/users/general.php index fd4ec7ba0c..113321d91f 100755 --- a/app/lang/lt/admin/users/general.php +++ b/app/lang/lt/admin/users/general.php @@ -10,7 +10,7 @@ return array( 'filetype_info' => 'Leidžiami dokumentų formatai png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.', 'history_user' => ':name naudotojo istorija', 'last_login' => 'Paskutinis prisijungimas', - '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_config_text' => 'LDAP konfigūracijos parametrus galima rasti app / config aplanke pavadinimu ldap.php. Pasirinkta vieta bus nustatyta visiems importuotiems vartotojams. Jums reikės turėti bent vieną vietą norint naudoti šią funkciją.', 'ldap_text' => 'Prisijungti prie LDAP ir sukurti naudotojus. Slaptažodžiai bus sugeneruojami automatiškai.', 'software_user' => ':name išduota įranga', 'view_user' => 'Peržiūrėti :name vartotoją', diff --git a/app/lang/lt/general.php b/app/lang/lt/general.php index 698e3aaf21..ce7ded088c 100755 --- a/app/lang/lt/general.php +++ b/app/lang/lt/general.php @@ -43,6 +43,7 @@ 'date' => 'Data', 'delete' => 'Ištrinti', 'deleted' => 'Ištrinta', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Naudojama', 'depreciation_report' => 'Nusidėvėjimo ataskaita', 'download' => 'Atsisiųsti', diff --git a/app/lang/ms/admin/accessories/general.php b/app/lang/ms/admin/accessories/general.php index 7d68dcabc5..85a199dbfc 100755 --- a/app/lang/ms/admin/accessories/general.php +++ b/app/lang/ms/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Accessory Category', 'accessory_name' => 'Accessory Name', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', + 'order' => 'Order Number', 'qty' => 'QTY', 'total' => 'Total', 'remaining' => 'Avail', diff --git a/app/lang/ms/admin/asset_maintenances/form.php b/app/lang/ms/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/ms/admin/asset_maintenances/form.php +++ b/app/lang/ms/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/ms/admin/asset_maintenances/table.php b/app/lang/ms/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/ms/admin/asset_maintenances/table.php +++ b/app/lang/ms/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/ms/admin/consumables/general.php b/app/lang/ms/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/ms/admin/consumables/general.php +++ b/app/lang/ms/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/ms/admin/locations/table.php b/app/lang/ms/admin/locations/table.php index 2b29794134..f9ac280ed5 100755 --- a/app/lang/ms/admin/locations/table.php +++ b/app/lang/ms/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Bandar', 'state' => 'Negeri', @@ -13,5 +14,5 @@ return array( 'zip' => 'Poskod', 'locations' => 'Lokasi', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/ms/admin/settings/general.php b/app/lang/ms/admin/settings/general.php index 2f00ec6ab7..052cf40a86 100755 --- a/app/lang/ms/admin/settings/general.php +++ b/app/lang/ms/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'Tetapan ini membenarkan anda menyesuaikan sesetengah aspek pemasangan anda.', 'laravel' => 'Versi Laravel', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Senarai Setiap Mukasurat', @@ -47,4 +48,7 @@ return array( 'system' => 'Maklumat Sistem', 'update' => 'Kemaskini Tetapan', 'value' => 'Nilai', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ms/general.php b/app/lang/ms/general.php index 4b61b66d49..cd9f971e3d 100755 --- a/app/lang/ms/general.php +++ b/app/lang/ms/general.php @@ -43,6 +43,7 @@ 'date' => 'Tarikh', 'delete' => 'Hapuskan', 'deleted' => 'Dihapuskan', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Telah Diagihkan', 'depreciation_report' => 'Laporan Susut nilai', 'download' => 'Download', diff --git a/app/lang/nl/admin/accessories/general.php b/app/lang/nl/admin/accessories/general.php index 7d68dcabc5..85a199dbfc 100755 --- a/app/lang/nl/admin/accessories/general.php +++ b/app/lang/nl/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Accessory Category', 'accessory_name' => 'Accessory Name', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', + 'order' => 'Order Number', 'qty' => 'QTY', 'total' => 'Total', 'remaining' => 'Avail', diff --git a/app/lang/nl/admin/asset_maintenances/form.php b/app/lang/nl/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/nl/admin/asset_maintenances/form.php +++ b/app/lang/nl/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/nl/admin/asset_maintenances/table.php b/app/lang/nl/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/nl/admin/asset_maintenances/table.php +++ b/app/lang/nl/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/nl/admin/consumables/general.php b/app/lang/nl/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/nl/admin/consumables/general.php +++ b/app/lang/nl/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/nl/admin/locations/table.php b/app/lang/nl/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/nl/admin/locations/table.php +++ b/app/lang/nl/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/nl/admin/settings/general.php b/app/lang/nl/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/nl/admin/settings/general.php +++ b/app/lang/nl/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/nl/general.php b/app/lang/nl/general.php index 3a57d1cacb..bf643bf864 100755 --- a/app/lang/nl/general.php +++ b/app/lang/nl/general.php @@ -43,6 +43,7 @@ 'date' => 'Datum', 'delete' => 'Verwijder', 'deleted' => 'Verwijderd', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Ingezet', 'depreciation_report' => 'Afschrijvingsrapport', 'download' => 'Download', diff --git a/app/lang/no/admin/accessories/general.php b/app/lang/no/admin/accessories/general.php index a930050e88..8c2811436c 100755 --- a/app/lang/no/admin/accessories/general.php +++ b/app/lang/no/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Tilbehør er hva som helst som du tildeler brukere som ikke har et serienummer (eller som du ikke bryr deg om å spore enkeltvis). For eksempel mus og tastatur.', 'accessory_category' => 'Tilbehørskategori', 'accessory_name' => 'Navn tilbehør', + 'cost' => 'Purchase Cost', 'create' => 'Legg til tilbehør', + 'date' => 'Purchase Date', 'eula_text' => 'EULA-kategori', 'eula_text_help' => 'Dette feltet lar deg tilpasse dine EULA for spesifikke typer eiendeler. Hvis du har kun en EULA for alle eiendeler kan du krysse av nedenfor for å bruke standard.', 'require_acceptance' => 'Krev at brukere bekrefter aksept av eiendeler i denne kategorien.', 'no_default_eula' => 'Ingen standard EULA funnet. Legg til en i Innstillinger.', + 'order' => 'Order Number', 'qty' => 'Antall', 'total' => 'Total', 'remaining' => 'Tilgjengelig', diff --git a/app/lang/no/admin/asset_maintenances/table.php b/app/lang/no/admin/asset_maintenances/table.php index 3efaf0c143..2c53bb8ee9 100755 --- a/app/lang/no/admin/asset_maintenances/table.php +++ b/app/lang/no/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Navn på leverandør', 'is_warranty' => 'Garanti', 'dl_csv' => 'Last ned CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/no/admin/consumables/general.php b/app/lang/no/admin/consumables/general.php index 9cc590dbe4..9e8eee9944 100755 --- a/app/lang/no/admin/consumables/general.php +++ b/app/lang/no/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Om Forbruksvarer', 'about_consumables_text' => 'Forbruksvarer er alle varer som blir brukt opp over tid. For eksempel, skriver toner eller kopi papir.', 'consumable_name' => 'Navn på forbruksvare', + 'cost' => 'Purchase Cost', 'create' => 'Legg til forbruksvare', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Gjenstår', 'total' => 'Total', 'update' => 'Oppdater forbruksvare', diff --git a/app/lang/no/admin/locations/table.php b/app/lang/no/admin/locations/table.php index 8d11e207df..37b12e05ea 100755 --- a/app/lang/no/admin/locations/table.php +++ b/app/lang/no/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'By', 'state' => 'Stat', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postnummer', 'locations' => 'Plasseringer', 'parent' => 'Overordnet', - 'currency' => 'Valuta i lokasjon', // this is deprecated + 'currency' => 'Valuta i lokasjon', ); diff --git a/app/lang/no/admin/settings/general.php b/app/lang/no/admin/settings/general.php index 38cf47fb65..f3d86df11c 100755 --- a/app/lang/no/admin/settings/general.php +++ b/app/lang/no/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Overskriftsfarge', 'info' => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.', 'laravel' => 'Laravel-versjon', - 'load_remote' => 'Denne Snipe-IT-installasjonen kan laste skript fra Internett.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'valgfri', 'per_page' => 'Resultater pr side', @@ -47,4 +48,7 @@ return array( 'system' => 'Systeminformasjon', 'update' => 'Oppdater innstillinger', 'value' => 'Verdi', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/no/general.php b/app/lang/no/general.php index 8a9b3762f7..7562c00c5d 100755 --- a/app/lang/no/general.php +++ b/app/lang/no/general.php @@ -43,6 +43,7 @@ 'date' => 'Dato', 'delete' => 'Slett', 'deleted' => 'Slettet', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Utlevert', 'depreciation_report' => 'Avskrivningsrapport', 'download' => 'Last ned', diff --git a/app/lang/pl/admin/accessories/general.php b/app/lang/pl/admin/accessories/general.php index 2e6ac26d63..95b9de6a08 100755 --- a/app/lang/pl/admin/accessories/general.php +++ b/app/lang/pl/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Akcesoria to coś co wydajesz dla użytkowników, a które nie mają numerów seryjny ch(lub nie zależy Ci na śledzeniu ich niepowtarzalności). Na przykład, myszy i klawiatury komputerowe.', 'accessory_category' => 'Kategorie Akcesoriów', 'accessory_name' => 'Nazwa akcesoriów', + 'cost' => 'Purchase Cost', 'create' => 'Utwórz akcesorium', + 'date' => 'Purchase Date', 'eula_text' => 'Kategoria EULA', 'eula_text_help' => 'To pole pozwala dostosować EULA dla określonych rodzajów aktywów. Jeśli masz tylko jeden EULA dla wszystkich swoich aktywów, można zaznaczyć poniższe pole, aby korzystać z podstawowej domyślnej.', 'require_acceptance' => 'Wymaga od użytkowników, aby potwierdzić akceptację aktywów w tej kategorii.', 'no_default_eula' => 'Nie znaleziono domyślnego EULA. Dodaj jeden w Ustawieniach.', + 'order' => 'Order Number', 'qty' => 'Ilość', 'total' => 'Suma', 'remaining' => 'Dostępne', diff --git a/app/lang/pl/admin/asset_maintenances/form.php b/app/lang/pl/admin/asset_maintenances/form.php index 88266e03fb..1f09111155 100755 --- a/app/lang/pl/admin/asset_maintenances/form.php +++ b/app/lang/pl/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Tytuł', 'start_date' => 'Data rozpoczęcia', - 'completion_date' => 'Completion Date', + 'completion_date' => 'Completed', 'cost' => 'Cena', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notatki', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/pl/admin/asset_maintenances/table.php b/app/lang/pl/admin/asset_maintenances/table.php index 5e08e2201b..ab0c7a60a0 100755 --- a/app/lang/pl/admin/asset_maintenances/table.php +++ b/app/lang/pl/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', + 'asset_name' => 'Asset', 'supplier_name' => 'Nazwa Dostawcy', 'is_warranty' => 'Gwarancja', 'dl_csv' => 'Pobierz CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/pl/admin/consumables/general.php b/app/lang/pl/admin/consumables/general.php index ca404e23ff..aa7dcecc0e 100755 --- a/app/lang/pl/admin/consumables/general.php +++ b/app/lang/pl/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Pozostało', 'total' => 'Łącznie', 'update' => 'Update Consumable', diff --git a/app/lang/pl/admin/locations/table.php b/app/lang/pl/admin/locations/table.php index 5622eaacd5..208c457311 100755 --- a/app/lang/pl/admin/locations/table.php +++ b/app/lang/pl/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Miasto', 'state' => 'Województwo', @@ -13,5 +14,5 @@ return array( 'zip' => 'Kod Pocztowy', 'locations' => 'Lokalizacje', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/pl/admin/settings/general.php b/app/lang/pl/admin/settings/general.php index b202d7c570..ab8b620232 100755 --- a/app/lang/pl/admin/settings/general.php +++ b/app/lang/pl/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Kolor nagłówka', 'info' => 'Te ustawienia pozwalają ci zdefiniować najważniejsze szczegóły twojej instalacji.', 'laravel' => 'Wersja Laravel', - 'load_remote' => 'Ta wersja Snipe-IT może ładować skrypty z zewnątrz.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'opcjonalny', 'per_page' => 'Wyników na stronie', @@ -47,4 +48,7 @@ return array( 'system' => 'Informacje o Systemie', 'update' => 'Ustawienia Aktualizacji', 'value' => 'Wartość', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/pl/general.php b/app/lang/pl/general.php index dae93ec878..4ce2ab1700 100755 --- a/app/lang/pl/general.php +++ b/app/lang/pl/general.php @@ -43,6 +43,7 @@ 'date' => 'Data', 'delete' => 'Kasuj', 'deleted' => 'Usunięte', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Rozmieszczone', 'depreciation_report' => 'Raport Amortyzacji', 'download' => 'Pobieranie', diff --git a/app/lang/pt-BR/admin/accessories/general.php b/app/lang/pt-BR/admin/accessories/general.php index 9fd6d17887..017fbcc444 100755 --- a/app/lang/pt-BR/admin/accessories/general.php +++ b/app/lang/pt-BR/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Um acessório é qualquer coisa que você emitir aos usuários sem um número de série (ou que você não se preocupar em acompanhá-la unicamente). Por exemplo, mouses ou teclados.', 'accessory_category' => 'Categoria do Acessório', 'accessory_name' => 'Nome do Acessório', + 'cost' => 'Purchase Cost', 'create' => 'Criar um dispositivo', + 'date' => 'Purchase Date', 'eula_text' => 'EULA da Categoria', 'eula_text_help' => 'Este campo lhe permite personalizar seus EULAs para tipos específicos de ativos. Se você apenas tem um EULA para todos os seus ativos, você pode selecionar a caixa abaixo para usar o padrão primário.', 'require_acceptance' => 'Requer que usuários confirmem a aceitação de ativos nesta categoria.', 'no_default_eula' => 'Nenhum EULA padrão primário foi encontrado. Adicione um nas Configurações.', + 'order' => 'Order Number', 'qty' => 'QTD', 'total' => 'Total', 'remaining' => 'Disponível', diff --git a/app/lang/pt-BR/admin/asset_maintenances/table.php b/app/lang/pt-BR/admin/asset_maintenances/table.php index cfad268516..0a226f53cd 100755 --- a/app/lang/pt-BR/admin/asset_maintenances/table.php +++ b/app/lang/pt-BR/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Nome do Fornecedor', 'is_warranty' => 'Garantia', 'dl_csv' => 'Baixar CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/pt-BR/admin/consumables/general.php b/app/lang/pt-BR/admin/consumables/general.php index ff0b016a48..8d5e5219d0 100755 --- a/app/lang/pt-BR/admin/consumables/general.php +++ b/app/lang/pt-BR/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Sobre consumiveis', 'about_consumables_text' => 'Consumíveis é todo e qualquer item comprado que será usado ao longo do tempo, por exemplo, papel ou tinta de impressora.', 'consumable_name' => 'Nome do Suprimento', + 'cost' => 'Purchase Cost', 'create' => 'Criar um suprimento', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Restante', 'total' => 'Total', 'update' => 'Atualizar um suprimento', diff --git a/app/lang/pt-BR/admin/locations/table.php b/app/lang/pt-BR/admin/locations/table.php index c017de3e27..24407b6c29 100755 --- a/app/lang/pt-BR/admin/locations/table.php +++ b/app/lang/pt-BR/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Cidade', 'state' => 'Estado', @@ -13,5 +14,5 @@ return array( 'zip' => 'Código Postal', 'locations' => 'Locais', 'parent' => 'Principal', - 'currency' => 'Moeda local', // this is deprecated + 'currency' => 'Moeda local', ); diff --git a/app/lang/pt-BR/admin/settings/general.php b/app/lang/pt-BR/admin/settings/general.php index 012f8e8c3a..d7eb0089a3 100755 --- a/app/lang/pt-BR/admin/settings/general.php +++ b/app/lang/pt-BR/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Cor do Cabeçalho', 'info' => 'Estas configurações deixam-lhe personalizar certos aspectos da sua instalação.', 'laravel' => 'Versão do Laravel', - 'load_remote' => 'Esta instalacao Snipe-IT pode suporta scripts externos.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'Opcional', 'per_page' => 'Resultados Por Página', @@ -47,4 +48,7 @@ return array( 'system' => 'Informação do sistema', 'update' => 'Atualizar Configurações', 'value' => 'Valor', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/pt-BR/general.php b/app/lang/pt-BR/general.php index a2b12f4fb3..5bcf82b26f 100755 --- a/app/lang/pt-BR/general.php +++ b/app/lang/pt-BR/general.php @@ -43,6 +43,7 @@ 'date' => 'Data', 'delete' => 'Deletar', 'deleted' => 'Excluído', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Implantado', 'depreciation_report' => 'Relatório de Depreciações', 'download' => 'Download', diff --git a/app/lang/pt-PT/admin/accessories/general.php b/app/lang/pt-PT/admin/accessories/general.php index b95b520ed2..2e3b85a5d8 100755 --- a/app/lang/pt-PT/admin/accessories/general.php +++ b/app/lang/pt-PT/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Um acessório é algo que se aloca aos utilizadores, e que não têm número de série (ou que não se preocupa em acompanhar de forma exclusiva). Por exemplo, ratos ou teclados.', 'accessory_category' => 'Categoria do Acessório', 'accessory_name' => 'Nome do Acessório', + 'cost' => 'Purchase Cost', 'create' => 'Criar acessório', + 'date' => 'Purchase Date', 'eula_text' => 'EULA da Categoria', 'eula_text_help' => 'Este atributo permite-lhe personalizar os seus EULAs para tipos específicos de ativos. Se apenas tem um para todos os seus ativos, pode selecionar a caixa abaixo, para usar o EULA padrão.', 'require_acceptance' => 'Solicitar aos utilizadores que confirmem a aceitação de ativos nesta categoria.', 'no_default_eula' => 'Não foi encontrado o EULA padrão. Defina um nas Configurações.', + 'order' => 'Order Number', 'qty' => 'QTD', 'total' => 'Total', 'remaining' => 'Disponíveis', diff --git a/app/lang/pt-PT/admin/asset_maintenances/table.php b/app/lang/pt-PT/admin/asset_maintenances/table.php index 2da5e86de4..e730cde3de 100755 --- a/app/lang/pt-PT/admin/asset_maintenances/table.php +++ b/app/lang/pt-PT/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Nome do fornecedor', 'is_warranty' => 'Garantia', 'dl_csv' => 'Descarregar CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/pt-PT/admin/consumables/general.php b/app/lang/pt-PT/admin/consumables/general.php index 5644a1d919..0760f68080 100755 --- a/app/lang/pt-PT/admin/consumables/general.php +++ b/app/lang/pt-PT/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Acerca de Consumíveis', 'about_consumables_text' => 'Consumíveis são todo e qualquer item comprado que será usado ao longo do tempo. Por exemplo, papel ou tinta de impressora.', 'consumable_name' => 'Nome do consumível', + 'cost' => 'Purchase Cost', 'create' => 'Criar consumível', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Restantes', 'total' => 'Total', 'update' => 'Atualizar consumível', diff --git a/app/lang/pt-PT/admin/locations/table.php b/app/lang/pt-PT/admin/locations/table.php index b6ee8400c3..d0851cc36a 100755 --- a/app/lang/pt-PT/admin/locations/table.php +++ b/app/lang/pt-PT/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Cidade', 'state' => 'Distrito', @@ -13,5 +14,5 @@ return array( 'zip' => 'Código postal', 'locations' => 'Localizações', 'parent' => 'Pertence a', - 'currency' => 'Moeda', // this is deprecated + 'currency' => 'Moeda', ); diff --git a/app/lang/pt-PT/admin/settings/general.php b/app/lang/pt-PT/admin/settings/general.php index 5f0e6a3661..8ccca7fd3b 100755 --- a/app/lang/pt-PT/admin/settings/general.php +++ b/app/lang/pt-PT/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Cor do cabeçalho', 'info' => 'Estas configurações permitem costumizar certos aspetos desta instalação.', 'laravel' => 'Versão do Laravel', - 'load_remote' => 'Esta instalação do Snipe-IT pode ler scipts externos.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'opcional', 'per_page' => 'Resultados por página', @@ -47,4 +48,7 @@ return array( 'system' => 'Informação de Sistema', 'update' => 'Atualizar Configurações', 'value' => 'Valor', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/pt-PT/general.php b/app/lang/pt-PT/general.php index 476398d92b..07eedf8d97 100755 --- a/app/lang/pt-PT/general.php +++ b/app/lang/pt-PT/general.php @@ -43,6 +43,7 @@ 'date' => 'Data', 'delete' => 'Remover', 'deleted' => 'Removidos', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Implementado', 'depreciation_report' => 'Relatório de Depreciação', 'download' => 'Download', diff --git a/app/lang/ro/admin/accessories/general.php b/app/lang/ro/admin/accessories/general.php index 7d68dcabc5..85a199dbfc 100755 --- a/app/lang/ro/admin/accessories/general.php +++ b/app/lang/ro/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Accessory Category', 'accessory_name' => 'Accessory Name', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', + 'order' => 'Order Number', 'qty' => 'QTY', 'total' => 'Total', 'remaining' => 'Avail', diff --git a/app/lang/ro/admin/asset_maintenances/form.php b/app/lang/ro/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/ro/admin/asset_maintenances/form.php +++ b/app/lang/ro/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/ro/admin/asset_maintenances/table.php b/app/lang/ro/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/ro/admin/asset_maintenances/table.php +++ b/app/lang/ro/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/ro/admin/consumables/general.php b/app/lang/ro/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/ro/admin/consumables/general.php +++ b/app/lang/ro/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/ro/admin/locations/table.php b/app/lang/ro/admin/locations/table.php index 6f7d1bfb79..3611c95f3a 100755 --- a/app/lang/ro/admin/locations/table.php +++ b/app/lang/ro/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Oras', 'state' => 'Judet', @@ -13,5 +14,5 @@ return array( 'zip' => 'Cod postal', 'locations' => 'Locatii', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/ro/admin/settings/general.php b/app/lang/ro/admin/settings/general.php index b2017d768f..a99c72dbd9 100755 --- a/app/lang/ro/admin/settings/general.php +++ b/app/lang/ro/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'Aceste setari va lasa sa modificati anumite aspecte ale instalarii.', 'laravel' => 'Versiune Laravel', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Rezultate pe pagina', @@ -47,4 +48,7 @@ return array( 'system' => 'Informatii sistem', 'update' => 'Actualizeaza setari', 'value' => 'Valoare', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ro/general.php b/app/lang/ro/general.php index 27adee3712..f92047c7bc 100755 --- a/app/lang/ro/general.php +++ b/app/lang/ro/general.php @@ -43,6 +43,7 @@ 'date' => 'Data', 'delete' => 'Sterge', 'deleted' => 'Sters', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Pus in folosinta', 'depreciation_report' => 'Raport depreciere', 'download' => 'Download', diff --git a/app/lang/ru/admin/accessories/general.php b/app/lang/ru/admin/accessories/general.php index a627e35041..f01574ec11 100755 --- a/app/lang/ru/admin/accessories/general.php +++ b/app/lang/ru/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Аксессуарами является все то, что выдается пользователям, но не имеет серийного номера или не требует учёта. Например, компьютерные мыши и клавиатуры.', 'accessory_category' => 'Категория аксессуара', 'accessory_name' => 'Имя аксессуара', + 'cost' => 'Purchase Cost', 'create' => 'Создать аксесуар', + 'date' => 'Purchase Date', 'eula_text' => 'Категория EULA', 'eula_text_help' => 'Это поле позволяет персонализировать пользовательские соглашения для определенных типов активов. Если у вас только одно пользовательское соглашение для всех активов, вы можете отметить чекбокс внизу, чтобы использовать основное соглашение по умолчанию.', 'require_acceptance' => 'Требовать обязательного подтверждения пользователем прием активов в этой категории.', 'no_default_eula' => 'Не найдено пользовательского соглашения по умолчанию. Добавьте его в Настройках.', + 'order' => 'Order Number', 'qty' => 'Кол-во', 'total' => 'Всего', 'remaining' => 'Наличие', diff --git a/app/lang/ru/admin/asset_maintenances/form.php b/app/lang/ru/admin/asset_maintenances/form.php index e9fee069ef..b37f484f5c 100755 --- a/app/lang/ru/admin/asset_maintenances/form.php +++ b/app/lang/ru/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Состояние обслуживания', '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' + 'start_date' => 'Дата начала', + 'completion_date' => 'Дата окончания', + 'cost' => 'Стоймость', + 'is_warranty' => 'Расширенная гарантия', + 'asset_maintenance_time' => 'Время обслуживания (в днях)', + 'notes' => 'Примечания', + 'update' => 'Обновить статус', + 'create' => 'Создать' ]; diff --git a/app/lang/ru/admin/asset_maintenances/general.php b/app/lang/ru/admin/asset_maintenances/general.php index 21cfc2b159..cd560bca89 100755 --- a/app/lang/ru/admin/asset_maintenances/general.php +++ b/app/lang/ru/admin/asset_maintenances/general.php @@ -1,11 +1,11 @@ 'Asset Maintenances', - 'edit' => 'Edit Asset Maintenance', - 'delete' => 'Delete Asset Maintenance', - 'view' => 'View Asset Maintenance Details', + 'asset_maintenances' => 'Обслуживание', + 'edit' => 'Редактировать', + 'delete' => 'Удалить', + 'view' => 'Показать подробности', 'repair' => 'Починить', - 'maintenance' => 'Maintenance', + 'maintenance' => 'Обслуживание', 'upgrade' => 'Модернизировать' ]; diff --git a/app/lang/ru/admin/asset_maintenances/message.php b/app/lang/ru/admin/asset_maintenances/message.php index 500bf9d2c6..bca41da019 100755 --- a/app/lang/ru/admin/asset_maintenances/message.php +++ b/app/lang/ru/admin/asset_maintenances/message.php @@ -1,17 +1,17 @@ 'Asset Maintenance you were looking for was not found!', + 'not_found' => 'Актив не найден!', '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' => 'Вы уверены что хотите удалить?', + 'error' => 'При удалении возникла проблема. Пожалуйста попробуйте еще раз.', + 'success' => 'Удалено.' ], 'create' => [ - 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'error' => 'Не выполнено, попробуйте еще раз.', + 'success' => 'Выполнено.' ], 'asset_maintenance_incomplete' => 'Ещё не готово', 'warranty' => 'Гарантия', - 'not_warranty' => 'Not Warranty', + 'not_warranty' => 'Гарантии нет/истекла', ]; \ No newline at end of file diff --git a/app/lang/ru/admin/asset_maintenances/table.php b/app/lang/ru/admin/asset_maintenances/table.php index 42e7661726..660262a90b 100755 --- a/app/lang/ru/admin/asset_maintenances/table.php +++ b/app/lang/ru/admin/asset_maintenances/table.php @@ -1,9 +1,9 @@ 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'title' => 'Заголовок', + 'asset_name' => 'Актив', + 'supplier_name' => 'Производитель', 'is_warranty' => 'Гарантия', 'dl_csv' => 'Загрузить CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/ru/admin/consumables/general.php b/app/lang/ru/admin/consumables/general.php index a45b984f51..f71caf5ead 100755 --- a/app/lang/ru/admin/consumables/general.php +++ b/app/lang/ru/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Про расходные материалы', 'about_consumables_text' => 'Расходные материалы это все приобретённые товары, которые израсходуются в процессе использования. Например, чернило для принтера или копировальная бумага.', 'consumable_name' => 'Название расходного материала', + 'cost' => 'Purchase Cost', 'create' => 'Создать расходный материал', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Осталось', 'total' => 'Всего', 'update' => 'Обновить расходный материал', diff --git a/app/lang/ru/admin/consumables/message.php b/app/lang/ru/admin/consumables/message.php index 2ee5eaab3e..0780066dd0 100755 --- a/app/lang/ru/admin/consumables/message.php +++ b/app/lang/ru/admin/consumables/message.php @@ -15,9 +15,9 @@ return array( ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this consumable?', + 'confirm' => 'Вы уверены, что хотите удалить расходный материал?', 'error' => 'В процессе удаления расходного материала произошла ошибка. Попробуйте ещё раз.', - 'success' => 'The consumable was deleted successfully.' + 'success' => 'Расходный материал успешно удалён.' ), 'checkout' => array( diff --git a/app/lang/ru/admin/hardware/form.php b/app/lang/ru/admin/hardware/form.php index 7957b0d36d..6026f9b90f 100755 --- a/app/lang/ru/admin/hardware/form.php +++ b/app/lang/ru/admin/hardware/form.php @@ -20,7 +20,7 @@ return array( 'expected_checkin' => 'Ожидаемая дата возврата', 'expires' => 'Истекает', 'fully_depreciated' => 'Полностью изношен', - 'help_checkout' => 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ', + 'help_checkout' => 'Если вы хотите привязать этот актив немедленно, выберите статус "Готов к установке" из списка ниже. ', 'mac_address' => 'MAC Адрес', 'manufacturer' => 'Производитель', 'model' => 'Модель', diff --git a/app/lang/ru/admin/licenses/form.php b/app/lang/ru/admin/licenses/form.php index bd401bd727..a34289730e 100755 --- a/app/lang/ru/admin/licenses/form.php +++ b/app/lang/ru/admin/licenses/form.php @@ -15,7 +15,7 @@ return array( 'notes' => 'Примечания', 'order' => 'Номер заказа', 'purchase_order' => 'Номер заказа на поставку', - 'reassignable' => 'Reassignable', + 'reassignable' => 'Переназначаемый', 'remaining_seats' => 'Осталось лицезий', 'seats' => 'Количество рабочих мест', 'serial' => 'Серийный номер', diff --git a/app/lang/ru/admin/licenses/general.php b/app/lang/ru/admin/licenses/general.php index f30921535e..6d24d648a1 100755 --- a/app/lang/ru/admin/licenses/general.php +++ b/app/lang/ru/admin/licenses/general.php @@ -6,7 +6,7 @@ return array( 'checkout_history' => 'История привязок', 'checkout' => 'Привязать лицензию', 'edit' => 'Редактировать лицензию', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', + 'filetype_info' => 'Разрешенные типы файлов: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.', 'clone' => 'Клонировать лицензию', 'history_for' => 'История для ', 'in_out' => 'Отвязано / Привязано', diff --git a/app/lang/ru/admin/locations/table.php b/app/lang/ru/admin/locations/table.php index 9fdcde247d..2454ae7f41 100755 --- a/app/lang/ru/admin/locations/table.php +++ b/app/lang/ru/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Город', 'state' => 'Область/Регион', @@ -13,5 +14,5 @@ return array( 'zip' => 'Почтовый индекс', 'locations' => 'Размещения', 'parent' => 'Родитель', - 'currency' => 'Валюта местонахождения', // this is deprecated + 'currency' => 'Валюта местонахождения', ); diff --git a/app/lang/ru/admin/settings/general.php b/app/lang/ru/admin/settings/general.php index 8fc7216c6f..0b6468c7de 100755 --- a/app/lang/ru/admin/settings/general.php +++ b/app/lang/ru/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Цвет заголовка', 'info' => 'Эти настройки позволяют персонализировать некоторые аспекты вашей установки.', 'laravel' => 'Версия Laravel', - 'load_remote' => 'Данная установка Snipe-IT может загружать внешние скрипты.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Логотип', 'optional' => 'не обязательно', 'per_page' => 'Результатов на страницу', @@ -47,4 +48,7 @@ return array( 'system' => 'Информация о системе', 'update' => 'Обновить настройки', 'value' => 'Значение', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/ru/general.php b/app/lang/ru/general.php index 5b12d3ed33..7d0fcb2f53 100755 --- a/app/lang/ru/general.php +++ b/app/lang/ru/general.php @@ -43,6 +43,7 @@ 'date' => 'Дата', 'delete' => 'Удалить', 'deleted' => 'Удалено', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Развернут', 'depreciation_report' => 'Отчет по амортизации', 'download' => 'Загрузка', @@ -61,9 +62,9 @@ 'image_delete' => 'Удалить изображение', 'image_upload' => 'Загрузить изображение', 'import' => 'Импорт', - 'asset_maintenance' => 'Asset Maintenance', - 'asset_maintenance_report' => 'Asset Maintenance Report', - 'asset_maintenances' => 'Asset Maintenances', + 'asset_maintenance' => 'Обслуживание', + 'asset_maintenance_report' => 'Отчет по обслуживанию', + 'asset_maintenances' => 'Активы на обслуживании', 'item' => 'Предмет', 'last' => 'В конец', 'last_name' => 'Фамилия', diff --git a/app/lang/sv-SE/admin/accessories/general.php b/app/lang/sv-SE/admin/accessories/general.php index 79ccbc410d..e68ef7ab1d 100755 --- a/app/lang/sv-SE/admin/accessories/general.php +++ b/app/lang/sv-SE/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', 'accessory_category' => 'Tillbehörs Kategori', 'accessory_name' => 'Tillbehörs Namn', + 'cost' => 'Purchase Cost', 'create' => 'Create Accessory', + 'date' => 'Purchase Date', '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.', 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', + 'order' => 'Order Number', 'qty' => 'Antal', 'total' => 'Totalt', 'remaining' => 'Tillgängliga', diff --git a/app/lang/sv-SE/admin/asset_maintenances/form.php b/app/lang/sv-SE/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/sv-SE/admin/asset_maintenances/form.php +++ b/app/lang/sv-SE/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/sv-SE/admin/asset_maintenances/table.php b/app/lang/sv-SE/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/sv-SE/admin/asset_maintenances/table.php +++ b/app/lang/sv-SE/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/sv-SE/admin/consumables/general.php b/app/lang/sv-SE/admin/consumables/general.php index 01ab4eb692..b29947f13a 100755 --- a/app/lang/sv-SE/admin/consumables/general.php +++ b/app/lang/sv-SE/admin/consumables/general.php @@ -4,7 +4,10 @@ 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', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Remaining', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/sv-SE/admin/locations/table.php b/app/lang/sv-SE/admin/locations/table.php index 1752eecc10..57e38b3c02 100755 --- a/app/lang/sv-SE/admin/locations/table.php +++ b/app/lang/sv-SE/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', 'state' => 'State', @@ -13,5 +14,5 @@ return array( 'zip' => 'Postal Code', 'locations' => 'Locations', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/sv-SE/admin/settings/general.php b/app/lang/sv-SE/admin/settings/general.php index ff19aca7e7..d4f404c00c 100755 --- a/app/lang/sv-SE/admin/settings/general.php +++ b/app/lang/sv-SE/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Header Color', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', - 'load_remote' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'optional', 'per_page' => 'Results Per Page', @@ -47,4 +48,7 @@ return array( 'system' => 'System Information', 'update' => 'Update Settings', 'value' => 'Value', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/sv-SE/general.php b/app/lang/sv-SE/general.php index d00f56a9c6..61ee0ba6f4 100755 --- a/app/lang/sv-SE/general.php +++ b/app/lang/sv-SE/general.php @@ -43,6 +43,7 @@ 'date' => 'Datum', 'delete' => 'Ta bort', 'deleted' => 'Raderad', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Deployed', 'depreciation_report' => 'Depreciation Report', 'download' => 'Ladda ner', diff --git a/app/lang/th/admin/accessories/general.php b/app/lang/th/admin/accessories/general.php index 42e1ad410d..701e6e748e 100755 --- a/app/lang/th/admin/accessories/general.php +++ b/app/lang/th/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'อุปกรณ์เสริมใดๆ ที่มอบให้กับผู้ใช้แต่ไม่มีหมายเลขเครื่อง (หรือไม่จำเป็นสำหรับการค้นหาข้อมูลย้อนหลัง) ยกตัวอย่าง เช่น คอมพิวเตอร์ ไมค์ หรือแป้นพิมพ์ เป็นต้น', 'accessory_category' => 'หมวดหมู่อุปกรณ์เสริม', 'accessory_name' => 'ชื่ออุปกรณ์เสริม', + 'cost' => 'Purchase Cost', 'create' => 'สร้างอุปกรณ์เสริม', + 'date' => 'Purchase Date', 'eula_text' => 'หมวดหมู่ข้อกำหนดการใช้งาน', 'eula_text_help' => 'ส่วนนี้อนุญาตให้คุณสามารถทำการปรับแต่งข้อตกลงการใช้งานสำหรับกำหนดชนิดของทรัพย์สินได้ หากคุณมีข้อตกลงการใช้งานเพียงหนึ่ง หรือเรื่องเดียวที่ใช้ครอบคลุมทรัพย์สินของคุณทั้งหมด คุณสามารถตั้งค่าให้เป็นการใช้งานหลัก โดยการทำเครื่องหมายในช่องด้านล่างนี้.', 'require_acceptance' => 'กำหนดให้ผู้ใช้ยืนยันยอมรับสินทรัพย์ในหมวดหมู่นี้', 'no_default_eula' => 'ไม่พบข้อกำหนดการใช้งานหลักใดๆ ในการตั้งค่า', + 'order' => 'Order Number', 'qty' => 'จำนวน', 'total' => 'รวมทั้งหมด', 'remaining' => 'พร้อมใช้', diff --git a/app/lang/th/admin/asset_maintenances/table.php b/app/lang/th/admin/asset_maintenances/table.php index e4b806539d..df54de23a0 100755 --- a/app/lang/th/admin/asset_maintenances/table.php +++ b/app/lang/th/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'ชื่อซัพพลายเออร์', 'is_warranty' => 'การรับประกัน', 'dl_csv' => 'ดาวน์โหลด CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/th/admin/consumables/general.php b/app/lang/th/admin/consumables/general.php index 0ed1b00fda..b9f4380b63 100755 --- a/app/lang/th/admin/consumables/general.php +++ b/app/lang/th/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'เกี่ยวกับวัสดุสิ้นเปลือง', 'about_consumables_text' => 'วัสดุสิ้นเปลืองคือสิ่งใดๆ ที่มีการซื้อและนำมาใช้ในช่วงเวลานั้น ยกตัวอย่างเช่น หมึกปริ้นเตอร์ หรือ กระดาษถ่ายสำเนา', 'consumable_name' => 'ชื่อวัสดุสิ้นเปลือง', + 'cost' => 'Purchase Cost', 'create' => 'สร้างวัสดุสิ้นเปลือง', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'คงค้าง', 'total' => 'รวมทั้งหมด', 'update' => 'ปรับปรุงวัสดุสิ้นเปลือง', diff --git a/app/lang/th/admin/locations/table.php b/app/lang/th/admin/locations/table.php index 6d712385d5..ab47766c78 100755 --- a/app/lang/th/admin/locations/table.php +++ b/app/lang/th/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'เขต/อำเภอ', 'state' => 'เมือง/รัฐ', @@ -13,5 +14,5 @@ return array( 'zip' => 'รหัสไปรษณีย์', 'locations' => 'สถานที่', 'parent' => 'หมวดแม่', - 'currency' => 'สกุลเงินตามสถานที่', // this is deprecated + 'currency' => 'สกุลเงินตามสถานที่', ); diff --git a/app/lang/th/admin/settings/general.php b/app/lang/th/admin/settings/general.php index ec8f18f7d1..48f65a10c3 100755 --- a/app/lang/th/admin/settings/general.php +++ b/app/lang/th/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'สีส่วนหัว', 'info' => 'การตั้งค่าเหล่านี้ช่วยให้คุณสามารถปรับแต่งลักษณะบางอย่าง', 'laravel' => 'เวอร์ชั่น Laravel', - 'load_remote' => 'สริปต์การติดตั้ง Snipe-IT นี้สามารถโหลดได้ทั่วทุกมุมโลก', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'โลโก้', 'optional' => 'ออฟชั่นเสริม', 'per_page' => 'ผลการค้นหาต่อหน้า', @@ -47,4 +48,7 @@ return array( 'system' => 'ข้อมูลระบบ', 'update' => 'แก้ไขการตั้งค่า', 'value' => 'มูลค่า', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/th/general.php b/app/lang/th/general.php index 1b9d896f85..be11c42221 100755 --- a/app/lang/th/general.php +++ b/app/lang/th/general.php @@ -43,6 +43,7 @@ 'date' => 'วันเดือนปี', 'delete' => 'ลบ', 'deleted' => 'ลบแล้ว', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'กำลังใช้งาน', 'depreciation_report' => 'รายงานการเสื่อมราคา', 'download' => 'ดาวน์โหลด', diff --git a/app/lang/tr/admin/accessories/general.php b/app/lang/tr/admin/accessories/general.php index f4658bd7a2..485f19e0d7 100755 --- a/app/lang/tr/admin/accessories/general.php +++ b/app/lang/tr/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Aksesuarlar kullanıclara verdiğiniz ekipmanlardır. Fakat seri numaraları yoktur (ya da siz tek tek takip etmeyi önemsemiyorsunuz). Örneğin bilgisayar faresi, klavye vs.', 'accessory_category' => 'Aksesuar Kategorisi', 'accessory_name' => 'Aksesuar Adı', + 'cost' => 'Purchase Cost', 'create' => 'Aksesuar oluşturun', + 'date' => 'Purchase Date', 'eula_text' => 'Kategori Sözleşmeleri', 'eula_text_help' => 'Bu alan özel tipteki demirbaşlarınız için Sözleşmesi\'ni özelleştirmeniz içindir. Eğer tüm demirbaşlarınız için sadece tek sözleşmeniz var ise yukarıdaki kutucuğu işaretlereyerek varsayılan yapabilirsiniz.', 'require_acceptance' => 'Bu kategoride kullanıcının kabul onayı gerekmektedir.', 'no_default_eula' => 'Varsayılan sözleşme bulunamadı. Lütfen Ayarlar\'dan ekleyiniz.', + 'order' => 'Order Number', 'qty' => 'Miktar', 'total' => 'Toplam', 'remaining' => 'Fayda', diff --git a/app/lang/tr/admin/asset_maintenances/form.php b/app/lang/tr/admin/asset_maintenances/form.php index 785d06b08f..2aa005c45f 100755 --- a/app/lang/tr/admin/asset_maintenances/form.php +++ b/app/lang/tr/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Asset Maintenance Type', + 'asset_maintenance_type' => 'Maintenance Type', 'title' => 'Title', - 'start_date' => 'Start Date', - 'completion_date' => 'Completion Date', + 'start_date' => 'Started', + 'completion_date' => 'Completed', 'cost' => 'Cost', 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Asset Maintenance Time (in days)', + 'asset_maintenance_time' => 'Days', 'notes' => 'Notes', - 'update' => 'Update Asset Maintenance', - 'create' => 'Create Asset Maintenance' + 'update' => 'Update', + 'create' => 'Create' ]; diff --git a/app/lang/tr/admin/asset_maintenances/table.php b/app/lang/tr/admin/asset_maintenances/table.php index 02e9060bf6..5b83539914 100755 --- a/app/lang/tr/admin/asset_maintenances/table.php +++ b/app/lang/tr/admin/asset_maintenances/table.php @@ -2,8 +2,8 @@ return [ 'title' => 'Asset Maintenance', - 'asset_name' => 'Asset Name', - 'supplier_name' => 'Supplier Name', + 'asset_name' => 'Asset', + 'supplier_name' => 'Supplier', 'is_warranty' => 'Warranty', 'dl_csv' => 'Download CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/tr/admin/consumables/general.php b/app/lang/tr/admin/consumables/general.php index dfb003a0c1..10f8a4bfb9 100755 --- a/app/lang/tr/admin/consumables/general.php +++ b/app/lang/tr/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Sarf Malzemeleri Hakkında', 'about_consumables_text' => 'Sarf malzemeleri satın alınan ve zamanla tüketilen ürünlerdir. Örneğin yazıcı kartuşu, fotokopi kağıdı vs.', 'consumable_name' => 'Consumable Name', + 'cost' => 'Purchase Cost', 'create' => 'Create Consumable', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Kalan', 'total' => 'Toplam', 'update' => 'Update Consumable', diff --git a/app/lang/tr/admin/locations/table.php b/app/lang/tr/admin/locations/table.php index 2cb79dcb59..977e841a4f 100755 --- a/app/lang/tr/admin/locations/table.php +++ b/app/lang/tr/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Şehir', 'state' => 'Bölge', @@ -13,5 +14,5 @@ return array( 'zip' => 'Posta kodu', 'locations' => 'Konumlar', 'parent' => 'Parent', - 'currency' => 'Location Currency', // this is deprecated + 'currency' => 'Location Currency', ); diff --git a/app/lang/tr/admin/settings/general.php b/app/lang/tr/admin/settings/general.php index e1796f0b43..988c3ec770 100755 --- a/app/lang/tr/admin/settings/general.php +++ b/app/lang/tr/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Başlık rengi', 'info' => 'Bu ayarlardan kurulum görünüşünüzü kişiselleştirebilirsiniz.', 'laravel' => 'Laravel Version', - 'load_remote' => 'Bu Snipe-IT kurulumu dünya dışından scriptler yükleyebilir.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'İsteğe bağlı', 'per_page' => 'Sayfa başına sonuç sayısı', @@ -47,4 +48,7 @@ return array( 'system' => 'Sistem Bilgisi', 'update' => 'Ayarları Güncelle', 'value' => 'Değer', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/tr/general.php b/app/lang/tr/general.php index 7c72c7fc79..033afe4f39 100755 --- a/app/lang/tr/general.php +++ b/app/lang/tr/general.php @@ -43,6 +43,7 @@ 'date' => 'Tarih', 'delete' => 'Sil', 'deleted' => 'Silinmiş', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Deployed', 'depreciation_report' => 'Depreciation Report', 'download' => 'İndir', diff --git a/app/lang/vi/admin/accessories/general.php b/app/lang/vi/admin/accessories/general.php index f1113ffead..1084ce7c5d 100755 --- a/app/lang/vi/admin/accessories/general.php +++ b/app/lang/vi/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => 'Phụ kiện (Accessories) đã bàn giao cho người dùng mà ko có số sê-ri (hoặc bạn không quan tâm đến việc theo dõi những phụ kiện này). Ví dụ như: chuột hay bàn phím.', 'accessory_category' => 'Hạng Mục Phụ Kiện', 'accessory_name' => 'Tên Phụ Kiện', + 'cost' => 'Purchase Cost', 'create' => 'Tạo Phụ Kiện', + 'date' => 'Purchase Date', 'eula_text' => 'Hạng mục điều khoản sử dụng', 'eula_text_help' => 'Trường này cho phép bạn thay đổi các điều khoản sử dụng (EULAs) cho từng loại tài sản cụ thể. Nếu chỉ có một EULA cho tất cả các tài sản, bạn có thể chọn ô vuông bên dưới để sử dụng làm mặc định.', 'require_acceptance' => 'Yêu cầu người dùng xác nhận đã nhận thiết bị trong hạng mục này.', 'no_default_eula' => 'Điều khoản sử dụng mặc định chưa được thiết lập. Hãy thêm một cái vào trong phần Settings.', + 'order' => 'Order Number', 'qty' => 'Số lượng', 'total' => 'Tổng số', 'remaining' => 'Sẵn có', diff --git a/app/lang/vi/admin/asset_maintenances/table.php b/app/lang/vi/admin/asset_maintenances/table.php index c7c648b9e7..5516a51a33 100755 --- a/app/lang/vi/admin/asset_maintenances/table.php +++ b/app/lang/vi/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => 'Tên nhà cung cấp', 'is_warranty' => 'Bảo hành', 'dl_csv' => 'Tải tập tin định dạng CSV' - ]; \ No newline at end of file + ]; diff --git a/app/lang/vi/admin/consumables/general.php b/app/lang/vi/admin/consumables/general.php index 4d414ebab1..20ae21126d 100755 --- a/app/lang/vi/admin/consumables/general.php +++ b/app/lang/vi/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => 'Vật rẻ mau hỏng', 'about_consumables_text' => 'Vật rẻ mau hỏng là bất cứ thứ gì được mua định kỳ theo thời gian. Ví dụ: mục in hoặc giấy photo.', 'consumable_name' => 'Tên vật tư phụ', + 'cost' => 'Purchase Cost', 'create' => 'Tạo vật tư phụ', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => 'Còn lại', 'total' => 'Tổng số', 'update' => 'Cập nhật vật tư phụ', diff --git a/app/lang/vi/admin/locations/table.php b/app/lang/vi/admin/locations/table.php index 29d89fa48c..0b9fe1152f 100755 --- a/app/lang/vi/admin/locations/table.php +++ b/app/lang/vi/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'Thành phố', 'state' => 'Tỉnh/Thành phố', @@ -13,5 +14,5 @@ return array( 'zip' => 'Mã bưu điện', 'locations' => 'Địa phương', 'parent' => 'Parent', - 'currency' => 'Tiền tệ địa phương', // this is deprecated + 'currency' => 'Tiền tệ địa phương', ); diff --git a/app/lang/vi/admin/settings/general.php b/app/lang/vi/admin/settings/general.php index 85cfdccf29..554abe374e 100755 --- a/app/lang/vi/admin/settings/general.php +++ b/app/lang/vi/admin/settings/general.php @@ -26,7 +26,8 @@ return array( 'header_color' => 'Màu Header', 'info' => 'Các thiết lập này cho phép bạn tùy chỉnh một số khía cạnh của quá trình cài đặt.', 'laravel' => 'Phiên bản Laravel', - 'load_remote' => 'Cài đặt Snipe-IT này có thể phải tải những đoạn mã từ bên ngoài.', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => 'Logo', 'optional' => 'tùy ý', 'per_page' => 'Kết quả trên trang', @@ -47,4 +48,7 @@ return array( 'system' => 'Thông tin hệ thống', 'update' => 'Cập nhật cài đặt', 'value' => 'Giá trị', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/vi/general.php b/app/lang/vi/general.php index a3c15568b2..8f85f92c05 100755 --- a/app/lang/vi/general.php +++ b/app/lang/vi/general.php @@ -43,6 +43,7 @@ 'date' => 'Ngày', 'delete' => 'Xóa', 'deleted' => 'Đã xóa', + 'delete_seats' => 'Deleted Seats', 'deployed' => 'Đã cấp phát', 'depreciation_report' => 'Báo cáo khấu hao', 'download' => 'Tải về', diff --git a/app/lang/zh-CN/admin/accessories/general.php b/app/lang/zh-CN/admin/accessories/general.php index 9800882d12..67a1ff2649 100755 --- a/app/lang/zh-CN/admin/accessories/general.php +++ b/app/lang/zh-CN/admin/accessories/general.php @@ -5,11 +5,14 @@ return array( 'about_accessories_text' => '配件就是你发给用户，但没有一个序列号（或者你不在乎唯一序列号标识）。例如，计算机鼠标或键盘。', 'accessory_category' => '配件类别', 'accessory_name' => '配件名称', + 'cost' => 'Purchase Cost', 'create' => '新增配件', + 'date' => 'Purchase Date', 'eula_text' => '类别的最终用户许可协议', 'eula_text_help' => '此字段允许您自定义的EULA（最终用户许可协议）为特定类型的资产。如果您所有资产只有一个EULA（最终用户许可协议），你可以检查下面的框中使用默认设置。', 'require_acceptance' => '要求用户确认接受这一类的资产。', 'no_default_eula' => '没有发现默认EULA（最终用户许可协议）。请在设置中添加一个。', + 'order' => 'Order Number', 'qty' => '数量', 'total' => '共计', 'remaining' => '可用', diff --git a/app/lang/zh-CN/admin/asset_maintenances/table.php b/app/lang/zh-CN/admin/asset_maintenances/table.php index f4919fcec4..42c0e286df 100755 --- a/app/lang/zh-CN/admin/asset_maintenances/table.php +++ b/app/lang/zh-CN/admin/asset_maintenances/table.php @@ -6,4 +6,4 @@ 'supplier_name' => '供应商名称', 'is_warranty' => '质保', 'dl_csv' => '下载CSV文件' - ]; \ No newline at end of file + ]; diff --git a/app/lang/zh-CN/admin/consumables/general.php b/app/lang/zh-CN/admin/consumables/general.php index 07f4ce8902..fdff5b422f 100755 --- a/app/lang/zh-CN/admin/consumables/general.php +++ b/app/lang/zh-CN/admin/consumables/general.php @@ -4,7 +4,10 @@ return array( 'about_consumables_title' => '关于耗材', 'about_consumables_text' => '所谓耗材是指从购买后会慢慢消耗并最终用尽的物品，例如打印机墨水，复印纸等等。', 'consumable_name' => '耗材名称', + 'cost' => 'Purchase Cost', 'create' => '创建耗材', + 'date' => 'Purchase Date', + 'order' => 'Order Number', 'remaining' => '剩余', 'total' => '总计', 'update' => '更新耗材', diff --git a/app/lang/zh-CN/admin/locations/table.php b/app/lang/zh-CN/admin/locations/table.php index 6083c0382f..e3c21fdfd5 100755 --- a/app/lang/zh-CN/admin/locations/table.php +++ b/app/lang/zh-CN/admin/locations/table.php @@ -1,7 +1,8 @@ 'Assets RTD', + 'assets_checkedout' => 'Assets Assigned', 'id' => '编号', 'city' => '城市', 'state' => '省份', @@ -13,5 +14,5 @@ return array( 'zip' => '邮政编码', 'locations' => '地理位置', 'parent' => '上级节点', - 'currency' => '当地货币单位', // this is deprecated + 'currency' => '当地货币单位', ); diff --git a/app/lang/zh-CN/admin/settings/general.php b/app/lang/zh-CN/admin/settings/general.php index 91a2f326b6..f1626dcab3 100755 --- a/app/lang/zh-CN/admin/settings/general.php +++ b/app/lang/zh-CN/admin/settings/general.php @@ -11,7 +11,7 @@ return array( 'barcode_type' => '条码类型', 'barcode_settings' => '条码设置', 'custom_css' => '自定义 CSS', - 'custom_css_help' => 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.', + 'custom_css_help' => '键入你喜欢的CSS格式覆盖。不要包括：<style></style> 标签。', 'default_currency' => '默认货币', 'default_eula_text' => 'Default EULA', 'default_eula_help_text' => '你也可以将自定义的EULA与特定资产分类相关联。', @@ -26,7 +26,8 @@ return array( 'header_color' => '标题颜色', 'info' => '这些设置允许您自定义安装的某些方面', 'laravel' => 'Laravel版本', - 'load_remote' => '允许Snipe-IT安装更新时从外部加载脚本。', + 'load_remote_text' => 'Remote Scripts', + 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', 'logo' => '徽标', 'optional' => '可选', 'per_page' => '每页搜索结果', @@ -47,4 +48,7 @@ return array( 'system' => '系统信息', 'update' => '更新设置', 'value' => '价值', + 'brand' => 'Branding', + 'about_settings_title' => 'About Settings', + 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', ); diff --git a/app/lang/zh-CN/general.php b/app/lang/zh-CN/general.php index e6f39f6597..d48277bc9d 100755 --- a/app/lang/zh-CN/general.php +++ b/app/lang/zh-CN/general.php @@ -43,6 +43,7 @@ 'date' => '日期', 'delete' => '刪除', 'deleted' => '已删除', + 'delete_seats' => 'Deleted Seats', 'deployed' => '已分配', 'depreciation_report' => '折旧报告', 'download' => '下载', diff --git a/app/macros.php b/app/macros.php index 116d174f2d..c6cccd7ea3 100755 --- a/app/macros.php +++ b/app/macros.php @@ -87,7 +87,6 @@ Form::macro('countries', function ($name = "country", $selected = null, $class = 'FO'=>'Faroe Islands', 'FR'=>'France', 'GA'=>'Gabon', - 'GB'=>'United Kingdom', 'GD'=>'Grenada', 'GE'=>'Georgia', 'GF'=>'French Guiana', @@ -242,8 +241,8 @@ Form::macro('countries', function ($name = "country", $selected = null, $class = 'UA'=>'Ukraine', 'UG'=>'Uganda', 'UK'=>'United Kingdom', - 'UM'=>'United States Minor Outlying Islands', 'US'=>'United States', + 'UM'=>'United States Minor Outlying Islands', 'UY'=>'Uruguay', 'UZ'=>'Uzbekistan', 'VA'=>'Vatican City State (Holy See)', @@ -311,31 +310,37 @@ Form::macro('barcode_types', function ($name = "barcode_type", $selected = null, */ Form::macro('currencies', function ($name = "currency", $selected = null, $class = null) { - $currencies = array( - '$'=>"$", - '€'=>'€', - '₠'=>"₠", - '₡'=>'₡', - 'RM'=>'RM', - '₣'=>'₣', - '₤'=>'₤', - '₥'=>'₥', - '₦'=>'₦', - '₧'=>'₧', - '₨'=>'₨', - '₩'=>'₩', - '₪'=>'₪', - '₫'=>'₫', - '₭'=>'₭', - '₮'=>'₮', - '₯'=>'₯', - '₱'=>'₱', - '₹'=>'₹', - ); + $currencies = array( + 'USD' => array('name'=>'USD - U.S. Dollars', 'symbol'=>'$','symbol_html'=>'$'), + 'GBP' => array('name'=>'GBP - British Pounds', 'symbol'=>'£','symbol_html'=>'£'), + 'EUR' => array('name'=>'EUR - Euros', 'symbol'=>'€','symbol_html'=>'€'), + 'ZAR' => array('name'=>'ZAR - South African Rand', 'symbol'=>'R','symbol_html'=>'R'), + 'AUD' => array('name'=>'AUD - Australian Dollars', 'symbol'=>'$','symbol_html'=>'$'), + 'BRL' => array('name'=>'BRL - Brazilian Real', 'symbol'=>'R$','symbol_html'=>'R$'), + 'CAD' => array('name'=>'CAD - Canadian Dollars', 'symbol'=>'$','symbol_html'=>'$'), + 'CZK' => array('name'=>'CZK - Czech koruny', 'symbol'=>'Kč','symbol_html'=>''), + 'DKK' => array('name'=>'DKK - Danish Kroner', 'symbol'=>'kr','symbol_html'=>'kr'), + 'HKD' => array('name'=>'HKD - Hong Kong Dollars', 'symbol'=>'$','symbol_html'=>'$'), + 'HUF' => array('name'=>'HUF - Hungarian Forints', 'symbol'=>'Ft','symbol_html'=>'Ft'), + 'ILS' => array('name'=>'ILS - Israeli Shekels', 'symbol'=>'₪','symbol_html'=>'₪'), + 'JPY' => array('name'=>'JPY - Japanese Yen', 'symbol'=>'¥','symbol_html'=>'¥'), + 'MYR' => array('name'=>'MYR - Malaysian Ringgits', 'symbol'=>'RM','symbol_html'=>'RM'), + 'MXN' => array('name'=>'MXN - Mexican Pesos', 'symbol'=>'$','symbol_html'=>'$'), + 'NZD' => array('name'=>'NZD - New Zealand Dollars', 'symbol'=>'$','symbol_html'=>'$'), + 'NOK' => array('name'=>'NOK - Norwegian Kroner', 'symbol'=>'kr','symbol_html'=>'kr'), + 'PHP' => array('name'=>'PHP - Philippine Pesos', 'symbol'=>'Php','symbol_html'=>'Php'), + 'PLN' => array('name'=>'PLN - Polish zloty', 'symbol'=>'zł','symbol_html'=>''), + 'SGD' => array('name'=>'SGD - Singapore Dollars', 'symbol'=>'$','symbol_html'=>'$'), + 'SEK' => array('name'=>'SEK - Swedish Kronor', 'symbol'=>'kr','symbol_html'=>'kr'), + 'CHF' => array('name'=>'CHF - Swiss Francs', 'symbol'=>'CHF','symbol_html'=>'CHF'), + 'TWD' => array('name'=>'TWD - Taiwan New Dollars', 'symbol'=>'$','symbol_html'=>'$'), + 'THB' => array('name'=>'THB - Thai Baht', 'symbol'=>'฿','symbol_html'=>' ฿'), + 'TRY' => array('name'=>'TRY - Turkish Liras', 'symbol'=>'TL','symbol_html'=>' ฿'), + ); $select = ''; diff --git a/app/models/Asset.php b/app/models/Asset.php index adb5f72169..05424e0811 100755 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -23,10 +23,10 @@ class Asset extends Depreciable ]; - /** - * Checkout asset - */ - public function checkOutToUser($user, $admin, $checkout_at = null, $expected_checkin = null, $note = null, $name = null) { + /** + * Checkout asset + */ + public function checkOutToUser($user, $admin, $checkout_at = null, $expected_checkin = null, $note = null, $name = null) { if ($expected_checkin) { $this->expected_checkin = $expected_checkin ; @@ -120,285 +120,285 @@ class Asset extends Depreciable } - public function createCheckoutLog($checkout_at = null, $admin, $user, $expected_checkin = null, $note = null) { + public function createCheckoutLog($checkout_at = null, $admin, $user, $expected_checkin = null, $note = null) { - $logaction = new Actionlog(); - $logaction->asset_id = $this->id; - $logaction->checkedout_to = $this->assigned_to; - $logaction->asset_type = 'hardware'; - $logaction->location_id = $user->location_id; - $logaction->adminlog()->associate($admin); - $logaction->note = $note; - if ($checkout_at) { - $logaction->created_at = $checkout_at; - } - $log = $logaction->logaction('checkout'); - return $logaction->id; - } + $logaction = new Actionlog(); + $logaction->asset_id = $this->id; + $logaction->checkedout_to = $this->assigned_to; + $logaction->asset_type = 'hardware'; + $logaction->location_id = $user->location_id; + $logaction->adminlog()->associate($admin); + $logaction->note = $note; + if ($checkout_at) { + $logaction->created_at = $checkout_at; + } + $log = $logaction->logaction('checkout'); + return $logaction->id; + } - /** - * Set depreciation relationship - */ - public function depreciation() - { - return $this->model->belongsTo( 'Depreciation', 'depreciation_id' ); - } + /** + * Set depreciation relationship + */ + public function depreciation() + { + return $this->model->belongsTo( 'Depreciation', 'depreciation_id' ); + } - /** - * Get depreciation attribute from associated asset model - */ - public function get_depreciation() - { - return $this->model->depreciation; - } + /** + * Get depreciation attribute from associated asset model + */ + public function get_depreciation() + { + return $this->model->depreciation; + } - /** - * Get uploads for this asset - */ - public function uploads() - { + /** + * Get uploads for this asset + */ + public function uploads() + { - return $this->hasMany( 'Actionlog', 'asset_id' ) - ->where( 'asset_type', '=', 'hardware' ) - ->where( 'action_type', '=', 'uploaded' ) - ->whereNotNull( 'filename' ) - ->orderBy( 'created_at', 'desc' ); - } + return $this->hasMany( 'Actionlog', 'asset_id' ) + ->where( 'asset_type', '=', 'hardware' ) + ->where( 'action_type', '=', 'uploaded' ) + ->whereNotNull( 'filename' ) + ->orderBy( 'created_at', 'desc' ); + } - public static function checkUploadIsImage($file) { - // Check if the file is an image, so we can show a preview - $finfo = finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension - $filetype = finfo_file($finfo, $file); - finfo_close($finfo); +public static function checkUploadIsImage($file) { +// Check if the file is an image, so we can show a preview +$finfo = finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension +$filetype = finfo_file($finfo, $file); +finfo_close($finfo); - if (($filetype=="image/jpeg") || ($filetype=="image/jpg") || ($filetype=="image/gif")) { - return true; - } +if (($filetype=="image/jpeg") || ($filetype=="image/jpg") || ($filetype=="image/gif")) { + return true; +} - return false; - } +return false; +} - public function assigneduser() - { + public function assigneduser() + { - return $this->belongsTo( 'User', 'assigned_to' ) - ->withTrashed(); - } + return $this->belongsTo( 'User', 'assigned_to' ) + ->withTrashed(); + } - /** - * Get the asset's location based on the assigned user - **/ - public function assetloc() - { + /** + * Get the asset's location based on the assigned user + **/ + public function assetloc() + { - if ($this->assigneduser) { - return $this->assigneduser->userloc(); - } else { - return $this->belongsTo( 'Location', 'rtd_location_id' ); - } + if ($this->assigneduser) { + return $this->assigneduser->userloc(); + } else { + return $this->belongsTo( 'Location', 'rtd_location_id' ); + } - } + } - /** - * Get the asset's location based on default RTD location - **/ - public function defaultLoc() - { + /** + * Get the asset's location based on default RTD location + **/ + public function defaultLoc() + { - return $this->belongsTo( 'Location', 'rtd_location_id' ); - } + return $this->belongsTo( 'Location', 'rtd_location_id' ); + } - /** - * Get action logs for this asset - */ - public function assetlog() - { + /** + * Get action logs for this asset + */ + public function assetlog() + { - return $this->hasMany( 'Actionlog', 'asset_id' ) - ->where( 'asset_type', '=', 'hardware' ) - ->orderBy( 'created_at', 'desc' ) - ->withTrashed(); - } + return $this->hasMany( 'Actionlog', 'asset_id' ) + ->where( 'asset_type', '=', 'hardware' ) + ->orderBy( 'created_at', 'desc' ) + ->withTrashed(); + } - /** - * assetmaintenances - * Get improvements for this asset - * - * @return mixed - * @author Vincent Sposato - * @version v1.0 - */ - public function assetmaintenances() - { + /** + * assetmaintenances + * Get improvements for this asset + * + * @return mixed + * @author Vincent Sposato + * @version v1.0 + */ + public function assetmaintenances() + { - return $this->hasMany( 'AssetMaintenance', 'asset_id' ) - ->orderBy( 'created_at', 'desc' ) - ->withTrashed(); - } + return $this->hasMany( 'AssetMaintenance', 'asset_id' ) + ->orderBy( 'created_at', 'desc' ) + ->withTrashed(); + } - /** - * Get action logs for this asset - */ - public function adminuser() - { + /** + * Get action logs for this asset + */ + public function adminuser() + { - return $this->belongsTo( 'User', 'user_id' ); - } + return $this->belongsTo( 'User', 'user_id' ); + } - /** - * Get total assets - */ - public static function assetcount() - { + /** + * Get total assets + */ + public static function assetcount() + { - return DB::table( 'assets' ) - ->where( 'physical', '=', '1' ) - ->whereNull( 'deleted_at', 'and' ) - ->count(); - } + return DB::table( 'assets' ) + ->where( 'physical', '=', '1' ) + ->whereNull( 'deleted_at', 'and' ) + ->count(); + } - /** - * Get total assets not checked out - */ - public static function availassetcount() - { + /** + * Get total assets not checked out + */ + public static function availassetcount() + { - return Asset::RTD() - ->whereNull( 'deleted_at' ) - ->count(); + return Asset::RTD() + ->whereNull( 'deleted_at' ) + ->count(); - } + } - /** - * Get requestable assets - */ - public static function getRequestable() - { + /** + * Get requestable assets + */ + public static function getRequestable() + { - return Asset::Requestable() - ->whereNull( 'deleted_at' ) - ->count(); + return Asset::Requestable() + ->whereNull( 'deleted_at' ) + ->count(); - } + } - /** - * Get total assets - */ - public function assetstatus() - { + /** + * Get total assets + */ + public function assetstatus() + { - return $this->belongsTo( 'Statuslabel', 'status_id' ); - } + return $this->belongsTo( 'Statuslabel', 'status_id' ); + } - /** - * Get name for EULA - **/ - public function showAssetName() - { + /** + * Get name for EULA + **/ + public function showAssetName() + { - if ($this->name == '') { - return $this->model->name; - } else { - return $this->name; - } - } + if ($this->name == '') { + return $this->model->name; + } else { + return $this->name; + } + } - public function warrantee_expires() - { + public function warrantee_expires() + { - $date = date_create( $this->purchase_date ); - date_add( $date, date_interval_create_from_date_string( $this->warranty_months . ' months' ) ); + $date = date_create( $this->purchase_date ); + date_add( $date, date_interval_create_from_date_string( $this->warranty_months . ' months' ) ); - return date_format( $date, 'Y-m-d' ); - } + return date_format( $date, 'Y-m-d' ); + } - public function model() - { + public function model() + { - return $this->belongsTo( 'Model', 'model_id' ) - ->withTrashed(); - } + return $this->belongsTo( 'Model', 'model_id' ) + ->withTrashed(); + } - public static function getExpiringWarrantee( $days = 30 ) - { + public static function getExpiringWarrantee( $days = 30 ) + { - return Asset::where( 'archived', '=', '0' ) - ->whereNotNull( 'warranty_months' ) - ->whereNotNull( 'purchase_date' ) - ->whereNull( 'deleted_at' ) - ->whereRaw( DB::raw( 'DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL ' - . $days - . ' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()' ) ) - ->orderBy( 'purchase_date', 'ASC' ) - ->get(); + return Asset::where( 'archived', '=', '0' ) + ->whereNotNull( 'warranty_months' ) + ->whereNotNull( 'purchase_date' ) + ->whereNull( 'deleted_at' ) + ->whereRaw( DB::raw( 'DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) <= DATE(NOW() + INTERVAL ' + . $days + . ' DAY) AND DATE_ADD(`purchase_date`,INTERVAL `warranty_months` MONTH) > NOW()' ) ) + ->orderBy( 'purchase_date', 'ASC' ) + ->get(); - } + } - /** - * Get the license seat information - **/ - public function licenses() - { + /** + * Get the license seat information + **/ + public function licenses() + { - return $this->belongsToMany( 'License', 'license_seats', 'asset_id', 'license_id' ); + return $this->belongsToMany( 'License', 'license_seats', 'asset_id', 'license_id' ); - } + } - public function licenseseats() - { + public function licenseseats() + { - return $this->hasMany( 'LicenseSeat', 'asset_id' ); - } + return $this->hasMany( 'LicenseSeat', 'asset_id' ); + } - public function supplier() - { + public function supplier() + { - return $this->belongsTo( 'Supplier', 'supplier_id' ); - } + return $this->belongsTo( 'Supplier', 'supplier_id' ); + } - public function months_until_eol() - { + public function months_until_eol() + { - $today = date( "Y-m-d" ); - $d1 = new DateTime( $today ); - $d2 = new DateTime( $this->eol_date() ); + $today = date( "Y-m-d" ); + $d1 = new DateTime( $today ); + $d2 = new DateTime( $this->eol_date() ); - if ($this->eol_date() > $today) { - $interval = $d2->diff( $d1 ); - } else { - $interval = null; - } + if ($this->eol_date() > $today) { + $interval = $d2->diff( $d1 ); + } else { + $interval = null; + } - return $interval; - } + return $interval; + } - public function eol_date() - { + public function eol_date() + { - if (( $this->purchase_date ) && ( $this->model )) { - $date = date_create( $this->purchase_date ); + if (( $this->purchase_date ) && ( $this->model )) { + $date = date_create( $this->purchase_date ); - // Use the asset-level EOL if one is given - if (($this->warranty_months) && ($this->warranty_months!='0')) { - date_add( $date, date_interval_create_from_date_string( $this->warranty_months . ' months' )); - // If a warranty month period wasn't specified on the asset level, use the model - } else { - date_add( $date, date_interval_create_from_date_string( $this->model->eol . ' months' )); - } + // Use the asset-level EOL if one is given + if (($this->warranty_months) && ($this->warranty_months!='0')) { + date_add( $date, date_interval_create_from_date_string( $this->warranty_months . ' months' )); + // If a warranty month period wasn't specified on the asset level, use the model + } else { + date_add( $date, date_interval_create_from_date_string( $this->model->eol . ' months' )); + } - return date_format( $date, 'Y-m-d' ); - } + return date_format( $date, 'Y-m-d' ); + } - } + } - /** - * Get total assets - */ - public static function autoincrement_asset() - { + /** + * Get total assets + */ + public static function autoincrement_asset() + { - $settings = Setting::getSettings(); + $settings = Setting::getSettings(); if ($settings->auto_increment_assets == '1') { $asset_tag = DB::table('assets') @@ -725,7 +725,7 @@ class Asset extends Depreciable * * @return Illuminate\Database\Query\Builder Modified query builder * TODO: Extend this method out for checked out assets as well. Right now it - * only checks the location name related to rtd_location_id + * only checks the location name related to rtd_location_id */ public function scopeOrderLocation($query, $order) { diff --git a/app/models/Location.php b/app/models/Location.php index df49df8dbf..e0181299ba 100755 --- a/app/models/Location.php +++ b/app/models/Location.php @@ -21,7 +21,7 @@ class Location extends Elegant } public function assets() { - return $this->hasMany('Actionlog','location_id'); + return $this->hasManyThrough('Asset', 'Actionlog', 'location_id', 'id'); } public function assignedassets() { @@ -99,22 +99,41 @@ class Location extends Elegant public function scopeTextsearch($query, $search) { - return $query->where('name', 'LIKE', "%$search%") - ->orWhere('address', 'LIKE', "%$search%") - ->orWhere('city', 'LIKE', "%$search%") - ->orWhere('state', 'LIKE', "%$search%") - ->orWhere('zip', 'LIKE', "%$search%") - - // This doesn't actually work - need to use a table alias maybe? - ->orWhere(function($query) use ($search) { - $query->whereHas('parent', function($query) use ($search) { - $query->where(function($query) use ($search) { - $query->where('name','LIKE','%'.$search.'%'); - }); - }); - }); + return $query->where('name', 'LIKE', "%$search%") + ->orWhere('address', 'LIKE', "%$search%") + ->orWhere('city', 'LIKE', "%$search%") + ->orWhere('state', 'LIKE', "%$search%") + ->orWhere('zip', 'LIKE', "%$search%") + + // This doesn't actually work - need to use a table alias maybe? + ->orWhere(function($query) use ($search) { + $query->whereHas('parent', function($query) use ($search) { + $query->where(function($query) use ($search) { + $query->where('name','LIKE','%'.$search.'%'); + }); + }) + // Ugly, ugly code because Laravel sucks at self-joins + ->orWhere(function($query) use ($search) { + $query->whereRaw("parent_id IN (select id from locations where name LIKE '%".$search."%') "); + }); + }); } + /** + * Query builder scope to order on parent + * + * @param Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return Illuminate\Database\Query\Builder Modified query builder + */ + public function scopeOrderParent($query, $order) + { + // Left join here, or it will only return results with parents + return $query->leftJoin('locations as parent_loc', 'locations.parent_id', '=', 'parent_loc.id')->orderBy('parent_loc.name', $order); + } + + } diff --git a/app/models/User.php b/app/models/User.php index b245f87ad2..20fa1f9e3d 100755 --- a/app/models/User.php +++ b/app/models/User.php @@ -200,7 +200,7 @@ class User extends SentryUserModel } - /** + /** * Query builder scope to search on text * * @param Illuminate\Database\Query\Builder $query Query builder instance @@ -211,28 +211,23 @@ class User extends SentryUserModel public function scopeTextsearch($query, $search) { - return $query->where(function($query) use ($search) { - $query->where('first_name', 'LIKE', "%$search%") - ->orWhere('last_name', 'LIKE', "%$search%") - ->orWhere('email', 'LIKE', "%$search%") - ->orWhere('username', 'LIKE', "%$search%") - ->orWhere('notes', 'LIKE', "%$search%") - ->orWhere(function($query) use ($search) { - $query->whereHas('userloc', function($query) use ($search) { - $query->where('name','LIKE','%'.$search.'%'); - }); - }) - - // This doesn't actually work - need to use a table alias maybe? - ->orWhere(function($query) use ($search) { - $query->whereHas('manager', function($query) use ($search) { - $query->where(function($query) use ($search) { - $query->where('first_name','LIKE','%'.$search.'%') - ->orWhere('last_name','LIKE','%'.$search.'%'); - }); - }); - }); + return $query->where(function($query) use ($search) { + $query->where('users.first_name', 'LIKE', "%$search%") + ->orWhere('users.last_name', 'LIKE', "%$search%") + ->orWhere('users.email', 'LIKE', "%$search%") + ->orWhere('users.username', 'LIKE', "%$search%") + ->orWhere('users.notes', 'LIKE', "%$search%") + ->orWhere(function($query) use ($search) { + $query->whereHas('userloc', function($query) use ($search) { + $query->where('name','LIKE','%'.$search.'%'); }); + }) + + // Ugly, ugly code because Laravel sucks at self-joins + ->orWhere(function($query) use ($search) { + $query->whereRaw("users.manager_id IN (select id from users where first_name LIKE '%".$search."%' OR last_name LIKE '%".$search."%') "); + }); + }); } @@ -251,4 +246,20 @@ class User extends SentryUserModel } + /** + * Query builder scope to order on manager + * + * @param Illuminate\Database\Query\Builder $query Query builder instance + * @param text $order Order + * + * @return Illuminate\Database\Query\Builder Modified query builder + */ + public function scopeOrderManager($query, $order) + { + // Left join here, or it will only return results with parents + return $query->leftJoin('users as manager', 'users.manager_id', '=', 'manager.id')->orderBy('manager.first_name', $order)->orderBy('manager.last_name', $order); + } + + + } diff --git a/app/routes.php b/app/routes.php index eefcdda15e..b9b87e1cb5 100755 --- a/app/routes.php +++ b/app/routes.php @@ -52,6 +52,9 @@ /*---Locations API---*/ Route::group(array('prefix'=>'locations'), function () { Route::get('list', array('as'=>'api.locations.list', 'uses'=>'LocationsController@getDatatable')); + Route::get('{locationID}/view', array('as'=>'api.locations.view', 'uses'=>'LocationsController@getDataView')); + Route::get('{locationID}/users', array('as'=>'api.locations.viewusers', 'uses'=>'LocationsController@getDataViewUsers')); + Route::get('{locationID}/assets', array('as'=>'api.locations.viewassets', 'uses'=>'LocationsController@getDataViewAssets')); }); /*---Depreciations API---*/ @@ -63,6 +66,7 @@ /*---Manufacturers API---*/ Route::group(array('prefix'=>'manufacturers'), function () { Route::get('list', array('as'=>'api.manufacturers.list', 'uses'=>'ManufacturersController@getDatatable')); + Route::get('{manufacturerID}/view', array('as'=>'api.manufacturers.view', 'uses'=>'ManufacturersController@getDataView')); }); /*---Suppliers API---*/ @@ -420,6 +424,7 @@ Route::get( '{locationId}/edit', [ 'as' => 'update/location', 'uses' => 'LocationsController@getEdit' ] ); Route::post( '{locationId}/edit', 'LocationsController@postEdit' ); + Route::get( '{locationId}/view', 'LocationsController@getView' ); Route::get( '{locationId}/delete', [ 'as' => 'delete/location', 'uses' => 'LocationsController@getDelete' ] ); } ); diff --git a/app/views/backend/accessories/view.blade.php b/app/views/backend/accessories/view.blade.php index 62191f2ef5..a8f0809fb0 100644 --- a/app/views/backend/accessories/view.blade.php +++ b/app/views/backend/accessories/view.blade.php @@ -27,8 +27,14 @@ @@ -35,37 +33,66 @@