diff --git a/.all-contributorsrc b/.all-contributorsrc index d5278f911f..c8f420d249 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -2396,6 +2396,87 @@ "contributions": [ "code" ] + }, + { + "login": "AL4AL", + "name": "ALPHA", + "avatar_url": "https://avatars.githubusercontent.com/u/22044358?v=4", + "profile": "https://github.com/AL4AL", + "contributions": [ + "code" + ] + }, + { + "login": "FliegenKLATSCH", + "name": "FliegenKLATSCH", + "avatar_url": "https://avatars.githubusercontent.com/u/1042587?v=4", + "profile": "https://www.ifern.de", + "contributions": [ + "code" + ] + }, + { + "login": "jerm", + "name": "Jeremy Price", + "avatar_url": "https://avatars.githubusercontent.com/u/442138?v=4", + "profile": "https://github.com/jerm", + "contributions": [ + "code" + ] + }, + { + "login": "Toreg87", + "name": "Toreg87", + "avatar_url": "https://avatars.githubusercontent.com/u/84392209?v=4", + "profile": "https://github.com/Toreg87", + "contributions": [ + "code" + ] + }, + { + "login": "Computroniks", + "name": "Matthew Nickson", + "avatar_url": "https://avatars.githubusercontent.com/u/67638596?v=4", + "profile": "https://github.com/Computroniks", + "contributions": [ + "code" + ] + }, + { + "login": "jethron", + "name": "Jethro Nederhof", + "avatar_url": "https://avatars.githubusercontent.com/u/1646397?v=4", + "profile": "https://jethron.id.au", + "contributions": [ + "code" + ] + }, + { + "login": "01ste02", + "name": "Oskar Stenberg", + "avatar_url": "https://avatars.githubusercontent.com/u/23289826?v=4", + "profile": "https://github.com/01ste02", + "contributions": [ + "code" + ] + }, + { + "login": "Robert-Azelis", + "name": "Robert-Azelis", + "avatar_url": "https://avatars.githubusercontent.com/u/82208283?v=4", + "profile": "https://github.com/Robert-Azelis", + "contributions": [ + "code" + ] + }, + { + "login": "alwism", + "name": "Alexander William Smith", + "avatar_url": "https://avatars.githubusercontent.com/u/60648387?v=4", + "profile": "https://github.com/alwism", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index 5e3a0a1e3e..75069a93b4 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) -[![All Contributors](https://img.shields.io/badge/all_contributors-262-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-271-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev) ## Snipe-IT - Open Source Asset Management System @@ -128,8 +128,8 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
Mark Stenglein](https://markstenglein.com)
[💻](https://github.com/snipe/snipe-it/commits?author=ocelotsloth "Code") | [
ajsy](https://github.com/ajsy)
[💻](https://github.com/snipe/snipe-it/commits?author=ajsy "Code") | [
Jan Kiesewetter](https://github.com/t3easy)
[💻](https://github.com/snipe/snipe-it/commits?author=t3easy "Code") | [
Tetrachloromethane250](https://github.com/Tetrachloromethane250)
[💻](https://github.com/snipe/snipe-it/commits?author=Tetrachloromethane250 "Code") | [
Lars Kajes](https://www.kajes.se/)
[💻](https://github.com/snipe/snipe-it/commits?author=kajes "Code") | [
Joly0](https://github.com/Joly0)
[💻](https://github.com/snipe/snipe-it/commits?author=Joly0 "Code") | [
theburger](https://github.com/limeless)
[💻](https://github.com/snipe/snipe-it/commits?author=limeless "Code") | | [
David Valin Alonso](https://github.com/deivishome)
[💻](https://github.com/snipe/snipe-it/commits?author=deivishome "Code") | [
andreaci](https://github.com/andreaci)
[💻](https://github.com/snipe/snipe-it/commits?author=andreaci "Code") | [
Jelle Sebreghts](http://www.jellesebreghts.be)
[💻](https://github.com/snipe/snipe-it/commits?author=Jelle-S "Code") | [
Michael Pietsch](https://github.com/Skywalker-11)
| [
Masudul Haque Shihab](https://github.com/sh1hab)
[💻](https://github.com/snipe/snipe-it/commits?author=sh1hab "Code") | [
Supapong Areeprasertkul](http://www.freedomdive.com/)
[💻](https://github.com/snipe/snipe-it/commits?author=zybersup "Code") | [
Peter Sarossy](https://github.com/psarossy)
[💻](https://github.com/snipe/snipe-it/commits?author=psarossy "Code") | | [
Renee Margaret McConahy](https://github.com/nepella)
[💻](https://github.com/snipe/snipe-it/commits?author=nepella "Code") | [
JohnnyPicnic](https://github.com/JohnnyPicnic)
[💻](https://github.com/snipe/snipe-it/commits?author=JohnnyPicnic "Code") | [
markbrule](https://github.com/markbrule)
[💻](https://github.com/snipe/snipe-it/commits?author=markbrule "Code") | [
Mike Campbell](https://github.com/mikecmpbll)
[💻](https://github.com/snipe/snipe-it/commits?author=mikecmpbll "Code") | [
tbrconnect](https://github.com/tbrconnect)
[💻](https://github.com/snipe/snipe-it/commits?author=tbrconnect "Code") | [
kcoyo](https://github.com/kcoyo)
[💻](https://github.com/snipe/snipe-it/commits?author=kcoyo "Code") | [
Travis Miller](https://travismiller.com/)
[💻](https://github.com/snipe/snipe-it/commits?author=travismiller "Code") | -| [
Petri Asikainen](https://github.com/PetriAsi)
[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [
derdeagle](https://github.com/derdeagle)
[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [
Mike Frysinger](https://wh0rd.org/)
[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | -| [
Evan Taylor](https://github.com/Delta5)
[💻](https://github.com/snipe/snipe-it/commits?author=Delta5 "Code") | +| [
Petri Asikainen](https://github.com/PetriAsi)
[💻](https://github.com/snipe/snipe-it/commits?author=PetriAsi "Code") | [
derdeagle](https://github.com/derdeagle)
[💻](https://github.com/snipe/snipe-it/commits?author=derdeagle "Code") | [
Mike Frysinger](https://wh0rd.org/)
[💻](https://github.com/snipe/snipe-it/commits?author=vapier "Code") | [
ALPHA](https://github.com/AL4AL)
[💻](https://github.com/snipe/snipe-it/commits?author=AL4AL "Code") | [
FliegenKLATSCH](https://www.ifern.de)
[💻](https://github.com/snipe/snipe-it/commits?author=FliegenKLATSCH "Code") | [
Jeremy Price](https://github.com/jerm)
[💻](https://github.com/snipe/snipe-it/commits?author=jerm "Code") | [
Toreg87](https://github.com/Toreg87)
[💻](https://github.com/snipe/snipe-it/commits?author=Toreg87 "Code") | +| [
Matthew Nickson](https://github.com/Computroniks)
[💻](https://github.com/snipe/snipe-it/commits?author=Computroniks "Code") | [
Jethro Nederhof](https://jethron.id.au)
[💻](https://github.com/snipe/snipe-it/commits?author=jethron "Code") | [
Oskar Stenberg](https://github.com/01ste02)
[💻](https://github.com/snipe/snipe-it/commits?author=01ste02 "Code") | [
Robert-Azelis](https://github.com/Robert-Azelis)
[💻](https://github.com/snipe/snipe-it/commits?author=Robert-Azelis "Code") | [
Alexander William Smith](https://github.com/alwism)
[💻](https://github.com/snipe/snipe-it/commits?author=alwism "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 422bef6e23..528e8851e0 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -402,6 +402,19 @@ class Helper */ public static function ParseFloat($floatString) { + /******* + * + * WARNING: This does conversions based on *locale* - a Unix-ey-like thing. + * + * Everything else in the system tends to convert based on the Snipe-IT settings + * + * So it's very likely this is *not* what you want - instead look for the new + * + * ParseCurrency($currencyString) + * + * Which should be directly below here + * + */ $LocaleInfo = localeconv(); $floatString = str_replace(',', '', $floatString); $floatString = str_replace($LocaleInfo['decimal_point'], '.', $floatString); @@ -416,6 +429,26 @@ class Helper return floatval($floatString); } + + /** + * Format currency using comma or period for thousands, and period or comma for decimal, based on settings. + * + * @author [B. Wetherington] [] + * @since [v5.2] + * @return Float + */ + public static function ParseCurrency($currencyString) { + $without_currency = str_replace(Setting::getSettings()->default_currency, '', $currencyString); //generally shouldn't come up, since we don't do this in fields, but just in case it does... + if(Setting::getSettings()->digit_separator=='1.234,56') { + //EU format + $without_thousands = str_replace('.', '', $without_currency); + $corrected_decimal = str_replace(',', '.', $without_thousands); + } else { + $without_thousands = str_replace(',', '', $without_currency); + $corrected_decimal = $without_thousands; // decimal is already OK + } + return floatval($corrected_decimal); + } /** * Get the list of status labels in an array to make a dropdown menu diff --git a/app/Http/Controllers/Accessories/AccessoriesController.php b/app/Http/Controllers/Accessories/AccessoriesController.php index 256634f891..108f624947 100755 --- a/app/Http/Controllers/Accessories/AccessoriesController.php +++ b/app/Http/Controllers/Accessories/AccessoriesController.php @@ -66,19 +66,19 @@ class AccessoriesController extends Controller $accessory = new Accessory(); // Update the accessory data - $accessory->name = request('name'); - $accessory->category_id = request('category_id'); - $accessory->location_id = request('location_id'); - $accessory->min_amt = request('min_amt'); - $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); - $accessory->order_number = request('order_number'); - $accessory->manufacturer_id = request('manufacturer_id'); - $accessory->model_number = request('model_number'); - $accessory->purchase_date = request('purchase_date'); - $accessory->purchase_cost = Helper::ParseFloat(request('purchase_cost')); - $accessory->qty = request('qty'); - $accessory->user_id = Auth::user()->id; - $accessory->supplier_id = request('supplier_id'); + $accessory->name = request('name'); + $accessory->category_id = request('category_id'); + $accessory->location_id = request('location_id'); + $accessory->min_amt = request('min_amt'); + $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); + $accessory->order_number = request('order_number'); + $accessory->manufacturer_id = request('manufacturer_id'); + $accessory->model_number = request('model_number'); + $accessory->purchase_date = request('purchase_date'); + $accessory->purchase_cost = Helper::ParseCurrency(request('purchase_cost')); + $accessory->qty = request('qty'); + $accessory->user_id = Auth::user()->id; + $accessory->supplier_id = request('supplier_id'); $accessory = $request->handleImages($accessory); @@ -101,6 +101,7 @@ class AccessoriesController extends Controller */ public function edit($accessoryId = null) { + if ($item = Accessory::find($accessoryId)) { $this->authorize($item); @@ -108,8 +109,10 @@ class AccessoriesController extends Controller } return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.does_not_exist')); + } + /** * Save edited Accessory from form post * @@ -128,18 +131,18 @@ class AccessoriesController extends Controller $this->authorize($accessory); // Update the accessory data - $accessory->name = request('name'); - $accessory->location_id = request('location_id'); - $accessory->min_amt = request('min_amt'); - $accessory->category_id = request('category_id'); - $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); - $accessory->manufacturer_id = request('manufacturer_id'); - $accessory->order_number = request('order_number'); - $accessory->model_number = request('model_number'); - $accessory->purchase_date = request('purchase_date'); - $accessory->purchase_cost = request('purchase_cost'); - $accessory->qty = request('qty'); - $accessory->supplier_id = request('supplier_id'); + $accessory->name = request('name'); + $accessory->location_id = request('location_id'); + $accessory->min_amt = request('min_amt'); + $accessory->category_id = request('category_id'); + $accessory->company_id = Company::getIdForCurrentUser(request('company_id')); + $accessory->manufacturer_id = request('manufacturer_id'); + $accessory->order_number = request('order_number'); + $accessory->model_number = request('model_number'); + $accessory->purchase_date = request('purchase_date'); + $accessory->purchase_cost = Helper::ParseCurrency(request('purchase_cost')); + $accessory->qty = request('qty'); + $accessory->supplier_id = request('supplier_id'); $accessory = $request->handleImages($accessory); @@ -167,6 +170,7 @@ class AccessoriesController extends Controller $this->authorize($accessory); + if ($accessory->hasUsers() > 0) { return redirect()->route('accessories.index')->with('error', trans('admin/accessories/message.assoc_users', ['count'=> $accessory->hasUsers()])); } @@ -184,6 +188,7 @@ class AccessoriesController extends Controller return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.delete.success')); } + /** * Returns a view that invokes the ajax table which contains * the content for the accessory detail view, which is generated in getDataView. diff --git a/app/Http/Controllers/Api/AssetMaintenancesController.php b/app/Http/Controllers/Api/AssetMaintenancesController.php index 2d694df021..6dcc009fcf 100644 --- a/app/Http/Controllers/Api/AssetMaintenancesController.php +++ b/app/Http/Controllers/Api/AssetMaintenancesController.php @@ -21,6 +21,8 @@ use Illuminate\Support\Facades\Input; */ class AssetMaintenancesController extends Controller { + + /** * Generates the JSON response for asset maintenances listing view. * @@ -82,10 +84,12 @@ class AssetMaintenancesController extends Controller $total = $maintenances->count(); $maintenances = $maintenances->skip($offset)->take($limit)->get(); - return (new AssetMaintenancesTransformer())->transformAssetMaintenances($maintenances, $total); + + } + /** * Validates and stores the new asset maintenance * @@ -101,7 +105,7 @@ class AssetMaintenancesController extends Controller $assetMaintenance = new AssetMaintenance(); $assetMaintenance->supplier_id = $request->input('supplier_id'); $assetMaintenance->is_warranty = $request->input('is_warranty'); - $assetMaintenance->cost = e($request->input('cost')); + $assetMaintenance->cost = Helper::ParseCurrency($request->input('cost')); $assetMaintenance->notes = e($request->input('notes')); $asset = Asset::find(e($request->input('asset_id'))); @@ -129,9 +133,11 @@ class AssetMaintenancesController extends Controller // Was the asset maintenance created? if ($assetMaintenance->save()) { return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.create.success'))); + } return response()->json(Helper::formatStandardApiResponse('error', null, $assetMaintenance->getErrors())); + } /** @@ -155,7 +161,7 @@ class AssetMaintenancesController extends Controller $assetMaintenance->supplier_id = e($request->input('supplier_id')); $assetMaintenance->is_warranty = e($request->input('is_warranty')); - $assetMaintenance->cost = Helper::ParseFloat(e($request->input('cost'))); + $assetMaintenance->cost = Helper::ParseCurrency($request->input('cost')); $assetMaintenance->notes = e($request->input('notes')); $asset = Asset::find(request('asset_id')); @@ -192,6 +198,7 @@ class AssetMaintenancesController extends Controller // Was the asset maintenance created? if ($assetMaintenance->save()) { return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.edit.success'))); + } return response()->json(Helper::formatStandardApiResponse('error', null, $assetMaintenance->getErrors())); @@ -218,6 +225,8 @@ class AssetMaintenancesController extends Controller $assetMaintenance->delete(); return response()->json(Helper::formatStandardApiResponse('success', $assetMaintenance, trans('admin/asset_maintenances/message.delete.success'))); + + } /** @@ -237,5 +246,6 @@ class AssetMaintenancesController extends Controller } return (new AssetMaintenancesTransformer())->transformAssetMaintenance($assetMaintenance); + } } diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php index 82e792d559..e4385032d0 100644 --- a/app/Http/Controllers/Api/AssetModelsController.php +++ b/app/Http/Controllers/Api/AssetModelsController.php @@ -66,7 +66,7 @@ class AssetModelsController extends Controller ->with('category', 'depreciation', 'manufacturer', 'fieldset') ->withCount('assets as assets_count'); - if ($request->filled('status')) { + if ($request->input('status')=='deleted') { $assetmodels->onlyTrashed(); } @@ -102,6 +102,7 @@ class AssetModelsController extends Controller return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total); } + /** * Store a newly created resource in storage. * @@ -120,8 +121,9 @@ class AssetModelsController extends Controller if ($assetmodel->save()) { return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.create.success'))); } - return response()->json(Helper::formatStandardApiResponse('error', null, $assetmodel->getErrors())); + + } /** @@ -156,6 +158,7 @@ class AssetModelsController extends Controller return (new AssetsTransformer)->transformAssets($assets, $assets->count()); } + /** * Update the specified resource in storage. * @@ -184,6 +187,7 @@ class AssetModelsController extends Controller $assetmodel->fieldset_id = $request->get('custom_fieldset_id'); } + if ($assetmodel->save()) { return response()->json(Helper::formatStandardApiResponse('success', $assetmodel, trans('admin/models/message.update.success'))); } diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index 32035146d6..6e56b317d2 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -188,6 +188,8 @@ class AssetsController extends Controller } } + + // This is used by the sidenav, mostly // We switched from using query scopes here because of a Laravel bug @@ -313,12 +315,25 @@ class AssetsController extends Controller $total = $assets->count(); $assets = $assets->skip($offset)->take($limit)->get(); + + + /** + * Include additional associated relationships + */ + if ($request->input('components')) { + $assets->loadMissing(['components' => function ($query) { + $query->orderBy('created_at', 'desc'); + }]); + } + + + /** * Here we're just determining which Transformer (via $transformer) to use based on the * variables we set earlier on in this method - we default to AssetsTransformer. */ - return (new $transformer)->transformAssets($assets, $total); + return (new $transformer)->transformAssets($assets, $total, $request); } /** @@ -329,15 +344,16 @@ class AssetsController extends Controller * @since [v4.2.1] * @return JsonResponse */ - public function showByTag($tag) + public function showByTag(Request $request, $tag) { if ($asset = Asset::with('assetstatus')->with('assignedTo')->where('asset_tag', $tag)->first()) { $this->authorize('view', $asset); - return (new AssetsTransformer)->transformAsset($asset); + return (new AssetsTransformer)->transformAsset($asset, $request); } - return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200); + + } /** @@ -348,15 +364,16 @@ class AssetsController extends Controller * @since [v4.2.1] * @return JsonResponse */ - public function showBySerial($serial) + public function showBySerial(Request $request, $serial) { $this->authorize('index', Asset::class); if ($assets = Asset::with('assetstatus')->with('assignedTo') ->withTrashed()->where('serial', $serial)->get()) { return (new AssetsTransformer)->transformAssets($assets, $assets->count()); } - return response()->json(Helper::formatStandardApiResponse('error', null, 'Asset not found'), 200); + + } @@ -368,19 +385,19 @@ class AssetsController extends Controller * @since [v4.0] * @return JsonResponse */ - public function show($id) + public function show(Request $request, $id) { if ($asset = Asset::with('assetstatus')->with('assignedTo')->withTrashed() ->withCount('checkins as checkins_count', 'checkouts as checkouts_count', 'userRequests as user_requests_count')->findOrFail($id)) { $this->authorize('view', $asset); - return (new AssetsTransformer)->transformAsset($asset); + return (new AssetsTransformer)->transformAsset($asset, $request->input('components') ); } } - public function licenses($id) + public function licenses(Request $request, $id) { $this->authorize('view', Asset::class); $this->authorize('view', License::class); @@ -446,6 +463,7 @@ class AssetsController extends Controller return (new SelectlistTransformer)->transformSelectlist($assets); } + /** * Accepts a POST request to create a new asset * @@ -461,26 +479,26 @@ class AssetsController extends Controller $asset = new Asset(); $asset->model()->associate(AssetModel::find((int) $request->get('model_id'))); - $asset->name = $request->get('name'); - $asset->serial = $request->get('serial'); - $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')); - $asset->model_id = $request->get('model_id'); - $asset->order_number = $request->get('order_number'); - $asset->notes = $request->get('notes'); - $asset->asset_tag = $request->get('asset_tag', Asset::autoincrement_asset()); - $asset->user_id = Auth::id(); - $asset->archived = '0'; - $asset->physical = '1'; - $asset->depreciate = '0'; - $asset->status_id = $request->get('status_id', 0); - $asset->warranty_months = $request->get('warranty_months', null); - $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')); - $asset->purchase_date = $request->get('purchase_date', null); - $asset->assigned_to = $request->get('assigned_to', null); - $asset->supplier_id = $request->get('supplier_id', 0); - $asset->requestable = $request->get('requestable', 0); - $asset->rtd_location_id = $request->get('rtd_location_id', null); - $asset->location_id = $request->get('rtd_location_id', null); + $asset->name = $request->get('name'); + $asset->serial = $request->get('serial'); + $asset->company_id = Company::getIdForCurrentUser($request->get('company_id')); + $asset->model_id = $request->get('model_id'); + $asset->order_number = $request->get('order_number'); + $asset->notes = $request->get('notes'); + $asset->asset_tag = $request->get('asset_tag', Asset::autoincrement_asset()); + $asset->user_id = Auth::id(); + $asset->archived = '0'; + $asset->physical = '1'; + $asset->depreciate = '0'; + $asset->status_id = $request->get('status_id', 0); + $asset->warranty_months = $request->get('warranty_months', null); + $asset->purchase_cost = Helper::ParseCurrency($request->get('purchase_cost')); // this is the API's store method, so I don't know that I want to do this? Confusing. FIXME (or not?!) + $asset->purchase_date = $request->get('purchase_date', null); + $asset->assigned_to = $request->get('assigned_to', null); + $asset->supplier_id = $request->get('supplier_id', 0); + $asset->requestable = $request->get('requestable', 0); + $asset->rtd_location_id = $request->get('rtd_location_id', null); + $asset->location_id = $request->get('rtd_location_id', null); /** * this is here just legacy reasons. Api\AssetController @@ -550,6 +568,7 @@ class AssetsController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200); } + /** * Accepts a POST request to update an asset * diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php index b9712b2788..0eb4ab9d12 100644 --- a/app/Http/Controllers/Api/ComponentsController.php +++ b/app/Http/Controllers/Api/ComponentsController.php @@ -223,7 +223,7 @@ class ComponentsController extends Controller $this->authorize('checkout', $component); - if ($component->numRemaining() > $request->get('assigned_qty')) { + if ($component->numRemaining() >= $request->get('assigned_qty')) { if (!$asset = Asset::find($request->input('assigned_to'))) { return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/hardware/message.does_not_exist'))); diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index ed6ab5bd62..2f9dc8cf2a 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -68,6 +68,7 @@ class UsersController extends Controller ->withCount('assets as assets_count', 'licenses as licenses_count', 'accessories as accessories_count', 'consumables as consumables_count'); $users = Company::scopeCompanyables($users); + if (($request->filled('deleted')) && ($request->input('deleted') == 'true')) { $users = $users->onlyTrashed(); } elseif (($request->filled('all')) && ($request->input('all') == 'true')) { @@ -144,6 +145,7 @@ class UsersController extends Controller // Check to make sure the limit is not higher than the max allowed ((config('app.max_results') >= $request->input('limit')) && ($request->filled('limit'))) ? $limit = $request->input('limit') : $limit = config('app.max_results'); + switch ($request->input('sort')) { case 'manager': $users = $users->OrderManager($order); @@ -233,6 +235,8 @@ class UsersController extends Controller return (new SelectlistTransformer)->transformSelectlist($users); } + + /** * Store a newly created resource in storage. * @@ -291,6 +295,7 @@ class UsersController extends Controller return (new UsersTransformer)->transformUser($user); } + /** * Update the specified resource in storage. * @@ -320,6 +325,7 @@ class UsersController extends Controller return response()->json(Helper::formatStandardApiResponse('error', null, 'Permission denied. You cannot update user information via API on the demo.')); } + $user->fill($request->all()); if ($user->id == $request->input('manager_id')) { @@ -343,6 +349,8 @@ class UsersController extends Controller $user->permissions = $permissions_array; } + + // Update the location of any assets checked out to this user Asset::where('assigned_type', User::class) ->where('assigned_to', $user->id)->update(['location_id' => $request->input('location_id', null)]); @@ -366,6 +374,7 @@ class UsersController extends Controller $user->groups()->sync([]); } + return response()->json(Helper::formatStandardApiResponse('success', (new UsersTransformer)->transformUser($user), trans('admin/users/message.success.update'))); } @@ -427,13 +436,13 @@ class UsersController extends Controller * @param $userId * @return string JSON */ - public function assets($id) + public function assets(Request $request, $id) { $this->authorize('view', User::class); $this->authorize('view', Asset::class); $assets = Asset::where('assigned_to', '=', $id)->where('assigned_type', '=', User::class)->with('model')->get(); - return (new AssetsTransformer)->transformAssets($assets, $assets->count()); + return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request); } /** @@ -496,8 +505,9 @@ class UsersController extends Controller return response()->json(['message' => trans('admin/settings/general.two_factor_reset_error')], 500); } } - return response()->json(['message' => 'No ID provided'], 500); + + } /** diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php index b1c28ea26a..1ab24b768f 100644 --- a/app/Http/Controllers/AssetMaintenancesController.php +++ b/app/Http/Controllers/AssetMaintenancesController.php @@ -98,7 +98,7 @@ class AssetMaintenancesController extends Controller $assetMaintenance = new AssetMaintenance(); $assetMaintenance->supplier_id = $request->input('supplier_id'); $assetMaintenance->is_warranty = $request->input('is_warranty'); - $assetMaintenance->cost = $request->input('cost'); + $assetMaintenance->cost = Helper::ParseCurrency($request->input('cost')); $assetMaintenance->notes = $request->input('notes'); $asset = Asset::find($request->input('asset_id')); @@ -206,7 +206,7 @@ class AssetMaintenancesController extends Controller $assetMaintenance->supplier_id = $request->input('supplier_id'); $assetMaintenance->is_warranty = $request->input('is_warranty'); - $assetMaintenance->cost = Helper::ParseFloat($request->input('cost')); + $assetMaintenance->cost = Helper::ParseCurrency($request->input('cost')); $assetMaintenance->notes = $request->input('notes'); $asset = Asset::find(request('asset_id')); diff --git a/app/Http/Controllers/Assets/AssetFilesController.php b/app/Http/Controllers/Assets/AssetFilesController.php index 276705b46a..ab3b857dc9 100644 --- a/app/Http/Controllers/Assets/AssetFilesController.php +++ b/app/Http/Controllers/Assets/AssetFilesController.php @@ -9,6 +9,8 @@ use App\Models\Actionlog; use App\Models\Asset; use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Storage; +use App\Helpers\StorageHelper; +use enshrined\svgSanitize\Sanitizer; class AssetFilesController extends Controller { @@ -36,9 +38,29 @@ class AssetFilesController extends Controller } foreach ($request->file('file') as $file) { + $extension = $file->getClientOriginalExtension(); $file_name = 'hardware-'.$asset->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension; + + // Check for SVG and sanitize it + if ($extension=='svg') { + \Log::debug('This is an SVG'); + + $sanitizer = new Sanitizer(); + $dirtySVG = file_get_contents($file->getRealPath()); + $cleanSVG = $sanitizer->sanitize($dirtySVG); + + try { + Storage::put('private_uploads/assets/'.$file_name, $cleanSVG); + } catch (\Exception $e) { + \Log::debug('Upload no workie :( '); + \Log::debug($e); + } + } else { Storage::put('private_uploads/assets/'.$file_name, file_get_contents($file)); + } + + $asset->logUpload($file_name, e($request->get('notes'))); } @@ -127,7 +149,6 @@ class AssetFilesController extends Controller return redirect()->back()->with('success', trans('admin/hardware/message.deletefile.success')); } - $log->delete(); return redirect()->back() ->with('success', trans('admin/hardware/message.deletefile.success')); diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php index b4ea12b6f1..934573cc7d 100755 --- a/app/Http/Controllers/Assets/AssetsController.php +++ b/app/Http/Controllers/Assets/AssetsController.php @@ -129,22 +129,22 @@ class AssetsController extends Controller $asset->asset_tag = $asset_tags[$a]; } - $asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $asset->model_id = $request->input('model_id'); - $asset->order_number = $request->input('order_number'); - $asset->notes = $request->input('notes'); - $asset->user_id = Auth::id(); - $asset->archived = '0'; - $asset->physical = '1'; - $asset->depreciate = '0'; - $asset->status_id = request('status_id', 0); - $asset->warranty_months = request('warranty_months', null); - $asset->purchase_cost = Helper::ParseFloat($request->get('purchase_cost')); - $asset->purchase_date = request('purchase_date', null); - $asset->assigned_to = request('assigned_to', null); - $asset->supplier_id = request('supplier_id', 0); - $asset->requestable = request('requestable', 0); - $asset->rtd_location_id = request('rtd_location_id', null); + $asset->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $asset->model_id = $request->input('model_id'); + $asset->order_number = $request->input('order_number'); + $asset->notes = $request->input('notes'); + $asset->user_id = Auth::id(); + $asset->archived = '0'; + $asset->physical = '1'; + $asset->depreciate = '0'; + $asset->status_id = request('status_id', 0); + $asset->warranty_months = request('warranty_months', null); + $asset->purchase_cost = Helper::ParseCurrency($request->get('purchase_cost')); + $asset->purchase_date = request('purchase_date', null); + $asset->assigned_to = request('assigned_to', null); + $asset->supplier_id = request('supplier_id', 0); + $asset->requestable = request('requestable', 0); + $asset->rtd_location_id = request('rtd_location_id', null); if (! empty($settings->audit_interval)) { $asset->next_audit_date = Carbon::now()->addMonths($settings->audit_interval)->toDateString(); @@ -296,7 +296,7 @@ class AssetsController extends Controller $asset->status_id = $request->input('status_id', null); $asset->warranty_months = $request->input('warranty_months', null); - $asset->purchase_cost = Helper::ParseFloat($request->input('purchase_cost', null)); + $asset->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost', null)); $asset->purchase_date = $request->input('purchase_date', null); $asset->supplier_id = $request->input('supplier_id', null); $asset->expected_checkin = $request->input('expected_checkin', null); @@ -357,6 +357,7 @@ class AssetsController extends Controller } } + if ($asset->save()) { return redirect()->route('hardware.show', $assetId) ->with('success', trans('admin/hardware/message.update.success')); @@ -828,8 +829,8 @@ class AssetsController extends Controller Storage::putFileAs($path, $upload, $file_name); } - $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name); + $asset->logAudit($request->input('note'), $request->input('location_id'), $file_name); return redirect()->to('hardware')->with('success', trans('admin/hardware/message.audit.success')); } } diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php index ebc2b08738..164c0f96a1 100644 --- a/app/Http/Controllers/Assets/BulkAssetsController.php +++ b/app/Http/Controllers/Assets/BulkAssetsController.php @@ -32,7 +32,8 @@ class BulkAssetsController extends Controller return redirect()->back()->with('error', 'No assets selected'); } - $asset_ids = array_keys($request->input('ids')); + + $asset_ids = array_values(array_unique($request->input('ids'))); if ($request->filled('bulk_actions')) { switch ($request->input('bulk_actions')) { @@ -51,7 +52,7 @@ class BulkAssetsController extends Controller return view('hardware/bulk-delete')->with('assets', $assets); case 'edit': return view('hardware/bulk') - ->with('assets', request('ids')) + ->with('assets', $asset_ids) ->with('statuslabel_list', Helper::statusLabelList()); } } @@ -92,6 +93,7 @@ class BulkAssetsController extends Controller || ($request->filled('model_id')) ) { foreach ($assets as $assetId) { + $this->update_array = []; $this->conditionallyAddItem('purchase_date') @@ -104,7 +106,7 @@ class BulkAssetsController extends Controller ->conditionallyAddItem('warranty_months'); if ($request->filled('purchase_cost')) { - $this->update_array['purchase_cost'] = Helper::ParseFloat($request->input('purchase_cost')); + $this->update_array['purchase_cost'] = Helper::ParseCurrency($request->input('purchase_cost')); } if ($request->filled('company_id')) { diff --git a/app/Http/Controllers/Auth/ForgotPasswordController.php b/app/Http/Controllers/Auth/ForgotPasswordController.php index 4f7e40998a..8912da442f 100644 --- a/app/Http/Controllers/Auth/ForgotPasswordController.php +++ b/app/Http/Controllers/Auth/ForgotPasswordController.php @@ -29,6 +29,7 @@ class ForgotPasswordController extends Controller public function __construct() { $this->middleware('guest'); + $this->middleware('throttle:5,1', ['except' => 'showLinkRequestForm']); } /** @@ -66,7 +67,7 @@ class ForgotPasswordController extends Controller * Once we have attempted to send the link, we will examine the response * then see the message we need to show to the user. Finally, we'll send out a proper response. */ - + $response = null; try { diff --git a/app/Http/Controllers/Components/ComponentsController.php b/app/Http/Controllers/Components/ComponentsController.php index 95bb8c5e07..664dd64937 100644 --- a/app/Http/Controllers/Components/ComponentsController.php +++ b/app/Http/Controllers/Components/ComponentsController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\Controller; use App\Http\Requests\ImageUploadRequest; use App\Models\Company; use App\Models\Component; +use App\Helpers\Helper; use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Storage; @@ -36,6 +37,7 @@ class ComponentsController extends Controller return view('components/index'); } + /** * Returns a form to create a new component. * @@ -67,17 +69,17 @@ class ComponentsController extends Controller { $this->authorize('create', Component::class); $component = new Component(); - $component->name = $request->input('name'); - $component->category_id = $request->input('category_id'); - $component->location_id = $request->input('location_id'); - $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $component->order_number = $request->input('order_number', null); - $component->min_amt = $request->input('min_amt', null); - $component->serial = $request->input('serial', null); - $component->purchase_date = $request->input('purchase_date', null); - $component->purchase_cost = $request->input('purchase_cost', null); - $component->qty = $request->input('qty'); - $component->user_id = Auth::id(); + $component->name = $request->input('name'); + $component->category_id = $request->input('category_id'); + $component->location_id = $request->input('location_id'); + $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $component->order_number = $request->input('order_number', null); + $component->min_amt = $request->input('min_amt', null); + $component->serial = $request->input('serial', null); + $component->purchase_date = $request->input('purchase_date', null); + $component->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost', null)); + $component->qty = $request->input('qty'); + $component->user_id = Auth::id(); $component = $request->handleImages($component); @@ -109,6 +111,7 @@ class ComponentsController extends Controller return redirect()->route('components.index')->with('error', trans('admin/components/message.does_not_exist')); } + /** * Return a view to edit a component. * @@ -139,16 +142,16 @@ class ComponentsController extends Controller $this->authorize('update', $component); // Update the component data - $component->name = $request->input('name'); - $component->category_id = $request->input('category_id'); - $component->location_id = $request->input('location_id'); - $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $component->order_number = $request->input('order_number'); - $component->min_amt = $request->input('min_amt'); - $component->serial = $request->input('serial'); - $component->purchase_date = $request->input('purchase_date'); - $component->purchase_cost = request('purchase_cost'); - $component->qty = $request->input('qty'); + $component->name = $request->input('name'); + $component->category_id = $request->input('category_id'); + $component->location_id = $request->input('location_id'); + $component->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $component->order_number = $request->input('order_number'); + $component->min_amt = $request->input('min_amt'); + $component->serial = $request->input('serial'); + $component->purchase_date = $request->input('purchase_date'); + $component->purchase_cost = Helper::ParseCurrency(request('purchase_cost')); + $component->qty = $request->input('qty'); $component = $request->handleImages($component); diff --git a/app/Http/Controllers/Consumables/ConsumablesController.php b/app/Http/Controllers/Consumables/ConsumablesController.php index 7b3947cabf..dc81f5feed 100644 --- a/app/Http/Controllers/Consumables/ConsumablesController.php +++ b/app/Http/Controllers/Consumables/ConsumablesController.php @@ -65,19 +65,19 @@ class ConsumablesController extends Controller { $this->authorize('create', Consumable::class); $consumable = new Consumable(); - $consumable->name = $request->input('name'); - $consumable->category_id = $request->input('category_id'); - $consumable->location_id = $request->input('location_id'); - $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $consumable->order_number = $request->input('order_number'); - $consumable->min_amt = $request->input('min_amt'); - $consumable->manufacturer_id = $request->input('manufacturer_id'); - $consumable->model_number = $request->input('model_number'); - $consumable->item_no = $request->input('item_no'); - $consumable->purchase_date = $request->input('purchase_date'); - $consumable->purchase_cost = Helper::ParseFloat($request->input('purchase_cost')); - $consumable->qty = $request->input('qty'); - $consumable->user_id = Auth::id(); + $consumable->name = $request->input('name'); + $consumable->category_id = $request->input('category_id'); + $consumable->location_id = $request->input('location_id'); + $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $consumable->order_number = $request->input('order_number'); + $consumable->min_amt = $request->input('min_amt'); + $consumable->manufacturer_id = $request->input('manufacturer_id'); + $consumable->model_number = $request->input('model_number'); + $consumable->item_no = $request->input('item_no'); + $consumable->purchase_date = $request->input('purchase_date'); + $consumable->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost')); + $consumable->qty = $request->input('qty'); + $consumable->user_id = Auth::id(); $consumable = $request->handleImages($consumable); @@ -128,18 +128,18 @@ class ConsumablesController extends Controller $this->authorize($consumable); - $consumable->name = $request->input('name'); - $consumable->category_id = $request->input('category_id'); - $consumable->location_id = $request->input('location_id'); - $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $consumable->order_number = $request->input('order_number'); - $consumable->min_amt = $request->input('min_amt'); - $consumable->manufacturer_id = $request->input('manufacturer_id'); - $consumable->model_number = $request->input('model_number'); - $consumable->item_no = $request->input('item_no'); - $consumable->purchase_date = $request->input('purchase_date'); - $consumable->purchase_cost = Helper::ParseFloat($request->input('purchase_cost')); - $consumable->qty = Helper::ParseFloat($request->input('qty')); + $consumable->name = $request->input('name'); + $consumable->category_id = $request->input('category_id'); + $consumable->location_id = $request->input('location_id'); + $consumable->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $consumable->order_number = $request->input('order_number'); + $consumable->min_amt = $request->input('min_amt'); + $consumable->manufacturer_id = $request->input('manufacturer_id'); + $consumable->model_number = $request->input('model_number'); + $consumable->item_no = $request->input('item_no'); + $consumable->purchase_date = $request->input('purchase_date'); + $consumable->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost')); + $consumable->qty = Helper::ParseFloat($request->input('qty')); $consumable = $request->handleImages($consumable); diff --git a/app/Http/Controllers/Licenses/LicenseFilesController.php b/app/Http/Controllers/Licenses/LicenseFilesController.php index e93aaf2be2..a91d0f4711 100644 --- a/app/Http/Controllers/Licenses/LicenseFilesController.php +++ b/app/Http/Controllers/Licenses/LicenseFilesController.php @@ -7,10 +7,11 @@ use App\Http\Controllers\Controller; use App\Http\Requests\AssetFileRequest; use App\Models\Actionlog; use App\Models\License; -use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Response; use Illuminate\Support\Facades\Storage; use Symfony\Component\HttpFoundation\JsonResponse; +use App\Helpers\StorageHelper; +use enshrined\svgSanitize\Sanitizer; class LicenseFilesController extends Controller { @@ -37,26 +38,39 @@ class LicenseFilesController extends Controller Storage::makeDirectory('private_uploads/licenses', 775); } - $upload_success = false; foreach ($request->file('file') as $file) { - $file_name = 'license-'.$license->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$file->getClientOriginalExtension())).'.'.$file->getClientOriginalExtension(); - $upload_success = $file->storeAs('private_uploads/licenses', $file_name); - // $upload_success = $file->storeAs('private_uploads/licenses/'.$file_name, $file); + $extension = $file->getClientOriginalExtension(); + $file_name = 'license-'.$license->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension; + + + // Check for SVG and sanitize it + if ($extension == 'svg') { + \Log::debug('This is an SVG'); + \Log::debug($file_name); + + $sanitizer = new Sanitizer(); + $dirtySVG = file_get_contents($file->getRealPath()); + $cleanSVG = $sanitizer->sanitize($dirtySVG); + + try { + Storage::put('private_uploads/licenses/'.$file_name, $cleanSVG); + } catch (\Exception $e) { + \Log::debug('Upload no workie :( '); + \Log::debug($e); + } + + } else { + Storage::put('private_uploads/licenses/'.$file_name, file_get_contents($file)); + } //Log the upload to the log $license->logUpload($file_name, e($request->input('notes'))); } - // This being called from a modal seems to confuse redirect()->back() - // It thinks we should go to the dashboard. As this is only used - // from the modal at present, hardcode the redirect. Longterm - // maybe we evaluate something else. - if ($upload_success) { - return redirect()->route('licenses.show', $license->id)->with('success', trans('admin/licenses/message.upload.success')); - } - return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.error')); + return redirect()->route('licenses.show', $license->id)->with('success', trans('admin/licenses/message.upload.success')); + } return redirect()->route('licenses.show', $license->id)->with('error', trans('admin/licenses/message.upload.nofiles')); @@ -153,6 +167,7 @@ class LicenseFilesController extends Controller } return StorageHelper::downloader($file); + } } } diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.php index 2d1eca6969..5272164b18 100755 --- a/app/Http/Controllers/Licenses/LicensesController.php +++ b/app/Http/Controllers/Licenses/LicensesController.php @@ -76,27 +76,27 @@ class LicensesController extends Controller // create a new model instance $license = new License(); // Save the license data - $license->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $license->depreciation_id = $request->input('depreciation_id'); - $license->expiration_date = $request->input('expiration_date'); - $license->license_email = $request->input('license_email'); - $license->license_name = $request->input('license_name'); - $license->maintained = $request->input('maintained', 0); - $license->manufacturer_id = $request->input('manufacturer_id'); - $license->name = $request->input('name'); - $license->notes = $request->input('notes'); - $license->order_number = $request->input('order_number'); - $license->purchase_cost = $request->input('purchase_cost'); - $license->purchase_date = $request->input('purchase_date'); - $license->purchase_order = $request->input('purchase_order'); - $license->purchase_order = $request->input('purchase_order'); - $license->reassignable = $request->input('reassignable', 0); - $license->seats = $request->input('seats'); - $license->serial = $request->input('serial'); - $license->supplier_id = $request->input('supplier_id'); - $license->category_id = $request->input('category_id'); - $license->termination_date = $request->input('termination_date'); - $license->user_id = Auth::id(); + $license->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $license->depreciation_id = $request->input('depreciation_id'); + $license->expiration_date = $request->input('expiration_date'); + $license->license_email = $request->input('license_email'); + $license->license_name = $request->input('license_name'); + $license->maintained = $request->input('maintained', 0); + $license->manufacturer_id = $request->input('manufacturer_id'); + $license->name = $request->input('name'); + $license->notes = $request->input('notes'); + $license->order_number = $request->input('order_number'); + $license->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost')); + $license->purchase_date = $request->input('purchase_date'); + $license->purchase_order = $request->input('purchase_order'); + $license->purchase_order = $request->input('purchase_order'); + $license->reassignable = $request->input('reassignable', 0); + $license->seats = $request->input('seats'); + $license->serial = $request->input('serial'); + $license->supplier_id = $request->input('supplier_id'); + $license->category_id = $request->input('category_id'); + $license->termination_date = $request->input('termination_date'); + $license->user_id = Auth::id(); if ($license->save()) { return redirect()->route('licenses.index')->with('success', trans('admin/licenses/message.create.success')); @@ -154,25 +154,25 @@ class LicensesController extends Controller $this->authorize('update', $license); - $license->company_id = Company::getIdForCurrentUser($request->input('company_id')); - $license->depreciation_id = $request->input('depreciation_id'); - $license->expiration_date = $request->input('expiration_date'); - $license->license_email = $request->input('license_email'); - $license->license_name = $request->input('license_name'); - $license->maintained = $request->input('maintained', 0); - $license->name = $request->input('name'); - $license->notes = $request->input('notes'); - $license->order_number = $request->input('order_number'); - $license->purchase_cost = $request->input('purchase_cost'); - $license->purchase_date = $request->input('purchase_date'); - $license->purchase_order = $request->input('purchase_order'); - $license->reassignable = $request->input('reassignable', 0); - $license->serial = $request->input('serial'); - $license->termination_date = $request->input('termination_date'); - $license->seats = e($request->input('seats')); - $license->manufacturer_id = $request->input('manufacturer_id'); - $license->supplier_id = $request->input('supplier_id'); - $license->category_id = $request->input('category_id'); + $license->company_id = Company::getIdForCurrentUser($request->input('company_id')); + $license->depreciation_id = $request->input('depreciation_id'); + $license->expiration_date = $request->input('expiration_date'); + $license->license_email = $request->input('license_email'); + $license->license_name = $request->input('license_name'); + $license->maintained = $request->input('maintained',0); + $license->name = $request->input('name'); + $license->notes = $request->input('notes'); + $license->order_number = $request->input('order_number'); + $license->purchase_cost = Helper::ParseCurrency($request->input('purchase_cost')); + $license->purchase_date = $request->input('purchase_date'); + $license->purchase_order = $request->input('purchase_order'); + $license->reassignable = $request->input('reassignable', 0); + $license->serial = $request->input('serial'); + $license->termination_date = $request->input('termination_date'); + $license->seats = e($request->input('seats')); + $license->manufacturer_id = $request->input('manufacturer_id'); + $license->supplier_id = $request->input('supplier_id'); + $license->category_id = $request->input('category_id'); if ($license->save()) { return redirect()->route('licenses.show', ['license' => $licenseId])->with('success', trans('admin/licenses/message.update.success')); diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php index 8199715b93..91ff9bc2ff 100644 --- a/app/Http/Controllers/ReportsController.php +++ b/app/Http/Controllers/ReportsController.php @@ -556,7 +556,7 @@ class ReportsController extends Controller foreach ($customfields as $customfield) { - if (e($request->input($customfield->db_column_name())) == '1') { + if ($request->input($customfield->db_column_name()) == '1') { $header[] = $customfield->name; } } diff --git a/app/Http/Controllers/Users/UserFilesController.php b/app/Http/Controllers/Users/UserFilesController.php index 9599f9c66c..cb49396324 100644 --- a/app/Http/Controllers/Users/UserFilesController.php +++ b/app/Http/Controllers/Users/UserFilesController.php @@ -10,6 +10,8 @@ use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Input; use Illuminate\Support\Facades\Response; use Symfony\Component\HttpFoundation\JsonResponse; +use enshrined\svgSanitize\Sanitizer; +use Illuminate\Support\Facades\Storage; class UserFilesController extends Controller { @@ -38,12 +40,32 @@ class UserFilesController extends Controller return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles')); } foreach ($files as $file) { + $extension = $file->getClientOriginalExtension(); - $filename = 'user-'.$user->id.'-'.str_random(8); - $filename .= '-'.str_slug($file->getClientOriginalName()).'.'.$extension; - if (! $file->move($destinationPath, $filename)) { - return redirect()->back()->with('error', trans('admin/users/message.upload.invalidfiles')); + $file_name = 'user-'.$user->id.'-'.str_random(8).'-'.str_slug(basename($file->getClientOriginalName(), '.'.$extension)).'.'.$extension; + + + // Check for SVG and sanitize it + if ($extension == 'svg') { + \Log::debug('This is an SVG'); + \Log::debug($file_name); + + $sanitizer = new Sanitizer(); + + $dirtySVG = file_get_contents($file->getRealPath()); + $cleanSVG = $sanitizer->sanitize($dirtySVG); + + try { + Storage::put('private_uploads/users/'.$file_name, $cleanSVG); + } catch (\Exception $e) { + \Log::debug('Upload no workie :( '); + \Log::debug($e); + } + + } else { + Storage::put('private_uploads/users/'.$file_name, file_get_contents($file)); } + //Log the uploaded file to the log $logAction = new Actionlog(); $logAction->item_id = $user->id; @@ -51,8 +73,8 @@ class UserFilesController extends Controller $logAction->user_id = Auth::id(); $logAction->note = $request->input('notes'); $logAction->target_id = null; - $logAction->created_at = date('Y-m-d H:i:s'); - $logAction->filename = $filename; + $logAction->created_at = date("Y-m-d H:i:s"); + $logAction->filename = $file_name; $logAction->action_type = 'uploaded'; if (! $logAction->save()) { @@ -63,8 +85,9 @@ class UserFilesController extends Controller // dd($logActions); return redirect()->back()->with('success', trans('admin/users/message.upload.success')); } - return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles')); + + } /** @@ -97,6 +120,7 @@ class UserFilesController extends Controller $error = trans('admin/users/message.user_not_found', ['id' => $userId]); // Redirect to the licence management page return redirect()->route('users.index')->with('error', $error); + } /** @@ -128,4 +152,5 @@ class UserFilesController extends Controller // Redirect to the licence management page return redirect()->route('users.index')->with('error', $error); } + } diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index dc698142ce..acd42e5576 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -23,6 +23,7 @@ class Kernel extends HttpKernel \App\Http\Middleware\CheckForDebug::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, \App\Http\Middleware\SecurityHeaders::class, + \App\Http\Middleware\PreventBackHistory::class, ]; diff --git a/app/Http/Middleware/PreventBackHistory.php b/app/Http/Middleware/PreventBackHistory.php new file mode 100644 index 0000000000..8533965b4f --- /dev/null +++ b/app/Http/Middleware/PreventBackHistory.php @@ -0,0 +1,30 @@ + 'no-cache, no-store, max-age=0, must-revalidate', + 'Pragma' => 'no-cache', + 'Expires' => 'Sun, 02 Jan 1990 00:00:00 GMT' + ]; + $response = $next($request); + foreach($headers as $key => $value) { + $response->headers->set($key, $value); + } + + return $response; + } +} \ No newline at end of file diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php index 558685e961..c33e1269b8 100644 --- a/app/Http/Transformers/AssetsTransformer.php +++ b/app/Http/Transformers/AssetsTransformer.php @@ -83,6 +83,7 @@ class AssetsTransformer 'user_can_checkout' => (bool) $asset->availableForCheckout(), ]; + if (($asset->model) && ($asset->model->fieldset) && ($asset->model->fieldset->fields->count() > 0)) { $fields_array = []; @@ -96,12 +97,15 @@ class AssetsTransformer 'value' => $value, 'field_format' => $field->format, ]; + } else { $fields_array[$field->name] = [ 'field' => $field->convertUnicodeDbSlug(), 'value' => $asset->{$field->convertUnicodeDbSlug()}, 'field_format' => $field->format, ]; + + } $array['custom_fields'] = $fields_array; } @@ -112,7 +116,7 @@ class AssetsTransformer $permissions_array['available_actions'] = [ 'checkout' => Gate::allows('checkout', Asset::class), 'checkin' => Gate::allows('checkin', Asset::class), - 'clone' => Gate::allows('create', Asset::class), + 'clone' => false, 'restore' => false, 'update' => (bool) Gate::allows('update', Asset::class), 'delete' => ($asset->assigned_to == '' && Gate::allows('delete', Asset::class)), @@ -129,6 +133,29 @@ class AssetsTransformer ]; } + + if (request('components')=='true') { + + if ($asset->components) { + $array['components'] = []; + + foreach ($asset->components as $component) { + $array['components'][] = [ + + 'id' => $component->id, + 'pivot_id' => $component->pivot->id, + 'name' => $component->name, + 'qty' => $component->pivot->assigned_qty, + 'price_cost' => $component->purchase_cost, + 'purchase_total' => $component->purchase_cost * $component->pivot->assigned_qty, + 'checkout_date' => Helper::getFormattedDateObject($component->pivot->created_at, 'datetime') , + + ]; + } + } + + } + $array += $permissions_array; return $array; @@ -160,6 +187,7 @@ class AssetsTransformer ] : null; } + public function transformRequestedAssets(Collection $assets, $total) { $array = []; @@ -192,7 +220,8 @@ class AssetsTransformer ]; $array += $permissions_array; - return $array; + + } } diff --git a/app/Http/Transformers/LicensesTransformer.php b/app/Http/Transformers/LicensesTransformer.php index 51b193a76a..56492ba45c 100644 --- a/app/Http/Transformers/LicensesTransformer.php +++ b/app/Http/Transformers/LicensesTransformer.php @@ -31,8 +31,9 @@ class LicensesTransformer 'purchase_order' => e($license->purchase_order), 'purchase_date' => Helper::getFormattedDateObject($license->purchase_date, 'date'), 'termination_date' => Helper::getFormattedDateObject($license->termination_date, 'date'), - 'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id, 'name'=> e($license->depreciation->name)] : null, - 'purchase_cost' => e($license->purchase_cost), + 'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null, + 'purchase_cost' => Helper::formatCurrencyOutput($license->purchase_cost), + 'purchase_cost_numeric' => $license->purchase_cost, 'notes' => e($license->notes), 'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'), 'seats' => (int) $license->seats, @@ -65,4 +66,7 @@ class LicensesTransformer { return (new DatatablesTransformer)->transformDatatables($licenses); } + + + } diff --git a/app/Importer/UserImporter.php b/app/Importer/UserImporter.php index 707ee0e2db..aa6c23d30e 100644 --- a/app/Importer/UserImporter.php +++ b/app/Importer/UserImporter.php @@ -74,6 +74,7 @@ class UserImporter extends ItemImporter return; } + // This needs to be applied after the update logic, otherwise we'll overwrite user passwords // Issue #5408 $this->item['password'] = bcrypt($this->tempPassword); @@ -106,6 +107,7 @@ class UserImporter extends ItemImporter } $this->logError($user, 'User'); + return; } /** @@ -118,9 +120,10 @@ class UserImporter extends ItemImporter */ public function createOrFetchDepartment($department_name) { - if(is_null($department_name) || $department_name == ''){ + return null; } + $department = Department::where(['name' => $department_name])->first(); if ($department) { diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 8ed9ac3782..cedf0a4f9c 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -29,6 +29,8 @@ class Asset extends Depreciable { protected $presenter = \App\Presenters\AssetPresenter::class; + + use CompanyableTrait; use HasFactory, Loggable, Requestable, Presentable, SoftDeletes, ValidatingTrait, UniqueUndeletedTrait, UniqueSerialTrait; const LOCATION = 'location'; @@ -68,6 +70,17 @@ class Asset extends Depreciable protected $injectUniqueIdentifier = true; // We set these as protected dates so that they will be easily accessible via Carbon + protected $dates = [ + 'created_at', + 'updated_at', + 'deleted_at', + 'purchase_date', + 'last_checkout', + 'expected_checkin', + 'last_audit_date', + 'next_audit_date' + ]; + protected $casts = [ 'purchase_date' => 'datetime', @@ -169,6 +182,7 @@ class Asset extends Depreciable 'model.manufacturer' => ['name'], ]; + /** * This handles the custom field validation for assets * @@ -187,6 +201,7 @@ class Asset extends Depreciable return parent::save($params); } + public function getDisplayNameAttribute() { return $this->present()->name(); @@ -243,7 +258,8 @@ class Asset extends Depreciable // The asset status is not archived and is deployable if (($this->assetstatus) && ($this->assetstatus->archived == '0') - && ($this->assetstatus->deployable == '1')) { + && ($this->assetstatus->deployable == '1')) + { return true; } } @@ -370,9 +386,10 @@ class Asset extends Depreciable */ public function components() { - return $this->belongsToMany(\App\Models\Component::class, 'components_assets', 'asset_id', 'component_id')->withPivot('id', 'assigned_qty')->withTrashed(); + } + /** * Get depreciation attribute from associated asset model * @@ -399,8 +416,8 @@ class Asset extends Depreciable */ public function uploads() { - return $this->hasMany(\App\Models\Actionlog::class, 'item_id') - ->where('item_type', '=', self::class) + return $this->hasMany('\App\Models\Actionlog', 'item_id') + ->where('item_type', '=', Asset::class) ->where('action_type', '=', 'uploaded') ->whereNotNull('filename') ->orderBy('created_at', 'desc'); @@ -447,6 +464,7 @@ class Asset extends Depreciable return $this->morphMany(self::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed(); } + /** * Get the asset's location based on the assigned user * @@ -475,6 +493,7 @@ class Asset extends Depreciable if ($this->assignedTo) { return $this->assignedTo; } + } if ($this->assignedType() == self::USER) { if (($this->assignedTo) && $this->assignedTo->userLoc) { @@ -533,6 +552,7 @@ class Asset extends Depreciable return false; } + /** * Get the asset's logs * @@ -592,6 +612,7 @@ class Asset extends Depreciable ->withTrashed(); } + /** * Get maintenances for this asset * @@ -617,6 +638,8 @@ class Asset extends Depreciable return $this->belongsTo(\App\Models\User::class, 'user_id'); } + + /** * Establishes the asset -> status relationship * @@ -662,6 +685,7 @@ class Asset extends Depreciable ->get(); } + /** * Establishes the asset -> assigned licenses relationship * @@ -710,6 +734,8 @@ class Asset extends Depreciable return $this->belongsTo(\App\Models\Location::class, 'location_id'); } + + /** * Get the next autoincremented asset tag * @@ -721,6 +747,7 @@ class Asset extends Depreciable { $settings = \App\Models\Setting::getSettings(); + if ($settings->auto_increment_assets == '1') { $temp_asset_tag = \DB::table('assets') ->where('physical', '=', '1') @@ -751,23 +778,28 @@ class Asset extends Depreciable */ public static function nextAutoIncrement($assets) { + $max = 1; foreach ($assets as $asset) { $results = preg_match("/\d+$/", $asset['asset_tag'], $matches); if ($results) { + { $number = $matches[0]; if ($number > $max) { + { $max = $number; } } } - return $max + 1; + } + + /** * Add zerofilling based on Settings * @@ -807,6 +839,7 @@ class Asset extends Depreciable if (($this->model) && ($this->model->category)) { return $this->model->category->require_acceptance; } + } /** @@ -834,6 +867,7 @@ class Asset extends Depreciable return false; } + /** * ----------------------------------------------- * BEGIN QUERY SCOPES @@ -859,11 +893,13 @@ class Asset extends Depreciable }); foreach ($terms as $term) { + $query = $query ->orWhere('assets_users.first_name', 'LIKE', '%'.$term.'%') ->orWhere('assets_users.last_name', 'LIKE', '%'.$term.'%') ->orWhere('assets_users.username', 'LIKE', '%'.$term.'%') ->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$term%"]); + } /** @@ -875,6 +911,7 @@ class Asset extends Depreciable }); foreach ($terms as $term) { + $query = $query->orWhere('assets_locations.name', 'LIKE', '%'.$term.'%'); } @@ -888,11 +925,13 @@ class Asset extends Depreciable foreach ($terms as $term) { $query = $query->orWhere('assigned_assets.name', 'LIKE', '%'.$term.'%'); + } return $query; } + /** * Query builder scope for hardware * @@ -900,6 +939,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeHardware($query) { return $query->where('physical', '=', '1'); @@ -912,6 +952,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopePending($query) { return $query->whereHas('assetstatus', function ($query) { @@ -921,6 +962,7 @@ class Asset extends Depreciable }); } + /** * Query builder scope for searching location * @@ -928,6 +970,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeAssetsByLocation($query, $location) { return $query->where(function ($query) use ($location) { @@ -949,6 +992,7 @@ class Asset extends Depreciable }); } + /** * Query builder scope for RTD assets * @@ -956,6 +1000,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeRTD($query) { return $query->whereNull('assets.assigned_to') @@ -973,6 +1018,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeUndeployable($query) { return $query->whereHas('assetstatus', function ($query) { @@ -989,6 +1035,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeNotArchived($query) { return $query->whereHas('assetstatus', function ($query) { @@ -1018,6 +1065,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeDueForAudit($query, $settings) { $interval = $settings->audit_warning_days ?? 0; @@ -1042,6 +1090,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeOverdueForAudit($query) { return $query->whereNotNull('assets.next_audit_date') @@ -1063,6 +1112,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeDueOrOverdueForAudit($query, $settings) { $interval = $settings->audit_warning_days ?? 0; @@ -1073,6 +1123,7 @@ class Asset extends Depreciable ->NotArchived(); } + /** * Query builder scope for Archived assets * @@ -1080,6 +1131,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeArchived($query) { return $query->whereHas('assetstatus', function ($query) { @@ -1096,6 +1148,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeDeployed($query) { return $query->where('assigned_to', '>', '0'); @@ -1108,6 +1161,7 @@ class Asset extends Depreciable * * @return \Illuminate\Database\Query\Builder Modified query builder */ + public function scopeRequestableAssets($query) { return Company::scopeCompanyables($query->where('requestable', '=', 1)) @@ -1118,6 +1172,7 @@ class Asset extends Depreciable }); } + /** * scopeInModelList * Get all assets in the provided listing of model ids @@ -1158,6 +1213,7 @@ class Asset extends Depreciable return $query->where('accepted', '=', 'rejected'); } + /** * Query builder scope to get accepted assets * @@ -1220,6 +1276,7 @@ class Asset extends Depreciable ->orWhere('assets.order_number', 'LIKE', '%'.$search.'%') ->orWhere('assets.notes', 'LIKE', '%'.$search.'%'); } + })->withTrashed()->whereNull('assets.deleted_at'); //workaround for laravel bug } @@ -1239,9 +1296,12 @@ class Asset extends Depreciable ->where('assets.assigned_type', '=', User::class); })->where(function ($query) use ($search) { $query->where('assets_dept_users.department_id', '=', $search); + })->withTrashed()->whereNull('assets.deleted_at'); //workaround for laravel bug } + + /** * Query builder scope to search on text filters for complex Bootstrap Tables API * @@ -1344,6 +1404,7 @@ class Asset extends Depreciable }); } + if ($fieldname == 'company') { $query->where(function ($query) use ($search_val) { $query->whereHas('company', function ($query) use ($search_val) { @@ -1381,14 +1442,21 @@ class Asset extends Depreciable * against those relationships earlier in this method. * * - snipe + * */ if (($fieldname != 'category') && ($fieldname != 'model_number') && ($fieldname != 'rtd_location') && ($fieldname != 'location') && ($fieldname != 'supplier') && ($fieldname != 'status_label') && ($fieldname != 'model') && ($fieldname != 'company') && ($fieldname != 'manufacturer')) { $query->orWhere('assets.'.$fieldname, 'LIKE', '%'.$search_val.'%'); } + + + + }); + } + /** * Query builder scope to order on model * @@ -1415,6 +1483,7 @@ class Asset extends Depreciable return $query->join('models', 'assets.model_id', '=', 'models.id')->orderBy('models.model_number', $order); } + /** * Query builder scope to order on assigned user * @@ -1454,6 +1523,7 @@ class Asset extends Depreciable return $query->leftJoin('companies as company_sort', 'assets.company_id', '=', 'company_sort.id')->orderBy('company_sort.name', $order); } + /** * Query builder scope to return results of a category * @@ -1482,6 +1552,8 @@ class Asset extends Depreciable ->join('manufacturers', 'models.manufacturer_id', '=', 'manufacturers.id')->where('models.manufacturer_id', '=', $manufacturer_id); } + + /** * Query builder scope to order on category * @@ -1497,6 +1569,7 @@ class Asset extends Depreciable ->orderBy('category_order.name', $order); } + /** * Query builder scope to order on manufacturer * @@ -1537,6 +1610,7 @@ class Asset extends Depreciable return $query->leftJoin('locations as rtd_asset_locations', 'rtd_asset_locations.id', '=', 'assets.rtd_location_id')->orderBy('rtd_asset_locations.name', $order); } + /** * Query builder scope to order on supplier name * @@ -1565,8 +1639,10 @@ class Asset extends Depreciable $query->where('locations.id', '=', $search); }); }); + } + /** * Query builder scope to search on depreciation name * @param \Illuminate\Database\Query\Builder $query Query builder instance @@ -1578,5 +1654,8 @@ class Asset extends Depreciable { return $query->join('models', 'assets.model_id', '=', 'models.id') ->join('depreciations', 'models.depreciation_id', '=', 'depreciations.id')->where('models.depreciation_id', '=', $search); + } + + } diff --git a/config/app.php b/config/app.php index 8a70596aee..e8d1ebae49 100755 --- a/config/app.php +++ b/config/app.php @@ -250,6 +250,9 @@ return [ 'enable_csp' => env('ENABLE_CSP', false), + + + /* |-------------------------------------------------------------------------- | Demo Mode Lockdown @@ -273,6 +276,7 @@ return [ 'min_php' => '7.2.5', + /* |-------------------------------------------------------------------------- | Autoloaded Service Providers @@ -399,6 +403,7 @@ return [ 'Carbon' => Carbon\Carbon::class, 'Helper' => App\Helpers\Helper::class, // makes it much easier to use 'Helper::blah' in blades (which is where we usually use this) + ], ]; diff --git a/docker/startup.sh b/docker/startup.sh index a9b8cb5fa0..70dace2648 100644 --- a/docker/startup.sh +++ b/docker/startup.sh @@ -40,6 +40,7 @@ done chown -R docker:root /var/lib/snipeit/data/* chown -R docker:root /var/lib/snipeit/dumps chown -R docker:root /var/lib/snipeit/keys +chown -R docker:root /var/www/html/storage/framework/cache # Fix php settings if [ -v "PHP_UPLOAD_LIMIT" ] diff --git a/resources/assets/js/snipeit.js b/resources/assets/js/snipeit.js index 8802605080..c74340b10c 100755 --- a/resources/assets/js/snipeit.js +++ b/resources/assets/js/snipeit.js @@ -301,11 +301,11 @@ $(document).ready(function () { }); // makes sure we're not selecting the same thing twice for multiples - var filteredResponse = response.items.filter(function(item) { + var filteredResponse = response.results.filter(function(item) { return currentlySelected.indexOf(+item.id) < 0; }); - var first = (currentlySelected.length > 0) ? filteredResponse[0] : response.items[0]; + var first = (currentlySelected.length > 0) ? filteredResponse[0] : response.results[0]; if(first && first.id) { first.selected = true; @@ -519,7 +519,7 @@ $(document).ready(function () { for (var i = 0; i < this.files.length; i++) { total_size += this.files[i].size; - $(id + '-info').append('' + this.files[i].name + ' (' + formatBytes(this.files[i].size) + ') '); + $(id + '-info').append('' + htmlEntities(this.files[i].name) + ' (' + formatBytes(this.files[i].size) + ') '); } console.log('Max size is: ' + max_size); @@ -540,6 +540,9 @@ $(document).ready(function () { }); +function htmlEntities(str) { + return String(str).replace(/&/g, '&').replace(//g, '>').replace(/"/g, '"'); +} @@ -565,4 +568,4 @@ $(document).ready(function () { }); }; -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/resources/lang/af/admin/depreciations/general.php b/resources/lang/af/admin/depreciations/general.php index 7ee137cd73..59bbb71c31 100644 --- a/resources/lang/af/admin/depreciations/general.php +++ b/resources/lang/af/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Waardevermindering Naam', 'number_of_months' => 'Aantal maande', 'update' => 'Werk waardevermindering op', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/af/admin/hardware/general.php b/resources/lang/af/admin/hardware/general.php index 7503353890..de5c217862 100644 --- a/resources/lang/af/admin/hardware/general.php +++ b/resources/lang/af/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Klone Bate', 'deployable' => 'verbintenis', - 'deleted' => 'Hierdie bate is verwyder. Klik hier om dit te herstel.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Wysig bate', - 'model_deleted' => 'Hierdie batesmodel is uitgevee. Jy moet die model herstel voordat jy die Bate kan herstel.
Klik hier om die model te herstel.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'versoek', 'restore' => 'Herstel bate', diff --git a/resources/lang/af/admin/models/general.php b/resources/lang/af/admin/models/general.php index 5274b166e1..dd1a0e87a6 100644 --- a/resources/lang/af/admin/models/general.php +++ b/resources/lang/af/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Oor Asset Models', 'about_models_text' => 'Batemodelle is \'n manier om identiese bates te groepeer. "MBP 2013", "IPhone 6s", ens.', - 'deleted' => 'Hierdie model is verwyder. Klik hier om dit te herstel.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php index 289640e9d4..aa286fde5a 100644 --- a/resources/lang/af/general.php +++ b/resources/lang/af/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Verwyder Maatskappyvereniging', 'reports' => 'Berigte', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'versoek', 'request_canceled' => 'Versoek gekanselleer', 'save' => 'Save', diff --git a/resources/lang/am/admin/depreciations/general.php b/resources/lang/am/admin/depreciations/general.php index 1fca0e2cb7..a5dec994c2 100644 --- a/resources/lang/am/admin/depreciations/general.php +++ b/resources/lang/am/admin/depreciations/general.php @@ -8,5 +8,6 @@ return array( 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ); diff --git a/resources/lang/am/admin/hardware/general.php b/resources/lang/am/admin/hardware/general.php index f1fcd4731e..af2be65fc6 100644 --- a/resources/lang/am/admin/hardware/general.php +++ b/resources/lang/am/admin/hardware/general.php @@ -10,9 +10,9 @@ return array( 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/am/admin/models/general.php b/resources/lang/am/admin/models/general.php index 3281cfe0fc..d2d77e0e8c 100644 --- a/resources/lang/am/admin/models/general.php +++ b/resources/lang/am/admin/models/general.php @@ -3,7 +3,7 @@ return array( 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/am/general.php b/resources/lang/am/general.php index 539a01a13f..446957c9a5 100644 --- a/resources/lang/am/general.php +++ b/resources/lang/am/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/ar/admin/depreciations/general.php b/resources/lang/ar/admin/depreciations/general.php index 48342e87df..aa8f97baed 100644 --- a/resources/lang/ar/admin/depreciations/general.php +++ b/resources/lang/ar/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'اسم الاستهلاك', 'number_of_months' => 'عدد الأشهر', 'update' => 'تحديث الاستهلاك', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ar/admin/hardware/general.php b/resources/lang/ar/admin/hardware/general.php index d55ff54273..1f72b91e02 100644 --- a/resources/lang/ar/admin/hardware/general.php +++ b/resources/lang/ar/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'اخراج الأصل', 'clone' => 'استنساخ الأصل', 'deployable' => 'قابل للتوزيع', - 'deleted' => 'تم حذف هذا الأصل. انقر هنا لاستعادته .', + 'deleted' => 'This asset has been deleted.', 'edit' => 'تعديل الأصل', - 'model_deleted' => 'تم حذف موديل الأصل هذا. يجب عليك استعادة الموديل قبل أن تتمكن من استعادة الأصل.
انقر هنا لاستعادة الموديل.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'قابل للطلب', 'requested' => 'تم الطلب', 'restore' => 'استعادة الأصل', diff --git a/resources/lang/ar/admin/models/general.php b/resources/lang/ar/admin/models/general.php index 4d6c5463a3..24ee0d9593 100644 --- a/resources/lang/ar/admin/models/general.php +++ b/resources/lang/ar/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'حول موديلات الأصول', 'about_models_text' => 'موديلات الأصول هي طريقة لتجميع الأصول المتطابقة "MBP 2013", "IPhone 6s", الخ.', - 'deleted' => 'تم حذف هذا الموديل. انقر هنا لاستعادته .', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'حذف موديلات الاصول بالجملة', 'bulk_delete_help' => 'استخدم مربعات الاختيار أدناه لتأكيد حذف موديلات الأصول المحددة. لا يمكن حذف موديلات الأصول التي تحتوي على أصول مرتبطة بها إلى أن يتم ربط الأصول بموديل مختلف.', 'bulk_delete_warn' => 'أنت على وشك حذف :model_count من موديلات الأصول.', diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php index 656d20d24f..0b9980e290 100644 --- a/resources/lang/ar/general.php +++ b/resources/lang/ar/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'إزالة جمعية الشركة', 'reports' => 'التقارير', 'restored' => 'المعاد', + 'restore' => 'Restore', 'requested' => 'طلب', 'request_canceled' => 'تم إلغاء الطلب', 'save' => 'حفظ', diff --git a/resources/lang/bg/admin/depreciations/general.php b/resources/lang/bg/admin/depreciations/general.php index 7fd6a938b1..2cd93e808f 100644 --- a/resources/lang/bg/admin/depreciations/general.php +++ b/resources/lang/bg/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Амортизация', 'number_of_months' => 'Брой месеци', 'update' => 'Обновяване на амортизация', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/bg/admin/hardware/general.php b/resources/lang/bg/admin/hardware/general.php index 879c621a9c..86547bd9a1 100644 --- a/resources/lang/bg/admin/hardware/general.php +++ b/resources/lang/bg/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Проверка на активите', 'clone' => 'Копиране на актив', 'deployable' => 'Може да бъде предоставен', - 'deleted' => 'Активът беше изтрит. Възстановяване.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Редакция на актив', - 'model_deleted' => 'Моделът актив беше изтрит.Необходимо е да възстановите моделът, преди да възстановите актива.
Възстановяване на модел.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Може да бъде изискван', 'requested' => 'Изискан', 'restore' => 'Възстановяване на актив', diff --git a/resources/lang/bg/admin/models/general.php b/resources/lang/bg/admin/models/general.php index 8a3abef6ee..2bce3d912f 100644 --- a/resources/lang/bg/admin/models/general.php +++ b/resources/lang/bg/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Относно модели на актив', 'about_models_text' => 'Модели на актив са начин за групиране на идентични активи. "MBP 2013", "IPhone 6s" и др.', - 'deleted' => 'Моделът беше изтрит. Възстановяване.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Масово изтриване на модели на активите', 'bulk_delete_help' => 'Използвайте квадратчетата за отметка по-долу, за да потвърдите изтриването на избраните модели на активи. Моделите, за които има асоциирани активи, не могат да бъдат изтрити, докато активите не се асоциират с друг модел.', 'bulk_delete_warn' => 'Ще бъдат изтрити :model_count модели на активи.', diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php index 7547bfb43d..87a9a78b59 100644 --- a/resources/lang/bg/general.php +++ b/resources/lang/bg/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Премахване на асоциация към компания', 'reports' => 'Справки', 'restored' => 'възстановени', + 'restore' => 'Restore', 'requested' => 'Изискан', 'request_canceled' => 'Заявка отменена', 'save' => 'Запис', diff --git a/resources/lang/ca/admin/depreciations/general.php b/resources/lang/ca/admin/depreciations/general.php index 1fca0e2cb7..a5dec994c2 100644 --- a/resources/lang/ca/admin/depreciations/general.php +++ b/resources/lang/ca/admin/depreciations/general.php @@ -8,5 +8,6 @@ return array( 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ); diff --git a/resources/lang/ca/admin/hardware/general.php b/resources/lang/ca/admin/hardware/general.php index f1fcd4731e..af2be65fc6 100644 --- a/resources/lang/ca/admin/hardware/general.php +++ b/resources/lang/ca/admin/hardware/general.php @@ -10,9 +10,9 @@ return array( 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/ca/admin/models/general.php b/resources/lang/ca/admin/models/general.php index 3281cfe0fc..d2d77e0e8c 100644 --- a/resources/lang/ca/admin/models/general.php +++ b/resources/lang/ca/admin/models/general.php @@ -3,7 +3,7 @@ return array( 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/ca/general.php b/resources/lang/ca/general.php index 16c9baa15d..5eee58d050 100644 --- a/resources/lang/ca/general.php +++ b/resources/lang/ca/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/cs/admin/depreciations/general.php b/resources/lang/cs/admin/depreciations/general.php index 2e3496ac1e..449088f921 100644 --- a/resources/lang/cs/admin/depreciations/general.php +++ b/resources/lang/cs/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Jméno amortizace', 'number_of_months' => 'Počet měsíců', 'update' => 'Aktualizovat amortizaci', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/cs/admin/hardware/general.php b/resources/lang/cs/admin/hardware/general.php index 93e4863b84..6d1b8579a5 100644 --- a/resources/lang/cs/admin/hardware/general.php +++ b/resources/lang/cs/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Pokladní majetek', 'clone' => 'Klonovat majetek', 'deployable' => 'Připraveno k nasazení', - 'deleted' => 'Toto zařízení bylo odstraněno. Klepněte zde pro jeho obnovení.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Upravit majetek', - 'model_deleted' => 'Tento model majetku byl odstraněn. Přejete-li si obnovit zařízení, klepněte zde
a obnovte nejdříve jeho model.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Lze vyžádat', 'requested' => 'Požadováno', 'restore' => 'Obnovit zařízení', diff --git a/resources/lang/cs/admin/models/general.php b/resources/lang/cs/admin/models/general.php index a7fe2793cb..71748aa810 100644 --- a/resources/lang/cs/admin/models/general.php +++ b/resources/lang/cs/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'O modelech majetku', 'about_models_text' => 'Modely majetku jsou způsoby seskupení shodných majetků. "MBP 2013", "iPhone 6s" atd.', - 'deleted' => 'Model byl vymazán. Klikněte sem pro jeho obnovení.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Hromadné mazání modelů majetku', 'bulk_delete_help' => 'Pomocí zaškrtávacích kolonek potvrďte smazání označených modelů majetku. Modely majetku, ke kterým je přiřazen majetek nemohou být smazány dokud jim přiřazený majetek nebude přeřazen k jinému modulu.', 'bulk_delete_warn' => 'Chystáte se smazat :model_count asset models.', diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php index a978a53119..eee066d5ea 100644 --- a/resources/lang/cs/general.php +++ b/resources/lang/cs/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Odstraňte sdružení společnosti', 'reports' => 'Reporty', 'restored' => 'obnoveno', + 'restore' => 'Restore', 'requested' => 'Požadováno', 'request_canceled' => 'Žádost zrušena', 'save' => 'Uložit', diff --git a/resources/lang/cy/admin/depreciations/general.php b/resources/lang/cy/admin/depreciations/general.php index 5624f9dd4c..d676e6cec6 100644 --- a/resources/lang/cy/admin/depreciations/general.php +++ b/resources/lang/cy/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Enw Dibrisiant', 'number_of_months' => 'Nifer o Fisoedd', 'update' => 'Diweddaru Dibrisiant', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/cy/admin/hardware/general.php b/resources/lang/cy/admin/hardware/general.php index e047f918e2..077b5727d5 100644 --- a/resources/lang/cy/admin/hardware/general.php +++ b/resources/lang/cy/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Nodi Asedau Allan', 'clone' => 'Dyblygu Ased', 'deployable' => 'Gellir ei ddefnyddio', - 'deleted' => 'Mae\'r ased yma wedi dileu. Cliciwch yma i\'w adfer.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Addasu Ased', - 'model_deleted' => 'Mae\'r model yma o ased wedi\'i dileu. Rhaid i chi adfer y model cyn fedrwch chi adfer y\'r ased.
Cliciwch yma i adfer yr ased.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Ar gael', 'requested' => 'Gofynnwyd amdano', 'restore' => 'Adfer Ased', diff --git a/resources/lang/cy/admin/models/general.php b/resources/lang/cy/admin/models/general.php index 645a53163e..ecd35826ae 100644 --- a/resources/lang/cy/admin/models/general.php +++ b/resources/lang/cy/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Amdan Modelau', 'about_models_text' => 'Mae modelau o asedau yn ffordd o creu grwp o asedau. "iPhone 7, Samsung TAB 4, ayyb.', - 'deleted' => 'Mae\'r model yma wedi dileu. Cliciwch yma i\'w adfer.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Dileu Nifer o Modelau', 'bulk_delete_help' => 'Rhowch tic yn y bocsys isod i cadarnhau dileu y model. Nid oes modd dileu modelau sydd hefo asedau yn ei erbyn.', 'bulk_delete_warn' => 'Rydych am dileu :model_count o asedau.', diff --git a/resources/lang/cy/general.php b/resources/lang/cy/general.php index 1b8dfaa4ed..3eda2bebf2 100644 --- a/resources/lang/cy/general.php +++ b/resources/lang/cy/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Dileu Cymdeithas y Cwmni', 'reports' => 'Adroddiadau', 'restored' => 'wedi adfer', + 'restore' => 'Restore', 'requested' => 'Gofynnwyd amdano', 'request_canceled' => 'Cais wedi dileu', 'save' => 'Cadw', diff --git a/resources/lang/da/admin/depreciations/general.php b/resources/lang/da/admin/depreciations/general.php index 2fa70f1dd9..3a77a799b8 100644 --- a/resources/lang/da/admin/depreciations/general.php +++ b/resources/lang/da/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Afskrivningnavn', 'number_of_months' => 'Antal måneder', 'update' => 'Opdater Afskrivninger', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/da/admin/hardware/general.php b/resources/lang/da/admin/hardware/general.php index e7f2b1f46c..44572d9587 100644 --- a/resources/lang/da/admin/hardware/general.php +++ b/resources/lang/da/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Klonaktiver', 'deployable' => 'Deployable', - 'deleted' => 'Dette aktiv er blevet slettet. Klik her for at gendanne det.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Rediger aktiv', - 'model_deleted' => 'Denne aktivmodel er blevet slettet. Du skal gendanne modellen, før du kan gendanne Asset.
Klik her for at gendanne model.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'kan anmodes', 'requested' => 'Anmodet', 'restore' => 'Gendan aktiv', diff --git a/resources/lang/da/admin/models/general.php b/resources/lang/da/admin/models/general.php index e6fd566323..d7d3544499 100644 --- a/resources/lang/da/admin/models/general.php +++ b/resources/lang/da/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Om aktiv modeller', 'about_models_text' => 'Aktiv modeller er en måde at gruppere identiske aktiver. "MBP 2013", "IPhone 6s", osv.', - 'deleted' => 'Denne model er blevet slettet. Klik her for at gendanne den.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Slet flere aktivmodeller', 'bulk_delete_help' => 'Brug checkboksene nedenfor til at bekræfte sletning af valgte aktivmodeller. Aktivmodeller med tilknyttede aktiver kan ikke slettes før aktivet er knyttet til en anden model.', 'bulk_delete_warn' => 'Du er ved at slette :model_count aktivmodeller.', diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php index 1b5318b1b6..af663e5c83 100644 --- a/resources/lang/da/general.php +++ b/resources/lang/da/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Fjern association med selskab', 'reports' => 'Rapporter', 'restored' => 'gendannet', + 'restore' => 'Restore', 'requested' => 'Anmodet', 'request_canceled' => 'Anmodning Annulleret', 'save' => 'Gem', diff --git a/resources/lang/de/admin/depreciations/general.php b/resources/lang/de/admin/depreciations/general.php index ed937636f2..cf5a44858a 100644 --- a/resources/lang/de/admin/depreciations/general.php +++ b/resources/lang/de/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Abschreibungs Name', 'number_of_months' => 'Anzahl der Monate', 'update' => 'Abschreibung aktualisieren', + 'depreciation_min' => 'Minimaler Wert nach Abschreibung' ]; diff --git a/resources/lang/de/admin/hardware/general.php b/resources/lang/de/admin/hardware/general.php index 44681ca954..7eaac5beec 100644 --- a/resources/lang/de/admin/hardware/general.php +++ b/resources/lang/de/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Asset herausgeben', 'clone' => 'Asset duplizieren', 'deployable' => 'Einsetzbar', - 'deleted' => 'Dieses Asset wurde gelöscht. Zur Wiederherstellung hier klicken.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Asset bearbeiten', - 'model_deleted' => 'Dieses Asset wurde gelöscht. Sie müssen das Modell Wiederherstellen bevor Sie das Asset Wiederherstellen können
klicken Sie hier um das Modell wiederherzustellen.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Anforderbar', 'requested' => 'Angefordert', 'restore' => 'Asset wiederherstellen', diff --git a/resources/lang/de/admin/models/general.php b/resources/lang/de/admin/models/general.php index 6dfda51630..d030b73f9f 100644 --- a/resources/lang/de/admin/models/general.php +++ b/resources/lang/de/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Über Asset-Modelle', 'about_models_text' => 'Asset-Modelle sind eine Möglichkeit, identische Assets zu gruppieren. "MBP 2013", "IPhone 6 s" usw.', - 'deleted' => 'Dieses Modell wurde gelöscht.klicken Sie hier um es Wiederzuherstellen.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Massenlöschen von Asset-Modellen', 'bulk_delete_help' => 'Nutzen Sie die nachfolgenden Kontrollkästchen, um die Löschung der Asset-Modelle zu bestätigen. Asset-Modelle die noch zugewiesene Assets haben können nur dann gelöscht werden, wenn die enthaltenen Assets einem anderem Asset-Modell zugewiesen werden.', 'bulk_delete_warn' => 'Sie sind im Begriff :model_count Asset-Modelle zu löschen.', diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php index 7fc9da1b88..2522da9c7f 100644 --- a/resources/lang/de/general.php +++ b/resources/lang/de/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Firmenzuordnung entfernen', 'reports' => 'Berichte', 'restored' => 'wiederhergestellt', + 'restore' => 'Restore', 'requested' => 'Angefragt', 'request_canceled' => 'Anfrage abgebrochen', 'save' => 'Speichern', diff --git a/resources/lang/el/admin/depreciations/general.php b/resources/lang/el/admin/depreciations/general.php index dbde844ef0..02578a214b 100644 --- a/resources/lang/el/admin/depreciations/general.php +++ b/resources/lang/el/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Όνομα απόσβεσης', 'number_of_months' => 'Αριθμός των μηνών', 'update' => 'Ενημέρωση αποσβέσεων', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/el/admin/hardware/general.php b/resources/lang/el/admin/hardware/general.php index 8a876010dc..07b1ea5a4a 100644 --- a/resources/lang/el/admin/hardware/general.php +++ b/resources/lang/el/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Ταμείο ελέγχου', 'clone' => 'Κλώνος χρήστη', 'deployable' => 'Προς ανάπτυξη', - 'deleted' => 'Αυτό το στοιχείο έχει διαγραφεί. Κάντε κλικ εδώ για να την επαναφέρετε.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Επεξεργασία παγίων', - 'model_deleted' => 'Αυτό το μοντέλο περιουσιακών στοιχείων έχει διαγραφεί. Πρέπει να επαναφέρετε το μοντέλο για να μπορέσετε να επαναφέρετε το Asset.
Κάντε κλικ εδώ για να επαναφέρετε το μοντέλο.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Επαναληπτικό', 'requested' => 'Ζητήθηκαν', 'restore' => 'Επαναφορά παγίου', diff --git a/resources/lang/el/admin/models/general.php b/resources/lang/el/admin/models/general.php index 08a2124b94..000ceb825c 100644 --- a/resources/lang/el/admin/models/general.php +++ b/resources/lang/el/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Σχετικά με τους τύπους παγίων', 'about_models_text' => 'Τα μοντέλα περιουσιακών στοιχείων είναι ένας τρόπος για να ομαδοποιήσετε ταυτόσημα περιουσιακά στοιχεία "MBP 2013", "IPhone 6s" κ.λπ.', - 'deleted' => 'Αυτό το μοντέλο έχει διαγραφεί. Κάντε κλικ εδώ για να την επαναφέρετε.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Μαζική διαγραφή μοντέλου Asset', 'bulk_delete_help' => 'Χρησιμοποιήστε τα παρακάτω πλαίσια ελέγχου για να επιβεβαιώσετε τη διαγραφή των επιλεγμένων μοντέλων στοιχείων. Τα μοντέλα στοιχείων που έχουν στοιχεία που σχετίζονται με αυτά δεν μπορούν να διαγραφούν έως ότου τα στοιχεία συσχετιστούν με διαφορετικό μοντέλο.', 'bulk_delete_warn' => 'Πρόκειται να διαγράψετε: asset_count περιουσιακών στοιχείων.', diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php index 59ac7bb684..286f7a87fd 100644 --- a/resources/lang/el/general.php +++ b/resources/lang/el/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Κατάργηση σύνδεσης εταιρείας', 'reports' => 'Αναφορές', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Ζητήθηκαν', 'request_canceled' => 'Το αίτημα ακυρώθηκε', 'save' => 'Αποθήκευση', diff --git a/resources/lang/en-GB/admin/depreciations/general.php b/resources/lang/en-GB/admin/depreciations/general.php index e0b02c009d..e6c86b9ff5 100644 --- a/resources/lang/en-GB/admin/depreciations/general.php +++ b/resources/lang/en-GB/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/en-GB/admin/hardware/general.php b/resources/lang/en-GB/admin/hardware/general.php index c5e5a483a4..80a2c14e50 100644 --- a/resources/lang/en-GB/admin/hardware/general.php +++ b/resources/lang/en-GB/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/en-GB/admin/models/general.php b/resources/lang/en-GB/admin/models/general.php index 6b38932347..046fd562e2 100644 --- a/resources/lang/en-GB/admin/models/general.php +++ b/resources/lang/en-GB/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php index a5ae8a2691..f1ee4504c4 100644 --- a/resources/lang/en-GB/admin/settings/general.php +++ b/resources/lang/en-GB/admin/settings/general.php @@ -14,7 +14,7 @@ return array( 'alerts_enabled' => 'Alerts Enabled', 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', - 'allow_user_skin' => 'Erlaube Benutzer Skin', + 'allow_user_skin' => 'Allow User Skin', 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' , 'asset_ids' => 'Asset IDs', 'audit_interval' => 'Audit Interval', diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index b26a01f69b..46c672b3dd 100644 --- a/resources/lang/en-GB/general.php +++ b/resources/lang/en-GB/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/en-ID/admin/depreciations/general.php b/resources/lang/en-ID/admin/depreciations/general.php index ca716e652f..1d78839275 100644 --- a/resources/lang/en-ID/admin/depreciations/general.php +++ b/resources/lang/en-ID/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nama Penyusutan', 'number_of_months' => 'Jumlah Bulan', 'update' => 'Perbarui pengurangan', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/en-ID/admin/hardware/general.php b/resources/lang/en-ID/admin/hardware/general.php index 5521cebf15..ed2e3e2022 100644 --- a/resources/lang/en-ID/admin/hardware/general.php +++ b/resources/lang/en-ID/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Periksa aset', 'clone' => 'Gandakan aset', 'deployable' => 'Bisa dicairkan', - 'deleted' => 'Aset ini telah dihapus Klik di sini untuk memulihkannya.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - 'model_deleted' => 'Model Aset ini telah dihapus. Anda harus mengembalikan model sebelum mengembalikan Aset.
Klik di sini untuk memulihkan modelnya.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Permintaan', 'requested' => 'Diminta', 'restore' => 'Kembalikan Aset', diff --git a/resources/lang/en-ID/admin/models/general.php b/resources/lang/en-ID/admin/models/general.php index 21cf9ca3d4..06f08ced79 100644 --- a/resources/lang/en-ID/admin/models/general.php +++ b/resources/lang/en-ID/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Tentang Model Aset', 'about_models_text' => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.', - 'deleted' => 'Model ini telah dihapus. Klik di sini untuk memulihkannya.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk hapus model aset', 'bulk_delete_help' => 'Gunakan kotak centang di bawah untuk mengkonfirmasi penghapusan model aset yang dipilih. Model aset yang memiliki aset yang terkait dengannya tidak dapat dihapus sampai aset dikaitkan dengan model yang berbeda.', 'bulk_delete_warn' => 'Anda akan menghapus: model aset model_count.', diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php index 0ff5592c50..9907d313d2 100644 --- a/resources/lang/en-ID/general.php +++ b/resources/lang/en-ID/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Hapus Asosiasi Perusahaan', 'reports' => 'Laporan', 'restored' => 'dikembalikan', + 'restore' => 'Restore', 'requested' => 'Diminta', 'request_canceled' => 'Permintaan dibatalkan', 'save' => 'Simpan', diff --git a/resources/lang/en/admin/categories/general.php b/resources/lang/en/admin/categories/general.php index e9fdcf9921..b4b428c6b3 100644 --- a/resources/lang/en/admin/categories/general.php +++ b/resources/lang/en/admin/categories/general.php @@ -17,7 +17,7 @@ return [ 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', 'update' => 'Update Category', 'use_default_eula' => 'Use the primary default EULA instead.', - 'use_default_eula_column' => 'Use default EULA', 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', + 'use_default_eula_column' => 'Use default EULA', ]; diff --git a/resources/lang/en/admin/hardware/general.php b/resources/lang/en/admin/hardware/general.php index c5e5a483a4..80a2c14e50 100644 --- a/resources/lang/en/admin/hardware/general.php +++ b/resources/lang/en/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/en/admin/models/general.php b/resources/lang/en/admin/models/general.php index 6b38932347..046fd562e2 100644 --- a/resources/lang/en/admin/models/general.php +++ b/resources/lang/en/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php index 96e9baeb99..ca028be152 100644 --- a/resources/lang/en/admin/settings/general.php +++ b/resources/lang/en/admin/settings/general.php @@ -62,8 +62,6 @@ return [ 'label_logo_size' => 'Square logos look best - will be displayed in the top right of each asset label. ', 'laravel' => 'Laravel Version', 'ldap_client_tls_cert' => 'LDAP Client-Side TLS Certificate', - 'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.', - 'ldap_client_tls_key' => 'LDAP Client-Side TLS key', 'ldap_enabled' => 'LDAP enabled', 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php index c859e63a2d..ff9f383178 100644 --- a/resources/lang/en/admin/users/message.php +++ b/resources/lang/en/admin/users/message.php @@ -15,6 +15,7 @@ return [ 'password_resets_sent' => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.', 'password_reset_sent' => 'A password reset link has been sent to :email!', + 'success' => [ 'create' => 'User was successfully created.', 'update' => 'User was successfully updated.', diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 6a0971cb05..942947e6c1 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -177,6 +177,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/en/mail.php b/resources/lang/en/mail.php index 6471289e00..db5e157135 100644 --- a/resources/lang/en/mail.php +++ b/resources/lang/en/mail.php @@ -60,7 +60,7 @@ return [ 'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)', 'the_following_item' => 'The following item has been checked in: ', 'low_inventory_alert' => 'There is :count item that is below minimum inventory or will soon be low.|There are :count items that are below minimum inventory or will soon be low.', - 'assets_warrantee_alert' => 'There is :count asset with a warrantee expiring in the next :threshold days.|There are :count assets with warrantees expiring in the next :threshold days.', + 'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.', 'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.', 'to_reset' => 'To reset your :web password, complete this form:', 'type' => 'Type', diff --git a/resources/lang/es-CO/admin/depreciations/general.php b/resources/lang/es-CO/admin/depreciations/general.php index 9eba2c65b1..5ca4dc75f5 100644 --- a/resources/lang/es-CO/admin/depreciations/general.php +++ b/resources/lang/es-CO/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nombre de Depreciación', 'number_of_months' => 'Número de Meses', 'update' => 'Actualizar Depreciación', + 'depreciation_min' => 'Valor mínimo después de depreciación' ]; diff --git a/resources/lang/es-CO/admin/hardware/general.php b/resources/lang/es-CO/admin/hardware/general.php index 5e6648e8ea..bcf75f4504 100644 --- a/resources/lang/es-CO/admin/hardware/general.php +++ b/resources/lang/es-CO/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Asignar Equipo', 'clone' => 'Clonar Equipo', 'deployable' => 'Desplegable', - 'deleted' => 'Este equipo ha sido eliminado. Click aquí para restaurarlo.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Editar Equipo', - 'model_deleted' => 'Este modelo de equipo ha sido borrado. Debes restaurar el modelo antes de poder restaurar el equipo.
Hacer click aquí para restaurar el modelo.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Puede Solicitarse', 'requested' => 'Solicitado', 'restore' => 'Restaurar equipo', diff --git a/resources/lang/es-CO/admin/models/general.php b/resources/lang/es-CO/admin/models/general.php index 90bca950ad..f85f093e83 100644 --- a/resources/lang/es-CO/admin/models/general.php +++ b/resources/lang/es-CO/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Acerca de modelos de activos', 'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Borrar Grandes Modelos de Activos', 'bulk_delete_help' => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.', 'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.', diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php index 04bbf3a59d..8a1615469d 100644 --- a/resources/lang/es-CO/general.php +++ b/resources/lang/es-CO/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Eliminar Asociación de compañía', 'reports' => 'Informes', 'restored' => 'restaurado', + 'restore' => 'Restore', 'requested' => 'Solicitado', 'request_canceled' => 'Solicitud Cancelada', 'save' => 'Guardar', diff --git a/resources/lang/es-ES/admin/depreciations/general.php b/resources/lang/es-ES/admin/depreciations/general.php index f5f35588ab..e68a9fa112 100644 --- a/resources/lang/es-ES/admin/depreciations/general.php +++ b/resources/lang/es-ES/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nombre Amortización', 'number_of_months' => 'Meses', 'update' => 'Actualizar Amortización', + 'depreciation_min' => 'Valor mínimo después de la depreciación' ]; diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php index a80910ee6c..5e51655171 100644 --- a/resources/lang/es-ES/admin/hardware/general.php +++ b/resources/lang/es-ES/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Activo de pago', 'clone' => 'Clonar Equipo', 'deployable' => 'Desplegable', - 'deleted' => 'Este equipo ha sido eliminado. Click aqui para restaurarlot.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Editar Equipo', - 'model_deleted' => 'Este modelo de equipo ha sido borrado. Debe restaurar el modelo antes de poder restaurar el equipo.
Hacer click aquí para restaurar el modelo.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requerible', 'requested' => 'Solicitado', 'restore' => 'Restaurar equipo', diff --git a/resources/lang/es-ES/admin/models/general.php b/resources/lang/es-ES/admin/models/general.php index 90bca950ad..f85f093e83 100644 --- a/resources/lang/es-ES/admin/models/general.php +++ b/resources/lang/es-ES/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Acerca de modelos de activos', 'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Borrar Grandes Modelos de Activos', 'bulk_delete_help' => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.', 'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.', diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php index 268399c20f..bb15ea9c76 100644 --- a/resources/lang/es-ES/general.php +++ b/resources/lang/es-ES/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Eliminar Asociación de compañía', 'reports' => 'Informes', 'restored' => 'restaurado', + 'restore' => 'Restore', 'requested' => 'Solicitado', 'request_canceled' => 'Solicitud Cancelada', 'save' => 'Guardar', diff --git a/resources/lang/es-MX/admin/depreciations/general.php b/resources/lang/es-MX/admin/depreciations/general.php index f5f35588ab..80f58e4ab9 100644 --- a/resources/lang/es-MX/admin/depreciations/general.php +++ b/resources/lang/es-MX/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nombre Amortización', 'number_of_months' => 'Meses', 'update' => 'Actualizar Amortización', + 'depreciation_min' => 'Valor mínimo después de depreciado' ]; diff --git a/resources/lang/es-MX/admin/hardware/general.php b/resources/lang/es-MX/admin/hardware/general.php index 0547326e3b..c56ab30c68 100644 --- a/resources/lang/es-MX/admin/hardware/general.php +++ b/resources/lang/es-MX/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Activo de pago', 'clone' => 'Clonar Equipo', 'deployable' => 'Desplegable', - 'deleted' => 'Este equipo ha sido eliminado. Click aqui para restaurarlot.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Editar Equipo', - 'model_deleted' => 'Este modelo de equipo ha sido borrado. Debe restaurar el modelo antes de poder restaurar el equipo.
Hacer click aquí para restaurar el modelo.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requerible', 'requested' => 'Solicitado', 'restore' => 'Restaurar equipo', diff --git a/resources/lang/es-MX/admin/models/general.php b/resources/lang/es-MX/admin/models/general.php index 3f7b53f569..b1ffcb9f37 100644 --- a/resources/lang/es-MX/admin/models/general.php +++ b/resources/lang/es-MX/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Acerca de modelos de activos', 'about_models_text' => 'Los Modelos de activos son una forma de agrupar activos idénticos. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Borrar Grandes Modelos de Activos', 'bulk_delete_help' => 'Usa las casillas de verificación para confirmar la eliminación de los modelos de activos. Los modelos de activos tienen activos asociados que no pueden ser eliminados hasta que los activos sean asociados con un modelo diferente.', 'bulk_delete_warn' => 'Estás a punto de eliminar: los modelos de activo model_count.', diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php index 128f81a19c..59b52d4905 100644 --- a/resources/lang/es-MX/general.php +++ b/resources/lang/es-MX/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Eliminar Asociación de compañía', 'reports' => 'Informes', 'restored' => 'restaurado', + 'restore' => 'Restore', 'requested' => 'Solicitado', 'request_canceled' => 'Solicitud Cancelada', 'save' => 'Guardar', diff --git a/resources/lang/es-VE/admin/depreciations/general.php b/resources/lang/es-VE/admin/depreciations/general.php index dbe8fedcb1..3dfb028fb3 100644 --- a/resources/lang/es-VE/admin/depreciations/general.php +++ b/resources/lang/es-VE/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nombre de Depreciación', 'number_of_months' => 'Número de Meses', 'update' => 'Actualizar Depreciación', + 'depreciation_min' => 'Valor mínimo después de la depreciación' ]; diff --git a/resources/lang/es-VE/admin/hardware/general.php b/resources/lang/es-VE/admin/hardware/general.php index f2ad99e2c6..8bb7102ffc 100644 --- a/resources/lang/es-VE/admin/hardware/general.php +++ b/resources/lang/es-VE/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Retirar Activo', 'clone' => 'Clonar Activo', 'deployable' => 'Enviable', - 'deleted' => 'Este activo ha sido borrado. Click aquí para restaurarlos.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Editar Activo', - 'model_deleted' => 'Este modelo de activos ha sido borrado. Debes restaurar el modelo antes de poder restaurar los activos.
Click aquí para restaurar el modelo.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Solicitable', 'requested' => 'Solicitado', 'restore' => 'Restaurar Activo', diff --git a/resources/lang/es-VE/admin/models/general.php b/resources/lang/es-VE/admin/models/general.php index 92e527b0eb..541dc18d53 100644 --- a/resources/lang/es-VE/admin/models/general.php +++ b/resources/lang/es-VE/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Acerca de los Modelos de Activos', 'about_models_text' => 'Los Modelos de Activos son un grupo de activos idénticos. "MBP 2013", "iPhone 6S", etc.', - 'deleted' => 'Este modelo ha sido borrado. Click aquí para restaurarlo.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Eliminación Masiva de Modelos de Activos', 'bulk_delete_help' => 'Usa las casillas abajo para confirmar la eliminación de los modelos de activos seleccionados. Los modelos de activo que tienen distintos activos asociados con ellos no pueden ser borrados hasta que los activos sean asociados a un modelo diferente.', 'bulk_delete_warn' => 'Estás a punto de borrar :model_count modelos de activo.', diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php index 3359374c9c..e7f0120001 100644 --- a/resources/lang/es-VE/general.php +++ b/resources/lang/es-VE/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Eliminar Asociación de la Compañía', 'reports' => 'Reportes', 'restored' => 'restaurado', + 'restore' => 'Restore', 'requested' => 'Solicitado', 'request_canceled' => 'Solicitud Cancelada', 'save' => 'Guardar', diff --git a/resources/lang/et/admin/depreciations/general.php b/resources/lang/et/admin/depreciations/general.php index db85afe764..c8cac4ed9d 100644 --- a/resources/lang/et/admin/depreciations/general.php +++ b/resources/lang/et/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Amortisatsiooni nimi', 'number_of_months' => 'Kuude arv', 'update' => 'Kulumi ajakohastamine', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/et/admin/hardware/general.php b/resources/lang/et/admin/hardware/general.php index 17fc08e345..44d94a3e24 100644 --- a/resources/lang/et/admin/hardware/general.php +++ b/resources/lang/et/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Klooni vahend', 'deployable' => 'Käivitatav', - 'deleted' => 'See vara on kustutatud. Klõpsake selle taastamiseks klõpsake siia.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Muuda vahendit', - 'model_deleted' => 'See varade mudel on kustutatud. Enne varade taastamist peate mudeleid taastada. 123._5_0_321 Klõpsake mudeli taastamiseks siin.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Taodeldav', 'requested' => 'Taotletud', 'restore' => 'Taasta vara', diff --git a/resources/lang/et/admin/models/general.php b/resources/lang/et/admin/models/general.php index b2bab7bafa..01ddb256d8 100644 --- a/resources/lang/et/admin/models/general.php +++ b/resources/lang/et/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Mudelitest', 'about_models_text' => 'Mudelid on selleks, et vahendeid grupeerida. "MBP 2013", "IPhone 6d", jne.', - 'deleted' => 'See mudel on kustutatud. Kliki siin selle taastamiseks.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/et/general.php b/resources/lang/et/general.php index 17e1897b0d..2993511fd6 100644 --- a/resources/lang/et/general.php +++ b/resources/lang/et/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Eemalda ettevõtteühing', 'reports' => 'Aruanded', 'restored' => 'taastatud', + 'restore' => 'Restore', 'requested' => 'Taotletud', 'request_canceled' => 'Taotlus tühistati', 'save' => 'Salvesta', diff --git a/resources/lang/fa/admin/accessories/message.php b/resources/lang/fa/admin/accessories/message.php index e62b5df4bc..96b6bd5221 100644 --- a/resources/lang/fa/admin/accessories/message.php +++ b/resources/lang/fa/admin/accessories/message.php @@ -2,7 +2,7 @@ return [ - 'does_not_exist' => 'The accessory [:id] does not exist.', + 'does_not_exist' => 'ابزار/وسیله [:id] وجود ندارد.', 'assoc_users' => 'این وسیله هم اکنون:آیتم های چک شده به کاربران را حساب کنید.لطفا در لوازم جانبی چک کنید و دوباره امتحان کنید', 'create' => [ diff --git a/resources/lang/fa/admin/asset_maintenances/general.php b/resources/lang/fa/admin/asset_maintenances/general.php index 3b99098eca..acb2d85638 100644 --- a/resources/lang/fa/admin/asset_maintenances/general.php +++ b/resources/lang/fa/admin/asset_maintenances/general.php @@ -8,7 +8,7 @@ 'repair' => 'بازسازی', 'maintenance' => 'نگهداشت', 'upgrade' => 'ارتقا', - 'calibration' => 'Calibration', - 'software_support' => 'Software Support', - 'hardware_support' => 'Hardware Support', + 'calibration' => 'کالیبره کردن', + 'software_support' => 'پشتیبانی نرم‌افزار', + 'hardware_support' => 'پشتیبانی سخت‌افزار', ]; diff --git a/resources/lang/fa/admin/depreciations/general.php b/resources/lang/fa/admin/depreciations/general.php index f48f75a9c1..a966f33f1c 100644 --- a/resources/lang/fa/admin/depreciations/general.php +++ b/resources/lang/fa/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'نام استهلاک', 'number_of_months' => 'تعداد ماه ها', 'update' => 'کمبود به روزرسانی', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/fa/admin/hardware/general.php b/resources/lang/fa/admin/hardware/general.php index fe5750348e..09339fc0b7 100644 --- a/resources/lang/fa/admin/hardware/general.php +++ b/resources/lang/fa/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'دارایی پرداخت', 'clone' => 'دارایی شگرف', 'deployable' => 'گسترش', - 'deleted' => 'این دارایی حذف شده است. اینجا به بازگرداندن آن کلیک کنید .', + 'deleted' => 'This asset has been deleted.', 'edit' => 'ویرایش دارایی', - 'model_deleted' => 'این مدل دارایی حذف شده است. شما باید مدل بازگرداندن قبل از شما می توانید دارایی بازگرداندن کنید.
برای بازگرداندن مدل را اینجا را کلیک کنید.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'در خواست شد', 'requested' => 'درخواست شده', 'restore' => 'بازیابی دارایی', diff --git a/resources/lang/fa/admin/models/general.php b/resources/lang/fa/admin/models/general.php index c6aa189cd8..08b636bccd 100644 --- a/resources/lang/fa/admin/models/general.php +++ b/resources/lang/fa/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'درباره مدل های دارایی', 'about_models_text' => 'مدل های دارایی یک راه برای گروه بندی دارایی های یکسان هستند. "MBP 2013"، "IPhone 6s" و غیره', - 'deleted' => 'این مدل حذف شده است. اینجا برای بازگرداندن کلیک کنید it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php index 3aec724cf2..023a4d4f66 100644 --- a/resources/lang/fa/general.php +++ b/resources/lang/fa/general.php @@ -179,6 +179,7 @@ 'remove_company' => 'حذف انجمن شرکت', 'reports' => 'گزارش‌ها', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'در خواست شده', 'request_canceled' => 'درخواست لغو شد', 'save' => 'ذخیره کردن', diff --git a/resources/lang/fi/admin/depreciations/general.php b/resources/lang/fi/admin/depreciations/general.php index 80eec3d9a9..c0f77c8bfd 100644 --- a/resources/lang/fi/admin/depreciations/general.php +++ b/resources/lang/fi/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Poiston nimi', 'number_of_months' => 'Kuukausien lukumäärä', 'update' => 'Päivitä poistot', + 'depreciation_min' => 'Minimiarvo poistojen jälkeen' ]; diff --git a/resources/lang/fi/admin/hardware/general.php b/resources/lang/fi/admin/hardware/general.php index 832d5fd7e8..720007d54e 100644 --- a/resources/lang/fi/admin/hardware/general.php +++ b/resources/lang/fi/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Luovuta laite', 'clone' => 'Monista laite', 'deployable' => 'Käyttöönotettavissa', - 'deleted' => 'Tämä laite on poistettu. Klikkaa tästä palauttaaksesi sen.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Muokkaa laitetta', - 'model_deleted' => 'Tämä laitemalli on poistettu. Sinun on palautettava malli ennen kuin voit palauttaa laitteen.
Klikkaa tästä palauttaaksesi mallin.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Pyydettävissä', 'requested' => 'Pyydetty', 'restore' => 'Palauta laite', diff --git a/resources/lang/fi/admin/models/general.php b/resources/lang/fi/admin/models/general.php index 8cdca9361a..db5e09aea7 100644 --- a/resources/lang/fi/admin/models/general.php +++ b/resources/lang/fi/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Tietoja laitemalleista', 'about_models_text' => 'Laitemalleilla ryhmitellään samankaltaiset laitteet. "Elitebook 820 G3", "IPhone 6s" jne.', - 'deleted' => 'Tämä malli on poistettu. Vaihda tästä palauttaaksesi sen.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Massapoista laitemalleja', 'bulk_delete_help' => 'Käytä alla olevia valintaruutuja vahvistaaksesi laitemallien poistaminen. Laitemalleja, joissa on niihin liittyviä laitteita, ei voida poistaa ennen kuin laitteet on liitetty toiseen malliin.', 'bulk_delete_warn' => 'Olet poistamassa :model_count laitemallia.', diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php index 8ae0dcd02c..9e227135a2 100644 --- a/resources/lang/fi/general.php +++ b/resources/lang/fi/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Poista', 'reports' => 'Raportit', 'restored' => 'palautettu', + 'restore' => 'Restore', 'requested' => 'Pyydetty', 'request_canceled' => 'Pyyntö peruutettu', 'save' => 'Tallenna', diff --git a/resources/lang/fil/admin/depreciations/general.php b/resources/lang/fil/admin/depreciations/general.php index a71875d68a..bb6dd3a398 100644 --- a/resources/lang/fil/admin/depreciations/general.php +++ b/resources/lang/fil/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Ang Pangalan ng Depresasyon', 'number_of_months' => 'Ang Bilang ng mga Buwan', 'update' => 'I-update ang Depresasyon', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/fil/admin/hardware/general.php b/resources/lang/fil/admin/hardware/general.php index 0241ca8721..f6f76a7b9b 100644 --- a/resources/lang/fil/admin/hardware/general.php +++ b/resources/lang/fil/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'I-checkout ang Asset', 'clone' => 'I-clone ang Asset', 'deployable' => 'Pwedeng mai-deploy', - 'deleted' => 'Ang asset na ito ay nai-delete na. I-klick dito para ibalik sa dati.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'I-edit ang Asset', - 'model_deleted' => 'Ang model ng mga Asset na ito ay nai-delete na. Dapat mo munang ibalik sa dati ang model bago ibalik sa dati ang Asset.
I-klick dito para ibalik sa dati ang model.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Pwedeng Ma-rekwest', 'requested' => 'Ni-rekwest', 'restore' => 'Ibalik sa dati ang Asset', diff --git a/resources/lang/fil/admin/models/general.php b/resources/lang/fil/admin/models/general.php index e494ba183d..bda8bb8e11 100644 --- a/resources/lang/fil/admin/models/general.php +++ b/resources/lang/fil/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Ang Tungkol sa mga Modelo ng Asset', 'about_models_text' => 'Ang mga Modelo ng Asset ay isang paraan para i-grupo ang magkakaparehong mga asset. "MBP 2013", "IPhone 6s", atbp.', - 'deleted' => 'Ang modelong ito ay nai-delete na. I-klik dito para maibalik sa dati.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Ang Maramihang Pag-delete sa mga Modelo ng Asset', 'bulk_delete_help' => 'Gamitin ang mga checkboxes sa ibaba para i-komperma ang pag-delete sa mga napiling mga modelo ng asset. Ang mga modelo ng asset na mayroong mga asset na nai-ugnay sa mga ito ay hindi pwedeng i-delete hanggang sa ang lahat ng mga asset ay nai-ugnay sa ibat-ibang modelo.', 'bulk_delete_warn' => 'Ikaw ay mag-delete ng :model_count mga modelo ng asset.', diff --git a/resources/lang/fil/general.php b/resources/lang/fil/general.php index 18f765fe83..e17d23231d 100644 --- a/resources/lang/fil/general.php +++ b/resources/lang/fil/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Tanggalin ang Assosasyon ng Kompanya', 'reports' => 'Mga Ulat', 'restored' => 'ibinalik sa dati', + 'restore' => 'Restore', 'requested' => 'Ang Nirekwest', 'request_canceled' => 'Ang mga Rekwest ay Nakansela', 'save' => 'I-save', diff --git a/resources/lang/fr/admin/depreciations/general.php b/resources/lang/fr/admin/depreciations/general.php index f3bed046a5..1cfd3ff044 100644 --- a/resources/lang/fr/admin/depreciations/general.php +++ b/resources/lang/fr/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nom d\'Amortissement', 'number_of_months' => 'Mois', 'update' => 'Actualiser l\'amortissement', + 'depreciation_min' => 'Valeur minimale après amortissement' ]; diff --git a/resources/lang/fr/admin/hardware/general.php b/resources/lang/fr/admin/hardware/general.php index d975bf8f88..6451bb04bf 100644 --- a/resources/lang/fr/admin/hardware/general.php +++ b/resources/lang/fr/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Commander l\'actif', 'clone' => 'Cloner le Bien', 'deployable' => 'Déployable', - 'deleted' => 'Cet actif a été détruit. Cliquez ici pour le restaurer.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Editer le Bien', - 'model_deleted' => 'Ce modèle d\'actif a été supprimé. Vous devez le restaurer avant de restaurer l\'actif.
Cliquez ici pour le restaurer.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Réquisitionnable', 'requested' => 'Demandé', 'restore' => 'Restaurer l\'actif', diff --git a/resources/lang/fr/admin/models/general.php b/resources/lang/fr/admin/models/general.php index d8d9f65275..2ecd09b12a 100644 --- a/resources/lang/fr/admin/models/general.php +++ b/resources/lang/fr/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'A propos des modèles actifs', 'about_models_text' => 'Les modèles actifs sont une façon de regrouper les actifs identiques. « MBP 2013", « IPhone 6 s », etc.', - 'deleted' => 'Ce modèle a été détruit. Cliquez ici pour le restaurer.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Suppression en masse des modèles d\'actifs', 'bulk_delete_help' => 'Cochez la case ci-dessous pour confirmer la suppression des modèles d\'actifs sélectionnés. Les modèles d\'actifs associés à des actifs ne peuvent pas être supprimés tant que les actifs ne sont pas associés à un modèle différent.', 'bulk_delete_warn' => 'Vous êtes sur le points de suppimer :model_count modèles d\'actifs.', diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php index 6af49daf3d..a25365f80d 100644 --- a/resources/lang/fr/general.php +++ b/resources/lang/fr/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Retirer l\'association avec l\'organisation', 'reports' => 'Rapports', 'restored' => 'restauré', + 'restore' => 'Restore', 'requested' => 'Demandé', 'request_canceled' => 'Demande annulée', 'save' => 'Sauvegarder', diff --git a/resources/lang/ga-IE/admin/depreciations/general.php b/resources/lang/ga-IE/admin/depreciations/general.php index ad04513ad3..974fcf92ec 100644 --- a/resources/lang/ga-IE/admin/depreciations/general.php +++ b/resources/lang/ga-IE/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Ainm Dímheas', 'number_of_months' => 'Líon na Míonna', 'update' => 'Dímheas Nuashonraigh', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ga-IE/admin/hardware/general.php b/resources/lang/ga-IE/admin/hardware/general.php index 1e2cc40485..82e22f0d93 100644 --- a/resources/lang/ga-IE/admin/hardware/general.php +++ b/resources/lang/ga-IE/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Seiceáil Seiceáil', 'clone' => 'Sócmhainn Clón', 'deployable' => 'Infheidhmithe', - 'deleted' => 'Scriosadh an tsócmhainn seo. Cliceáil anseo chun é a chur ar ais.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Athraigh Sócmhainn', - 'model_deleted' => 'Scriosadh an tsamhail Sócmhainní seo. Caithfidh tú an tsamhail a chur ar ais sular féidir leat an Sócmhainn a athbhunú.
Cliceáil anseo chun an tsamhail a chur ar ais.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Inrianaithe', 'requested' => 'Iarrtar', 'restore' => 'Athchóirigh Sócmhainn', diff --git a/resources/lang/ga-IE/admin/models/general.php b/resources/lang/ga-IE/admin/models/general.php index 2faf9f326e..e705301c6a 100644 --- a/resources/lang/ga-IE/admin/models/general.php +++ b/resources/lang/ga-IE/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Maidir le Múnlaí Sócmhainne', 'about_models_text' => 'Tá modhanna sócmhainne ina bhealach chun sócmhainní comhionanna a ghrúpáil. "MBP 2013", "iPhone 6s", etc.', - 'deleted' => 'Scriosadh an múnla seo. Cliceáil anseo chun é a chur ar ais.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php index 7483e27b69..4082c4acb9 100644 --- a/resources/lang/ga-IE/general.php +++ b/resources/lang/ga-IE/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Bain Cuideachta Chomhlachais', 'reports' => 'Tuarascálacha', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Iarrtar', 'request_canceled' => 'Iarratas Ar Ceal', 'save' => 'Sábháil', diff --git a/resources/lang/he/admin/depreciations/general.php b/resources/lang/he/admin/depreciations/general.php index 2ab968882e..c9cc3bcfee 100644 --- a/resources/lang/he/admin/depreciations/general.php +++ b/resources/lang/he/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'שם פחת', 'number_of_months' => 'מספר החודשים', 'update' => 'עדכון פחת', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/he/admin/hardware/general.php b/resources/lang/he/admin/hardware/general.php index e3555b6df6..719f185026 100644 --- a/resources/lang/he/admin/hardware/general.php +++ b/resources/lang/he/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'רכוש Checkout', 'clone' => 'נכס משוכפל', 'deployable' => 'ניתן לפריסה', - 'deleted' => 'הנכס הזה נמחק. לחץ כאן כדי לשחזר אותו .', + 'deleted' => 'This asset has been deleted.', 'edit' => 'ערוך נכס', - 'model_deleted' => 'מודל נכסים זה נמחק. עליך לשחזר את המודל לפני שתוכל לשחזר את הנכס
לחץ כאן כדי לשחזר את המודל .', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'ניתן לבקש', 'requested' => 'מבוקש', 'restore' => 'שחזור נכס', diff --git a/resources/lang/he/admin/models/general.php b/resources/lang/he/admin/models/general.php index 3417dfcd22..7d98ce7095 100644 --- a/resources/lang/he/admin/models/general.php +++ b/resources/lang/he/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'על מודלים הנכסים', 'about_models_text' => 'מודלים של נכסים הם דרך לקבץ נכסים זהים. "MBP 2013", "iPhone 6s", וכו \'', - 'deleted' => 'מודל זה נמחק. לחץ כאן כדי לשחזר אותו .', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php index b1848d81f4..1ea2778008 100644 --- a/resources/lang/he/general.php +++ b/resources/lang/he/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'הסר התאחדות החברה', 'reports' => 'דיווחים', 'restored' => 'שוחזר', + 'restore' => 'Restore', 'requested' => 'מבוקש', 'request_canceled' => 'הבקשה בוטלה', 'save' => 'להציל', diff --git a/resources/lang/hr/admin/depreciations/general.php b/resources/lang/hr/admin/depreciations/general.php index 95c38f0a13..f786ce817a 100644 --- a/resources/lang/hr/admin/depreciations/general.php +++ b/resources/lang/hr/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Naziv amortizacije', 'number_of_months' => 'Broj mjeseci', 'update' => 'Ažuriraj amortizaciju', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/hr/admin/hardware/general.php b/resources/lang/hr/admin/hardware/general.php index 6829370964..6e2053e89e 100644 --- a/resources/lang/hr/admin/hardware/general.php +++ b/resources/lang/hr/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Asset Checkout', 'clone' => 'Klonska imovina', 'deployable' => 'razmjestiti', - 'deleted' => 'Ova je imovina izbrisana. Kliknite ovdje da biste ga vratili.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Uređivanje imovine', - 'model_deleted' => 'Model ove stavke je izbrisan. Morate vratiti model prije nego što vratite Asset.
Kliknite ovdje da biste vratili model.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Traženi', 'restore' => 'Vraćanje imovine', diff --git a/resources/lang/hr/admin/models/general.php b/resources/lang/hr/admin/models/general.php index 93e487b8c9..d1f4c70c33 100644 --- a/resources/lang/hr/admin/models/general.php +++ b/resources/lang/hr/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'O modelu imovine', 'about_models_text' => 'Modeli imovine su način grupiranja identične imovine. "MBP 2013", "IPhone 6s" itd.', - 'deleted' => 'Ovaj je model izbrisan. Kliknite ovdje da biste ga vratili.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Skupno brisanje modela imovine', 'bulk_delete_help' => 'Koristeći checkbox-ove niže potvrdite brisanje odabranih modela imovine. Modeli imovine koji na sebi imaju povezanu imovinu se ne mogu brisati dok se imovina ne poveže sa drugim modelom.', 'bulk_delete_warn' => 'Izbrisati ćete :model_count model(a) imovine.', diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php index 964c9b5a16..b519e7a5cc 100644 --- a/resources/lang/hr/general.php +++ b/resources/lang/hr/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Ukloni Udruženje tvrtki', 'reports' => 'Izvještaji', 'restored' => 'obnovljeno', + 'restore' => 'Restore', 'requested' => 'Traženi', 'request_canceled' => 'Zahtjev je otkazan', 'save' => 'Uštedjeti', diff --git a/resources/lang/hu/admin/depreciations/general.php b/resources/lang/hu/admin/depreciations/general.php index d20d51aca9..9033768e2a 100644 --- a/resources/lang/hu/admin/depreciations/general.php +++ b/resources/lang/hu/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Értékcsökkenés neve', 'number_of_months' => 'Hónapok száma', 'update' => 'Értékcsökkenés frissítése', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/hu/admin/hardware/general.php b/resources/lang/hu/admin/hardware/general.php index 580ea321a8..6bdb89e775 100644 --- a/resources/lang/hu/admin/hardware/general.php +++ b/resources/lang/hu/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Eszköz klónozása', 'deployable' => 'Kiadható', - 'deleted' => 'Ez az eszköz törölve lett. Kattintson ide a visszaállításához.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Eszköz módosítása', - 'model_deleted' => 'Ez az Eszközök modell törölve lett. Vissza kell állítania a modellt, mielőtt visszaállíthatja az Eszközt.
Kattintson ide a modell visszaállításához.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'lehívási', 'requested' => 'Kérve', 'restore' => 'Visszaállítás eszköz', diff --git a/resources/lang/hu/admin/models/general.php b/resources/lang/hu/admin/models/general.php index 80f18e2596..b309e9e6c9 100644 --- a/resources/lang/hu/admin/models/general.php +++ b/resources/lang/hu/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Az Asset Models-ról', 'about_models_text' => 'Az eszköz-modellek lehetővé teszik az azonos eszközök csoportosítását. "MBP 2013", "IPhone 6s" stb.', - 'deleted' => 'Ez a modell törölve lett. Itt visszaállíthatod.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Eszköz modellek csoportos törlése', 'bulk_delete_help' => 'Az alábbi jelölőnégyzetek segítségével, kérem, erősítse meg, hogy valóban törölni szeretné a kiválasztott eszköz modelleket! Azok az eszköz modellek, melyeknek vannak hozzárendelt eszközei, egészen addig nem törölhetőek, amíg ezeket az eszközöket egy másik modellhez nem rendeli.', 'bulk_delete_warn' => 'Törlődni fog :model_count eszköz modell.', diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php index c8d7f60a21..c8d340723e 100644 --- a/resources/lang/hu/general.php +++ b/resources/lang/hu/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Vállati kapcsolat megszüntetése', 'reports' => 'Jelentések', 'restored' => 'visszaállítva', + 'restore' => 'Restore', 'requested' => 'Kérve', 'request_canceled' => 'A kérelem törölve', 'save' => 'Mentés', diff --git a/resources/lang/id/admin/depreciations/general.php b/resources/lang/id/admin/depreciations/general.php index a4ce2f5f4b..88f2c8d734 100644 --- a/resources/lang/id/admin/depreciations/general.php +++ b/resources/lang/id/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nama Penyusutan', 'number_of_months' => 'Jumlah bulan', 'update' => 'Perbaharui Penyusutan', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/id/admin/hardware/general.php b/resources/lang/id/admin/hardware/general.php index 1f6081df05..988dcc51cb 100644 --- a/resources/lang/id/admin/hardware/general.php +++ b/resources/lang/id/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Aset Checkout', 'clone' => 'Klon Aset', 'deployable' => 'Dapat digunakan', - 'deleted' => 'Aset ini telah di hapus. Klik disini untuk memulihkan.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Sunting Aset', - 'model_deleted' => 'Model aset telah di hapus. Anda harus memulihkan model dahulu sebelum memulihkan aset.
Klik disini untuk memulihkan model.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Dapat diminta', 'requested' => 'Telah diminta', 'restore' => 'Mengembalikan aset', diff --git a/resources/lang/id/admin/models/general.php b/resources/lang/id/admin/models/general.php index 54702d1937..8e717eb433 100644 --- a/resources/lang/id/admin/models/general.php +++ b/resources/lang/id/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Tentang Model Aset', 'about_models_text' => 'Model Aset adalah cara untuk mengelompokkan aset identik. "MBP 2013", "IPhone 6s", dll.', - 'deleted' => 'Model ini telah dihapus. Click di sini untuk memulihkan.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Menghapus massal aset model', 'bulk_delete_help' => 'Centang kotak di bawah untuk mengkonfirmasi penghapusan model aset yang dipilih. Model aset yang memiliki aset yang terkait dengannya tidak dapat dihapus sampai aset dikaitkan dengan model yang berbeda.', 'bulk_delete_warn' => 'Anda akan menghapus :model_count asset models.', diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php index 8c0fc3d3a4..360b6f1f1b 100644 --- a/resources/lang/id/general.php +++ b/resources/lang/id/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Hapus Asosiasi Perusahaan', 'reports' => 'Laporan', 'restored' => 'kembalikan', + 'restore' => 'Restore', 'requested' => 'Diminta', 'request_canceled' => 'Permintaan Dibatalkan', 'save' => 'Simpan', diff --git a/resources/lang/is/admin/depreciations/general.php b/resources/lang/is/admin/depreciations/general.php index 81fb66eb5a..844e5d9626 100644 --- a/resources/lang/is/admin/depreciations/general.php +++ b/resources/lang/is/admin/depreciations/general.php @@ -8,5 +8,6 @@ return array( 'depreciation_name' => 'Heiti fyrningarflokks', 'number_of_months' => 'Fjöldi mánaða', 'update' => 'Uppfæra fyrningarflokk', + 'depreciation_min' => 'Minimum Value after Depreciation' ); diff --git a/resources/lang/is/admin/hardware/general.php b/resources/lang/is/admin/hardware/general.php index 547b970342..cba6164173 100644 --- a/resources/lang/is/admin/hardware/general.php +++ b/resources/lang/is/admin/hardware/general.php @@ -10,9 +10,9 @@ return array( 'checkout' => 'Ráðstafa eign', 'clone' => 'Clone Asset', 'deployable' => 'Nothæfar', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Breyta eign', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/is/admin/models/general.php b/resources/lang/is/admin/models/general.php index 6b38932347..046fd562e2 100644 --- a/resources/lang/is/admin/models/general.php +++ b/resources/lang/is/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/is/admin/suppliers/message.php b/resources/lang/is/admin/suppliers/message.php index 5460f8eebf..614c3768e8 100644 --- a/resources/lang/is/admin/suppliers/message.php +++ b/resources/lang/is/admin/suppliers/message.php @@ -11,7 +11,7 @@ return array( ), 'update' => array( - 'error' => 'Supplier was not updated, please try again', + 'error' => 'Þessi birgi var ekki skráður. Vinsamlegast reyndu aftur', 'success' => 'Supplier updated successfully.' ), diff --git a/resources/lang/is/button.php b/resources/lang/is/button.php index a18e1c9a86..bf78c2b2b7 100644 --- a/resources/lang/is/button.php +++ b/resources/lang/is/button.php @@ -1,6 +1,6 @@ 'Aðgerðir', 'add' => 'Bæta við nýjum', 'cancel' => 'Hætta við', @@ -11,7 +11,7 @@ return [ 'request' => 'Óska eftir', 'submit' => 'Staðfesta', 'upload' => 'Hlaða upp', - 'select_file' => 'Velja skrá...', + 'select_file' => 'Velja skrá...', 'select_files' => 'Velja skrár...', - 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', -]; + 'generate_labels' => 'Útbúa límmiða', +); diff --git a/resources/lang/is/general.php b/resources/lang/is/general.php index f0f52f0a12..8c04a02f20 100644 --- a/resources/lang/is/general.php +++ b/resources/lang/is/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Skýrslur', 'restored' => 'endurheimt', + 'restore' => 'Restore', 'requested' => 'Óskað eftir', 'request_canceled' => 'Beiðni endurkölluð', 'save' => 'Vista', diff --git a/resources/lang/it/admin/depreciations/general.php b/resources/lang/it/admin/depreciations/general.php index 733a345655..d30f344b53 100644 --- a/resources/lang/it/admin/depreciations/general.php +++ b/resources/lang/it/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nome Obsolescenza', 'number_of_months' => 'Numero di Mesi', 'update' => 'Aggiorna l\'ammortamento', + 'depreciation_min' => 'Valore minimo di svalutazione' ]; diff --git a/resources/lang/it/admin/hardware/general.php b/resources/lang/it/admin/hardware/general.php index e562867dcc..404e8e3d22 100644 --- a/resources/lang/it/admin/hardware/general.php +++ b/resources/lang/it/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Asset Checkout', 'clone' => 'Copia Asset', 'deployable' => 'Distribuibile', - 'deleted' => 'Questo asset è stato cancellato. Clicca qui per ripristinarlo.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Modifica Asset', - 'model_deleted' => 'Questo modello di Asset è stato cancellato. Devi ripristinare il modello prima di poter ripristinare L\'asset.
Clicca qui per ripristinare il modello.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Disponibile', 'requested' => 'richiesto', 'restore' => 'Ripristina Asset', diff --git a/resources/lang/it/admin/models/general.php b/resources/lang/it/admin/models/general.php index 785223fb4e..b60c9e0b9f 100644 --- a/resources/lang/it/admin/models/general.php +++ b/resources/lang/it/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Informazioni sui modelli di Asset', 'about_models_text' => 'I modelli sono un modo per raggruppare Asset identici. "MBP 2016", "IPhone 6s", etc.', - 'deleted' => 'Questo modello è stato eliminato.Clicca qui per ripristinarlo.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Eliminazione di massa di modelli Asset', 'bulk_delete_help' => 'Utilizza le caselle di controllo in basso per confermare la cancellazione dei modelli di asset selezionati. I modelli di asset con asset ad essi associati non possono essere eliminati finché le risorse non sono associate a un modello diverso.', 'bulk_delete_warn' => 'Stai per cancellare :asset_count assets.', diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php index 092bf5040f..8971b2f3b6 100644 --- a/resources/lang/it/general.php +++ b/resources/lang/it/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Rimuovi associazioni azienda', 'reports' => 'Reports', 'restored' => 'ripristinato', + 'restore' => 'Restore', 'requested' => 'Richiesto', 'request_canceled' => 'Richiesta annullata', 'save' => 'Salva', diff --git a/resources/lang/iu/admin/depreciations/general.php b/resources/lang/iu/admin/depreciations/general.php index e0b02c009d..e6c86b9ff5 100644 --- a/resources/lang/iu/admin/depreciations/general.php +++ b/resources/lang/iu/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/iu/admin/hardware/general.php b/resources/lang/iu/admin/hardware/general.php index c5e5a483a4..80a2c14e50 100644 --- a/resources/lang/iu/admin/hardware/general.php +++ b/resources/lang/iu/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/iu/admin/models/general.php b/resources/lang/iu/admin/models/general.php index 6b38932347..046fd562e2 100644 --- a/resources/lang/iu/admin/models/general.php +++ b/resources/lang/iu/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/iu/general.php b/resources/lang/iu/general.php index 9bb3f84e44..c1931af8d1 100644 --- a/resources/lang/iu/general.php +++ b/resources/lang/iu/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/ja/admin/depreciations/general.php b/resources/lang/ja/admin/depreciations/general.php index aab918f724..c48af97821 100644 --- a/resources/lang/ja/admin/depreciations/general.php +++ b/resources/lang/ja/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => '減価償却名', 'number_of_months' => '月数', 'update' => '減価償却の更新', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ja/admin/hardware/general.php b/resources/lang/ja/admin/hardware/general.php index b2c4f5866d..d37d1f50a9 100644 --- a/resources/lang/ja/admin/hardware/general.php +++ b/resources/lang/ja/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => '資産をチェックアウト', 'clone' => '資産を複製', 'deployable' => '配備可能', - 'deleted' => 'この資産は削除されました。復元するにはココをクリックして下さい。', + 'deleted' => 'This asset has been deleted.', 'edit' => '資産を編集', - 'model_deleted' => 'この資産型番は削除されました。資産を戻すためには型番を復元する必要があります。
型番を復元するにはココをクリックして下さい。', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => '要求可能', 'requested' => '要求済', 'restore' => '資産を復元', diff --git a/resources/lang/ja/admin/kits/general.php b/resources/lang/ja/admin/kits/general.php index 0dfad82469..233edf96e1 100644 --- a/resources/lang/ja/admin/kits/general.php +++ b/resources/lang/ja/admin/kits/general.php @@ -1,17 +1,17 @@ 'About Predefined Kits', - 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.', - 'checkout' => 'Checkout Kit ', - 'create_success' => 'Kit was successfully created.', - 'create' => 'Create Predefined Kit', - 'update' => 'Update Predefined Kit', - 'delete_success' => 'Kit was successfully deleted.', - 'update_success' => 'Kit was successfully updated.', - 'none_models' => 'There are not enough available assets for :model to checkout. :qty are required. ', - 'none_licenses' => 'There are not enough available seats for :license to checkout. :qty are required. ', - 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ', - 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ', +return array( + 'about_kits_title' => '製品セットについて', + 'about_kits_text' => '製品セットを用いると、アイテム（アセット、ライセンスなど）のコレクションをすばやくユーザーに払い出す（チェックアウトする）ことができます。例えば、組織のオンボーディングプロセスが一貫している場合に、すべてのユーザーが同じアイテムを使用する場合に役立ちます。', + 'checkout' => 'チェックアウト', + 'create_success' => '製品セットは正常に作成されました。', + 'create' => '製品セットを作成', + 'update' => '製品セットを更新', + 'delete_success' => '製品セットは正常に削除されました。', + 'update_success' => '製品セットは正常に更新されました。', + 'none_models' => ':modelをチェックアウトするのに十分な資産がありません。:qtyが必要です。 ', + 'none_licenses' => ':licenseをチェックアウトするのに十分なシートがありません。:qtyが必要です。 ', + 'none_consumables' => ':consumableをチェックアウトするのに十分な数がありません。:qtyが必要です。 ', + 'none_accessory' => ':accessoryをチェックアウトするのに十分な数がありません。:qtyが必要です。 ', -]; +); diff --git a/resources/lang/ja/admin/models/general.php b/resources/lang/ja/admin/models/general.php index 7b763a40a7..e72bcb7fb8 100644 --- a/resources/lang/ja/admin/models/general.php +++ b/resources/lang/ja/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => '資産モデルについて', 'about_models_text' => '資産モデルは、同一資産をグループ化する方法です。(例:「MBP 2013」、「IPhone 6」など)', - 'deleted' => 'この型番は削除されました。元に戻すにはココをクリックして下さい。.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => '資産モデルの一括削除', 'bulk_delete_help' => '下のチェックボックスを使用して、選択した資産モデルの削除を確認します。資産が関連付けられている資産モデルは、資産が別のモデルに関連付けられるまで削除できません。', 'bulk_delete_warn' => ':model_count 件の資産モデルを削除しようとしています。', diff --git a/resources/lang/ja/auth/general.php b/resources/lang/ja/auth/general.php index 2fb1fe62b8..81cf25a534 100644 --- a/resources/lang/ja/auth/general.php +++ b/resources/lang/ja/auth/general.php @@ -11,5 +11,5 @@ return [ 'ldap_reset_password' => 'LDAPパスワードをリセットするにはここをクリックしてください', 'remember_me' => 'ログイン状態を維持する', 'username_help_top' => 'パスワードリセットリンクを送信する対象の ユーザー名 を入力してください。', - 'username_help_bottom' => 'Your username and email address may be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator.

Usernames without an associated email address will not be emailed a password reset link. ', + 'username_help_bottom' => 'ユーザー名とメールアドレスは、設定によって同じ場合もありますが、そうでない場合もあります。ユーザー名を思い出せない場合は、管理者にお問い合わせください。

メールアドレスが関連付けられていないユーザー名には、パスワードリセットのリンクがメールで送信されません。 ', ]; diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php index 8e4931c3ea..658faea33d 100644 --- a/resources/lang/ja/general.php +++ b/resources/lang/ja/general.php @@ -90,12 +90,12 @@ 'firstname_lastname_format' => '名 姓 (jane.smith@example.com)', 'firstname_lastname_underscore_format' => '名 姓 (jane_smith@example.com)', 'lastnamefirstinitial_format' => '姓 イニシャル（smithj@example.com）', - 'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)', + 'firstintial_dot_lastname_format' => '名のイニシャルと姓 (j.smith@example.com)', 'first' => '最初', - 'firstnamelastname' => 'First Name Last Name (janesmith@example.com)', - 'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)', - 'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)', - 'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)', + 'firstnamelastname' => '名と姓 (janesmith@example.com)', + 'lastname_firstinitial' => '姓と名のイニシャル (smith_j@example.com)', + 'firstinitial.lastname' => '名のイニシャルと姓 (j.smith@example.com)', + 'firstnamelastinitial' => '名のイニシャルと姓 (janes@example.com)', 'first_name' => '姓', 'first_name_format' => '名 (jane@example.com)', 'files' => 'ファイル', @@ -122,7 +122,7 @@ 'asset_maintenances' => '資産管理', 'item' => 'アイテム', 'insufficient_permissions' => '権限が不足しています。', - 'kits' => 'Predefined Kits', + 'kits' => '製品セット', 'language' => '言語', 'last' => '最後', 'last_login' => '最終ログイン', @@ -137,7 +137,7 @@ 'feature_disabled' => 'この機能は、デモインストールでは無効化されています。', 'location' => '設置場所', 'locations' => '設置場所の数', - 'logo_size' => 'Square logos look best with Logo + Text. Logo maximum display size is 50px high x 500px wide. ', + 'logo_size' => '正方形のロゴの場合は、「ロゴ＋文字」で表示されます。ロゴの最大表示サイズは、縦50px×横500pxです。 ', 'logout' => 'ログアウト', 'lookup_by_tag' => '資産タグで参照', 'maintenances' => 'メンテナンス', @@ -176,6 +176,7 @@ 'remove_company' => '会社の団体を取り除く', 'reports' => 'レポート', 'restored' => '復元', + 'restore' => 'Restore', 'requested' => '要求済', 'request_canceled' => 'リクエストキャンセル', 'save' => '保存', @@ -199,7 +200,7 @@ 'sign_in' => 'サインイン', 'signature' => '署名', 'skin' => 'スキン', - 'slack_test_msg' => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!', + 'slack_test_msg' => 'こんにちは！SlackとSnipe-ITの連携がうまくいっているようです！', 'some_features_disabled' => 'デモモード ： いくつかの機能はこのインストールでは無効化されます', 'site_name' => 'サイト名', 'state' => '都道府県', @@ -227,7 +228,7 @@ 'declined' => '却下済', 'unaccepted_asset_report' => '未許可資産', 'users' => '利用者', - 'viewall' => 'View All', + 'viewall' => 'すべて表示', 'viewassets' => '割当済み資産を表示', 'website' => 'ウェブサイト', 'welcome' => 'ようこそ、 :name さん', @@ -236,14 +237,14 @@ 'zip' => '郵便番号', 'noimage' => 'イメージはアップロードされていません または イメージは見つかりませんでした', 'token_expired' => 'セッションが失効しました。再度ログインしてください。', - 'login_enabled' => 'Login Enabled', - 'audit_due' => 'Due for Audit', - 'audit_overdue' => 'Overdue for Audit', - 'accept' => 'Accept :asset', - 'i_accept' => 'I accept', - 'i_decline' => 'I decline', - 'sign_tos' => 'Sign below to indicate that you agree to the terms of service:', - 'clear_signature' => 'Clear Signature', + 'login_enabled' => 'ログイン可能', + 'audit_due' => '監査期日', + 'audit_overdue' => '監査期日を超過', + 'accept' => ':assetを承認', + 'i_accept' => '承認', + 'i_decline' => '却下', + 'sign_tos' => '利用規約に同意された方は、ご署名ください。', + 'clear_signature' => '署名をクリア', 'show_help' => 'ヘルプを表示', 'hide_help' => 'ヘルプを非表示', ]; diff --git a/resources/lang/ko/admin/depreciations/general.php b/resources/lang/ko/admin/depreciations/general.php index 0bfcb1a5cc..f2d4497848 100644 --- a/resources/lang/ko/admin/depreciations/general.php +++ b/resources/lang/ko/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => '감가 상각 명', 'number_of_months' => '개월 수', 'update' => '감가 상각 갱신', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ko/admin/hardware/general.php b/resources/lang/ko/admin/hardware/general.php index 395bf63845..e939831164 100644 --- a/resources/lang/ko/admin/hardware/general.php +++ b/resources/lang/ko/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => '반출 자산', 'clone' => '자산 복제', 'deployable' => '사용가능', - 'deleted' => '이 자산은 삭제되었습니다. 복원하려면 여기를 클릭하세요.', + 'deleted' => 'This asset has been deleted.', 'edit' => '자산 수정', - 'model_deleted' => '이 자산 모델은 삭제되었습니다. 자산을 복원하기 전에 모델을 복원해야 합니다.
모델을 복원하려면 여기를 클릭하세요.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => '요청가능', 'requested' => '요청됨', 'restore' => '자산 복원', diff --git a/resources/lang/ko/admin/models/general.php b/resources/lang/ko/admin/models/general.php index 1f33741f9f..0dc6ef3ab4 100644 --- a/resources/lang/ko/admin/models/general.php +++ b/resources/lang/ko/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => '자산 모델이란', 'about_models_text' => '자산 모델은 동일한 자산들을 그룹화 하는 방법입니다. "MBP 2013", "IPhone 6들", 등등.', - 'deleted' => '이 모델은 삭제되었습니다. 복원 하려면 여기를 클릭하세요.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => '자산 모델 대량 삭제', 'bulk_delete_help' => '선택한 자산 모델의 삭제를 확인하려면 아래 체크박스를 사용하십시오. 자산에 연결된 자산 모델은 자산이 다른 모델과 연결될 때까지 삭제할 수 없습니다.', 'bulk_delete_warn' => '다음을 삭제하려 합니다:model_count asset models.', diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php index 9b55a81224..324cd06fd2 100644 --- a/resources/lang/ko/general.php +++ b/resources/lang/ko/general.php @@ -176,6 +176,7 @@ 'remove_company' => '공급자 연결 제거', 'reports' => '보고서', 'restored' => '복원됨', + 'restore' => 'Restore', 'requested' => '요청됨', 'request_canceled' => '요청 취소', 'save' => '저장', diff --git a/resources/lang/lt/admin/depreciations/general.php b/resources/lang/lt/admin/depreciations/general.php index 97ea5903db..3aada18c1a 100644 --- a/resources/lang/lt/admin/depreciations/general.php +++ b/resources/lang/lt/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nusidėvėjimo pavadinimas', 'number_of_months' => 'Mėnesių skaičius', 'update' => 'Atnaujinti nusidėvėjimą', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/lt/admin/hardware/general.php b/resources/lang/lt/admin/hardware/general.php index d66d2cbb18..31dc14fa9e 100644 --- a/resources/lang/lt/admin/hardware/general.php +++ b/resources/lang/lt/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Patikros turtas', 'clone' => 'Kopijuoti įrangą', 'deployable' => 'Naudojamas', - 'deleted' => 'Ši įranga buvo ištrinta. Paspauskit čia ją atkurti.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Keisti įrangą', - 'model_deleted' => 'Įrangos modelis buvo ištrintas. Jūs privalote atkurti modelį prieš atkurdami įrangą.
Spauskite čia atkurti modelį.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Reiklaujamas', 'requested' => 'Užklausta', 'restore' => 'Atkurti įrangą', diff --git a/resources/lang/lt/admin/models/general.php b/resources/lang/lt/admin/models/general.php index 63b4fbff3c..38f205085f 100644 --- a/resources/lang/lt/admin/models/general.php +++ b/resources/lang/lt/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Apie turto modelius', 'about_models_text' => 'Turto modeliai yra būdas grupuoti identišką turtą. "MBP 2013", "IPhone 6s" ir kt.', - 'deleted' => 'Šis modelis ištrintas. Spauskite atkurti modelį čia.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Ištrinti pažymėtus turto modelius', 'bulk_delete_help' => '„Pažymėkite žemiau esantį langelį, kad patvirtintumėte pasirinktų turto modelių ištrynimą. Turto modeliai, kuriuose yra su jais susijęs turtas, negali būti ištrinti, išskyrus tuos atvejus, kai tas turtas yra susietas su kitu modeliu.“.', 'bulk_delete_warn' => 'Ketinate ištrinti :model_count turto modelius.', diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php index 723936c684..6b530beb05 100644 --- a/resources/lang/lt/general.php +++ b/resources/lang/lt/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Panaikinti kompanijos asociaciją', 'reports' => 'Ataskaitos', 'restored' => 'atkurta', + 'restore' => 'Restore', 'requested' => 'Užklausta', 'request_canceled' => 'Prašymas atšauktas', 'save' => 'Išsaugoti', diff --git a/resources/lang/lv/admin/depreciations/general.php b/resources/lang/lv/admin/depreciations/general.php index 81be6da6f6..f029af4fa4 100644 --- a/resources/lang/lv/admin/depreciations/general.php +++ b/resources/lang/lv/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nolietojuma nosaukums', 'number_of_months' => 'Mēnešu skaits', 'update' => 'Atjaunināt nolietojumu', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/lv/admin/hardware/general.php b/resources/lang/lv/admin/hardware/general.php index 460184019d..de4e26c431 100644 --- a/resources/lang/lv/admin/hardware/general.php +++ b/resources/lang/lv/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Izvietojams', - 'deleted' => 'Šis īpašums ir dzēsts. Noklikšķiniet šeit, lai to atjaunotu.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Rediģēt īpašumu', - 'model_deleted' => 'Šis Assets modelis ir izdzēsts. Jums ir jāatjauno modelis, lai varētu atjaunot Asset.
Noklikšķiniet šeit, lai atjaunotu modeli.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Pieļaujams', 'requested' => 'Pieprasīts', 'restore' => 'Atjaunot aktīvus', diff --git a/resources/lang/lv/admin/models/general.php b/resources/lang/lv/admin/models/general.php index ced11fcd1a..e765e2ce47 100644 --- a/resources/lang/lv/admin/models/general.php +++ b/resources/lang/lv/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Par īpašuma modeļiem', 'about_models_text' => 'Aktīvu modeļi ir veids, kā grupēt identiskus aktīvus. "MBP 2013", "IPhone 6s" uc', - 'deleted' => 'Šis modelis ir dzēsts. Noklikšķiniet šeit, lai to atjaunotu.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Līdzekļu modeļu lielapjoma dzēšana', 'bulk_delete_help' => 'Lai apstiprinātu izvēlēto līdzekļu modeļu dzēšanu, ir jāatzīmē zemāk esošās izvēles rūtiņas. Līdzekļu modeļi, kuriem ir piesaistīti aktīvi, nevar tikt dzēsti, kamēr līdzekļi nav piesaistīti citam modelim.', 'bulk_delete_warn' => 'Tiks dzēsti :model_count līdzekļu modeļi.', diff --git a/resources/lang/lv/general.php b/resources/lang/lv/general.php index 41c4e640d3..18665df6c2 100644 --- a/resources/lang/lv/general.php +++ b/resources/lang/lv/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Noņemt uzņēmumu asociāciju', 'reports' => 'Ziņojumi', 'restored' => 'atjaunots', + 'restore' => 'Restore', 'requested' => 'Pieprasīts', 'request_canceled' => 'Pieprasījums atcelts', 'save' => 'Saglabājiet', diff --git a/resources/lang/mi/admin/depreciations/general.php b/resources/lang/mi/admin/depreciations/general.php index 33cb4fa38a..4a2d2ce4df 100644 --- a/resources/lang/mi/admin/depreciations/general.php +++ b/resources/lang/mi/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Te Ingoa Taweke', 'number_of_months' => 'Tau o Marama', 'update' => 'Whakahouhia te whakahekenga', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/mi/admin/hardware/general.php b/resources/lang/mi/admin/hardware/general.php index 19ec3961da..547cb24461 100644 --- a/resources/lang/mi/admin/hardware/general.php +++ b/resources/lang/mi/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Whakaritehia te Ahua', 'clone' => 'Te Tino Tae', 'deployable' => 'Kaore e taea', - 'deleted' => 'Kua mukua tenei taonga. Kia tuhia ki konei hei whakaora i te reira.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Whakatikahia te Ahua', - 'model_deleted' => 'Kua mukua tenei tauira Ahua. Me whakahou e koe te tauira i mua i to hokinga mai i te Asset.
Kia huri ki konei kia whakahokia mai te tauira.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Ka taea te tuku', 'requested' => 'I tonohia', 'restore' => 'Whakaorangia te Ahua', diff --git a/resources/lang/mi/admin/models/general.php b/resources/lang/mi/admin/models/general.php index 2f8d673db1..31c7a97c58 100644 --- a/resources/lang/mi/admin/models/general.php +++ b/resources/lang/mi/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Mō nga tauira Ahua', 'about_models_text' => 'Ko nga Momo Ahuatanga he huarahi ki te whakariterite i nga rawa taatai. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'Kua mukua tenei tauira. Kua tuhia ki konei hei whakaora i te reira.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/mi/general.php b/resources/lang/mi/general.php index 9159572622..7fc63b38c3 100644 --- a/resources/lang/mi/general.php +++ b/resources/lang/mi/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Tangohia te Kamupene Kamupene', 'reports' => 'Ngā pūrongo', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'I tonohia', 'request_canceled' => 'Tono Whakamutua', 'save' => 'Tiaki', diff --git a/resources/lang/mk/admin/depreciations/general.php b/resources/lang/mk/admin/depreciations/general.php index 753192d1bd..0eed649d9e 100644 --- a/resources/lang/mk/admin/depreciations/general.php +++ b/resources/lang/mk/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Име на амортизационен план', 'number_of_months' => 'Број на месеци', 'update' => 'Ажурирај амортизационен план', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/mk/admin/hardware/general.php b/resources/lang/mk/admin/hardware/general.php index 6a30fcf735..d43d666893 100644 --- a/resources/lang/mk/admin/hardware/general.php +++ b/resources/lang/mk/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Задолжи основно средство', 'clone' => 'Клонирај основно средство', 'deployable' => 'Распоредливи', - 'deleted' => 'Ова средство е избришано. Кликнете овде за да го вратите.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Уредување на основно средство', - 'model_deleted' => 'Овој модел на основни средства е избришан. Мора да го вратите моделот пред да можете да го вратите основното средство.
Кликни тука за да го вратиш моделот.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Може да се побара', 'requested' => 'Побарано', 'restore' => 'Врати основно средство', diff --git a/resources/lang/mk/admin/models/general.php b/resources/lang/mk/admin/models/general.php index 545f6f983b..5638d16580 100644 --- a/resources/lang/mk/admin/models/general.php +++ b/resources/lang/mk/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'За моделите на основни средства', 'about_models_text' => 'Моделите на основни средства служат да се групираат идентични средства. Пр. "IPhone 6s", "ThinkPad T470" итн.', - 'deleted' => 'Овој модел е избришан. Кликнете овде за да го вратите.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Масовно бришење на модели', 'bulk_delete_help' => 'Користете ги полињата подолу за да го потврдите бришењето на избраните модели. Моделите кои имаат основни средства поврзани со нив не може да се избришат додека средствата не се поврзанат со друг модел.', 'bulk_delete_warn' => 'Ќе избришете :model_count модели.', diff --git a/resources/lang/mk/general.php b/resources/lang/mk/general.php index 60a775344a..423b00911d 100644 --- a/resources/lang/mk/general.php +++ b/resources/lang/mk/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Отстрани поврзување со компанија', 'reports' => 'Извештаи', 'restored' => 'вратено', + 'restore' => 'Restore', 'requested' => 'Побарано', 'request_canceled' => 'Барањето е откажано', 'save' => 'Зачувај', diff --git a/resources/lang/ml-IN/admin/depreciations/general.php b/resources/lang/ml-IN/admin/depreciations/general.php index e0b02c009d..e6c86b9ff5 100644 --- a/resources/lang/ml-IN/admin/depreciations/general.php +++ b/resources/lang/ml-IN/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ml-IN/admin/hardware/general.php b/resources/lang/ml-IN/admin/hardware/general.php index c5e5a483a4..80a2c14e50 100644 --- a/resources/lang/ml-IN/admin/hardware/general.php +++ b/resources/lang/ml-IN/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/ml-IN/admin/models/general.php b/resources/lang/ml-IN/admin/models/general.php index 6b38932347..046fd562e2 100644 --- a/resources/lang/ml-IN/admin/models/general.php +++ b/resources/lang/ml-IN/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php index 9bb3f84e44..c1931af8d1 100644 --- a/resources/lang/ml-IN/general.php +++ b/resources/lang/ml-IN/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/mn/admin/depreciations/general.php b/resources/lang/mn/admin/depreciations/general.php index e023a663df..d46c4b0dca 100644 --- a/resources/lang/mn/admin/depreciations/general.php +++ b/resources/lang/mn/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Элэгдэл Нэр', 'number_of_months' => 'Сарын тоо', 'update' => 'Элэгдэл шинэчлэх', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/mn/admin/hardware/general.php b/resources/lang/mn/admin/hardware/general.php index b5437436ab..2a651cefbc 100644 --- a/resources/lang/mn/admin/hardware/general.php +++ b/resources/lang/mn/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Тооцоот Хөрөнгийн', 'clone' => 'Clone Asset', 'deployable' => 'Даалгавартай', - 'deleted' => 'Энэ хөрөнгө устгагдсан байна. Дахин оруулна уу.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Хөрөнгийг засварлах', - 'model_deleted' => 'Энэ активын загвар устгагдсан байна. Хөрөнгийг сэргээхээс өмнө загварыг сэргээх хэрэгтэй.
Загвар-г сэргээхийн тулд энд дарна уу.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Уучлаарай', 'requested' => 'Хүсэлт гаргасан', 'restore' => 'Хөрөнгийг дахин сэргээх', diff --git a/resources/lang/mn/admin/models/general.php b/resources/lang/mn/admin/models/general.php index 37c5819c3d..25d7618d40 100644 --- a/resources/lang/mn/admin/models/general.php +++ b/resources/lang/mn/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Активын загварууд', 'about_models_text' => 'Хөрөнгийн загвар нь ижил төрлийн хөрөнгийг бүлэглэх арга юм. "MBP 2013", "IPhone 6s", гэх мэт.', - 'deleted' => 'Энэ загварыг устгасан. Дахин оруулна уу.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Бөөнөөр хөрөнгийн загварыг устгах', 'bulk_delete_help' => 'Сонгосон хөрөнгийн загварыг устгахыг баталгаажуулж доорх хайрцгийг ашиглана уу. Хөрөнгөтэй холбоотой хөрөнгийн загварыг өөр загвартай холбох хүртэл устгах боломжгүй.', 'bulk_delete_warn' => 'Та :asset_count ширхэг хөрөнгийн загвар устгах гэж байна.', diff --git a/resources/lang/mn/general.php b/resources/lang/mn/general.php index a9f21bb5a2..c59a25acc8 100644 --- a/resources/lang/mn/general.php +++ b/resources/lang/mn/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Компанийн холбоог устгах', 'reports' => 'Тайлан', 'restored' => 'сэргээгдсэн', + 'restore' => 'Restore', 'requested' => 'Хүсэлт гаргасан', 'request_canceled' => 'Хүсэлтийг цуцалсан', 'save' => 'Хадгалах', diff --git a/resources/lang/ms/admin/depreciations/general.php b/resources/lang/ms/admin/depreciations/general.php index bc75e66983..47bf5cc8fd 100644 --- a/resources/lang/ms/admin/depreciations/general.php +++ b/resources/lang/ms/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nama Susut Nilai', 'number_of_months' => 'Bilangan Bulan', 'update' => 'Kemas kini Susutnilai', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ms/admin/hardware/general.php b/resources/lang/ms/admin/hardware/general.php index 6bb40ab7d7..cb6cf33769 100644 --- a/resources/lang/ms/admin/hardware/general.php +++ b/resources/lang/ms/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Aset Checkout', 'clone' => 'Pendua Harta', 'deployable' => 'Deployable', - 'deleted' => 'Aset ini telah dipadamkan. Klik di sini untuk memulihkannya.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Kemaskini Harta', - 'model_deleted' => 'Model Aset ini telah dipadam. Anda mesti memulihkan model sebelum anda boleh memulihkan Asset.
Klik di sini untuk memulihkan model.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Diminta', 'requested' => 'Diminta', 'restore' => 'Pulihkan Asset', diff --git a/resources/lang/ms/admin/models/general.php b/resources/lang/ms/admin/models/general.php index 15aff4021c..9c19dbb476 100644 --- a/resources/lang/ms/admin/models/general.php +++ b/resources/lang/ms/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Mengenai Model Asset', 'about_models_text' => 'Model Aset adalah cara untuk mengumpulkan aset yang sama. "MBP 2013", "IPhone 6s", dan sebagainya.', - 'deleted' => 'Model ini telah dipadamkan. Klik di sini untuk memulihkannya.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Padam Secara Pukal Model Aset', 'bulk_delete_help' => 'Gunakan kotak semakan di bawah untuk mengesahkan penghapusan model aset terpilih. Model aset yang mempunyai aset yang berkaitan dengannya tidak boleh dihapuskan sehingga aset dikaitkan dengan model yang berbeza.', 'bulk_delete_warn' => 'Anda akan hapus :model_count model aset.', diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php index d80b154c36..feedcf5a0b 100644 --- a/resources/lang/ms/general.php +++ b/resources/lang/ms/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Keluarkan Persatuan Syarikat', 'reports' => 'Laporan', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Diminta', 'request_canceled' => 'Permintaan Dibatalkan', 'save' => 'Simpan', diff --git a/resources/lang/nl/admin/depreciations/general.php b/resources/lang/nl/admin/depreciations/general.php index 72ee8bccbd..52c5026280 100644 --- a/resources/lang/nl/admin/depreciations/general.php +++ b/resources/lang/nl/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Afschrijvingsnaam', 'number_of_months' => 'Aantal maanden', 'update' => 'Afschrijving bijwerken', + 'depreciation_min' => 'Minimale waarde na afschrijving' ]; diff --git a/resources/lang/nl/admin/hardware/general.php b/resources/lang/nl/admin/hardware/general.php index 1f3d46a949..682774805a 100644 --- a/resources/lang/nl/admin/hardware/general.php +++ b/resources/lang/nl/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Asset uitchecken', 'clone' => 'Dupliceer Asset', 'deployable' => 'Uitgeefbaar', - 'deleted' => 'Dit asset is verwijderd. Klik hier om het te herstellen.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Asset bewerken', - 'model_deleted' => 'Dit Assets model is verwijderd. U moet het model herstellen voordat u het Asset kunt herstellen.
Klik hier om het model te herstellen.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Aanvraagbaar', 'requested' => 'Aangevraagd', 'restore' => 'Herstel Asset', diff --git a/resources/lang/nl/admin/models/general.php b/resources/lang/nl/admin/models/general.php index 90b2dfbae6..968b1a447b 100644 --- a/resources/lang/nl/admin/models/general.php +++ b/resources/lang/nl/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Over Asset Modellen', 'about_models_text' => 'Assetmodellen zijn een manier om identieke assets te groeperen. "MBP 2013", "iPhone 6s", enz.', - 'deleted' => 'Dit asset is verwijderd. Klik hier om het te herstellen.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'In bulk verwijderen van assetmodellen', 'bulk_delete_help' => 'Gebruik de selectievakjes hieronder om het verwijderen van de geselecteerde assetmodellen te bevestigen. Assetmodellen waarbij assets gekoppeld zijn, kunnen niet verwijderd worden totdat de assets gekoppeld zijn aan een ander model.', 'bulk_delete_warn' => 'Je staat op het punt om :model_count assetmodellen te verwijderen.', diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php index 4a8240a1af..da5f9cad49 100644 --- a/resources/lang/nl/general.php +++ b/resources/lang/nl/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Verwijder bedrijfsverbinding', 'reports' => 'Rapporten', 'restored' => 'hersteld', + 'restore' => 'Restore', 'requested' => 'Aangevraagd', 'request_canceled' => 'Aanvraag geannuleerd', 'save' => 'Opslaan', diff --git a/resources/lang/no/admin/depreciations/general.php b/resources/lang/no/admin/depreciations/general.php index 0aef1ff615..52fc626c44 100644 --- a/resources/lang/no/admin/depreciations/general.php +++ b/resources/lang/no/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Avskrivningsnavn', 'number_of_months' => 'Antall måneder', 'update' => 'Oppdater avskrivninger', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/no/admin/hardware/general.php b/resources/lang/no/admin/hardware/general.php index 2360993d3f..24d4968171 100644 --- a/resources/lang/no/admin/hardware/general.php +++ b/resources/lang/no/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Sjekk ut asset', 'clone' => 'Klon eiendel', 'deployable' => 'Utleverbar', - 'deleted' => 'Denne eiendelen har blitt slettet. Klikk for å gjenopprette den.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Rediger eiendel', - 'model_deleted' => 'Denne eiendelsmodellen er slettet. Du må gjenopprette modellen før du kan gjenopprette eiendelen.
Klikk her for å gjenopprette modellen.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Forespørrbar', 'requested' => 'Forespurt', 'restore' => 'Gjenopprett eiendel', diff --git a/resources/lang/no/admin/models/general.php b/resources/lang/no/admin/models/general.php index ea633beeee..f8c759668a 100644 --- a/resources/lang/no/admin/models/general.php +++ b/resources/lang/no/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Om asset modeller', 'about_models_text' => 'Asset modeller er en måte å gruppere identiske eiendeler. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'Denne modellen er slettet. Klikk her for å gjenopprette.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk slett modeller', 'bulk_delete_help' => 'Bruk merkeboksene nedenfor til å bekrefte sletting av de merkede modellene. Modeller som har eiendeler tilknyttet kan ikke slettes før eiendelene har blitt tilknyttet en annen modell.', 'bulk_delete_warn' => 'Du er i ferd med å slette :model_count modeller.', diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php index 8a6fb4a8bd..68bf2f669e 100644 --- a/resources/lang/no/general.php +++ b/resources/lang/no/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Fjern tilknytning til bedrift', 'reports' => 'Rapporter', 'restored' => 'gjenopprettet', + 'restore' => 'Restore', 'requested' => 'Forespurt', 'request_canceled' => 'Forespørsel avbrutt', 'save' => 'Lagre', diff --git a/resources/lang/pl/admin/depreciations/general.php b/resources/lang/pl/admin/depreciations/general.php index 00d5c5983c..2eac13ae62 100644 --- a/resources/lang/pl/admin/depreciations/general.php +++ b/resources/lang/pl/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nazwa amortyzacji', 'number_of_months' => 'Numer miesiąca', 'update' => 'Aktualizuj amortyzację', + 'depreciation_min' => 'Minimalna wartość po spadku wartości' ]; diff --git a/resources/lang/pl/admin/hardware/general.php b/resources/lang/pl/admin/hardware/general.php index 1b63c2bd2e..724b589d28 100644 --- a/resources/lang/pl/admin/hardware/general.php +++ b/resources/lang/pl/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Przypisz zasób', 'clone' => 'Klonuj zasób', 'deployable' => 'Gotowe do wdrożenia', - 'deleted' => 'To aktywo zostało usunięte. Kliknij tutaj, aby je przywrócić.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edytuj zasób', - 'model_deleted' => 'Model aktywa został usunięty. Należy przywrócić model przed przywróceniem aktywa.
Kliknij tutaj aby przywrócić model/.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Żądane', 'requested' => 'Zamówione', 'restore' => 'Przywróć aktywa', diff --git a/resources/lang/pl/admin/models/general.php b/resources/lang/pl/admin/models/general.php index 5aaf261134..4ca81431e3 100644 --- a/resources/lang/pl/admin/models/general.php +++ b/resources/lang/pl/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'O Modelach aktywów', 'about_models_text' => 'Modele aktywów są sposobem grupowania identycznych aktywów. "MBP 2013", "IPhone 6s", itp.', - 'deleted' => 'Model został usunięty. Kliknij aby przywrócić.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Zbiorcze usuwanie modeli aktywów', 'bulk_delete_help' => 'Użyj poniższych pól wyboru, aby potwierdzić usunięcie wybranych modeli zasobów. Modele zasobów z którymi są powiązane zasoby, nie mogą zostać usunięte, dopóki zasoby nie zostaną powiązane z innym modelem.', 'bulk_delete_warn' => 'Zamierzasz usunąć :model_count modeli aktywów.', diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php index 3950bd7a32..1a2d5f6052 100644 --- a/resources/lang/pl/general.php +++ b/resources/lang/pl/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Usuń powiązanie firmy', 'reports' => 'Raporty', 'restored' => 'przywrócone', + 'restore' => 'Restore', 'requested' => 'Wymagane', 'request_canceled' => 'Żądanie anulowane', 'save' => 'Zapisz', diff --git a/resources/lang/pl/mail.php b/resources/lang/pl/mail.php index 4ffe0200a7..4afcf9eaeb 100644 --- a/resources/lang/pl/mail.php +++ b/resources/lang/pl/mail.php @@ -9,7 +9,7 @@ return [ 'asset' => 'Sprzęt:', 'asset_name' => 'Nazwa sprzętu:', 'asset_requested' => 'Wystosowane zapotrzebowanie na sprzęt', - 'asset_tag' => 'Artykół Tag', + 'asset_tag' => 'Tag sprzętu', 'assigned_to' => 'Przypisane do', 'best_regards' => 'Pozdrawiam', 'canceled' => 'Anulowane:', diff --git a/resources/lang/pt-BR/admin/depreciations/general.php b/resources/lang/pt-BR/admin/depreciations/general.php index fdc1c0b9c8..7ac2824084 100644 --- a/resources/lang/pt-BR/admin/depreciations/general.php +++ b/resources/lang/pt-BR/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nome da Depreciação', 'number_of_months' => 'Número de Meses', 'update' => 'Atualizar Depreciação', + 'depreciation_min' => 'Valor Mínimo após Depreciação' ]; diff --git a/resources/lang/pt-BR/admin/hardware/general.php b/resources/lang/pt-BR/admin/hardware/general.php index e17dcf1539..9f85a25965 100644 --- a/resources/lang/pt-BR/admin/hardware/general.php +++ b/resources/lang/pt-BR/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout de Ativo', 'clone' => 'Clonar Ativo', 'deployable' => 'Implementável', - 'deleted' => 'Este ativo foi excluído. Clique aqui para restaurá-lo.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Editar Ativo', - 'model_deleted' => 'Este modelo de Ativos foi excluído. Você deve restaurar o modelo antes de restaurar o Ativo.
Clique aqui para restaurar o modelo.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Solicitável', 'requested' => 'Solicitado', 'restore' => 'Restaurar Ativo', diff --git a/resources/lang/pt-BR/admin/models/general.php b/resources/lang/pt-BR/admin/models/general.php index 4e52e9ed83..a7298d6fc3 100644 --- a/resources/lang/pt-BR/admin/models/general.php +++ b/resources/lang/pt-BR/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Sobre os Modelos de Ativos', 'about_models_text' => 'Os Modelos dos ativos são uma maneira para agrupar ativos idênticos. "MBP 2013", "iPhone 6s", etc.', - 'deleted' => 'Este modelo foi excluído. Clique aqui para o restaurar.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk deletar modelos de ativos', 'bulk_delete_help' => 'Use a caixa abaixo para confirmar a exlusão dos modelos de ativos selecionados. Modelos de ativos que tem ativos associados a eles não podem ser deletados a não ser que esses ativos sejam associados a um modelo diferente.', 'bulk_delete_warn' => 'Você está prestes a exluir :model_count asset models.', diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php index 7a5d333efc..535f920d1e 100644 --- a/resources/lang/pt-BR/general.php +++ b/resources/lang/pt-BR/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remover associação de empresa', 'reports' => 'Relatórios', 'restored' => 'restaurado', + 'restore' => 'Restore', 'requested' => 'Solicitado', 'request_canceled' => 'Pedido cancelado', 'save' => 'Salvar', diff --git a/resources/lang/pt-PT/admin/depreciations/general.php b/resources/lang/pt-PT/admin/depreciations/general.php index 3e7f143807..e5ddf2d6c9 100644 --- a/resources/lang/pt-PT/admin/depreciations/general.php +++ b/resources/lang/pt-PT/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nome da depreciação', 'number_of_months' => 'Número de mêses', 'update' => 'Actualizar depreciação', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/pt-PT/admin/hardware/general.php b/resources/lang/pt-PT/admin/hardware/general.php index eb6291d702..0f3413c8c1 100644 --- a/resources/lang/pt-PT/admin/hardware/general.php +++ b/resources/lang/pt-PT/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Ativo de compras', 'clone' => 'Clonar Ativo', 'deployable' => 'Implementável', - 'deleted' => 'Este ativo foi removido. Clique aqui para restaurar.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Editar artigo', - 'model_deleted' => 'Este modelo de ativo foi removido. Deve restaurar o modelo para poder restaurar o Ativo.
Clique aqui para restaurar o modelo.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Solicitavel', 'requested' => 'Requisitado', 'restore' => 'Restaurar ativo', diff --git a/resources/lang/pt-PT/admin/models/general.php b/resources/lang/pt-PT/admin/models/general.php index b941b7ac22..31dc2787d9 100644 --- a/resources/lang/pt-PT/admin/models/general.php +++ b/resources/lang/pt-PT/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Sobre os modelos dos artigos', 'about_models_text' => 'Os Modelos dos artigos são uma maneira para agrupar artigos idênticos. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'O modelo foi removido. Clique aqui para o restaurar.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Eliminar modelos de artigos em massa', 'bulk_delete_help' => 'Use as caixas de selecção abaixo para confirmar a eliminação dos modelos de artigos selecionados. Modelos de artigos que contenham artigos associados não serão eliminados até que estes artigos sejam associados a um modelo diferente.', 'bulk_delete_warn' => 'Esta prestes a eliminar :model_count modelos de artigos.', diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php index 824fc8598c..aac569c5a9 100644 --- a/resources/lang/pt-PT/general.php +++ b/resources/lang/pt-PT/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remover associação de empresa', 'reports' => 'Relatórios', 'restored' => 'restaurado', + 'restore' => 'Restore', 'requested' => 'Solicitado', 'request_canceled' => 'Pedido cancelado', 'save' => 'Guardar', diff --git a/resources/lang/ro/admin/depreciations/general.php b/resources/lang/ro/admin/depreciations/general.php index 72ae25fe88..abb9360175 100644 --- a/resources/lang/ro/admin/depreciations/general.php +++ b/resources/lang/ro/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Nume depreciere', 'number_of_months' => 'Numarul de luni', 'update' => 'Actualizați amortizarea', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ro/admin/hardware/general.php b/resources/lang/ro/admin/hardware/general.php index c0997717fc..fd01e1ab75 100644 --- a/resources/lang/ro/admin/hardware/general.php +++ b/resources/lang/ro/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Cloneaza activ', 'deployable' => 'Lansabil', - 'deleted' => 'Acest activ a fost șters. Faceți clic aici pentru a le restabili.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Editeaza activ', - 'model_deleted' => 'Acest model de Active a fost șters. Trebuie să restabiliți modelul înainte de a putea să-l restabiliți. 123_45_0_321 Faceți clic aici pentru a restabili modelul.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Solicitat', 'restore' => 'Restabilirea activului', diff --git a/resources/lang/ro/admin/models/general.php b/resources/lang/ro/admin/models/general.php index dd3d631db2..35cc654b4a 100644 --- a/resources/lang/ro/admin/models/general.php +++ b/resources/lang/ro/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Despre modelele de active', 'about_models_text' => 'Modelele de activ sunt o modalitate de a grupa active identice. "MBP 2013", "iPhone 6s" etc.', - 'deleted' => 'Modelul a fost sters. Apasati aici pentru a-l restaura.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Stergere in masa a modelelor de echipamente', 'bulk_delete_help' => 'Utilizați casetele de selectare de mai jos pentru a confirma ștergerea modelelor de echipamente selectate. Modelele care au echipamente asociate cu acestea nu pot fi șterse până când activele nu sunt asociate cu un alt model.', 'bulk_delete_warn' => 'Sunteți pe cale să ștergeți modelul de echipament: model_count.', diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php index b3bb5f76e4..b38d257a6c 100644 --- a/resources/lang/ro/admin/settings/general.php +++ b/resources/lang/ro/admin/settings/general.php @@ -43,13 +43,13 @@ return [ 'display_eol' => 'Arata EOL in tabel', 'display_qr' => 'Afișați codurile pătrată', 'display_alt_barcode' => 'Afișați coduri de bare 1D', - 'email_logo' => 'Email Logo', + 'email_logo' => 'Logo e-mail', 'barcode_type' => 'Tip de cod de bare 2D', 'alt_barcode_type' => 'Tip de cod de bare 1D', 'email_logo_size' => 'Square logos in email look best. ', 'eula_settings' => 'Setările EULA', 'eula_markdown' => 'Această licență EULA permite Github aromdown markdown.', - 'favicon' => 'Favicon', + 'favicon' => 'Pictogramă', 'favicon_format' => 'Accepted filetypes are ico, png, and gif. Other image formats may not work in all browsers.', 'favicon_size' => 'Favicons should be square images, 16x16 pixels.', 'footer_text' => 'Textul suplimentar în subsol ', @@ -58,7 +58,7 @@ return [ 'generate_backup' => 'Generați Backup', 'header_color' => 'Culoarea antetului', 'info' => 'Aceste setari va lasa sa modificati anumite aspecte ale instalarii.', - 'label_logo' => 'Label Logo', + 'label_logo' => 'Sigla etichetei', 'label_logo_size' => 'Square logos look best - will be displayed in the top right of each asset label. ', 'laravel' => 'Versiune Laravel', 'ldap_enabled' => 'LDAP activat', diff --git a/resources/lang/ro/admin/users/general.php b/resources/lang/ro/admin/users/general.php index ff390201a0..4a1e070ffd 100644 --- a/resources/lang/ro/admin/users/general.php +++ b/resources/lang/ro/admin/users/general.php @@ -1,7 +1,8 @@ 'This user can login', + +return array( + 'activated_help_text' => 'Acest utilizator se poate conecta', 'activated_disabled_help_text' => 'You cannot edit activation status for your own account.', 'assets_user' => 'Activul desemnat catre :name', 'bulk_update_warn' => 'Sunteți pe punctul de a edita proprietățile utilizatorilor: user_count. Rețineți că nu puteți modifica propriile atribute ale utilizatorilor utilizând acest formular și trebuie să efectuați modificări individuale ale propriului dvs. utilizator.', @@ -12,7 +13,7 @@ return [ 'edit' => 'Editeaza utilizator', 'filetype_info' => 'Tipurile de fișiere permise sunt png, gif, jpg, jpeg, doc, docx, pdf, txt, zip și rar.', 'history_user' => 'Istoric pentru :name', - 'info' => 'Info', + 'info' => 'Info', 'restore_user' => 'Faceți clic aici pentru a le restaura.', 'last_login' => 'Ultima logare', 'ldap_config_text' => 'Setările de configurare LDAP pot fi găsite pe Administrator> Setări. Locația selectată (opțional) va fi setată pentru toți utilizatorii importați.', @@ -24,4 +25,4 @@ return [ 'two_factor_admin_optin_help' => 'Setările dvs. actuale de administrare permit executarea selectivă a autentificării cu două factori.', 'two_factor_enrolled' => 'Dispozitivul 2FA Înregistrat', 'two_factor_active' => '2FA Active', - ]; + ); diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php index c22a52280c..d13bb7987e 100644 --- a/resources/lang/ro/general.php +++ b/resources/lang/ro/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Eliminați asocierea companiilor', 'reports' => 'Rapoarte', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Cereri', 'request_canceled' => 'Cerere anulată', 'save' => 'Salveaza', diff --git a/resources/lang/ru/admin/depreciations/general.php b/resources/lang/ru/admin/depreciations/general.php index 1b29636370..325ce7fddd 100644 --- a/resources/lang/ru/admin/depreciations/general.php +++ b/resources/lang/ru/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Название амортизации', 'number_of_months' => 'Количество месяцев', 'update' => 'Обновить амортизацию', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ru/admin/hardware/general.php b/resources/lang/ru/admin/hardware/general.php index a153f78548..5ef3078a4a 100644 --- a/resources/lang/ru/admin/hardware/general.php +++ b/resources/lang/ru/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Выдать актив пользователю', 'clone' => 'Клонировать актив', 'deployable' => 'Доступные', - 'deleted' => 'Этот актив был удален. Нажмите, чтобы восстановить.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Редактировать актив', - 'model_deleted' => 'Эта модель актива была удалена. Необходимо сначала восстановить модель актива прежде чем восстанавливать сам актив.
Нажмите здесь, чтобы восстановить модель.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Готов к выдаче', 'requested' => 'Запрошенное', 'restore' => 'Восстановить актив', diff --git a/resources/lang/ru/admin/models/general.php b/resources/lang/ru/admin/models/general.php index 8fbc01e29f..a819224085 100644 --- a/resources/lang/ru/admin/models/general.php +++ b/resources/lang/ru/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'О моделях активов', 'about_models_text' => 'Модели активов это способ группировки идентичных активов. Например, "MacBookPro 2013, iPhone 6s", и т. д.', - 'deleted' => 'Эта модель была удалена. Нажмите здесь, чтобы восстановить.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Массовое удаление моделей активов', 'bulk_delete_help' => 'Установите флажки ниже, чтобы подтвердить удаление выбранных моделей активов. Модели, имеющие связанные с ними активы, не могут быть удалены до тех пор, пока активы не будут связаны с другой моделью.', 'bulk_delete_warn' => 'Вы собираетесь удалить :model_count моделей активов.', diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php index bc63098f37..2701edde03 100644 --- a/resources/lang/ru/general.php +++ b/resources/lang/ru/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Удалить привязку компании', 'reports' => 'Отчеты', 'restored' => 'восстановлено', + 'restore' => 'Restore', 'requested' => 'Запрошено', 'request_canceled' => 'Запрос отменен', 'save' => 'Сохранить', diff --git a/resources/lang/ru/mail.php b/resources/lang/ru/mail.php index 4847e51934..a78e59fba6 100644 --- a/resources/lang/ru/mail.php +++ b/resources/lang/ru/mail.php @@ -20,10 +20,10 @@ return [ 'click_on_the_link_asset' => 'Пожалуйста, перейдите по ссылке внизу, чтобы подтвердить получение актива.', 'Confirm_Asset_Checkin' => 'Подтверждение возврата активов', 'Confirm_Accessory_Checkin' => 'Подтвердить возврат аксессуара', - 'Confirm_accessory_delivery' => 'Accessory delivery confirmation', - 'Confirm_license_delivery' => 'License delivery confirmation', - 'Confirm_asset_delivery' => 'Asset delivery confirmation', - 'Confirm_consumable_delivery' => 'Consumable delivery confirmation', + 'Confirm_accessory_delivery' => 'Подтвердить доставку аксессуара', + 'Confirm_license_delivery' => 'Подтвердите получение лицензии', + 'Confirm_asset_delivery' => 'Подтвердить доставку актива', + 'Confirm_consumable_delivery' => 'Подтвердить доставку расходников', 'current_QTY' => 'Текущее количество', 'Days' => 'Дни', 'days' => 'Дни', diff --git a/resources/lang/si-LK/admin/depreciations/general.php b/resources/lang/si-LK/admin/depreciations/general.php index 1fca0e2cb7..a5dec994c2 100644 --- a/resources/lang/si-LK/admin/depreciations/general.php +++ b/resources/lang/si-LK/admin/depreciations/general.php @@ -8,5 +8,6 @@ return array( 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ); diff --git a/resources/lang/si-LK/admin/hardware/general.php b/resources/lang/si-LK/admin/hardware/general.php index f1fcd4731e..af2be65fc6 100644 --- a/resources/lang/si-LK/admin/hardware/general.php +++ b/resources/lang/si-LK/admin/hardware/general.php @@ -10,9 +10,9 @@ return array( 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/si-LK/admin/models/general.php b/resources/lang/si-LK/admin/models/general.php index 3281cfe0fc..d2d77e0e8c 100644 --- a/resources/lang/si-LK/admin/models/general.php +++ b/resources/lang/si-LK/admin/models/general.php @@ -3,7 +3,7 @@ return array( 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/si-LK/general.php b/resources/lang/si-LK/general.php index 539a01a13f..446957c9a5 100644 --- a/resources/lang/si-LK/general.php +++ b/resources/lang/si-LK/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/sk/admin/depreciations/general.php b/resources/lang/sk/admin/depreciations/general.php index 60ffbdcc86..8f8250c0e8 100644 --- a/resources/lang/sk/admin/depreciations/general.php +++ b/resources/lang/sk/admin/depreciations/general.php @@ -8,5 +8,6 @@ return array( 'depreciation_name' => 'Názov odpisovania', 'number_of_months' => 'Počet mesiacov', 'update' => 'Upraviť odpisovanie', + 'depreciation_min' => 'Minimum Value after Depreciation' ); diff --git a/resources/lang/sk/admin/hardware/general.php b/resources/lang/sk/admin/hardware/general.php index f33503a594..4eafc6bf6a 100644 --- a/resources/lang/sk/admin/hardware/general.php +++ b/resources/lang/sk/admin/hardware/general.php @@ -10,9 +10,9 @@ return array( 'checkout' => 'Vyskladniť majetok', 'clone' => 'Duplikovať majetok', 'deployable' => 'Vyskladniteľný', - 'deleted' => 'Tento majetok bol odstránený. Kliknite sem pre jeho obnovenie.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Upraviť majetok', - 'model_deleted' => 'Tento model majetku bol odstránený. Pred obnovením majetku musíte najprv obnoviť model.
Pre obnovenie modelu kliknite sem.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Vyžiadateľný', 'requested' => 'Vyžiadané', 'restore' => 'Obnoviť majetok', diff --git a/resources/lang/sk/admin/models/general.php b/resources/lang/sk/admin/models/general.php index 3281cfe0fc..d2d77e0e8c 100644 --- a/resources/lang/sk/admin/models/general.php +++ b/resources/lang/sk/admin/models/general.php @@ -3,7 +3,7 @@ return array( 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/sk/general.php b/resources/lang/sk/general.php index 539a01a13f..446957c9a5 100644 --- a/resources/lang/sk/general.php +++ b/resources/lang/sk/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/sl/admin/depreciations/general.php b/resources/lang/sl/admin/depreciations/general.php index 4ca4be5acc..2710cccf87 100644 --- a/resources/lang/sl/admin/depreciations/general.php +++ b/resources/lang/sl/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Ime amortizacije', 'number_of_months' => 'Število mesecev', 'update' => 'Posodobi amortizacijo', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/sl/admin/hardware/general.php b/resources/lang/sl/admin/hardware/general.php index ca9d916e0a..0eee65ec5d 100644 --- a/resources/lang/sl/admin/hardware/general.php +++ b/resources/lang/sl/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Izdaja sredstev', 'clone' => 'Klonska sredstvo', 'deployable' => 'Razdeljeno', - 'deleted' => 'To sredstvo je bilo izbrisano. Kliknite tukaj, da ga obnovite.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Urejanje sredstva', - 'model_deleted' => 'Ta model sredsteva je bil izbrisan. Pred obnovitvijo sredstva morate obnoviti model.
Kliknite tukaj, da obnovite model.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Zahtevano', 'requested' => 'Zahtevano', 'restore' => 'Obnovitev sredstev', diff --git a/resources/lang/sl/admin/models/general.php b/resources/lang/sl/admin/models/general.php index 94efac83d1..f78ee3924b 100644 --- a/resources/lang/sl/admin/models/general.php +++ b/resources/lang/sl/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'O modelih sredstev', 'about_models_text' => 'Modeli sredstev so način za združevanje identičnih sredstev. "MBP 2013", "IPhone 6s" itd.', - 'deleted' => 'Ta model je bil izbrisan. Kliknite tukaj, da ga obnovite.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Množično brisanje modelov sredstva', 'bulk_delete_help' => 'S potrditvenimi polji spodaj potrdite izbris izbranih modelov sredstev. Modelov sredstev, ki imajo z njimi povezana sredstva, ni mogoče izbrisati, dokler sredstva niso povezana z drugačnim modelom.', 'bulk_delete_warn' => 'Izbrisali boste :modelov_count modelov sredstev.', diff --git a/resources/lang/sl/general.php b/resources/lang/sl/general.php index 518ecc9f6b..3ffcb52d7c 100644 --- a/resources/lang/sl/general.php +++ b/resources/lang/sl/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Odstrani povezavo do podjetja', 'reports' => 'Poročila', 'restored' => 'obnovljena', + 'restore' => 'Restore', 'requested' => 'Zahtevano', 'request_canceled' => 'Zahteva je bila preklicana', 'save' => 'Shrani', diff --git a/resources/lang/sr-CS/admin/accessories/message.php b/resources/lang/sr-CS/admin/accessories/message.php index f80643a3f4..223354ebf7 100644 --- a/resources/lang/sr-CS/admin/accessories/message.php +++ b/resources/lang/sr-CS/admin/accessories/message.php @@ -2,7 +2,7 @@ return [ - 'does_not_exist' => 'The accessory [:id] does not exist.', + 'does_not_exist' => 'Pribor [:Id] ne postoji.', 'assoc_users' => 'Ovaj pribor trenutno ima :count stavku označenu korisnicima. Proverite pribor i pokušajte ponovo. ', 'create' => [ diff --git a/resources/lang/sr-CS/admin/asset_maintenances/general.php b/resources/lang/sr-CS/admin/asset_maintenances/general.php index 1c40317774..381b7cf3ff 100644 --- a/resources/lang/sr-CS/admin/asset_maintenances/general.php +++ b/resources/lang/sr-CS/admin/asset_maintenances/general.php @@ -9,6 +9,6 @@ 'maintenance' => 'Održavanje', 'upgrade' => 'Nadogradnja', 'calibration' => 'Calibration', - 'software_support' => 'Software Support', - 'hardware_support' => 'Hardware Support', + 'software_support' => 'Podrška Softver', + 'hardware_support' => 'Podrška Hardware', ]; diff --git a/resources/lang/sr-CS/admin/depreciations/general.php b/resources/lang/sr-CS/admin/depreciations/general.php index 6cefe0cea8..8456f982a2 100644 --- a/resources/lang/sr-CS/admin/depreciations/general.php +++ b/resources/lang/sr-CS/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Naziv amortizacije', 'number_of_months' => 'Broj meseci', 'update' => 'Ažuriraj amortizaciju', + 'depreciation_min' => 'Minimalna vrednost nakon amortizacije' ]; diff --git a/resources/lang/sr-CS/admin/hardware/general.php b/resources/lang/sr-CS/admin/hardware/general.php index cf89f0bb4c..dac9370175 100644 --- a/resources/lang/sr-CS/admin/hardware/general.php +++ b/resources/lang/sr-CS/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Kloniraj imovinu', 'deployable' => 'Može se razmestiti', - 'deleted' => 'Ova je imovina izbrisana. Kliknite ovdje da biste je vratili.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Uređivanje imovine', - 'model_deleted' => 'Model ove stavke je izbrisan. Morate vratiti model prije nego što vratite Asset.
Kliknite ovde da biste vratili model.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Može da se potražuje', 'requested' => 'Zatraženo', 'restore' => 'Restore Asset', diff --git a/resources/lang/sr-CS/admin/models/general.php b/resources/lang/sr-CS/admin/models/general.php index c59854046c..4b42fe6229 100644 --- a/resources/lang/sr-CS/admin/models/general.php +++ b/resources/lang/sr-CS/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'O modelu imovine', 'about_models_text' => 'Modeli imovine su način grupisanja identične imovine. "MBP 2013", "IPhone 6s" itd.', - 'deleted' => 'Ovaj je model izbrisan. Kliknite ovde da biste ga vratili.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Skupno brisanje modela imovine', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'Želite da obrišete :model_count asset models.', diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php index ed3237cb9c..7490d61347 100644 --- a/resources/lang/sr-CS/general.php +++ b/resources/lang/sr-CS/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Ukloni asocijaciju sa firmom', 'reports' => 'Izveštaji', 'restored' => 'vraćeno u prethodno stanje', + 'restore' => 'Restore', 'requested' => 'Tražena', 'request_canceled' => 'Zahtev je otkazan', 'save' => 'Sačuvaj', diff --git a/resources/lang/sv-SE/admin/depreciations/general.php b/resources/lang/sv-SE/admin/depreciations/general.php index c96f70bcfe..d30c3dcbb2 100644 --- a/resources/lang/sv-SE/admin/depreciations/general.php +++ b/resources/lang/sv-SE/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Avskrivningsnamn', 'number_of_months' => 'Antal Månader', 'update' => 'Uppdatera avskrivningar', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/sv-SE/admin/hardware/general.php b/resources/lang/sv-SE/admin/hardware/general.php index 832949dc7c..cb24dd856b 100644 --- a/resources/lang/sv-SE/admin/hardware/general.php +++ b/resources/lang/sv-SE/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Klon tillgång', 'deployable' => 'Deployable', - 'deleted' => 'Den här tillgången har tagits bort. Klicka här för att återställa det.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Redigera tillgång', - 'model_deleted' => 'Denna tillgångsmodell har raderats. Du måste återställa modellen innan du kan återställa Asset.
Klick här för att återställa modellen.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Tillgängliga', 'requested' => 'Begärda', 'restore' => 'Återställ tillgången', diff --git a/resources/lang/sv-SE/admin/models/general.php b/resources/lang/sv-SE/admin/models/general.php index 193d00c4c5..f0de34fe44 100644 --- a/resources/lang/sv-SE/admin/models/general.php +++ b/resources/lang/sv-SE/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Om modeller', 'about_models_text' => 'Modeller är ett sätt att gruppera identiska tillgångar. "Galaxy S20", "iPhone 12", etc.', - 'deleted' => 'Den här modellen har tagits bort. Klicka här för att återskapa.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Radera modeller', 'bulk_delete_help' => 'Använd kryssrutan här under för att bekräfta borttagning av valda modeller. Modeller som har tillgångar kopplade till sig kan inte raderas innan dessa är kopplade till en annan modell.', 'bulk_delete_warn' => 'Du håller på att ta bort: model_count modeller.', diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php index 419182bdf6..a7372e83b4 100644 --- a/resources/lang/sv-SE/general.php +++ b/resources/lang/sv-SE/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Ta bort företagsföreningen', 'reports' => 'Rapporter', 'restored' => 'återställd', + 'restore' => 'Restore', 'requested' => 'Begärda', 'request_canceled' => 'Förfrågan annulleras', 'save' => 'Spara', diff --git a/resources/lang/ta/admin/depreciations/general.php b/resources/lang/ta/admin/depreciations/general.php index bbcc9bdd3e..410cdf8acc 100644 --- a/resources/lang/ta/admin/depreciations/general.php +++ b/resources/lang/ta/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'தேய்மானி பெயர்', 'number_of_months' => 'மாதங்களின் எண்ணிக்கை', 'update' => 'தேய்மானம் புதுப்பிக்கவும்', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ta/admin/hardware/general.php b/resources/lang/ta/admin/hardware/general.php index 113c9ff190..c4f78bc7a6 100644 --- a/resources/lang/ta/admin/hardware/general.php +++ b/resources/lang/ta/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'சரிபார்ப்புச் சொத்து', 'clone' => 'குளோன் சொத்து', 'deployable' => 'அணியப்படுத்தக்', - 'deleted' => 'இந்த சொத்து நீக்கப்பட்டது. அதை மீட்டமைக்க இங்கு கிளிக் செய்க. .', + 'deleted' => 'This asset has been deleted.', 'edit' => 'சொத்து திருத்து', - 'model_deleted' => 'இந்த சொத்து மாடல் நீக்கப்பட்டது. நீங்கள் சொத்து மீட்டமைக்கப்படுவதற்கு முன் மாடலை நீங்கள் மீட்டெடுக்க வேண்டும்.
model ஐ மீட்டமைக்க இங்கே கிளிக் செய்க.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'கோரப்பட்டது', 'restore' => 'சொத்து மீட்டமை', diff --git a/resources/lang/ta/admin/models/general.php b/resources/lang/ta/admin/models/general.php index 04bb24352f..4eb03f9dde 100644 --- a/resources/lang/ta/admin/models/general.php +++ b/resources/lang/ta/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'சொத்து மாடல்களைப் பற்றி', 'about_models_text' => 'சொத்து மாதிரிகள் ஒரே மாதிரியான சொத்துக்களை குழுவாக மாற்றுகின்றன. "MBP 2013", "ஐபோன் 6s", முதலியன', - 'deleted' => 'இந்த மாதிரி நீக்கப்பட்டது. அதை மீட்டமைக்க இங்கு கிளிக் செய்க. .', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/ta/general.php b/resources/lang/ta/general.php index 092446f6f0..691290674b 100644 --- a/resources/lang/ta/general.php +++ b/resources/lang/ta/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'நிறுவன சங்கத்தை அகற்று', 'reports' => 'அறிக்கைகள்', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'கோரப்பட்டது', 'request_canceled' => 'கோரிக்கை ரத்து செய்யப்பட்டது', 'save' => 'சேமி', diff --git a/resources/lang/th/admin/depreciations/general.php b/resources/lang/th/admin/depreciations/general.php index 1eb8ffd540..1015d3f930 100644 --- a/resources/lang/th/admin/depreciations/general.php +++ b/resources/lang/th/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'ชื่อค่าเสื่อมราคา', 'number_of_months' => 'จำนวนเดือน', 'update' => 'อัปเดตค่าเสื่อมราคา', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/th/admin/hardware/general.php b/resources/lang/th/admin/hardware/general.php index 0d83abf81a..cbf70f5c03 100644 --- a/resources/lang/th/admin/hardware/general.php +++ b/resources/lang/th/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'ตรวจสอบสินทรัพย์', 'clone' => 'คัดลอกแบบสินทรัพย์', 'deployable' => 'สามารถใช้งานได้', - 'deleted' => 'สินทรัพย์นี้ถูกลบแล้ว คลิกที่นี่เพื่อกู้คืน.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'แก้ไขสินทรัพย์', - 'model_deleted' => 'รุ่นสินทรัพย์นี้ถูกลบ ก่อนที่คุณจะสามารถกู้คืนสินทรัพย์นี้ คุณต้องกู้คืนรุ่นสินทรัพย์นี้
คลิกที่นี่เพื้อกู้คืนรุ่น.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'ร้องขอได้', 'requested' => 'การขอใช้บริการ', 'restore' => 'กู้คืนสินทรัพย์', diff --git a/resources/lang/th/admin/models/general.php b/resources/lang/th/admin/models/general.php index edf863e11f..34212d704b 100644 --- a/resources/lang/th/admin/models/general.php +++ b/resources/lang/th/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'เกี่ยวกับโมเดลสินทรัพย์', 'about_models_text' => 'โมเดลสินทรัพย์คือวิธีการจัดกลุ่มเนื้อหาที่เหมือนกัน "MBP 2013", "IPhone 6s" ฯลฯ', - 'deleted' => 'โมเดลนี้ถูกลบแล้ว Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'การลบรายการเป็นกลุ่ม', 'bulk_delete_help' => 'ใช้ช่องทำเครื่องหมายด้านล่างเพื่อยืนยันการลบโมเดลเนื้อหาที่เลือก โมเดลสินทรัพย์ที่มีเนื้อหาเกี่ยวข้องกับเนื้อหาเหล่านั้นไม่สามารถลบออกได้จนกว่าสินทรัพย์จะเชื่อมโยงกับโมเดลอื่น', 'bulk_delete_warn' => 'คุณกำลังจะลบ: asset_count', diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php index 0b1781d435..5ce8781f4b 100644 --- a/resources/lang/th/general.php +++ b/resources/lang/th/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'นำออกสมาคม บริษัท', 'reports' => 'รายงาน', 'restored' => 'คืนค่า', + 'restore' => 'Restore', 'requested' => 'คำร้องขอ', 'request_canceled' => 'คำขอยกเลิกแล้ว', 'save' => 'บันทึก', diff --git a/resources/lang/tl/admin/depreciations/general.php b/resources/lang/tl/admin/depreciations/general.php index e0b02c009d..e6c86b9ff5 100644 --- a/resources/lang/tl/admin/depreciations/general.php +++ b/resources/lang/tl/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/tl/admin/hardware/general.php b/resources/lang/tl/admin/hardware/general.php index c5e5a483a4..80a2c14e50 100644 --- a/resources/lang/tl/admin/hardware/general.php +++ b/resources/lang/tl/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/tl/admin/models/general.php b/resources/lang/tl/admin/models/general.php index 6b38932347..046fd562e2 100644 --- a/resources/lang/tl/admin/models/general.php +++ b/resources/lang/tl/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/tl/general.php b/resources/lang/tl/general.php index 9bb3f84e44..c1931af8d1 100644 --- a/resources/lang/tl/general.php +++ b/resources/lang/tl/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/tr/admin/depreciations/general.php b/resources/lang/tr/admin/depreciations/general.php index c710cea181..47b427964b 100644 --- a/resources/lang/tr/admin/depreciations/general.php +++ b/resources/lang/tr/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Amortisman Adı', 'number_of_months' => 'Ay Sayısı', 'update' => 'Değer Kaybını Güncelle', + 'depreciation_min' => 'Değişiklik sonrası minumum değer' ]; diff --git a/resources/lang/tr/admin/hardware/general.php b/resources/lang/tr/admin/hardware/general.php index cdd2677fbf..c5e3565a31 100644 --- a/resources/lang/tr/admin/hardware/general.php +++ b/resources/lang/tr/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Ödenme Öğe', 'clone' => 'Demirbaşı Kopyala', 'deployable' => 'Dağıtılabilir', - 'deleted' => 'Bu demirbaş silindi. Geri getirmek için tıklayınız.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Demirbaşı Düzenle', - 'model_deleted' => 'Bu demirbaş modeli silindi. Bu demirbaşı geri getirmek için önce modeli geri getiriniz.
Modeli geri getirmek için tıklayınız.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Talep edilebilir', 'requested' => 'Talep edildi', 'restore' => 'Demirbaşı Geri Getir', diff --git a/resources/lang/tr/admin/models/general.php b/resources/lang/tr/admin/models/general.php index f1806a2494..2653cefc1d 100644 --- a/resources/lang/tr/admin/models/general.php +++ b/resources/lang/tr/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Varlık Modelleri Hakkında', 'about_models_text' => 'Varlık Modelleri, özdeş varlıkları gruplamanın bir yoludur. Örn: "Tiny M73", "Samsung A7", vb.', - 'deleted' => 'Model silindi. Geri getirmek için buraya tıklayınız.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Varlık Modellerini Toplu Silme', 'bulk_delete_help' => 'Seçilen varlık modelleri silme işlemini onaylamak için aşağıdaki onay kutularını kullanın. Başka bir varlık modeli ile ilişkilendirilmiş olan varlık modelleri, başka bir varlık modeli ile ilişkilendirilmeden silinemez.', 'bulk_delete_warn' => ':model_count varlık modellerini silmek üzeresiniz.', diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php index cf791957a5..00ae2dc5ea 100644 --- a/resources/lang/tr/general.php +++ b/resources/lang/tr/general.php @@ -179,6 +179,7 @@ Context | Request Context 'remove_company' => 'Firma bağlantısını sil', 'reports' => 'Raporlar', 'restored' => 'geri yüklendi', + 'restore' => 'Restore', 'requested' => 'Talep Edilen', 'request_canceled' => 'Talep iptal edildi', 'save' => 'Kaydet', diff --git a/resources/lang/uk/admin/depreciations/general.php b/resources/lang/uk/admin/depreciations/general.php index 041b64d04c..e848d825b1 100644 --- a/resources/lang/uk/admin/depreciations/general.php +++ b/resources/lang/uk/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Кількість місяців', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/uk/admin/hardware/general.php b/resources/lang/uk/admin/hardware/general.php index c14a76e526..f7f274cf57 100644 --- a/resources/lang/uk/admin/hardware/general.php +++ b/resources/lang/uk/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Видати актив', 'clone' => 'Клонувати актив', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Редагувати актив', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/uk/admin/models/general.php b/resources/lang/uk/admin/models/general.php index 24858c4188..ae3ed8994a 100644 --- a/resources/lang/uk/admin/models/general.php +++ b/resources/lang/uk/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Про моделі активів', 'about_models_text' => 'Моделі активів це спосіб групування ідентичних активів. Наприклад, «Lenovo G700», «Nokia 3310», тощо.', - 'deleted' => 'Цю мадель видалено. Натисніть для її відновлення.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/uk/general.php b/resources/lang/uk/general.php index f18ff6bfe6..3b97644fd6 100644 --- a/resources/lang/uk/general.php +++ b/resources/lang/uk/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Звіти', 'restored' => 'відновлено', + 'restore' => 'Restore', 'requested' => 'Запрошено користувачем', 'request_canceled' => 'Запит скасовано', 'save' => 'Зберегти', diff --git a/resources/lang/ur-PK/admin/depreciations/general.php b/resources/lang/ur-PK/admin/depreciations/general.php index e0b02c009d..e6c86b9ff5 100644 --- a/resources/lang/ur-PK/admin/depreciations/general.php +++ b/resources/lang/ur-PK/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Depreciation Name', 'number_of_months' => 'Number of Months', 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/ur-PK/admin/hardware/general.php b/resources/lang/ur-PK/admin/hardware/general.php index c5e5a483a4..80a2c14e50 100644 --- a/resources/lang/ur-PK/admin/hardware/general.php +++ b/resources/lang/ur-PK/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/ur-PK/admin/models/general.php b/resources/lang/ur-PK/admin/models/general.php index 6b38932347..046fd562e2 100644 --- a/resources/lang/ur-PK/admin/models/general.php +++ b/resources/lang/ur-PK/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'About Asset Models', 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php index 9bb3f84e44..c1931af8d1 100644 --- a/resources/lang/ur-PK/general.php +++ b/resources/lang/ur-PK/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/vi/admin/depreciations/general.php b/resources/lang/vi/admin/depreciations/general.php index 8f3afd9b5e..bd45ee262b 100644 --- a/resources/lang/vi/admin/depreciations/general.php +++ b/resources/lang/vi/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Tên khấu hao', 'number_of_months' => 'Số lượng tháng', 'update' => 'Cập nhật khấu hao', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/vi/admin/hardware/general.php b/resources/lang/vi/admin/hardware/general.php index fe8b90f34c..1db379cd81 100644 --- a/resources/lang/vi/admin/hardware/general.php +++ b/resources/lang/vi/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Tài sản thanh toán', 'clone' => 'Nhân đôi tài sản', 'deployable' => 'Cho phép cấp phát', - 'deleted' => 'Tài sản này đã bị xóa. Nhấn vào đây để phục hồi.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Sửa tài sản', - 'model_deleted' => 'Kiểu tài sản này đã bị xóa. Bạn phải phục hồi kiểu tài sản trước khi bạn phục hồi Tài sản.
Nhấn vào đây để phục hồi kiểu tài sản.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Cho phép đề xuất', 'requested' => 'Yêu cầu', 'restore' => 'Phục hồi tài sản', diff --git a/resources/lang/vi/admin/models/general.php b/resources/lang/vi/admin/models/general.php index 15fabe32d1..4c085343bc 100644 --- a/resources/lang/vi/admin/models/general.php +++ b/resources/lang/vi/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Giới thiệu về Mô hình Tài sản', 'about_models_text' => 'Mô hình Tài sản là một cách để nhóm các tài sản giống nhau. "MBP 2013", "IPhone 6", v.v ...', - 'deleted' => 'Model này đã bị xoá. Bấm vào đây để khôi phục lại.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Xóa hàng loạt Kiểu tài sản', 'bulk_delete_help' => 'Sử dụng hộp kiểm bên dưới để xác nhận việc sẽ xóa kiểu tài sản đã lựa chọn. Kiểu tài sản đó có liên kết với tài sản thì sẽ không thể xóa cho đến khi tài sản đó được chuyển đến kiểu tài sản khác.', 'bulk_delete_warn' => 'Bạn sắp xóa :model_count asset models.', diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php index c8fbef2231..736328c463 100644 --- a/resources/lang/vi/general.php +++ b/resources/lang/vi/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Xóa Hiệp hội Công ty', 'reports' => 'Các báo cáo', 'restored' => 'khôi phục', + 'restore' => 'Restore', 'requested' => 'Đã yêu cầu', 'request_canceled' => 'Yêu cầu Đã Hủy', 'save' => 'Lưu', diff --git a/resources/lang/zh-CN/admin/depreciations/general.php b/resources/lang/zh-CN/admin/depreciations/general.php index 62deac96a2..96f2918cca 100644 --- a/resources/lang/zh-CN/admin/depreciations/general.php +++ b/resources/lang/zh-CN/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => '折旧名称', 'number_of_months' => '月数', 'update' => '更新折旧', + 'depreciation_min' => '最底折旧值' ]; diff --git a/resources/lang/zh-CN/admin/hardware/general.php b/resources/lang/zh-CN/admin/hardware/general.php index f90cdd3c17..4ed665959d 100644 --- a/resources/lang/zh-CN/admin/hardware/general.php +++ b/resources/lang/zh-CN/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => '借出资产', 'clone' => '复制资产', 'deployable' => '可部署', - 'deleted' => '该资产已删除。 点击此处恢复.', + 'deleted' => 'This asset has been deleted.', 'edit' => '编辑资产', - 'model_deleted' => '这个资产模型将被删除，恢复资产之前需要先恢复模型。
单击这里备份模型.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => '可申领', 'requested' => '已申请', 'restore' => '还原资产', diff --git a/resources/lang/zh-CN/admin/models/general.php b/resources/lang/zh-CN/admin/models/general.php index 165236383f..0cce521bb9 100644 --- a/resources/lang/zh-CN/admin/models/general.php +++ b/resources/lang/zh-CN/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => '关于资产型号', 'about_models_text' => '资产型号是将相同资产分组的一种方式。"MBP 2013"、"IPhone 6s"等。', - 'deleted' => '此型号已被删除。点击此处恢复。', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => '批量删除资产型号', 'bulk_delete_help' => '使用下面的复选框确认删除所选资产型号。若有与之关联的资产，该资产型号则不能删除，除非将关联资产关联到别的资产型号。', 'bulk_delete_warn' => '您即将删除:model_count资产型号。', diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php index e89f07ed9d..111d1488c1 100644 --- a/resources/lang/zh-CN/general.php +++ b/resources/lang/zh-CN/general.php @@ -176,6 +176,7 @@ 'remove_company' => '移除公司关联', 'reports' => '报告', 'restored' => '恢复', + 'restore' => 'Restore', 'requested' => '已申请', 'request_canceled' => '取消请求', 'save' => '保存​​', diff --git a/resources/lang/zh-HK/admin/depreciations/general.php b/resources/lang/zh-HK/admin/depreciations/general.php index e21ef85f96..a5dec994c2 100644 --- a/resources/lang/zh-HK/admin/depreciations/general.php +++ b/resources/lang/zh-HK/admin/depreciations/general.php @@ -1,12 +1,13 @@ '關於資產折舊', - 'about_depreciations' => '您可以設置資產折舊期限', - 'asset_depreciations' => '資產折舊', - 'create' => '新建折舊', - 'depreciation_name' => '折舊名稱', - 'number_of_months' => '月數', - 'update' => '更新折舊', +return array( + 'about_asset_depreciations' => 'About Asset Depreciations', + 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', + 'asset_depreciations' => 'Asset Depreciations', + 'create' => 'Create Depreciation', + 'depreciation_name' => 'Depreciation Name', + 'number_of_months' => 'Number of Months', + 'update' => 'Update Depreciation', + 'depreciation_min' => 'Minimum Value after Depreciation' -]; +); diff --git a/resources/lang/zh-HK/admin/hardware/general.php b/resources/lang/zh-HK/admin/hardware/general.php index c5e5a483a4..80a2c14e50 100644 --- a/resources/lang/zh-HK/admin/hardware/general.php +++ b/resources/lang/zh-HK/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'Checkout Asset', 'clone' => 'Clone Asset', 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Edit Asset', - '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.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Requestable', 'requested' => 'Requested', 'restore' => 'Restore Asset', diff --git a/resources/lang/zh-HK/admin/models/general.php b/resources/lang/zh-HK/admin/models/general.php index ae7a7a4223..d2d77e0e8c 100644 --- a/resources/lang/zh-HK/admin/models/general.php +++ b/resources/lang/zh-HK/admin/models/general.php @@ -1,18 +1,18 @@ '關於資產型號', - 'about_models_text' => '資產型號是將相同資產分組的一種方式，例如："MBP 2013"、"iPhone 6s"... 等。', - 'deleted' => '此型號已被刪除。點擊此處恢復。', - 'bulk_delete' => '批次刪除資產型號', - 'bulk_delete_help' => '使用下面的核取方塊確認刪除選定的資產型號。不能刪除具有資產與之關聯的資產模型。', - 'bulk_delete_warn' => '您即將刪除資產型號 :model_count。', - 'restore' => '恢復型號', - 'requestable' => '使用者可申請此型號', - 'show_mac_address' => '在型號資產中顯示MAC地址', - 'view_deleted' => '檢視已刪除', - 'view_models' => '檢視型號', - 'fieldset' => '欄位集', - 'no_custom_field' => '沒有自訂欄位', - 'add_default_values' => '新增預設值', -]; +return array( + 'about_models_title' => 'About Asset Models', + 'about_models_text' => 'Asset Models are a way to group identical assets. "MBP 2013", "IPhone 6s", etc.', + 'deleted' => 'This model has been deleted.', + 'bulk_delete' => 'Bulk Delete Asset Models', + 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', + 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', + 'restore' => 'Restore Model', + 'requestable' => 'Users may request this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', + 'view_deleted' => 'View Deleted', + 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', + 'add_default_values' => 'Add default values', +); diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php index 9bb3f84e44..c1931af8d1 100644 --- a/resources/lang/zh-HK/general.php +++ b/resources/lang/zh-HK/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Requested', 'request_canceled' => 'Request Canceled', 'save' => 'Save', diff --git a/resources/lang/zh-TW/admin/depreciations/general.php b/resources/lang/zh-TW/admin/depreciations/general.php index e21ef85f96..8c5760727a 100644 --- a/resources/lang/zh-TW/admin/depreciations/general.php +++ b/resources/lang/zh-TW/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => '折舊名稱', 'number_of_months' => '月數', 'update' => '更新折舊', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/zh-TW/admin/hardware/general.php b/resources/lang/zh-TW/admin/hardware/general.php index db1f57fc0a..b82ed8b85f 100644 --- a/resources/lang/zh-TW/admin/hardware/general.php +++ b/resources/lang/zh-TW/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => '借出資產', 'clone' => '複製資產', 'deployable' => '可部署', - 'deleted' => '此資產已刪除。點擊此處恢復.', + 'deleted' => 'This asset has been deleted.', 'edit' => '編輯資產', - 'model_deleted' => '此資產型號已被刪除，恢復資產前需要先恢復型號。
點擊此處恢復型號。', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => '可申領', 'requested' => '已申領', 'restore' => '還原資產', diff --git a/resources/lang/zh-TW/admin/models/general.php b/resources/lang/zh-TW/admin/models/general.php index ae7a7a4223..8932563bcb 100644 --- a/resources/lang/zh-TW/admin/models/general.php +++ b/resources/lang/zh-TW/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => '關於資產型號', 'about_models_text' => '資產型號是將相同資產分組的一種方式，例如："MBP 2013"、"iPhone 6s"... 等。', - 'deleted' => '此型號已被刪除。點擊此處恢復。', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => '批次刪除資產型號', 'bulk_delete_help' => '使用下面的核取方塊確認刪除選定的資產型號。不能刪除具有資產與之關聯的資產模型。', 'bulk_delete_warn' => '您即將刪除資產型號 :model_count。', diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php index 0428932477..8e69a4acb0 100644 --- a/resources/lang/zh-TW/general.php +++ b/resources/lang/zh-TW/general.php @@ -176,6 +176,7 @@ 'remove_company' => '移除公司關聯', 'reports' => '報告', 'restored' => '還原', + 'restore' => 'Restore', 'requested' => '已申請', 'request_canceled' => '取消申請', 'save' => '儲存', diff --git a/resources/lang/zu/admin/depreciations/general.php b/resources/lang/zu/admin/depreciations/general.php index 99f5e909a7..0e5806dcc7 100644 --- a/resources/lang/zu/admin/depreciations/general.php +++ b/resources/lang/zu/admin/depreciations/general.php @@ -8,5 +8,6 @@ return [ 'depreciation_name' => 'Igama lokunciphisa', 'number_of_months' => 'Inani lezinyanga', 'update' => 'Buyekeza ukwehla kwenani', + 'depreciation_min' => 'Minimum Value after Depreciation' ]; diff --git a/resources/lang/zu/admin/hardware/general.php b/resources/lang/zu/admin/hardware/general.php index 9a49c9014a..946d1c756d 100644 --- a/resources/lang/zu/admin/hardware/general.php +++ b/resources/lang/zu/admin/hardware/general.php @@ -10,9 +10,9 @@ return [ 'checkout' => 'I-Asset ye-Checkout', 'clone' => 'Clone Asset', 'deployable' => 'Iyasebenza', - 'deleted' => 'Lefa isusiwe. Chofoza lapha ukuze ubuyiselwe.', + 'deleted' => 'This asset has been deleted.', 'edit' => 'Hlela Impahla', - 'model_deleted' => 'Le model ye-Assets isusiwe. Kumelwe ubuyisele imodeli ngaphambi kokuthi ubuyisele i-Asset.
Chofoza lapha ukuze ubuyisele imodeli.', + 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.', 'requestable' => 'Iyadingeka', 'requested' => 'Kuceliwe', 'restore' => 'Buyisela imali', diff --git a/resources/lang/zu/admin/models/general.php b/resources/lang/zu/admin/models/general.php index e217426f11..7c7941bfaf 100644 --- a/resources/lang/zu/admin/models/general.php +++ b/resources/lang/zu/admin/models/general.php @@ -3,7 +3,7 @@ return [ 'about_models_title' => 'Mayelana namamodeli asefa', 'about_models_text' => 'Amamodeli asefa kuyindlela yokuqoqa amafa afanayo. "MBP 2013", "IPhone 6s", njll.', - 'deleted' => 'Le model isusiwe. Chofoza lapha ukuze ubuyiselwe.', + 'deleted' => 'This model has been deleted.', 'bulk_delete' => 'Bulk Delete Asset Models', 'bulk_delete_help' => 'Use the checkboxes below to confirm the deletion of the selected asset models. Asset models that have assets associated with them cannot be deleted until the assets are associated with a different model.', 'bulk_delete_warn' => 'You are about to delete :model_count asset models.', diff --git a/resources/lang/zu/general.php b/resources/lang/zu/general.php index 1e86c33402..5724307837 100644 --- a/resources/lang/zu/general.php +++ b/resources/lang/zu/general.php @@ -176,6 +176,7 @@ 'remove_company' => 'Susa Inkampani Yenkampani', 'reports' => 'Imibiko', 'restored' => 'restored', + 'restore' => 'Restore', 'requested' => 'Kuceliwe', 'request_canceled' => 'Isicelo sikhanseliwe', 'save' => 'Londoloza', diff --git a/resources/views/asset_maintenances/view.blade.php b/resources/views/asset_maintenances/view.blade.php index 13506eeb4b..cea5eb2c04 100644 --- a/resources/views/asset_maintenances/view.blade.php +++ b/resources/views/asset_maintenances/view.blade.php @@ -81,7 +81,7 @@ use Carbon\Carbon;
{{ trans('admin/asset_maintenances/form.cost') }}: - {{ sprintf( trans( 'general.currency' ) . '%01.2f', $assetMaintenance->cost) }} + {{ trans( 'general.currency' ) . Helper::formatCurrencyOutput($assetMaintenance->cost) }}
{{ trans('admin/asset_maintenances/form.is_warranty') }}: diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php index 11cd9dedcc..ae84e9008a 100755 --- a/resources/views/hardware/bulk.blade.php +++ b/resources/views/hardware/bulk.blade.php @@ -149,7 +149,7 @@
@foreach ($assets as $key => $value) - + @endforeach
diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index fe21801e68..267b68a56c 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -57,23 +57,33 @@
- {{ Form::open([ - 'method' => 'POST', - 'route' => ['hardware/bulkedit'], - 'class' => 'form-inline', - 'id' => 'bulkForm']) }} +
+ @if (Request::get('status')!='Deleted') -
- - - -
+ + + +
+ {{ Form::open([ + 'method' => 'POST', + 'route' => ['hardware/bulkedit'], + 'class' => 'form-inline', + 'id' => 'bulkForm']) }} + + + + + + + {{ Form::close() }} +
+ @endif - {{ Form::close() }} + diff --git a/resources/views/hardware/qr-view.blade.php b/resources/views/hardware/qr-view.blade.php deleted file mode 100644 index 8f4e6d244a..0000000000 --- a/resources/views/hardware/qr-view.blade.php +++ /dev/null @@ -1,447 +0,0 @@ -@extends('layouts/default') - -{{-- Page title --}} -@section('title') -{{ trans('admin/hardware/general.view') }} {{ $asset->asset_tag }} -@parent -@stop - -{{-- Page content --}} -@section('content') - -
-
-

- {{ trans('admin/hardware/general.view') }} - {{ $asset->asset_tag }} - @if ($asset->name) - ({{ $asset->name }}) - @endif -

- -
-
- - -
-
-
-
- -
- - - - - - - - - @foreach ($asset->licenseseats as $seat) - - - - - - @endforeach - -
{{ trans('general.name') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('table.actions') }}
{{ $seat->license->name }}{{ $seat->license->serial }}{{ trans('general.checkin') }} -
- @else -
-
- - {{ trans('general.no_results') }} -
-
- @endif -
- -
-
- {{ trans('general.file_uploads') }} [ {{trans('button.add')}} ] -
- - - - - - - - - - - - @if ($asset->uploads->count() > 0) - @foreach ($asset->uploads as $file) - - - - - - - @endforeach - @else - - - - @endif - -
{{ trans('general.notes') }}{{ trans('general.file_name') }}
- @if ($file->note) - {{ $file->note }} - @endif - - {{ $file->filename }} - - @if ($file->filename) - {{ trans('general.download') }} - @endif - - - - -
- {{ trans('general.no_results') }} -
-
- -
- - - - - - - - - - - - - 'icon' => '', - 'created_at' => date("M d, Y g:iA", strtotime($this->created_at)), - 'action_type' => strtolower(trans('general.'.str_replace(' ', '_', $this->action_type))), - 'admin' => $this->model->user ? $this->model->user->present()->nameUrl() : '', - 'target' => $this->target(), - 'item' => $this->item(), - 'item_type' => $this->itemType(), - 'note' => e($this->note), - - @if (count($asset->assetlog) > 0) - @foreach ($asset->assetlog as $log) - @php $result = $log->present()->forDataTable(); - @endphp - - - - - - - - @endforeach - @endif - - - - - - - - -
{{ trans('general.date') }}{{ trans('general.admin') }}{{ trans('table.actions') }}{{ trans('general.user') }}{{ trans('general.notes') }}
{{ $result['created_at'] }} - {!! $result['admin'] !!} - {{ $result['action_type'] }} - {!! $result['target'] !!} - - {{ $result['note'] }} -
{{ $asset->created_at }} - @if (isset($asset->adminuser->id)) {{ $asset->adminuser->present()->fullName() }} - @else - {{ trans('general.unknown_admin') }} - @endif - {{ trans('general.created_asset') }} -
-
-
- - -
- - @if ($asset->notes) -
{{ trans('admin/hardware/form.notes') }}:
-
{{ nl2br(e($asset->notes)) }}
- @endif - - @if ($qr_code->display) -
{{ trans('admin/hardware/form.qr') }}
-
    -
  • - -
    • -
- @endif - - @if (($asset->checkedOutToUser()) && ($asset->assigned_to > 0) && ($asset->deleted_at=='')) - {{-- @TODO This should be extnded for details about non users --}} -

{{ trans('admin/hardware/form.checkedout_to') }}
-
    -
  • -

    -
    • -
  • - {{ $asset->assignedTo->present()->nameUrl() }} -
    • - - @if (isset($asset->location->address)) -
  • - {{ $asset->location->address }} - @if (isset($asset->location->address2)) - {{ $asset->location->address2 }} - @endif -
    • - @if (isset($asset->location->city)) -
  • {{ $asset->location->city }}, {{ $asset->location->state }} {{ $asset->location->zip }}
    • - @endif - @endif - - @if (isset($asset->assignedTo->email)) -

  • {{ $asset->assignedTo->email }}
    • - @endif - - @if ((isset($asset->assignedTo->phone)) && ($asset->assignedTo->phone!='')) -
  • {{ $asset->assignedTo->phone }}
    • - @endif -
- @endif - - @if (($asset->status_id ) && ($asset->status_id > 0)) - - @if ($asset->assetstatus) -

- @if (($asset->assetstatus->deployable=='1') && ($asset->assigned_to > 0)) - {{ trans('admin/hardware/general.asset') }} - {{ trans('general.deployed') }} - @else - {{ $asset->assetstatus->name }} - {{ trans('admin/hardware/general.asset') }} - @endif - - - @if (($asset->assetstatus->notes) && ($asset->assigned_to=='')) -
-
- - {{ $asset->assetstatus->notes }} - -
-
- @endif - - @endif - @endif -
-
-
- - - - -@stop diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 195e93f3e6..63ef534087 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -9,14 +9,17 @@ {{-- Right header --}} @section('header_right') + @can('manage', \App\Models\Asset::class) + @if ($asset->deleted_at=='')
+ @endif @endcan @stop @@ -83,7 +87,7 @@ WARNING: This asset has been deleted. - You must restore it before you can assign it to someone. + You must restore it before you can assign it to someone.
@endif @@ -193,6 +197,20 @@
+ @if ($asset->deleted_at!='') +
+
+ {{ trans('general.deleted') }} +
+
+ {{ \App\Helpers\Helper::getFormattedDateObject($asset->deleted_at, 'date', false) }} + +
+
+ @endif + + + @if ($asset->assetstatus)
@@ -782,13 +800,22 @@ @if (($asset->image) || (($asset->model) && ($asset->model->image!=''))) -
+
{{ $asset->getDisplayNameAttribute() }}
@endif + @if ($asset->deleted_at!='') +
+
+ @csrf + +
+
+ @endif + @if ($snipeSettings->qr_code=='1') QR code for {{ $asset->getDisplayNameAttribute() }} @endif @@ -905,7 +932,8 @@ {{ $component->name }} {{ $component->pivot->assigned_qty }} - {{ $component->purchase_cost }} each + {{ Helper::formatCurrencyOutput($component->purchase_cost) }} each + purchase_cost *$component->pivot->assigned_qty) ?> @endif diff --git a/resources/views/models/edit.blade.php b/resources/views/models/edit.blade.php index 9f8b22a249..436e425179 100755 --- a/resources/views/models/edit.blade.php +++ b/resources/views/models/edit.blade.php @@ -48,7 +48,7 @@ {{ Form::checkbox('image_delete', '1', old('image_delete'), array('class' => 'minimal', 'aria-label'=>'required')) }}
- Image for {{ $item->name }} + Image for {{ $item->name }} {!! $errors->first('image_delete', '') !!}
diff --git a/resources/views/models/index.blade.php b/resources/views/models/index.blade.php index b1c1dab873..16b2040a4c 100755 --- a/resources/views/models/index.blade.php +++ b/resources/views/models/index.blade.php @@ -69,7 +69,7 @@ data-sort-order="asc" id="asssetModelsTable" class="table table-striped snipe-table" - data-url="{{ route('api.models.index') }}" + data-url="{{ route('api.models.index', ['status' => request('status')]) }}" data-export-options='{ "fileName": "export-models-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"] diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index a5e9b9d755..7c2efd1a68 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -75,12 +75,17 @@ export: 'fa-download', clearSearch: 'fa-times' }, + exportOptions: { + htmlContent: true, + }, + exportTypes: ['csv', 'excel', 'doc', 'txt','json', 'xml', 'pdf'], onLoadSuccess: function () { $('[data-toggle="tooltip"]').tooltip(); // Needed to attach tooltips after ajax call } }); + }); @@ -95,25 +100,47 @@ } + // These methods dynamically add/remove hidden input values in the bulk actions form + $('.snipe-table').on('check.bs.table .btSelectItem', function (row, $element) { + $('#bulkEdit').removeAttr('disabled'); + $('#bulkEdit').prepend(''); + }); + + $('.snipe-table').on('uncheck.bs.table .btSelectItem', function (row, $element) { + $( "#checkbox_" + $element.id).remove(); + }); + + // Handle whether or not the edit button should be disabled - $('.snipe-table').on('check.bs.table', function () { - $('#bulkEdit').removeAttr('disabled'); - }); - - $('.snipe-table').on('check-all.bs.table', function () { - $('#bulkEdit').removeAttr('disabled'); - }); - $('.snipe-table').on('uncheck.bs.table', function () { if ($('.snipe-table').bootstrapTable('getSelections').length == 0) { $('#bulkEdit').attr('disabled', 'disabled'); } }); - $('.snipe-table').on('uncheck-all.bs.table', function (e, row) { + $('.snipe-table').on('uncheck-all.bs.table', function (event, rowsAfter, rowsBefore) { $('#bulkEdit').attr('disabled', 'disabled'); + //console.dir(rowsBefore); + + for (var i in rowsBefore) { + $( "#checkbox_" + rowsBefore[i].id).remove(); + } + }); + $('.snipe-table').on('check-all.bs.table', function (event, rowsAfter, rowsBefore) { + + $('#bulkEdit').removeAttr('disabled'); + //console.dir(rowsAfter); + + for (var i in rowsAfter) { + // console.log(rowsAfter[i].id); + $('#bulkEdit').prepend(''); + } + }); + + + // This only works for model index pages because it uses the row's model ID function genericRowLinkFormatter(destination) { return function (value,row) { @@ -209,7 +236,7 @@ } if ((row.available_actions) && (row.available_actions.update === true)) { - actions += 'Update '; + actions += '{{ trans('general.update') }} '; } if ((row.available_actions) && (row.available_actions.delete === true)) { @@ -224,7 +251,10 @@ } if ((row.available_actions) && (row.available_actions.restore === true)) { - actions += ' '; + actions += '
'; + actions += '@csrf'; + actions += ' '; + actions += '{{ trans('general.restore') }}
 '; } actions +=''; @@ -601,8 +631,8 @@ } if ("{{$snipeSettings->digit_separator}}" == "1.234,56") { // yank periods, change commas to periods - periodless = number.toString().replace("\.",""); - decimalfixed = periodless.replace(",","."); + periodless = number.toString().replace(/\./g,""); + decimalfixed = periodless.replace(/,/g,"."); } else { // yank commas, that's it. decimalfixed = number.toString().replace(",",""); diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 00e7c601a6..a3d95b2c50 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -19,22 +19,31 @@ @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) + {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} @else {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} @endif + + @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) + {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} @else {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} @endif - + @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled",'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) + {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled",'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} @else {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit", 'class'=>'minimal', 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} @endif diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index 5b5100ebf7..17e3d85ede 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -191,7 +191,7 @@ {{ $improvement->start_date }} {{ $improvement->completion_date }} {{ $improvement->is_warranty ? trans('admin/asset_maintenances/message.warranty') : trans('admin/asset_maintenances/message.not_warranty') }} - {{ sprintf( $snipeSettings->default_currency. '%01.2f', $improvement->cost) }} + {{ $snipeSettings->default_currency. ' '. Helper::formatCurrencyOutput($improvement->cost) }} cost; ?> @@ -207,7 +207,7 @@ - {{sprintf($snipeSettings->default_currency . '%01.2f', $totalCost)}} + {{ $snipeSettings->default_currency . ' '.Helper::formatCurrencyOutput($totalCost) }} diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 2d49043315..f19bb20e1b 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -509,6 +509,10 @@ @if (!Auth::user()->isSuperUser())

Only superadmins may grant a user superadmin access.

@endif + + @if (!Auth::user()->hasAccess('admin')) +

Only users with admins rights or greater may grant a user admin access.

+ @endif
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 3dd8e179a7..df3d96154f 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -629,7 +629,7 @@ @endcan @@ -742,7 +742,7 @@
-
- {{ $license->purchase_cost }} + {{ Helper::formatCurrencyOutput($license->purchase_cost) }} {{ $license->purchase_order }} @@ -681,7 +681,7 @@
{!!$accessory->present()->nameUrl()!!} - {!! $accessory->purchase_cost !!} + {!! Helper::formatCurrencyOutput($accessory->purchase_cost) !!} @can('checkin', $accessory) @@ -727,7 +727,7 @@
{!! $consumable->present()->nameUrl() !!} - {!! $consumable->purchase_cost !!} + {!! Helper::formatCurrencyOutput($consumable->purchase_cost) !!} {{ $consumable->created_at }}
+
@@ -820,7 +820,7 @@
-
{{ trans('general.notes') }}
+
diff --git a/routes/web.php b/routes/web.php index 96f638f28d..c1c439638e 100644 --- a/routes/web.php +++ b/routes/web.php @@ -341,6 +341,7 @@ Route::get( [LoginController::class, 'legacyAuthRedirect'] ); + /* |-------------------------------------------------------------------------- | Setup Routes @@ -360,6 +361,7 @@ Route::group(['prefix' => 'setup', 'middleware' => 'web'], function () { [SettingsController::class, 'postSaveFirstAdmin'] )->name('setup.user.save'); + Route::get( 'migrate', [SettingsController::class, 'getSetupMigrate'] diff --git a/routes/web/models.php b/routes/web/models.php index e1acd9bad3..591edb9f28 100644 --- a/routes/web/models.php +++ b/routes/web/models.php @@ -33,7 +33,7 @@ Route::group(['prefix' => 'models', 'middleware' => ['auth']], function () { ] )->name('view/model'); - Route::get( + Route::post( '{modelID}/restore', [ AssetModelsController::class, diff --git a/routes/web/users.php b/routes/web/users.php index af856d725a..48e5e44142 100644 --- a/routes/web/users.php +++ b/routes/web/users.php @@ -4,6 +4,14 @@ use App\Http\Controllers\Users; use Illuminate\Support\Facades\Route; // User Management + Route::post('{userId}/clone', [ 'uses' => 'Users\UsersController@postCreate' ]); + Route::post('{userId}/restore', [ 'as' => 'restore/user', 'uses' => 'Users\UsersController@getRestore' ]); + Route::get('{userId}/unsuspend', [ 'as' => 'unsuspend/user', 'uses' => 'Users\UsersController@getUnsuspend' ]); + Route::post('{userId}/upload', [ 'as' => 'upload/user', 'uses' => 'Users\UserFilesController@store' ]); + Route::delete( + '{userId}/deletefile/{fileId}', + [ 'as' => 'userfile.destroy', 'uses' => 'Users\UserFilesController@destroy' ] + ); Route::group(['prefix' => 'users', 'middleware' => ['auth']], function () {
{{ trans('general.name') }}