diff --git a/.env.example b/.env.example index c67ba1d5e5..13b742f066 100644 --- a/.env.example +++ b/.env.example @@ -30,7 +30,7 @@ MAIL_USERNAME=YOURUSERNAME MAIL_PASSWORD=YOURPASSWORD MAIL_ENCRYPTION=null MAIL_FROM_ADDR=you@example.com -MAIL_FROM_NAME=Snipe-IT +MAIL_FROM_NAME='Snipe-IT' # -------------------------------------------- @@ -74,4 +74,5 @@ AWS_BUCKET=null APP_LOG=single APP_LOCKED=false FILESYSTEM_DISK=local -APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1 \ No newline at end of file +APP_TRUSTED_PROXIES=192.168.1.1,10.0.0.1 +ALLOW_IFRAMING=false diff --git a/app/Console/Commands/ObjectImportCommand.php b/app/Console/Commands/ObjectImportCommand.php index 05198c418d..bc0a023b25 100644 --- a/app/Console/Commands/ObjectImportCommand.php +++ b/app/Console/Commands/ObjectImportCommand.php @@ -1,25 +1,27 @@ companies = Company::All(['name', 'id']); $this->status_labels = Statuslabel::All(['name', 'id']); $this->suppliers = Supplier::All(['name', 'id']); - $this->assets = Asset::all(['asset_tag']); - $this->accessories = Accessory::All(['name']); - $this->consumables = Consumable::All(['name']); + switch (strtolower($this->option('item-type'))) { + case "asset": + $this->assets = Asset::all(); + break; + case "accessory": + $this->accessories = Accessory::All(); + break; + case "consumable": + $this->consumables = Consumable::All(); + break; + } $this->customfields = CustomField::All(['name']); $bar = null; @@ -275,7 +285,7 @@ class ObjectImportCommand extends Command */ public function array_smart_fetch(array $array, $key, $default = '') { - return array_key_exists($key, $array) ? e(trim($array[ $key ])) : $default; + return array_key_exists(trim($key), $array) ? e(Encoding::fixUTF8(trim($array[ $key ]))) : $default; } @@ -313,7 +323,7 @@ class ObjectImportCommand extends Command $asset_model_name = $this->array_smart_fetch($row, "model name"); $asset_modelno = $this->array_smart_fetch($row, "model number"); if (empty($asset_model_name)) { - $asset_model_name='Unknown'; + $asset_model_name ='Unknown'; } if (empty($asset_modelno)) { $asset_modelno=''; @@ -346,6 +356,7 @@ class ObjectImportCommand extends Command return $asset_model; } else { $this->jsonError('Asset Model "' . $asset_model_name . '"', $asset_model->getErrors()); + $this->log('Asset Model "' . $asset_model_name . '"', $asset_model->getErrors()); return $asset_model; } } else { @@ -732,6 +743,24 @@ class ObjectImportCommand extends Command */ public function createAssetIfNotExists(array $row, array $item) { + $asset = null; + $editingAsset = false; + foreach ($this->assets as $tempasset) { + if (strcasecmp($tempasset->asset_tag, $item['asset_tag']) == 0) { + $this->log('A matching Asset ' . $item['asset_tag'] . ' already exists'); + if (!$this->option('update')) { + $this->log("Skipping item."); + return; + } + $this->log('Updating matching asset with new values'); + $editingAsset = true; + $asset = $tempasset; + } + } + if (is_null($asset)) { + $this->log("No Matching Asset, Creating a new one"); + $asset = new Asset; + } $asset_serial = $this->array_smart_fetch($row, "serial number"); $asset_image = $this->array_smart_fetch($row, "image"); $asset_warranty_months = intval($this->array_smart_fetch($row, "warranty months")); @@ -747,12 +776,7 @@ class ObjectImportCommand extends Command $this->log('Notes: '.$item["notes"]); $this->log('Warranty Months: ' . $asset_warranty_months); - foreach ($this->assets as $tempasset) { - if (strcasecmp($tempasset->asset_tag, $item['asset_tag']) == 0) { - $this->log('A matching Asset ' . $item['asset_tag'] . ' already exists'); - return; - } - } + if ($item["status_label"]) { $status_id = $item["status_label"]->id; @@ -763,12 +787,14 @@ class ObjectImportCommand extends Command $status_id = 1; } - $asset = new Asset(); - $asset->name = $item["item_name"]; - if ($item["purchase_date"] != '') { + if (!$editingAsset) { + $asset->asset_tag = $item['asset_tag']; // This doesn't need to be guarded for empty because it's the key we use to identify the asset. + } + if (!empty($item['item_name'])) { + $asset->name = $item["item_name"]; + } + if (!empty($item["purchase_date"])) { $asset->purchase_date = $item["purchase_date"]; - } else { - $asset->purchase_date = null; } if (array_key_exists('custom_fields', $item)) { @@ -780,37 +806,53 @@ class ObjectImportCommand extends Command if (!empty($item["purchase_cost"])) { //TODO How to generalize this for not USD? $purchase_cost = substr($item["purchase_cost"], 0, 1) === '$' ? substr($item["purchase_cost"], 1) : $item["purchase_cost"]; - $asset->purchase_cost = number_format($purchase_cost, 2, '.', ''); + // $asset->purchase_cost = number_format($purchase_cost, 2, '.', ''); + $asset->purchase_cost = Helper::ParseFloat($purchase_cost); $this->log("Asset cost parsed: " . $asset->purchase_cost); } else { $asset->purchase_cost = 0.00; } - $asset->serial = $asset_serial; - $asset->asset_tag = $item['asset_tag']; - $asset->warranty_months = $asset_warranty_months; + if (!empty($asset_serial)) { + $asset->serial = $asset_serial; + } + if (!empty($asset_warranty_months)) { + $asset->warranty_months = $asset_warranty_months; + } if ($asset_model) { $asset->model_id = $asset_model->id; } + if ($item["user"]) { $asset->assigned_to = $item["user"]->id; } + if ($item["location"]) { $asset->rtd_location_id = $item["location"]->id; } + $asset->user_id = $this->option('user_id'); - $this->log("status_id: " . $status_id); - $asset->status_id = $status_id; + if (!empty($status_id)) { + $asset->status_id = $status_id; + } if ($item["company"]) { $asset->company_id = $item["company"]->id; } - $asset->order_number = $item["order_number"]; + if ($item["order_number"]) { + $asset->order_number = $item["order_number"]; + } if ($supplier) { $asset->supplier_id = $supplier->id; } - $asset->notes = $item["notes"]; - $asset->image = $asset_image; - $this->assets->add($asset); + if ($item["notes"]) { + $asset->notes = $item["notes"]; + } + if (!empty($asset_image)) { + $asset->image = $asset_image; + } + if (!$editingAsset) { + $this->assets->add($asset); + } if (!$this->option('testrun')) { if ($asset->save()) { @@ -835,17 +877,29 @@ class ObjectImportCommand extends Command */ public function createAccessoryIfNotExists(array $item) { + $accessory = null; + $editingAccessory = false; $this->log("Creating Accessory"); foreach ($this->accessories as $tempaccessory) { if (strcasecmp($tempaccessory->name, $item["item_name"]) == 0) { $this->log('A matching Accessory ' . $item["item_name"] . ' already exists. '); - // FUTURE: Adjust quantity on import maybe? - return; + if (!$this->option('update')) { + $this->log("Skipping accessory."); + return; + } + $this->log('Updating matching accessory with new values'); + $editingAccessory = true; + $accessory = $tempaccessory; } } + if (is_null($accessory)) { + $this->log("No Matching Accessory, Creating a new one"); + $accessory = new Accessory(); + } - $accessory = new Accessory(); - $accessory->name = $item["item_name"]; + if (!$editingAccessory) { + $accessory->name = $item["item_name"]; + } if (!empty($item["purchase_date"])) { $accessory->purchase_date = $item["purchase_date"]; @@ -853,10 +907,9 @@ class ObjectImportCommand extends Command $accessory->purchase_date = null; } if (!empty($item["purchase_cost"])) { - $accessory->purchase_cost = number_format(e($item["purchase_cost"]), 2); - } else { - $accessory->purchase_cost = 0.00; + $accessory->purchase_cost = Helper::ParseFloat($item["purchase_cost"]); } + if ($item["location"]) { $accessory->location_id = $item["location"]->id; } @@ -864,20 +917,26 @@ class ObjectImportCommand extends Command if ($item["company"]) { $accessory->company_id = $item["company"]->id; } - $accessory->order_number = $item["order_number"]; + if (!empty($item["order_number"])) { + $accessory->order_number = $item["order_number"]; + } if ($item["category"]) { $accessory->category_id = $item["category"]->id; } //TODO: Implement // $accessory->notes = e($item_notes); - $accessory->requestable = filter_var($item["requestable"], FILTER_VALIDATE_BOOLEAN); + if (!empty($item["requestable"])) { + $accessory->requestable = filter_var($item["requestable"], FILTER_VALIDATE_BOOLEAN); + } //Must have at least zero of the item if we import it. - if ($item["quantity"] > -1) { - $accessory->qty = $item["quantity"]; - } else { - $accessory->qty = 1; + if (!empty($item["quantity"])) { + if ($item["quantity"] > -1) { + $accessory->qty = $item["quantity"]; + } else { + $accessory->qty = 1; + } } if (!$this->option('testrun')) { @@ -904,18 +963,29 @@ class ObjectImportCommand extends Command */ public function createConsumableIfNotExists(array $item) { + $consumable = null; + $editingConsumable = false; $this->log("Creating Consumable"); foreach ($this->consumables as $tempconsumable) { if (strcasecmp($tempconsumable->name, $item["item_name"]) == 0) { $this->log("A matching consumable " . $item["item_name"] . " already exists"); - //TODO: Adjust quantity if different maybe? - return; + if (!$this->option('update')) { + $this->log("Skipping consumable."); + return; + } + $this->log('Updating matching consumable with new values'); + $editingConsumable = true; + $consumable = $tempconsumable; } } - $consumable = new Consumable(); - $consumable->name = $item["item_name"]; - + if (is_null($consumable)) { + $this->log("No matching consumable, creating one"); + $consumable = new Consumable(); + } + if (!$editingConsumable) { + $consumable->name = $item["item_name"]; + } if (!empty($item["purchase_date"])) { $consumable->purchase_date = $item["purchase_date"]; } else { @@ -923,26 +993,37 @@ class ObjectImportCommand extends Command } if (!empty($item["purchase_cost"])) { - $consumable->purchase_cost = number_format(e($item["purchase_cost"]), 2); - } else { - $consumable->purchase_cost = 0.00; + $consumable->purchase_cost = Helper::ParseFloat($item["purchase_cost"]); + } + if ($item["location"]) { + $consumable->location_id = $item["location"]->id; } - $consumable->location_id = $item["location"]->id; $consumable->user_id = $this->option('user_id'); - $consumable->company_id = $item["company"]->id; - $consumable->order_number = $item["order_number"]; - $consumable->category_id = $item["category"]->id; + if ($item["company"]) { + $consumable->company_id = $item["company"]->id; + } + if (!empty($item["order_number"])) { + $consumable->order_number = $item["order_number"]; + } + if ($item["category"]) { + $consumable->category_id = $item["category"]->id; + } // TODO:Implement //$consumable->notes= e($item_notes); - $consumable->requestable = filter_var($item["requestable"], FILTER_VALIDATE_BOOLEAN); + if (!empty($item["requestable"])) { + $consumable->requestable = filter_var($item["requestable"], FILTER_VALIDATE_BOOLEAN); + } - if ($item["quantity"] > -1) { - $consumable->qty = $item["quantity"]; - } else { - $consumable->qty = 1; + if (!empty($item["quantity"])) { + if ($item["quantity"] > -1) { + $consumable->qty = $item["quantity"]; + } else { + $consumable->qty = 1; + } } if (!$this->option("testrun")) { + // dd($consumable); if ($consumable->save()) { $this->log("Consumable " . $item["item_name"] . ' was created'); // $this->comment("Consumable " . $item["item_name"] . ' was created'); @@ -985,8 +1066,9 @@ class ObjectImportCommand extends Command array('testrun', null, InputOption::VALUE_NONE, 'If set, will parse and output data without adding to database', null), array('logfile', null, InputOption::VALUE_REQUIRED, 'The path to log output to. storage/logs/importer.log by default', storage_path('logs/importer.log') ), array('item-type', null, InputOption::VALUE_REQUIRED, 'Item Type To import. Valid Options are Asset, Consumable, Or Accessory', 'Asset'), - array('web-importer', null, InputOption::VALUE_NONE, 'Internal: packages output for use with the web importer'), - array('user_id', null, InputOption::VALUE_REQUIRED, 'ID of user creating items', 1) + array('web-importer', null, InputOption::VALUE_NONE, 'Internal: packages output for use with the web importer'), + array('user_id', null, InputOption::VALUE_REQUIRED, 'ID of user creating items', 1), + array('update', null, InputOption::VALUE_NONE, 'If a matching item is found, update item information'), ); } diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index b0fc905511..d92a2c9881 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -17,6 +17,8 @@ use App\Models\Component; use App\Models\Accessory; use App\Models\Consumable; use App\Models\Asset; +use Crypt; +use Illuminate\Contracts\Encryption\DecryptException; /* * To change this license header, choose License Headers in Project Properties. @@ -237,7 +239,7 @@ class Helper { $keys=array_keys(CustomField::$PredefinedFormats); $stuff=array_combine($keys, $keys); - return $stuff+["" => "Custom Format..."]; + return $stuff+["" => trans('admin/custom_fields/general.custom_format')]; } public static function barcodeDimensions($barcode_type = 'QRCODE') @@ -476,6 +478,21 @@ class Helper } + public static function gracefulDecrypt(CustomField $field, $string) { + if ($field->isFieldDecryptable($string)) { + + try { + Crypt::decrypt($string); + return Crypt::decrypt($string); + + } catch (DecryptException $e) { + return 'Error Decrypting: '.$e->getMessage(); + } + + } + return $string; + + } } diff --git a/app/Http/Controllers/AssetMaintenancesController.php b/app/Http/Controllers/AssetMaintenancesController.php index e265bbe935..b7bdb81bbb 100644 --- a/app/Http/Controllers/AssetMaintenancesController.php +++ b/app/Http/Controllers/AssetMaintenancesController.php @@ -122,20 +122,18 @@ class AssetMaintenancesController extends Controller $actions = ''; - if (($maintenance->cost) && ($maintenance->asset->assetloc) && ($maintenance->asset->assetloc->currency!='')) { + if (($maintenance->cost) && (isset($maintenance->asset)) && ($maintenance->asset->assetloc) && ($maintenance->asset->assetloc->currency!='')) { $maintenance_cost = $maintenance->asset->assetloc->currency.$maintenance->cost; } else { $maintenance_cost = $settings->default_currency.$maintenance->cost; } - - $company = $maintenance->asset->company; - + $rows[] = array( 'id' => $maintenance->id, - 'asset_name' => (string)link_to('/hardware/'.$maintenance->asset->id.'/view', $maintenance->asset->showAssetName()) , + 'asset_name' => ($maintenance->asset) ? (string)link_to('/hardware/'.$maintenance->asset->id.'/view', $maintenance->asset->showAssetName()) : 'Deleted Asset' , 'title' => $maintenance->title, 'notes' => $maintenance->notes, - 'supplier' => $maintenance->supplier->name, + 'supplier' => ($maintenance->supplier) ? (string)link_to('/admin/settings/suppliers/'.$maintenance->supplier->id.'/view', $maintenance->supplier->name) : 'Deleted Supplier', 'cost' => $maintenance_cost, 'asset_maintenance_type' => e($maintenance->asset_maintenance_type), 'start_date' => $maintenance->start_date, @@ -143,7 +141,7 @@ class AssetMaintenancesController extends Controller 'completion_date' => $maintenance->completion_date, 'user_id' => ($maintenance->admin) ? (string)link_to('/admin/users/'.$maintenance->admin->id.'/view', $maintenance->admin->fullName()) : '', 'actions' => $actions, - 'companyName' => is_null($company) ? '' : $company->name + 'companyName' => ($maintenance->asset) ? $maintenance->asset->company->name : '' ); } diff --git a/app/Http/Controllers/AssetsController.php b/app/Http/Controllers/AssetsController.php index 99468dcb3e..e7512a2530 100755 --- a/app/Http/Controllers/AssetsController.php +++ b/app/Http/Controllers/AssetsController.php @@ -436,14 +436,22 @@ class AssetsController extends Controller $model = AssetModel::find($request->get('model_id')); if ($model->fieldset) { foreach ($model->fieldset->fields as $field) { - $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = e($request->input(\App\Models\CustomField::name_to_db_name($field->name))); - // LOG::debug($field->name); - // LOG::debug(\App\Models\CustomField::name_to_db_name($field->name)); - // LOG::debug($field->db_column_name()); + + + if ($field->field_encrypted=='1') { + if (Gate::allows('admin')) { + $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = \Crypt::encrypt(e($request->input(\App\Models\CustomField::name_to_db_name($field->name)))); + } + + } else { + $asset->{\App\Models\CustomField::name_to_db_name($field->name)} = e($request->input(\App\Models\CustomField::name_to_db_name($field->name))); + } + } } + if ($asset->save()) { // Redirect to the new asset page \Session::flash('success', trans('admin/hardware/message.update.success')); @@ -919,6 +927,18 @@ class AssetsController extends Controller } + public function getDeleteImportFile($filename) + { + if (!Company::isCurrentUserAuthorized()) { + return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions')); + } + + if (unlink(config('app.private_uploads').'/imports/assets/'.$filename)) { + return redirect()->back()->with('success', trans('admin/hardware/message.import.file_delete_success')); + } + return redirect()->back()->with('error', trans('admin/hardware/message.import.file_delete_error')); + } + /** * Process the uploaded file @@ -928,28 +948,47 @@ class AssetsController extends Controller * @since [v2.0] * @return Redirect */ - public function getProcessImportFile($filename) + public function postProcessImportFile() { // php artisan asset-import:csv path/to/your/file.csv --domain=yourdomain.com --email_format=firstname.lastname + $filename = Input::get('filename'); + $itemType = Input::get('import-type'); + $updateItems = Input::get('import-update'); if (!Company::isCurrentUserAuthorized()) { return redirect()->to('hardware')->with('error', trans('general.insufficient_permissions')); } - - $return = Artisan::call( - 'snipeit:import', - ['filename'=> config('app.private_uploads').'/imports/assets/'.$filename, + $importOptions = ['filename'=> config('app.private_uploads').'/imports/assets/'.$filename, '--email_format'=>'firstname.lastname', '--username_format'=>'firstname.lastname', '--web-importer' => true, - '--user_id' => Auth::user()->id - ] - ); + '--user_id' => Auth::user()->id, + '--item-type' => $itemType, + ]; + if ($updateItems) { + $importOptions['--update'] = true; + } + + $return = Artisan::call('snipeit:import', $importOptions); $display_output = Artisan::output(); $file = config('app.private_uploads').'/imports/assets/'.str_replace('.csv', '', $filename).'-output-'.date("Y-m-d-his").'.txt'; file_put_contents($file, $display_output); + // We use hardware instead of asset in the url + $redirectTo = "hardware"; + switch($itemType) { + case "asset": + $redirectTo = "hardware"; + break; + case "accessory": + $redirectTo = "accessories"; + break; + case "consumable": + $redirectTo = "consumables"; + break; + } + if ($return === 0) { //Success - return redirect()->to('hardware')->with('success', trans('admin/hardware/message.import.success')); + return redirect()->to(route($redirectTo))->with('success', trans('admin/hardware/message.import.success')); } elseif ($return === 1) { // Failure return redirect()->back()->with('import_errors', json_decode($display_output))->with('error', trans('admin/hardware/message.import.error')); } @@ -1588,31 +1627,31 @@ class AssetsController extends Controller * @since [v2.0] * @return String JSON */ - public function getDatatable($status = null) + public function getDatatable(Request $request, $status = null) { $assets = Company::scopeCompanyables(Asset::select('assets.*'))->with('model', 'assigneduser', 'assigneduser.userloc', 'assetstatus', 'defaultLoc', 'assetlog', 'model', 'model.category', 'model.manufacturer', 'model.fieldset', 'assetstatus', 'assetloc', 'company') ->Hardware(); - if (Input::has('search')) { - $assets = $assets->TextSearch(e(Input::get('search'))); + if ($request->has('search')) { + $assets = $assets->TextSearch(e($request->get('search'))); } - if (Input::has('offset')) { - $offset = e(Input::get('offset')); + if ($request->has('offset')) { + $offset = e($request->get('offset')); } else { $offset = 0; } - if (Input::has('limit')) { - $limit = e(Input::get('limit')); + if ($request->has('limit')) { + $limit = e($request->get('limit')); } else { $limit = 50; } - if (Input::has('order_number')) { - $assets->where('order_number', '=', e(Input::get('order_number'))); + if ($request->has('order_number')) { + $assets->where('order_number', '=', e($request->get('order_number'))); } switch ($status) { @@ -1637,9 +1676,18 @@ class AssetsController extends Controller case 'Deployed': $assets->Deployed(); break; + default: + $assets->NotArchived(); + break; } + if ($request->has('status_id')) { + $assets->where('status_id','=', e($request->get('status_id'))); + } + + + $allowed_columns = [ 'id', 'name', @@ -1669,8 +1717,8 @@ class AssetsController extends Controller $allowed_columns[]=$field->db_column_name(); } - $order = Input::get('order') === 'asc' ? 'asc' : 'desc'; - $sort = in_array(Input::get('sort'), $allowed_columns) ? Input::get('sort') : 'asset_tag'; + $order = $request->get('order') === 'asc' ? 'asc' : 'desc'; + $sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'asset_tag'; switch ($sort) { case 'model': @@ -1772,10 +1820,26 @@ class AssetsController extends Controller 'companyName' => is_null($asset->company) ? '' : e($asset->company->name) ); foreach ($all_custom_fields as $field) { - if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) { - $row[$field->db_column_name()] = ''.$asset->{$field->db_column_name()}.''; + $column_name = $field->db_column_name(); + + if ($field->isFieldDecryptable($asset->{$column_name})) { + + if (Gate::allows('admin')) { + if (($field->format=='URL') && ($asset->{$column_name}!='')) { + $row[$column_name] = ''.Helper::gracefulDecrypt($field, $asset->{$column_name}).''; + } else { + $row[$column_name] = Helper::gracefulDecrypt($field, $asset->{$column_name}); + } + + } else { + $row[$field->db_column_name()] = strtoupper(trans('admin/custom_fields/general.encrypted')); + } } else { - $row[$field->db_column_name()] = e($asset->{$field->db_column_name()}); + if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) { + $row[$field->db_column_name()] = ''.$asset->{$field->db_column_name()}.''; + } else { + $row[$field->db_column_name()] = e($asset->{$field->db_column_name()}); + } } } diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php index d2d911bb2a..953668aca2 100644 --- a/app/Http/Controllers/CustomFieldsController.php +++ b/app/Http/Controllers/CustomFieldsController.php @@ -10,6 +10,7 @@ use Redirect; use App\Models\AssetModel; use Lang; use Auth; +use Illuminate\Http\Request; /** * This controller handles all actions related to Custom Asset Fields for @@ -63,10 +64,15 @@ class CustomFieldsController extends Controller * @since [v1.8] * @return Redirect */ - public function store() + public function store(Request $request) { // - $cfset=new CustomFieldset(["name" => Input::get("name"),"user_id" => Auth::user()->id]); + $cfset = new CustomFieldset( + [ + "name" => e($request->get("name")), + "user_id" => Auth::user()->id] + ); + $validator=Validator::make(Input::all(), $cfset->rules); if ($validator->passes()) { $cfset->save(); @@ -122,24 +128,33 @@ class CustomFieldsController extends Controller * @since [v1.8] * @return Redirect */ - public function storeField() + public function storeField(Request $request) { - $field=new CustomField(["name" => Input::get("name"),"element" => Input::get("element"),"user_id" => Auth::user()->id]); + $field = new CustomField([ + "name" => e($request->get("name")), + "element" => e($request->get("element")), + "field_values" => e($request->get("field_values")), + "field_encrypted" => e($request->get("field_encrypted", 0)), + "user_id" => Auth::user()->id + ]); + if (!in_array(Input::get('format'), array_keys(CustomField::$PredefinedFormats))) { - $field->format=Input::get("custom_format"); + $field->format = e($request->get("custom_format")); } else { - $field->format=Input::get('format'); + $field->format = e($request->get("format")); } + + $validator=Validator::make(Input::all(), $field->rules); if ($validator->passes()) { - $results=$field->save(); - //return "postCreateField: $results"; + $results = $field->save(); if ($results) { return redirect()->route("admin.custom_fields.index")->with("success", trans('admin/custom_fields/message.field.create.success')); } else { + dd($field); return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.field.create.error')); } } else { @@ -175,9 +190,7 @@ class CustomFieldsController extends Controller */ public function deleteField($field_id) { - $field=CustomField::find($field_id); - - + $field = CustomField::find($field_id); if ($field->fieldset->count()>0) { return redirect()->back()->withErrors(['message' => "Field is in-use"]); diff --git a/app/Http/Controllers/DashboardController.php b/app/Http/Controllers/DashboardController.php index b0f0eac286..60204367a0 100755 --- a/app/Http/Controllers/DashboardController.php +++ b/app/Http/Controllers/DashboardController.php @@ -32,7 +32,7 @@ class DashboardController extends Controller $recent_activity = Actionlog::orderBy('created_at', 'DESC') ->with('accessorylog', 'consumablelog', 'licenselog', 'assetlog', 'adminlog', 'userlog', 'componentlog') - ->take(30) + ->take(20) ->get(); diff --git a/app/Http/Controllers/ProfileController.php b/app/Http/Controllers/ProfileController.php index a92c36db4d..4a176fe4c3 100755 --- a/app/Http/Controllers/ProfileController.php +++ b/app/Http/Controllers/ProfileController.php @@ -55,7 +55,7 @@ class ProfileController extends Controller if (Input::file('avatar')) { $image = Input::file('avatar'); - $file_name = $user->first_name."-".$user->last_name.".".$image->getClientOriginalExtension(); + $file_name = str_slug($user->first_name."-".$user->last_name).".".$image->getClientOriginalExtension(); $path = public_path('uploads/avatars/'.$file_name); Image::make($image->getRealPath())->resize(84, 84)->save($path); $user->avatar = $file_name; diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php index fb4cab69ef..f680ec5696 100755 --- a/app/Http/Controllers/StatuslabelsController.php +++ b/app/Http/Controllers/StatuslabelsController.php @@ -120,6 +120,7 @@ class StatuslabelsController extends Controller $statuslabel->pending = $statustype['pending']; $statuslabel->archived = $statustype['archived']; $statuslabel->color = e(Input::get('color')); + $statuslabel->show_in_nav = e(Input::get('show_in_nav'),0); // Was the asset created? @@ -208,6 +209,7 @@ class StatuslabelsController extends Controller $statuslabel->pending = $statustype['pending']; $statuslabel->archived = $statustype['archived']; $statuslabel->color = e(Input::get('color')); + $statuslabel->show_in_nav = e(Input::get('show_in_nav'),0); // Was the asset created? @@ -258,7 +260,7 @@ class StatuslabelsController extends Controller public function getDatatable() { - $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color')) + $statuslabels = Statuslabel::select(array('id','name','deployable','pending','archived','color','show_in_nav')) ->whereNull('deleted_at'); if (Input::has('search')) { @@ -314,6 +316,7 @@ class StatuslabelsController extends Controller 'type' => e($label_type), 'name' => e($statuslabel->name), 'color' => $color, + 'show_in_nav' => ($statuslabel->show_in_nav=='1') ? trans('general.yes') : trans('general.no'), 'actions' => $actions ); } diff --git a/app/Http/Middleware/FrameGuard.php b/app/Http/Middleware/FrameGuard.php index 7e9795a1fe..beb19f20f1 100644 --- a/app/Http/Middleware/FrameGuard.php +++ b/app/Http/Middleware/FrameGuard.php @@ -15,7 +15,10 @@ class FrameGuard public function handle($request, Closure $next) { $response = $next($request); - $response->headers->set('X-Frame-Options', 'SAMEORIGIN', false); + if (config('app.allow_iframing') == false) { + $response->headers->set('X-Frame-Options', 'SAMEORIGIN', false); + } return $response; + } } diff --git a/app/Http/Requests/SaveUserRequest.php b/app/Http/Requests/SaveUserRequest.php index dd4f6374dc..76a36985b9 100644 --- a/app/Http/Requests/SaveUserRequest.php +++ b/app/Http/Requests/SaveUserRequest.php @@ -25,10 +25,10 @@ class SaveUserRequest extends Request { return [ 'first_name' => 'required|string|min:1', - 'last_name' => 'required|string|min:1', 'email' => 'email', 'password' => 'required|min:6', 'password_confirm' => 'sometimes|required_with:password', + 'username' => 'required|string|min:2|unique:users,username,NULL,deleted_at', ]; } } diff --git a/app/Http/routes.php b/app/Http/routes.php index 25feecf9cf..f23c098723 100755 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -293,9 +293,13 @@ Route::group( 'uses' => 'AssetsController@getDeleteImportFile' ]); - Route::get( 'import/process/{filename}', [ 'as' => 'assets/import/process-file', + Route::post( 'import/process/', [ 'as' => 'assets/import/process-file', 'middleware' => 'authorize:assets.create', - 'uses' => 'AssetsController@getProcessImportFile' + 'uses' => 'AssetsController@postProcessImportFile' + ]); + Route::get( 'import/delete/{filename}', [ 'as' => 'assets/import/delete-file', + 'middleware' => 'authorize:assets.create', // TODO What permissions should this require? + 'uses' => 'AssetsController@getDeleteImportFile' ]); Route::get('import',[ diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 25c7ba4343..c6b1bb2916 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -628,6 +628,23 @@ public function checkin_email() }); } + /** + * Query builder scope for non-Archived assets + * + * @param Illuminate\Database\Query\Builder $query Query builder instance + * + * @return Illuminate\Database\Query\Builder Modified query builder + */ + + public function scopeNotArchived($query) + { + + return $query->whereHas('assetstatus', function ($query) { + + $query->where('archived', '=', 0); + }); + } + /** * Query builder scope for Archived assets * diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index f8c0b52b03..1037760eaa 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -11,14 +11,14 @@ class CustomField extends Model */ public static $PredefinedFormats=[ - "ANY" => "", - "ALPHA" => "alpha", - "EMAIL" => "email", - "DATE" => "date", - "URL" => "url", - "NUMERIC" => "numeric", - "MAC" => "regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/", - "IP" => "ip" + "ANY" => "", + "ALPHA" => "alpha", + "EMAIL" => "email", + "DATE" => "date", + "URL" => "url", + "NUMERIC" => "numeric", + "MAC" => "regex:/^[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}:[a-fA-F0-9]{2}$/", + "IP" => "ip", ]; public $rules=[ @@ -109,4 +109,43 @@ class CustomField extends Model $this->attributes['format']=$value; } } + + /** + * Format a value string as an array for select boxes and checkboxes. + * + * @author [A. Gianotto] [] + * @since [v3.4] + * @return Array + */ + public function formatFieldValuesAsArray() { + $arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values); + + $result[''] = 'Select '.strtolower($this->format); + + for ($x = 0; $x < count($arr); $x++) { + $arr_parts = explode('|', $arr[$x]); + if ($arr_parts[0]!='') { + if (key_exists('1',$arr_parts)) { + $result[$arr_parts[0]] = $arr_parts[1]; + } else { + $result[$arr_parts[0]] = $arr_parts[0]; + } + } + + } + + + return $result; + } + + public function isFieldDecryptable($string) { + if (($this->field_encrypted=='1') && ($string!='')) { + return true; + } + return false; + } + + + + } diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php index fd8deca6a7..5b185cadde 100644 --- a/app/Models/CustomFieldset.php +++ b/app/Models/CustomFieldset.php @@ -2,6 +2,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Gate; class CustomFieldset extends Model { @@ -30,16 +31,21 @@ class CustomFieldset extends Model { $rules=[]; foreach ($this->fields as $field) { - $rule=[]; - if ($field->pivot->required) { - $rule[]="required"; + $rule = []; + + if (($field->field_encrypted!='1') || + (($field->field_encrypted =='1') && (Gate::allows('admin')) )) + { + + if ($field->pivot->required) { + $rule[]="required"; + } } + array_push($rule, $field->attributes['format']); $rules[$field->db_column_name()]=$rule; } return $rules; } - //requiredness goes *here* - //sequence goes here? } diff --git a/app/Models/Ldap.php b/app/Models/Ldap.php index 9e4b01a9a2..ea92ee3f9d 100644 --- a/app/Models/Ldap.php +++ b/app/Models/Ldap.php @@ -81,11 +81,18 @@ class Ldap extends Model if ($settings->is_ad =='1') { - // In case they haven't added an AD domain - if ($settings->ad_domain == '') { - $userDn = $username.'@'.$settings->email_domain; + // Check if they are using the userprincipalname for the username field. + // If they are, we can skip building the UPN to authenticate against AD + if ($ldap_username_field=='userprincipalname') + { + $userDn = $username; } else { - $userDn = $username.'@'.$settings->ad_domain; + // In case they haven't added an AD domain + if ($settings->ad_domain == '') { + $userDn = $username.'@'.$settings->email_domain; + } else { + $userDn = $username.'@'.$settings->ad_domain; + } } } else { diff --git a/app/Models/User.php b/app/Models/User.php index e26b256f03..eae06ac50b 100755 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -67,7 +67,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon // Loop through the groups to see if any of them grant this permission foreach ($user_groups as $user_group) { - $group_permissions = json_decode($user_group->permissions, true); + $group_permissions = (array) json_decode($user_group->permissions, true); if (((array_key_exists($section, $group_permissions)) && ($group_permissions[$section]=='1'))) { return true; } @@ -84,7 +84,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon foreach ($this->groups as $user_group) { $group_permissions = json_decode($user_group->permissions, true); - $group_array = $group_permissions; + $group_array = (array)$group_permissions; if ((array_key_exists('superuser', $group_array)) && ($group_permissions['superuser']=='1')) { return true; } diff --git a/composer.json b/composer.json index 5ec95b091e..fff54719a8 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,8 @@ "doctrine/dbal": "v2.4.2", "barryvdh/laravel-debugbar": "^2.1", "spatie/laravel-backup": "3.8.1", - "misterphilip/maintenance-mode": "1.0.*" + "misterphilip/maintenance-mode": "1.0.*", + "neitanod/forceutf8": "dev-master" }, "require-dev": { "fzaninotto/faker": "~1.4", diff --git a/composer.lock b/composer.lock index 02592d0e39..94f9422f7d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,21 +4,21 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a770010d0ebb93a2e1b5f4acadd5a7f3", - "content-hash": "59772418a4612685eea10dde38ca77b7", + "hash": "ed9f8700f2dcd943ff662a82e4d8314f", + "content-hash": "9c0251ddc1a110d83a762483abeea079", "packages": [ { "name": "aws/aws-sdk-php", - "version": "3.18.39", + "version": "3.19.2", "source": { "type": "git", "url": "https://github.com/aws/aws-sdk-php.git", - "reference": "85f1fddaeb40b95106b2a2764268e9c89fc258ce" + "reference": "3cb90413129da42c9d3289d542bee0ae1049892c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/85f1fddaeb40b95106b2a2764268e9c89fc258ce", - "reference": "85f1fddaeb40b95106b2a2764268e9c89fc258ce", + "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/3cb90413129da42c9d3289d542bee0ae1049892c", + "reference": "3cb90413129da42c9d3289d542bee0ae1049892c", "shasum": "" }, "require": { @@ -85,7 +85,7 @@ "s3", "sdk" ], - "time": "2016-08-11 16:40:35" + "time": "2016-08-23 20:58:48" }, { "name": "aws/aws-sdk-php-laravel", @@ -145,21 +145,21 @@ }, { "name": "barryvdh/laravel-debugbar", - "version": "v2.2.2", + "version": "V2.2.3", "source": { "type": "git", "url": "https://github.com/barryvdh/laravel-debugbar.git", - "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0" + "reference": "ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/c291e58d0a13953e0f68d99182ee77ebc693edc0", - "reference": "c291e58d0a13953e0f68d99182ee77ebc693edc0", + "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd", + "reference": "ecd1ce5c4a827e2f6a8fb41bcf67713beb1c1cbd", "shasum": "" }, "require": { - "illuminate/support": "5.1.*|5.2.*", - "maximebf/debugbar": "~1.11.0", + "illuminate/support": "5.1.*|5.2.*|5.3.*", + "maximebf/debugbar": "~1.11.0|~1.12.0", "php": ">=5.5.9", "symfony/finder": "~2.7|~3.0" }, @@ -195,7 +195,7 @@ "profiler", "webprofiler" ], - "time": "2016-05-11 13:54:43" + "time": "2016-07-29 15:00:36" }, { "name": "classpreloader/classpreloader", @@ -1018,12 +1018,12 @@ "source": { "type": "git", "url": "https://github.com/Intervention/image.git", - "reference": "6886d43f5babe6900c29c59640ca81401fe71c80" + "reference": "45a41a38bd1e5290cd51ab773013e6f041b2b711" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/6886d43f5babe6900c29c59640ca81401fe71c80", - "reference": "6886d43f5babe6900c29c59640ca81401fe71c80", + "url": "https://api.github.com/repos/Intervention/image/zipball/45a41a38bd1e5290cd51ab773013e6f041b2b711", + "reference": "45a41a38bd1e5290cd51ab773013e6f041b2b711", "shasum": "" }, "require": { @@ -1072,7 +1072,7 @@ "thumbnail", "watermark" ], - "time": "2016-06-22 08:03:11" + "time": "2016-08-19 14:41:12" }, { "name": "jakub-onderka/php-console-color", @@ -1221,16 +1221,16 @@ }, { "name": "laravel/framework", - "version": "v5.2.43", + "version": "v5.2.45", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "5490b8f00564bb60839002f86828e27edd1e5610" + "reference": "2a79f920d5584ec6df7cf996d922a742d11095d1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/5490b8f00564bb60839002f86828e27edd1e5610", - "reference": "5490b8f00564bb60839002f86828e27edd1e5610", + "url": "https://api.github.com/repos/laravel/framework/zipball/2a79f920d5584ec6df7cf996d922a742d11095d1", + "reference": "2a79f920d5584ec6df7cf996d922a742d11095d1", "shasum": "" }, "require": { @@ -1311,7 +1311,7 @@ "pusher/pusher-php-server": "Required to use the Pusher broadcast driver (~2.0).", "symfony/css-selector": "Required to use some of the crawler integration testing tools (2.8.*|3.0.*).", "symfony/dom-crawler": "Required to use most of the crawler integration testing tools (2.8.*|3.0.*).", - "symfony/psr-http-message-bridge": "Required to psr7 bridging features (0.2.*)." + "symfony/psr-http-message-bridge": "Required to use psr7 bridging features (0.2.*)." }, "type": "library", "extra": { @@ -1347,7 +1347,7 @@ "framework", "laravel" ], - "time": "2016-08-10 12:23:59" + "time": "2016-08-26 11:44:52" }, { "name": "laravelcollective/html", @@ -1595,16 +1595,16 @@ }, { "name": "maximebf/debugbar", - "version": "v1.11.1", + "version": "v1.12.0", "source": { "type": "git", "url": "https://github.com/maximebf/php-debugbar.git", - "reference": "d9302891c1f0a0ac5a4f66725163a00537c6359f" + "reference": "e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d9302891c1f0a0ac5a4f66725163a00537c6359f", - "reference": "d9302891c1f0a0ac5a4f66725163a00537c6359f", + "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988", + "reference": "e634fbd32cd6bc3fa0e8c972b52d4bf49bab3988", "shasum": "" }, "require": { @@ -1623,7 +1623,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.11-dev" + "dev-master": "1.12-dev" } }, "autoload": { @@ -1652,7 +1652,7 @@ "debug", "debugbar" ], - "time": "2016-01-22 12:22:23" + "time": "2016-05-15 13:11:34" }, { "name": "misterphilip/maintenance-mode", @@ -1876,6 +1876,40 @@ ], "time": "2016-01-05 18:25:05" }, + { + "name": "neitanod/forceutf8", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/neitanod/forceutf8.git", + "reference": "2c1b21e00ed16b2b083ae4e27901cb5f2856db90" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/neitanod/forceutf8/zipball/2c1b21e00ed16b2b083ae4e27901cb5f2856db90", + "reference": "2c1b21e00ed16b2b083ae4e27901cb5f2856db90", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "autoload": { + "psr-0": { + "ForceUTF8\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "authors": [ + { + "name": "Sebastián Grignoli", + "email": "grignoli@gmail.com" + } + ], + "description": "PHP Class Encoding featuring popular Encoding::toUTF8() function --formerly known as forceUTF8()-- that fixes mixed encoded strings.", + "homepage": "https://github.com/neitanod/forceutf8", + "time": "2015-05-07 16:37:23" + }, { "name": "nesbot/carbon", "version": "1.21.0", @@ -3132,17 +3166,17 @@ "source": { "type": "git", "url": "https://github.com/tecnickcom/tc-lib-barcode.git", - "reference": "220728e5f659b935348442e8d1d3e46fd5f9e178" + "reference": "df69541618a0ebc24bc8f938e52f76a471f2e018" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/220728e5f659b935348442e8d1d3e46fd5f9e178", - "reference": "220728e5f659b935348442e8d1d3e46fd5f9e178", + "url": "https://api.github.com/repos/tecnickcom/tc-lib-barcode/zipball/df69541618a0ebc24bc8f938e52f76a471f2e018", + "reference": "df69541618a0ebc24bc8f938e52f76a471f2e018", "shasum": "" }, "require": { "php": ">=5.4", - "tecnickcom/tc-lib-color": "^1.11.0" + "tecnickcom/tc-lib-color": "^1.12.0" }, "require-dev": { "apigen/apigen": "^4.1.2", @@ -3210,20 +3244,20 @@ "tc-lib-barcode", "upc" ], - "time": "2016-07-10 18:29:15" + "time": "2016-08-25 12:36:23" }, { "name": "tecnickcom/tc-lib-color", - "version": "1.11.0", + "version": "1.12.0", "source": { "type": "git", "url": "https://github.com/tecnickcom/tc-lib-color.git", - "reference": "6a000b658758e271bf4c41bbc1ce4c685d8a7160" + "reference": "176464ae7ad0256c1dfd9d742ee2461d0b660f7c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/6a000b658758e271bf4c41bbc1ce4c685d8a7160", - "reference": "6a000b658758e271bf4c41bbc1ce4c685d8a7160", + "url": "https://api.github.com/repos/tecnickcom/tc-lib-color/zipball/176464ae7ad0256c1dfd9d742ee2461d0b660f7c", + "reference": "176464ae7ad0256c1dfd9d742ee2461d0b660f7c", "shasum": "" }, "require": { @@ -3272,7 +3306,7 @@ "tc-lib-color", "web" ], - "time": "2016-06-13 14:31:19" + "time": "2016-08-25 11:56:01" }, { "name": "vlucas/phpdotenv", @@ -3326,24 +3360,24 @@ }, { "name": "watson/validating", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/dwightwatson/validating.git", - "reference": "64dc3d211372576d468e2bfaf3c7b7ace66ee970" + "reference": "8f37e416aaf02129c8ad57a446a6ef7080019687" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dwightwatson/validating/zipball/64dc3d211372576d468e2bfaf3c7b7ace66ee970", - "reference": "64dc3d211372576d468e2bfaf3c7b7ace66ee970", + "url": "https://api.github.com/repos/dwightwatson/validating/zipball/8f37e416aaf02129c8ad57a446a6ef7080019687", + "reference": "8f37e416aaf02129c8ad57a446a6ef7080019687", "shasum": "" }, "require": { - "illuminate/contracts": "~5.0", - "illuminate/database": "~5.0 || >=5.1.27", - "illuminate/events": "~5.0", - "illuminate/support": "~5.0", - "illuminate/validation": "~5.0", + "illuminate/contracts": "~5.0 <5.3", + "illuminate/database": "~5.0 <5.3 || >=5.1.27", + "illuminate/events": "~5.0 <5.3", + "illuminate/support": "~5.0 <5.3", + "illuminate/validation": "~5.0 <5.3", "php": ">=5.4.0" }, "require-dev": { @@ -3377,7 +3411,7 @@ "laravel", "validation" ], - "time": "2016-04-07 14:59:06" + "time": "2016-08-28 07:54:32" } ], "packages-dev": [ @@ -3571,16 +3605,16 @@ }, { "name": "facebook/webdriver", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/facebook/php-webdriver.git", - "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986" + "reference": "b7186fb1bcfda956d237f59face250d06ef47253" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/0b889d7de7461439f8a3bbcca46e0f696cb27986", - "reference": "0b889d7de7461439f8a3bbcca46e0f696cb27986", + "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/b7186fb1bcfda956d237f59face250d06ef47253", + "reference": "b7186fb1bcfda956d237f59face250d06ef47253", "shasum": "" }, "require": { @@ -3588,7 +3622,9 @@ "php": ">=5.3.19" }, "require-dev": { - "phpunit/phpunit": "4.6.*" + "friendsofphp/php-cs-fixer": "^1.11", + "phpunit/phpunit": "4.6.* || ~5.0", + "squizlabs/php_codesniffer": "^2.6" }, "suggest": { "phpdocumentor/phpdocumentor": "2.*" @@ -3611,7 +3647,7 @@ "selenium", "webdriver" ], - "time": "2016-06-04 00:02:34" + "time": "2016-08-10 00:44:08" }, { "name": "fzaninotto/faker", @@ -4580,23 +4616,23 @@ }, { "name": "sebastian/environment", - "version": "1.3.7", + "version": "1.3.8", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716" + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716", - "reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/be2c607e43ce4c89ecd60e75c6a85c126e754aea", + "reference": "be2c607e43ce4c89ecd60e75c6a85c126e754aea", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^5.3.3 || ^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^4.8 || ^5.0" }, "type": "library", "extra": { @@ -4626,7 +4662,7 @@ "environment", "hhvm" ], - "time": "2016-05-17 03:18:57" + "time": "2016-08-18 05:49:44" }, { "name": "sebastian/exporter", @@ -5184,7 +5220,8 @@ "intervention/image": 20, "maknz/slack": 20, "erusev/parsedown": 20, - "tecnickcom/tc-lib-barcode": 20 + "tecnickcom/tc-lib-barcode": 20, + "neitanod/forceutf8": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/config/app.php b/config/app.php index 0b7a0e3c5d..0535a49e4b 100644 --- a/config/app.php +++ b/config/app.php @@ -127,6 +127,20 @@ return [ 'private_uploads' => storage_path().'/private_uploads', + /* + |-------------------------------------------------------------------------- + | ALLOW I-FRAMING + |-------------------------------------------------------------------------- + | + | Normal users will never need to edit this. This option lets you run + | Snipe-IT within an I-Frame, which is normally disabled by default for + | security reasons, to prevent clickjacking. It should normally be set to false. + | + */ + + 'allow_iframing' => env('ALLOW_IFRAMING', false), + + /* |-------------------------------------------------------------------------- | Demo Mode Lockdown @@ -140,7 +154,6 @@ return [ 'lock_passwords' => env('APP_LOCKED', false), - /* |-------------------------------------------------------------------------- | Autoloaded Service Providers diff --git a/config/version.php b/config/version.php index 8892147417..63f3d85e06 100644 --- a/config/version.php +++ b/config/version.php @@ -1,5 +1,5 @@ 'v3.3.0', - 'hash_version' => 'v3.3.0-16-ge52a0f6', + 'app_version' => 'v3.4.0', + 'hash_version' => 'v3.4.0-beta-13-gba70e5b', ); diff --git a/database/migrations/2016_08_23_143353_add_new_fields_to_custom_fields.php b/database/migrations/2016_08_23_143353_add_new_fields_to_custom_fields.php new file mode 100644 index 0000000000..ae32779a19 --- /dev/null +++ b/database/migrations/2016_08_23_143353_add_new_fields_to_custom_fields.php @@ -0,0 +1,34 @@ +string('field_values')->nullable()->default(null); + $table->boolean('field_encrypted')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('custom_fields', function (Blueprint $table) { + // + $table->dropColumn('field_values', 'field_encrypted'); + }); + } +} diff --git a/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php b/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php new file mode 100644 index 0000000000..a67f34db59 --- /dev/null +++ b/database/migrations/2016_08_23_145619_add_show_in_nav_to_status_labels.php @@ -0,0 +1,31 @@ +boolean('show_in_nav')->default(0); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('status_labels', function (Blueprint $table) { + $table->dropColumn('show_in_nav', 'field_encrypted'); + }); + } +} diff --git a/database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php b/database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php new file mode 100644 index 0000000000..c4eef30aa8 --- /dev/null +++ b/database/migrations/2016_08_30_084634_make_purchase_cost_nullable.php @@ -0,0 +1,29 @@ +decimal('purchase_cost',8,2)->nullable()->default(null)->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/docker.env b/docker.env index 4f48132d21..442f5c08ed 100644 --- a/docker.env +++ b/docker.env @@ -22,3 +22,5 @@ APP_KEY=Y5hJeC7x1i7OxhDrvrQPlB9KvCorvRdO APP_URL=http://127.0.0.1:32782 APP_TIMEZONE=US/Pacific APP_LOCALE=en + +ALLOW_IFRAMING=false diff --git a/docker/docker.env b/docker/docker.env index 405ec02079..74228420e1 100644 --- a/docker/docker.env +++ b/docker/docker.env @@ -18,6 +18,7 @@ DB_DATABASE=${MYSQL_DATABASE} DB_USERNAME=${MYSQL_USER} DB_PASSWORD=${MYSQL_PASSWORD} DB_PREFIX=null +DB_DUMP_PATH='/usr/bin' # -------------------------------------------- diff --git a/public/assets/js/html5shiv.js b/public/assets/js/html5shiv.js new file mode 100644 index 0000000000..1a01c94ba4 --- /dev/null +++ b/public/assets/js/html5shiv.js @@ -0,0 +1,4 @@ +/** +* @preserve HTML5 Shiv 3.7.3 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed +*/ +!function(a,b){function c(a,b){var c=a.createElement("p"),d=a.getElementsByTagName("head")[0]||a.documentElement;return c.innerHTML="x",d.insertBefore(c.lastChild,d.firstChild)}function d(){var a=t.elements;return"string"==typeof a?a.split(" "):a}function e(a,b){var c=t.elements;"string"!=typeof c&&(c=c.join(" ")),"string"!=typeof a&&(a=a.join(" ")),t.elements=c+" "+a,j(b)}function f(a){var b=s[a[q]];return b||(b={},r++,a[q]=r,s[r]=b),b}function g(a,c,d){if(c||(c=b),l)return c.createElement(a);d||(d=f(c));var e;return e=d.cache[a]?d.cache[a].cloneNode():p.test(a)?(d.cache[a]=d.createElem(a)).cloneNode():d.createElem(a),!e.canHaveChildren||o.test(a)||e.tagUrn?e:d.frag.appendChild(e)}function h(a,c){if(a||(a=b),l)return a.createDocumentFragment();c=c||f(a);for(var e=c.frag.cloneNode(),g=0,h=d(),i=h.length;i>g;g++)e.createElement(h[g]);return e}function i(a,b){b.cache||(b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag()),a.createElement=function(c){return t.shivMethods?g(c,a,b):b.createElem(c)},a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+d().join().replace(/[\w\-:]+/g,function(a){return b.createElem(a),b.frag.createElement(a),'c("'+a+'")'})+");return n}")(t,b.frag)}function j(a){a||(a=b);var d=f(a);return!t.shivCSS||k||d.hasCSS||(d.hasCSS=!!c(a,"article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}")),l||i(a,d),a}var k,l,m="3.7.3",n=a.html5||{},o=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,p=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,q="_html5shiv",r=0,s={};!function(){try{var a=b.createElement("a");a.innerHTML="",k="hidden"in a,l=1==a.childNodes.length||function(){b.createElement("a");var a=b.createDocumentFragment();return"undefined"==typeof a.cloneNode||"undefined"==typeof a.createDocumentFragment||"undefined"==typeof a.createElement}()}catch(c){k=!0,l=!0}}();var t={elements:n.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output picture progress section summary template time video",version:m,shivCSS:n.shivCSS!==!1,supportsUnknownElements:l,shivMethods:n.shivMethods!==!1,type:"default",shivDocument:j,createElement:g,createDocumentFragment:h,addElements:e};a.html5=t,j(b),"object"==typeof module&&module.exports&&(module.exports=t)}("undefined"!=typeof window?window:this,document); diff --git a/public/assets/js/respond.js b/public/assets/js/respond.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/public/index.php b/public/index.php index c2d9ddf004..01ea454daa 100644 --- a/public/index.php +++ b/public/index.php @@ -36,6 +36,11 @@ include '../c3.php'; $app = require_once __DIR__.'/../bootstrap/app.php'; +// set the public path to this directory +$app->bind('path.public', function() { + return __DIR__; +}); + /* |-------------------------------------------------------------------------- | Run The Application diff --git a/resources/lang/ar/admin/custom_fields/general.php b/resources/lang/ar/admin/custom_fields/general.php index f75ddb17c7..776428e449 100644 --- a/resources/lang/ar/admin/custom_fields/general.php +++ b/resources/lang/ar/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'حقل', 'about_fieldsets_title' => 'حول مجموعة الحقول', 'about_fieldsets_text' => 'مجموعات-الحقول تسمح لك بإنشاء مجموعات من الحقول اللتي يمكن إعادة إستخدامها مع أنواع موديل محدد.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'مجموعة-حقول', 'qty_fields' => 'الحقول الكمية', 'fieldsets' => 'مجموعات-الحقول', 'fieldset_name' => 'إسم مجموعة-الحقل', 'field_name' => 'إسم الحقل', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'عنصر النموذج', 'field_element_short' => 'عنصر', 'field_format' => 'صيغة', diff --git a/resources/lang/ar/admin/hardware/message.php b/resources/lang/ar/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/ar/admin/hardware/message.php +++ b/resources/lang/ar/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php index 623b000605..a365f803c1 100644 --- a/resources/lang/ar/admin/settings/general.php +++ b/resources/lang/ar/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/ar/admin/statuslabels/table.php b/resources/lang/ar/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/ar/admin/statuslabels/table.php +++ b/resources/lang/ar/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php index 5c1b7bc6bc..1d098b94ed 100644 --- a/resources/lang/ar/general.php +++ b/resources/lang/ar/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'حذف الصورة', 'image_upload' => 'رفع صورة', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/bg/admin/custom_fields/general.php b/resources/lang/bg/admin/custom_fields/general.php index c0ffdba972..27a5f3a192 100644 --- a/resources/lang/bg/admin/custom_fields/general.php +++ b/resources/lang/bg/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Поле', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/bg/admin/hardware/message.php b/resources/lang/bg/admin/hardware/message.php index 6558f6a8e4..1c93c08a19 100644 --- a/resources/lang/bg/admin/hardware/message.php +++ b/resources/lang/bg/admin/hardware/message.php @@ -36,9 +36,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -51,7 +51,8 @@ return array( 'checkout' => array( 'error' => 'Активът не беше изписан. Моля опитайте отново.', 'success' => 'Активът изписан успешно.', - 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.' + 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php index db8e0b17f0..666aa3b564 100644 --- a/resources/lang/bg/admin/settings/general.php +++ b/resources/lang/bg/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP парола на потребител за връзка', 'ldap_basedn' => 'Базов DN', 'ldap_filter' => 'LDAP филтър', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Поле за потребителско име', 'ldap_lname_field' => 'Фамилия', 'ldap_fname_field' => 'LDAP собствено име', diff --git a/resources/lang/bg/admin/statuslabels/table.php b/resources/lang/bg/admin/statuslabels/table.php index 609afb9231..8a50d6e414 100644 --- a/resources/lang/bg/admin/statuslabels/table.php +++ b/resources/lang/bg/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Относно статус етикетите', 'archived' => 'Архивирани', 'create' => 'Създаване на статус етикет', + 'color' => 'Chart Color', 'deployable' => 'Може да бъде предоставен', 'info' => 'Статусите се използват за описване на различните състояния на Вашите активи. Например, това са Предаден за ремонт, Изгубен/откраднат и др. Можете да създавате нови статуси за активите, които могат да бъдат предоставяни, очакващи набавяне и архивирани.', 'name' => 'Статус', 'pending' => 'Изчакване', 'status_type' => 'Тип на статуса', + 'show_in_nav' => 'Show in side nav', 'title' => 'Заглавия на статуси', 'undeployable' => 'Не може да бъде предоставян', 'update' => 'Обновяване на статус', diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php index 6155358495..25776610ef 100644 --- a/resources/lang/bg/general.php +++ b/resources/lang/bg/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Изтриване на изображението', 'image_upload' => 'Качване на изображение', 'import' => 'Зареждане', + 'import-history' => 'Import History', 'asset_maintenance' => 'Поддръжка на активи', 'asset_maintenance_report' => 'Справка за поддръжка на активи', 'asset_maintenances' => 'Поддръжки на активи', diff --git a/resources/lang/cs/admin/custom_fields/general.php b/resources/lang/cs/admin/custom_fields/general.php index f440715ed7..94acb9aa55 100644 --- a/resources/lang/cs/admin/custom_fields/general.php +++ b/resources/lang/cs/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Pole', 'about_fieldsets_title' => 'O sadách polí', 'about_fieldsets_text' => 'Sady polí Vám umožňují vytvořit si vlastní hodnoty, které chcete evidovat u modelů majetku.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Sada', 'qty_fields' => 'Počet', 'fieldsets' => 'Sady', 'fieldset_name' => 'Název sady', 'field_name' => 'Název pole', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Typ pole', 'field_element_short' => 'Typ', 'field_format' => 'Formát', diff --git a/resources/lang/cs/admin/hardware/message.php b/resources/lang/cs/admin/hardware/message.php index 35a6fd2a19..386282a9b4 100644 --- a/resources/lang/cs/admin/hardware/message.php +++ b/resources/lang/cs/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Některé položky se nepodařilo správně nahrát.', - 'errorDetail' => 'Pro chyby se nepodařilo nahrát následující položky.', - 'success' => "Váš soubor byl v pořádku nahrán", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Majetek nebyl předán, zkuste to prosím znovu', 'success' => 'Majetek byl v pořádku předán.', - 'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.' + 'user_does_not_exist' => 'Tento uživatel je neplatný. Zkuste to prosím znovu.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php index 82b245b950..0d4711c672 100644 --- a/resources/lang/cs/admin/settings/general.php +++ b/resources/lang/cs/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/cs/admin/statuslabels/table.php b/resources/lang/cs/admin/statuslabels/table.php index 0e7c04f228..4ec43e4840 100644 --- a/resources/lang/cs/admin/statuslabels/table.php +++ b/resources/lang/cs/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'O označení stavu', 'archived' => 'Archivováno', 'create' => 'Vytvořit označení stavu', + 'color' => 'Chart Color', 'deployable' => 'Připraveno k nasazení', 'info' => 'Označení stavu se používá k popisu různých stavů majetku. Můžou být v opravě, ztracení atd. Lze vytvořit nové stavy pro další možné stavy.', 'name' => 'Název stavu', 'pending' => 'Probíhající', 'status_type' => 'Typ stavu', + 'show_in_nav' => 'Show in side nav', 'title' => 'Označení stavu', 'undeployable' => 'Nemožné připravit', 'update' => 'Upravit označení stavu', diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php index 2a63479ac7..05d7f92138 100644 --- a/resources/lang/cs/general.php +++ b/resources/lang/cs/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Smazat obrázek', 'image_upload' => 'Nahrát obrázek', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Údržba zařízení', 'asset_maintenance_report' => 'Zpráva o údržbě zařízení', 'asset_maintenances' => 'Záznamy o údržbě zařízení', diff --git a/resources/lang/da/admin/accessories/general.php b/resources/lang/da/admin/accessories/general.php index 872796294a..8f9896321a 100644 --- a/resources/lang/da/admin/accessories/general.php +++ b/resources/lang/da/admin/accessories/general.php @@ -6,11 +6,11 @@ return array( 'accessory_category' => 'Tilbehør Kategori', 'accessory_name' => 'Tilbehør Navn', 'cost' => 'Indkøbspris', - 'checkout' => 'Checkout Accessory', - 'checkin' => 'Checkin Accessory', + 'checkout' => 'Tjek tilbehør ud', + 'checkin' => 'Tjek tilbehør ind', 'create' => 'Opret tilbehør', 'date' => 'Købsdato', - 'edit' => 'Edit Accessory', + 'edit' => 'Rediger tilbehør', 'eula_text' => 'Slutbrugerlicenskategori', 'eula_text_help' => 'Dette felt tillader dig at tilpasse din slutbrugerlicens til specifikke typer af tilbehør. Hvis du kun har en slutbrugerlicens for alle dine tilbehør, kan du afkrydse boksen nedenfor for at bruge den primære standardlicens.', 'require_acceptance' => 'Kræver brugere at bekræfte accept af tilbehør i denne kategori.', diff --git a/resources/lang/da/admin/accessories/message.php b/resources/lang/da/admin/accessories/message.php index e4aa37807b..6fc3a8fd5c 100644 --- a/resources/lang/da/admin/accessories/message.php +++ b/resources/lang/da/admin/accessories/message.php @@ -2,23 +2,23 @@ return array( - 'does_not_exist' => 'The accessory does not exist.', + 'does_not_exist' => 'Tilbehøret findes ikke.', 'assoc_users' => 'Dette tilbehør har pt. :count emner tjekket ud til brugere. Tjek tilbehør ind og prøv igen.', 'create' => array( - 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' + 'error' => 'Tilbehøret blev ikke oprettet, prøv venligst igen.', + 'success' => 'Tilbehøret blev oprettet.' ), 'update' => array( - 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' + 'error' => 'Tilbehøret blev ikke opdateret, prøv venligst igen', + 'success' => 'Tilbehøret blev opdateret med success.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this accessory?', - 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' + 'confirm' => 'Er du sikker på du vil slette dette tilbehør?', + 'error' => 'Der opstod et problem under sletning af tilbehøret. Prøv venligst igen.', + 'success' => 'Tilbehøret blev slettet med success.' ), 'checkout' => array( diff --git a/resources/lang/da/admin/asset_maintenances/message.php b/resources/lang/da/admin/asset_maintenances/message.php index ca4256efbe..af097d59f5 100644 --- a/resources/lang/da/admin/asset_maintenances/message.php +++ b/resources/lang/da/admin/asset_maintenances/message.php @@ -1,17 +1,17 @@ 'Asset Maintenance you were looking for was not found!', + 'not_found' => 'Aktivets vedligeholdelse blev ikke fundet!', 'delete' => [ - 'confirm' => 'Are you sure you wish to delete this asset maintenance?', - 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'confirm' => 'Er du sikker på du vil slette dette aktivs vedligeholdelse?', + 'error' => 'Der opstod et problem under sletning af aktivets vedligeholdelse. Prøv venligst igen.', + 'success' => 'Aktivets vedligeholdelse blev slettet med succes.' ], 'create' => [ - 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'error' => 'Aktivets vedligeholdelse blev ikke oprettet, prøv venligst igen.', + 'success' => 'Aktivets vedligeholdelse blev oprettet med succes.' ], - 'asset_maintenance_incomplete' => 'Not Completed Yet', - 'warranty' => 'Warranty', - 'not_warranty' => 'Not Warranty', + 'asset_maintenance_incomplete' => 'Ikke afsluttet endnu', + 'warranty' => 'Garanti', + 'not_warranty' => 'Ingen garanti', ]; \ No newline at end of file diff --git a/resources/lang/da/admin/categories/general.php b/resources/lang/da/admin/categories/general.php index 861f78db17..a7bca09a1f 100644 --- a/resources/lang/da/admin/categories/general.php +++ b/resources/lang/da/admin/categories/general.php @@ -5,7 +5,7 @@ return array( 'about_categories' => 'Aktiver kategorier hjælper dig med at organisere dine aktiver. Eksempler på kategorier kunne være "Stationære coputere", "Bærbare", "Mobiltelefoner", "Tabletter" osv., men du kan bruge aktiver kategorier på en hvilken som helst måde som giver mening for dig.', 'asset_categories' => 'Aktiver Kategorier', 'category_name' => 'Kategorinavn', - 'checkin_email' => 'Send email to user on checkin.', + 'checkin_email' => 'Send email til bruger ved tjek ind.', 'clone' => 'Klon Kategori', 'create' => 'Opret kategori', 'edit' => 'Rediger Kategori', diff --git a/resources/lang/da/admin/categories/message.php b/resources/lang/da/admin/categories/message.php index 01977cf71a..6b26b7dc1c 100644 --- a/resources/lang/da/admin/categories/message.php +++ b/resources/lang/da/admin/categories/message.php @@ -3,8 +3,8 @@ return array( 'does_not_exist' => 'Kategorien eksisterer ikke.', - 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', - 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', + 'assoc_models' => 'Denne kategori er i øjeblikket associeret med mindst en model og kan ikke slettes. Opdater venligst dine modeller, så de ikke længere refererer til denne kategori og prøv igen. ', + 'assoc_items' => 'Denne kategori er i øjeblikket associeret med mindst en :asset_type og kan ikke slettes. Opdater venligst din :asset_type, så de ikke længere refererer til denne kategori og prøv igen. ', 'create' => array( 'error' => 'Kategorien blev ikke oprettet, prøv igen.', diff --git a/resources/lang/da/admin/custom_fields/general.php b/resources/lang/da/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/da/admin/custom_fields/general.php +++ b/resources/lang/da/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/da/admin/hardware/form.php b/resources/lang/da/admin/hardware/form.php index a40c709c3e..3634412216 100644 --- a/resources/lang/da/admin/hardware/form.php +++ b/resources/lang/da/admin/hardware/form.php @@ -1,9 +1,9 @@ 'Confrm Bulk Delete Assets', - 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', - 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', + 'bulk_delete' => 'Bekræft massesletning af aktiver', + 'bulk_delete_help' => 'Gennemgå aktiver for massesletning nedenfor. Disse aktiver kan gendannes når slettet, men de vil ikke længere være forbundet med eventuelle brugere, de i øjeblikket er tildelt.', + 'bulk_delete_warn' => 'Du er i gang med at slette :asset_count aktiver.', 'bulk_update' => 'Masseopdater Aktiver', 'bulk_update_help' => 'Denne form tillader dig at opdatere flere aktiver på en gang. Udfyld kun de felter der skal ændres. Ikke udfyldte feltet forbilver uændret.', 'bulk_update_warn' => 'Du er i færd med at redigere egenskaber på :asset_count aktiver.', @@ -19,10 +19,10 @@ return array( 'default_location' => 'Standardplacering', 'eol_date' => 'EOL Dato', 'eol_rate' => 'EOL Rate', - 'expected_checkin' => 'Expected Checkin Date', + 'expected_checkin' => 'Forventet indtjekningsdato', 'expires' => 'Udløber', 'fully_depreciated' => 'Fuldt Afskrevet', - 'help_checkout' => 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ', + 'help_checkout' => 'Vælg "Klar til implementering" fra listen ovenfor, hvis du ønsker at tildele dette aktiv med det samme. ', 'mac_address' => 'MAC-adresse', 'manufacturer' => 'Producent', 'model' => 'Model', diff --git a/resources/lang/da/admin/hardware/message.php b/resources/lang/da/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/da/admin/hardware/message.php +++ b/resources/lang/da/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/da/admin/models/table.php b/resources/lang/da/admin/models/table.php index 11a512b3d3..6c364796f4 100644 --- a/resources/lang/da/admin/models/table.php +++ b/resources/lang/da/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Asset Models', 'update' => 'Update Asset Model', 'view' => 'View Asset Model', - 'update' => 'Update Asset Model', + 'update' => 'Update Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', ); diff --git a/resources/lang/da/admin/settings/general.php b/resources/lang/da/admin/settings/general.php index 623b000605..a365f803c1 100644 --- a/resources/lang/da/admin/settings/general.php +++ b/resources/lang/da/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/da/admin/statuslabels/table.php b/resources/lang/da/admin/statuslabels/table.php index d65893eef2..69a905bed3 100644 --- a/resources/lang/da/admin/statuslabels/table.php +++ b/resources/lang/da/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Om status labels', 'archived' => 'Archived', 'create' => 'Opret status label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status navn', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status labels', 'undeployable' => 'Undeployable', 'update' => 'Opdater status label', diff --git a/resources/lang/da/button.php b/resources/lang/da/button.php index f8ea19942a..6846a66617 100644 --- a/resources/lang/da/button.php +++ b/resources/lang/da/button.php @@ -5,7 +5,7 @@ return array( 'actions' => 'Handlinger', 'add' => 'Tilføj Ny', 'cancel' => 'Annuller', - 'checkin_and_delete' => 'Checkin & Delete User', + 'checkin_and_delete' => 'Tjek ind og slet bruger', 'delete' => 'Slet', 'edit' => 'Rediger', 'restore' => 'Gendan', diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php index 7afe38bc65..23af333193 100644 --- a/resources/lang/da/general.php +++ b/resources/lang/da/general.php @@ -2,11 +2,11 @@ return [ 'accessories' => 'Tilbehør', - 'activated' => 'Activated', + 'activated' => 'Aktiveret', 'accessory' => 'Tilbehør', - 'accessory_report' => 'Accessory Report', - 'action' => 'Action', - 'activity_report' => 'Activity Report', + 'accessory_report' => 'Tilbehørsrapport', + 'action' => 'Handling', + 'activity_report' => 'Aktivitetsrapport', 'address' => 'Addresse', 'admin' => 'Admin', 'add_seats' => 'Added seats', @@ -22,21 +22,21 @@ 'avatar_delete' => 'Slet avatar', 'avatar_upload' => 'Upload Avatar', 'back' => 'Tilbage', - 'bad_data' => 'Nothing found. Maybe bad data?', - 'bulk_checkout' => 'Bulk Checkout', + 'bad_data' => 'Intet fundet. Måske dårlig data?', + 'bulk_checkout' => 'Masseudtjekning', 'cancel' => 'Annuller', - 'categories' => 'Categories', - 'category' => 'Category', + 'categories' => 'Kategorier', + 'category' => 'Kategori', 'changeemail' => 'Skift email adresse', 'changepassword' => 'Skift adgangskode', 'checkin' => 'Tjek Ind', - 'checkin_from' => 'Checkin from', + 'checkin_from' => 'Tjek ind fra', 'checkout' => 'Tjek Ud', 'city' => 'By', - 'companies' => 'Companies', - 'company' => 'Company', - 'component' => 'Component', - 'components' => 'Components', + 'companies' => 'Selskaber', + 'company' => 'Selskab', + 'component' => 'Komponent', + 'components' => 'Komponenter', 'consumable' => 'Consumable', 'consumables' => 'Consumables', 'country' => 'Land', @@ -57,73 +57,74 @@ 'depreciation' => 'Afskrivning', 'editprofile' => 'Ret Din Profil', 'eol' => 'EOL', - 'email_domain' => 'Email Domain', - 'email_format' => 'Email Format', - 'email_domain_help' => 'This is used to generate email addresses when importing', - 'filastname_format' => 'First Initial Last Name (jsmith@example.com)', - 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)', - 'first' => 'First', + 'email_domain' => 'Email domæne', + 'email_format' => 'Email formattering', + 'email_domain_help' => 'Dette bruges til at generere email-adresser ved importering', + 'filastname_format' => 'Fornavnskarakter Efternavn (jsmith@example.com)', + 'firstname_lastname_format' => 'Fornavn Efternavn (jane.smith@example.com)', + 'first' => 'Første', 'first_name' => 'Fornavn', - 'first_name_format' => 'First Name (jane@example.com)', + 'first_name_format' => 'Fornavn (jane@example.com)', 'file_name' => 'Fil', 'file_uploads' => 'Filoverførsel', 'generate' => 'Skab', 'groups' => 'Grupper', 'gravatar_email' => 'Gravatar email addresse', - 'history' => 'History', + 'history' => 'Historik', 'history_for' => 'Historie for', 'id' => 'ID', 'image_delete' => 'Slet billede', 'image_upload' => 'Upload billede', - 'import' => 'Import', - 'asset_maintenance' => 'Asset Maintenance', - 'asset_maintenance_report' => 'Asset Maintenance Report', - 'asset_maintenances' => 'Asset Maintenances', - 'item' => 'Item', - 'insufficient_permissions' => 'Insufficient permissions!', - 'language' => 'Language', - 'last' => 'Last', + 'import' => 'Importér', + 'import-history' => 'Import History', + 'asset_maintenance' => 'Vedligeholdelse af aktiv', + 'asset_maintenance_report' => 'Aktiv vedligeholdelsesrapport', + 'asset_maintenances' => 'Vedligeholdelse af aktiv', + 'item' => 'Emne', + 'insufficient_permissions' => 'Ingen rettigheder!', + 'language' => 'Sprog', + 'last' => 'Sidste', 'last_name' => 'Efternavn', 'license' => 'Licens', 'license_report' => 'Licensrapport', 'licenses_available' => 'Tilgængelige licenser', 'licenses' => 'Licenser', 'list_all' => 'Vis alle', - 'loading' => 'Loading', + 'loading' => 'Indlæser', 'lock_passwords' => 'This field cannot be edited in this installation.', 'feature_disabled' => 'This feature has been disabled for this installation.', 'location' => 'Lokation', 'locations' => 'Lokationer', 'logout' => 'Log ud', - 'lookup_by_tag' => 'Lookup by Asset Tag', + 'lookup_by_tag' => 'Søg på aktivkode', 'manufacturer' => 'Producent', 'manufacturers' => 'Producenter', - 'markdown' => 'This field allows Github flavored markdown.', - 'min_amt' => 'Min. QTY', + 'markdown' => 'Dette felt tillader Github koder.', + 'min_amt' => 'Min. antal', 'min_amt_help' => 'Minimum number of items that should be available before an alert gets triggered.', 'model_no' => 'Modelnummer', 'months' => 'måneder', 'moreinfo' => 'Mere Info', 'name' => 'Navn', - 'next' => 'Next', - 'new' => 'new!', + 'next' => 'Næste', + 'new' => 'ny!', 'no_depreciation' => 'Ingen Afskrivning', 'no_results' => 'Ingen Resultater.', 'no' => 'Nej', 'notes' => 'Noter', - 'page_menu' => 'Showing _MENU_ items', - 'pagination_info' => 'Showing _START_ to _END_ of _TOTAL_ items', + 'page_menu' => 'Viser _MENU_ emner', + 'pagination_info' => 'Viser _START_ til _END_ af _TOTAL_ emner', 'pending' => 'Afventer', 'people' => 'Personer', 'per_page' => 'Resultater Per Side', - 'previous' => 'Previous', - 'processing' => 'Processing', + 'previous' => 'Forrige', + 'processing' => 'Behandler', 'profile' => 'Din profil', - 'qty' => 'QTY', - 'quantity' => 'Quantity', + 'qty' => 'STK', + 'quantity' => 'Antal', 'ready_to_deploy' => 'Klar til Implementering', - 'recent_activity' => 'Recent Activity', - 'remove_company' => 'Remove Company Association', + 'recent_activity' => 'Seneste aktivitet', + 'remove_company' => 'Fjern association med selskab', 'reports' => 'Rapporter', 'requested' => 'Requested', 'save' => 'Gem', diff --git a/resources/lang/da/passwords.php b/resources/lang/da/passwords.php index 5195a9b77c..ceb9bd464c 100644 --- a/resources/lang/da/passwords.php +++ b/resources/lang/da/passwords.php @@ -1,7 +1,7 @@ 'Your password link has been sent!', - 'user' => 'That user does not exist or does not have an email address associated', + 'sent' => 'Dit adgangskode link er blevet sendt!', + 'user' => 'Brugeren findes ikke eller har ikke nogen email-adresse tilknyttet', ]; diff --git a/resources/lang/da/reminders.php b/resources/lang/da/reminders.php index 0f0f6915a0..0158281a88 100644 --- a/resources/lang/da/reminders.php +++ b/resources/lang/da/reminders.php @@ -17,7 +17,7 @@ return array( "user" => "Brugernavn eller email adresse er forkert", - "token" => "This password reset token is invalid.", + "token" => "Denne adgangskode nulstillingstoken er ugyldig.", "sent" => "Hvis en tilsvarende email adresse blev fundet, er der afsendt en påmindelse om adgangskode!", diff --git a/resources/lang/da/table.php b/resources/lang/da/table.php index afd9cbcdf5..922b8e82bf 100644 --- a/resources/lang/da/table.php +++ b/resources/lang/da/table.php @@ -5,6 +5,6 @@ return array( 'actions' => 'Handlinger', 'action' => 'Handling', 'by' => 'Af', - 'item' => 'Item', + 'item' => 'Emne', ); diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php index f3be93a4f8..b8ccbe151f 100644 --- a/resources/lang/da/validation.php +++ b/resources/lang/da/validation.php @@ -32,11 +32,11 @@ return array( "digits" => ":attribute skal være :digits cifre.", "digits_between" => ":attribute skal være imellem :min og :max cifre.", "email" => ":attribute formatet er ugylidgt.", - "exists" => "The selected :attribute is invalid.", - "email_array" => "One or more email addresses is invalid.", + "exists" => "Den valgte :attribute er ugyldig.", + "email_array" => "En eller flere email-adresser er ugyldige.", "image" => ":attribute skal være et billede.", "in" => "Det valgte :attribute er ugyldigt.", - "integer" => "The :attribute must be an integer.", + "integer" => ":attribute skal være et heltal.", "ip" => ":attribute skal være en gyldig IP adresse.", "max" => array( "numeric" => ":attribute må ikke overstige :max.", @@ -49,8 +49,8 @@ return array( "file" => ":attribute skal mindst være :min kilobytes.", "string" => ":attribute skal mindst være :min tegn.", ), - "not_in" => "The selected :attribute is invalid.", - "numeric" => "The :attribute must be a number.", + "not_in" => "Den valgte :attribute er ugyldig.", + "numeric" => ":attribute skal være et tal.", "regex" => ":attribute formatet er ugyldigt.", "required" => ":attribute feltet er krævet.", "required_if" => ":attribute feltet er krævet når :other er :value.", @@ -62,10 +62,10 @@ return array( "file" => ":attribute skal være :size kilobytes.", "string" => ":attribute skal være :size tegn.", ), - "unique" => "The :attribute has already been taken.", + "unique" => ":attribute er allerede taget.", "url" => ":attribute formatet er ugyldigt.", - "statuslabel_type" => "You must select a valid status label type", - "unique_undeleted" => "The :attribute must be unique.", + "statuslabel_type" => "Du skal vælge en gyldig statusmærke type", + "unique_undeleted" => ":attribute skal være unik.", /* @@ -80,7 +80,7 @@ return array( */ 'custom' => array(), - 'alpha_space' => "The :attribute field contains a character that is not allowed.", + 'alpha_space' => ":attribute feltet indeholder en karakter der ikke er tilladt.", /* |-------------------------------------------------------------------------- diff --git a/resources/lang/de/admin/custom_fields/general.php b/resources/lang/de/admin/custom_fields/general.php index 112b45bfcd..4066bf5a55 100644 --- a/resources/lang/de/admin/custom_fields/general.php +++ b/resources/lang/de/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Feld', 'about_fieldsets_title' => 'Über Feldsätze', 'about_fieldsets_text' => 'Feldsätze erlauben es Gruppen aus benutzerdefinierten Feldern zu erstellen, welche regelmäßig für spezifische Modelltypen benutzt werden.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Feldsatz', 'qty_fields' => 'Anzahl Felder', 'fieldsets' => 'Feldsätze', 'fieldset_name' => 'Feldsatzname', 'field_name' => 'Feldname', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Formularelement', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/de/admin/hardware/general.php b/resources/lang/de/admin/hardware/general.php index 9316e67119..4d21872e3f 100644 --- a/resources/lang/de/admin/hardware/general.php +++ b/resources/lang/de/admin/hardware/general.php @@ -3,7 +3,7 @@ return array( 'archived' => 'Archiviert', 'asset' => 'Asset', - 'bulk_checkout' => 'Checkout Assets to User', + 'bulk_checkout' => 'Assets an Benutzer herausgeben', 'checkin' => 'Asset zurücknehmen', 'checkout' => 'Asset an Benutzer herausgeben', 'clone' => 'Asset duplizieren', diff --git a/resources/lang/de/admin/hardware/message.php b/resources/lang/de/admin/hardware/message.php index 572c6cf5dc..31f0273262 100644 --- a/resources/lang/de/admin/hardware/message.php +++ b/resources/lang/de/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Einige Elemente wurden nicht korrekt importiert.', - 'errorDetail' => 'Die Folgenden Elemente wurden aufgrund von Fehlern nicht importiert.', - 'success' => "Ihre Datei wurde importiert", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset konnte nicht herausgegeben werden. Bitte versuchen Sie es erneut', 'success' => 'Asset wurde erfolgreich herausgegeben.', - 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.' + 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/de/admin/models/table.php b/resources/lang/de/admin/models/table.php index 064a78d779..47d3ee3fd5 100644 --- a/resources/lang/de/admin/models/table.php +++ b/resources/lang/de/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Asset Modelle', 'update' => 'Asset Modell aktualisieren', 'view' => 'Asset Modell ansehen', - 'update' => 'Asset Modell aktualisieren', + 'update' => 'Modell aktualisieren', 'clone' => 'Modell duplizieren', 'edit' => 'Modell bearbeiten', ); diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php index 1ad3686e3e..25dbbf0a39 100644 --- a/resources/lang/de/admin/settings/general.php +++ b/resources/lang/de/admin/settings/general.php @@ -2,9 +2,9 @@ return array( 'ad' => 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad_domain' => 'Active Directory Domäne', + 'ad_domain_help' => 'Meistens dieselbe wie die E-Mail Domäne.', + 'is_ad' => 'Dies ist ein Active Directory Server', 'alert_email' => 'Alarme senden an', 'alerts_enabled' => 'Alarme aktiviert', 'alert_interval' => 'Ablauf Alarmschwelle (in Tagen)', @@ -41,16 +41,18 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Einstellungen', 'ldap_server' => 'LDAP Server', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', + 'ldap_server_help' => 'Sollte mit ldap:// (für unencrypted oder TLS) oder ldaps:// (für SSL) starten', 'ldap_server_cert' => 'LDAP SSL Zertifikatsüberprüfung', 'ldap_server_cert_ignore' => 'Erlaube ungültige SSL Zertifikate', 'ldap_server_cert_help' => 'Wählen Sie diese Option, wenn Sie selbstsignierte SSL Zertifikate verwenden und diese gegebenenfalls ungültigen Zertifikate akzeptieren möchten.', - 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', + 'ldap_tls' => 'TLS verwenden', + 'ldap_tls_help' => 'Sollte nur wenn STARTTLS am LDAP Server verwendet wird, aktiviert sein. ', 'ldap_uname' => 'LDAP Bind Nutzername', 'ldap_pword' => 'LDAP Bind Passwort', 'ldap_basedn' => 'Basis Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Benutzername', 'ldap_lname_field' => 'Familienname', 'ldap_fname_field' => 'LDAP Vorname', @@ -108,5 +110,5 @@ return array( 'bottom' => 'Unten', 'vertical' => 'Vertikal', 'horizontal' => 'Horizontal', - 'zerofill_count' => 'Length of asset tags, including zerofill', + 'zerofill_count' => 'Länge der Asset Tags, inklusive zerofill', ); diff --git a/resources/lang/de/admin/statuslabels/table.php b/resources/lang/de/admin/statuslabels/table.php index 82dea8f5c3..f6e36485b4 100644 --- a/resources/lang/de/admin/statuslabels/table.php +++ b/resources/lang/de/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Info Statusbezeichnung', 'archived' => 'Archiviert', 'create' => 'Statusbezeichnung erstellen', + 'color' => 'Chart Color', 'deployable' => 'Einsetzbar', 'info' => 'Status Label werden eingesetzt um diverse Stati Ihrer Assets zu beschreiben. Diese können zB. in Reparatur sein, Gestohlen oder Verlohren worden sein. Sie können neue Status Labels für Einsetzbare, Unerledigte und Archivierte Assets erstellen.', 'name' => 'Statusname', 'pending' => 'Unerledigt', 'status_type' => 'Statustyp', + 'show_in_nav' => 'Show in side nav', 'title' => 'Statusbezeichnungen', 'undeployable' => 'nicht Einsetzbar', 'update' => 'Statusbezeichnung bearbeiten', diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php index 2db75dd3ab..bb4090a886 100644 --- a/resources/lang/de/general.php +++ b/resources/lang/de/general.php @@ -23,7 +23,7 @@ 'avatar_upload' => 'Avatar hochladen', 'back' => 'Zurück', 'bad_data' => 'Nichts gefunden. Vielleicht defekte Daten?', - 'bulk_checkout' => 'Bulk Checkout', + 'bulk_checkout' => 'Massen-Checkout', 'cancel' => 'Abbrechen', 'categories' => 'Kategorien', 'category' => 'Kategorie', @@ -76,6 +76,7 @@ 'image_delete' => 'Bild löschen', 'image_upload' => 'Bild hinzufügen', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Wartung', 'asset_maintenance_report' => 'Asset Wartungsbericht', 'asset_maintenances' => 'Asset Wartungen', @@ -106,7 +107,7 @@ 'moreinfo' => 'Mehr Informationen', 'name' => 'Location Name', 'next' => 'Nächstes', - 'new' => 'new!', + 'new' => 'Neu!', 'no_depreciation' => 'Do Not Depreciate', 'no_results' => 'Keine Treffer.', 'no' => 'Nein', @@ -142,7 +143,7 @@ 'select_asset' => 'Asset auswählen', 'settings' => 'Einstellungen', 'sign_in' => 'Einloggen', - 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', + 'some_features_disabled' => 'Einige Funktionen sind für den DEMO-Modus deaktiviert.', 'site_name' => 'Seitenname', 'state' => 'Zustand', 'status_labels' => 'Statusbezeichnungen', diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php index f77d42ba66..807d80b648 100644 --- a/resources/lang/de/validation.php +++ b/resources/lang/de/validation.php @@ -64,8 +64,8 @@ return array( ), "unique" => ":attribute schon benutzt.", "url" => ":attribute Format ist ungültig.", - "statuslabel_type" => "You must select a valid status label type", - "unique_undeleted" => "The :attribute must be unique.", + "statuslabel_type" => "Gültigen Status Beschriftungstyp auswählen!", + "unique_undeleted" => ":attribute muss eindeutig sein.", /* diff --git a/resources/lang/el/admin/custom_fields/general.php b/resources/lang/el/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/el/admin/custom_fields/general.php +++ b/resources/lang/el/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/el/admin/hardware/message.php b/resources/lang/el/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/el/admin/hardware/message.php +++ b/resources/lang/el/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/el/admin/models/table.php b/resources/lang/el/admin/models/table.php index 11a512b3d3..6c364796f4 100644 --- a/resources/lang/el/admin/models/table.php +++ b/resources/lang/el/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Asset Models', 'update' => 'Update Asset Model', 'view' => 'View Asset Model', - 'update' => 'Update Asset Model', + 'update' => 'Update Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', ); diff --git a/resources/lang/el/admin/settings/general.php b/resources/lang/el/admin/settings/general.php index 623b000605..a365f803c1 100644 --- a/resources/lang/el/admin/settings/general.php +++ b/resources/lang/el/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/el/admin/statuslabels/table.php b/resources/lang/el/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/el/admin/statuslabels/table.php +++ b/resources/lang/el/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php index e1d5eba5c3..0b6ef1fcb9 100644 --- a/resources/lang/el/general.php +++ b/resources/lang/el/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Delete Image', 'image_upload' => 'Upload Image', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/en-GB/admin/custom_fields/general.php b/resources/lang/en-GB/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/en-GB/admin/custom_fields/general.php +++ b/resources/lang/en-GB/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/en-GB/admin/hardware/message.php b/resources/lang/en-GB/admin/hardware/message.php index dd23fe7474..26a5eec28f 100644 --- a/resources/lang/en-GB/admin/hardware/message.php +++ b/resources/lang/en-GB/admin/hardware/message.php @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/en-GB/admin/models/table.php b/resources/lang/en-GB/admin/models/table.php index 11a512b3d3..6c364796f4 100644 --- a/resources/lang/en-GB/admin/models/table.php +++ b/resources/lang/en-GB/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Asset Models', 'update' => 'Update Asset Model', 'view' => 'View Asset Model', - 'update' => 'Update Asset Model', + 'update' => 'Update Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', ); diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php index f45c678bf5..02dc48a619 100644 --- a/resources/lang/en-GB/admin/settings/general.php +++ b/resources/lang/en-GB/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/en-GB/admin/statuslabels/table.php b/resources/lang/en-GB/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/en-GB/admin/statuslabels/table.php +++ b/resources/lang/en-GB/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php index 96072b274c..0b84fcd694 100644 --- a/resources/lang/en-GB/general.php +++ b/resources/lang/en-GB/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Delete Image', 'image_upload' => 'Upload Image', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/en-ID/admin/custom_fields/general.php b/resources/lang/en-ID/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/en-ID/admin/custom_fields/general.php +++ b/resources/lang/en-ID/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/en-ID/admin/hardware/message.php b/resources/lang/en-ID/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/en-ID/admin/hardware/message.php +++ b/resources/lang/en-ID/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php index 623b000605..a365f803c1 100644 --- a/resources/lang/en-ID/admin/settings/general.php +++ b/resources/lang/en-ID/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/en-ID/admin/statuslabels/table.php b/resources/lang/en-ID/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/en-ID/admin/statuslabels/table.php +++ b/resources/lang/en-ID/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php index f13a6493cf..32a6162eb9 100644 --- a/resources/lang/en-ID/general.php +++ b/resources/lang/en-ID/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Delete Image', 'image_upload' => 'Upload Image', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/en/admin/custom_fields/general.php b/resources/lang/en/admin/custom_fields/general.php index 7182fecfdc..42a3684232 100644 --- a/resources/lang/en/admin/custom_fields/general.php +++ b/resources/lang/en/admin/custom_fields/general.php @@ -4,12 +4,18 @@ return array( 'custom_fields' => 'Custom Fields', 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', - 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database for each asset. The decrypted value of this field will only be viewable by admins.', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', + 'encrypted' => 'Encrypted', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored. Separate values and labels by pipes on each line (optional).', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', @@ -20,4 +26,5 @@ return array( 'order' => 'Order', 'create_fieldset' => 'New Fieldset', 'create_field' => 'New Custom Field', + 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value', ); diff --git a/resources/lang/en/admin/hardware/message.php b/resources/lang/en/admin/hardware/message.php index 26a5eec28f..8a170db8bf 100644 --- a/resources/lang/en/admin/hardware/message.php +++ b/resources/lang/en/admin/hardware/message.php @@ -37,9 +37,11 @@ return array( ), 'import' => array( - 'error' => 'Some items did not import correctly.', - 'errorDetail' => 'The following Items were not imported because of errors.', - 'success' => "Your file has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", + 'file_delete_success' => "Your file has been been successfully deleted", + 'file_delete_error' => "The file was unable to be deleted", ), diff --git a/resources/lang/en/admin/statuslabels/table.php b/resources/lang/en/admin/statuslabels/table.php index bd5d544fa5..b9b5b7ec4e 100644 --- a/resources/lang/en/admin/statuslabels/table.php +++ b/resources/lang/en/admin/statuslabels/table.php @@ -10,6 +10,7 @@ return array( 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/es-CO/admin/custom_fields/general.php b/resources/lang/es-CO/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/es-CO/admin/custom_fields/general.php +++ b/resources/lang/es-CO/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/es-CO/admin/hardware/message.php +++ b/resources/lang/es-CO/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php index 623b000605..a365f803c1 100644 --- a/resources/lang/es-CO/admin/settings/general.php +++ b/resources/lang/es-CO/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/es-CO/admin/statuslabels/table.php b/resources/lang/es-CO/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/es-CO/admin/statuslabels/table.php +++ b/resources/lang/es-CO/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php index e1d5eba5c3..0b6ef1fcb9 100644 --- a/resources/lang/es-CO/general.php +++ b/resources/lang/es-CO/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Delete Image', 'image_upload' => 'Upload Image', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/es-ES/admin/consumables/general.php b/resources/lang/es-ES/admin/consumables/general.php index 782359c039..6767702155 100644 --- a/resources/lang/es-ES/admin/consumables/general.php +++ b/resources/lang/es-ES/admin/consumables/general.php @@ -7,7 +7,7 @@ return array( 'cost' => 'Precio de compra', 'create' => 'Crear Consumible', 'date' => 'Fecha de compra', - 'item_no' => 'Item No.', + 'item_no' => 'Artículo núm.', 'order' => 'Orden de compra', 'remaining' => 'Restante', 'total' => 'Total', diff --git a/resources/lang/es-ES/admin/custom_fields/general.php b/resources/lang/es-ES/admin/custom_fields/general.php index de9acc173a..bf0a02e299 100644 --- a/resources/lang/es-ES/admin/custom_fields/general.php +++ b/resources/lang/es-ES/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Campo', 'about_fieldsets_title' => 'Acerca de los campos personalizados', 'about_fieldsets_text' => 'Los grupos de campos personalizados te permiten agrupar campos que se usan frecuentemente para determinados modelos de equipos.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Grupo de campos personalizados', 'qty_fields' => 'Campos de Cantidad', 'fieldsets' => 'Grupo de campos personalizados', 'fieldset_name' => 'Nombre del grupo', 'field_name' => 'Nombre del campo', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Elemento de formulario', 'field_element_short' => 'Elemento', 'field_format' => 'Formato', diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php index 00d800c70e..34506a3cae 100644 --- a/resources/lang/es-ES/admin/hardware/general.php +++ b/resources/lang/es-ES/admin/hardware/general.php @@ -3,7 +3,7 @@ return array( 'archived' => 'Archivado', 'asset' => 'Equipo', - 'bulk_checkout' => 'Checkout Assets to User', + 'bulk_checkout' => 'Asignar activos a un usuario', 'checkin' => 'Quitar Equipo', 'checkout' => 'Asignar a un usuario', 'clone' => 'Clonar Equipo', diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php index f8c0a79131..ef5f82ab6d 100644 --- a/resources/lang/es-ES/admin/hardware/message.php +++ b/resources/lang/es-ES/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,14 +52,15 @@ return array( 'checkout' => array( 'error' => 'Equipo no asignado, intentalo de nuevo', 'success' => 'Equipo asignado.', - 'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.' + 'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( 'error' => 'No se ha quitado el equipo. Intentalo de nuevo.', 'success' => 'Equipo quitado correctamente.', 'user_does_not_exist' => 'Este usuario no es correcto. Intentalo de nuevo.', - 'already_checked_in' => 'That asset is already checked in.', + 'already_checked_in' => 'Ese activo ya se quito.', ), diff --git a/resources/lang/es-ES/admin/licenses/form.php b/resources/lang/es-ES/admin/licenses/form.php index 4a5a435341..8dca9b5d41 100644 --- a/resources/lang/es-ES/admin/licenses/form.php +++ b/resources/lang/es-ES/admin/licenses/form.php @@ -9,7 +9,7 @@ return array( 'date' => 'Fecha Compra', 'depreciation' => 'Amortización', 'expiration' => 'Fecha de vencimiento', - 'license_key' => 'Product Key', + 'license_key' => 'Clave de producto', 'maintained' => 'Mantenido', 'name' => 'Aplicación', 'no_depreciation' => 'No Amortizar', diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php index dbec6bc1f4..fd00a920db 100644 --- a/resources/lang/es-ES/admin/settings/general.php +++ b/resources/lang/es-ES/admin/settings/general.php @@ -1,13 +1,13 @@ 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad' => 'Directorio Activo', + 'ad_domain' => 'Dominio del Directorio Activo', + 'ad_domain_help' => 'Esto es a veces el mismo que su correo electrónico de dominio, pero no siempre.', + 'is_ad' => 'Este es un servidor de Directorio Activo', 'alert_email' => 'Enviar alertas a', 'alerts_enabled' => 'Alertas habilitadas', - 'alert_interval' => 'Expiring Alerts Threshold (in days)', + 'alert_interval' => 'Limite de alertas de expiración (en días)', 'alert_inv_threshold' => 'Umbral de alerta del inventario', 'asset_ids' => 'IDs de Recurso', 'auto_increment_assets' => 'Generar IDs de equipo autoincrementales', @@ -26,10 +26,10 @@ return array( 'display_asset_name' => 'Mostrar Nombre Equipo', 'display_checkout_date' => 'Mostrar Fecha de Salida', 'display_eol' => 'Mostrar EOL', - 'display_qr' => 'Display Square Codes', - 'display_alt_barcode' => 'Display 1D barcode', - 'barcode_type' => '2D Barcode Type', - 'alt_barcode_type' => '1D barcode type', + 'display_qr' => 'Mostrar Códigos QR', + 'display_alt_barcode' => 'Mostrar códigos de barras en 1D', + 'barcode_type' => 'Tipo de códigos de barras 2D', + 'alt_barcode_type' => 'Tipo de códigos de barras 1D', 'eula_settings' => 'Configuración EULA', 'eula_markdown' => 'Este EULS permite makrdown estilo Github.', 'general_settings' => 'Configuración General', @@ -41,16 +41,18 @@ return array( 'ldap_integration' => 'Integración LDAP', 'ldap_settings' => 'Ajustes LDAP', 'ldap_server' => 'Servidor LDAP', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', + 'ldap_server_help' => 'Esto debería empezar con ldap:// (sin codificar o TLS) o ldaps:// (para SSL)', 'ldap_server_cert' => 'Certificado de validación SSL LDAP', 'ldap_server_cert_ignore' => 'Permitir certificados SSL inválidos', 'ldap_server_cert_help' => 'Selecciona este campo si estás usando un certificado SSL auto firmado y quieres aceptar un certificado SSL inválido.', - 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', + 'ldap_tls' => 'Usar TLS', + 'ldap_tls_help' => 'Esto se debe seleccionar si se está ejecutando STARTTLS en el servidor LDAP. ', 'ldap_uname' => 'Enlazar usuario LDAP', 'ldap_pword' => 'Enlazar contraseña LDAP', 'ldap_basedn' => 'Enlazar base DN', 'ldap_filter' => 'Filtro LDAP', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Campo de usuario', 'ldap_lname_field' => 'Apellido', 'ldap_fname_field' => 'Nombre LDAP', @@ -89,24 +91,24 @@ return array( 'labels_per_page' => 'Etiquetas por pàgina', 'label_dimensions' => 'Dimensiones de las etiquetas (pulgadas)', 'page_padding' => 'Margenès de pàgina (pulgadas)', - 'purge' => 'Purge Deleted Records', + 'purge' => 'Purgar registros eliminados', 'labels_display_bgutter' => 'Label bottom gutter', 'labels_display_sgutter' => 'Label side gutter', - 'labels_fontsize' => 'Label font size', - 'labels_pagewidth' => 'Label sheet width', - 'labels_pageheight' => 'Label sheet height', - 'label_gutters' => 'Label spacing (inches)', - 'page_dimensions' => 'Page dimensions (inches)', - 'label_fields' => 'Label visible fields', - 'inches' => 'inches', + 'labels_fontsize' => 'Tamaño de fuente de la etiqueta', + 'labels_pagewidth' => 'Ancho de la hoja de etiqueta', + 'labels_pageheight' => 'Altura de la hoja de etiqueta', + 'label_gutters' => 'Espaciamiento de etiqueta (pulgadas)', + 'page_dimensions' => 'Dimensiones de la página (pulgadas)', + 'label_fields' => 'Campos visibles de la etiqueta', + 'inches' => 'pulgadas', 'width_w' => 'w', 'height_h' => 'h', 'text_pt' => 'pt', - 'left' => 'left', - 'right' => 'right', - 'top' => 'top', - 'bottom' => 'bottom', + 'left' => 'izquierda', + 'right' => 'derecha', + 'top' => 'arriba', + 'bottom' => 'fondo', 'vertical' => 'vertical', 'horizontal' => 'horizontal', - 'zerofill_count' => 'Length of asset tags, including zerofill', + 'zerofill_count' => 'Longitud de etiquetas de activos, incluyendo relleno de ceros', ); diff --git a/resources/lang/es-ES/admin/settings/message.php b/resources/lang/es-ES/admin/settings/message.php index 8b569eaedb..3980dcd7a8 100644 --- a/resources/lang/es-ES/admin/settings/message.php +++ b/resources/lang/es-ES/admin/settings/message.php @@ -14,7 +14,7 @@ return array( 'file_not_found' => 'El archivo de respaldo no se ha encontrado en el servidor.', ), 'purge' => array( - 'error' => 'An error has occurred while purging. ', + 'error' => 'Ha ocurrido un error mientras se realizaba el purgado. ', 'validation_failed' => 'Su confirmación de purga es incorrecta. Por favor, escriba la palabra "Borrar" en el cuadro de confirmación.', 'success' => 'Registros eliminados correctamente purgados.' ), diff --git a/resources/lang/es-ES/admin/statuslabels/message.php b/resources/lang/es-ES/admin/statuslabels/message.php index 619a5a509c..4266485389 100644 --- a/resources/lang/es-ES/admin/statuslabels/message.php +++ b/resources/lang/es-ES/admin/statuslabels/message.php @@ -2,24 +2,24 @@ return array( - 'does_not_exist' => 'Status Label does not exist.', - 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', + 'does_not_exist' => 'Etiqueta de estado no existe.', + 'assoc_assets' => 'Esta etiqueta de estado esta actualmente asociado con al menos un activo y no se puede eliminar. Por favor actualice sus activos para ya no hacer referencia a este estado y vuelva a intentarlo. ', 'create' => array( - 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' + 'error' => 'Etiqueta de estado no fue creada, por favor, inténtelo de nuevo.', + 'success' => 'Etiqueta de estado fue creada exitosamente.' ), 'update' => array( - 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' + 'error' => 'Etiqueta de estado no se ha actualizado, por favor, inténtelo de nuevo', + 'success' => 'Etiqueta de estado fue actualizada exitosamente.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this Status Label?', - 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' + 'confirm' => '¿Está seguro que desea eliminar esta etiqueta de estado?', + 'error' => 'Hubo un problema borrando la etiqueta de estado. Por favor, inténtelo de nuevo.', + 'success' => 'La etiqueta de estado se ha eliminado exitosamente.' ) ); diff --git a/resources/lang/es-ES/admin/statuslabels/table.php b/resources/lang/es-ES/admin/statuslabels/table.php index b714436c6c..22b0080e50 100644 --- a/resources/lang/es-ES/admin/statuslabels/table.php +++ b/resources/lang/es-ES/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Info Etiquetas Estado', 'archived' => 'Archivado', 'create' => 'Crear Etiqueta Estado', + 'color' => 'Chart Color', 'deployable' => 'Desplegable', 'info' => 'Las etiquetas de estado se utilizan para describir los diferentes estados en que pueden estar tus equipos. Pueden estar fuera en reparación, perdidos/robados, etc. Puedes crear nuevas etiquetas de estado para equipos desplegables, pendientes o archivados.', 'name' => 'Estado', 'pending' => 'Pendiente', 'status_type' => 'Tipo de estado', + 'show_in_nav' => 'Show in side nav', 'title' => 'Etiquetas Estado', 'undeployable' => 'No desplegable', 'update' => 'Actualizar Etiqueta Estado', diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php index 3ec9da5b3f..a7b8cb4bd2 100644 --- a/resources/lang/es-ES/general.php +++ b/resources/lang/es-ES/general.php @@ -35,8 +35,8 @@ 'city' => 'Ciudad', 'companies' => 'Empresas', 'company' => 'Empresa', - 'component' => 'Component', - 'components' => 'Components', + 'component' => 'Componente', + 'components' => 'Componentes', 'consumable' => 'Consumible', 'consumables' => 'Consumibles', 'country' => 'Pais', @@ -57,25 +57,26 @@ 'depreciation' => 'Amortización', 'editprofile' => 'Editar Perfil', 'eol' => 'EOL', - 'email_domain' => 'Email Domain', - 'email_format' => 'Email Format', - 'email_domain_help' => 'This is used to generate email addresses when importing', - 'filastname_format' => 'First Initial Last Name (jsmith@example.com)', - 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)', + 'email_domain' => 'Dominio de correo electrónico', + 'email_format' => 'Formato de correo electrónico', + 'email_domain_help' => 'Esto se utiliza para generar direcciones de correo electrónico cuando se importan', + 'filastname_format' => 'Primera Inicial del Apellido (jsmith@ejemplo.com)', + 'firstname_lastname_format' => 'Primer Nombre y Apellido (jane.smith@ejemplo.com)', 'first' => 'Primero', 'first_name' => 'Nombre', - 'first_name_format' => 'First Name (jane@example.com)', + 'first_name_format' => 'Primer Nombre (jane@ejemplo.com)', 'file_name' => 'Archivo', 'file_uploads' => 'Carga de Archivos', 'generate' => 'Generar', 'groups' => 'Grupos', 'gravatar_email' => 'Gravatar Email', - 'history' => 'History', + 'history' => 'Historial', 'history_for' => 'Historial de', 'id' => 'Id', 'image_delete' => 'Borrar imagen', 'image_upload' => 'Enviar imagen', 'import' => 'Importar', + 'import-history' => 'Import History', 'asset_maintenance' => 'Mantenimiento de Equipo', 'asset_maintenance_report' => 'Reporte de Mantenimiento de Equipo', 'asset_maintenances' => 'Mantenimientos de Equipo', @@ -95,18 +96,18 @@ 'location' => 'Localización', 'locations' => 'Localizaciones', 'logout' => 'Desconexión', - 'lookup_by_tag' => 'Lookup by Asset Tag', + 'lookup_by_tag' => 'Buscar por etiqueta de activo', 'manufacturer' => 'Fabricante', 'manufacturers' => 'Fabricantes', - 'markdown' => 'This field allows Github flavored markdown.', - 'min_amt' => 'Min. QTY', - 'min_amt_help' => 'Minimum number of items that should be available before an alert gets triggered.', + 'markdown' => 'Este campo permite Github con sabor a markdown.', + 'min_amt' => 'Cantidad mínima', + 'min_amt_help' => 'Número mínimo de elementos que deben estar disponibles antes de obtiene desencadenar una alerta.', 'model_no' => 'Modelo No.', 'months' => 'Meses', 'moreinfo' => 'Más Info', 'name' => 'Nombre Localización', 'next' => 'Siguiente', - 'new' => 'new!', + 'new' => 'nuevo!', 'no_depreciation' => 'No Amortizar', 'no_results' => 'Sin Resultados.', 'no' => 'No', @@ -129,7 +130,7 @@ 'save' => 'Guardar', 'select' => 'Seleccionar', 'search' => 'Buscar', - 'select_category' => 'Select a Category', + 'select_category' => 'Seleccione una categoría', 'select_depreciation' => 'Seleccionar un tipo de Amortización', 'select_location' => 'Seleccionar una Ubicación', 'select_manufacturer' => 'Seleccionar un Fabricante', @@ -142,7 +143,7 @@ 'select_asset' => 'Seleccionar activos', 'settings' => 'Opciones', 'sign_in' => 'Entrar', - 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', + 'some_features_disabled' => 'MODO DE DEMOSTRACIÓN: Algunas funciones estan desactivadas para esta instalación.', 'site_name' => 'Sitio', 'state' => 'Provincia', 'status_labels' => 'Etiquetas Estados', @@ -153,7 +154,7 @@ 'type' => 'Tipo', 'undeployable' => 'No Instalable', 'unknown_admin' => 'Admin Desconocido', - 'username_format' => 'Username Format', + 'username_format' => 'Formato del nombre de usuario', 'update' => 'Actualizar', 'uploaded' => 'Subido', 'user' => 'Usuario', diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php index 1b3a49bc08..899ee1769e 100644 --- a/resources/lang/es-ES/validation.php +++ b/resources/lang/es-ES/validation.php @@ -64,8 +64,8 @@ return array( ), "unique" => ":attribute ya ha sido introducido.", "url" => ":attribute formato incorrecto.", - "statuslabel_type" => "You must select a valid status label type", - "unique_undeleted" => "The :attribute must be unique.", + "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido", + "unique_undeleted" => ":attribute debe ser único.", /* diff --git a/resources/lang/fa/admin/custom_fields/general.php b/resources/lang/fa/admin/custom_fields/general.php index 1065916b7a..d477b89017 100644 --- a/resources/lang/fa/admin/custom_fields/general.php +++ b/resources/lang/fa/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'فیلد', 'about_fieldsets_title' => 'درباره ی تنظیمات فیلد', 'about_fieldsets_text' => 'تنظیمات فیلد به شما امکان این را می دهد که گروه های فیلدهای سفارشی ایجاد کنید که مرتبا برای انواع مدل های دارایی خاص مورد استفاده ی مجدد قرار می گیرند.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'تنظیمات فیلد', 'qty_fields' => 'فیلد های Qty', 'fieldsets' => 'تنظیمات فیلد', 'fieldset_name' => 'نام تنظیمات فیلد', 'field_name' => 'نام فیلد', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'ایجاد یک عنصر', 'field_element_short' => 'عنصر', 'field_format' => 'شکل دادن', diff --git a/resources/lang/fa/admin/hardware/message.php b/resources/lang/fa/admin/hardware/message.php index ee49cc99fa..82266c9970 100644 --- a/resources/lang/fa/admin/hardware/message.php +++ b/resources/lang/fa/admin/hardware/message.php @@ -36,9 +36,9 @@ return array( ), 'import' => array( - 'error' => 'برخی از موارد به درستی وارد بود.', - 'errorDetail' => 'موارد زیر به دلیل خطاهای وارد شدند.', - 'success' => "دستور شما وارد شده است.", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -51,7 +51,8 @@ return array( 'checkout' => array( 'error' => 'دارایی در بررسی نیست، لطفا دوباره امتحان کنید', 'success' => 'دارایی را بررسی کنید موفقیت.', - 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.' + 'user_does_not_exist' => 'کاربر نامعتبر است لطفا دوباره امتحان کنید.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/fa/admin/settings/general.php b/resources/lang/fa/admin/settings/general.php index 99587288b2..0617217a2a 100644 --- a/resources/lang/fa/admin/settings/general.php +++ b/resources/lang/fa/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP اتصال رمز عبور', 'ldap_basedn' => 'اتصال پایگاه DN', 'ldap_filter' => 'LDAP فیلتر', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'فیلد نام کاربری', 'ldap_lname_field' => 'نام خانوادگی', 'ldap_fname_field' => 'LDAP نام', diff --git a/resources/lang/fa/admin/statuslabels/table.php b/resources/lang/fa/admin/statuslabels/table.php index 035133565f..8c4d47281d 100644 --- a/resources/lang/fa/admin/statuslabels/table.php +++ b/resources/lang/fa/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'درباره ی برچسب های وضعیت', 'archived' => 'آرشیو', 'create' => 'ساخت برچسب وضعیت', + 'color' => 'Chart Color', 'deployable' => 'گسترش', 'info' => 'برچسب های وضعیت، برای توصیف وضعیت های مختلفی که دارایی های شما می توانند داشته باشند، استفاده می شود. آن ها می توانند برای تعمیر، گمشده/دزدیده شده و غیره باشند. شما می توانید برچسب های وضعیت جدیدی برای گسترش کار، انتظار و آرشیو دارایی ها بسازید.', 'name' => 'نام وضعیت', 'pending' => 'در حالت انتظار', 'status_type' => 'نوع وضعیت', + 'show_in_nav' => 'Show in side nav', 'title' => 'برچسب های وضعیت', 'undeployable' => 'غیرقابل گسترش', 'update' => 'به روزرسانی برچسب وضعیت', diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php index 1954093471..1559c63cfb 100644 --- a/resources/lang/fa/general.php +++ b/resources/lang/fa/general.php @@ -78,6 +78,7 @@ 'image_delete' => 'عکس های پاک شده', 'image_upload' => 'آپلود تصویر', 'import' => 'واردات', + 'import-history' => 'Import History', 'asset_maintenance' => 'نگهداشت دارایی', 'asset_maintenance_report' => 'گزارش تعمیر و نگهداری دارایی ها', 'asset_maintenances' => 'نگهداشت دارایی', diff --git a/resources/lang/fi/admin/custom_fields/general.php b/resources/lang/fi/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/fi/admin/custom_fields/general.php +++ b/resources/lang/fi/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/fi/admin/hardware/message.php b/resources/lang/fi/admin/hardware/message.php index c04b0326cf..8965d9209d 100644 --- a/resources/lang/fi/admin/hardware/message.php +++ b/resources/lang/fi/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Laitteen luovutus epäonnistui, yritä uudelleen', 'success' => 'Laite luovutettu onnistuneesti.', - 'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.' + 'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/fi/admin/settings/general.php b/resources/lang/fi/admin/settings/general.php index 7ef91594ae..9fe2684f1c 100644 --- a/resources/lang/fi/admin/settings/general.php +++ b/resources/lang/fi/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Sukunimi', 'ldap_fname_field' => 'LDAP Etunimi', diff --git a/resources/lang/fi/admin/statuslabels/table.php b/resources/lang/fi/admin/statuslabels/table.php index 71d714d69e..666e476470 100644 --- a/resources/lang/fi/admin/statuslabels/table.php +++ b/resources/lang/fi/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Lisätietoja Tilamerkinnöistä', 'archived' => 'Arkistoitu', 'create' => 'Uusi Tilamerkintä', + 'color' => 'Chart Color', 'deployable' => 'Käyttööotettavissa', 'info' => 'Tilamerkintöjä käytetään kuvailemaan laitteidesi eri tiloja. Ne voivat olla korjauksessa, hävinneitä/varastettuja jne. Voit luoa uusia tilamerkintöjä käyttöönotettaville, odottaville sekä arkistoiduille laitteille.', 'name' => 'Tilan Nimi', 'pending' => 'Odottaa', 'status_type' => 'Tilatyyppi', + 'show_in_nav' => 'Show in side nav', 'title' => 'Tilamerkinnät', 'undeployable' => 'Käyttökelvoton', 'update' => 'Päivitä Tilamerkinnät', diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php index c1d6511564..92b0a13234 100644 --- a/resources/lang/fi/general.php +++ b/resources/lang/fi/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Poista Kuva', 'image_upload' => 'Lähetä Kuva', 'import' => 'Tuo tiedot', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/fr/admin/accessories/general.php b/resources/lang/fr/admin/accessories/general.php index 5d28ba7447..f895257676 100644 --- a/resources/lang/fr/admin/accessories/general.php +++ b/resources/lang/fr/admin/accessories/general.php @@ -6,11 +6,11 @@ return array( 'accessory_category' => 'Catégorie d\'accessoire', 'accessory_name' => 'Nom de l\'accessoire', 'cost' => 'Prix d\'achat', - 'checkout' => 'Checkout Accessory', - 'checkin' => 'Checkin Accessory', + 'checkout' => 'Attribuer l\'accessoire', + 'checkin' => 'Dissocier l\'accessoire', 'create' => 'Création d\'accessoire', 'date' => 'Date d\'achat', - 'edit' => 'Edit Accessory', + 'edit' => 'Modifier l\'accessoire', 'eula_text' => 'License de catégorie', 'eula_text_help' => 'Ce champ vous permet de configurer vos licenses d\'utilisation pour chaque type d\'items. Si vous avez seulement une license pour tout vos items, vous pouvez cochez la case ci-dessous pour utiliser celle par défaut.', 'require_acceptance' => 'L\'utilisateur doit confirmer qu\'il accepte les items dans cette catégorie.', diff --git a/resources/lang/fr/admin/accessories/message.php b/resources/lang/fr/admin/accessories/message.php index e9832a5ecd..67c93bc778 100644 --- a/resources/lang/fr/admin/accessories/message.php +++ b/resources/lang/fr/admin/accessories/message.php @@ -16,9 +16,9 @@ return array( ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this accessory?', - 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' + 'confirm' => 'Etes-vous sûr de vouloir supprimer cet accessoire ?', + 'error' => 'Un problème est survenu durant la suppression de l\'accessoire. Merci d\'essayer à nouveau.', + 'success' => 'L\'accessoire a bien été supprimé.' ), 'checkout' => array( diff --git a/resources/lang/fr/admin/categories/message.php b/resources/lang/fr/admin/categories/message.php index 6cefc31867..f3a543a181 100644 --- a/resources/lang/fr/admin/categories/message.php +++ b/resources/lang/fr/admin/categories/message.php @@ -3,8 +3,8 @@ return array( 'does_not_exist' => 'Cette catégorie n\'existe pas.', - 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', - 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', + 'assoc_models' => 'Cette catégorie est actuellement associée à au moins un modèle et ne peut pas être supprimée. Merci de mettre à jour les modèles afin de ne plus référencer cette catégorie et essayez à nouveau. ', + 'assoc_items' => 'Cette catégorie est actuellement associée à au moins un :asset_type et ne peut pas être supprimée. Merci de mettre à jour les :asset_type afin de ne plus référencer cette catégorie et essayez à nouveau. ', 'create' => array( 'error' => 'Cette catégorie n\'a pas été créée, veuillez réessayer.', diff --git a/resources/lang/fr/admin/components/general.php b/resources/lang/fr/admin/components/general.php index 75c9d250ab..6960628a49 100644 --- a/resources/lang/fr/admin/components/general.php +++ b/resources/lang/fr/admin/components/general.php @@ -1,17 +1,17 @@ 'About Components', - 'about_components_text' => 'Components are items that are part of an asset, for example HDD, RAM, etc.', - 'component_name' => 'Component Name', - 'checkin' => 'Checkin Component', - 'checkout' => 'Checkout Component', - 'cost' => 'Purchase Cost', - 'create' => 'Create Component', - 'edit' => 'Edit Component', - 'date' => 'Purchase Date', - 'order' => 'Order Number', - 'remaining' => 'Remaining', + 'about_components_title' => 'A propos des composants', + 'about_components_text' => 'Les composants sont des éléments constitutifs d\'un objet, par exemple HDD, RAM, etc.', + 'component_name' => 'Nom du composant', + 'checkin' => 'Dissocier un composant', + 'checkout' => 'Attribuer un composant', + 'cost' => 'Coût d\'achat', + 'create' => 'Créer un composant', + 'edit' => 'Modifier un composant', + 'date' => 'Date d\'achat', + 'order' => 'Numéro de commande', + 'remaining' => 'Restant', 'total' => 'Total', - 'update' => 'Update Component', + 'update' => 'Mettre à jour un composant', ); diff --git a/resources/lang/fr/admin/components/message.php b/resources/lang/fr/admin/components/message.php index 1d13970f23..650626e937 100644 --- a/resources/lang/fr/admin/components/message.php +++ b/resources/lang/fr/admin/components/message.php @@ -2,34 +2,34 @@ return array( - 'does_not_exist' => 'Component does not exist.', + 'does_not_exist' => 'Le composant n\'existe pas.', 'create' => array( - 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' + 'error' => 'Le composant n\'a pas été créé, merci d\'essayer à nouveau.', + 'success' => 'Le composant a bien été créé.' ), 'update' => array( - 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' + 'error' => 'Le composant n\'a pas été mis à jour, merci d\'essayer à nouveau', + 'success' => 'Le composant a bien été mis à jour.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this component?', - 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' + 'confirm' => 'Etes-vous sûr de vouloir supprimer ce composant?', + 'error' => 'Un problème est survenu durant la suppression de ce composant. Merci d\'essayer à nouveau.', + 'success' => 'Le composant a bien été supprimé.' ), 'checkout' => array( - 'error' => 'Component was not checked out, please try again', - 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Le composant n\'a pas été libéré, merci d\'essayer à nouveau', + 'success' => 'Le composant a bien été libéré.', + 'user_does_not_exist' => 'Cet utilisateur n\'est pas valide. Merci d\'essayer à nouveau.' ), 'checkin' => array( - 'error' => 'Component was not checked in, please try again', - 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Le composant n\'a pas été réceptionné, merci d\'essayer à nouveau', + 'success' => 'Le composant a bien été réceptionné.', + 'user_does_not_exist' => 'Cet utilisateur n\'est pas valide. Merci d\'essayer à nouveau.' ) diff --git a/resources/lang/fr/admin/components/table.php b/resources/lang/fr/admin/components/table.php index 3d4fed6a7f..3d5d825990 100644 --- a/resources/lang/fr/admin/components/table.php +++ b/resources/lang/fr/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', + 'title' => 'Nom du composant', ); diff --git a/resources/lang/fr/admin/consumables/general.php b/resources/lang/fr/admin/consumables/general.php index ac23e8f770..17b2617e3a 100644 --- a/resources/lang/fr/admin/consumables/general.php +++ b/resources/lang/fr/admin/consumables/general.php @@ -7,7 +7,7 @@ return array( 'cost' => 'Coût d\'achat', 'create' => 'Créer une fourniture', 'date' => 'Date d\'achat', - 'item_no' => 'Item No.', + 'item_no' => 'Num. d\'élément', 'order' => 'Numéro de commande', 'remaining' => 'Quantité restante', 'total' => 'Total', diff --git a/resources/lang/fr/admin/custom_fields/general.php b/resources/lang/fr/admin/custom_fields/general.php index 24a09d2200..0ce0ecf76b 100644 --- a/resources/lang/fr/admin/custom_fields/general.php +++ b/resources/lang/fr/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Champ', 'about_fieldsets_title' => 'A propos des fieldsets', 'about_fieldsets_text' => 'Les fieldsets permettent de créer des groupes de champs personnalisés que vous utilisez fréquemment pour des types de modèles spécifiques.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qté de champs', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Nom du fieldset', 'field_name' => 'Nom du champ', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Élément de formulaire', 'field_element_short' => 'Elément', 'field_format' => 'Format', diff --git a/resources/lang/fr/admin/hardware/form.php b/resources/lang/fr/admin/hardware/form.php index 0ab6437efd..77d0c0dbf0 100644 --- a/resources/lang/fr/admin/hardware/form.php +++ b/resources/lang/fr/admin/hardware/form.php @@ -1,8 +1,8 @@ 'Confrm Bulk Delete Assets', - 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', + 'bulk_delete' => 'Confirmez la suppression du lot d\'objets', + 'bulk_delete_help' => 'Vérifiez les objets ci-dessous pour la suppression du lot. Une fois supprimés, ces objets peuvent être restaurés, mais ils ne seront plus associés avec les utilisateurs auxquels ils sont actuellement assignés.', 'bulk_delete_warn' => 'Vous allez supprimer :asset_count objets.', 'bulk_update' => 'Mise à jour en bloc d\'actifs', 'bulk_update_help' => 'Ce formulaire vous permet de mettre à jour plusieurs actifs à la fois. Seulement remplir les champs que vous devez modifier. Tous les champs laissés vides resteront inchangés. ', diff --git a/resources/lang/fr/admin/hardware/general.php b/resources/lang/fr/admin/hardware/general.php index c728308ef4..954b18e4f1 100644 --- a/resources/lang/fr/admin/hardware/general.php +++ b/resources/lang/fr/admin/hardware/general.php @@ -3,7 +3,7 @@ return array( 'archived' => 'Retiré', 'asset' => 'Biens', - 'bulk_checkout' => 'Checkout Assets to User', + 'bulk_checkout' => 'Attribuer les objets à l\'utilisateur', 'checkin' => 'Retour des Biens', 'checkout' => 'Sortie des Biens', 'clone' => 'Cloner le Bien', diff --git a/resources/lang/fr/admin/hardware/message.php b/resources/lang/fr/admin/hardware/message.php index e1138e394d..f55a73dffd 100644 --- a/resources/lang/fr/admin/hardware/message.php +++ b/resources/lang/fr/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,20 +52,21 @@ return array( 'checkout' => array( 'error' => 'Ce bien n\'a pas été sorti, veuillez réessayer', 'success' => 'Ce bien a été sorti correctement.', - 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.' + 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( 'error' => 'Ce bien n\'a pas été retourné, veuillez réessayer', 'success' => 'Ce bien a été retourné correctement.', 'user_does_not_exist' => 'Cet utilisateur est invalide. Veuillez réessayer.', - 'already_checked_in' => 'That asset is already checked in.', + 'already_checked_in' => 'Ce bien est déjà dissocié.', ), 'requests' => array( - 'error' => 'Asset was not requested, please try again', - 'success' => 'Asset requested successfully.', + 'error' => 'Le bien n\'a pas été demandé, merci d\'essayer à nouveau', + 'success' => 'Le bien a été demandé correctement.', ) ); diff --git a/resources/lang/fr/admin/licenses/form.php b/resources/lang/fr/admin/licenses/form.php index f4d249e955..5ad1bf919e 100644 --- a/resources/lang/fr/admin/licenses/form.php +++ b/resources/lang/fr/admin/licenses/form.php @@ -9,7 +9,7 @@ return array( 'date' => 'Date d\'achat', 'depreciation' => 'Amortissement', 'expiration' => 'Date d\'expiration', - 'license_key' => 'Product Key', + 'license_key' => 'Clé du produit', 'maintained' => 'Maintenu', 'name' => 'Nom du logiciel', 'no_depreciation' => 'Ne pas amortir', diff --git a/resources/lang/fr/admin/locations/table.php b/resources/lang/fr/admin/locations/table.php index 4a374949bc..fa7dc2c85e 100644 --- a/resources/lang/fr/admin/locations/table.php +++ b/resources/lang/fr/admin/locations/table.php @@ -1,8 +1,8 @@ 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. - 'assets_checkedout' => 'Assets Assigned', + 'assets_rtd' => 'Biens', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. + 'assets_checkedout' => 'Biens assignés', 'id' => 'ID', 'city' => 'Ville', 'state' => 'État', diff --git a/resources/lang/fr/admin/models/general.php b/resources/lang/fr/admin/models/general.php index 5d4d417fa0..f2e41f557c 100644 --- a/resources/lang/fr/admin/models/general.php +++ b/resources/lang/fr/admin/models/general.php @@ -7,7 +7,7 @@ return array( 'show_mac_address' => 'Afficher le champ pour l\'adresse MAC pour ce modèle d\'actif', 'view_deleted' => 'Voir les modèles détruits', 'view_models' => 'Voir les différents modèles', - 'fieldset' => 'Fieldset', - 'no_custom_field' => 'No custom fields', + 'fieldset' => 'Ensemble de champs', + 'no_custom_field' => 'Pas de champs personnalisés', ); diff --git a/resources/lang/fr/admin/models/table.php b/resources/lang/fr/admin/models/table.php index 727ba77e1b..7357c42f91 100644 --- a/resources/lang/fr/admin/models/table.php +++ b/resources/lang/fr/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Modèles d\'actif', 'update' => 'Mettre à jour le modèle d\'actif', 'view' => 'Voir le modèle d\'actif', - 'update' => 'Mettre à jour le modèle d\'actif', + 'update' => 'Mettre à jour le modèle', 'clone' => 'Cloner le modèle', 'edit' => 'Éditer le modèle', ); diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php index 6dedfe11e8..1e532a4890 100644 --- a/resources/lang/fr/admin/settings/general.php +++ b/resources/lang/fr/admin/settings/general.php @@ -1,35 +1,35 @@ 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad' => 'Service d\'annuaire', + 'ad_domain' => 'Domaine du service d\'annuaire', + 'ad_domain_help' => 'C\'est parfois le même que votre domaine d\'e-mail, mais pas toujours.', + 'is_ad' => 'C\'est un serveur Active Directory', 'alert_email' => 'Envoyer les alertes à', - 'alerts_enabled' => 'Alerts Enabled', - 'alert_interval' => 'Expiring Alerts Threshold (in days)', - 'alert_inv_threshold' => 'Inventory Alert Threshold', + 'alerts_enabled' => 'Alertes activées', + 'alert_interval' => 'Seuil d\'expiration des alertes (en jours)', + 'alert_inv_threshold' => 'Seuil d\'alerte d\'inventaire', 'asset_ids' => 'ID de l\'actif', 'auto_increment_assets' => 'Générer des identifiants d\'actifs auto-incrémentés', 'auto_increment_prefix' => 'Préfixe (optionnel)', 'auto_incrementing_help' => 'Activer l\'auto-incrémentation des ID d\'actif avant de sélectionner cette option', 'backups' => 'Sauvegardes', 'barcode_settings' => 'Configuration des codes à barres', - 'confirm_purge' => 'Confirm Purge', - 'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.', + 'confirm_purge' => 'Confirmer la purge', + 'confirm_purge_help' => 'Entrer le texte "DELETE" dans la boite ci-dessous pour purger les enregistrements supprimés. Cette action est irréversible.', 'custom_css' => 'CSS personnalisé', 'custom_css_help' => 'Entrez les codes CSS personnalisé que vous souhaitez utiliser . Ne pas inclure les balises <style></style>.', 'default_currency' => 'Devise par défaut', 'default_eula_text' => 'Licence d\'utilisation par défaut', - 'default_language' => 'Default Language', + 'default_language' => 'Langue par défaut', 'default_eula_help_text' => 'Vous pouvez également associer les licences d\'utilisations personnalisés à des catégories spécifiques d\'actifs .', 'display_asset_name' => 'Afficher le nom des actifs', 'display_checkout_date' => 'Afficher la date d\'association', 'display_eol' => 'Afficher la fin de vie dans les tables', - 'display_qr' => 'Display Square Codes', - 'display_alt_barcode' => 'Display 1D barcode', - 'barcode_type' => '2D Barcode Type', - 'alt_barcode_type' => '1D barcode type', + 'display_qr' => 'Affiche les QR codes', + 'display_alt_barcode' => 'Affiche le code-barres 1D', + 'barcode_type' => 'Type du code-barres 2D', + 'alt_barcode_type' => 'Type du code-barres 1D', 'eula_settings' => 'Configuration pour les licences d\'utilisation', 'eula_markdown' => 'Cette licence d\'utilisation permet l\'utilisation des "Github flavored markdown".', 'general_settings' => 'Configuration générale', @@ -37,33 +37,35 @@ return array( 'header_color' => 'Couleur de l\'en-tête', 'info' => 'Ces paramètres vous permettent de personnaliser certains aspects de votre installation.', 'laravel' => 'Version de Laravel', - 'ldap_enabled' => 'LDAP enabled', - 'ldap_integration' => 'LDAP Integration', - 'ldap_settings' => 'LDAP Settings', - 'ldap_server' => 'LDAP Server', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', - 'ldap_server_cert' => 'LDAP SSL certificate validation', - 'ldap_server_cert_ignore' => 'Allow invalid SSL Certificate', - 'ldap_server_cert_help' => 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.', - 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', - 'ldap_uname' => 'LDAP Bind Username', - 'ldap_pword' => 'LDAP Bind Password', - 'ldap_basedn' => 'Base Bind DN', - 'ldap_filter' => 'LDAP Filter', - 'ldap_username_field' => 'Username Field', - 'ldap_lname_field' => 'Last Name', - 'ldap_fname_field' => 'LDAP First Name', - 'ldap_auth_filter_query' => 'LDAP Authentication query', - 'ldap_version' => 'LDAP Version', - 'ldap_active_flag' => 'LDAP Active Flag', - 'ldap_emp_num' => 'LDAP Employee Number', - 'ldap_email' => 'LDAP Email', - 'load_remote_text' => 'Remote Scripts', - 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', + 'ldap_enabled' => 'LDAP activé', + 'ldap_integration' => 'Intégration LDAP', + 'ldap_settings' => 'Paramètres LDAP', + 'ldap_server' => 'Serveur LDAP', + 'ldap_server_help' => 'Ca devrait commencer par ldap:// (non crypté ou TLS) ou ldaps:// (SSL)', + 'ldap_server_cert' => 'Validation du certificat SSL LDAP', + 'ldap_server_cert_ignore' => 'Autorise un certificat SSL invalide', + 'ldap_server_cert_help' => 'Sélectionnez cette case à cocher si vous utilisez un certificat SSL auto-signé et voudriez accepter un certificat SSL invalide.', + 'ldap_tls' => 'Utilisez TLS', + 'ldap_tls_help' => 'A cocher seulement si vous utilisez STARTTLS sur votre serveur LDAP. ', + 'ldap_uname' => 'Nom d\'utilisateur bind LDAP', + 'ldap_pword' => 'Mot de passe bind LDAP', + 'ldap_basedn' => 'Bind de base DN', + 'ldap_filter' => 'Filtre LDAP', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', + 'ldap_username_field' => 'Champ nom d\'utilisateur', + 'ldap_lname_field' => 'Nom de famille', + 'ldap_fname_field' => 'Prénom LDAP', + 'ldap_auth_filter_query' => 'Requête d\'authentification LDAP', + 'ldap_version' => 'Version LDAP', + 'ldap_active_flag' => 'Signal d\'activation LDAP', + 'ldap_emp_num' => 'Numéro d\'employé LDAP', + 'ldap_email' => 'E-mail LDAP', + 'load_remote_text' => 'Scripts distants', + 'load_remote_help_text' => 'Cette installation Snipe-IT peut charger des scripts depuis le monde extérieur.', 'logo' => 'Logo', - 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', - 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', + 'full_multiple_companies_support_help_text' => 'Restreindre les utilisateurs (admins compris) assignés à des organisations aux biens de leur propre organisation.', + 'full_multiple_companies_support_text' => 'Support complet des organisations multiples', 'optional' => 'facultatif', 'per_page' => 'Résultats par page', 'php' => 'Version de PHP', @@ -83,30 +85,30 @@ return array( 'system' => 'Information du système', 'update' => 'Mettre à jour les paramètres', 'value' => 'Valeur', - 'brand' => 'Branding', - 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', - 'labels_per_page' => 'Labels per page', - 'label_dimensions' => 'Label dimensions (inches)', - 'page_padding' => 'Page margins (inches)', - 'purge' => 'Purge Deleted Records', - 'labels_display_bgutter' => 'Label bottom gutter', - 'labels_display_sgutter' => 'Label side gutter', - 'labels_fontsize' => 'Label font size', - 'labels_pagewidth' => 'Label sheet width', - 'labels_pageheight' => 'Label sheet height', - 'label_gutters' => 'Label spacing (inches)', - 'page_dimensions' => 'Page dimensions (inches)', - 'label_fields' => 'Label visible fields', - 'inches' => 'inches', - 'width_w' => 'w', + 'brand' => 'Marque', + 'about_settings_title' => 'A propos des réglages', + 'about_settings_text' => 'Ces réglages vous permettent de personnaliser certains aspects de votre installation.', + 'labels_per_page' => 'Etiquettes par page', + 'label_dimensions' => 'Dimensions de l\'étiquette (en pouces)', + 'page_padding' => 'Marges de la page (en pouces)', + 'purge' => 'Purger les enregistrements supprimés', + 'labels_display_bgutter' => 'Etiquette de la gouttière du bas', + 'labels_display_sgutter' => 'Etiquette de la gouttière latérale', + 'labels_fontsize' => 'Taille de caractère de l\'étiquette', + 'labels_pagewidth' => 'Largeur de l\'étiquette', + 'labels_pageheight' => 'Hauteur de l\'étiquette', + 'label_gutters' => 'Espacement de l\'étiquette (en pouces)', + 'page_dimensions' => 'Dimensions de la page (en pouces)', + 'label_fields' => 'Champs visibles de l\'étiquette', + 'inches' => 'pouces', + 'width_w' => 'l', 'height_h' => 'h', 'text_pt' => 'pt', - 'left' => 'left', - 'right' => 'right', - 'top' => 'top', - 'bottom' => 'bottom', - 'vertical' => 'vertical', + 'left' => 'gauche', + 'right' => 'droite', + 'top' => 'haut', + 'bottom' => 'bas', + 'vertical' => 'veritcal', 'horizontal' => 'horizontal', - 'zerofill_count' => 'Length of asset tags, including zerofill', + 'zerofill_count' => 'Longueur des étiquettes de bien, incluant le remplissage de zéros', ); diff --git a/resources/lang/fr/admin/settings/message.php b/resources/lang/fr/admin/settings/message.php index cd04b77663..998b15ff56 100644 --- a/resources/lang/fr/admin/settings/message.php +++ b/resources/lang/fr/admin/settings/message.php @@ -14,9 +14,9 @@ return array( 'file_not_found' => 'Ce fichier de sauvegarde n\'a pas pu être trouvé sur le serveur .', ), 'purge' => array( - 'error' => 'An error has occurred while purging. ', - 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' + 'error' => 'Une erreur est survenue durant la purge. ', + 'validation_failed' => 'Votre confirmation de purge est incorrecte. Merci d\'écrire le mot "DELETE" dans la fenêtre de confirmation.', + 'success' => 'Les enregistrements supprimés ont bien été purgés.' ), ); diff --git a/resources/lang/fr/admin/statuslabels/message.php b/resources/lang/fr/admin/statuslabels/message.php index 619a5a509c..d8ecf356ff 100644 --- a/resources/lang/fr/admin/statuslabels/message.php +++ b/resources/lang/fr/admin/statuslabels/message.php @@ -2,24 +2,24 @@ return array( - 'does_not_exist' => 'Status Label does not exist.', - 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', + 'does_not_exist' => 'L\'étiquette de statut n\'existe pas.', + 'assoc_assets' => 'Cette étiquette de statut est actuellement associée avec au moins un bien et ne peut être supprimée. Merci de mettre à jour vos biens pour ne plus référencer ce statut et essayez à nouveau. ', 'create' => array( - 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' + 'error' => 'L\'étiquette de statut n\'a pas été créée, merci d\'essayer à nouveau.', + 'success' => 'L\'étiquette de statut a bien été créée.' ), 'update' => array( - 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' + 'error' => 'L\'étiquette de statut n\'a pas été mise à jour, merci de réessayer', + 'success' => 'L\'étiquette de statut a bien été mise à jour.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this Status Label?', - 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' + 'confirm' => 'Etes-vous sûr de vouloir supprimer cette étiquette de statut?', + 'error' => 'Un problème est survenu durant la suppression de cette étiquette de statut. Merci d\'essayer à nouveau.', + 'success' => 'L\'étiquette de statut a bien été supprimée.' ) ); diff --git a/resources/lang/fr/admin/statuslabels/table.php b/resources/lang/fr/admin/statuslabels/table.php index 75de0d3f3d..d9c47bde2c 100644 --- a/resources/lang/fr/admin/statuslabels/table.php +++ b/resources/lang/fr/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'À propos des étiquettes de statut', 'archived' => 'Retiré', 'create' => 'Créé une étiquette de statut', + 'color' => 'Chart Color', 'deployable' => 'Déployable', 'info' => 'Les étiquettes d\'état sont utilisés pour décrire les différents états de vos actifs. Ils peuvent être pour réparation , perdu / volé , etc. Vous pouvez créer de nouvelles étiquettes d\'état pour déployable , en attente et actifs retirés.', 'name' => 'Nom du statut', 'pending' => 'En attente', 'status_type' => 'Type d\'état', + 'show_in_nav' => 'Show in side nav', 'title' => 'Étiquette de statut', 'undeployable' => 'Non déployable', 'update' => 'Mettre à jour l\'étiquette de statut', diff --git a/resources/lang/fr/admin/users/general.php b/resources/lang/fr/admin/users/general.php index 6476bc1e29..c364a9eb5b 100644 --- a/resources/lang/fr/admin/users/general.php +++ b/resources/lang/fr/admin/users/general.php @@ -4,14 +4,14 @@ return array( 'assets_user' => 'Actifs associés avec :name', - 'current_assets' => 'Assets currently checked out to this user', + 'current_assets' => 'Biens actuellement attribués à cet utilisateur', 'clone' => 'Cloner l\'utilisateur', 'contact_user' => 'Contact :name', 'edit' => 'Modifier l\'utilisateur', 'filetype_info' => 'Types de fichier autorisés: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', 'history_user' => 'Historique pour :name', 'last_login' => 'Dernière connexion', - 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', + 'ldap_config_text' => 'Les paramètres de configuration LDAP se trouvent sous Admin > Réglages. La localisation sélectionnée (optionnelle) sera définie pour tous les utilisateurs importés.', 'software_user' => 'Logiciels associés avec :name', 'view_user' => 'Voir l\'utilisateur :name', 'usercsv' => 'Fichier CSV', diff --git a/resources/lang/fr/admin/users/message.php b/resources/lang/fr/admin/users/message.php index e2ee955dc7..45448b57a0 100644 --- a/resources/lang/fr/admin/users/message.php +++ b/resources/lang/fr/admin/users/message.php @@ -33,7 +33,7 @@ return array( 'import' => 'Il y a eu un problème lors de l\'importation des utilisateurs. Veuillez réessayer.', 'asset_already_accepted' => 'Cet actif a déjà été accepté.', 'accept_or_decline' => 'Vous devez accepter ou refuser cet actif.', - 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', + 'incorrect_user_accepted' => 'Le bien que vous avez tenté d\'accepter ne vous avait pas été attribué.', 'ldap_could_not_connect' => 'Impossible de se connecter au serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP .
Erreur du serveur LDAP :', 'ldap_could_not_bind' => 'Impossible de se connecter au serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP .
Erreur de serveur LDAP : ', 'ldap_could_not_search' => 'Impossible de rechercher le serveur LDAP . S\'il vous plaît vérifier la configuration de votre serveur LDAP dans le fichier de configuration LDAP .
Erreur de serveur LDAP :', diff --git a/resources/lang/fr/auth/general.php b/resources/lang/fr/auth/general.php index bf88cba77a..85be7ede28 100644 --- a/resources/lang/fr/auth/general.php +++ b/resources/lang/fr/auth/general.php @@ -1,12 +1,12 @@ 'Send Password Reset Link', - 'email_reset_password' => 'Email Password Reset', - 'reset_password' => 'Reset Password', - 'login' => 'Login', - 'login_prompt' => 'Please Login', - 'forgot_password' => 'I forgot my password', - 'remember_me' => 'Remember Me', + 'send_password_link' => 'Envoyer un lien pour réinitialiser un mot de passe', + 'email_reset_password' => 'E-mail pour réinitialiser le mot de passe', + 'reset_password' => 'Réinitialiser le mot de passe', + 'login' => 'Connexion', + 'login_prompt' => 'Veuillez vous connecter', + 'forgot_password' => 'J\'ai oublié mon mot de passe', + 'remember_me' => 'Rappelez-vous de moi', ]; diff --git a/resources/lang/fr/button.php b/resources/lang/fr/button.php index 6c075f202e..1edcde1546 100644 --- a/resources/lang/fr/button.php +++ b/resources/lang/fr/button.php @@ -5,7 +5,7 @@ return array( 'actions' => 'Actions', 'add' => 'Ajouter', 'cancel' => 'Annuler', - 'checkin_and_delete' => 'Checkin & Delete User', + 'checkin_and_delete' => 'Dissocier et supprimer l\'utilisateur', 'delete' => 'Supprimer', 'edit' => 'Éditer', 'restore' => 'Restaurer', diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php index 01333bba5e..9f8c44ce90 100644 --- a/resources/lang/fr/general.php +++ b/resources/lang/fr/general.php @@ -9,7 +9,7 @@ 'activity_report' => 'Rapport d\'activité', 'address' => 'Adresse', 'admin' => 'Admin', - 'add_seats' => 'Added seats', + 'add_seats' => 'Places ajoutées', 'all_assets' => 'Tous les actifs', 'all' => 'Tous', 'archived' => 'Retiré', @@ -23,7 +23,7 @@ 'avatar_upload' => 'Charger un Avatar', 'back' => 'Retour', 'bad_data' => 'Aucun résultat, les données sont peut-être erronées?', - 'bulk_checkout' => 'Bulk Checkout', + 'bulk_checkout' => 'Attribution par lot', 'cancel' => 'Annuler', 'categories' => 'Catégories', 'category' => 'Сatégorie', @@ -35,8 +35,8 @@ 'city' => 'Ville', 'companies' => 'Compagnies', 'company' => 'Compagnie', - 'component' => 'Component', - 'components' => 'Components', + 'component' => 'Composant', + 'components' => 'Composants', 'consumable' => 'Fourniture', 'consumables' => 'Fournitures', 'country' => 'Pays', @@ -50,38 +50,39 @@ 'date' => 'Date', 'delete' => 'Supprimer', 'deleted' => 'Supprimé', - 'delete_seats' => 'Deleted Seats', + 'delete_seats' => 'Places supprimées', 'deployed' => 'Déployé', 'depreciation_report' => 'Rapport d’amortissement', 'download' => 'Télécharger', 'depreciation' => 'Amortissement', 'editprofile' => 'Éditer votre profile', 'eol' => 'Fin de vie', - 'email_domain' => 'Email Domain', - 'email_format' => 'Email Format', - 'email_domain_help' => 'This is used to generate email addresses when importing', - 'filastname_format' => 'First Initial Last Name (jsmith@example.com)', - 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)', + 'email_domain' => 'Domaine de l\'e-mail', + 'email_format' => 'Format de l\'e-mail', + 'email_domain_help' => 'C\'est utilisé pour générer des adresses e-mail lors de l\'importation', + 'filastname_format' => 'Première lettre du prénom Nom de famille (jsmith@example.com)', + 'firstname_lastname_format' => 'Prénom Nom de famille (jane.smith@example.com)', 'first' => 'Premier', 'first_name' => 'Prénom', - 'first_name_format' => 'First Name (jane@example.com)', + 'first_name_format' => 'Prénom (jane@example.com)', 'file_name' => 'Fichier', 'file_uploads' => 'Uploads de fichiers', 'generate' => 'Générer', 'groups' => 'Groupes', 'gravatar_email' => 'E-mail adresse Gravatar', - 'history' => 'History', + 'history' => 'Historique', 'history_for' => 'Historique pour', 'id' => 'ID', 'image_delete' => 'Supprimer l\'image', 'image_upload' => 'Charger une image', 'import' => 'Importer', + 'import-history' => 'Import History', 'asset_maintenance' => 'Gestion des actifs', 'asset_maintenance_report' => 'Rapport sur l\'entretien d\'actif', 'asset_maintenances' => 'Entretien d\'actifs', 'item' => 'Item', 'insufficient_permissions' => 'Autorisations insuffisantes !', - 'language' => 'Language', + 'language' => 'Langue', 'last' => 'Dernier', 'last_name' => 'Nom', 'license' => 'Licence', @@ -95,18 +96,18 @@ 'location' => 'Lieu', 'locations' => 'Lieux', 'logout' => 'Se déconnecter', - 'lookup_by_tag' => 'Lookup by Asset Tag', + 'lookup_by_tag' => 'Recherche par étiquette de bien', 'manufacturer' => 'Fabricant', 'manufacturers' => 'Fabricants', - 'markdown' => 'This field allows Github flavored markdown.', - 'min_amt' => 'Min. QTY', - 'min_amt_help' => 'Minimum number of items that should be available before an alert gets triggered.', + 'markdown' => 'Ce champ permet Github flavored markdown.', + 'min_amt' => 'Qté min', + 'min_amt_help' => 'Nombre minimum de biens qui devraient être disponibles avant qu\'une alerte soit déclenchée.', 'model_no' => 'Model n°.', 'months' => 'mois', 'moreinfo' => 'Plus d\'info', 'name' => 'Nom', 'next' => 'Prochain', - 'new' => 'new!', + 'new' => 'nouveau!', 'no_depreciation' => 'Pas d\'amortissement', 'no_results' => 'Pas de résultat.', 'no' => 'Non', @@ -123,13 +124,13 @@ 'quantity' => 'Quantité', 'ready_to_deploy' => 'Prêt à être déployé', 'recent_activity' => 'Activité récente', - 'remove_company' => 'Remove Company Association', + 'remove_company' => 'Retirer l\'association avec l\'organisation', 'reports' => 'Rapports', 'requested' => 'Demandé', 'save' => 'Sauvegarder', 'select' => 'Sélectionner', 'search' => 'Rechercher', - 'select_category' => 'Select a Category', + 'select_category' => 'Choisir une catégorie', 'select_depreciation' => 'Choisissez un type d\'amortissement', 'select_location' => 'Choisissez un emplacement', 'select_manufacturer' => 'Choisissez un fabricant', @@ -139,10 +140,10 @@ 'select_date' => 'Choisissez une date', 'select_statuslabel' => 'Choisissez un état', 'select_company' => 'Sélectionnez une compagnie', - 'select_asset' => 'Select Asset', + 'select_asset' => 'Choisir un bien', 'settings' => 'Préférences', 'sign_in' => 'Connexion', - 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', + 'some_features_disabled' => 'MODE DEMO: Certaines fonctionnalités sont désactivées pour cette installation.', 'site_name' => 'Nom du Site', 'state' => 'État', 'status_labels' => 'Étiquette de statut', @@ -153,7 +154,7 @@ 'type' => 'Type ', 'undeployable' => 'Non déployable', 'unknown_admin' => 'Admin inconnu', - 'username_format' => 'Username Format', + 'username_format' => 'Format du nom d\'utilisateur', 'update' => 'Actualiser', 'uploaded' => 'Téléversement réussi', 'user' => 'Utilisateur', @@ -168,5 +169,5 @@ 'yes' => 'Oui', 'zip' => 'Code postal', 'noimage' => 'Aucune image envoyée ou aucune image trouvée.', - 'token_expired' => 'Your form session has expired. Please try again.', + 'token_expired' => 'La session de votre formulaire a expiré. Merci d\'essayer à nouveau.', ]; diff --git a/resources/lang/fr/passwords.php b/resources/lang/fr/passwords.php index 5195a9b77c..ad4f68e975 100644 --- a/resources/lang/fr/passwords.php +++ b/resources/lang/fr/passwords.php @@ -1,7 +1,7 @@ 'Your password link has been sent!', - 'user' => 'That user does not exist or does not have an email address associated', + 'sent' => 'Le lien vers votre mot de passe a bien été envoyé!', + 'user' => 'Cet utilisateur n\'existe pas ou n\'a pas d\'adresse e-mail associée', ]; diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index c48d3f211a..f01a11b478 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -33,7 +33,7 @@ return array( "digits_between" => "L'attribut \":attribute\" doit contenir entre :min et :max chiffres.", "email" => "Le format de l'attribut \":attribute\" est invalide.", "exists" => "L'attribut \":attribute\" est invalide.", - "email_array" => "One or more email addresses is invalid.", + "email_array" => "Une ou plusieurs adresses e-mail sont invalides.", "image" => "L'attribut \":attribute\" doit être une image.", "in" => "Le :attribute selectionné est invalide.", "integer" => "L'attribut \":attribute\" doit être un nombre entier.", @@ -64,8 +64,8 @@ return array( ), "unique" => "Cet-te :attribute a déjà été pris-e.", "url" => "Le format de cet-te :attribute est invalide.", - "statuslabel_type" => "You must select a valid status label type", - "unique_undeleted" => "The :attribute must be unique.", + "statuslabel_type" => "Vous devez sélectionner un type d'étiquette de statut valide", + "unique_undeleted" => "L'attribut :attribute doit être unique.", /* diff --git a/resources/lang/he/admin/custom_fields/general.php b/resources/lang/he/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/he/admin/custom_fields/general.php +++ b/resources/lang/he/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/he/admin/hardware/message.php b/resources/lang/he/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/he/admin/hardware/message.php +++ b/resources/lang/he/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/he/admin/settings/general.php b/resources/lang/he/admin/settings/general.php index 623b000605..a365f803c1 100644 --- a/resources/lang/he/admin/settings/general.php +++ b/resources/lang/he/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/he/admin/statuslabels/table.php b/resources/lang/he/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/he/admin/statuslabels/table.php +++ b/resources/lang/he/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php index e1d5eba5c3..0b6ef1fcb9 100644 --- a/resources/lang/he/general.php +++ b/resources/lang/he/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Delete Image', 'image_upload' => 'Upload Image', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/hr/admin/custom_fields/general.php b/resources/lang/hr/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/hr/admin/custom_fields/general.php +++ b/resources/lang/hr/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/hr/admin/hardware/message.php b/resources/lang/hr/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/hr/admin/hardware/message.php +++ b/resources/lang/hr/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/hr/admin/models/table.php b/resources/lang/hr/admin/models/table.php index 11a512b3d3..6c364796f4 100644 --- a/resources/lang/hr/admin/models/table.php +++ b/resources/lang/hr/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Asset Models', 'update' => 'Update Asset Model', 'view' => 'View Asset Model', - 'update' => 'Update Asset Model', + 'update' => 'Update Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', ); diff --git a/resources/lang/hr/admin/settings/general.php b/resources/lang/hr/admin/settings/general.php index 623b000605..a365f803c1 100644 --- a/resources/lang/hr/admin/settings/general.php +++ b/resources/lang/hr/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/hr/admin/statuslabels/table.php b/resources/lang/hr/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/hr/admin/statuslabels/table.php +++ b/resources/lang/hr/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php index e1d5eba5c3..0b6ef1fcb9 100644 --- a/resources/lang/hr/general.php +++ b/resources/lang/hr/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Delete Image', 'image_upload' => 'Upload Image', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/hu/admin/custom_fields/general.php b/resources/lang/hu/admin/custom_fields/general.php index ec15b42079..bad511fb64 100644 --- a/resources/lang/hu/admin/custom_fields/general.php +++ b/resources/lang/hu/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Mező', 'about_fieldsets_title' => 'A mezőcsoportokról', 'about_fieldsets_text' => 'A mezőcsoportokkal tudsz létrehozni olyan gyakran használt egyedi mezőket csoportosító speciális eszköz modell típusokat.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Mezőcsoportok', 'qty_fields' => 'Mennyiségi mezők', 'fieldsets' => 'Mezőcsoportok', 'fieldset_name' => 'Mezőcsoport neve', 'field_name' => 'Mező neve', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Ürlap elem', 'field_element_short' => 'Elem', 'field_format' => 'Formátum', diff --git a/resources/lang/hu/admin/hardware/message.php b/resources/lang/hu/admin/hardware/message.php index 4f8285498a..6068c78558 100644 --- a/resources/lang/hu/admin/hardware/message.php +++ b/resources/lang/hu/admin/hardware/message.php @@ -36,9 +36,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -51,7 +51,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php index 7c6d666a24..9d479e4dfc 100644 --- a/resources/lang/hu/admin/settings/general.php +++ b/resources/lang/hu/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/hu/admin/statuslabels/table.php b/resources/lang/hu/admin/statuslabels/table.php index f6bf22462c..69fdb923ac 100644 --- a/resources/lang/hu/admin/statuslabels/table.php +++ b/resources/lang/hu/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'A státusz címkékről', 'archived' => 'Archivált', 'create' => 'Státusz címke létrehozása', + 'color' => 'Chart Color', 'deployable' => 'Telepíthető', 'info' => 'A státusz címkék arra szolgálnak, hogy az eszközök különböző állapotát leírják. Például javítás alatt, eltűnt/ellopott, stb. Új címkéket is létre lehet hozni telepíthető, függőben levő és archivált eszközökhöz.', 'name' => 'Státusz elnevezése', 'pending' => 'Függőben', 'status_type' => 'Státusz típusa', + 'show_in_nav' => 'Show in side nav', 'title' => 'Státusz címkék', 'undeployable' => 'Nem telepíthető', 'update' => 'Státusz címke frissítése', diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php index 8bf90504e1..38c2ebf0ad 100644 --- a/resources/lang/hu/general.php +++ b/resources/lang/hu/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Kép törlése', 'image_upload' => 'Kép feltöltése', 'import' => 'Importálás', + 'import-history' => 'Import History', 'asset_maintenance' => 'Eszköz karbantartás', 'asset_maintenance_report' => 'Eszköz Karbantartás Riport', 'asset_maintenances' => 'Eszköz karbantartások', diff --git a/resources/lang/id/admin/custom_fields/general.php b/resources/lang/id/admin/custom_fields/general.php index 8a9bcec62a..51957e20a0 100644 --- a/resources/lang/id/admin/custom_fields/general.php +++ b/resources/lang/id/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Kolom', 'about_fieldsets_title' => 'Tentang Set Kolom', 'about_fieldsets_text' => 'Fieldsets memungkinkan Anda untuk membuat kolom tambahan yang seringkali dipakai untuk dapat digunakan pada model aset tertentu.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Set Kolom', 'qty_fields' => 'Kolom Jumlah', 'fieldsets' => 'Kumpulan Set Kolom', 'fieldset_name' => 'Nama Kumpulan Set Kolom', 'field_name' => 'Nama Set Kolom', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Elemen Form', 'field_element_short' => 'Elemen', 'field_format' => 'Format', diff --git a/resources/lang/id/admin/custom_fields/message.php b/resources/lang/id/admin/custom_fields/message.php index 0d34afa9e8..b407bbeff8 100644 --- a/resources/lang/id/admin/custom_fields/message.php +++ b/resources/lang/id/admin/custom_fields/message.php @@ -3,25 +3,25 @@ return array( 'field' => array( - 'invalid' => 'That field does not exist.', - 'already_added' => 'Field already added', + 'invalid' => 'Field tersebut tidak ada.', + 'already_added' => 'Field sudah di tambahkan', 'create' => array( - 'error' => 'Field was not created, please try again.', - 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' + 'error' => 'Field gagal di buat, silahkan coba kembali.', + 'success' => 'Field telah sukses di buat.', + 'assoc_success' => 'Field sukses di tambahkan ke fieldset.' ), 'update' => array( - 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' + 'error' => 'Field tidak terbaharui, silahkan coba kembali', + 'success' => 'Field sukses diperbarui.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this field?', - 'error' => 'There was an issue deleting the field. Please try again.', - 'success' => 'The field was deleted successfully.', - 'in_use' => 'Field is still in use.', + 'confirm' => 'Apakah Anda yakin untuk menghapus field ini?', + 'error' => 'Terdapat kesalahan pada saat penghapusan field ini. Silahkan coba kembali.', + 'success' => 'Field telah berhasil dihapus.', + 'in_use' => 'Field sedang digunakan.', ) ), @@ -31,20 +31,20 @@ return array( 'create' => array( - 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' + 'error' => 'Fieldset gagal di buat, silahkan coba kembali.', + 'success' => 'Fieldset telah sukses di buat.' ), 'update' => array( - 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' + 'error' => 'Fieldset tidak terbaharui, silahkan coba kembali', + 'success' => 'Fieldset sukses diperbarui.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this fieldset?', - 'error' => 'There was an issue deleting the fieldset. Please try again.', - 'success' => 'The fieldset was deleted successfully.', - 'in_use' => 'Fieldset is still in use.', + 'confirm' => 'Apakah Anda yakin untuk menghapus fieldset ini?', + 'error' => 'Terdapat kesalahan pada saat penghapusan fieldset ini. Silahkan coba kembali.', + 'success' => 'Fieldset telah berhasil dihapus.', + 'in_use' => 'Fieldset sedang digunakan.', ) ), diff --git a/resources/lang/id/admin/depreciations/general.php b/resources/lang/id/admin/depreciations/general.php index d5796ff9f6..562c432786 100644 --- a/resources/lang/id/admin/depreciations/general.php +++ b/resources/lang/id/admin/depreciations/general.php @@ -1,12 +1,12 @@ 'About Asset Depreciations', - 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - 'asset_depreciations' => 'Asset Depreciations', - 'create_depreciation' => 'Create Depreciation', - 'depreciation_name' => 'Depreciation Name', - 'number_of_months' => 'Number of Months', - 'update_depreciation' => 'Update Depreciation', + 'about_asset_depreciations' => 'Tentang Penyusutan Aset', + 'about_depreciations' => 'Anda dapat mengatur penyusutan aset dengan perhitungan penyusutan garis lurus.', + 'asset_depreciations' => 'Depresiasi Aset', + 'create_depreciation' => 'Buat Penyusutan', + 'depreciation_name' => 'Nama Penyusutan', + 'number_of_months' => 'Jumlah bulan', + 'update_depreciation' => 'Memperbarui Penyusutan', ); diff --git a/resources/lang/id/admin/depreciations/message.php b/resources/lang/id/admin/depreciations/message.php index c20e52c13c..155eca8cfc 100644 --- a/resources/lang/id/admin/depreciations/message.php +++ b/resources/lang/id/admin/depreciations/message.php @@ -2,24 +2,24 @@ return array( - 'does_not_exist' => 'Depreciation class does not exist.', - 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', + 'does_not_exist' => 'Kelas penyusutan tidak ada.', + 'assoc_users' => 'Penyusutan ini saat ini terkoneksi dengan satu atau lebih model dan tidak dapat di hapus. Silahkan hapus model tersebut lebih dahulu, kemudian coba ulangi kembali. ', 'create' => array( - 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' + 'error' => 'Kelas penyusutan gagal dibuat, silahkan coba kembali', + 'success' => 'Kelas penyusutan sukses di buat' ), 'update' => array( - 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' + 'error' => 'Kelas penyusutan gagal di perbarui, silahkan coba kembali', + 'success' => 'Kelas penyusutan sukses di perbarui.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this depreciation class?', - 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' + 'confirm' => 'Apakah Anda yakin untuk menghapus kelas penyusutan ini?', + 'error' => 'Terdapat kesalahan pada saat penghapusan kelas penyusutan. Silahkan coba kembali.', + 'success' => 'Kelas penyusutan sukses di hapus.' ) ); diff --git a/resources/lang/id/admin/depreciations/table.php b/resources/lang/id/admin/depreciations/table.php index 5ba01d132c..20f1d1a5c0 100644 --- a/resources/lang/id/admin/depreciations/table.php +++ b/resources/lang/id/admin/depreciations/table.php @@ -3,8 +3,8 @@ return array( 'id' => 'ID', - 'months' => 'Months', - 'term' => 'Term', - 'title' => 'Name ', + 'months' => 'Bulan', + 'term' => 'Syarat', + 'title' => 'Nama ', ); diff --git a/resources/lang/id/admin/groups/message.php b/resources/lang/id/admin/groups/message.php index f14b6339e8..a07902428f 100644 --- a/resources/lang/id/admin/groups/message.php +++ b/resources/lang/id/admin/groups/message.php @@ -2,21 +2,21 @@ return array( - 'group_exists' => 'Group already exists!', - 'group_not_found' => 'Group [:id] does not exist.', - 'group_name_required' => 'The name field is required', + 'group_exists' => 'Kelompok sudah ada!', + 'group_not_found' => 'Kelompok [:id] tidak ada.', + 'group_name_required' => 'Field nama di perlukan', 'success' => array( - 'create' => 'Group was successfully created.', - 'update' => 'Group was successfully updated.', - 'delete' => 'Group was successfully deleted.', + 'create' => 'Sukses membuat kelompok.', + 'update' => 'Sukses memperbarui kelompok.', + 'delete' => 'Sukses menghapus kelompok.', ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this group?', - 'create' => 'There was an issue creating the group. Please try again.', - 'update' => 'There was an issue updating the group. Please try again.', - 'delete' => 'There was an issue deleting the group. Please try again.', + 'confirm' => 'Anda yakin menghapus kelompok ini?', + 'create' => 'Terdapat kesalahan ketika membuat kelompok. Silahkan coba kembali.', + 'update' => 'Terdapat kesalahan ketika memperbarui kelompok. Silahkan coba kembali.', + 'delete' => 'Terdapat kesalahan ketika menghapus kelompok. Silahkan coba kembali.', ), ); diff --git a/resources/lang/id/admin/groups/table.php b/resources/lang/id/admin/groups/table.php index 61f060a116..226fb86336 100644 --- a/resources/lang/id/admin/groups/table.php +++ b/resources/lang/id/admin/groups/table.php @@ -3,7 +3,7 @@ return array( 'id' => 'Id', - 'name' => 'Name', - 'users' => '# of Users', + 'name' => 'Nama', + 'users' => '# Pengguna', ); diff --git a/resources/lang/id/admin/groups/titles.php b/resources/lang/id/admin/groups/titles.php index 12c333a66f..a4eef2c54c 100644 --- a/resources/lang/id/admin/groups/titles.php +++ b/resources/lang/id/admin/groups/titles.php @@ -2,12 +2,12 @@ return array( - 'group_management' => 'Group Management', - 'create_group' => 'Create New Group', - 'edit_group' => 'Edit Group', - 'group_name' => 'Group Name', - 'group_admin' => 'Group Admin', - 'allow' => 'Allow', - 'deny' => 'Deny', + 'group_management' => 'Manajemen Kelompok', + 'create_group' => 'Membuat kelompok baru', + 'edit_group' => 'Sunting kelompok', + 'group_name' => 'Nama Kelompok', + 'group_admin' => 'Admin Kelompok', + 'allow' => 'Izin', + 'deny' => 'Tolak', ); diff --git a/resources/lang/id/admin/hardware/form.php b/resources/lang/id/admin/hardware/form.php index e4bf1e3f39..4fe70ab69b 100644 --- a/resources/lang/id/admin/hardware/form.php +++ b/resources/lang/id/admin/hardware/form.php @@ -1,44 +1,44 @@ 'Confrm Bulk Delete Assets', - 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', - 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', - 'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.', - 'checkedout_to' => 'Checked Out To', - 'checkout_date' => 'Checkout Date', - 'checkin_date' => 'Checkin Date', - 'checkout_to' => 'Checkout to', - 'cost' => 'Purchase Cost', - 'create' => 'Create Asset', - 'date' => 'Purchase Date', - 'depreciates_on' => 'Depreciates On', - 'depreciation' => 'Depreciation', - 'default_location' => 'Default Location', - 'eol_date' => 'EOL Date', - 'eol_rate' => 'EOL Rate', - 'expected_checkin' => 'Expected Checkin Date', - 'expires' => 'Expires', - 'fully_depreciated' => 'Fully Depreciated', - 'help_checkout' => 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ', - 'mac_address' => 'MAC Address', - 'manufacturer' => 'Manufacturer', + 'bulk_delete' => 'Konfirmasi penghapusan aset dalam jumlah besar', + 'bulk_delete_help' => 'Meninjau aset untuk penghapusan massal di bawah ini. Setelah dihapus, aset-aset ini dapat dipulihkan, tetapi mereka tidak lagi akan dikaitkan dengan setiap pengguna yang mereka saat ini digunakan.', + 'bulk_delete_warn' => 'Anda akan menghapus :asset_count aset.', + 'bulk_update' => 'Perbarui aset jumlah besar', + 'bulk_update_help' => 'Formulir ini mengizinkan anda untuk memperbarui kelipatan aset dalam sekali proses. Cukup isi di field yang hendak di rubah. Jika ada yang kosong tidak akan dirubah. ', + 'bulk_update_warn' => 'Anda akan menyunting :asset_count aset.', + 'checkedout_to' => 'Diberikan kepada', + 'checkout_date' => 'Tanggal Pemberian', + 'checkin_date' => 'Tanggal Pengembalian', + 'checkout_to' => 'Diberikan kepada', + 'cost' => 'Harga Pembelian', + 'create' => 'Membuat aset', + 'date' => 'Tanggal pembelian', + 'depreciates_on' => 'Penyusutan aktif', + 'depreciation' => 'Penyusutan', + 'default_location' => 'Lokasi awal', + 'eol_date' => 'Tanggal EOL', + 'eol_rate' => 'Tingkat EOL', + 'expected_checkin' => 'Tanggal pengembalian diharapkan diterima', + 'expires' => 'Kadaluarsa', + 'fully_depreciated' => 'Penyusutan penuh', + 'help_checkout' => 'Jika anda ingin segera menggunakan aset ini segera, pilih "Ready to Deploy" dari daftar status di atas. ', + 'mac_address' => 'Alamat MAC', + 'manufacturer' => 'Produsen', 'model' => 'Model', - 'months' => 'months', - 'name' => 'Asset Name', - 'notes' => 'Notes', - 'order' => 'Order Number', - 'qr' => 'QR Code', - 'requestable' => 'Users may request this asset', - 'select_statustype' => 'Select Status Type', + 'months' => 'bulan', + 'name' => 'Nama Aset', + 'notes' => 'Catatan', + 'order' => 'Nomor Pemesanan', + 'qr' => 'Kode QR', + 'requestable' => 'Pengguna dapat meminta aset ini', + 'select_statustype' => 'Memilih Tipe Status', 'serial' => 'Serial', 'status' => 'Status', - 'supplier' => 'Supplier', - 'tag' => 'Asset Tag', - 'update' => 'Asset Update', - 'warranty' => 'Warranty', - 'years' => 'years', + 'supplier' => 'Pemasok', + 'tag' => 'Tag Aset', + 'update' => 'Perbarui Aset', + 'warranty' => 'Garansi', + 'years' => 'tahun', ) ; diff --git a/resources/lang/id/admin/hardware/general.php b/resources/lang/id/admin/hardware/general.php index 65b6d77477..610241d225 100644 --- a/resources/lang/id/admin/hardware/general.php +++ b/resources/lang/id/admin/hardware/general.php @@ -1,20 +1,20 @@ 'Archived', - 'asset' => 'Asset', - 'bulk_checkout' => 'Checkout Assets to User', - 'checkin' => 'Checkin Asset', - 'checkout' => 'Checkout Asset to User', - 'clone' => 'Clone Asset', - 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', - 'edit' => 'Edit Asset', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', - 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.', - 'requestable' => 'Requestable', - 'restore' => 'Restore Asset', - 'pending' => 'Pending', - 'undeployable' => 'Undeployable', - 'view' => 'View Asset', + 'archived' => 'Diarsipkan', + 'asset' => 'Aset', + 'bulk_checkout' => 'Pemberian aset kepada pengguna', + 'checkin' => 'Pengembalian aset', + 'checkout' => 'Pemberian aset kepada pengguna', + 'clone' => 'Klon Aset', + 'deployable' => 'Dapat digunakan', + 'deleted' => 'Aset ini telah di hapus. Klik disini untuk memulihkan.', + 'edit' => 'Sunting Aset', + 'filetype_info' => 'Jenis berkas diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar.', + 'model_deleted' => 'Model aset telah di hapus. Anda harus memulihkan model dahulu sebelum memulihkan aset.
Klik disini untuk memulihkan model.', + 'requestable' => 'Dapat diminta', + 'restore' => 'Mengembalikan aset', + 'pending' => 'Tunda', + 'undeployable' => 'Tidak dapat digunakan', + 'view' => 'Tampilkan aset', ); diff --git a/resources/lang/id/admin/hardware/message.php b/resources/lang/id/admin/hardware/message.php index f5961b9367..216f0f36f2 100644 --- a/resources/lang/id/admin/hardware/message.php +++ b/resources/lang/id/admin/hardware/message.php @@ -2,20 +2,20 @@ return array( - 'undeployable' => 'Warning: This asset has been marked as currently undeployable. - If this status has changed, please update the asset status.', - 'does_not_exist' => 'Asset does not exist.', - 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', - 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ', + 'undeployable' => 'Peringatan: Aset ini telah di tandai sebagai aset yang tak dapat digunakan. + Jika status ini telah berubah, silahkan perbarui status aset.', + 'does_not_exist' => 'Aset tidak ada.', + 'does_not_exist_or_not_requestable' => 'Aset tersebut tidak terdaftar atau tidak dapat di minta.', + 'assoc_users' => 'Aset ini sudah diberikan kepada pengguna dan tidak dapat di hapus. Silahkan cek aset terlebih dahulu kemudian coba hapus kembali. ', 'create' => array( - 'error' => 'Asset was not created, please try again. :(', - 'success' => 'Asset created successfully. :)' + 'error' => 'Aset gagal di buat, silahkan coba kembali', + 'success' => 'Sukses membuat aset' ), 'update' => array( - 'error' => 'Asset was not updated, please try again', - 'success' => 'Asset updated successfully.', + 'error' => 'Gagal perbarui aset, silahkan coba kembali', + 'success' => 'Sukses perbarui aset.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', ), @@ -37,35 +37,36 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this asset?', - 'error' => 'There was an issue deleting the asset. Please try again.', - 'success' => 'The asset was deleted successfully.' + 'confirm' => 'Apakah Anda yakin untuk menghapus aset ini?', + 'error' => 'Terdapat kesalahan pada saat penghapusan aset. Silahkan coba kembali.', + 'success' => 'Aset sukses terhapus.' ), 'checkout' => array( - 'error' => 'Asset was not checked out, please try again', - 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Aset gagal di berikan, silahkan coba kembali', + 'success' => 'Sukses memberikan aset.', + 'user_does_not_exist' => 'Pengguna tersebut tidak terdaftar. Silahkan coba kembali.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( - 'error' => 'Asset was not checked in, please try again', - 'success' => 'Asset checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.', - 'already_checked_in' => 'That asset is already checked in.', + 'error' => 'Aset gagal di terima, silahkan coba kembali', + 'success' => 'Sukses menerima aset.', + 'user_does_not_exist' => 'Pengguna tersebut tidak terdaftar. Silahkan coba kembali.', + 'already_checked_in' => 'Aset tersebut telah di terima.', ), 'requests' => array( - 'error' => 'Asset was not requested, please try again', - 'success' => 'Asset requested successfully.', + 'error' => 'Aset gagal di minta, silahkan coba kembali', + 'success' => 'Sukses meminta aset.', ) ); diff --git a/resources/lang/id/admin/hardware/table.php b/resources/lang/id/admin/hardware/table.php index e8baa09d5a..8608b9827a 100644 --- a/resources/lang/id/admin/hardware/table.php +++ b/resources/lang/id/admin/hardware/table.php @@ -2,23 +2,23 @@ return array( - 'asset_tag' => 'Asset Tag', + 'asset_tag' => 'Tag Aset', 'asset_model' => 'Model', - 'book_value' => 'Value', - 'change' => 'In/Out', - 'checkout_date' => 'Checkout Date', - 'checkoutto' => 'Checked Out', + 'book_value' => 'Harga', + 'change' => 'Masuk/Keluar', + 'checkout_date' => 'Tanggal Pemberian', + 'checkoutto' => 'Diberikan', 'diff' => 'Diff', - 'dl_csv' => 'Download CSV', - 'eol' => 'EOL', + 'dl_csv' => 'Unduh CSV', + 'eol' => 'MHP', 'id' => 'ID', - 'location' => 'Location', - 'purchase_cost' => 'Cost', - 'purchase_date' => 'Purchased', + 'location' => 'Lokasi', + 'purchase_cost' => 'Biaya', + 'purchase_date' => 'Dibeli', 'serial' => 'Serial', 'status' => 'Status', - 'title' => 'Asset ', - 'image' => 'Device Image', - 'days_without_acceptance' => 'Days Without Acceptance' + 'title' => 'Aset ', + 'image' => 'Gambar Perangkat', + 'days_without_acceptance' => 'Tanda Terima' ); diff --git a/resources/lang/id/admin/licenses/general.php b/resources/lang/id/admin/licenses/general.php index 808d75a34a..5c515e0ba9 100644 --- a/resources/lang/id/admin/licenses/general.php +++ b/resources/lang/id/admin/licenses/general.php @@ -2,19 +2,19 @@ return array( - 'checkin' => 'Checkin License Seat', - 'checkout_history' => 'Checkout History', - 'checkout' => 'Checkout License Seat', - 'edit' => 'Edit License', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', - 'clone' => 'Clone License', - 'history_for' => 'History for ', - 'in_out' => 'In/Out', - 'info' => 'License Info', - 'license_seats' => 'License Seats', - 'seat' => 'Seat', - 'seats' => 'Seats', - 'software_licenses' => 'Software Licenses', - 'user' => 'User', - 'view' => 'View License', + 'checkin' => 'Pemberian kapasitas lisensi', + 'checkout_history' => 'Riwayat Pemberian', + 'checkout' => 'Pemberian kapasitas lisensi', + 'edit' => 'Sunting lisensi', + 'filetype_info' => 'Jenis berkas diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar.', + 'clone' => 'Klon lisensi', + 'history_for' => 'Riwayat untuk ', + 'in_out' => 'Masuk/Keluar', + 'info' => 'Info Lisensi', + 'license_seats' => 'Kapasitas Lisensi', + 'seat' => 'Kapasitas', + 'seats' => 'Kapasitas', + 'software_licenses' => 'Lisensi Perangkat Lunak', + 'user' => 'Pengguna', + 'view' => 'Tampilkan Lisensi', ); diff --git a/resources/lang/id/admin/licenses/message.php b/resources/lang/id/admin/licenses/message.php index ffc70bee0f..75054f84a8 100644 --- a/resources/lang/id/admin/licenses/message.php +++ b/resources/lang/id/admin/licenses/message.php @@ -2,49 +2,49 @@ return array( - 'does_not_exist' => 'License does not exist.', - 'user_does_not_exist' => 'User does not exist.', - 'asset_does_not_exist' => 'The asset you are trying to associate with this license does not exist.', - 'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.', - 'assoc_users' => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ', + 'does_not_exist' => 'Lisensi tidak ada.', + 'user_does_not_exist' => 'Pengguna tidak ada.', + 'asset_does_not_exist' => 'Aset yang hendak di asosiasikan dengan lisensi ini tidak ada.', + 'owner_doesnt_match_asset' => 'Aset yang hendak di asosiasikan dengan lisensi ini di miliki oleh seseorang yang tidak masuk dalam daftar.', + 'assoc_users' => 'Lisensi ini sudah diberikan kepada pengguna dan tidak dapat di hapus. Silahkan cek lisensi terlebih dahulu kemudian coba hapus kembali. ', 'create' => array( - 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' + 'error' => 'Gagal membuat lisensi, silahkan coba kembali.', + 'success' => 'Sukses membuat lisensi.' ), 'deletefile' => array( - 'error' => 'File not deleted. Please try again.', - 'success' => 'File successfully deleted.', + 'error' => 'Berkas belum terhapus. Silahkan coba kembali.', + 'success' => 'Berkas sukses di hapus.', ), 'upload' => array( - 'error' => 'File(s) not uploaded. Please try again.', - 'success' => 'File(s) successfully uploaded.', - 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', - 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', + 'error' => 'Berkas belum terunggah. Silakan coba kembali.', + 'success' => 'Berkas sukses terunggah.', + 'nofiles' => 'Anda belum memilih berkas untuk di unggah, atau berkas yang akan di unggah terlalu besar ukurannya', + 'invalidfiles' => 'Satu atau lebih dari file Anda terlalu besar atau jenis berkas yang tidak diperbolehkan. Tipe file diizinkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', ), 'update' => array( - 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' + 'error' => 'Gagal memperbarui lisensi, silahkan coba kembali', + 'success' => 'Sukses perbarui lisensi.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this license?', - 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' + 'confirm' => 'Apakah Anda yakin untuk menghapus lisensi ini?', + 'error' => 'Terdapat kesalahan pada saat penghapusan lisensi ini. Silahkan coba kembali.', + 'success' => 'Lisensi telah berhasil dihapus.' ), 'checkout' => array( - 'error' => 'There was an issue checking out the license. Please try again.', - 'success' => 'The license was checked out successfully' + 'error' => 'Terdapat kesalahan pada saat pemberian lisensi ini. Silahkan coba kembali.', + 'success' => 'Lisensi telah berhasil diberikan' ), 'checkin' => array( - 'error' => 'There was an issue checking in the license. Please try again.', - 'success' => 'The license was checked in successfully' + 'error' => 'Terdapat kesalahan pada saat penerimaan lisensi ini. Silahkan coba kembali.', + 'success' => 'Lisensi telah berhasil diterima' ), ); diff --git a/resources/lang/id/admin/licenses/table.php b/resources/lang/id/admin/licenses/table.php index dfce4136cb..d836b5006f 100644 --- a/resources/lang/id/admin/licenses/table.php +++ b/resources/lang/id/admin/licenses/table.php @@ -2,16 +2,16 @@ return array( - 'assigned_to' => 'Assigned To', - 'checkout' => 'In/Out', + 'assigned_to' => 'Diberikan kepada', + 'checkout' => 'Masuk/Keluar', 'id' => 'ID', - 'license_email' => 'License Email', - 'license_name' => 'Licensed To', - 'purchase_date' => 'Purchase Date', - 'purchased' => 'Purchased', - 'seats' => 'Seats', - 'hardware' => 'Hardware', + 'license_email' => 'Email Lisensi', + 'license_name' => 'Dilisensikan kepada', + 'purchase_date' => 'Tanggal pembelian', + 'purchased' => 'Dibeli', + 'seats' => 'Kapasitas', + 'hardware' => 'Perangkat Keras', 'serial' => 'Serial', - 'title' => 'License', + 'title' => 'Lisensi', ); diff --git a/resources/lang/id/admin/manufacturers/message.php b/resources/lang/id/admin/manufacturers/message.php index e3c7cf00c5..e294c33455 100644 --- a/resources/lang/id/admin/manufacturers/message.php +++ b/resources/lang/id/admin/manufacturers/message.php @@ -3,22 +3,22 @@ return array( 'does_not_exist' => 'Produsen tidak ada.', - 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', + 'assoc_users' => 'Produsen ini saat ini dikaitkan dengan setidaknya satu model dan tidak dapat dihapus. Perbarui model Anda yang tidak ada referensi dari produsen ini dan coba lagi. ', 'create' => array( - 'error' => 'Manufacturer was not created, please try again.', - 'success' => 'Manufacturer created successfully.' + 'error' => 'Produsen gagal di buat, silahkan coba kembali.', + 'success' => 'Produsen sukses di buat.' ), 'update' => array( - 'error' => 'Manufacturer was not updated, please try again', - 'success' => 'Manufacturer updated successfully.' + 'error' => 'Produsen gagal di perbarui, silahkan coba kembali', + 'success' => 'Produsen sukses di perbarui.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this manufacturer?', - 'error' => 'There was an issue deleting the manufacturer. Please try again.', - 'success' => 'The Manufacturer was deleted successfully.' + 'confirm' => 'Apakah Anda yakin untuk menghapus produsen ini?', + 'error' => 'Terdapat kesalahan pada saat penghapusan produsen. Silahkan coba kembali.', + 'success' => 'Produsen sukses di hapus.' ) ); diff --git a/resources/lang/id/admin/manufacturers/table.php b/resources/lang/id/admin/manufacturers/table.php index 1861ee7c56..85d29fcbba 100644 --- a/resources/lang/id/admin/manufacturers/table.php +++ b/resources/lang/id/admin/manufacturers/table.php @@ -2,10 +2,10 @@ return array( - 'asset_manufacturers' => 'Asset Manufacturers', - 'create' => 'Create Manufacturer', + 'asset_manufacturers' => 'Merek Aset', + 'create' => 'Masukan Merek', 'id' => 'ID', - 'name' => 'Manufacturer Name', - 'update' => 'Update Manufacturer', + 'name' => 'Nama Merek', + 'update' => 'Perbarui Merek', ); diff --git a/resources/lang/id/admin/models/general.php b/resources/lang/id/admin/models/general.php index ccd36607ce..16cc4392fd 100644 --- a/resources/lang/id/admin/models/general.php +++ b/resources/lang/id/admin/models/general.php @@ -2,12 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', - 'restore' => 'Restore Model', - 'show_mac_address' => 'Show MAC address field in assets in this model', - 'view_deleted' => 'View Deleted', - 'view_models' => 'View Models', + 'deleted' => 'Model ini telah dihapus. Click di sini untuk memulihkan.', + 'restore' => 'Mengembalikan Model', + 'show_mac_address' => 'Tampilkan alamat MAC di aset untuk model ini', + 'view_deleted' => 'Lihat yang Dihapus', + 'view_models' => 'Lihat Model', 'fieldset' => 'Fieldset', - 'no_custom_field' => 'No custom fields', + 'no_custom_field' => 'Field yang tidak bisa di rubah', ); diff --git a/resources/lang/id/admin/models/message.php b/resources/lang/id/admin/models/message.php index fe51cb8d4c..bced6b6571 100644 --- a/resources/lang/id/admin/models/message.php +++ b/resources/lang/id/admin/models/message.php @@ -2,30 +2,30 @@ return array( - 'does_not_exist' => 'Model does not exist.', - 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', + 'does_not_exist' => 'Model tidak ada.', + 'assoc_users' => 'Saat ini model tersebut terhubung dengan 1 atau lebih dengan aset dan tidak dapat di hapus. Silahkan hapus aset terlebih dahulu, kemudian coba hapus kembali. ', 'create' => array( - 'error' => 'Model was not created, please try again.', - 'success' => 'Model created successfully.', - 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', + 'error' => 'Model gagal di buat, silahkan coba kembali.', + 'success' => 'Sukses mebuat model.', + 'duplicate_set' => 'Model aset dengan nomor nama, produsen dan model yang sama sudah ada.', ), 'update' => array( - 'error' => 'Model was not updated, please try again', - 'success' => 'Model updated successfully.' + 'error' => 'Model gagal diperbarui, silahkan coba kembali', + 'success' => 'Sukses memperbarui Model.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this asset model?', - 'error' => 'There was an issue deleting the model. Please try again.', - 'success' => 'The model was deleted successfully.' + 'confirm' => 'Anda yakin untuk menghapus model aset ini?', + 'error' => 'Terdapat kesalahan pada saat penghapusan model. Silahkan coba kembali.', + 'success' => 'Model sukses terhapus.' ), 'restore' => array( - 'error' => 'Model was not restored, please try again', - 'success' => 'Model restored successfully.' + 'error' => 'Modal gagal di pulihkan, silahkan coba kembali', + 'success' => 'Sukses memulihkan model.' ), ); diff --git a/resources/lang/id/admin/models/table.php b/resources/lang/id/admin/models/table.php index 11a512b3d3..98a88a675f 100644 --- a/resources/lang/id/admin/models/table.php +++ b/resources/lang/id/admin/models/table.php @@ -2,16 +2,16 @@ return array( - 'create' => 'Create Asset Model', - 'created_at' => 'Created at', - 'eol' => 'EOL', - 'modelnumber' => 'Model No.', - 'name' => 'Asset Model Name', - 'numassets' => 'Assets', - 'title' => 'Asset Models', - 'update' => 'Update Asset Model', - 'view' => 'View Asset Model', - 'update' => 'Update Asset Model', - 'clone' => 'Clone Model', - 'edit' => 'Edit Model', + 'create' => 'Membuat Model aset', + 'created_at' => 'Dibuat', + 'eol' => 'MHP', + 'modelnumber' => 'No. Model.', + 'name' => 'Nama Model Aset', + 'numassets' => 'Aset', + 'title' => 'Model Aset', + 'update' => 'Perbarui Model Aset', + 'view' => 'Tampilkan Model Aset', + 'update' => 'Pebarui Model', + 'clone' => 'Duplikat Model', + 'edit' => 'Sunting Model', ); diff --git a/resources/lang/id/admin/settings/general.php b/resources/lang/id/admin/settings/general.php index c9a22ed69a..91ba1bc21f 100644 --- a/resources/lang/id/admin/settings/general.php +++ b/resources/lang/id/admin/settings/general.php @@ -2,23 +2,23 @@ return array( 'ad' => 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad_domain' => 'Domain Active Directory', + 'ad_domain_help' => 'Hal ini kadang-kadang sama sebagai domain email Anda, tetapi tidak selalu.', + 'is_ad' => 'Ini adalah server Active Directory', 'alert_email' => 'Kirim pemberitahuan kepada', 'alerts_enabled' => 'Aktifkan pemberitahuan', - 'alert_interval' => 'Expiring Alerts Threshold (in days)', + 'alert_interval' => 'Ambang batas pemberitahuan kadaluarsa (dalam hari)', 'alert_inv_threshold' => 'Ambang pemberitahuan persediaan', 'asset_ids' => 'Aset id', - 'auto_increment_assets' => 'Generate auto-incrementing asset IDs', + 'auto_increment_assets' => 'Membuat otomatis pembahan nomor ID aset', 'auto_increment_prefix' => 'Awalan (pilihan)', - 'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this', + 'auto_incrementing_help' => 'Hidupkan penambahan otomatis terlebih dahulu sebelumnya', 'backups' => 'Cadangan', 'barcode_settings' => 'Pengaturan barcode', 'confirm_purge' => 'Konfirmasi pembersihan', 'confirm_purge_help' => 'Masukan tulisan "DELETE" di kolom bawah untuk membersihkan dokumen anda. Tindakan ini tidak dapat dibatalkan.', 'custom_css' => 'Custom CSS', - 'custom_css_help' => 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.', + 'custom_css_help' => 'Masukan modifikasi CSS yang hendak anda gunakan. Jangan sertakan <style></style> tags.', 'default_currency' => 'Mata uang utama', 'default_eula_text' => 'EULA utama', 'default_language' => 'Bahasa utama', @@ -31,26 +31,28 @@ return array( 'barcode_type' => 'Tipe Barcode 2D', 'alt_barcode_type' => 'Tipe Barcode 1D', 'eula_settings' => 'Konfigurasi EULA', - 'eula_markdown' => 'This EULA allows Github flavored markdown.', + 'eula_markdown' => 'EULA mengijinkan Github flavored markdown.', 'general_settings' => 'Konfigurasi umum', - 'generate_backup' => 'Generate Backup', + 'generate_backup' => 'Membuat cadangan', 'header_color' => 'Warna Header', - 'info' => 'These settings let you customize certain aspects of your installation.', + 'info' => 'Dengan pengaturan ini anda dapat merubah aspek tertentu pada instalasi.', 'laravel' => 'Versi Laravel', 'ldap_enabled' => 'Aktifkan LDAP', 'ldap_integration' => 'Integrasi LDAP', 'ldap_settings' => 'Konfigurasi LDAP', 'ldap_server' => 'LDAP Server', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', + 'ldap_server_help' => 'Ini harus dimulai dengan ldap: / / (untuk tidak terenkripsi atau TLS) atau ldaps: / / (untuk SSL)', 'ldap_server_cert' => 'Validasi sertifikat LDAP SSL', 'ldap_server_cert_ignore' => 'Izinkan sertifikat SSL tak terdaftar', 'ldap_server_cert_help' => 'Pilih kotak ini jika anda menggunakan sertifikat SSL self sign dan menerima sertifikat SSL yang tak terdaftar.', - 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', + 'ldap_tls' => 'Gunakan TLS', + 'ldap_tls_help' => 'Ini digunakan jika anda menggunakan STARTTLS di server LDAP anda. ', 'ldap_uname' => 'Nama pengguna LDAP', 'ldap_pword' => 'Katakunci LDAP', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'Saring LDAP', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Kolom nama pengguna', 'ldap_lname_field' => 'Nama Belakang', 'ldap_fname_field' => 'LDAP Nama Depan', @@ -59,54 +61,54 @@ return array( 'ldap_active_flag' => 'LDAP Active Flag', 'ldap_emp_num' => 'Nomor karyawan LDAP', 'ldap_email' => 'LDAP Email', - 'load_remote_text' => 'Remote Scripts', - 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Kode jarak jauh', + 'load_remote_help_text' => 'Snipe-IT dapat menggunakan kode program dari luar.', 'logo' => 'Logo', - 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', - 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', - 'optional' => 'optional', - 'per_page' => 'Results Per Page', - 'php' => 'PHP Version', - 'php_gd_info' => 'You must install php-gd to display QR codes, see install instructions.', - 'php_gd_warning' => 'PHP Image Processing and GD plugin is NOT installed.', - 'qr_help' => 'Enable QR Codes first to set this', - 'qr_text' => 'QR Code Text', - 'setting' => 'Setting', - 'settings' => 'Settings', - 'site_name' => 'Site Name', + 'full_multiple_companies_support_help_text' => 'Membatasi pengguna (termasuk admin) diberikan kepada perusahaan untuk aset perusahaan mereka.', + 'full_multiple_companies_support_text' => 'Dukungan penuh beberapa perusahaan', + 'optional' => 'pilihan', + 'per_page' => 'Hasil per halaman', + 'php' => 'Versi PHP', + 'php_gd_info' => 'Anda harus memasang php-gd untuk menampilkan kode QR, baca petunjuk pemasangan.', + 'php_gd_warning' => 'Plugin PHP pengolahan citra dan GD tidak diinstal.', + 'qr_help' => 'Hidupkan kode QR sebelumnya', + 'qr_text' => 'Teks kode QR', + 'setting' => 'Pengaturan', + 'settings' => 'Pengaturan', + 'site_name' => 'Nama Situs', 'slack_botname' => 'Slack Botname', 'slack_channel' => 'Slack Channel', 'slack_endpoint' => 'Slack Endpoint', - 'slack_integration' => 'Slack Settings', - 'slack_integration_help' => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first create an incoming webhook on your Slack account.', - 'snipe_version' => 'Snipe-IT version', - 'system' => 'System Information', - 'update' => 'Update Settings', - 'value' => 'Value', - 'brand' => 'Branding', - 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', - 'labels_per_page' => 'Labels per page', - 'label_dimensions' => 'Label dimensions (inches)', - 'page_padding' => 'Page margins (inches)', - 'purge' => 'Purge Deleted Records', - 'labels_display_bgutter' => 'Label bottom gutter', - 'labels_display_sgutter' => 'Label side gutter', - 'labels_fontsize' => 'Label font size', - 'labels_pagewidth' => 'Label sheet width', - 'labels_pageheight' => 'Label sheet height', - 'label_gutters' => 'Label spacing (inches)', - 'page_dimensions' => 'Page dimensions (inches)', - 'label_fields' => 'Label visible fields', - 'inches' => 'inches', - 'width_w' => 'w', - 'height_h' => 'h', + 'slack_integration' => 'Pengaturan Slack', + 'slack_integration_help' => 'Penggabungan Slack adalah pilihan, namun untuk kanal dan titik akhir wajib jika anda hendak menggunakannya. Untuk konfigurasi penggabungan slack, anda harus membuat kaitan masuk pada akun slack.', + 'snipe_version' => 'Versi Snipe-IT', + 'system' => 'Informasi Sistem', + 'update' => 'Pengaturan perbaruan', + 'value' => 'Harga', + 'brand' => 'Merek', + 'about_settings_title' => 'Tentang pengaturan', + 'about_settings_text' => 'Dengan pengaturan ini anda dapat merubah aspek tertentu pada instalasi.', + 'labels_per_page' => 'Label per halaman', + 'label_dimensions' => 'Dimensi label (inch)', + 'page_padding' => 'Marjin halaman (inch)', + 'purge' => 'Pembersihan catatan yang telah terhapus', + 'labels_display_bgutter' => 'Ukuran bawah label', + 'labels_display_sgutter' => 'Ukuran samping label', + 'labels_fontsize' => 'Ukuran huruf label', + 'labels_pagewidth' => 'Lebar halaman label', + 'labels_pageheight' => 'Tinggi kertas label', + 'label_gutters' => 'Spasi label (inci)', + 'page_dimensions' => 'Dimensi halaman (inch)', + 'label_fields' => 'Field label yang terlihat', + 'inches' => 'inci', + 'width_w' => 'l', + 'height_h' => 't', 'text_pt' => 'pt', - 'left' => 'left', - 'right' => 'right', - 'top' => 'top', - 'bottom' => 'bottom', - 'vertical' => 'vertical', - 'horizontal' => 'horizontal', - 'zerofill_count' => 'Length of asset tags, including zerofill', + 'left' => 'kiri', + 'right' => 'kanan', + 'top' => 'atas', + 'bottom' => 'bawah', + 'vertical' => 'vertikal', + 'horizontal' => 'horisontal', + 'zerofill_count' => 'Jarak tag aset, termasuk angka nol', ); diff --git a/resources/lang/id/admin/settings/message.php b/resources/lang/id/admin/settings/message.php index 736d5c3e9e..500ff8732c 100644 --- a/resources/lang/id/admin/settings/message.php +++ b/resources/lang/id/admin/settings/message.php @@ -4,19 +4,19 @@ return array( 'update' => array( - 'error' => 'An error has occurred while updating. ', - 'success' => 'Settings updated successfully.' + 'error' => 'Terdapat kesalahan ketika proses pembaharuan. ', + 'success' => 'Sukses perbarui pengaturan.' ), 'backup' => array( - 'delete_confirm' => 'Are you sure you would like to delete this backup file? This action cannot be undone. ', - 'file_deleted' => 'The backup file was successfully deleted. ', - 'generated' => 'A new backup file was successfully created.', - 'file_not_found' => 'That backup file could not be found on the server.', + 'delete_confirm' => 'Apakah anda yakin menghapus berkas cadangan ini? Tindakan ini tidak dapat di batalkan. ', + 'file_deleted' => 'Sukses menghapus Berkas cadangan. ', + 'generated' => 'Sukses membuat cadangan baru.', + 'file_not_found' => 'Berkas cadangan tidak ditemukan di server.', ), 'purge' => array( - 'error' => 'An error has occurred while purging. ', - 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' + 'error' => 'Terdapat kesalahan ketika proses pembersihan. ', + 'validation_failed' => 'Konfirmasi pembersihan anda tidak tepat. Silahkan ketikan kata "DELETE" di kotak konfirmasi.', + 'success' => 'Sukses melakukan pembersihan data yang terhapus.' ), ); diff --git a/resources/lang/id/admin/statuslabels/message.php b/resources/lang/id/admin/statuslabels/message.php index 619a5a509c..3566d06ceb 100644 --- a/resources/lang/id/admin/statuslabels/message.php +++ b/resources/lang/id/admin/statuslabels/message.php @@ -2,24 +2,24 @@ return array( - 'does_not_exist' => 'Status Label does not exist.', - 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', + 'does_not_exist' => 'Label status tidak ada.', + 'assoc_assets' => 'Saat ini label status tersebut terhubung dengan 1 aset dan tidak dapat di hapus. Silahkan perbarui aset anda sehingga tidak terhubung dan kemudian coba kembali. ', 'create' => array( - 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' + 'error' => 'Label status gagal di buat, silahkan coba lagi.', + 'success' => 'Sukses membuat status label.' ), 'update' => array( - 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' + 'error' => 'Gagal perbarui label status, silahkan coba kembali', + 'success' => 'Sukses perbarui label status.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this Status Label?', - 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' + 'confirm' => 'Anda yakin untuk menghapus model label status ini?', + 'error' => 'Terdapat kesalahan pada saat penghapusan label status ini. Silahkan coba kembali.', + 'success' => 'Sukses menghapus label status.' ) ); diff --git a/resources/lang/id/admin/statuslabels/table.php b/resources/lang/id/admin/statuslabels/table.php index dd21781115..ad74d862ac 100644 --- a/resources/lang/id/admin/statuslabels/table.php +++ b/resources/lang/id/admin/statuslabels/table.php @@ -1,15 +1,17 @@ 'About Status Labels', - 'archived' => 'Archived', - 'create' => 'Create Status Label', - 'deployable' => 'Deployable', - 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', - 'name' => 'Status Name', - 'pending' => 'Pending', - 'status_type' => 'Status Type', - 'title' => 'Status Labels', - 'undeployable' => 'Undeployable', - 'update' => 'Update Status Label', + 'about' => 'Tentang label status', + 'archived' => 'Diarsipkan', + 'create' => 'Membuat label status', + 'color' => 'Chart Color', + 'deployable' => 'Dapat digunakan', + 'info' => 'Label status digunakan untuk menjelaskan berbagai macam status aset. Sebagai contoh, rusak/hilang, dalam perbaikan dan sebagainya. Anda dapat membuat status label baru untuk penundaan aset, aset yang dapat digunakan dan aset yang diarsipkan.', + 'name' => 'Nama Status', + 'pending' => 'Tunda', + 'status_type' => 'Tipe Status', + 'show_in_nav' => 'Show in side nav', + 'title' => 'Label Status', + 'undeployable' => 'Tidak dapat digunakan', + 'update' => 'Perbarui label status', ); diff --git a/resources/lang/id/admin/suppliers/message.php b/resources/lang/id/admin/suppliers/message.php index df4bc41af3..6b6619f90d 100644 --- a/resources/lang/id/admin/suppliers/message.php +++ b/resources/lang/id/admin/suppliers/message.php @@ -2,23 +2,23 @@ return array( - 'does_not_exist' => 'Supplier does not exist.', - 'assoc_users' => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ', + 'does_not_exist' => 'Pemasok tidak ada.', + 'assoc_users' => 'Saat ini pemasok tersebut terhubung dengan satu model dan tidak dapat di hapus. Silahkan perbarui model anda sehingga tidak terhubung dengan pemasok tersebut dan coba kembali. ', 'create' => array( - 'error' => 'Supplier was not created, please try again.', - 'success' => 'Supplier created successfully.' + 'error' => 'Pemasok gagal di buat, silahkan coba kembali.', + 'success' => 'Pemasok sukses dibuat.' ), 'update' => array( - 'error' => 'Supplier was not updated, please try again', - 'success' => 'Supplier updated successfully.' + 'error' => 'Pemasok tidak di perbarui, silahkan coba kembali', + 'success' => 'Sukses perbarui pemasok.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this supplier?', - 'error' => 'There was an issue deleting the supplier. Please try again.', - 'success' => 'Supplier was deleted successfully.' + 'confirm' => 'Apakah Anda yakin untuk menghapus pemasok ini?', + 'error' => 'Terdapat masalah ketika menghapus pemasok. Silahkan coba kembali.', + 'success' => 'Sukses menghapus pemasok.' ) ); diff --git a/resources/lang/id/admin/suppliers/table.php b/resources/lang/id/admin/suppliers/table.php index 88adfc692b..eef93452f3 100644 --- a/resources/lang/id/admin/suppliers/table.php +++ b/resources/lang/id/admin/suppliers/table.php @@ -1,25 +1,25 @@ 'Supplier Address', - 'assets' => 'Assets', - 'city' => 'City', - 'contact' => 'Contact Name', - 'country' => 'Country', - 'create' => 'Create Supplier', + 'address' => 'Alamat pemasok', + 'assets' => 'Aset', + 'city' => 'Kota', + 'contact' => 'Nama Kontak', + 'country' => 'Negara', + 'create' => 'Membuat pemasok', 'email' => 'Email', - 'fax' => 'Fax', + 'fax' => 'Faks', 'id' => 'ID', - 'licenses' => 'Licenses', - 'name' => 'Supplier Name', - 'notes' => 'Notes', - 'phone' => 'Phone', - 'state' => 'State', - 'suppliers' => 'Suppliers', - 'update' => 'Update Supplier', + 'licenses' => 'Lisensi', + 'name' => 'Nama Pemasok', + 'notes' => 'Catatan', + 'phone' => 'Telepon', + 'state' => 'Provinsi', + 'suppliers' => 'Pemasok', + 'update' => 'Perbarui Pemasok', 'url' => 'URL', - 'view' => 'View Supplier', - 'view_assets_for' => 'View Assets for', - 'zip' => 'Postal Code', + 'view' => 'Tampilkan Pemasok', + 'view_assets_for' => 'Tampilkan Aset untuk', + 'zip' => 'Kode Pos', ); diff --git a/resources/lang/id/admin/users/general.php b/resources/lang/id/admin/users/general.php index b6acbce0d7..59b50b64d3 100644 --- a/resources/lang/id/admin/users/general.php +++ b/resources/lang/id/admin/users/general.php @@ -3,16 +3,16 @@ return array( - 'assets_user' => 'Assets assigned to :name', - 'current_assets' => 'Assets currently checked out to this user', - 'clone' => 'Clone User', - 'contact_user' => 'Contact :name', - 'edit' => 'Edit User', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', - 'history_user' => 'History for :name', - 'last_login' => 'Last Login', - 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', - 'software_user' => 'Software Checked out to :name', - 'view_user' => 'View User :name', - 'usercsv' => 'CSV file', + 'assets_user' => 'Aset pada :name', + 'current_assets' => 'Aset ini untuk pengguna ini', + 'clone' => 'Klon pengguna', + 'contact_user' => 'Kontak :name', + 'edit' => 'Sunting Pengguna', + 'filetype_info' => 'Jenis berkas diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar.', + 'history_user' => 'Riwayat untuk :name', + 'last_login' => 'Terakhir masuk', + 'ldap_config_text' => 'Konfigurasi LDAP terdapat di Admin > Pengaturan. Jika lokasi di pilih, maka akan di impor untuk semua pengguna.', + 'software_user' => 'Perangkat lunak pada :name', + 'view_user' => 'Lihat pengguna: name', + 'usercsv' => 'Berkas CSV', ); diff --git a/resources/lang/id/admin/users/message.php b/resources/lang/id/admin/users/message.php index a1a9757e86..3ce230144a 100644 --- a/resources/lang/id/admin/users/message.php +++ b/resources/lang/id/admin/users/message.php @@ -2,54 +2,54 @@ return array( - 'accepted' => 'You have successfully accepted this asset.', - 'declined' => 'You have successfully declined this asset.', - 'user_exists' => 'User already exists!', - 'user_not_found' => 'User [:id] does not exist.', - 'user_login_required' => 'The login field is required', - 'user_password_required' => 'The password is required.', - 'insufficient_permissions' => 'Insufficient Permissions.', - 'user_deleted_warning' => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.', - 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', + 'accepted' => 'Anda sukses menerima aset ini.', + 'declined' => 'Anda sukses menolak aset ini.', + 'user_exists' => 'Pengguna sudah ada!', + 'user_not_found' => 'Pengguna [:id] tidak terdaftar.', + 'user_login_required' => 'Kolom login wajib di-isi', + 'user_password_required' => 'Kata sandi wajib di-isi.', + 'insufficient_permissions' => 'Tidak ada hak akses.', + 'user_deleted_warning' => 'Pengguna ini telah di hapus. Anda harus kembalikan dahulu pengguna ini jika ingin menyunting atau di berikan hak kelola aset.', + 'ldap_not_configured' => 'Integrasi LDAP belum dikonfigurasi untuk instalasi ini.', 'success' => array( - 'create' => 'User was successfully created.', - 'update' => 'User was successfully updated.', - 'delete' => 'User was successfully deleted.', - 'ban' => 'User was successfully banned.', - 'unban' => 'User was successfully unbanned.', - 'suspend' => 'User was successfully suspended.', - 'unsuspend' => 'User was successfully unsuspended.', - 'restored' => 'User was successfully restored.', - 'import' => 'Users imported successfully.', + 'create' => 'Pengguna sukses di buat.', + 'update' => 'Pengguna sukses di perbarui.', + 'delete' => 'Pengguna sukses di hapus.', + 'ban' => 'Pengguna sukses di blokir.', + 'unban' => 'Pengguna sukses tidak di blokir.', + 'suspend' => 'Pengguna sukses di tangguhkan.', + 'unsuspend' => 'Pengguna sukses tidak di tangguhkan.', + 'restored' => 'Pengguna sukses di kembalikan.', + 'import' => 'Sukses mengimpor pengguna.', ), 'error' => array( - 'create' => 'There was an issue creating the user. Please try again.', - 'update' => 'There was an issue updating the user. Please try again.', - 'delete' => 'There was an issue deleting the user. Please try again.', - 'unsuspend' => 'There was an issue unsuspending the user. Please try again.', - 'import' => 'There was an issue importing users. Please try again.', - 'asset_already_accepted' => 'This asset has already been accepted.', - 'accept_or_decline' => 'You must either accept or decline this asset.', - 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', - 'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', - 'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server: ', - 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', - 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', + 'create' => 'Terdapat kesalahan ketika membuat pengguna. Silahkan coba kembali.', + 'update' => 'Terdapat masalah ketika memperbarui pengguna. Silahkan coba kembali.', + 'delete' => 'Terdapat masalah ketika menghapus pengguna. Silahkan coba kembali.', + 'unsuspend' => 'Terdapat masalah ketika menangguhkan pengguna. Silahkan coba kembali.', + 'import' => 'Terdapat masalah ketika mengimpor pengguna. Silahkan coba kembali.', + 'asset_already_accepted' => 'Aset ini telah di terima.', + 'accept_or_decline' => 'Anda harus menolak atau menerima aset ini.', + 'incorrect_user_accepted' => 'Aset yang akan di berikan ke anda, belum di setujui.', + 'ldap_could_not_connect' => 'Gagal koneksi ke server LDAP. Silahkan periksa konfigurasi server LDAP di berkas config.
Eror dari server LDAP:', + 'ldap_could_not_bind' => 'Server LDAP gagal mengikat. Silahkan cek kembali konfigurasi server LDAP di berkas config.
Eror dari server LDAP: ', + 'ldap_could_not_search' => 'Gagal mencari server LDAP. Silahkan cek konfigurasi server LDAP di berkas config LDAP.
Eror dari server LDAP:', + 'ldap_could_not_get_entries' => 'Gagal menerima catatan dari server LDAP. Silahkan cek konfigurasi server LDAP di berkas config LDAP.
Eror dari server LDAP:', ), 'deletefile' => array( - 'error' => 'File not deleted. Please try again.', - 'success' => 'File successfully deleted.', + 'error' => 'Berkas belum terhapus. Silahkan coba kembali.', + 'success' => 'Berkas sukses di hapus.', ), 'upload' => array( - 'error' => 'File(s) not uploaded. Please try again.', - 'success' => 'File(s) successfully uploaded.', - 'nofiles' => 'You did not select any files for upload', - 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', + 'error' => 'Berkas belum terunggah. Silakan coba kembali.', + 'success' => 'Berkas sukses terunggah.', + 'nofiles' => 'Anda belum memilih berkas untuk di unggah', + 'invalidfiles' => 'Satu atau lebih dari file Anda terlalu besar atau jenis berkas yang tidak diperbolehkan. Tipe file diizinkan adalah png, gif, jpg, doc, docx, pdf, dan txt.', ), ); diff --git a/resources/lang/id/admin/users/table.php b/resources/lang/id/admin/users/table.php index 8c9b40a454..37157fb197 100644 --- a/resources/lang/id/admin/users/table.php +++ b/resources/lang/id/admin/users/table.php @@ -2,35 +2,35 @@ return array( - 'activated' => 'Active', - 'allow' => 'Allow', - 'checkedout' => 'Assets', - 'created_at' => 'Created', - 'createuser' => 'Create User', - 'deny' => 'Deny', + 'activated' => 'Aktif', + 'allow' => 'Izinkan', + 'checkedout' => 'Aset', + 'created_at' => 'Dibuat', + 'createuser' => 'Membuat pengguna', + 'deny' => 'Menolak', 'email' => 'Email', - 'employee_num' => 'Employee No.', - 'first_name' => 'First Name', - 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned.', + 'employee_num' => 'No. Karyawan.', + 'first_name' => 'Nama Depan', + 'groupnotes' => 'Pilih kelompok untuk diberikan ke pengguna, ingatlah bahwa pengguna mendapatkan hak ases dari kelompok yang ada pada mereka.', 'id' => 'Id', - 'inherit' => 'Inherit', - 'job' => 'Job Title', - 'last_login' => 'Last Login', - 'last_name' => 'Last Name', - 'location' => 'Location', - 'lock_passwords' => 'Login details cannot be changed on this installation.', - 'manager' => 'Manager', - 'name' => 'Name', - 'notes' => 'Notes', - 'password_confirm' => 'Confirm Password', - 'password' => 'Password', - 'phone' => 'Phone', - 'show_current' => 'Show Current Users', - 'show_deleted' => 'Show Deleted Users', - 'title' => 'Title', - 'updateuser' => 'Update User', - 'username' => 'Username', - 'username_note' => '(This is used for Active Directory binding only, not for login.)', - 'cloneuser' => 'Clone User', - 'viewusers' => 'View Users', + 'inherit' => 'Turunan', + 'job' => 'Pekerjaan', + 'last_login' => 'Terakhir masuk', + 'last_name' => 'Nama Belakang', + 'location' => 'Lokasi', + 'lock_passwords' => 'Detail masuk tidak dapat di ubah ketika instalasi.', + 'manager' => 'Manajer', + 'name' => 'Nama', + 'notes' => 'Catatan', + 'password_confirm' => 'Konfirmasikan Kata Sandi', + 'password' => 'Kata sandi', + 'phone' => 'Telepon', + 'show_current' => 'Tampilkan pengguna saat ini', + 'show_deleted' => 'Tampilkan pengguna yang di hapus', + 'title' => 'Judul', + 'updateuser' => 'Perbarui Pengguna', + 'username' => 'Nama Pengguna', + 'username_note' => '(Ini digunakan untuk mengikat Active Directory saja, bukan untuk login.)', + 'cloneuser' => 'Klon pengguna', + 'viewusers' => 'Tampilkan Pengguna', ); diff --git a/resources/lang/id/auth/general.php b/resources/lang/id/auth/general.php index bf88cba77a..10e09794d9 100644 --- a/resources/lang/id/auth/general.php +++ b/resources/lang/id/auth/general.php @@ -1,12 +1,12 @@ 'Send Password Reset Link', - 'email_reset_password' => 'Email Password Reset', - 'reset_password' => 'Reset Password', - 'login' => 'Login', - 'login_prompt' => 'Please Login', - 'forgot_password' => 'I forgot my password', - 'remember_me' => 'Remember Me', + 'send_password_link' => 'Kirim tautan reset kata sandi', + 'email_reset_password' => 'Reset Email kata sandi', + 'reset_password' => 'Reset kata sandi', + 'login' => 'Masuk', + 'login_prompt' => 'Silahkan masuk', + 'forgot_password' => 'Lupa kata sandi', + 'remember_me' => 'Ingat saya', ]; diff --git a/resources/lang/id/auth/message.php b/resources/lang/id/auth/message.php index 31bafb55ce..89f01d07c3 100644 --- a/resources/lang/id/auth/message.php +++ b/resources/lang/id/auth/message.php @@ -2,35 +2,35 @@ return array( - 'account_already_exists' => 'An account with the this email already exists.', - 'account_not_found' => 'The username or password is incorrect.', - 'account_not_activated' => 'This user account is not activated.', - 'account_suspended' => 'This user account is suspended.', - 'account_banned' => 'This user account is banned.', + 'account_already_exists' => 'Akun dengan ini email telah digunakan.', + 'account_not_found' => 'Nama pengguna atau sandi tidak benar.', + 'account_not_activated' => 'Akun pengguna ini belum ter-aktivasi.', + 'account_suspended' => 'Akun pengguna ini di tangguhkan.', + 'account_banned' => 'Akun pengguna ini dilarang.', 'signin' => array( - 'error' => 'There was a problem while trying to log you in, please try again.', - 'success' => 'You have successfully logged in.', + 'error' => 'Terdapat kesalahan ketika anda mencoba masuk, silahkan coba kembali.', + 'success' => 'Anda berhasil masuk.', ), 'signup' => array( - 'error' => 'There was a problem while trying to create your account, please try again.', - 'success' => 'Account sucessfully created.', + 'error' => 'Terdapat kesalahan ketika membuat akun anda, silahkan coba kembali.', + 'success' => 'Akun berhasil dibuat.', ), 'forgot-password' => array( - 'error' => 'There was a problem while trying to get a reset password code, please try again.', - 'success' => 'Password recovery email successfully sent.', + 'error' => 'Terdapat kesalahan ketika reset kode kata sandi anda, silahkan coba kembali.', + 'success' => 'Email pembaruan kata sandi sukses terkirim.', ), 'forgot-password-confirm' => array( - 'error' => 'There was a problem while trying to reset your password, please try again.', - 'success' => 'Your password has been successfully reset.', + 'error' => 'Terdapat kesalahan ketika reset kata sandi anda, silahkan coba kembali.', + 'success' => 'Password anda sudah berhasil di reset.', ), 'activate' => array( - 'error' => 'There was a problem while trying to activate your account, please try again.', - 'success' => 'Your account has been successfully activated.', + 'error' => 'Terdapat kesalahan ketika aktivasi akun anda, silahkan coba kembali.', + 'success' => 'Akun anda sukses di aktivasi.', ), ); diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php index e1d5eba5c3..1dc523a7d8 100644 --- a/resources/lang/id/general.php +++ b/resources/lang/id/general.php @@ -1,172 +1,173 @@ 'Accessories', - 'activated' => 'Activated', - 'accessory' => 'Accessory', - 'accessory_report' => 'Accessory Report', - 'action' => 'Action', - 'activity_report' => 'Activity Report', - 'address' => 'Address', + 'accessories' => 'Aksesoris', + 'activated' => 'Diaktifkan', + 'accessory' => 'Aksesori', + 'accessory_report' => 'Laporan aksesori', + 'action' => 'Tindakan', + 'activity_report' => 'Laporan kegiatan', + 'address' => 'Alamat', 'admin' => 'Admin', - 'add_seats' => 'Added seats', - 'all_assets' => 'All Assets', - 'all' => 'All', - 'archived' => 'Archived', - 'asset_models' => 'Asset Models', - 'asset' => 'Asset', - 'asset_report' => 'Asset Report', - 'asset_tag' => 'Asset Tag', - 'assets_available' => 'assets available', - 'assets' => 'Assets', - 'avatar_delete' => 'Delete Avatar', - 'avatar_upload' => 'Upload Avatar', - 'back' => 'Back', - 'bad_data' => 'Nothing found. Maybe bad data?', - 'bulk_checkout' => 'Bulk Checkout', - 'cancel' => 'Cancel', - 'categories' => 'Categories', - 'category' => 'Category', - 'changeemail' => 'Change Email Address', - 'changepassword' => 'Change Password', - 'checkin' => 'Checkin', - 'checkin_from' => 'Checkin from', - 'checkout' => 'Checkout', - 'city' => 'City', - 'companies' => 'Companies', - 'company' => 'Company', - 'component' => 'Component', - 'components' => 'Components', - 'consumable' => 'Consumable', - 'consumables' => 'Consumables', - 'country' => 'Country', - 'create' => 'Create New', - 'created_asset' => 'created asset', - 'created_at' => 'Created at', + 'add_seats' => 'Tambahan hak', + 'all_assets' => 'Semua aset', + 'all' => 'Semua', + 'archived' => 'Diarsipkan', + 'asset_models' => 'Model aset', + 'asset' => 'Aset', + 'asset_report' => 'Laporan aset', + 'asset_tag' => 'Tag Aset', + 'assets_available' => 'Aset yang tersedia', + 'assets' => 'Aset', + 'avatar_delete' => 'Hapus avatar', + 'avatar_upload' => 'Unggah avatar', + 'back' => 'Kembali', + 'bad_data' => 'Tidak di temukan. Kemungkinan data rusak?', + 'bulk_checkout' => 'check-out masal', + 'cancel' => 'Batalkan', + 'categories' => 'Kategori', + 'category' => 'Kategori', + 'changeemail' => 'Rubah alamat email', + 'changepassword' => 'Rubah Kata sandi', + 'checkin' => 'Check-in', + 'checkin_from' => 'Check-in dari', + 'checkout' => 'Check-out', + 'city' => 'Kota', + 'companies' => 'Perusahaan', + 'company' => 'Perusahaan', + 'component' => 'Komponen', + 'components' => 'Komponen', + 'consumable' => 'Barang Habis Pakai', + 'consumables' => 'Barang Habis Pakai', + 'country' => 'Negara', + 'create' => 'Buat baru', + 'created_asset' => 'Buat aset', + 'created_at' => 'Dibuat di', 'currency' => '$', // this is deprecated - 'current' => 'Current', - 'custom_report' => 'Custom Asset Report', + 'current' => 'Saat ini', + 'custom_report' => 'Laporan kustom aset', 'dashboard' => 'Dashboard', - 'date' => 'Date', - 'delete' => 'Delete', - 'deleted' => 'Deleted', - 'delete_seats' => 'Deleted Seats', - 'deployed' => 'Deployed', - 'depreciation_report' => 'Depreciation Report', + 'date' => 'Tanggal', + 'delete' => 'Hapus', + 'deleted' => 'Dihapus', + 'delete_seats' => 'Lisensi di hapus', + 'deployed' => 'Dijalankan', + 'depreciation_report' => 'Laporan penyusutan', 'download' => 'Download', - 'depreciation' => 'Depreciation', - 'editprofile' => 'Edit Your Profile', - 'eol' => 'EOL', - 'email_domain' => 'Email Domain', - 'email_format' => 'Email Format', - 'email_domain_help' => 'This is used to generate email addresses when importing', - 'filastname_format' => 'First Initial Last Name (jsmith@example.com)', - 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)', - 'first' => 'First', - 'first_name' => 'First Name', - 'first_name_format' => 'First Name (jane@example.com)', - 'file_name' => 'File', - 'file_uploads' => 'File Uploads', + 'depreciation' => 'Penyusutan', + 'editprofile' => 'Sunting profil anda', + 'eol' => 'MHP', + 'email_domain' => 'Domain email', + 'email_format' => 'Format email', + 'email_domain_help' => 'Ini digunakan untuk untuk membuat email ketika melakukan proses import', + 'filastname_format' => 'Inisial pertama - Nama belakang (jsmith@example.com)', + 'firstname_lastname_format' => 'Nama depan - Nama belakang (jane.smith@example.com)', + 'first' => 'Pertama', + 'first_name' => 'Nama Depan', + 'first_name_format' => 'Nama Depan (jane@example.com)', + 'file_name' => 'Berkas', + 'file_uploads' => 'Unggah Berkas', 'generate' => 'Generate', - 'groups' => 'Groups', - 'gravatar_email' => 'Gravatar Email Address', - 'history' => 'History', - 'history_for' => 'History for', + 'groups' => 'Kelompok', + 'gravatar_email' => 'Alamat Gravatar Email', + 'history' => 'Riwayat', + 'history_for' => 'Riwayat untuk', 'id' => 'ID', - 'image_delete' => 'Delete Image', - 'image_upload' => 'Upload Image', - 'import' => 'Import', - 'asset_maintenance' => 'Asset Maintenance', - 'asset_maintenance_report' => 'Asset Maintenance Report', - 'asset_maintenances' => 'Asset Maintenances', + 'image_delete' => 'Menghapus gambar', + 'image_upload' => 'Unggah gambar', + 'import' => 'Impor', + 'import-history' => 'Import History', + 'asset_maintenance' => 'Pemeliharaan Aset', + 'asset_maintenance_report' => 'Laporan Pemeliharaan Aset', + 'asset_maintenances' => 'Pemeliharaan Aset', 'item' => 'Item', - 'insufficient_permissions' => 'Insufficient permissions!', - 'language' => 'Language', - 'last' => 'Last', - 'last_name' => 'Last Name', - 'license' => 'License', - 'license_report' => 'License Report', - 'licenses_available' => 'licenses available', - 'licenses' => 'Licenses', - 'list_all' => 'List All', - 'loading' => 'Loading', - 'lock_passwords' => 'This field cannot be edited in this installation.', - 'feature_disabled' => 'This feature has been disabled for this installation.', - 'location' => 'Location', - 'locations' => 'Locations', - 'logout' => 'Logout', - 'lookup_by_tag' => 'Lookup by Asset Tag', - 'manufacturer' => 'Manufacturer', - 'manufacturers' => 'Manufacturers', - 'markdown' => 'This field allows Github flavored markdown.', - 'min_amt' => 'Min. QTY', - 'min_amt_help' => 'Minimum number of items that should be available before an alert gets triggered.', - 'model_no' => 'Model No.', - 'months' => 'months', - 'moreinfo' => 'More Info', - 'name' => 'Name', - 'next' => 'Next', - 'new' => 'new!', - 'no_depreciation' => 'No Depreciation', - 'no_results' => 'No Results.', - 'no' => 'No', - 'notes' => 'Notes', - 'page_menu' => 'Showing _MENU_ items', - 'pagination_info' => 'Showing _START_ to _END_ of _TOTAL_ items', - 'pending' => 'Pending', - 'people' => 'People', - 'per_page' => 'Results Per Page', - 'previous' => 'Previous', - 'processing' => 'Processing', - 'profile' => 'Your profile', - 'qty' => 'QTY', - 'quantity' => 'Quantity', - 'ready_to_deploy' => 'Ready to Deploy', - 'recent_activity' => 'Recent Activity', - 'remove_company' => 'Remove Company Association', - 'reports' => 'Reports', - 'requested' => 'Requested', - 'save' => 'Save', - 'select' => 'Select', - 'search' => 'Search', - 'select_category' => 'Select a Category', - 'select_depreciation' => 'Select a Depreciation Type', - 'select_location' => 'Select a Location', - 'select_manufacturer' => 'Select a Manufacturer', - 'select_model' => 'Select a Model', - 'select_supplier' => 'Select a Supplier', - 'select_user' => 'Select a User', - 'select_date' => 'Select Date', - 'select_statuslabel' => 'Select Status', - 'select_company' => 'Select Company', - 'select_asset' => 'Select Asset', - 'settings' => 'Settings', - 'sign_in' => 'Sign in', - 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', - 'site_name' => 'Site Name', - 'state' => 'State', - 'status_labels' => 'Status Labels', + 'insufficient_permissions' => 'Tidak ada hak akses!', + 'language' => 'Bahasa', + 'last' => 'Terakhir', + 'last_name' => 'Nama Belakang', + 'license' => 'Lisensi', + 'license_report' => 'Laporan Lisensi', + 'licenses_available' => 'lisensi yang tersedia', + 'licenses' => 'Lisensi', + 'list_all' => 'Tampilkan semua', + 'loading' => 'Memuat', + 'lock_passwords' => 'Field ini tidak dapat di edit ketika instalasi.', + 'feature_disabled' => 'Fitur ini telah di non-aktifkan untuk instalasi ini.', + 'location' => 'Lokasi', + 'locations' => 'Lokasi', + 'logout' => 'Keluar', + 'lookup_by_tag' => 'Mencari berdasarkan tag aset', + 'manufacturer' => 'Produsen', + 'manufacturers' => 'Produsen', + 'markdown' => 'Field ini mengizinkan Github flavored markdown.', + 'min_amt' => 'Jml Min.', + 'min_amt_help' => 'Jumlah item minimal yang tersedia sebelum pemberitahuan di aktifkan.', + 'model_no' => 'No. Model', + 'months' => 'bulan', + 'moreinfo' => 'Lebih Lanjut', + 'name' => 'Nama', + 'next' => 'Berikutnya', + 'new' => 'baru!', + 'no_depreciation' => 'Tidak ada penyusutan', + 'no_results' => 'Tidak ada hasil.', + 'no' => 'Tidak', + 'notes' => 'Catatan', + 'page_menu' => 'Menampilkan item _MENU_', + 'pagination_info' => 'Menampilkan hal_START_ to _END_ of _TOTAL_', + 'pending' => 'Ditunda', + 'people' => 'Orang', + 'per_page' => 'Hasil per halaman', + 'previous' => 'Sebelumnya', + 'processing' => 'Pengolahan', + 'profile' => 'Profil anda', + 'qty' => 'JML', + 'quantity' => 'Jumlah', + 'ready_to_deploy' => 'Siap digunakan', + 'recent_activity' => 'Aktivitas Terakhir', + 'remove_company' => 'Hapus Asosiasi Perusahaan', + 'reports' => 'Laporan', + 'requested' => 'Diminta', + 'save' => 'Simpan', + 'select' => 'Pilih', + 'search' => 'Cari', + 'select_category' => 'Memilih Kategori', + 'select_depreciation' => 'Memilih tipe penyusutan', + 'select_location' => 'Memilih lokasi', + 'select_manufacturer' => 'Memilih pabrikan', + 'select_model' => 'Memilih model', + 'select_supplier' => 'Memilih pemasok', + 'select_user' => 'Memilih pengguna', + 'select_date' => 'Memilih Tanggal', + 'select_statuslabel' => 'Memilih Status', + 'select_company' => 'Memilih Perusahaan', + 'select_asset' => 'Memilih Aset', + 'settings' => 'Pengaturan', + 'sign_in' => 'Masuk', + 'some_features_disabled' => 'DEMO: Beberapa fitur tidak aktif.', + 'site_name' => 'Nama Situs', + 'state' => 'Provinsi', + 'status_labels' => 'Status label', 'status' => 'Status', - 'suppliers' => 'Suppliers', - 'total_assets' => 'total assets', - 'total_licenses' => 'total licenses', - 'type' => 'Type', - 'undeployable' => 'Un-deployable', - 'unknown_admin' => 'Unknown Admin', - 'username_format' => 'Username Format', - 'update' => 'Update', - 'uploaded' => 'Uploaded', - 'user' => 'User', - 'accepted' => 'accepted', - 'declined' => 'declined', - 'unaccepted_asset_report' => 'Unaccepted Assets', - 'users' => 'Users', - 'viewassets' => 'View Assigned Assets', - 'website' => 'Website', - 'welcome' => 'Welcome, :name', - 'years' => 'years', - 'yes' => 'Yes', - 'zip' => 'Zip', - 'noimage' => 'No image uploaded or image not found.', - 'token_expired' => 'Your form session has expired. Please try again.', + 'suppliers' => 'Pemasok', + 'total_assets' => 'total aset', + 'total_licenses' => 'total lisensi', + 'type' => 'Tipe', + 'undeployable' => 'Belum siap digunakan', + 'unknown_admin' => 'Admin tidak diketahui', + 'username_format' => 'Format pengguna', + 'update' => 'Memperbarui', + 'uploaded' => 'Terunggah', + 'user' => 'Pengguna', + 'accepted' => 'diterima', + 'declined' => 'menolak', + 'unaccepted_asset_report' => 'Aset tidak diterima', + 'users' => 'Pengguna', + 'viewassets' => 'Tampilkan aset', + 'website' => 'Situs Web', + 'welcome' => 'Selamat datang, :name', + 'years' => 'tahun', + 'yes' => 'Ya', + 'zip' => 'Kode Pos', + 'noimage' => 'Gambar tidak di temukan atau gambar tidak ter-unggah.', + 'token_expired' => 'Sesi login Anda telah kadaluarsa. Silakan login lagi.', ]; diff --git a/resources/lang/id/pagination.php b/resources/lang/id/pagination.php index b573b51e91..af0f8ece41 100644 --- a/resources/lang/id/pagination.php +++ b/resources/lang/id/pagination.php @@ -13,8 +13,8 @@ return array( | */ - 'previous' => '« Previous', + 'previous' => '« Sebelumnya', - 'next' => 'Next »', + 'next' => 'Selanjutnya »', ); diff --git a/resources/lang/id/passwords.php b/resources/lang/id/passwords.php index 5195a9b77c..6beb31c503 100644 --- a/resources/lang/id/passwords.php +++ b/resources/lang/id/passwords.php @@ -1,7 +1,7 @@ 'Your password link has been sent!', - 'user' => 'That user does not exist or does not have an email address associated', + 'sent' => 'Tautan sandi Anda telah dikirim!', + 'user' => 'User tersebut tidak terdaftar atau tidak memiliki alamat email terdaftar', ]; diff --git a/resources/lang/id/reminders.php b/resources/lang/id/reminders.php index e7a476e3a2..ec797a949b 100644 --- a/resources/lang/id/reminders.php +++ b/resources/lang/id/reminders.php @@ -13,12 +13,12 @@ return array( | */ - "password" => "Passwords must be six characters and match the confirmation.", + "password" => "Kata sandi harus 6 karakter dan sama.", - "user" => "Username or email address is incorrect", + "user" => "Nama pengguna atau alamat email salah", - "token" => "This password reset token is invalid.", + "token" => "Password reset token tidak valid.", - "sent" => "If a matching email address was found, a password reminder has been sent!", + "sent" => "Jika alamat email yang cocok ditemukan, pengingat password telah dikirim!", ); diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php index 4e501f1a5f..95bf1c3c65 100644 --- a/resources/lang/id/validation.php +++ b/resources/lang/id/validation.php @@ -64,8 +64,8 @@ return array( ), "unique" => ":attribute sudah digunakan.", "url" => "Format :attribute tidak benar.", - "statuslabel_type" => "You must select a valid status label type", - "unique_undeleted" => "The :attribute must be unique.", + "statuslabel_type" => "Anda harus memilih tipe status label yang benar", + "unique_undeleted" => ":attribute harus unik.", /* diff --git a/resources/lang/it/admin/custom_fields/general.php b/resources/lang/it/admin/custom_fields/general.php index 4e0fea281b..112fc0ae08 100644 --- a/resources/lang/it/admin/custom_fields/general.php +++ b/resources/lang/it/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Campo', 'about_fieldsets_title' => 'Fileldsets', 'about_fieldsets_text' => 'I Fieldsets ti permettono di creare gruppi di campi personalizzati che sono frequentemente riutilizzati per modelli specifici di asset.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Campi quantità', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Nome Fieldset', 'field_name' => 'Nome campo', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Elemento del form', 'field_element_short' => 'Elemento', 'field_format' => 'Formato', diff --git a/resources/lang/it/admin/hardware/message.php b/resources/lang/it/admin/hardware/message.php index 619970ac08..eb66bbb933 100644 --- a/resources/lang/it/admin/hardware/message.php +++ b/resources/lang/it/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Il bene non è stato estratto, per favore riprova', 'success' => 'Il bene è stato estratto con successo.', - 'user_does_not_exist' => 'Questo utente non è valido. Riprova.' + 'user_does_not_exist' => 'Questo utente non è valido. Riprova.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php index e2053417a2..c871bea9d0 100644 --- a/resources/lang/it/admin/settings/general.php +++ b/resources/lang/it/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'Password LDAP', 'ldap_basedn' => 'DN Base', 'ldap_filter' => 'Filtro LDAP', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Campo nome utente', 'ldap_lname_field' => 'Cognome', 'ldap_fname_field' => 'Nome LDAP', diff --git a/resources/lang/it/admin/statuslabels/table.php b/resources/lang/it/admin/statuslabels/table.php index 7921d29ba7..c17738a124 100644 --- a/resources/lang/it/admin/statuslabels/table.php +++ b/resources/lang/it/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Informazioni sulle etichette di stato', 'archived' => 'Archiviato', 'create' => 'Crea Etichetta di Stato', + 'color' => 'Chart Color', 'deployable' => 'Distribuibile', 'info' => 'Le etichette di stato sono usate per descrivere i vari stati dei beni. Essi possono essere fuori per la riparazione, perso o rubato, etc. È possibile creare nuove etichette di stato per schierabili, in attesa e dei beni archiviati.', 'name' => 'Nome Stato', 'pending' => 'In attesa', 'status_type' => 'Tipo di stato', + 'show_in_nav' => 'Show in side nav', 'title' => 'Etichette di Stato', 'undeployable' => 'Non Distribuilbile', 'update' => 'Aggiorna Etichetta di Stato', diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php index afa4d890fc..ff36d0a50b 100644 --- a/resources/lang/it/general.php +++ b/resources/lang/it/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Cancella l\'Immagine', 'image_upload' => 'Carica immagine', 'import' => 'Importa', + 'import-history' => 'Import History', 'asset_maintenance' => 'Manutenzione Prodotto', 'asset_maintenance_report' => 'Rapporto manutenzione prodotto', 'asset_maintenances' => 'Manutenzione Prodotto', diff --git a/resources/lang/ja/admin/categories/message.php b/resources/lang/ja/admin/categories/message.php index ecf8f2685d..ee53030cf9 100644 --- a/resources/lang/ja/admin/categories/message.php +++ b/resources/lang/ja/admin/categories/message.php @@ -3,8 +3,8 @@ return array( 'does_not_exist' => 'カテゴリーが存在しません。', - 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ', - 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ', + 'assoc_models' => 'このカテゴリーは１つ以上の型番に関連付けられているため削除できません。このカテゴリーを参照しないようにモ型番を更新して再度実行してください。 ', + 'assoc_items' => 'このカテゴリーは１つ以上の資産に関連付けられているため削除できません。このカテゴリーを参照しないようにモ資産を更新して再度実行してください。 ', 'create' => array( 'error' => 'カテゴリーが作成されていません。再度実行してください。', diff --git a/resources/lang/ja/admin/companies/general.php b/resources/lang/ja/admin/companies/general.php index 9d58ccb58e..a011ba0429 100644 --- a/resources/lang/ja/admin/companies/general.php +++ b/resources/lang/ja/admin/companies/general.php @@ -1,4 +1,4 @@ 'Select Company', + 'select_company' => '所属を選択', ]; diff --git a/resources/lang/ja/admin/companies/message.php b/resources/lang/ja/admin/companies/message.php index a6db573519..6176b70cd1 100644 --- a/resources/lang/ja/admin/companies/message.php +++ b/resources/lang/ja/admin/companies/message.php @@ -1,18 +1,18 @@ 'Company does not exist.', - 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', + 'does_not_exist' => '所属は存在しません', + 'assoc_users' => 'この所属は現在少なくとも一つの型番に関連付けされているため削除できません。この所属を参照しないように更新した上で、もう一度試して下さい。 ', 'create' => array( - 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' + 'error' => '所属は作成されませんでした、もう一度やり直してください。', + 'success' => '所属が正常に作成されました。' ), 'update' => array( - 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' + 'error' => '所属部署が更新されませんでした、もう一度やり直してください。', + 'success' => '所属が正常に更新されました。' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this company?', - 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' + 'confirm' => 'この所属を削除してもよろしいですか？', + 'error' => '所属を削除する時に問題が発生しました。もう一度試して下さい。', + 'success' => '所属の削除に成功しました。' ) ); diff --git a/resources/lang/ja/admin/companies/table.php b/resources/lang/ja/admin/companies/table.php index 2f86126ff2..1e4181c8bd 100644 --- a/resources/lang/ja/admin/companies/table.php +++ b/resources/lang/ja/admin/companies/table.php @@ -1,9 +1,9 @@ 'Companies', - 'create' => 'Create Company', - 'title' => 'Company', - 'update' => 'Update Company', - 'name' => 'Company Name', + 'companies' => '所属', + 'create' => '所属を作成', + 'title' => '所属', + 'update' => '所属を更新', + 'name' => '所属名', 'id' => 'ID', ); diff --git a/resources/lang/ja/admin/components/general.php b/resources/lang/ja/admin/components/general.php index 75c9d250ab..1eddbced1e 100644 --- a/resources/lang/ja/admin/components/general.php +++ b/resources/lang/ja/admin/components/general.php @@ -1,17 +1,17 @@ 'About Components', - 'about_components_text' => 'Components are items that are part of an asset, for example HDD, RAM, etc.', - 'component_name' => 'Component Name', - 'checkin' => 'Checkin Component', - 'checkout' => 'Checkout Component', - 'cost' => 'Purchase Cost', - 'create' => 'Create Component', - 'edit' => 'Edit Component', - 'date' => 'Purchase Date', - 'order' => 'Order Number', - 'remaining' => 'Remaining', - 'total' => 'Total', - 'update' => 'Update Component', + 'about_components_title' => '構成部品名', + 'about_components_text' => '構成部品名は 資産の一部となるアイテムです。(例 HDD, RAM など)', + 'component_name' => '構成部品名', + 'checkin' => '構成品のチェックイン', + 'checkout' => '構成部品のチェックアウト', + 'cost' => '購入費用', + 'create' => '構成部品の作成', + 'edit' => '構成部品の編集', + 'date' => '購入日', + 'order' => '注文番号', + 'remaining' => '残数', + 'total' => '合計', + 'update' => '構成部品の更新', ); diff --git a/resources/lang/ja/admin/components/message.php b/resources/lang/ja/admin/components/message.php index 1d13970f23..06beea39e3 100644 --- a/resources/lang/ja/admin/components/message.php +++ b/resources/lang/ja/admin/components/message.php @@ -2,34 +2,34 @@ return array( - 'does_not_exist' => 'Component does not exist.', + 'does_not_exist' => '構成部品は存在しません', 'create' => array( - 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' + 'error' => '構成部品が作成できませんでした。もう一度やり直して下さい。', + 'success' => '構成部品が作成されました。' ), 'update' => array( - 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' + 'error' => '構成部品がが更新できませんでした。もう一度やり直して下さい。', + 'success' => '構成部品が作成されました。' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this component?', - 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' + 'confirm' => 'この構成部品を削除してもよろしいですか?', + 'error' => '構成部品を削除する際に問題が発生しました。もう一度やり直して下さい。', + 'success' => '構成部品は削除されました。' ), 'checkout' => array( - 'error' => 'Component was not checked out, please try again', - 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => '構成部品はチェックアウトされませんでした。もう一度、やり直して下さい。', + 'success' => '構成部品は正常にチェックアウトされました。', + 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。' ), 'checkin' => array( - 'error' => 'Component was not checked in, please try again', - 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => '構成部品はチェックインされませんでした。もう一度、やり直して下さい。', + 'success' => '構成部品は正常にチェックインされました。', + 'user_does_not_exist' => '利用者が正しくありません。もう一度試して下さい。' ) diff --git a/resources/lang/ja/admin/components/table.php b/resources/lang/ja/admin/components/table.php index 3d4fed6a7f..08f7648572 100644 --- a/resources/lang/ja/admin/components/table.php +++ b/resources/lang/ja/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', + 'title' => '構成部品名', ); diff --git a/resources/lang/ja/admin/custom_fields/general.php b/resources/lang/ja/admin/custom_fields/general.php index 7182fecfdc..7438491f71 100644 --- a/resources/lang/ja/admin/custom_fields/general.php +++ b/resources/lang/ja/admin/custom_fields/general.php @@ -1,23 +1,29 @@ 'Custom Fields', - 'field' => 'Field', - 'about_fieldsets_title' => 'About Fieldsets', - 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', - 'fieldset' => 'Fieldset', - 'qty_fields' => 'Qty Fields', - 'fieldsets' => 'Fieldsets', - 'fieldset_name' => 'Fieldset Name', - 'field_name' => 'Field Name', - 'field_element' => 'Form Element', - 'field_element_short' => 'Element', - 'field_format' => 'Format', - 'field_custom_format' => 'Custom Format', - 'required' => 'Required', - 'req' => 'Req.', - 'used_by_models' => 'Used By Models', - 'order' => 'Order', - 'create_fieldset' => 'New Fieldset', - 'create_field' => 'New Custom Field', + 'custom_fields' => 'カスタムフィールド', + 'field' => 'フィールド', + 'about_fieldsets_title' => 'フィールドセットについて', + 'about_fieldsets_text' => 'フィールドセットでは、頻繁に利用されるカスタム フィールドのグループを作成することができます。 +よく', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', + 'fieldset' => 'フィールドセット', + 'qty_fields' => '数量フィールド', + 'fieldsets' => 'フィールドセット', + 'fieldset_name' => 'フィールドセット名', + 'field_name' => 'フィールド名', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', + 'field_element' => 'フォームエレメント', + 'field_element_short' => 'エレメント', + 'field_format' => 'フォーマット', + 'field_custom_format' => 'カスタム形式：', + 'required' => '必須', + 'req' => '必須', + 'used_by_models' => '型番で使用', + 'order' => '順番', + 'create_fieldset' => '新しいフィールドセット', + 'create_field' => '新しいユーザー設定フィールド', ); diff --git a/resources/lang/ja/admin/custom_fields/message.php b/resources/lang/ja/admin/custom_fields/message.php index 0d34afa9e8..5fd1a66f1a 100644 --- a/resources/lang/ja/admin/custom_fields/message.php +++ b/resources/lang/ja/admin/custom_fields/message.php @@ -3,25 +3,25 @@ return array( 'field' => array( - 'invalid' => 'That field does not exist.', - 'already_added' => 'Field already added', + 'invalid' => 'フィールドがありません。', + 'already_added' => 'フィールドはすでに追加されています', 'create' => array( - 'error' => 'Field was not created, please try again.', - 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' + 'error' => 'フォルダーは作成されませんでした。もう一度やり直してください。', + 'success' => 'フィールドを正常に作成しました。', + 'assoc_success' => 'フィールドはフィールドセットに追加されました' ), 'update' => array( - 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' + 'error' => 'フィールドは更新されませんでした。もう一度やり直してください。', + 'success' => 'フィールドを正常に更新しました。' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this field?', - 'error' => 'There was an issue deleting the field. Please try again.', - 'success' => 'The field was deleted successfully.', - 'in_use' => 'Field is still in use.', + 'confirm' => 'このフィールドを削除してもよろしいですか？', + 'error' => 'フィールドを削除する際に問題が発生しました。もう一度、やり直して下さい。', + 'success' => 'フィールドは削除されました。', + 'in_use' => 'フィールドは使用中です。', ) ), @@ -31,20 +31,20 @@ return array( 'create' => array( - 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' + 'error' => 'フィールドセットは作成されませんでした。もう一度やり直してください。', + 'success' => 'フィールドセットを正常に作成しました。' ), 'update' => array( - 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' + 'error' => 'フィールドセットは更新されませんでした。もう一度やり直してください。', + 'success' => 'フィールドセットを正常に更新しました。' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this fieldset?', - 'error' => 'There was an issue deleting the fieldset. Please try again.', - 'success' => 'The fieldset was deleted successfully.', - 'in_use' => 'Fieldset is still in use.', + 'confirm' => 'このフィールドセットを削除してもよろしいですか？', + 'error' => 'フィールドセットを削除する際に問題が発生しました。もう一度、やり直して下さい。', + 'success' => 'フィールドセットは削除されました。', + 'in_use' => 'フィールドセットは使用中です。', ) ), diff --git a/resources/lang/ja/admin/hardware/form.php b/resources/lang/ja/admin/hardware/form.php index fca9f6e9ef..ca9b60a8c8 100644 --- a/resources/lang/ja/admin/hardware/form.php +++ b/resources/lang/ja/admin/hardware/form.php @@ -1,9 +1,9 @@ 'Confrm Bulk Delete Assets', - 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', - 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', + 'bulk_delete' => '資産一括削除', + 'bulk_delete_help' => '以下の資産が一括削除されます。削除後のデータは戻すことができませ', + 'bulk_delete_warn' => ':asset_cont 件の資産を削除しました', 'bulk_update' => '資産を一括更新', 'bulk_update_help' => 'このフォームは一度に複数の資産を更新することが可能です。変更が必要なフィールドにのみ入力をして下さい。ブランクのフィールドは変更されません。 ', 'bulk_update_warn' => '資産群（:asset_count）のプロパティを編集します。', diff --git a/resources/lang/ja/admin/hardware/general.php b/resources/lang/ja/admin/hardware/general.php index 1bbad86b00..9ff75718ab 100644 --- a/resources/lang/ja/admin/hardware/general.php +++ b/resources/lang/ja/admin/hardware/general.php @@ -3,7 +3,7 @@ return array( 'archived' => 'アーカイブ', 'asset' => '資産', - 'bulk_checkout' => 'Checkout Assets to User', + 'bulk_checkout' => '利用者に資産をチェックアウトする', 'checkin' => '資産をチェックイン', 'checkout' => '利用者に資産をチェックアウト', 'clone' => '資産を複製', diff --git a/resources/lang/ja/admin/hardware/message.php b/resources/lang/ja/admin/hardware/message.php index b955e8c61d..4a247c1a91 100644 --- a/resources/lang/ja/admin/hardware/message.php +++ b/resources/lang/ja/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,20 +52,21 @@ return array( 'checkout' => array( 'error' => '資産はチェックアウトされませんでした。もう一度、やり直して下さい。', 'success' => '資産は正常にチェックアウトされました。', - 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。' + 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( 'error' => '資産はチェックインされませんでした。もう一度、やり直して下さい。', 'success' => '資産は正常にチェックインされました。', 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。', - 'already_checked_in' => 'That asset is already checked in.', + 'already_checked_in' => 'その資産はすでにチェックインしています。', ), 'requests' => array( - 'error' => 'Asset was not requested, please try again', - 'success' => 'Asset requested successfully.', + 'error' => '資産は要求されませんでした。もう一度、やり直して下さい。', + 'success' => '資産の要求処理が成功しました。', ) ); diff --git a/resources/lang/ja/admin/licenses/form.php b/resources/lang/ja/admin/licenses/form.php index 2ff220c2c5..c8dccb28f6 100644 --- a/resources/lang/ja/admin/licenses/form.php +++ b/resources/lang/ja/admin/licenses/form.php @@ -9,7 +9,7 @@ return array( 'date' => '購入日', 'depreciation' => '減価償却', 'expiration' => '有効期限', - 'license_key' => 'Product Key', + 'license_key' => 'プロダクト キー', 'maintained' => '保有', 'name' => 'ソフトウェア名', 'no_depreciation' => '減価償却しない', diff --git a/resources/lang/ja/admin/models/general.php b/resources/lang/ja/admin/models/general.php index e20e9f924d..d018fd095f 100644 --- a/resources/lang/ja/admin/models/general.php +++ b/resources/lang/ja/admin/models/general.php @@ -7,7 +7,7 @@ return array( 'show_mac_address' => 'この型番の資産にMACアドレスフィールドを表示', 'view_deleted' => '削除したものを表示', 'view_models' => '型番を表示', - 'fieldset' => 'Fieldset', - 'no_custom_field' => 'No custom fields', + 'fieldset' => 'フィールドセット', + 'no_custom_field' => 'カスタム フィールドなし', ); diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php index bfd3d2141a..4d120e3807 100644 --- a/resources/lang/ja/admin/settings/general.php +++ b/resources/lang/ja/admin/settings/general.php @@ -2,34 +2,34 @@ return array( 'ad' => 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad_domain' => 'Active Directory ドメイン', + 'ad_domain_help' => '通常はemailのドメイン名と同じです。ただし例外あり', + 'is_ad' => 'Active Directory サーバー', 'alert_email' => 'アラートの送信先', - 'alerts_enabled' => 'Alerts Enabled', - 'alert_interval' => 'Expiring Alerts Threshold (in days)', - 'alert_inv_threshold' => 'Inventory Alert Threshold', + 'alerts_enabled' => 'アラートを有効化', + 'alert_interval' => 'アラートを無視する期間', + 'alert_inv_threshold' => 'インベントリのアラート間隔', 'asset_ids' => '資産ID', 'auto_increment_assets' => '資産IDを自動採番で生成', 'auto_increment_prefix' => 'プレフィクス (オプション)', 'auto_incrementing_help' => 'この初期値を使って資産IDの自動採番を有効化', 'backups' => 'バックアップ', 'barcode_settings' => 'バーコード設定', - 'confirm_purge' => 'Confirm Purge', - 'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.', + 'confirm_purge' => 'パージを確定', + 'confirm_purge_help' => 'レコード削除のため、パージを実行するとき"DELETE"の文字を下のテキストボックスに入力します。このアクションは取り消しはできません。', 'custom_css' => 'カスタム CSS:', 'custom_css_help' => '使用したいカスタムCSSを入力してください。<style></style> タグは含めないでください', 'default_currency' => '既定の通貨', 'default_eula_text' => '既定のEULA', - 'default_language' => 'Default Language', + 'default_language' => '既定の言語', 'default_eula_help_text' => '特殊な資産カテゴリーにカスタムEULAを関連付けられます。', 'display_asset_name' => '資産名を表示', 'display_checkout_date' => 'チェックアウト日を表示', 'display_eol' => '表形式でEOLを表示', - 'display_qr' => 'Display Square Codes', - 'display_alt_barcode' => 'Display 1D barcode', - 'barcode_type' => '2D Barcode Type', - 'alt_barcode_type' => '1D barcode type', + 'display_qr' => 'QRコードを表示', + 'display_alt_barcode' => 'バーコードを表示', + 'barcode_type' => '2次元バーコードタイプ', + 'alt_barcode_type' => 'バーコードタイプ', 'eula_settings' => 'EULA設定', 'eula_markdown' => 'この EULA は、Github flavored markdownで、利用可能です。', 'general_settings' => '全般設定', @@ -37,33 +37,35 @@ return array( 'header_color' => 'ヘッダーカラー', 'info' => 'これらの設定は、あなたの設備の特性に合わせてカスタマイズできます。', 'laravel' => 'Laravelバージョン', - 'ldap_enabled' => 'LDAP enabled', - 'ldap_integration' => 'LDAP Integration', - 'ldap_settings' => 'LDAP Settings', - 'ldap_server' => 'LDAP Server', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', - 'ldap_server_cert' => 'LDAP SSL certificate validation', - 'ldap_server_cert_ignore' => 'Allow invalid SSL Certificate', - 'ldap_server_cert_help' => 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.', - 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', - 'ldap_uname' => 'LDAP Bind Username', - 'ldap_pword' => 'LDAP Bind Password', - 'ldap_basedn' => 'Base Bind DN', - 'ldap_filter' => 'LDAP Filter', - 'ldap_username_field' => 'Username Field', - 'ldap_lname_field' => 'Last Name', - 'ldap_fname_field' => 'LDAP First Name', - 'ldap_auth_filter_query' => 'LDAP Authentication query', - 'ldap_version' => 'LDAP Version', - 'ldap_active_flag' => 'LDAP Active Flag', - 'ldap_emp_num' => 'LDAP Employee Number', - 'ldap_email' => 'LDAP Email', + 'ldap_enabled' => 'LDAP 対応', + 'ldap_integration' => 'LDAP 統合', + 'ldap_settings' => 'LDAP 設定', + 'ldap_server' => 'LDAP サーバ', + 'ldap_server_help' => 'LDAP を使用開始 ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', + 'ldap_server_cert' => 'LDAP SSL 認証', + 'ldap_server_cert_ignore' => '無効な SSL 証明書を許可します。', + 'ldap_server_cert_help' => '自己署名 SSL 証明書を使用して無効な SSL 証明書を受け入れたい場合は、このチェック ボックスを選択します。', + 'ldap_tls' => 'TLS の使用', + 'ldap_tls_help' => 'これは、LDAP サーバーで STARTTLS を実行している場合にのみチェック必要があります。 ', + 'ldap_uname' => 'LDAP バインド ユーザー名', + 'ldap_pword' => 'LDAP バインド パスワード', + 'ldap_basedn' => 'LDAP 検索ベース DN', + 'ldap_filter' => 'LDAP フィルター', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', + 'ldap_username_field' => 'ユーザー名フィールド', + 'ldap_lname_field' => '姓', + 'ldap_fname_field' => 'LDAP 名', + 'ldap_auth_filter_query' => 'LDAP 認証クエリ', + 'ldap_version' => 'LDAP バージョン', + 'ldap_active_flag' => 'LDAP アクティブ フラグ', + 'ldap_emp_num' => 'LDAP 社員番号', + 'ldap_email' => 'LDAP メール', 'load_remote_text' => 'リモートスクリプト', 'load_remote_help_text' => 'Snipe-ITのインストールは、外部からスクリプトを読み込むことが可能です。', 'logo' => 'ロゴ', - 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', - 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', + 'full_multiple_companies_support_help_text' => 'ユーザー (管理者を含む) に 資産の割り当て を制限します。', + 'full_multiple_companies_support_text' => '複数企業をサポートします。', 'optional' => 'オプション', 'per_page' => 'ページ毎の結果', 'php' => 'PHPバージョン', @@ -86,27 +88,27 @@ return array( 'brand' => 'ブランディング', 'about_settings_title' => '設定について', 'about_settings_text' => 'これらの設定は、あなたのインストレーションの特性に合わせてカスタマイズできます。', - 'labels_per_page' => 'Labels per page', - 'label_dimensions' => 'Label dimensions (inches)', - 'page_padding' => 'Page margins (inches)', - 'purge' => 'Purge Deleted Records', - 'labels_display_bgutter' => 'Label bottom gutter', - 'labels_display_sgutter' => 'Label side gutter', - 'labels_fontsize' => 'Label font size', - 'labels_pagewidth' => 'Label sheet width', - 'labels_pageheight' => 'Label sheet height', - 'label_gutters' => 'Label spacing (inches)', - 'page_dimensions' => 'Page dimensions (inches)', - 'label_fields' => 'Label visible fields', - 'inches' => 'inches', + 'labels_per_page' => 'ページあたりのラベル数', + 'label_dimensions' => 'ラベルの大きさ (インチ)', + 'page_padding' => 'ページ マージン', + 'purge' => 'データレコードを消去', + 'labels_display_bgutter' => 'ラベル 下余白', + 'labels_display_sgutter' => 'ラベル横余白', + 'labels_fontsize' => 'ラベルフォントサイズ', + 'labels_pagewidth' => 'ラベルシート幅', + 'labels_pageheight' => 'ラベルシート高さ', + 'label_gutters' => 'ラベルの間隔 (インチ)', + 'page_dimensions' => 'ページサイズ（インチ）', + 'label_fields' => 'ラベル表示フィールド', + 'inches' => 'インチ', 'width_w' => 'w', 'height_h' => 'h', 'text_pt' => 'pt', - 'left' => 'left', - 'right' => 'right', - 'top' => 'top', - 'bottom' => 'bottom', - 'vertical' => 'vertical', - 'horizontal' => 'horizontal', - 'zerofill_count' => 'Length of asset tags, including zerofill', + 'left' => '左', + 'right' => '右', + 'top' => '上', + 'bottom' => '下', + 'vertical' => '垂直', + 'horizontal' => '水平方向', + 'zerofill_count' => '資産タグの長さ (ゼロ埋め含む)', ); diff --git a/resources/lang/ja/admin/settings/message.php b/resources/lang/ja/admin/settings/message.php index 5b9e7aab91..825dd9b352 100644 --- a/resources/lang/ja/admin/settings/message.php +++ b/resources/lang/ja/admin/settings/message.php @@ -14,9 +14,9 @@ return array( 'file_not_found' => 'そのバックアップファイルをサーバー上に見つけることが出来ませんでした。', ), 'purge' => array( - 'error' => 'An error has occurred while purging. ', - 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' + 'error' => 'パージ中にエラーが発生しました。 ', + 'validation_failed' => 'パージの確定方法が正しくありません。入力してください、単語「削除」確認ボックス。', + 'success' => 'パージによりレコードは削除されました' ), ); diff --git a/resources/lang/ja/admin/statuslabels/message.php b/resources/lang/ja/admin/statuslabels/message.php index 619a5a509c..dc4d3b1e19 100644 --- a/resources/lang/ja/admin/statuslabels/message.php +++ b/resources/lang/ja/admin/statuslabels/message.php @@ -2,24 +2,24 @@ return array( - 'does_not_exist' => 'Status Label does not exist.', - 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', + 'does_not_exist' => 'ステータス ラベルは存在しません。', + 'assoc_assets' => 'このステータスラベルは少なくとも一つの資産に関連付けされているため、削除できません。資産の関連付けを削除し、もう一度試して下さい。 ', 'create' => array( - 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' + 'error' => 'ステータスラベルが作成できませんでした。もう一度試して下さい。', + 'success' => 'ステータスラベルが作成されました。' ), 'update' => array( - 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' + 'error' => 'ステータスラベルは更新できませんでした。もう一度試して下さい。', + 'success' => 'ステータスラベルが更新されました。' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this Status Label?', - 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' + 'confirm' => 'このステータスラベルを削除しますか？', + 'error' => 'ステータスラベルを削除する際に問題が発生しました。もう一度やり直して下さい。', + 'success' => 'ステータスラベルは削除されました。' ) ); diff --git a/resources/lang/ja/admin/statuslabels/table.php b/resources/lang/ja/admin/statuslabels/table.php index 8e005dbd4d..2c0291fcc8 100644 --- a/resources/lang/ja/admin/statuslabels/table.php +++ b/resources/lang/ja/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'ステータスラベルについて', 'archived' => 'アーカイブ', 'create' => 'ステータスラベルを作成', + 'color' => 'Chart Color', 'deployable' => '配備可能', 'info' => 'ステータスラベルは資産の様々な状態の説明に利用されます。修理中であったり、紛失/盗難かもしれません。資産を配備可能、ペンディング、保管といった新しいステータスラベルを作成できます。', 'name' => 'ステータス名', 'pending' => '保留中', 'status_type' => 'ステータスタイプ', + 'show_in_nav' => 'Show in side nav', 'title' => 'ステータスラベル', 'undeployable' => '配備不可', 'update' => 'ステータスラベルを更新', diff --git a/resources/lang/ja/admin/users/general.php b/resources/lang/ja/admin/users/general.php index 682be8693f..5cb78f60e3 100644 --- a/resources/lang/ja/admin/users/general.php +++ b/resources/lang/ja/admin/users/general.php @@ -4,14 +4,14 @@ return array( 'assets_user' => ':name に資産を割り当てる', - 'current_assets' => 'Assets currently checked out to this user', + 'current_assets' => '資産をこのユーザーにチェック アウト', 'clone' => '利用者を複製', 'contact_user' => ':name にコンタクト', 'edit' => '利用者を編集', 'filetype_info' => '許可するファイルタイプ（png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar）', 'history_user' => ':nameの履歴', 'last_login' => '最終ログイン', - 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', + 'ldap_config_text' => 'LDAP 構成設定 管理者 > 設定。 選択した場所は、インポートされたすべてのユーザーに対して設定されます。', 'software_user' => 'ソフトウェアは :name にチェックアウトしました。', 'view_user' => '利用者 :name を表示', 'usercsv' => 'CSVファイル', diff --git a/resources/lang/ja/auth/general.php b/resources/lang/ja/auth/general.php index bf88cba77a..6829362880 100644 --- a/resources/lang/ja/auth/general.php +++ b/resources/lang/ja/auth/general.php @@ -1,12 +1,12 @@ 'Send Password Reset Link', - 'email_reset_password' => 'Email Password Reset', - 'reset_password' => 'Reset Password', - 'login' => 'Login', - 'login_prompt' => 'Please Login', - 'forgot_password' => 'I forgot my password', - 'remember_me' => 'Remember Me', + 'send_password_link' => 'パスワード リセットのメールを送信します。', + 'email_reset_password' => '電子メールによるパスワードのリセット', + 'reset_password' => 'パスワードリセット', + 'login' => 'ログイン', + 'login_prompt' => 'ログインしてください。', + 'forgot_password' => 'パスワードを忘れました', + 'remember_me' => 'ログイン状態を維持する', ]; diff --git a/resources/lang/ja/button.php b/resources/lang/ja/button.php index d5d70e1ae3..03e5cd11e9 100644 --- a/resources/lang/ja/button.php +++ b/resources/lang/ja/button.php @@ -5,7 +5,7 @@ return array( 'actions' => 'アクション', 'add' => '新規追加', 'cancel' => 'キャンセル', - 'checkin_and_delete' => 'Checkin & Delete User', + 'checkin_and_delete' => 'チェックイン＆ユーザー削除', 'delete' => '削除', 'edit' => '編集', 'restore' => '復元', diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php index c11a90f50a..36e31413a3 100644 --- a/resources/lang/ja/general.php +++ b/resources/lang/ja/general.php @@ -9,7 +9,7 @@ 'activity_report' => '操作レポート', 'address' => '住所', 'admin' => '管理', - 'add_seats' => 'Added seats', + 'add_seats' => 'シートを追加', 'all_assets' => '全ての資産', 'all' => 'All', 'archived' => 'アーカイブ', @@ -23,7 +23,7 @@ 'avatar_upload' => 'アバターをアップロード', 'back' => '戻る', 'bad_data' => '存在しませんでした。データに誤りがあるかもしれません。', - 'bulk_checkout' => 'Bulk Checkout', + 'bulk_checkout' => '一括チェックアウト', 'cancel' => 'キャンセル', 'categories' => 'カテゴリー', 'category' => 'カテゴリー', @@ -33,10 +33,10 @@ 'checkin_from' => 'チェックイン元', 'checkout' => 'チェックアウト', 'city' => '市区町村', - 'companies' => 'Companies', - 'company' => 'Company', - 'component' => 'Component', - 'components' => 'Components', + 'companies' => '所属', + 'company' => '所属', + 'component' => '構成部品', + 'components' => '構成部品', 'consumable' => '消耗品', 'consumables' => '消耗品数', 'country' => '国', @@ -57,31 +57,32 @@ 'depreciation' => '減価償却', 'editprofile' => 'プロファイルを編集', 'eol' => 'EOL', - 'email_domain' => 'Email Domain', - 'email_format' => 'Email Format', - 'email_domain_help' => 'This is used to generate email addresses when importing', - 'filastname_format' => 'First Initial Last Name (jsmith@example.com)', - 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)', + 'email_domain' => 'Eメール ドメイン', + 'email_format' => 'Eメールフォーマット', + 'email_domain_help' => 'インポート時に作成するe-mail アドレス', + 'filastname_format' => '名 イニシャル 姓 (jsmith@example.com)', + 'firstname_lastname_format' => '名 姓 (jane.smith@example.com)', 'first' => '最初', 'first_name' => '姓', - 'first_name_format' => 'First Name (jane@example.com)', + 'first_name_format' => '名 (jane@example.com)', 'file_name' => 'ファイル', 'file_uploads' => 'ファイルアップロード', 'generate' => '作成', 'groups' => 'グループ', 'gravatar_email' => 'Gravatar のメールアドレス', - 'history' => 'History', + 'history' => '履歴', 'history_for' => '履歴', 'id' => 'ID', 'image_delete' => '画像を削除', 'image_upload' => '画像をアップロード', 'import' => 'インポート', + 'import-history' => 'Import History', 'asset_maintenance' => '資産管理', 'asset_maintenance_report' => '資産管理レポート', 'asset_maintenances' => '資産管理', 'item' => 'アイテム', - 'insufficient_permissions' => 'Insufficient permissions!', - 'language' => 'Language', + 'insufficient_permissions' => '権限が不足しています。', + 'language' => '言語', 'last' => '最後', 'last_name' => '姓', 'license' => 'ライセンス', @@ -95,18 +96,18 @@ 'location' => '設置場所', 'locations' => '設置場所の数', 'logout' => 'ログアウト', - 'lookup_by_tag' => 'Lookup by Asset Tag', + 'lookup_by_tag' => '資産タグで参照', 'manufacturer' => '製造元', 'manufacturers' => '製造元の数', - 'markdown' => 'This field allows Github flavored markdown.', - 'min_amt' => 'Min. QTY', - 'min_amt_help' => 'Minimum number of items that should be available before an alert gets triggered.', + 'markdown' => 'このフィールドでは Github flavored markdown. が利用可能です', + 'min_amt' => '最小数量', + 'min_amt_help' => 'アイテムの最小数 は、アラートのトリガーとして使用可能です。', 'model_no' => 'モデル No.', 'months' => '月', 'moreinfo' => '詳細', 'name' => '名前', 'next' => '次へ', - 'new' => 'new!', + 'new' => '新規', 'no_depreciation' => '非減価償却資産', 'no_results' => '結果はありません。', 'no' => 'いいえ', @@ -120,16 +121,16 @@ 'processing' => '処理中', 'profile' => 'あなたのプロファイル', 'qty' => '数量', - 'quantity' => 'Quantity', + 'quantity' => '数量', 'ready_to_deploy' => '配備完了', 'recent_activity' => '最近のアクティビティ', - 'remove_company' => 'Remove Company Association', + 'remove_company' => '会社の団体を取り除く', 'reports' => 'レポート', 'requested' => '要求済', 'save' => '保存', 'select' => '選択', 'search' => '検索', - 'select_category' => 'Select a Category', + 'select_category' => 'カテゴリを選択', 'select_depreciation' => '減価償却タイプを選択', 'select_location' => '設置場所を選択', 'select_manufacturer' => '製造元を選択', @@ -138,11 +139,11 @@ 'select_user' => '利用者を選択', 'select_date' => '日付を選択', 'select_statuslabel' => 'ステータスを選択', - 'select_company' => 'Select Company', - 'select_asset' => 'Select Asset', + 'select_company' => '所属を選択', + 'select_asset' => '資産を選択します。', 'settings' => '設定', 'sign_in' => 'サインイン', - 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', + 'some_features_disabled' => 'デモモード ： いくつかの機能はこのインストールでは無効化されます', 'site_name' => 'サイト名', 'state' => '都道府県', 'status_labels' => 'ステータスラベル', @@ -153,7 +154,7 @@ 'type' => 'タイプ', 'undeployable' => '未配備', 'unknown_admin' => '不明な管理者', - 'username_format' => 'Username Format', + 'username_format' => 'ユーザー名の書式', 'update' => '更新', 'uploaded' => 'アップロード完了', 'user' => '利用者', @@ -167,6 +168,6 @@ 'years' => '年', 'yes' => 'はい', 'zip' => '郵便番号', - 'noimage' => 'No image uploaded or image not found.', - 'token_expired' => 'Your form session has expired. Please try again.', + 'noimage' => 'イメージはアップロードされていません または イメージは見つかりませんでした', + 'token_expired' => 'セッションが失効しました。再度ログインしてください。', ]; diff --git a/resources/lang/ja/passwords.php b/resources/lang/ja/passwords.php index 5195a9b77c..bc77190d79 100644 --- a/resources/lang/ja/passwords.php +++ b/resources/lang/ja/passwords.php @@ -1,7 +1,7 @@ 'Your password link has been sent!', - 'user' => 'That user does not exist or does not have an email address associated', + 'sent' => 'パスワード リンクが送信されました!', + 'user' => 'そのユーザーが存在しない、または関連付けられている電子メール アドレスが割り当てられていません。', ]; diff --git a/resources/lang/ja/validation.php b/resources/lang/ja/validation.php index 3ff31df50d..2e573d1d70 100644 --- a/resources/lang/ja/validation.php +++ b/resources/lang/ja/validation.php @@ -64,8 +64,8 @@ return array( ), "unique" => ":attribute は、取得済みです。", "url" => ":attribute フォーマットが不正です。", - "statuslabel_type" => "You must select a valid status label type", - "unique_undeleted" => "The :attribute must be unique.", + "statuslabel_type" => "有効なステータス ラベルの種類を選択する必要があります。", + "unique_undeleted" => ":attribute は 一意の値である必要があります。", /* diff --git a/resources/lang/ko/admin/custom_fields/general.php b/resources/lang/ko/admin/custom_fields/general.php index 468d33221a..88f963bb89 100644 --- a/resources/lang/ko/admin/custom_fields/general.php +++ b/resources/lang/ko/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => '항목', 'about_fieldsets_title' => '항목세트란', 'about_fieldsets_text' => '항목세트는 특정 자산 모델에 사용하기 위해 빈번하게 재사용되는 사용자 정의 항목의 그룹을 생성하는 것을 허용합니다.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => '항목세트', 'qty_fields' => '항목수', 'fieldsets' => '항목세트', 'fieldset_name' => '항목세트명', 'field_name' => '항목명', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => '양식 성분', 'field_element_short' => '성분', 'field_format' => '형식', diff --git a/resources/lang/ko/admin/hardware/message.php b/resources/lang/ko/admin/hardware/message.php index 6d82ec4890..b8403183f7 100644 --- a/resources/lang/ko/admin/hardware/message.php +++ b/resources/lang/ko/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => '몇몇 품목들을 정확하게 읽어오지 못했습니다.', - 'errorDetail' => '다음 품목들은 오류로 읽어오지 못했습니다.', - 'success' => "파일에서 읽어오기가 완료되었습니다", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => '자산이 반출되지 않았습니다. 다시 시도해 주세요.', 'success' => '자산이 반출되었습니다.', - 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.' + 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/ko/admin/models/table.php b/resources/lang/ko/admin/models/table.php index 18b09d3573..2d9b89b2c3 100644 --- a/resources/lang/ko/admin/models/table.php +++ b/resources/lang/ko/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => '자산 모델', 'update' => '자산 모델 갱신', 'view' => '자산 모델 보기', - 'update' => '자산 모델 갱신', + 'update' => '모델 갱신', 'clone' => '모델 복제', 'edit' => '모델 편집', ); diff --git a/resources/lang/ko/admin/settings/general.php b/resources/lang/ko/admin/settings/general.php index ac16589112..fb606314c3 100644 --- a/resources/lang/ko/admin/settings/general.php +++ b/resources/lang/ko/admin/settings/general.php @@ -2,7 +2,7 @@ return array( 'ad' => 'Active Directory', - 'ad_domain' => 'Active Directory domain', + 'ad_domain' => 'Active Directory 도메인', 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', 'is_ad' => 'This is an Active Directory server', 'alert_email' => '알림 전송', @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP 연결용 비밀번호', 'ldap_basedn' => 'Base BIND DN', 'ldap_filter' => 'LDAP 필터', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => '사용자명 항목', 'ldap_lname_field' => '성:', 'ldap_fname_field' => 'LDAP 이름', diff --git a/resources/lang/ko/admin/statuslabels/table.php b/resources/lang/ko/admin/statuslabels/table.php index 7026660b57..3879bff795 100644 --- a/resources/lang/ko/admin/statuslabels/table.php +++ b/resources/lang/ko/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => '상태 꼬리표란', 'archived' => '보관됨', 'create' => '상태 꼬리표 생성', + 'color' => 'Chart Color', 'deployable' => '사용가능', 'info' => '상태 꼬리표는 소유한 자산들의 다양한 상태들을 묘사할 때 사용됩니다. 수리요망, 분실/도난 등이 될 것입니다. 사용 할 수 있거나, 대기중이거나 보관된 자산들 대상으로 새로운 상태 딱지를 생성할 수 있습니다.', 'name' => '상태 명', 'pending' => '대기중', 'status_type' => '상태 유형', + 'show_in_nav' => 'Show in side nav', 'title' => '상태 꼬리표', 'undeployable' => '사용불가', 'update' => '상태 꼬리표 수정', diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php index 17a961b642..0d3670d464 100644 --- a/resources/lang/ko/general.php +++ b/resources/lang/ko/general.php @@ -76,6 +76,7 @@ 'image_delete' => '이미지 삭제', 'image_upload' => '이미지 올리기', 'import' => '불러오기', + 'import-history' => 'Import History', 'asset_maintenance' => '자산 관리', 'asset_maintenance_report' => '자산 관리 보고서', 'asset_maintenances' => '자산 관리', diff --git a/resources/lang/lt/admin/custom_fields/general.php b/resources/lang/lt/admin/custom_fields/general.php index 3f1851e972..fe6d8fc55c 100644 --- a/resources/lang/lt/admin/custom_fields/general.php +++ b/resources/lang/lt/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Laukas', 'about_fieldsets_title' => 'Apie laukų grupes', 'about_fieldsets_text' => 'Laukų grupės leidžia jums sukurti grupes kurios dažnai naudojamos specifiniai įrangai.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Laukų grupė', 'qty_fields' => 'Laukų kiekis', 'fieldsets' => 'Laukų grupės', 'fieldset_name' => 'Laukų grupės pavadinimas', 'field_name' => 'Lauko pavadinimas', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Laukelio elementas', 'field_element_short' => 'Elementas', 'field_format' => 'Formatas', diff --git a/resources/lang/lt/admin/hardware/message.php b/resources/lang/lt/admin/hardware/message.php index 56676d2abd..82cb28c128 100644 --- a/resources/lang/lt/admin/hardware/message.php +++ b/resources/lang/lt/admin/hardware/message.php @@ -36,9 +36,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -51,7 +51,8 @@ return array( 'checkout' => array( 'error' => 'Įranga neišduota, prašome bandyti dar kartą', 'success' => 'Įranga išduota sėkmingai.', - 'user_does_not_exist' => 'Netinkamas naudotojas. Prašome bandykite dar kartą.' + 'user_does_not_exist' => 'Netinkamas naudotojas. Prašome bandykite dar kartą.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/lt/admin/settings/general.php b/resources/lang/lt/admin/settings/general.php index 5555632393..92eb580962 100644 --- a/resources/lang/lt/admin/settings/general.php +++ b/resources/lang/lt/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP slaptažodis', 'ldap_basedn' => 'DN', 'ldap_filter' => 'LDAP filtras', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Vartotojo vardo laukelis', 'ldap_lname_field' => 'Pavardė', 'ldap_fname_field' => 'LDAP vardas', diff --git a/resources/lang/lt/admin/statuslabels/table.php b/resources/lang/lt/admin/statuslabels/table.php index c3ba8e8ecf..3fbeacc3a9 100644 --- a/resources/lang/lt/admin/statuslabels/table.php +++ b/resources/lang/lt/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Apie būklės korteles', 'archived' => 'Archyvuota', 'create' => 'Sukurti būlės kortelę', + 'color' => 'Chart Color', 'deployable' => 'Naudojamas', 'info' => 'Būklės kortelės naudojamos apibūdinti įvairias jūsų įrangos būkles, kuriose ji randasi. Kortelės gali būti nurodančios, kad įranga remontuojama, prarasta, pavota ir t. t. Jūs galite suskurti naują būklės kortelę išduotiems, atnaujinamiems ir kitiems įrenginiams.', 'name' => 'Būklės pavadinimas', 'pending' => 'Vykdoma', 'status_type' => 'Būklės tipas', + 'show_in_nav' => 'Show in side nav', 'title' => 'Būklės kortelės', 'undeployable' => 'Negalimas naudoti', 'update' => 'Atnaujinti būklės kortelę', diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php index 060bbfe483..278d7c8ff0 100644 --- a/resources/lang/lt/general.php +++ b/resources/lang/lt/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Ištrinti nuotrauką', 'image_upload' => 'Įkelti nuotrauką', 'import' => 'Įkelti', + 'import-history' => 'Import History', 'asset_maintenance' => 'Įrangos priežiūra', 'asset_maintenance_report' => 'Įrangos priežiūros ataskaita', 'asset_maintenances' => 'Įrangos priežiūros', diff --git a/resources/lang/ms/admin/custom_fields/general.php b/resources/lang/ms/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/ms/admin/custom_fields/general.php +++ b/resources/lang/ms/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/ms/admin/hardware/message.php b/resources/lang/ms/admin/hardware/message.php index 7d3da78932..d8650b4e80 100644 --- a/resources/lang/ms/admin/hardware/message.php +++ b/resources/lang/ms/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Harta gagal diagihkan, sila cuba semula', 'success' => 'Harta berjaya diagihkan.', - 'user_does_not_exist' => 'Pengguna tak sah. Sila cuba lagi.' + 'user_does_not_exist' => 'Pengguna tak sah. Sila cuba lagi.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/ms/admin/settings/general.php b/resources/lang/ms/admin/settings/general.php index 3af4ce061a..2acd8d7b71 100644 --- a/resources/lang/ms/admin/settings/general.php +++ b/resources/lang/ms/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/ms/admin/statuslabels/table.php b/resources/lang/ms/admin/statuslabels/table.php index f729e8744a..c3fc36bdd8 100644 --- a/resources/lang/ms/admin/statuslabels/table.php +++ b/resources/lang/ms/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Mengenai Label Status', 'archived' => 'Archived', 'create' => 'Cipata Label Status', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Nama Status', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Label Status', 'undeployable' => 'Undeployable', 'update' => 'Kemaskini Label Status', diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php index 79822e5bb5..5cfbcda283 100644 --- a/resources/lang/ms/general.php +++ b/resources/lang/ms/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Hapuskan imej', 'image_upload' => 'Muat naik imej', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/nl/admin/custom_fields/general.php b/resources/lang/nl/admin/custom_fields/general.php index 835e182d67..02cb5085dc 100644 --- a/resources/lang/nl/admin/custom_fields/general.php +++ b/resources/lang/nl/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Veld', 'about_fieldsets_title' => 'Over veldverzamelingen', 'about_fieldsets_text' => 'Veldverzamelingen laat jou groepen van aangepaste velden maken die vaak worden hergebruikt voor specifieke soorten eigendoms modellen.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Veldverzameling', 'qty_fields' => 'Aantal Velden', 'fieldsets' => 'Veldverzamelingen', 'fieldset_name' => 'Veldverzamelin naam', 'field_name' => 'Veldnaam', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Formulier element', 'field_element_short' => 'Element', 'field_format' => 'Stijl', diff --git a/resources/lang/nl/admin/hardware/general.php b/resources/lang/nl/admin/hardware/general.php index 41203e9ac9..7cf036cf84 100644 --- a/resources/lang/nl/admin/hardware/general.php +++ b/resources/lang/nl/admin/hardware/general.php @@ -3,7 +3,7 @@ return array( 'archived' => 'Gearchiveerd', 'asset' => 'Materiaal', - 'bulk_checkout' => 'Checkout Assets to User', + 'bulk_checkout' => 'Materiaal aan gebruiker uitleveren', 'checkin' => 'Materiaal uitlenen', 'checkout' => 'Leen materiaal uit aan deze gebruiker', 'clone' => 'Kloon Materiaal', diff --git a/resources/lang/nl/admin/hardware/message.php b/resources/lang/nl/admin/hardware/message.php index 4b01b2a328..e8a9beb6f9 100644 --- a/resources/lang/nl/admin/hardware/message.php +++ b/resources/lang/nl/admin/hardware/message.php @@ -36,9 +36,9 @@ return array( ), 'import' => array( - 'error' => 'Sommige items zijn niet goed geïmporteerd.', - 'errorDetail' => 'De volgende items zijn niet geïmporteerd vanwege fouten.', - 'success' => "Je bestand is geïmporteerd", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -51,7 +51,8 @@ return array( 'checkout' => array( 'error' => 'Product is niet uitgecheckt, probeer het opnieuw', 'success' => 'Product is met succes uitgecheckt.', - 'user_does_not_exist' => 'De gebruiker is ongeldig. Probeer het opnieuw.' + 'user_does_not_exist' => 'De gebruiker is ongeldig. Probeer het opnieuw.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/nl/admin/models/table.php b/resources/lang/nl/admin/models/table.php index 922036c380..ceee8c99a7 100644 --- a/resources/lang/nl/admin/models/table.php +++ b/resources/lang/nl/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Product modellen', 'update' => 'Wijzig product model', 'view' => 'Bekijk product model', - 'update' => 'Wijzig product model', + 'update' => 'Wijzig model', 'clone' => 'Kopieer model', 'edit' => 'Bewerk model', ); diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php index 97fc841722..d97c34f43d 100644 --- a/resources/lang/nl/admin/settings/general.php +++ b/resources/lang/nl/admin/settings/general.php @@ -2,9 +2,9 @@ return array( 'ad' => 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad_domain' => 'Active Directory domein', + 'ad_domain_help' => 'Dit is soms hetzelfde als je e-mail domein.', + 'is_ad' => 'Dit is een Active Directory server', 'alert_email' => 'Verstuur meldingen naar', 'alerts_enabled' => 'Meldingen ingeschakeld', 'alert_interval' => 'Drempel verlopende meldingen (in dagen)', @@ -41,16 +41,18 @@ return array( 'ldap_integration' => 'LDAP integratie', 'ldap_settings' => 'LDAP instellingen', 'ldap_server' => 'LDAP server', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', + 'ldap_server_help' => 'Dit moet beginnen met ldap:// (voor onversleuteld of TLS) of ldaps:// (voor SSL)', 'ldap_server_cert' => 'LDAP SSL certificaat validatie', 'ldap_server_cert_ignore' => 'Staat ongeldige SSL certificaat toe', 'ldap_server_cert_help' => 'Selecteer deze box als je een eigen ondergetekende SSL certificaat gebruik en deze wilt accepteren.', - 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', + 'ldap_tls' => 'TLS gebruiken', + 'ldap_tls_help' => 'Dit moet alleen ingeschakeld worden als je STARTTLS op je LDAP server gebruikt. ', 'ldap_uname' => 'LDAP Bind gebruikersnaam', 'ldap_pword' => 'LDAP Bind wachtwoord', 'ldap_basedn' => 'Basis Bind DN', 'ldap_filter' => 'LDAP filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Gebruikersnaam veld', 'ldap_lname_field' => 'Achternaam', 'ldap_fname_field' => 'LDAP Voornaam', @@ -108,5 +110,5 @@ return array( 'bottom' => 'onderkant', 'vertical' => 'verticaal', 'horizontal' => 'horizontaal', - 'zerofill_count' => 'Length of asset tags, including zerofill', + 'zerofill_count' => 'Lengte van object ID, inclusief opvulling', ); diff --git a/resources/lang/nl/admin/statuslabels/table.php b/resources/lang/nl/admin/statuslabels/table.php index 40eaec30f1..854a5e73ac 100644 --- a/resources/lang/nl/admin/statuslabels/table.php +++ b/resources/lang/nl/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Over status labels', 'archived' => 'Gearchiveerd', 'create' => 'Maak een Status Label', + 'color' => 'Chart Color', 'deployable' => 'Uitrolbaar', 'info' => 'Status labels worden gebruikt om de status van je producten te beschrijven. Ze kunnen worden gerepareerd, verloren/gestolen, etc. Je kan nieuwe status labels maken voor uitrolbaar, inbehandeling en gearchiveerde producten.', 'name' => 'Statusnaam', 'pending' => 'In behandeling', 'status_type' => 'Statustype', + 'show_in_nav' => 'Show in side nav', 'title' => 'Statuslabels', 'undeployable' => 'Niet uitrolbaar', 'update' => 'Update Status Label', diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php index 6e0eebcd2e..24e489dd8d 100644 --- a/resources/lang/nl/general.php +++ b/resources/lang/nl/general.php @@ -23,7 +23,7 @@ 'avatar_upload' => 'Upload profielafbeelding', 'back' => 'Terug', 'bad_data' => 'Niks gevonden. Misschien verkeerde data?', - 'bulk_checkout' => 'Bulk Checkout', + 'bulk_checkout' => 'Bulk uitlevering', 'cancel' => 'Annuleren', 'categories' => 'Categorieën', 'category' => 'Categorie', @@ -76,6 +76,7 @@ 'image_delete' => 'Afbeelding verwijderen', 'image_upload' => 'Afbeelding uploaden', 'import' => 'Importeer', + 'import-history' => 'Import History', 'asset_maintenance' => 'Materiaal onderhoud', 'asset_maintenance_report' => 'Materiaal onderhoud rapport', 'asset_maintenances' => 'Materiaal onderhoud', @@ -106,7 +107,7 @@ 'moreinfo' => 'Meer Info', 'name' => 'Naam', 'next' => 'Volgende', - 'new' => 'new!', + 'new' => 'nieuw!', 'no_depreciation' => 'Geen afschrijving', 'no_results' => 'Geen resultaten.', 'no' => 'Neen', @@ -142,7 +143,7 @@ 'select_asset' => 'Selecteer product', 'settings' => 'Instellingen', 'sign_in' => 'Aanmelden', - 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', + 'some_features_disabled' => 'DEMO MODUS: Sommige functies zijn uitgeschakeld voor deze installatie.', 'site_name' => 'Sitenaam', 'state' => 'Status', 'status_labels' => 'Statuslabels', diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php index 50b4005c88..b7d631fa3c 100644 --- a/resources/lang/nl/validation.php +++ b/resources/lang/nl/validation.php @@ -64,8 +64,8 @@ return array( ), "unique" => "Het veld :attribute is reeds in gebruik.", "url" => "Het formaat van :attribute is ongeldig.", - "statuslabel_type" => "You must select a valid status label type", - "unique_undeleted" => "The :attribute must be unique.", + "statuslabel_type" => "Je moet een geldig status label type selecteren", + "unique_undeleted" => "Het :attribute moet uniek zijn.", /* diff --git a/resources/lang/no/admin/custom_fields/general.php b/resources/lang/no/admin/custom_fields/general.php index b80897ac74..b9bdfa00e0 100644 --- a/resources/lang/no/admin/custom_fields/general.php +++ b/resources/lang/no/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Felt', 'about_fieldsets_title' => 'Om Feltsett', 'about_fieldsets_text' => 'Feltsett lar deg opprette grupper av egendefinerte felt som ofte gjenbrukes brukes til bestemte modelltyper.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Feltsett', 'qty_fields' => 'Antall Felt', 'fieldsets' => 'Feltsett', 'fieldset_name' => 'Feltsett Navn', 'field_name' => 'Felt Navn', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Skjema Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/no/admin/hardware/message.php b/resources/lang/no/admin/hardware/message.php index cf08cb69c9..b9c3965f87 100644 --- a/resources/lang/no/admin/hardware/message.php +++ b/resources/lang/no/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Eiendel ble ikke sjekket ut. Prøv igjen', 'success' => 'Vellykket utsjekk av eiendel.', - 'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.' + 'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/no/admin/settings/general.php b/resources/lang/no/admin/settings/general.php index a99bf3eb7b..d55721dee7 100644 --- a/resources/lang/no/admin/settings/general.php +++ b/resources/lang/no/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind passord', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Brukernavn Felt', 'ldap_lname_field' => 'Etternavn', 'ldap_fname_field' => 'LDAP Fornavn', diff --git a/resources/lang/no/admin/statuslabels/table.php b/resources/lang/no/admin/statuslabels/table.php index d28cd1ffdd..f1a6cae170 100644 --- a/resources/lang/no/admin/statuslabels/table.php +++ b/resources/lang/no/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Om statusmerker', 'archived' => 'Arkivert', 'create' => 'Opprett statusmerke', + 'color' => 'Chart Color', 'deployable' => 'Utleverbar', 'info' => 'Statusmerker brukes for å beskrive de forskjellige statusene dine eiendeler kan ha. De kan være under reparasjon, tapt/stjålet, osv. Du kan opprette nye statusmerker for utleverbare, under arbeid eller arkiverte eiendeler.', 'name' => 'Statusnavn', 'pending' => 'Under arbeid', 'status_type' => 'Statustype', + 'show_in_nav' => 'Show in side nav', 'title' => 'Statusmerke', 'undeployable' => 'Ikke utleverbar', 'update' => 'Oppdater statusmerke', diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php index 4003d2cd43..9221dbdfd6 100644 --- a/resources/lang/no/general.php +++ b/resources/lang/no/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Slett bilde', 'image_upload' => 'Last opp bilde', 'import' => 'Importer', + 'import-history' => 'Import History', 'asset_maintenance' => 'Vedlikehold av eiendeler', 'asset_maintenance_report' => 'Rapport Vedlikehold av eiendeler', 'asset_maintenances' => 'Vedlikehold av eiendeler', diff --git a/resources/lang/pl/admin/companies/general.php b/resources/lang/pl/admin/companies/general.php index 9d58ccb58e..bd2b44e674 100644 --- a/resources/lang/pl/admin/companies/general.php +++ b/resources/lang/pl/admin/companies/general.php @@ -1,4 +1,4 @@ 'Select Company', + 'select_company' => 'Wybierz firmę', ]; diff --git a/resources/lang/pl/admin/companies/message.php b/resources/lang/pl/admin/companies/message.php index a6db573519..ad75832ad9 100644 --- a/resources/lang/pl/admin/companies/message.php +++ b/resources/lang/pl/admin/companies/message.php @@ -1,18 +1,18 @@ 'Company does not exist.', - 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ', + 'does_not_exist' => 'Wskazana firma nie istnieje.', + 'assoc_users' => 'Wybrana kategoria jest obecnie powiązana z co najmniej jednym typem urządzenia i nie może zostać usunięta. Uaktualnij swoją listę modeli urządzeń by nie zwierała tej kategorii, a następnie spróbuj ponownie. ', 'create' => array( - 'error' => 'Company was not created, please try again.', - 'success' => 'Company created successfully.' + 'error' => 'Firma nie została utworzona, spróbuj ponownie.', + 'success' => 'Firma utworzona pomyślnie.' ), 'update' => array( - 'error' => 'Company was not updated, please try again', - 'success' => 'Company updated successfully.' + 'error' => 'Firma nie została uaktualniona, spróbuj ponownie', + 'success' => 'Firma została uaktualniona pomyślnie.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this company?', - 'error' => 'There was an issue deleting the company. Please try again.', - 'success' => 'The Company was deleted successfully.' + 'confirm' => 'Czy na pewno chcesz usunąć tę firmę?', + 'error' => 'Wystąpił problem podczas usuwania firmy. Spróbuj ponownie.', + 'success' => 'Firma została usunięta pomyślnie.' ) ); diff --git a/resources/lang/pl/admin/companies/table.php b/resources/lang/pl/admin/companies/table.php index 2f86126ff2..8db983722d 100644 --- a/resources/lang/pl/admin/companies/table.php +++ b/resources/lang/pl/admin/companies/table.php @@ -1,9 +1,9 @@ 'Companies', - 'create' => 'Create Company', - 'title' => 'Company', - 'update' => 'Update Company', - 'name' => 'Company Name', - 'id' => 'ID', + 'companies' => 'Firmy', + 'create' => 'Utwórz firmę', + 'title' => 'Firma', + 'update' => 'Aktualizacja firmy', + 'name' => 'Nazwa Firmy', + 'id' => 'Id', ); diff --git a/resources/lang/pl/admin/components/general.php b/resources/lang/pl/admin/components/general.php index 75c9d250ab..e89a57c914 100644 --- a/resources/lang/pl/admin/components/general.php +++ b/resources/lang/pl/admin/components/general.php @@ -1,17 +1,17 @@ 'About Components', - 'about_components_text' => 'Components are items that are part of an asset, for example HDD, RAM, etc.', - 'component_name' => 'Component Name', - 'checkin' => 'Checkin Component', - 'checkout' => 'Checkout Component', - 'cost' => 'Purchase Cost', - 'create' => 'Create Component', - 'edit' => 'Edit Component', - 'date' => 'Purchase Date', - 'order' => 'Order Number', - 'remaining' => 'Remaining', - 'total' => 'Total', - 'update' => 'Update Component', + 'about_components_title' => 'O składnikach', + 'about_components_text' => 'Składniki są elementami, które są częścią aktywów, na przykład dysku twardego, pamięci RAM itp.', + 'component_name' => 'Nazwa składnika', + 'checkin' => 'Odbiór składnika', + 'checkout' => 'Wydanie składnika', + 'cost' => 'Koszt zakupu', + 'create' => 'Utwórz składnik', + 'edit' => 'Edytuj składnik', + 'date' => 'Data Zakupu', + 'order' => 'Numer zamówienia', + 'remaining' => 'Pozostało', + 'total' => 'Suma', + 'update' => 'Aktualizacja składnika', ); diff --git a/resources/lang/pl/admin/components/message.php b/resources/lang/pl/admin/components/message.php index 1d13970f23..afc4868e71 100644 --- a/resources/lang/pl/admin/components/message.php +++ b/resources/lang/pl/admin/components/message.php @@ -2,34 +2,34 @@ return array( - 'does_not_exist' => 'Component does not exist.', + 'does_not_exist' => 'Składnik nie istnieje.', 'create' => array( - 'error' => 'Component was not created, please try again.', - 'success' => 'Component created successfully.' + 'error' => 'Składnik nie został utworzony, spróbuj ponownie.', + 'success' => 'Składnik został utworzony pomyślnie.' ), 'update' => array( - 'error' => 'Component was not updated, please try again', - 'success' => 'Component updated successfully.' + 'error' => 'Składnik nie został uaktualniony, spróbuj ponownie', + 'success' => 'Składnik został zaktualizowany pomyślnie.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this component?', - 'error' => 'There was an issue deleting the component. Please try again.', - 'success' => 'The component was deleted successfully.' + 'confirm' => 'Czy na pewno chcesz usunąć ten składnik?', + 'error' => 'Wystąpił problem podczas usuwania składnika. Spróbuj ponownie.', + 'success' => 'Składnik został usunięty pomyślnie.' ), 'checkout' => array( - 'error' => 'Component was not checked out, please try again', - 'success' => 'Component checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Składnik nie został wydany, spróbuj ponownie', + 'success' => 'Składnik został wydany pomyślnie.', + 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Spróbuj ponownie.' ), 'checkin' => array( - 'error' => 'Component was not checked in, please try again', - 'success' => 'Component checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Składnik nie został odebrany, spróbuj ponownie', + 'success' => 'Składnik został odebrany pomyślnie.', + 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Spróbuj ponownie.' ) diff --git a/resources/lang/pl/admin/components/table.php b/resources/lang/pl/admin/components/table.php index 3d4fed6a7f..c7a12c46b8 100644 --- a/resources/lang/pl/admin/components/table.php +++ b/resources/lang/pl/admin/components/table.php @@ -1,5 +1,5 @@ 'Component Name', + 'title' => 'Nazwa składnika', ); diff --git a/resources/lang/pl/admin/consumables/general.php b/resources/lang/pl/admin/consumables/general.php index 02e893b948..5d584038c0 100644 --- a/resources/lang/pl/admin/consumables/general.php +++ b/resources/lang/pl/admin/consumables/general.php @@ -2,12 +2,12 @@ return array( 'about_consumables_title' => 'Materiały eksploatacyjne', - 'about_consumables_text' => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.', + 'about_consumables_text' => 'Materiały eksploatacyjne są przedmiotami jednorazowego użytku, które będą wykorzystane w miarę upływu czasu. Na przykład, tusz do drukarki lub papier do kopiarek.', 'consumable_name' => 'Nazwa materiału eksploatacyjnego', 'cost' => 'Koszt zakupu', 'create' => 'Utwórz materiał eksploatacyjny', 'date' => 'Data zakupu', - 'item_no' => 'Item No.', + 'item_no' => 'Nr artykułu', 'order' => 'Numer zamówienia', 'remaining' => 'Pozostało', 'total' => 'Łącznie', diff --git a/resources/lang/pl/admin/consumables/message.php b/resources/lang/pl/admin/consumables/message.php index eb56c42220..b1209eabed 100644 --- a/resources/lang/pl/admin/consumables/message.php +++ b/resources/lang/pl/admin/consumables/message.php @@ -2,33 +2,33 @@ return array( - 'does_not_exist' => 'Consumable does not exist.', + 'does_not_exist' => 'Materiał eksploatacyjny nie istnieje.', 'create' => array( - 'error' => 'Consumable was not created, please try again.', - 'success' => 'Consumable created successfully.' + 'error' => 'Materiał eksploatacyjny nie został utworzony, spróbuj ponownie.', + 'success' => 'Materiał eksploatacyjny utworzony pomyślnie.' ), 'update' => array( - 'error' => 'Consumable was not updated, please try again', - 'success' => 'Consumable updated successfully.' + 'error' => 'Materiał eksploatacyjny nie został uaktualniony, spróbuj ponownie', + 'success' => 'Materiał eksploatacyjny został zaktualizowany pomyślnie.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this consumable?', - 'error' => 'There was an issue deleting the consumable. Please try again.', - 'success' => 'The consumable was deleted successfully.' + 'confirm' => 'Czy na pewno chcesz usunąć materiał eksploatacyjny?', + 'error' => 'Wystąpił problem podczas usuwania materiału eksploatacyjnego. Spróbuj ponownie.', + 'success' => 'Materiał eksploatacyjny został usunięty pomyślnie.' ), 'checkout' => array( - 'error' => 'Consumable was not checked out, please try again', - 'success' => 'Consumable checked out successfully.', + 'error' => 'Materiał eksploatacyjny nie został wydany, spróbuj ponownie', + 'success' => 'Materiał eksploatacyjny został wydany pomyślnie.', 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.' ), 'checkin' => array( - 'error' => 'Consumable was not checked in, please try again', - 'success' => 'Consumable checked in successfully.', + 'error' => 'Materiał eksploatacyjny nie został odebrany, spróbuj ponownie', + 'success' => 'Materiał eksploatacyjny odebrany pomyślnie.', 'user_does_not_exist' => 'Użytkownik nie istnieje. Spróbuj ponownie.' ) diff --git a/resources/lang/pl/admin/custom_fields/general.php b/resources/lang/pl/admin/custom_fields/general.php index 7182fecfdc..9128c5fa6f 100644 --- a/resources/lang/pl/admin/custom_fields/general.php +++ b/resources/lang/pl/admin/custom_fields/general.php @@ -1,23 +1,28 @@ 'Custom Fields', - 'field' => 'Field', - 'about_fieldsets_title' => 'About Fieldsets', - 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', - 'fieldset' => 'Fieldset', - 'qty_fields' => 'Qty Fields', - 'fieldsets' => 'Fieldsets', - 'fieldset_name' => 'Fieldset Name', - 'field_name' => 'Field Name', - 'field_element' => 'Form Element', + 'custom_fields' => 'Pola niestandardowe', + 'field' => 'Pole', + 'about_fieldsets_title' => 'O zestawie pól', + 'about_fieldsets_text' => 'Zestawy pól pozwalają tworzyć grupy pól niestandardowych, które często są używane dla specyficznych typów modeli.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', + 'fieldset' => 'Zestaw pól', + 'qty_fields' => 'Ilość pól', + 'fieldsets' => 'Zestaw pól', + 'fieldset_name' => 'Nazwa zestawu pól', + 'field_name' => 'Nazwa Pola', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', + 'field_element' => 'Element formularza', 'field_element_short' => 'Element', 'field_format' => 'Format', - 'field_custom_format' => 'Custom Format', - 'required' => 'Required', - 'req' => 'Req.', - 'used_by_models' => 'Used By Models', - 'order' => 'Order', - 'create_fieldset' => 'New Fieldset', - 'create_field' => 'New Custom Field', + 'field_custom_format' => 'Format niestandardowy', + 'required' => 'Wymagane', + 'req' => 'Wymagane', + 'used_by_models' => 'Używane przez modele', + 'order' => 'Kolejność', + 'create_fieldset' => 'Nowy zestaw pól', + 'create_field' => 'Nowe pole niestandardowe', ); diff --git a/resources/lang/pl/admin/custom_fields/message.php b/resources/lang/pl/admin/custom_fields/message.php index 0d34afa9e8..2b25c61117 100644 --- a/resources/lang/pl/admin/custom_fields/message.php +++ b/resources/lang/pl/admin/custom_fields/message.php @@ -3,25 +3,25 @@ return array( 'field' => array( - 'invalid' => 'That field does not exist.', - 'already_added' => 'Field already added', + 'invalid' => 'Pole nie istnieje.', + 'already_added' => 'Pole już istnieje', 'create' => array( - 'error' => 'Field was not created, please try again.', - 'success' => 'Field created successfully.', - 'assoc_success' => 'Field successfully added to fieldset.' + 'error' => 'Pole nie zostało utworzone. Spróbuj ponownie.', + 'success' => 'Pole utworzone pomyślnie.', + 'assoc_success' => 'Pole pomyślnie dadane do zestawu pól.' ), 'update' => array( - 'error' => 'Field was not updated, please try again', - 'success' => 'Field updated successfully.' + 'error' => 'Pole nie zostało zaktualizowane, spróbuj ponownie', + 'success' => 'Pole zaktualizowane pomyślnie.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this field?', - 'error' => 'There was an issue deleting the field. Please try again.', - 'success' => 'The field was deleted successfully.', - 'in_use' => 'Field is still in use.', + 'confirm' => 'Czy na pewno chcesz usunąć to pole?', + 'error' => 'Wystąpił błąd podczas usuwania pola. Spróbuj ponownie.', + 'success' => 'Pole zostało usunięte pomyślnie.', + 'in_use' => 'Pole jest wciąż w użytku.', ) ), @@ -31,20 +31,20 @@ return array( 'create' => array( - 'error' => 'Fieldset was not created, please try again.', - 'success' => 'Fieldset created successfully.' + 'error' => 'Zestaw pól nie został utworzony, spróbuj ponownie.', + 'success' => 'Zestaw pól utworzono pomyślnie.' ), 'update' => array( - 'error' => 'Fieldset was not updated, please try again', - 'success' => 'Fieldset updated successfully.' + 'error' => 'Zestaw pól nie został zaktualizowany, spróbuj ponownie', + 'success' => 'Zestaw pól zaktualizowany pomyślnie.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this fieldset?', - 'error' => 'There was an issue deleting the fieldset. Please try again.', - 'success' => 'The fieldset was deleted successfully.', - 'in_use' => 'Fieldset is still in use.', + 'confirm' => 'Czy na pewno chcesz usunąć ten zestaw pól?', + 'error' => 'Wystąpił błąd podczas usuwania zestawu pól. Spróbuj ponownie.', + 'success' => 'Zestaw pól usunięto pomyślnie.', + 'in_use' => 'Zestaw pól jest nadal w użyciu.', ) ), diff --git a/resources/lang/pl/admin/depreciations/general.php b/resources/lang/pl/admin/depreciations/general.php index 16a2dcae25..dae0e43085 100644 --- a/resources/lang/pl/admin/depreciations/general.php +++ b/resources/lang/pl/admin/depreciations/general.php @@ -2,7 +2,7 @@ return array( 'about_asset_depreciations' => 'Informacja na temat amortyzacji nabytku', - 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', + 'about_depreciations' => 'Możesz ustawić amortyzację środków trwałych na podstawie amortyzacji aktywów w oparciu o metodę liniową.', 'asset_depreciations' => 'Amortyzacja nabytków', 'create_depreciation' => 'Nowa amortyzacja', 'depreciation_name' => 'Nazwa amortyzacji', diff --git a/resources/lang/pl/admin/depreciations/message.php b/resources/lang/pl/admin/depreciations/message.php index c20e52c13c..5088977a86 100644 --- a/resources/lang/pl/admin/depreciations/message.php +++ b/resources/lang/pl/admin/depreciations/message.php @@ -2,24 +2,24 @@ return array( - 'does_not_exist' => 'Depreciation class does not exist.', - 'assoc_users' => 'This depreciation is currently associated with one or more models and cannot be deleted. Please delete the models, and then try deleting again. ', + 'does_not_exist' => 'Klasa amortyzacji nie istnieje.', + 'assoc_users' => 'Amortyzacja ta jest aktualnie skojarzona z jednym lub większą ilością modeli amortyzacji i nie można usunąć. Proszę usunąć modele, a następnie spróbować ją ponownie usunąć. ', 'create' => array( - 'error' => 'Depreciation class was not created, please try again. :(', - 'success' => 'Depreciation class created successfully. :)' + 'error' => 'Klasa amortyzacji nie został utworzony, spróbuj ponownie. :(', + 'success' => 'Klasa amortyzacji została utworzona pomyślnie. :)' ), 'update' => array( - 'error' => 'Depreciation class was not updated, please try again', - 'success' => 'Depreciation class updated successfully.' + 'error' => 'Klasa amortyzacji nie został uaktualniona, spróbuj ponownie', + 'success' => 'Klasa amortyzacji została uaktualniona pomyślnie.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this depreciation class?', - 'error' => 'There was an issue deleting the depreciation class. Please try again.', - 'success' => 'The depreciation class was deleted successfully.' + 'confirm' => 'Czy na pewno chcesz usunąć tę klasę amortyzacji?', + 'error' => 'Wystąpił problem podczas usuwania klasy amortyzacji. Spróbuj ponownie.', + 'success' => 'Klasa amortyzacji została usunięta pomyślnie.' ) ); diff --git a/resources/lang/pl/admin/depreciations/table.php b/resources/lang/pl/admin/depreciations/table.php index 5ba01d132c..eaf87978c3 100644 --- a/resources/lang/pl/admin/depreciations/table.php +++ b/resources/lang/pl/admin/depreciations/table.php @@ -2,9 +2,9 @@ return array( - 'id' => 'ID', - 'months' => 'Months', - 'term' => 'Term', - 'title' => 'Name ', + 'id' => 'Id', + 'months' => 'Miesiące', + 'term' => 'Termin', + 'title' => 'Nazwa ', ); diff --git a/resources/lang/pl/admin/hardware/form.php b/resources/lang/pl/admin/hardware/form.php index 36b246ad7d..e81784c19c 100644 --- a/resources/lang/pl/admin/hardware/form.php +++ b/resources/lang/pl/admin/hardware/form.php @@ -1,28 +1,28 @@ 'Confrm Bulk Delete Assets', - 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.', - 'bulk_delete_warn' => 'You are about to delete :asset_count assets.', - 'bulk_update' => 'Bulk Update Assets', - 'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ', + 'bulk_delete' => 'Potwierdź zbiorcze usuwanie aktywów', + 'bulk_delete_help' => 'Przejrzyj usuwanie zbiorcze aktywów poniżej. Po usunięciu tych aktywów będą one mogły zostać przywrócone, ale nie będą one skojarzone z żadnym z użytkowników, do których są aktualnie przypisane.', + 'bulk_delete_warn' => 'Zamierzasz usunąć :asset_count aktywów.', + 'bulk_update' => 'Zbiorcza aktualizacja aktywów', + 'bulk_update_help' => 'Ten formularz umożliwia zbiorczą aktualizację wielu aktywów na raz. Wypełnij tylko te pola, które chcesz zmienić. Puste pola pozostaną niezmienione. ', 'bulk_update_warn' => 'Zamierzasz edytować właściwości :asset_count zestawów.', 'checkedout_to' => 'Wypożyczony do', 'checkout_date' => 'Data przypisania', - 'checkin_date' => 'Checkin Date', + 'checkin_date' => 'Data przypisania', 'checkout_to' => 'Przypisane do', 'cost' => 'Koszt zakupu', 'create' => 'Nowy nabytek', 'date' => 'Data zakupu', - 'depreciates_on' => 'Depreciates On', + 'depreciates_on' => 'Amortyzacja włączona', 'depreciation' => 'Amortyzacja', 'default_location' => 'Domyślna lokalizacja', - 'eol_date' => 'EOL Date', - 'eol_rate' => 'EOL Rate', - 'expected_checkin' => 'Expected Checkin Date', + 'eol_date' => 'Data końca licencji', + 'eol_rate' => 'Szacowany koniec licencji', + 'expected_checkin' => 'Przewidywana data przyjęcia', 'expires' => 'Wygasa', - 'fully_depreciated' => 'Fully Depreciated', - 'help_checkout' => 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ', + 'fully_depreciated' => 'W pełni zamortyzowany', + 'help_checkout' => 'Jeśli chcesz natychmiast przypisać ten zasób, wybierz "Gotowy do wdrożęnia" z powyższej listy stanu. ', 'mac_address' => 'Adres MAC', 'manufacturer' => 'Producent', 'model' => 'Model', diff --git a/resources/lang/pl/admin/hardware/general.php b/resources/lang/pl/admin/hardware/general.php index ad9091a221..2e99536aff 100644 --- a/resources/lang/pl/admin/hardware/general.php +++ b/resources/lang/pl/admin/hardware/general.php @@ -3,18 +3,18 @@ return array( 'archived' => 'Zarchiwizowane', 'asset' => 'Nabytek', - 'bulk_checkout' => 'Checkout Assets to User', + 'bulk_checkout' => 'Przypisane aktywa do użytkownika', 'checkin' => 'Potwierdzanie zasobu/aktywa', 'checkout' => 'Przypisanie aktywa do Użytkownika', 'clone' => 'Klonuj zasób', - 'deployable' => 'Deployable', - 'deleted' => 'This asset has been deleted. Click here to restore it.', + 'deployable' => 'Gotowe do wdrożenia', + 'deleted' => 'To aktywo zostało usunięte. Kliknij tutaj, aby je przywrócić.', 'edit' => 'Edytuj zasób', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', - 'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.', + 'filetype_info' => 'Dozwolone typy plików: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.', + 'model_deleted' => 'Model aktywa został usunięty. Należy przywrócić model przed przywróceniem aktywa.
Kliknij tutaj aby przywrócić model/.', 'requestable' => 'Requestable', - 'restore' => 'Restore Asset', - 'pending' => 'Pending', - 'undeployable' => 'Undeployable', + 'restore' => 'Przywróć aktywa', + 'pending' => 'Oczekuje', + 'undeployable' => 'Niemożliwe do wdrożenia', 'view' => 'Wyświetl nabytki', ); diff --git a/resources/lang/pl/admin/hardware/message.php b/resources/lang/pl/admin/hardware/message.php index bf781601e8..4bf70c968f 100644 --- a/resources/lang/pl/admin/hardware/message.php +++ b/resources/lang/pl/admin/hardware/message.php @@ -5,7 +5,7 @@ return array( 'undeployable' => 'Uwaga: To aktywo zostało oznaczone jako tymczasowo niemożliwe do wdrożenia. Jeśli jego stan się zmienił, zaktualizuj status aktywa.', 'does_not_exist' => 'Nabytek/zasób nie istnieje.', - 'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.', + 'does_not_exist_or_not_requestable' => 'Niezła próba. Ten nabytek/zasób nie istnieje lub nie można go zażądać.', 'assoc_users' => 'Ten nabytek/zasób jest przypisany do użytkownika i nie może być usunięty. Proszę sprawdzić przypisanie nabytków/zasobów a następnie spróbować ponownie.', 'create' => array( @@ -32,14 +32,14 @@ return array( 'upload' => array( 'error' => 'Plik(i) nie zostały wysłane. Spróbuj ponownie.', 'success' => 'Plik(i) zostały wysłane.', - 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', + 'nofiles' => 'Nie wybrałeś żadnych plików do przesłania, albo plik, który próbujesz przekazać jest zbyt duży', 'invalidfiles' => 'Jeden lub więcej z wybranych przez ciebie plików jest jest za duży lub jego typ jest niewłaściwy. Dopuszczalne typy plików: png, gif, jpg, doc, docx, pdf, and txt.', ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,20 +52,21 @@ return array( 'checkout' => array( 'error' => 'Nie mogę wypisać nabytku/zasobu, proszę spróbować ponownie.', 'success' => 'Przypisano nabytek/zasób.', - 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Proszę spróbować ponownie.' + 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Proszę spróbować ponownie.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( 'error' => 'Nie można przypisać nabytku/zasobu, proszę spróbować ponownie', 'success' => 'Nabytek/zasób przypisany.', 'user_does_not_exist' => 'Nieprawidłowy użytkownik. Proszę spróbować ponownie.', - 'already_checked_in' => 'That asset is already checked in.', + 'already_checked_in' => 'Aktywo jest już zaewidencjonowane.', ), 'requests' => array( - 'error' => 'Asset was not requested, please try again', - 'success' => 'Asset requested successfully.', + 'error' => 'Aktywo nie zostało zawnioskowane, spróbuj ponownie', + 'success' => 'Aktywo zawnioskowe pomyślnie.', ) ); diff --git a/resources/lang/pl/admin/hardware/table.php b/resources/lang/pl/admin/hardware/table.php index d46666c079..4c4f834e5f 100644 --- a/resources/lang/pl/admin/hardware/table.php +++ b/resources/lang/pl/admin/hardware/table.php @@ -18,7 +18,7 @@ return array( 'serial' => 'Nr. seryjny', 'status' => 'Status', 'title' => 'Nabytek', - 'image' => 'Device Image', - 'days_without_acceptance' => 'Days Without Acceptance' + 'image' => 'Zdjęcie urządzenia', + 'days_without_acceptance' => 'Dni bez akceptacji' ); diff --git a/resources/lang/pl/admin/licenses/form.php b/resources/lang/pl/admin/licenses/form.php index b8071cf6c6..99c855455c 100644 --- a/resources/lang/pl/admin/licenses/form.php +++ b/resources/lang/pl/admin/licenses/form.php @@ -2,25 +2,25 @@ return array( - 'asset' => 'Asset', + 'asset' => 'Aktywa', 'checkin' => 'Checkin', - 'cost' => 'Purchase Cost', + 'cost' => 'Koszt zakupu', 'create' => 'Dodaj Licencję', 'date' => 'Data Zakupu', - 'depreciation' => 'Depreciation', + 'depreciation' => 'Amortyzacja', 'expiration' => 'Data wygaśnięcia', - 'license_key' => 'Product Key', + 'license_key' => 'Klucz produktu', 'maintained' => 'Wsparcie Producenta', 'name' => 'Nazwa Oprogramowania', - 'no_depreciation' => 'Do Not Depreciate', + 'no_depreciation' => 'Nie amortyzować', 'notes' => 'Uwagi', 'order' => 'Zamówienie nr', 'purchase_order' => 'Numer zamówienia', - 'reassignable' => 'Reassignable', + 'reassignable' => 'Do ponownego przypisania', 'remaining_seats' => 'Wolne stanowiska', 'seats' => 'Ilość stanowisk', 'serial' => 'Klucz produktu', - 'supplier' => 'Supplier', + 'supplier' => 'Dostawca', 'termination_date' => 'Termination Date', 'to_email' => 'Przypisany do adresu email', 'to_name' => 'Przypisany do Nazwiska', diff --git a/resources/lang/pl/admin/licenses/general.php b/resources/lang/pl/admin/licenses/general.php index 808d75a34a..d94259a80b 100644 --- a/resources/lang/pl/admin/licenses/general.php +++ b/resources/lang/pl/admin/licenses/general.php @@ -5,16 +5,16 @@ return array( 'checkin' => 'Checkin License Seat', 'checkout_history' => 'Checkout History', 'checkout' => 'Checkout License Seat', - 'edit' => 'Edit License', - 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.', - 'clone' => 'Clone License', - 'history_for' => 'History for ', + 'edit' => 'Edytuj licencje', + 'filetype_info' => 'Dozwolone typy plików: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.', + 'clone' => 'Duplikuj licencje', + 'history_for' => 'Historia dla ', 'in_out' => 'In/Out', - 'info' => 'License Info', + 'info' => 'Informacja o licencji', 'license_seats' => 'License Seats', 'seat' => 'Seat', 'seats' => 'Seats', - 'software_licenses' => 'Software Licenses', - 'user' => 'User', - 'view' => 'View License', + 'software_licenses' => 'Licencje oprogramowania', + 'user' => 'Użytkownik', + 'view' => 'Podgląd licencji', ); diff --git a/resources/lang/pl/admin/licenses/message.php b/resources/lang/pl/admin/licenses/message.php index ffc70bee0f..013a145b8d 100644 --- a/resources/lang/pl/admin/licenses/message.php +++ b/resources/lang/pl/admin/licenses/message.php @@ -2,39 +2,39 @@ return array( - 'does_not_exist' => 'License does not exist.', - 'user_does_not_exist' => 'User does not exist.', - 'asset_does_not_exist' => 'The asset you are trying to associate with this license does not exist.', - 'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.', - 'assoc_users' => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ', + 'does_not_exist' => 'Licencja nie istnieje.', + 'user_does_not_exist' => 'Użytkownik nie istnieje.', + 'asset_does_not_exist' => 'Aktywa, które chcesz skojarzyć z licencją nie istnieją.', + 'owner_doesnt_match_asset' => 'Aktywa, które chcesz skojarzyć z tą licencją są własnością kogoś innego niż osoba wskazana z rozwijanej listy.', + 'assoc_users' => 'Ten nabytek/zasób jest przypisany do użytkownika i nie może być usunięty. Proszę sprawdzić przypisanie nabytków/zasobów a następnie spróbować ponownie. ', 'create' => array( - 'error' => 'License was not created, please try again.', - 'success' => 'License created successfully.' + 'error' => 'Licencja nie została utworzona, spróbuj ponownie.', + 'success' => 'Licencja została utworzona pomyślnie.' ), 'deletefile' => array( - 'error' => 'File not deleted. Please try again.', - 'success' => 'File successfully deleted.', + 'error' => 'Plik nie został usunięty. Spróbuj ponownie.', + 'success' => 'Plik został usunięty pomyślnie.', ), 'upload' => array( - 'error' => 'File(s) not uploaded. Please try again.', - 'success' => 'File(s) successfully uploaded.', - 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large', - 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', + 'error' => 'Plik(i) nie zostały wysłane. Spróbuj ponownie.', + 'success' => 'Plik(i) zostały wysłane poprawnie.', + 'nofiles' => 'Nie wybrałeś żadnych plików do przesłania, albo plik, który próbujesz przekazać jest zbyt duży', + 'invalidfiles' => 'Jeden lub więcej z wybranych przez ciebie plików jest za duży lub jego typ nie jest dopuszczony. Dopuszczalne typy plików: png, gif, jpg, doc, docx, pdf, and txt.', ), 'update' => array( - 'error' => 'License was not updated, please try again', - 'success' => 'License updated successfully.' + 'error' => 'Licencja nie została uaktualniona, spróbuj ponownie', + 'success' => 'Licencja została zaktualizowana pomyślnie.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this license?', - 'error' => 'There was an issue deleting the license. Please try again.', - 'success' => 'The license was deleted successfully.' + 'confirm' => 'Czy jesteś pewny, że chcesz usunąć tą licencję?', + 'error' => 'Wystąpił problem podczas usuwania licencji. Spróbuj ponownie.', + 'success' => 'Licencja została usunięta pomyślnie.' ), 'checkout' => array( diff --git a/resources/lang/pl/admin/licenses/table.php b/resources/lang/pl/admin/licenses/table.php index dfce4136cb..b3122ccb1a 100644 --- a/resources/lang/pl/admin/licenses/table.php +++ b/resources/lang/pl/admin/licenses/table.php @@ -2,16 +2,16 @@ return array( - 'assigned_to' => 'Assigned To', + 'assigned_to' => 'Przypisane do', 'checkout' => 'In/Out', - 'id' => 'ID', + 'id' => 'Id', 'license_email' => 'License Email', - 'license_name' => 'Licensed To', - 'purchase_date' => 'Purchase Date', - 'purchased' => 'Purchased', - 'seats' => 'Seats', - 'hardware' => 'Hardware', - 'serial' => 'Serial', - 'title' => 'License', + 'license_name' => 'Licencja przypisana do', + 'purchase_date' => 'Data zakupu', + 'purchased' => 'Zakupiono', + 'seats' => 'Ilość stanowisk', + 'hardware' => 'Sprzęt', + 'serial' => 'Nr. seryjny', + 'title' => 'Licencja', ); diff --git a/resources/lang/pl/admin/locations/message.php b/resources/lang/pl/admin/locations/message.php index 3c911cd679..96280d5f1f 100644 --- a/resources/lang/pl/admin/locations/message.php +++ b/resources/lang/pl/admin/locations/message.php @@ -3,9 +3,9 @@ return array( 'does_not_exist' => 'Lokalizacja nie istnieje.', - 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', - 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', - 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', + 'assoc_users' => 'Lokalizacja obecnie jest skojarzona z minimum jednym użytkownikiem i nie może zostać usunięta. Uaktualnij właściwości użytkownika tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ', + 'assoc_assets' => 'Lokalizacja obecnie jest skojarzona z minimum jednym aktywem i nie może zostać usunięta. Uaktualnij właściwości aktywów tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ', + 'assoc_child_loc' => 'Lokalizacja obecnie jest rodzicem minimum jeden innej lokalizacji i nie może zostać usunięta. Uaktualnij właściwości lokalizacji tak aby nie było relacji z tą lokalizacją i spróbuj ponownie. ', 'create' => array( diff --git a/resources/lang/pl/admin/locations/table.php b/resources/lang/pl/admin/locations/table.php index eb5f67d302..8396e8dee6 100644 --- a/resources/lang/pl/admin/locations/table.php +++ b/resources/lang/pl/admin/locations/table.php @@ -1,8 +1,8 @@ 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. - 'assets_checkedout' => 'Assets Assigned', + 'assets_rtd' => 'Aktywa', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted. + 'assets_checkedout' => 'Aktywa przypisane', 'id' => 'ID', 'city' => 'Miasto', 'state' => 'Województwo', @@ -13,6 +13,6 @@ return array( 'address' => 'Adres', 'zip' => 'Kod Pocztowy', 'locations' => 'Lokalizacje', - 'parent' => 'Parent', - 'currency' => 'Location Currency', + 'parent' => 'Rodzic', + 'currency' => 'Waluta lokalna', ); diff --git a/resources/lang/pl/admin/manufacturers/message.php b/resources/lang/pl/admin/manufacturers/message.php index 22e775673a..26d0d878b9 100644 --- a/resources/lang/pl/admin/manufacturers/message.php +++ b/resources/lang/pl/admin/manufacturers/message.php @@ -3,7 +3,7 @@ return array( 'does_not_exist' => 'Producent nie istnieje.', - 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ', + 'assoc_users' => 'Wybrany producent jest obecnie skojarzony z minimum jednym modelem i nie może zostać usunięty. Uaktualnij swoją listę modeli urządzeń by nie zawierała tego producenta, a następnie spróbuj ponownie. ', 'create' => array( 'error' => 'Producent nie został stworzony, spróbuj ponownie.', diff --git a/resources/lang/pl/admin/manufacturers/table.php b/resources/lang/pl/admin/manufacturers/table.php index e39d00a910..315ce4e5f0 100644 --- a/resources/lang/pl/admin/manufacturers/table.php +++ b/resources/lang/pl/admin/manufacturers/table.php @@ -2,7 +2,7 @@ return array( - 'asset_manufacturers' => 'Asset Manufacturers', + 'asset_manufacturers' => 'Producenci aktywów', 'create' => 'Stwórz Producenta', 'id' => 'ID', 'name' => 'Nazwa Producenta', diff --git a/resources/lang/pl/admin/models/general.php b/resources/lang/pl/admin/models/general.php index dabe1f208e..98b1c7f832 100644 --- a/resources/lang/pl/admin/models/general.php +++ b/resources/lang/pl/admin/models/general.php @@ -4,10 +4,10 @@ return array( 'deleted' => 'Model został usunięty. Kliknij aby przywrócić.', 'restore' => 'Przywróć Model', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Pokaż pole MAC adresu tego modelu w aktywach', 'view_deleted' => 'Pokaż usunięte', 'view_models' => 'Pokaż Modele', - 'fieldset' => 'Fieldset', - 'no_custom_field' => 'No custom fields', + 'fieldset' => 'Zestaw pól', + 'no_custom_field' => 'Brak niestandardowych pól', ); diff --git a/resources/lang/pl/admin/models/message.php b/resources/lang/pl/admin/models/message.php index 949918af88..9b09c16fff 100644 --- a/resources/lang/pl/admin/models/message.php +++ b/resources/lang/pl/admin/models/message.php @@ -3,13 +3,13 @@ return array( 'does_not_exist' => 'Model nie istnieje.', - 'assoc_users' => 'This model is currently associated with one or more assets and cannot be deleted. Please delete the assets, and then try deleting again. ', + 'assoc_users' => 'Ten model jest przypisany do minim jednego aktywa i nie może być usunięty. Proszę usunąć aktywa, a następnie spróbować ponownie. ', 'create' => array( 'error' => 'Model nie został stworzony. Spróbuj ponownie.', 'success' => 'Model utworzony pomyślnie.', - 'duplicate_set' => 'An asset model with that name, manufacturer and model number already exists.', + 'duplicate_set' => 'Istnieje już model aktywu o tej nazwie, producencie i numerze.', ), 'update' => array( @@ -18,7 +18,7 @@ return array( ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this asset model?', + 'confirm' => 'Czy na pewno chcesz usunąć ten model aktywów?', 'error' => 'Wystąpił błąd podczas usuwania modelu. Spróbuj ponownie.', 'success' => 'Model usunięty poprawnie.' ), diff --git a/resources/lang/pl/admin/models/table.php b/resources/lang/pl/admin/models/table.php index 927a806476..754a8a7b91 100644 --- a/resources/lang/pl/admin/models/table.php +++ b/resources/lang/pl/admin/models/table.php @@ -2,16 +2,16 @@ return array( - 'create' => 'Create Asset Model', + 'create' => 'Utwórz model aktytwa', 'created_at' => 'Utworzone', - 'eol' => 'EOL', + 'eol' => 'Koniec licencji', 'modelnumber' => 'Numer Modelu', - 'name' => 'Asset Model Name', - 'numassets' => 'Assets', - 'title' => 'Asset Models', - 'update' => 'Update Asset Model', - 'view' => 'View Asset Model', - 'update' => 'Update Asset Model', + 'name' => 'Nazwa modelu aktywa', + 'numassets' => 'Aktywa', + 'title' => 'Model aktywa', + 'update' => 'Uaktualnij model aktywa', + 'view' => 'Podgląd modelu aktywa', + 'update' => 'Aktualizuj Model', 'clone' => 'Kopiuj Model', 'edit' => 'Edytuj Model', ); diff --git a/resources/lang/pl/admin/reports/general.php b/resources/lang/pl/admin/reports/general.php index b03b97546f..74a79b48f7 100644 --- a/resources/lang/pl/admin/reports/general.php +++ b/resources/lang/pl/admin/reports/general.php @@ -1,5 +1,5 @@ 'Select the options you want for your asset report.' + 'info' => 'Wybierz opcje, które chcesz by znalazły się w raporcie aktywów.' ); diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php index db003687a1..229abf84aa 100644 --- a/resources/lang/pl/admin/settings/general.php +++ b/resources/lang/pl/admin/settings/general.php @@ -1,35 +1,35 @@ 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad' => 'Usługa katalogowa Active Directory', + 'ad_domain' => 'Domena Active Directory', + 'ad_domain_help' => 'Czasami jest taka sama jak domena poczty e-mail, ale nie zawsze.', + 'is_ad' => 'To jest serwer Active Directory', 'alert_email' => 'Wyślij powiadomienia do', - 'alerts_enabled' => 'Alerts Enabled', - 'alert_interval' => 'Expiring Alerts Threshold (in days)', - 'alert_inv_threshold' => 'Inventory Alert Threshold', + 'alerts_enabled' => 'Alarmy włączone', + 'alert_interval' => 'Próg wygasających alarmów (w dniach)', + 'alert_inv_threshold' => 'Inwentarz progu alarmów', 'asset_ids' => 'ID Aktywa', 'auto_increment_assets' => 'Generuj automatycznie zwiększane ID aktywa', 'auto_increment_prefix' => 'Prefix (opcjonalnie)', 'auto_incrementing_help' => 'Najpierw aktywuj automatycznie zwiększane ID Aktywa, by móc ustawić te opcje.', 'backups' => 'Kopie zapasowe', 'barcode_settings' => 'Ustawienia Kodów Kreskowych', - 'confirm_purge' => 'Confirm Purge', - 'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.', + 'confirm_purge' => 'Potwierdź wyczyszczenie', + 'confirm_purge_help' => 'Wpisz w poniższe pole słowo "DELETE" aby wyczyścić usunięte rekordy. Tej czynności nie da się cofnąć.', 'custom_css' => 'Własny CSS', 'custom_css_help' => 'Wprowadź własny kod CSS. Nie używaj tagów <style></style>.', 'default_currency' => 'Domyślna Waluta', 'default_eula_text' => 'Domyślna EULA', - 'default_language' => 'Default Language', + 'default_language' => 'Domyślny język', 'default_eula_help_text' => 'Możesz również sporządzić własną licencje by sprecyzować kategorie aktywa.', 'display_asset_name' => 'Wyświetl nazwę aktywa', 'display_checkout_date' => 'Wyświetl Datę Przypisania', 'display_eol' => 'Wyświetl koniec linii w widoku tabeli', - 'display_qr' => 'Display Square Codes', - 'display_alt_barcode' => 'Display 1D barcode', - 'barcode_type' => '2D Barcode Type', - 'alt_barcode_type' => '1D barcode type', + 'display_qr' => 'Wyświetlaj QR kody', + 'display_alt_barcode' => 'Wyświetlaj kod kreskowy w 1D', + 'barcode_type' => 'Kod kreskowy typu 2D', + 'alt_barcode_type' => 'Kod kreskowy typu 1D', 'eula_settings' => 'Ustawienia Licencji', 'eula_markdown' => 'Ta licencja zezwala na Github flavored markdown.', 'general_settings' => 'Ustawienia ogólne', @@ -38,29 +38,31 @@ return array( 'info' => 'Te ustawienia pozwalają ci zdefiniować najważniejsze szczegóły twojej instalacji.', 'laravel' => 'Wersja Laravel', 'ldap_enabled' => 'LDAP włączone', - 'ldap_integration' => 'LDAP Integration', - 'ldap_settings' => 'LDAP Settings', - 'ldap_server' => 'LDAP Server', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', - 'ldap_server_cert' => 'LDAP SSL certificate validation', - 'ldap_server_cert_ignore' => 'Allow invalid SSL Certificate', - 'ldap_server_cert_help' => 'Select this checkbox if you are using a self signed SSL cert and would like to accept an invalid SSL certificate.', - 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', - 'ldap_uname' => 'LDAP Bind Username', - 'ldap_pword' => 'LDAP Bind Password', + 'ldap_integration' => 'Integracja z LDAP', + 'ldap_settings' => 'Ustawienia LDAP', + 'ldap_server' => 'Serwery LDAP', + 'ldap_server_help' => 'To powinno się rozpocząć od ldap: / / (dla nieszyfrowanych połączeń) lub ldaps: / / (dla szyfrowanych połączeń)', + 'ldap_server_cert' => 'Walidacja certyfikatu SSL dla LDAP', + 'ldap_server_cert_ignore' => 'Zezwalaj na nieprawidłowy certyfikat SSL', + 'ldap_server_cert_help' => 'Zaznacz tą opcje jeśli używasz certyfikatu SSL podpisanego przez samego siebie i chcesz zezwolić na nieprawidłowy certyfikat.', + 'ldap_tls' => 'Używaj TLS', + 'ldap_tls_help' => 'Ta opcja powinna zaznaczony jedynie gdy używasz STARTLS w swoim serwerze LDAP. ', + 'ldap_uname' => 'Użytkownik do łączenia się z serwerem LDAP', + 'ldap_pword' => 'Hasło użytkownika wpisanego do łączenia się z serwerem LDAP', 'ldap_basedn' => 'Base Bind DN', - 'ldap_filter' => 'LDAP Filter', - 'ldap_username_field' => 'Username Field', - 'ldap_lname_field' => 'Last Name', - 'ldap_fname_field' => 'LDAP First Name', + 'ldap_filter' => 'Filtr LDAP', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', + 'ldap_username_field' => 'Pole użytkownika', + 'ldap_lname_field' => 'Nazwisko', + 'ldap_fname_field' => 'Imię', 'ldap_auth_filter_query' => 'LDAP Authentication query', - 'ldap_version' => 'LDAP Version', - 'ldap_active_flag' => 'LDAP Active Flag', + 'ldap_version' => 'Wersja LDAP', + 'ldap_active_flag' => 'Aktywna flaga LDAP', 'ldap_emp_num' => 'LDAP Employee Number', 'ldap_email' => 'LDAP Email', - 'load_remote_text' => 'Remote Scripts', - 'load_remote_help_text' => 'This Snipe-IT install can load scripts from the outside world.', + 'load_remote_text' => 'Skrypty zdalne', + 'load_remote_help_text' => 'Ta instalacja Snipe-IT może załadować skrypty z zewnętrznego świata.', 'logo' => 'Logo', 'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.', 'full_multiple_companies_support_text' => 'Full Multiple Companies Support', @@ -88,25 +90,25 @@ return array( 'about_settings_text' => 'Te ustawienia pozwalają ci zmodyfikować najważniejsze szczegóły twojej instalacji.', 'labels_per_page' => 'Labels per page', 'label_dimensions' => 'Label dimensions (inches)', - 'page_padding' => 'Page margins (inches)', - 'purge' => 'Purge Deleted Records', + 'page_padding' => 'Margines strony (cale)', + 'purge' => 'Wyczyść usunięte rekordy', 'labels_display_bgutter' => 'Label bottom gutter', 'labels_display_sgutter' => 'Label side gutter', - 'labels_fontsize' => 'Label font size', + 'labels_fontsize' => 'Rozmiar czcionki na etykiecie', 'labels_pagewidth' => 'Label sheet width', 'labels_pageheight' => 'Label sheet height', 'label_gutters' => 'Label spacing (inches)', 'page_dimensions' => 'Page dimensions (inches)', 'label_fields' => 'Label visible fields', - 'inches' => 'inches', - 'width_w' => 'w', - 'height_h' => 'h', - 'text_pt' => 'pt', - 'left' => 'left', - 'right' => 'right', - 'top' => 'top', - 'bottom' => 'bottom', - 'vertical' => 'vertical', + 'inches' => 'cale', + 'width_w' => 'szerokość', + 'height_h' => 'wysokość', + 'text_pt' => 'piksel', + 'left' => 'lewo', + 'right' => 'prawo', + 'top' => 'góra', + 'bottom' => 'dół', + 'vertical' => 'pionowy', 'horizontal' => 'horizontal', 'zerofill_count' => 'Length of asset tags, including zerofill', ); diff --git a/resources/lang/pl/admin/settings/message.php b/resources/lang/pl/admin/settings/message.php index 52fc831ca2..44fa2f2378 100644 --- a/resources/lang/pl/admin/settings/message.php +++ b/resources/lang/pl/admin/settings/message.php @@ -14,9 +14,9 @@ return array( 'file_not_found' => 'Nie odnaleziono kopii zapasowej na serwerze.', ), 'purge' => array( - 'error' => 'An error has occurred while purging. ', - 'validation_failed' => 'Your purge confirmation is incorrect. Please type the word "DELETE" in the confirmation box.', - 'success' => 'Deleted records successfully purged.' + 'error' => 'Wystąpił błąd podczas czyszczenia. ', + 'validation_failed' => 'Potwierdzenie czyszczenia jest niepoprawne. Wpisz słowo "DELETE" w polu potwierdzenia.', + 'success' => 'Pomyślnie wyczyszczono rekordy usunięte.' ), ); diff --git a/resources/lang/pl/admin/statuslabels/message.php b/resources/lang/pl/admin/statuslabels/message.php index 619a5a509c..d317d97afd 100644 --- a/resources/lang/pl/admin/statuslabels/message.php +++ b/resources/lang/pl/admin/statuslabels/message.php @@ -2,24 +2,24 @@ return array( - 'does_not_exist' => 'Status Label does not exist.', - 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ', + 'does_not_exist' => 'Status etykiety nie istnieje.', + 'assoc_assets' => 'Status etykiety jest skojarzony z minimum jednym aktywem i nie może być usunięty. Uaktualnij aktywa tak aby nie było relacji z tym statusem i spróbuj ponownie. ', 'create' => array( - 'error' => 'Status Label was not created, please try again.', - 'success' => 'Status Label created successfully.' + 'error' => 'Status etykiety nie został utworzony, spróbuj ponownie.', + 'success' => 'Status etykiety utworzony pomyślnie.' ), 'update' => array( - 'error' => 'Status Label was not updated, please try again', - 'success' => 'Status Label updated successfully.' + 'error' => 'Status etykiety nie został zaktualizowany, spróbuj ponownie', + 'success' => 'Status etykiety został zaktualizowany pomyślnie.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this Status Label?', - 'error' => 'There was an issue deleting the Status Label. Please try again.', - 'success' => 'The Status Label was deleted successfully.' + 'confirm' => 'Czy na pewno chcesz usunąć ten status etykiety?', + 'error' => 'Wystąpił błąd podczas usuwania statusu etykiety. Spróbuj ponownie.', + 'success' => 'Status etykiety został usunięty pomyślnie.' ) ); diff --git a/resources/lang/pl/admin/statuslabels/table.php b/resources/lang/pl/admin/statuslabels/table.php index 83ec5fd449..de0a87d209 100644 --- a/resources/lang/pl/admin/statuslabels/table.php +++ b/resources/lang/pl/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'O statusie', 'archived' => 'Zarchiwizowane', 'create' => 'Stwórz Status', + 'color' => 'Chart Color', 'deployable' => 'Gotowe do wdrożenia', 'info' => 'Status jest używany by opisać różne stany w jakich mogą znaleźć się twoje aktywa. Mogą być one w trakcie naprawy, zgubione/ukradzione itd. Możesz tworzyć nowe etykiety statusu dla gotowych do wdrożenia, oczekujących oraz zarchiwizowanych aktywów.', 'name' => 'Nazwa Statusu', 'pending' => 'Oczekujący', 'status_type' => 'Typ Statusu', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status', 'undeployable' => 'Niemożliwe do wdrożenia', 'update' => 'Zaktualizuj Status', diff --git a/resources/lang/pl/admin/suppliers/message.php b/resources/lang/pl/admin/suppliers/message.php index 1ad614a9fb..665d7642f9 100644 --- a/resources/lang/pl/admin/suppliers/message.php +++ b/resources/lang/pl/admin/suppliers/message.php @@ -3,7 +3,7 @@ return array( 'does_not_exist' => 'Dostawca nie istnieje.', - 'assoc_users' => 'This supplier is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this supplier and try again. ', + 'assoc_users' => 'Dostawca jest obecnie powiązany z co najmniej jednym modelem i nie może być usunięty. uaktualnij swoją listę modeli by nie zawierała powiązania z tym dostawcą i spróbuj ponownie. ', 'create' => array( 'error' => 'Dostawca nie został utworzony, spróbuj ponownie.', diff --git a/resources/lang/pl/admin/suppliers/table.php b/resources/lang/pl/admin/suppliers/table.php index 44a1bbd552..3744eb106e 100644 --- a/resources/lang/pl/admin/suppliers/table.php +++ b/resources/lang/pl/admin/suppliers/table.php @@ -2,7 +2,7 @@ return array( 'address' => 'Adres Dostawcy', - 'assets' => 'Assets', + 'assets' => 'Aktywa', 'city' => 'Miasto', 'contact' => 'Osoba Kontaktowa', 'country' => 'Kraj', @@ -18,8 +18,8 @@ return array( 'suppliers' => 'Dostawcy', 'update' => 'Zaktualizuj Dostawcę', 'url' => 'Adres www', - 'view' => 'View Supplier', - 'view_assets_for' => 'View Assets for', + 'view' => 'Podgląd dostawcy', + 'view_assets_for' => 'Podgląd aktywa dla', 'zip' => 'Kod Pocztowy', ); diff --git a/resources/lang/pl/admin/users/general.php b/resources/lang/pl/admin/users/general.php index 55b63935eb..aa3a771211 100644 --- a/resources/lang/pl/admin/users/general.php +++ b/resources/lang/pl/admin/users/general.php @@ -4,14 +4,14 @@ return array( 'assets_user' => 'Aktwo przypisane do :name', - 'current_assets' => 'Assets currently checked out to this user', + 'current_assets' => 'Aktywo obecnie jest przypisane do tego użytkownika', 'clone' => 'Kopiuj Użytkownika', 'contact_user' => 'Kontakt :name', 'edit' => 'Edycja Użytkownika', 'filetype_info' => 'Dozwolone typy plików: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.', 'history_user' => 'Historia', 'last_login' => 'Ostatnie logowanie', - 'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.', + 'ldap_config_text' => 'Ustawienia konfiguracji LDAP mogą być znalezione w Administracja -> Ustawienia. Opcjonalnie wybierz lokalizacje, która będzie ustawiona dla zaimportowanych użytkowników.', 'software_user' => 'Oprogramowanie przypisane do :name', 'view_user' => 'Zobacz Użytkownika :name', 'usercsv' => 'plik CSV', diff --git a/resources/lang/pl/admin/users/message.php b/resources/lang/pl/admin/users/message.php index 85bde569b6..7d2defc616 100644 --- a/resources/lang/pl/admin/users/message.php +++ b/resources/lang/pl/admin/users/message.php @@ -2,15 +2,15 @@ return array( - 'accepted' => 'You have successfully accepted this asset.', - 'declined' => 'You have successfully declined this asset.', + 'accepted' => 'Pomyślnie zaakceptowałeś ten składnik aktywów.', + 'declined' => 'Pomyślnie odrzuciłeś ten składnik aktywów.', 'user_exists' => 'Użytkownik już istnieje!', 'user_not_found' => 'User [:id] nie istnieje.', 'user_login_required' => 'Pole login jest wymagane', 'user_password_required' => 'Pole hasło jest wymagane.', 'insufficient_permissions' => 'Brak uprawnień.', - 'user_deleted_warning' => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.', - 'ldap_not_configured' => 'LDAP integration has not been configured for this installation.', + 'user_deleted_warning' => 'Ten użytkownik został usunięty. Musisz przywrócić tego użytkownika aby je wyedytować lub przypisać je do nowych aktywów.', + 'ldap_not_configured' => 'Integracja z LDAP nie została skonfigurowana dla tej instalacji.', 'success' => array( @@ -29,15 +29,15 @@ return array( 'create' => 'Podczas tworzenia użytkownika wystąpił problem. Spróbuj ponownie.', 'update' => 'Podczas aktualizacji użytkownika wystąpił problem. Spróbuj ponownie.', 'delete' => 'Wystąpił błąd podczas usuwania użytkownika. Spróbuj ponownie.', - 'unsuspend' => 'There was an issue unsuspending the user. Please try again.', + 'unsuspend' => 'Wystąpił problem podczas odblokowania użytkownika. Spróbuj ponownie.', 'import' => 'Podczas importowania użytkowników wystąpił błąd. Spróbuj ponownie.', - 'asset_already_accepted' => 'This asset has already been accepted.', - 'accept_or_decline' => 'You must either accept or decline this asset.', + 'asset_already_accepted' => 'Aktywo zostało już zaakceptowane.', + 'accept_or_decline' => 'Musisz zaakceptować lub odrzucić to aktywo.', 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', - 'ldap_could_not_connect' => 'Could not connect to the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', - 'ldap_could_not_bind' => 'Could not bind to the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server: ', - 'ldap_could_not_search' => 'Could not search the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', - 'ldap_could_not_get_entries' => 'Could not get entries from the LDAP server. Please check your LDAP server configuration in the LDAP config file.
Error from LDAP Server:', + 'ldap_could_not_connect' => 'Nie udało się połączyć z serwerem LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji.
Błąd z serwera LDAP:', + 'ldap_could_not_bind' => 'Nie udało się połączyć z serwerem LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji.
Błąd z serwera LDAP: ', + 'ldap_could_not_search' => 'Nie udało się przeszukać serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji.
Błąd z serwera LDAP:', + 'ldap_could_not_get_entries' => 'Nie udało się pobrać pozycji z serwera LDAP. Sprawdź proszę konfigurację serwera LDAP w pliku konfiguracji.
Błąd z serwera LDAP:', ), 'deletefile' => array( @@ -49,7 +49,7 @@ return array( 'error' => 'Plik(i) nie zostały wysłane. Spróbuj ponownie.', 'success' => 'Plik(i) zostały wysłane poprawnie.', 'nofiles' => 'Nie wybrałeś żadnych plików do wysłania', - 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', + 'invalidfiles' => 'Jeden lub więcej z wybranych przez ciebie plików jest za duży lub jego typ nie jest dopuszczony. Dopuszczalne typy plików: png, gif, jpg, doc, docx, pdf, and txt.', ), ); diff --git a/resources/lang/pl/admin/users/table.php b/resources/lang/pl/admin/users/table.php index b00b88cd27..88101cb02a 100644 --- a/resources/lang/pl/admin/users/table.php +++ b/resources/lang/pl/admin/users/table.php @@ -4,7 +4,7 @@ return array( 'activated' => 'Aktywny', 'allow' => 'Pozwól', - 'checkedout' => 'Assets', + 'checkedout' => 'Aktywa', 'created_at' => 'Utworzone', 'createuser' => 'Dodaj Użytkownika', 'deny' => 'Odmów', @@ -13,24 +13,24 @@ return array( 'first_name' => 'Imię', 'groupnotes' => 'Wybierz grupę w której przypiszesz użytkownika, dostanie on prawa grupy do której zostanie przypisany.', 'id' => 'ID', - 'inherit' => 'Inherit', + 'inherit' => 'Dziedziczy', 'job' => 'Stanowisko', 'last_login' => 'Ostatnie logowanie', 'last_name' => 'Nazwisko', 'location' => 'Lokalizacja', - 'lock_passwords' => 'Login details cannot be changed on this installation.', + 'lock_passwords' => 'Szczegóły loginu nie mogą zostać zmienione dla tej instalacji.', 'manager' => 'Kierownik', 'name' => 'Nazwa', 'notes' => 'Uwagi', 'password_confirm' => 'Potwierdź hasło', 'password' => 'Hasło', 'phone' => 'Telefon', - 'show_current' => 'Show Current Users', + 'show_current' => 'Pokaż bieżących użytkowników', 'show_deleted' => 'Pokaż usuniętych użytkowników', 'title' => 'Tytuł', 'updateuser' => 'Zaktualizuj użytkownika', 'username' => 'Nazwa użytkownika', - 'username_note' => '(This is used for Active Directory binding only, not for login.)', + 'username_note' => '(to jest używane do połączenia do Active Directory, nie do logowania)', 'cloneuser' => 'Kopiuj Użytkownika', 'viewusers' => 'Przeglądaj użytkowników', ); diff --git a/resources/lang/pl/auth/general.php b/resources/lang/pl/auth/general.php index bf88cba77a..af81fcbb5a 100644 --- a/resources/lang/pl/auth/general.php +++ b/resources/lang/pl/auth/general.php @@ -1,12 +1,12 @@ 'Send Password Reset Link', - 'email_reset_password' => 'Email Password Reset', - 'reset_password' => 'Reset Password', + 'send_password_link' => 'Wyślij e-mail resetujący hasło', + 'email_reset_password' => 'E-mail resetujący hasło', + 'reset_password' => 'Resetuj hasło', 'login' => 'Login', - 'login_prompt' => 'Please Login', - 'forgot_password' => 'I forgot my password', - 'remember_me' => 'Remember Me', + 'login_prompt' => 'Zaloguj się', + 'forgot_password' => 'Zapomniałem hasła', + 'remember_me' => 'Zapamiętaj mnie', ]; diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php index ee672fc291..9f61d7756e 100644 --- a/resources/lang/pl/general.php +++ b/resources/lang/pl/general.php @@ -57,9 +57,9 @@ 'depreciation' => 'Amortyzacja', 'editprofile' => 'Edytuj Swój Profil', 'eol' => 'EOL', - 'email_domain' => 'Email Domain', - 'email_format' => 'Email Format', - 'email_domain_help' => 'This is used to generate email addresses when importing', + 'email_domain' => 'Domena poczty e-mail', + 'email_format' => 'Format e-mail', + 'email_domain_help' => 'To jest używane do generowania e-maili podczas importowania', 'filastname_format' => 'First Initial Last Name (jsmith@example.com)', 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)', 'first' => 'Pierwszy', @@ -76,6 +76,7 @@ 'image_delete' => 'Usuń zdjęcie', 'image_upload' => 'Dodaj zdjęcie', 'import' => 'Zaimportuj', + 'import-history' => 'Import History', 'asset_maintenance' => 'Utrzymanie aktywów', 'asset_maintenance_report' => 'Raport utrzymywania aktywów', 'asset_maintenances' => 'Utrzymanie aktywów', @@ -106,7 +107,7 @@ 'moreinfo' => 'Więcej informacji', 'name' => 'Nazwa', 'next' => 'Następny', - 'new' => 'new!', + 'new' => 'nowy!', 'no_depreciation' => 'Nie Amortyzowany', 'no_results' => 'Brak wyników.', 'no' => 'Nie', @@ -129,7 +130,7 @@ 'save' => 'Zapisz', 'select' => 'Wybierz', 'search' => 'Wyszukaj', - 'select_category' => 'Select a Category', + 'select_category' => 'Wybierz kategorię', 'select_depreciation' => 'Wybierz rodzaj amortyzacji', 'select_location' => 'Wybierz lokację', 'select_manufacturer' => 'Wybierz producenta', @@ -142,7 +143,7 @@ 'select_asset' => 'Wybierz aktywa', 'settings' => 'Ustawienia', 'sign_in' => 'Zaloguj się', - 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', + 'some_features_disabled' => 'Wersja demonstracyjna: Pewne funkcje zostały wyłączone w tej instalacji.', 'site_name' => 'Nazwa Witryny', 'state' => 'Województwo', 'status_labels' => 'Etykiety Statusu', @@ -153,7 +154,7 @@ 'type' => 'Rodzaj', 'undeployable' => 'Nie przypisane', 'unknown_admin' => 'Nieznany Administrator', - 'username_format' => 'Username Format', + 'username_format' => 'Format nazwy użytkownika', 'update' => 'Zaktualizuj', 'uploaded' => 'Przesłano', 'user' => 'Użytkownik', diff --git a/resources/lang/pl/passwords.php b/resources/lang/pl/passwords.php index 5195a9b77c..ee1935060e 100644 --- a/resources/lang/pl/passwords.php +++ b/resources/lang/pl/passwords.php @@ -1,7 +1,7 @@ 'Your password link has been sent!', - 'user' => 'That user does not exist or does not have an email address associated', + 'sent' => 'Twój link do hasła został wysłany!', + 'user' => 'Ten użytkownik nie istnieje lub nie ma powiązanego adresu e-mail', ]; diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php index 9bbf64e3ee..f071831602 100644 --- a/resources/lang/pl/validation.php +++ b/resources/lang/pl/validation.php @@ -25,47 +25,47 @@ return array( "file" => ":attribute musi być pomiędzy :min - :max kilobajtów.", "string" => ":attribute musi być pomiędzy :min - :max znaków.", ), - "confirmed" => "The :attribute confirmation does not match.", - "date" => "The :attribute is not a valid date.", - "date_format" => "The :attribute does not match the format :format.", - "different" => "The :attribute and :other must be different.", - "digits" => "The :attribute must be :digits digits.", - "digits_between" => "The :attribute must be between :min and :max digits.", + "confirmed" => "Potwierdzenie :attribute nie pasuje.", + "date" => ":attribute nie jest prawidłową datą.", + "date_format" => "Format :attribute nie pasuje do :format.", + "different" => ":attribute musi różnić się od :other.", + "digits" => ":attribute musi posiadać cyfry :digits.", + "digits_between" => ":attribute musi być pomiędzy cyframi :min i :max.", "email" => "Format pola :attribute jest niewłaściwy.", "exists" => "Wybrane :attribute jest niewłaściwe.", - "email_array" => "One or more email addresses is invalid.", + "email_array" => "Jeden lub więcej wprowadzonych adresów jest nieprawidłowy.", "image" => ":attribute musi być obrazkiem.", "in" => "Wybrane :attribute jest niewłaściwe.", "integer" => ":attribute must musi być liczbą całkowitą.", "ip" => ":attribute musi być poprawnym adresem IP.", "max" => array( - "numeric" => "The :attribute may not be greater than :max.", - "file" => "The :attribute may not be greater than :max kilobytes.", - "string" => "The :attribute may not be greater than :max characters.", + "numeric" => ":attribute nie może być większy niż :max.", + "file" => ":attribute nie może być więszky niż :max kilobajtów.", + "string" => ":attribute nie może posiadać więcej znaków niż :max.", ), - "mimes" => "The :attribute must be a file of type: :values.", + "mimes" => ":attribute musi być plikiem z rozszerzeniami :values.", "min" => array( - "numeric" => "The :attribute must be at least :min.", - "file" => "The :attribute must be at least :min kilobytes.", - "string" => "The :attribute must be at least :min characters.", + "numeric" => ":attribute musi być przynajmniej :min.", + "file" => ":attribute musi być przynajmniej wielkości :min kilobajtów.", + "string" => ":attribute musi być posiadać minimum :min znaki.", ), - "not_in" => "The selected :attribute is invalid.", + "not_in" => "Wybrany :attribute jest nieprawidłowy.", "numeric" => ":attribute musi być liczbą.", "regex" => "Format :attribute jest niewłaściwy.", "required" => ":attribute nie może być puste.", - "required_if" => "The :attribute field is required when :other is :value.", - "required_with" => "The :attribute field is required when :values is present.", - "required_without" => "The :attribute field is required when :values is not present.", - "same" => "The :attribute and :other must match.", + "required_if" => "Pole :attribute jest wymagane gdy :other jest :value.", + "required_with" => "Pole :attribute jest wymagane gdy :values jest podana.", + "required_without" => "Pole :attribute jest wymagane gdy :values nie jest podana.", + "same" => ":attribute i :other muszą pasować.", "size" => array( - "numeric" => "The :attribute must be :size.", - "file" => "The :attribute must be :size kilobytes.", - "string" => "The :attribute must be :size characters.", + "numeric" => ":attribute musi być wielkości :size.", + "file" => ":attribute musi być :size kilobajtów.", + "string" => ":attribute musi być :size znakowy.", ), - "unique" => "The :attribute has already been taken.", - "url" => "The :attribute format is invalid.", - "statuslabel_type" => "You must select a valid status label type", - "unique_undeleted" => "The :attribute must be unique.", + "unique" => ":attribute został już wzięty.", + "url" => "Format pola :attribute jest niewłaściwy.", + "statuslabel_type" => "Musisz wybrać poprawny status typu etykiety", + "unique_undeleted" => ":attribute musi być unikalny.", /* @@ -80,7 +80,7 @@ return array( */ 'custom' => array(), - 'alpha_space' => "The :attribute field contains a character that is not allowed.", + 'alpha_space' => "Pole :attribute posiada znak, który jest niedozwolony.", /* |-------------------------------------------------------------------------- diff --git a/resources/lang/pt-BR/admin/custom_fields/general.php b/resources/lang/pt-BR/admin/custom_fields/general.php index 2cd8519c93..345261a21e 100644 --- a/resources/lang/pt-BR/admin/custom_fields/general.php +++ b/resources/lang/pt-BR/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Campo', 'about_fieldsets_title' => 'Sobre conjuntos de campos', 'about_fieldsets_text' => 'Conjuntos de campos permitem criar grupos de campos personalizados que são frequentemente reutilizados para modelos de ativos específicos.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Conjunto de campos', 'qty_fields' => 'Qtd de campos', 'fieldsets' => 'Conjuntos de campos', 'fieldset_name' => 'Nome do conjunto de campos', 'field_name' => 'Nome do campo', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Elemento do formulario', 'field_element_short' => 'Elemento', 'field_format' => 'Formato', diff --git a/resources/lang/pt-BR/admin/hardware/message.php b/resources/lang/pt-BR/admin/hardware/message.php index 32efbb6196..8d64a7cc7b 100644 --- a/resources/lang/pt-BR/admin/hardware/message.php +++ b/resources/lang/pt-BR/admin/hardware/message.php @@ -36,9 +36,9 @@ return array( ), 'import' => array( - 'error' => 'Alguns itens não foram importados corretamente.', - 'errorDetail' => 'Os seguintes itens não foram importados devido a erros.', - 'success' => "Seu Arquivo foi importado", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -51,7 +51,8 @@ return array( 'checkout' => array( 'error' => 'Ativo não foi registrado, favor tentar novamente', 'success' => 'Ativo registrado com sucesso.', - 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.' + 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/pt-BR/admin/models/table.php b/resources/lang/pt-BR/admin/models/table.php index d3f6c3c811..60ec2d0562 100644 --- a/resources/lang/pt-BR/admin/models/table.php +++ b/resources/lang/pt-BR/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Modelos de Ativos', 'update' => 'Atualizar Modelo de Ativos', 'view' => 'Ver Modelo de Ativos', - 'update' => 'Atualizar Modelo de Ativos', + 'update' => 'Atualizar Modelo', 'clone' => 'Clonar Modelo', 'edit' => 'Editar Modelo', ); diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php index 2f8a657416..127f76be87 100644 --- a/resources/lang/pt-BR/admin/settings/general.php +++ b/resources/lang/pt-BR/admin/settings/general.php @@ -1,10 +1,10 @@ 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad' => 'Diretório Ativo', + 'ad_domain' => 'Domínio de Diretório Ativo', + 'ad_domain_help' => 'Geralmente isso é igual ao seu domínio de email, mas nem sempre.', + 'is_ad' => 'Este é um servidor de Diretório Ativo', 'alert_email' => 'Enviar alertas a', 'alerts_enabled' => 'Alertas ativados', 'alert_interval' => 'Limite de Expiração dos Alertas (em dias)', @@ -41,16 +41,18 @@ return array( 'ldap_integration' => 'Integração LDAP', 'ldap_settings' => 'Configurações LDAP', 'ldap_server' => 'Servidor LDAP', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', + 'ldap_server_help' => 'Deve iniciar com ldap:// (para encriptado ou TLS) ou ldaps:// (para SSL)', 'ldap_server_cert' => 'Validação certificado SSL LDAP', 'ldap_server_cert_ignore' => 'Permitir certificado SSL inválido', 'ldap_server_cert_help' => 'Selecione esta opção se está utilizando um certificado SSL próprio e deseja aceitar um certificado SSL inválido.', 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', + 'ldap_tls_help' => 'Isso deve ser verificado somente se você estiver rodando STARTTLS no seu servidor LDAP. ', 'ldap_uname' => 'Login do usuário LDAP', 'ldap_pword' => 'Senha do usuário LDAP', 'ldap_basedn' => 'DN de Atribuição Básico', 'ldap_filter' => 'Filtro LDAP', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Nome do utilizador', 'ldap_lname_field' => 'Último Nome', 'ldap_fname_field' => 'Primeiro nome', @@ -108,5 +110,5 @@ return array( 'bottom' => 'rodapé', 'vertical' => 'vertical', 'horizontal' => 'horizontal', - 'zerofill_count' => 'Length of asset tags, including zerofill', + 'zerofill_count' => 'Comprimento de etiquetas de ativos, incluindo zerofill', ); diff --git a/resources/lang/pt-BR/admin/statuslabels/table.php b/resources/lang/pt-BR/admin/statuslabels/table.php index 781405513e..27a6220bd5 100644 --- a/resources/lang/pt-BR/admin/statuslabels/table.php +++ b/resources/lang/pt-BR/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Sobre os Rótulos de Status', 'archived' => 'Arquivado', 'create' => 'Criar Rótulo de Status', + 'color' => 'Chart Color', 'deployable' => 'Implementável', 'info' => 'Rótulos de status são usados para descrever os vários estados que seus ativos podem estar. Eles podem ser fora do ar para reparo, perdido/roubado, etc. Você pode criar novos rótulos de status para ativos implementáveis, pendentes e arquivados.', 'name' => 'Nome do Status', 'pending' => 'Pendente', 'status_type' => 'Tipo do Status', + 'show_in_nav' => 'Show in side nav', 'title' => 'Rótulos de Status', 'undeployable' => 'Não implementável', 'update' => 'Atualizar Rótulo de Status', diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php index 2de5c6e10f..e358a6e682 100644 --- a/resources/lang/pt-BR/general.php +++ b/resources/lang/pt-BR/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Excluir Imagem', 'image_upload' => 'Carregar Imagem', 'import' => 'Importar', + 'import-history' => 'Import History', 'asset_maintenance' => 'Manutenção de Ativo', 'asset_maintenance_report' => 'Relatório de Manutenção em Ativo', 'asset_maintenances' => 'Manutenções em Ativo', diff --git a/resources/lang/pt-PT/admin/custom_fields/general.php b/resources/lang/pt-PT/admin/custom_fields/general.php index b99ba2a905..02a83cf6d6 100644 --- a/resources/lang/pt-PT/admin/custom_fields/general.php +++ b/resources/lang/pt-PT/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Campo', 'about_fieldsets_title' => 'Sobre conjuntos de campos', 'about_fieldsets_text' => 'Conjuntos de campos permitem criar grupos de campos personalizados que são frequentemente reutilizados para modelos de artigos especificos.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Conjunto de campos', 'qty_fields' => 'Qtd de campos', 'fieldsets' => 'Conjuntos de campos', 'fieldset_name' => 'Nome do conjunto de campos', 'field_name' => 'Nome do campo', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Elemento do formulario', 'field_element_short' => 'Elemento', 'field_format' => 'Formato', diff --git a/resources/lang/pt-PT/admin/hardware/general.php b/resources/lang/pt-PT/admin/hardware/general.php index a46c1fb0a8..04f7515f7c 100644 --- a/resources/lang/pt-PT/admin/hardware/general.php +++ b/resources/lang/pt-PT/admin/hardware/general.php @@ -3,7 +3,7 @@ return array( 'archived' => 'Arquivado', 'asset' => 'Ativo', - 'bulk_checkout' => 'Checkout Assets to User', + 'bulk_checkout' => 'Atribuir artigo a utilizador', 'checkin' => 'Devolver Ativo', 'checkout' => 'Alocar ativo ao utilizador', 'clone' => 'Clonar Ativo', diff --git a/resources/lang/pt-PT/admin/hardware/message.php b/resources/lang/pt-PT/admin/hardware/message.php index d874d8c852..45937f2ede 100644 --- a/resources/lang/pt-PT/admin/hardware/message.php +++ b/resources/lang/pt-PT/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Alguns itens não foram importados correctamente.', - 'errorDetail' => 'Os seguintes itens não foram importados devido a erros.', - 'success' => "O seu ficheiro foi importado", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Não foi possível alocar o artigo, por favor tente novamente', 'success' => 'Artigo alocado com sucesso.', - 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.' + 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/pt-PT/admin/models/table.php b/resources/lang/pt-PT/admin/models/table.php index ffaab53474..bdc73173a8 100644 --- a/resources/lang/pt-PT/admin/models/table.php +++ b/resources/lang/pt-PT/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Modelos de Artigo', 'update' => 'Atualizar Modelo de Artigo', 'view' => 'Ver Modelo de Artigo', - 'update' => 'Atualizar Modelo de Artigo', + 'update' => 'Atualizar Modelo', 'clone' => 'Clonar Modelo', 'edit' => 'Editar Modelo', ); diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php index 28b8ea7384..02e7116f4a 100644 --- a/resources/lang/pt-PT/admin/settings/general.php +++ b/resources/lang/pt-PT/admin/settings/general.php @@ -2,9 +2,9 @@ return array( 'ad' => 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', + 'ad_domain' => 'Dominio do Active Directory', + 'ad_domain_help' => 'Em alguns casos isto e o mesmo que o dominio de email, mas nem sempre.', + 'is_ad' => 'Isto é um servidor do Active Directoriy', 'alert_email' => 'Enviar alertas para', 'alerts_enabled' => 'Alertas ativos', 'alert_interval' => 'Alertas expiram (em dias)', @@ -41,16 +41,18 @@ return array( 'ldap_integration' => 'Integração LDAP', 'ldap_settings' => 'Configurações LDAP', 'ldap_server' => 'Servidor LDAP', - 'ldap_server_help' => 'This should start with ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)', + 'ldap_server_help' => 'Isso deve começar com ldap: / / (para não-criptado ou TLS) ou ldaps: / / (para SSL)', 'ldap_server_cert' => 'Validação certificado SSL LDAP', 'ldap_server_cert_ignore' => 'Permitir certificado SSL inválido', 'ldap_server_cert_help' => 'Seleccione esta opção se está a usar um certificado SSL auto-assinado e desejar aceitar um certificado SSL inválido.', - 'ldap_tls' => 'Use TLS', - 'ldap_tls_help' => 'This should be checked only if you are running STARTTLS on your LDAP server. ', + 'ldap_tls' => 'Usar TLS', + 'ldap_tls_help' => 'Isto só deve ser escolhido se estiver a correr STARTTLS no seu servidor LDAP. ', 'ldap_uname' => 'Utilizador bind LDAP', 'ldap_pword' => 'Password bind LDAP', 'ldap_basedn' => 'Base bind DN', 'ldap_filter' => 'Filtro LDAP', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Campo nome de utilizador', 'ldap_lname_field' => 'Campo Último nome', 'ldap_fname_field' => 'Campo Primeiro nome', diff --git a/resources/lang/pt-PT/admin/statuslabels/table.php b/resources/lang/pt-PT/admin/statuslabels/table.php index 032e2b3702..f201c816f1 100644 --- a/resources/lang/pt-PT/admin/statuslabels/table.php +++ b/resources/lang/pt-PT/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Acerca da Rótulos de Estados', 'archived' => 'Arquivado', 'create' => 'Criar Estado', + 'color' => 'Chart Color', 'deployable' => 'Implementável', 'info' => 'Estados são usados para descrever as várias situações em que os artigos se podem encontrar. Podem estar em reparação, perdidos/roubados, etc. É possível criar Estados para artigos implementáveis, pendentes ou arquivados.', 'name' => 'Nome do Estado', 'pending' => 'Pendente', 'status_type' => 'Tipo de Estado', + 'show_in_nav' => 'Show in side nav', 'title' => 'Estados', 'undeployable' => 'Não implementável', 'update' => 'Atualizar Estado', diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php index 13e6f8139a..9d67176ad0 100644 --- a/resources/lang/pt-PT/general.php +++ b/resources/lang/pt-PT/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Apagar imagem', 'image_upload' => 'Carregar Imagem', 'import' => 'Importar', + 'import-history' => 'Import History', 'asset_maintenance' => 'Manutenção de Artigo', 'asset_maintenance_report' => 'Relatório de Manutenção de Artigos', 'asset_maintenances' => 'Manutenções de Artigos', diff --git a/resources/lang/ro/admin/custom_fields/general.php b/resources/lang/ro/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/ro/admin/custom_fields/general.php +++ b/resources/lang/ro/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/ro/admin/hardware/message.php b/resources/lang/ro/admin/hardware/message.php index 9d01c7a6b0..87b6b08fb2 100644 --- a/resources/lang/ro/admin/hardware/message.php +++ b/resources/lang/ro/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Activul nu a fost predat, va rugam incercati iar', 'success' => 'Activul a fost predat.', - 'user_does_not_exist' => 'Utilizatorul este invalid. Va rugam incercati iar.' + 'user_does_not_exist' => 'Utilizatorul este invalid. Va rugam incercati iar.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php index 16b4b26dfc..e3284ef076 100644 --- a/resources/lang/ro/admin/settings/general.php +++ b/resources/lang/ro/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/ro/admin/statuslabels/table.php b/resources/lang/ro/admin/statuslabels/table.php index 6c310ad74a..f7644f99a0 100644 --- a/resources/lang/ro/admin/statuslabels/table.php +++ b/resources/lang/ro/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Despre etichete status', 'archived' => 'Arhivat', 'create' => 'Creeaza eticheta status', + 'color' => 'Chart Color', 'deployable' => 'Lansabil', 'info' => 'Etichetele de status sunt folosite pentru a descrie diferite statusuri in care se pot afla activele. Ele pot fi trimise la reparat, pierdut/furat, etc. Poti crea noi etichete de status pentru active lansabile, in asteptare sau arhivate.', 'name' => 'Nume status', 'pending' => 'In asteptare', 'status_type' => 'Tip status', + 'show_in_nav' => 'Show in side nav', 'title' => 'Etichete status', 'undeployable' => 'Nelansabil', 'update' => 'Actualizeaza eticheta status', diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php index 4a4239f7b4..7ba175f7ed 100644 --- a/resources/lang/ro/general.php +++ b/resources/lang/ro/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Sterge poza', 'image_upload' => 'Incarca poza', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Mentenanta produs', 'asset_maintenance_report' => 'Raport privind mentenanta produsului', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/ru/admin/custom_fields/general.php b/resources/lang/ru/admin/custom_fields/general.php index a5cf0239a9..23eded9d58 100644 --- a/resources/lang/ru/admin/custom_fields/general.php +++ b/resources/lang/ru/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Поле', 'about_fieldsets_title' => 'О наборах полей', 'about_fieldsets_text' => 'Наборы полей позволяют вам создать группы пользовательских полей, которые часто используются для конкретных моделей автивов.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Набор полей', 'qty_fields' => 'Кол-во полей', 'fieldsets' => 'Наборы полей', 'fieldset_name' => 'Имя набора', 'field_name' => 'Имя поля', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Элемент формы', 'field_element_short' => 'Элемент', 'field_format' => 'Формат', diff --git a/resources/lang/ru/admin/hardware/message.php b/resources/lang/ru/admin/hardware/message.php index c56e7be4db..1f555ca979 100644 --- a/resources/lang/ru/admin/hardware/message.php +++ b/resources/lang/ru/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Некоторые элементы не были импортированы корректно.', - 'errorDetail' => 'Следующие элементы не были импортированы из за ошибок.', - 'success' => "Ваш файл был импортирован", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Актив не был привязан, пожалуйста попробуйте снова', 'success' => 'Актив успешно привязан.', - 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.' + 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/ru/admin/settings/general.php b/resources/lang/ru/admin/settings/general.php index fa93d49e18..1068769b65 100644 --- a/resources/lang/ru/admin/settings/general.php +++ b/resources/lang/ru/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'Пароль LDAP Bind', 'ldap_basedn' => 'Основной Bind DN', 'ldap_filter' => 'Фильтр LDAP', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Поле имени пользователя', 'ldap_lname_field' => 'Фамилия', 'ldap_fname_field' => 'LDAP Имя', diff --git a/resources/lang/ru/admin/statuslabels/table.php b/resources/lang/ru/admin/statuslabels/table.php index bc36fb8983..99496d6907 100644 --- a/resources/lang/ru/admin/statuslabels/table.php +++ b/resources/lang/ru/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Справка по статусам активов', 'archived' => 'Архивные', 'create' => 'Создать статус актива', + 'color' => 'Chart Color', 'deployable' => 'Доступные', 'info' => 'Статус активов необходим для отслеживания состояния активов. Активы могут быть утеряны, находится в сервисных центрах, в архиве либо быть готовыми к использованию.', 'name' => 'Название статуса', 'pending' => 'Ожидающие', 'status_type' => 'Тип статуса', + 'show_in_nav' => 'Show in side nav', 'title' => 'Статус активов', 'undeployable' => 'Недоступные', 'update' => 'Изменить статус актива', diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php index e40e1c45d9..1c63f5877d 100644 --- a/resources/lang/ru/general.php +++ b/resources/lang/ru/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Удалить изображение', 'image_upload' => 'Загрузить изображение', 'import' => 'Импорт', + 'import-history' => 'Import History', 'asset_maintenance' => 'Обслуживание', 'asset_maintenance_report' => 'Отчет по обслуживанию', 'asset_maintenances' => 'Активы на обслуживании', diff --git a/resources/lang/sv-SE/admin/accessories/general.php b/resources/lang/sv-SE/admin/accessories/general.php index 022a88bd43..74867d3284 100644 --- a/resources/lang/sv-SE/admin/accessories/general.php +++ b/resources/lang/sv-SE/admin/accessories/general.php @@ -6,11 +6,11 @@ return array( 'accessory_category' => 'Tillbehörs Kategori', 'accessory_name' => 'Tillbehörs Namn', 'cost' => 'Inköpspris', - 'checkout' => 'Checkout Accessory', - 'checkin' => 'Checkin Accessory', + 'checkout' => 'Checka ut tillbehör', + 'checkin' => 'Checka in tillbehör', 'create' => 'Skapa tillbehör', 'date' => 'Inköpsdatum', - 'edit' => 'Edit Accessory', + 'edit' => 'Redigera tillbehär', 'eula_text' => 'Kategori EULA', 'eula_text_help' => 'Det här fältet tillåter att du ändrar din EULA för specifika typer av tillgångar. Om du endast har en EULA för samtliga tillgångar så kan du kryssa i rutan nedan för att använda den.', 'require_acceptance' => 'Kräv att användare accepterar mottagande av inventarier i den här kategorin.', diff --git a/resources/lang/sv-SE/admin/accessories/message.php b/resources/lang/sv-SE/admin/accessories/message.php index 92998a4e14..db9034d950 100644 --- a/resources/lang/sv-SE/admin/accessories/message.php +++ b/resources/lang/sv-SE/admin/accessories/message.php @@ -2,35 +2,35 @@ return array( - 'does_not_exist' => 'The accessory does not exist.', - 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', + 'does_not_exist' => 'Tillbehöret finns inte.', + 'assoc_users' => 'Detta tillbehör har för närvarande :count objekt utcheckade till användare. Checka in tillbehöret och försök igen. ', 'create' => array( - 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' + 'error' => 'Tillbehöret skapades inte, vänligen försök igen.', + 'success' => 'Tillbehöret skapades.' ), 'update' => array( - 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' + 'error' => 'Tillbehöret uppdaterades inte, försök igen', + 'success' => 'Tillbehöret uppdaterades.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this accessory?', - 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' + 'confirm' => 'Är du säker på att du vill ta bort det här tillbehöret?', + 'error' => 'Ett problem uppstod då tillbehöret skulle tas bort. Vänligen försök igen.', + 'success' => 'Tillbehöret togs bort.' ), 'checkout' => array( - 'error' => 'Accessory was not checked out, please try again', - 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Tillbehöret checkades inte ut. Vänligen försök igen', + 'success' => 'Tillbehöret checkades ut.', + 'user_does_not_exist' => 'Användaren är ogiltig. Försök igen.' ), 'checkin' => array( - 'error' => 'Accessory was not checked in, please try again', - 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => 'Tillbehöret checkades inte in. Vänligen försök igen', + 'success' => 'Tillbehöret checkades in.', + 'user_does_not_exist' => 'Användaren är ogiltig. Försök igen.' ) diff --git a/resources/lang/sv-SE/admin/asset_maintenances/table.php b/resources/lang/sv-SE/admin/asset_maintenances/table.php index 48605d1e9f..bb76ecb542 100644 --- a/resources/lang/sv-SE/admin/asset_maintenances/table.php +++ b/resources/lang/sv-SE/admin/asset_maintenances/table.php @@ -1,7 +1,7 @@ 'Asset Maintenance', + 'title' => 'Inventarieunderhåll', 'asset_name' => 'Inventarie', 'supplier_name' => 'Leverantör', 'is_warranty' => 'Garanti', diff --git a/resources/lang/sv-SE/admin/categories/table.php b/resources/lang/sv-SE/admin/categories/table.php index f9e9a97a8c..d8e00749d1 100644 --- a/resources/lang/sv-SE/admin/categories/table.php +++ b/resources/lang/sv-SE/admin/categories/table.php @@ -4,7 +4,7 @@ return array( 'eula_text' => 'EULA', 'id' => 'ID', 'parent' => 'Förälder', - 'require_acceptance' => 'Acceptance', + 'require_acceptance' => 'Godkännande', 'title' => 'Tillgångskategori', ); diff --git a/resources/lang/sv-SE/admin/consumables/general.php b/resources/lang/sv-SE/admin/consumables/general.php index f20c1e3ccd..00d1d3156b 100644 --- a/resources/lang/sv-SE/admin/consumables/general.php +++ b/resources/lang/sv-SE/admin/consumables/general.php @@ -7,7 +7,7 @@ return array( 'cost' => 'Inköpspris', 'create' => 'Skapa förbrukningvara', 'date' => 'Inköpsdatum', - 'item_no' => 'Item No.', + 'item_no' => 'Artikelnummer', 'order' => 'Beställningsnummer', 'remaining' => 'Återstående', 'total' => 'Totalt', diff --git a/resources/lang/sv-SE/admin/custom_fields/general.php b/resources/lang/sv-SE/admin/custom_fields/general.php index 7182fecfdc..3fa6cdcfca 100644 --- a/resources/lang/sv-SE/admin/custom_fields/general.php +++ b/resources/lang/sv-SE/admin/custom_fields/general.php @@ -1,23 +1,28 @@ 'Custom Fields', - 'field' => 'Field', - 'about_fieldsets_title' => 'About Fieldsets', - 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', - 'fieldset' => 'Fieldset', - 'qty_fields' => 'Qty Fields', - 'fieldsets' => 'Fieldsets', - 'fieldset_name' => 'Fieldset Name', - 'field_name' => 'Field Name', - 'field_element' => 'Form Element', + 'custom_fields' => 'Anpassade fält', + 'field' => 'Fält', + 'about_fieldsets_title' => 'Om fältsamlingar', + 'about_fieldsets_text' => 'Fältsamlingar låter dig skapa grupper av anpassade fält som ofta används för specifika modelltyper av inventarier.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', + 'fieldset' => 'Fältsamling', + 'qty_fields' => 'Antal fält', + 'fieldsets' => 'Fältsamlingar', + 'fieldset_name' => 'Namn på fältsamling', + 'field_name' => 'Fältnamn', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', + 'field_element' => 'Formulärelement', 'field_element_short' => 'Element', 'field_format' => 'Format', - 'field_custom_format' => 'Custom Format', - 'required' => 'Required', - 'req' => 'Req.', - 'used_by_models' => 'Used By Models', - 'order' => 'Order', - 'create_fieldset' => 'New Fieldset', - 'create_field' => 'New Custom Field', + 'field_custom_format' => 'Anpassat format', + 'required' => 'Krävs', + 'req' => 'Obl.', + 'used_by_models' => 'Används av modeller', + 'order' => 'Sortering', + 'create_fieldset' => 'Ny fältsamling', + 'create_field' => 'Nytt anpassat fält', ); diff --git a/resources/lang/sv-SE/admin/depreciations/general.php b/resources/lang/sv-SE/admin/depreciations/general.php index e0142ef0a9..77ed0d5466 100644 --- a/resources/lang/sv-SE/admin/depreciations/general.php +++ b/resources/lang/sv-SE/admin/depreciations/general.php @@ -2,8 +2,8 @@ return array( 'about_asset_depreciations' => 'Om tillgångsavskrivningar', - 'about_depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.', - 'asset_depreciations' => 'Asset Depreciations', + 'about_depreciations' => 'Du kan ställa in inventarieavskrivningar baserat på linjär avskrivning.', + 'asset_depreciations' => 'Avskrivningar av inventarier', 'create_depreciation' => 'Skapa Avskrivning', 'depreciation_name' => 'Avskrivningsnamn', 'number_of_months' => 'Antal Månader', diff --git a/resources/lang/sv-SE/admin/hardware/message.php b/resources/lang/sv-SE/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/sv-SE/admin/hardware/message.php +++ b/resources/lang/sv-SE/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/sv-SE/admin/locations/message.php b/resources/lang/sv-SE/admin/locations/message.php index 3ba1eed3b6..1f1147f0a8 100644 --- a/resources/lang/sv-SE/admin/locations/message.php +++ b/resources/lang/sv-SE/admin/locations/message.php @@ -2,26 +2,26 @@ return array( - 'does_not_exist' => 'Location does not exist.', - 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ', - 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ', - 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ', + 'does_not_exist' => 'Platsen finns inte.', + 'assoc_users' => 'Platsen är associerad med minst en användare och kan inte tas bort. Vänligen uppdatera dina användare så dom inte refererar till denna plats och försök igen.', + 'assoc_assets' => 'Platsen är associerad med minst en inventarie och kan inte tas bort. Vänligen uppdatera dina inventarier så dom inte refererar till denna plats och försök igen. ', + 'assoc_child_loc' => 'Denna plats är för närvarande överliggande för minst en annan plats och kan inte tas bort. Vänligen uppdatera dina platser så dom inte längre refererar till denna och försök igen.', 'create' => array( - 'error' => 'Location was not created, please try again.', - 'success' => 'Location created successfully.' + 'error' => 'Platsen kunde inte skapas. Vänligen försök igen.', + 'success' => 'Platsen skapades.' ), 'update' => array( - 'error' => 'Location was not updated, please try again', - 'success' => 'Location updated successfully.' + 'error' => 'Platsen kunde inte uppdateras. Vänligen försök igen', + 'success' => 'Platsen uppdaterades.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this location?', - 'error' => 'There was an issue deleting the location. Please try again.', - 'success' => 'The location was deleted successfully.' + 'confirm' => 'Är du säker du vill ta bort denna plats?', + 'error' => 'Ett fel inträffade när denna plats skulle tas bort. Vänligen försök igen.', + 'success' => 'Platsen har tagits bort.' ) ); diff --git a/resources/lang/sv-SE/admin/models/general.php b/resources/lang/sv-SE/admin/models/general.php index 6433dbb65f..7d87b5a834 100644 --- a/resources/lang/sv-SE/admin/models/general.php +++ b/resources/lang/sv-SE/admin/models/general.php @@ -4,10 +4,10 @@ return array( 'deleted' => 'Den här modellen har tagits bort. Klicka här för att återskapa.', 'restore' => 'Återskapa Modell', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Visa fältet MAC-adress för inventarier av denna modell', 'view_deleted' => 'Visa Borttagna', 'view_models' => 'Visa Modeller', - 'fieldset' => 'Fieldset', - 'no_custom_field' => 'No custom fields', + 'fieldset' => 'Fältsamling', + 'no_custom_field' => 'Inga anpassade fält', ); diff --git a/resources/lang/sv-SE/admin/models/table.php b/resources/lang/sv-SE/admin/models/table.php index 2b66014407..7d3cee918e 100644 --- a/resources/lang/sv-SE/admin/models/table.php +++ b/resources/lang/sv-SE/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Inventarie Modell', 'update' => 'Uppdatera Inventarie Modell', 'view' => 'View Asset Model', - 'update' => 'Uppdatera Inventarie Modell', + 'update' => 'Uppdatera Modell', 'clone' => 'Kopiera Modell', 'edit' => 'Ändra Modell', ); diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php index 623b000605..2c50795a5c 100644 --- a/resources/lang/sv-SE/admin/settings/general.php +++ b/resources/lang/sv-SE/admin/settings/general.php @@ -2,39 +2,39 @@ return array( 'ad' => 'Active Directory', - 'ad_domain' => 'Active Directory domain', - 'ad_domain_help' => 'This is sometimes the same as your email domain, but not always.', - 'is_ad' => 'This is an Active Directory server', - 'alert_email' => 'Send alerts to', - 'alerts_enabled' => 'Alerts Enabled', + 'ad_domain' => 'Active Directory-domän', + 'ad_domain_help' => 'Detta är ibland samma som din e-post domän, men inte alltid.', + 'is_ad' => 'Detta är en Active Directory-server', + 'alert_email' => 'Skicka larm till', + 'alerts_enabled' => 'Larm aktivt', 'alert_interval' => 'Expiring Alerts Threshold (in days)', 'alert_inv_threshold' => 'Inventory Alert Threshold', - 'asset_ids' => 'Asset IDs', - 'auto_increment_assets' => 'Generate auto-incrementing asset IDs', - 'auto_increment_prefix' => 'Prefix (optional)', + 'asset_ids' => 'Inventarienummer', + 'auto_increment_assets' => 'Generera automatiskt stigande inventarienummer', + 'auto_increment_prefix' => 'Prefix (frivilligt)', 'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this', - 'backups' => 'Backups', - 'barcode_settings' => 'Barcode Settings', - 'confirm_purge' => 'Confirm Purge', - 'confirm_purge_help' => 'Enter the text "DELETE" in the box below to purge your deleted records. This action cannot be undone.', - 'custom_css' => 'Custom CSS', - 'custom_css_help' => 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.', - 'default_currency' => 'Default Currency', - 'default_eula_text' => 'Default EULA', - 'default_language' => 'Default Language', + 'backups' => 'Säkerhetskopior', + 'barcode_settings' => 'Streckkodsinställningar', + 'confirm_purge' => 'Bekräfta tömning', + 'confirm_purge_help' => 'Skriv texten "DELETE" i fältet nedan för att tömma dina borttagna poster. Detta går ej att ångra.', + 'custom_css' => 'Anpassad CSS', + 'custom_css_help' => 'Fyll i eventuella anpassade CSS-överskridningar du vill använda. Inkludera inte <style></style> taggar.', + 'default_currency' => 'Standardvaluta', + 'default_eula_text' => 'Standard EULA', + 'default_language' => 'Standardspråk', 'default_eula_help_text' => 'You can also associate custom EULAs to specific asset categories.', - 'display_asset_name' => 'Display Asset Name', - 'display_checkout_date' => 'Display Checkout Date', - 'display_eol' => 'Display EOL in table view', - 'display_qr' => 'Display Square Codes', + 'display_asset_name' => 'Visa inventarienamn', + 'display_checkout_date' => 'Visa utcheckningsdatum', + 'display_eol' => 'Visa EOL i tabellvy', + 'display_qr' => 'Visa QR-koder', 'display_alt_barcode' => 'Display 1D barcode', 'barcode_type' => '2D Barcode Type', 'alt_barcode_type' => '1D barcode type', 'eula_settings' => 'EULA Settings', 'eula_markdown' => 'This EULA allows Github flavored markdown.', - 'general_settings' => 'General Settings', - 'generate_backup' => 'Generate Backup', - 'header_color' => 'Header Color', + 'general_settings' => 'Allmänna inställningar', + 'generate_backup' => 'Skapa säkerhetskopia', + 'header_color' => 'Sidhuvudets färg', 'info' => 'These settings let you customize certain aspects of your installation.', 'laravel' => 'Laravel Version', 'ldap_enabled' => 'LDAP enabled', @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/sv-SE/admin/statuslabels/table.php b/resources/lang/sv-SE/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/sv-SE/admin/statuslabels/table.php +++ b/resources/lang/sv-SE/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/sv-SE/auth/message.php b/resources/lang/sv-SE/auth/message.php index f553a5891b..848db7cd75 100644 --- a/resources/lang/sv-SE/auth/message.php +++ b/resources/lang/sv-SE/auth/message.php @@ -3,7 +3,7 @@ return array( 'account_already_exists' => 'Ett konto med denna epostadressen finns redan.', - 'account_not_found' => 'The username or password is incorrect.', + 'account_not_found' => 'Användarnamnet eller lösenordet är felaktigt.', 'account_not_activated' => 'Detta användarkonto är inte aktiverat.', 'account_suspended' => 'Detta användarkontot har blivit suspenderat.', 'account_banned' => 'Detta användarkontot har blivit avstängt.', diff --git a/resources/lang/sv-SE/button.php b/resources/lang/sv-SE/button.php index 2528d08a6f..276678c1e8 100644 --- a/resources/lang/sv-SE/button.php +++ b/resources/lang/sv-SE/button.php @@ -3,14 +3,14 @@ return array( 'actions' => 'Åtgärder', - 'add' => 'Add New', - 'cancel' => 'Cancel', - 'checkin_and_delete' => 'Checkin & Delete User', + 'add' => 'Lägg till ny', + 'cancel' => 'Avbryt', + 'checkin_and_delete' => 'Checka in & radera användare', 'delete' => 'Radera', 'edit' => 'Ändra', 'restore' => 'Återställ', - 'request' => 'Request', + 'request' => 'Begäran', 'submit' => 'Skicka', - 'upload' => 'Upload', + 'upload' => 'Ladda upp', ); diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php index 23a9309a5d..fe1a4e79f4 100644 --- a/resources/lang/sv-SE/general.php +++ b/resources/lang/sv-SE/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Ta bort Bild', 'image_upload' => 'Ladda upp Bild', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/th/admin/custom_fields/general.php b/resources/lang/th/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/th/admin/custom_fields/general.php +++ b/resources/lang/th/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/th/admin/hardware/message.php b/resources/lang/th/admin/hardware/message.php index 51927e9b3a..0f08562392 100644 --- a/resources/lang/th/admin/hardware/message.php +++ b/resources/lang/th/admin/hardware/message.php @@ -36,9 +36,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -51,7 +51,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/th/admin/settings/general.php b/resources/lang/th/admin/settings/general.php index b2916670f8..91897a21af 100644 --- a/resources/lang/th/admin/settings/general.php +++ b/resources/lang/th/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/th/admin/statuslabels/table.php b/resources/lang/th/admin/statuslabels/table.php index 307a33c75d..90a3702e1d 100644 --- a/resources/lang/th/admin/statuslabels/table.php +++ b/resources/lang/th/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'เกี่ยวกับป้ายสถานะ', 'archived' => 'ที่เก็บถาวร', 'create' => 'สร้างป้ายสถานะ', + 'color' => 'Chart Color', 'deployable' => 'สามารถใช้งานได้', 'info' => 'ป้ายสถานะใช้สำหรับบ่งบอกสถานะของสินทรัพย์ของคุณว่าอยู่ในสถานะใด ซึ่งอาจจะอยู่สถานะ เช่น ซ่อมแซม สูญหาย ถูกขโมย เป็นต้น คุณสามารถสร้างป้ายสถานะสำหรับ สามารถใช้งานได้ หรืออยู่ในระหว่างการดำเนินการ หรือ ถูกเก็บไว้ถาวร', 'name' => 'ชื่อสถานะ', 'pending' => 'อยู่ระหว่างดำเนินการ', 'status_type' => 'ประเภทสถานะ', + 'show_in_nav' => 'Show in side nav', 'title' => 'ป้ายสถานะ', 'undeployable' => 'ไม่สามารถนำไปใช้งานได้', 'update' => 'ปรับปรุงป้ายสถานะ', diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php index 91dfc0ecba..905d2a3e2b 100644 --- a/resources/lang/th/general.php +++ b/resources/lang/th/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'ลบรูปภาพประจำตัว', 'image_upload' => 'อัพโหลดภาพ', 'import' => 'นำเข้า', + 'import-history' => 'Import History', 'asset_maintenance' => 'การซ่อมบำรุงสินทรัพย์', 'asset_maintenance_report' => 'รายงานการซ่อมบำรุงสินทรัพย์', 'asset_maintenances' => 'ซ่อมบำรุงสินทรัพย์', diff --git a/resources/lang/tr/admin/custom_fields/general.php b/resources/lang/tr/admin/custom_fields/general.php index 50f43472e5..92b8892f7a 100644 --- a/resources/lang/tr/admin/custom_fields/general.php +++ b/resources/lang/tr/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Alan', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Miktar alanları', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Alan Adı', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Düzen', diff --git a/resources/lang/tr/admin/hardware/message.php b/resources/lang/tr/admin/hardware/message.php index 61e35ff9b3..e0045e7f4c 100644 --- a/resources/lang/tr/admin/hardware/message.php +++ b/resources/lang/tr/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Demirbaş çıkışı yapılamadı. Lütfen tekrar deneyin', 'success' => 'Demirbaş çıkışı yapıldı.', - 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.' + 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php index f7706bcd83..b4bd91d794 100644 --- a/resources/lang/tr/admin/settings/general.php +++ b/resources/lang/tr/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/tr/admin/statuslabels/table.php b/resources/lang/tr/admin/statuslabels/table.php index 74c653ca66..215479bbb0 100644 --- a/resources/lang/tr/admin/statuslabels/table.php +++ b/resources/lang/tr/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Durum Etiketi Hakkında', 'archived' => 'Arşivlenmiş', 'create' => 'Durum Etiketi Oluştur', + 'color' => 'Chart Color', 'deployable' => 'Dağıtılabilir', 'info' => 'Durum Etiketleri demirbaşınızın o anki durumunu tanımlamada kullanılır. Demirbaşınız o an onarımda ya da kayıp/çalınmış olabilir. Dağıtılabilir, Beklemede ve Arşivlenmiş demirbaşlarınız için yeni durum etiketleri oluşturabilirsiniz.', 'name' => 'Durum Adı', 'pending' => 'Beklemede', 'status_type' => 'Durum Türü', + 'show_in_nav' => 'Show in side nav', 'title' => 'Durum Etiketleri', 'undeployable' => 'Dağtılamaz', 'update' => 'Durum Etiketi Güncelle', diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php index 25354e9dce..7be19bae7d 100644 --- a/resources/lang/tr/general.php +++ b/resources/lang/tr/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Delete Image', 'image_upload' => 'Upload Image', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/vi/admin/custom_fields/general.php b/resources/lang/vi/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/vi/admin/custom_fields/general.php +++ b/resources/lang/vi/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/vi/admin/hardware/message.php b/resources/lang/vi/admin/hardware/message.php index 96057582a5..47f6fa20cd 100644 --- a/resources/lang/vi/admin/hardware/message.php +++ b/resources/lang/vi/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Tài sản chưa được checkout, xin vui lòng thử lại', 'success' => 'Tài sản đã checkout thành công.', - 'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.' + 'user_does_not_exist' => 'Người dùng này không tồn tại. Bạn hãy thử lại.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/vi/admin/settings/general.php b/resources/lang/vi/admin/settings/general.php index 90e87263ec..0eb0644a04 100644 --- a/resources/lang/vi/admin/settings/general.php +++ b/resources/lang/vi/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/vi/admin/statuslabels/table.php b/resources/lang/vi/admin/statuslabels/table.php index cc6e269eb6..c12b913bb8 100644 --- a/resources/lang/vi/admin/statuslabels/table.php +++ b/resources/lang/vi/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'Về tình trạng nhãn', 'archived' => 'Đã lưu trữ', 'create' => 'Tạo tình trạng nhãn', + 'color' => 'Chart Color', 'deployable' => 'Cho phép cấp phát', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Tên tình trạng', 'pending' => 'Đang chờ', 'status_type' => 'Loại tình trạng', + 'show_in_nav' => 'Show in side nav', 'title' => 'Nhãn tình trạng', 'undeployable' => 'Không cho phép cấp phát', 'update' => 'Cập nhật tình trạng nhãn', diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php index 8bd00afc62..f3757df518 100644 --- a/resources/lang/vi/general.php +++ b/resources/lang/vi/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Xóa hình', 'image_upload' => 'Tải hình', 'import' => 'Nhập', + 'import-history' => 'Import History', 'asset_maintenance' => 'Tài sản đang bảo trì', 'asset_maintenance_report' => 'Báo cáo tài sản bảo trì', 'asset_maintenances' => 'Tài sản đang bảo trì', diff --git a/resources/lang/zh-CN/admin/custom_fields/general.php b/resources/lang/zh-CN/admin/custom_fields/general.php index 605ad526be..6f29aa6b07 100644 --- a/resources/lang/zh-CN/admin/custom_fields/general.php +++ b/resources/lang/zh-CN/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => '字段', 'about_fieldsets_title' => '关于字段集', 'about_fieldsets_text' => '字段集允许你为常用的资产模型定义一组可重用的字段。', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => '字段集', 'qty_fields' => '字段', 'fieldsets' => '字段集', 'fieldset_name' => '名称', 'field_name' => '名称', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => '表单元素', 'field_element_short' => '表单元素', 'field_format' => '格式', diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php index 8cbd67f677..2b2196def7 100644 --- a/resources/lang/zh-CN/admin/hardware/message.php +++ b/resources/lang/zh-CN/admin/hardware/message.php @@ -36,9 +36,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -51,7 +51,8 @@ return array( 'checkout' => array( 'error' => '资产未被借出，请重试', 'success' => '资产借出成功。', - 'user_does_not_exist' => '无效用户，请重试。' + 'user_does_not_exist' => '无效用户，请重试。', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php index 2b73379b9d..4244483db0 100644 --- a/resources/lang/zh-CN/admin/settings/general.php +++ b/resources/lang/zh-CN/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP 密码', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP 过滤器', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => '用户名字段', 'ldap_lname_field' => '姓氏', 'ldap_fname_field' => 'LDAP用户名字字段', diff --git a/resources/lang/zh-CN/admin/statuslabels/table.php b/resources/lang/zh-CN/admin/statuslabels/table.php index 930bfbb68d..29a61bd032 100644 --- a/resources/lang/zh-CN/admin/statuslabels/table.php +++ b/resources/lang/zh-CN/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => '关于状态标签', 'archived' => '已存档', 'create' => '创建状态标签', + 'color' => 'Chart Color', 'deployable' => '可领用', 'info' => '状态标签用于描述资产的各种状态（例如送外维修、丢失、被窃等等）。你可以为处于可部署、待处理或已存档的资产创建新的状态标签。 ', 'name' => '状态名称', 'pending' => '待处理', 'status_type' => '状态类型', + 'show_in_nav' => 'Show in side nav', 'title' => '状态标签', 'undeployable' => '无法部署', 'update' => '更新状态标签', diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php index 8cdf9ae97e..8338bad35f 100644 --- a/resources/lang/zh-CN/general.php +++ b/resources/lang/zh-CN/general.php @@ -76,6 +76,7 @@ 'image_delete' => '删除图片', 'image_upload' => '上传图片', 'import' => '导入', + 'import-history' => 'Import History', 'asset_maintenance' => '资产维修', 'asset_maintenance_report' => '资产维修报表', 'asset_maintenances' => '资产维修', diff --git a/resources/lang/zh-TW/admin/accessories/general.php b/resources/lang/zh-TW/admin/accessories/general.php index 647a1a9a2b..593a651d70 100644 --- a/resources/lang/zh-TW/admin/accessories/general.php +++ b/resources/lang/zh-TW/admin/accessories/general.php @@ -2,25 +2,25 @@ return array( 'about_accessories_title' => '關於配件', - 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', - 'accessory_category' => 'Accessory Category', + 'about_accessories_text' => '配件是你分派給使用者，但不包含序號(或你不需要追蹤唯一性) 的物品。例如：滑鼠或鍵盤', + 'accessory_category' => '配件類別', 'accessory_name' => '配件名稱', 'cost' => '採購成本', - 'checkout' => 'Checkout Accessory', - 'checkin' => 'Checkin Accessory', + 'checkout' => '配件借出', + 'checkin' => '配件繳回', 'create' => '新增配件', 'date' => '購買日期', 'edit' => '編輯配件', - 'eula_text' => 'Category EULA', - 'eula_text_help' => 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.', - 'require_acceptance' => 'Require users to confirm acceptance of assets in this category.', - 'no_default_eula' => 'No primary default EULA found. Add one in Settings.', - 'order' => 'Order Number', - 'qty' => 'QTY', - 'total' => 'Total', - 'remaining' => 'Avail', - 'update' => 'Update Accessory', - 'use_default_eula' => 'Use the primary default EULA instead.', - 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.', + 'eula_text' => '類別的最終使用者許可協議', + 'eula_text_help' => '此欄位允許您為特定資產自定EULA（最終使用者許可協議）。如果您所有資產只有一個EULA（最終使用者許可協議），您可以勾選下方選項設為預設。', + 'require_acceptance' => '需要使用者確認接受此類資產', + 'no_default_eula' => '沒有找到預設EULA（最終使用者許可協議）。請在設定中增加一個。', + 'order' => '訂單編號', + 'qty' => '數量', + 'total' => '總計', + 'remaining' => '可用', + 'update' => '更新配件', + 'use_default_eula' => '用預設EULA（最終使用者許可協議）進行替換', + 'use_default_eula_disabled' => '使用預設EULA（最終使用者許可協議）沒有設定預設EULA（最終使用者許可協議），請在設定中新增一個。', ); diff --git a/resources/lang/zh-TW/admin/accessories/message.php b/resources/lang/zh-TW/admin/accessories/message.php index 92998a4e14..470f8bcafe 100644 --- a/resources/lang/zh-TW/admin/accessories/message.php +++ b/resources/lang/zh-TW/admin/accessories/message.php @@ -2,35 +2,35 @@ return array( - 'does_not_exist' => 'The accessory does not exist.', - 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ', + 'does_not_exist' => '配件不存在', + 'assoc_users' => '使用者目前已借出 :count 組配件。請在繳回配件後重試。 ', 'create' => array( - 'error' => 'The accessory was not created, please try again.', - 'success' => 'The accessory was successfully created.' + 'error' => '新增配件失敗，請重試。', + 'success' => '新增配件成功。' ), 'update' => array( - 'error' => 'The accessory was not updated, please try again', - 'success' => 'The accessory was updated successfully.' + 'error' => '更新配件失敗，請重試。', + 'success' => '更新配件成功。' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this accessory?', - 'error' => 'There was an issue deleting the accessory. Please try again.', - 'success' => 'The accessory was deleted successfully.' + 'confirm' => '您確定要刪除此配件嗎？', + 'error' => '刪除配件時發生問題。請再試一次。', + 'success' => '配件已刪除。' ), 'checkout' => array( - 'error' => 'Accessory was not checked out, please try again', - 'success' => 'Accessory checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => '配件借出失敗。請再試一次。', + 'success' => '借出配件成功。', + 'user_does_not_exist' => '使用者不正確。請再試一次。' ), 'checkin' => array( - 'error' => 'Accessory was not checked in, please try again', - 'success' => 'Accessory checked in successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'error' => '配件繳回失敗。請再試一次。', + 'success' => '繳回配件成功。', + 'user_does_not_exist' => '使用者不正確。請再試一次。' ) diff --git a/resources/lang/zh-TW/admin/accessories/table.php b/resources/lang/zh-TW/admin/accessories/table.php index e02d9f22e4..b6156018be 100644 --- a/resources/lang/zh-TW/admin/accessories/table.php +++ b/resources/lang/zh-TW/admin/accessories/table.php @@ -1,11 +1,11 @@ 'Download CSV', - 'eula_text' => 'EULA', + 'dl_csv' => '下載CSV檔', + 'eula_text' => '最終使用者許可協議', 'id' => 'ID', - 'require_acceptance' => 'Acceptance', - 'title' => 'Accessory Name', + 'require_acceptance' => '接收', + 'title' => '配件名稱', ); diff --git a/resources/lang/zh-TW/admin/asset_maintenances/form.php b/resources/lang/zh-TW/admin/asset_maintenances/form.php index 2aa005c45f..04a707e15e 100644 --- a/resources/lang/zh-TW/admin/asset_maintenances/form.php +++ b/resources/lang/zh-TW/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Maintenance Type', - 'title' => 'Title', - 'start_date' => 'Started', - 'completion_date' => 'Completed', - 'cost' => 'Cost', - 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Days', - 'notes' => 'Notes', - 'update' => 'Update', - 'create' => 'Create' + 'asset_maintenance_type' => '資產維護類型', + 'title' => '標題', + 'start_date' => '開始日期', + 'completion_date' => '完成日期', + 'cost' => '維護費用', + 'is_warranty' => '保固升級/延期', + 'asset_maintenance_time' => '資產維護所需天數', + 'notes' => '備註', + 'update' => '更新資產維護', + 'create' => '新建資產維護' ]; diff --git a/resources/lang/zh-TW/admin/asset_maintenances/general.php b/resources/lang/zh-TW/admin/asset_maintenances/general.php index c7ae42d41a..278ece3dfb 100644 --- a/resources/lang/zh-TW/admin/asset_maintenances/general.php +++ b/resources/lang/zh-TW/admin/asset_maintenances/general.php @@ -1,11 +1,11 @@ 'Asset Maintenances', - 'edit' => 'Edit Asset Maintenance', - 'delete' => 'Delete Asset Maintenance', - 'view' => 'View Asset Maintenance Details', - 'repair' => 'Repair', - 'maintenance' => 'Maintenance', - 'upgrade' => 'Upgrade' + 'asset_maintenances' => '資產維護', + 'edit' => '編輯資產維護', + 'delete' => '刪除資產維護', + 'view' => '檢視資產維護詳細資料', + 'repair' => '維修', + 'maintenance' => '維護', + 'upgrade' => '升級' ]; diff --git a/resources/lang/zh-TW/admin/asset_maintenances/message.php b/resources/lang/zh-TW/admin/asset_maintenances/message.php index ca4256efbe..078d55577d 100644 --- a/resources/lang/zh-TW/admin/asset_maintenances/message.php +++ b/resources/lang/zh-TW/admin/asset_maintenances/message.php @@ -1,17 +1,17 @@ 'Asset Maintenance you were looking for was not found!', + 'not_found' => '未找到您查詢的資產維護訊息！', 'delete' => [ - 'confirm' => 'Are you sure you wish to delete this asset maintenance?', - 'error' => 'There was an issue deleting the asset maintenance. Please try again.', - 'success' => 'The asset maintenance was deleted successfully.' + 'confirm' => '您確定要刪除此筆資產維護訊息嗎？', + 'error' => '資產維護訊息刪除失敗。請再試一次', + 'success' => '資產維護訊息已刪除。' ], 'create' => [ - 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'error' => '資產維護訊息新增失敗。請再試一次', + 'success' => '資產維護訊息已新增。' ], - 'asset_maintenance_incomplete' => 'Not Completed Yet', - 'warranty' => 'Warranty', - 'not_warranty' => 'Not Warranty', + 'asset_maintenance_incomplete' => '尚未完成', + 'warranty' => '保固', + 'not_warranty' => '無保固', ]; \ No newline at end of file diff --git a/resources/lang/zh-TW/admin/asset_maintenances/table.php b/resources/lang/zh-TW/admin/asset_maintenances/table.php index 5b83539914..de96c2e5df 100644 --- a/resources/lang/zh-TW/admin/asset_maintenances/table.php +++ b/resources/lang/zh-TW/admin/asset_maintenances/table.php @@ -1,9 +1,9 @@ 'Asset Maintenance', - 'asset_name' => 'Asset', - 'supplier_name' => 'Supplier', - 'is_warranty' => 'Warranty', - 'dl_csv' => 'Download CSV' + 'title' => '資產維護', + 'asset_name' => '資產名稱', + 'supplier_name' => '供應商', + 'is_warranty' => '保固', + 'dl_csv' => '下載CSV檔' ]; diff --git a/resources/lang/zh-TW/admin/categories/general.php b/resources/lang/zh-TW/admin/categories/general.php index 58967eda60..f67fd487b0 100644 --- a/resources/lang/zh-TW/admin/categories/general.php +++ b/resources/lang/zh-TW/admin/categories/general.php @@ -1,10 +1,10 @@ 'About Asset Categories', - 'about_categories' => 'Asset categories help you organize your assets. Some example categories might be "Desktops", "Laptops", "Mobile Phones", "Tablets", and so on, but you can use asset categories any way that makes sense for you.', - 'asset_categories' => 'Asset Categories', - 'category_name' => 'Category Name', + 'about_asset_categories' => '關於資產類別', + 'about_categories' => '資產類別可幫助您組織您的資產。例如：桌上型電腦、筆記型電腦、手機、平板...等，您可依需求自行定義類別。', + 'asset_categories' => '資產類別', + 'category_name' => '類別名稱', 'checkin_email' => 'Send email to user on checkin.', 'clone' => 'Clone Category', 'create' => 'Create Category', diff --git a/resources/lang/zh-TW/admin/custom_fields/general.php b/resources/lang/zh-TW/admin/custom_fields/general.php index 7182fecfdc..b0024f47c4 100644 --- a/resources/lang/zh-TW/admin/custom_fields/general.php +++ b/resources/lang/zh-TW/admin/custom_fields/general.php @@ -5,11 +5,16 @@ return array( 'field' => 'Field', 'about_fieldsets_title' => 'About Fieldsets', 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.', + 'custom_format' => 'Custom format...', + 'encrypt_field' => 'Encrypt the value of this field in the database', + 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.', 'fieldset' => 'Fieldset', 'qty_fields' => 'Qty Fields', 'fieldsets' => 'Fieldsets', 'fieldset_name' => 'Fieldset Name', 'field_name' => 'Field Name', + 'field_values' => 'Field Values', + 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.', 'field_element' => 'Form Element', 'field_element_short' => 'Element', 'field_format' => 'Format', diff --git a/resources/lang/zh-TW/admin/hardware/message.php b/resources/lang/zh-TW/admin/hardware/message.php index f5961b9367..26a5eec28f 100644 --- a/resources/lang/zh-TW/admin/hardware/message.php +++ b/resources/lang/zh-TW/admin/hardware/message.php @@ -37,9 +37,9 @@ return array( ), 'import' => array( - 'error' => 'Some Items did not import Correctly.', - 'errorDetail' => 'The Following Items were not imported because of errors.', - 'success' => "Your File has been imported", + 'error' => 'Some items did not import correctly.', + 'errorDetail' => 'The following Items were not imported because of errors.', + 'success' => "Your file has been imported", ), @@ -52,7 +52,8 @@ return array( 'checkout' => array( 'error' => 'Asset was not checked out, please try again', 'success' => 'Asset checked out successfully.', - 'user_does_not_exist' => 'That user is invalid. Please try again.' + 'user_does_not_exist' => 'That user is invalid. Please try again.', + 'not_available' => 'That asset is not available for checkout!' ), 'checkin' => array( diff --git a/resources/lang/zh-TW/admin/models/table.php b/resources/lang/zh-TW/admin/models/table.php index 11a512b3d3..6c364796f4 100644 --- a/resources/lang/zh-TW/admin/models/table.php +++ b/resources/lang/zh-TW/admin/models/table.php @@ -11,7 +11,7 @@ return array( 'title' => 'Asset Models', 'update' => 'Update Asset Model', 'view' => 'View Asset Model', - 'update' => 'Update Asset Model', + 'update' => 'Update Model', 'clone' => 'Clone Model', 'edit' => 'Edit Model', ); diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php index 623b000605..a365f803c1 100644 --- a/resources/lang/zh-TW/admin/settings/general.php +++ b/resources/lang/zh-TW/admin/settings/general.php @@ -51,6 +51,8 @@ return array( 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP Filter', + 'ldap_pw_sync' => 'LDAP Password Sync', + 'ldap_pw_sync_help' => 'Uncheck this box if you do not wish to keep LDAP passwords synced with local passwords. Disabling this means that your users may not be able to login if your LDAP server is unreachable for some reason.', 'ldap_username_field' => 'Username Field', 'ldap_lname_field' => 'Last Name', 'ldap_fname_field' => 'LDAP First Name', diff --git a/resources/lang/zh-TW/admin/statuslabels/table.php b/resources/lang/zh-TW/admin/statuslabels/table.php index dd21781115..b9b5b7ec4e 100644 --- a/resources/lang/zh-TW/admin/statuslabels/table.php +++ b/resources/lang/zh-TW/admin/statuslabels/table.php @@ -4,11 +4,13 @@ return array( 'about' => 'About Status Labels', 'archived' => 'Archived', 'create' => 'Create Status Label', + 'color' => 'Chart Color', 'deployable' => 'Deployable', 'info' => 'Status labels are used to describe the various states your assets could be in. They may be out for repair, lost/stolen, etc. You can create new status labels for deployable, pending and archived assets.', 'name' => 'Status Name', 'pending' => 'Pending', 'status_type' => 'Status Type', + 'show_in_nav' => 'Show in side nav', 'title' => 'Status Labels', 'undeployable' => 'Undeployable', 'update' => 'Update Status Label', diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php index e1d5eba5c3..0b6ef1fcb9 100644 --- a/resources/lang/zh-TW/general.php +++ b/resources/lang/zh-TW/general.php @@ -76,6 +76,7 @@ 'image_delete' => 'Delete Image', 'image_upload' => 'Upload Image', 'import' => 'Import', + 'import-history' => 'Import History', 'asset_maintenance' => 'Asset Maintenance', 'asset_maintenance_report' => 'Asset Maintenance Report', 'asset_maintenances' => 'Asset Maintenances', diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php index 03c7471cab..24a4109998 100644 --- a/resources/lang/zh-TW/validation.php +++ b/resources/lang/zh-TW/validation.php @@ -14,7 +14,7 @@ return array( */ "accepted" => "The :attribute must be accepted.", - "active_url" => "The :attribute is not a valid URL.", + "active_url" => "屬性不是有效的URL", "after" => "The :attribute must be a date after :date.", "alpha" => "The :attribute may only contain letters.", "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.", diff --git a/resources/macros/macros.php b/resources/macros/macros.php index 2ad17c618f..471c2a8bc0 100644 --- a/resources/macros/macros.php +++ b/resources/macros/macros.php @@ -30,6 +30,7 @@ Form::macro('locales', function ($name = "locale", $selected = null, $class = nu 'el'=> "Greek", 'he'=> "Hebrew", 'hu'=> "Hungarian", + 'id'=> "Indonesian", 'it'=> "Italian", 'ja'=> "Japanese", 'ko'=> "Korean", @@ -472,3 +473,24 @@ Form::macro('username_format', function ($name = "username_format", $selected = return $select; }); + + +Form::macro('customfield_elements', function ($name = "customfield_elements", $selected = null, $class = null) { + + $formats = array( + 'text' => 'Text Box', + 'listbox' => 'List Box', + // 'checkbox' => 'Checkbox', + // 'radio' => 'Radio Buttons', + ); + + $select = ''; + + return $select; + +}); diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php index 05fed2ca4b..15d70732fe 100755 --- a/resources/views/account/profile.blade.php +++ b/resources/views/account/profile.blade.php @@ -88,7 +88,7 @@
{{ Form::checkbox('avatar_delete') }} - + {!! $errors->first('avatar_delete', ':message') !!}
diff --git a/resources/views/custom_fields/create_field.blade.php b/resources/views/custom_fields/create_field.blade.php index 99e97d4762..ebde371b73 100644 --- a/resources/views/custom_fields/create_field.blade.php +++ b/resources/views/custom_fields/create_field.blade.php @@ -28,67 +28,132 @@
- + -
+
{!! $errors->first('name', ' :message') !!}
- +
- + -
+
- {{ Form::select("element",["text" => "Text Box"],"text", array('class'=>'select2 form-control')) }} + {!! Form::customfield_elements('element', Input::old('element'), 'field_element select2 form-control') !!} + {!! $errors->first('element', ' :message') !!} - {!! $errors->first('element', ' :message') !!}
+ + +
- + -
- {{ Form::select("format",\App\Helpers\Helper::predefined_formats(),"ANY", array('class'=>'select2 form-control')) }} +
+ {{ Form::select("format",\App\Helpers\Helper::predefined_formats(),"ANY", array('class'=>'format select2 form-control')) }} {!! $errors->first('format', ' :message') !!}
-
+ + + +
+
+ +
+ {{ Form::close() }}

About Custom Fields

Custom fields allow you to add arbitrary attributes to assets.

+@section('moar_scripts') + +@stop + + @stop diff --git a/resources/views/custom_fields/show.blade.php b/resources/views/custom_fields/show.blade.php index e32a76fed2..082ff02ad0 100644 --- a/resources/views/custom_fields/show.blade.php +++ b/resources/views/custom_fields/show.blade.php @@ -37,9 +37,10 @@ {{ trans('admin/custom_fields/general.order') }} - {{ trans('admin/custom_fields/general.field_name') }} + {{ trans('admin/custom_fields/general.field_name') }} {{ trans('admin/custom_fields/general.field_format') }} {{ trans('admin/custom_fields/general.field_element') }} + {{ trans('admin/custom_fields/general.encrypted') }} {{ trans('admin/custom_fields/general.required') }} @@ -71,6 +72,7 @@ {{$field->name}} {{$field->format}} {{$field->element}} + {{ $field->field_encrypted=='1' ? trans('general.yes') : trans('general.no') }} {{$field->pivot->required ? "REQUIRED" : "OPTIONAL"}} Remove diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index f59ad3d516..a2edef1c58 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -141,7 +141,7 @@ @if (($activity->assetlog) && ($activity->asset_type=="hardware")) - {{ $activity->assetlog->showAssetName() }} + {{ $activity->assetlog->asset_tag }} - {{ $activity->assetlog->showAssetName() }} @elseif (($activity->licenselog) && ($activity->asset_type=="software")) {{ $activity->licenselog->name }} @elseif (($activity->consumablelog) && ($activity->asset_type=="consumable")) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 53a469ecea..55b8778c71 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -569,5 +569,28 @@ $(function () { }); }); + + + + @stop @stop diff --git a/resources/views/hardware/import.blade.php b/resources/views/hardware/import.blade.php index cb8ff0f714..e5c1d4b415 100644 --- a/resources/views/hardware/import.blade.php +++ b/resources/views/hardware/import.blade.php @@ -9,6 +9,86 @@ {{-- Page content --}} @section('content') + +{{-- Modal import dialog --}} + +@if (session()->has('import_errors')) +
+
+
+ Warning {{trans('admin/hardware/message.import.errorDetail')}} +
+ +
+ + + + + + + + @foreach (session('import_errors') as $asset => $itemErrors) + + + + + @endforeach + +
AssetErrors
{{ $asset }} + @foreach ($itemErrors as $field => $values ) + {{ $field }}: + @foreach( $values as $errorString) + {{$errorString[0]}} + @endforeach +
+ @endforeach +
+
+
+
+@endif + + + + +
@@ -40,8 +120,6 @@
- - @@ -56,8 +134,8 @@ @endforeach @@ -66,37 +144,9 @@ - - @if (session()->has('import_errors')) -
-
- Warning {{trans('admin/hardware/message.import.errorDetail')}} -
-
File{{ date("M d, Y g:i A", $file['modified']) }} {{ $file['filesize'] }} - - Process + Process +
- - - - - - @foreach (session('import_errors') as $asset => $itemErrors) - - - - - @endforeach - -
AssetErrors
{{ $asset }} - @foreach ($itemErrors as $field => $values ) - {{ $field }}: - @foreach( $values as $errorString) - {{$errorString[0]}} - @endforeach -
- @endforeach -
-
- @endif + +
@section('moar_scripts') @@ -149,8 +199,7 @@ $('.progress-bar-text').html('Finished!'); $('.progress-checkmark').fadeIn('fast').html(''); $.each(data.result.files, function (index, file) { - $('' + file.name + 'Just now' + file.filesize + ' Process').prependTo("#upload-table > tbody"); - //$('').text(file.name).appendTo(document.body); + $('' + file.name + 'Just now' + file.filesize + ' Process ').prependTo("#upload-table > tbody"); }); } $('#progress').removeClass('active'); @@ -159,6 +208,14 @@ } }); }); + + // Modal Import options handling + $('#importModal').on("show.bs.modal", function(event) { + var link = $(event.relatedTarget); + var filename = link.data('filename'); + $(this).find('.modal-title').text("Import File: " + filename ); + $("#modal-filename").val(filename); + }); @stop diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 314c40aba6..a5408b2ff4 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -65,7 +65,7 @@ data-toolbar="#toolbar" class="table table-striped" id="table" - data-url="{{route('api.hardware.list', array(''=>e(Input::get('status')),'order_number'=>e(Input::get('order_number'))))}}" + data-url="{{route('api.hardware.list', array(''=>e(Input::get('status')),'order_number'=>e(Input::get('order_number')), 'status_id'=>e(Input::get('status_id'))))}}" data-cookie="true" data-click-to-select="true" data-cookie-id-table="{{ e(Input::get('status')) }}assetTable-{{ config('version.hash_version') }}"> @@ -95,7 +95,16 @@ {{ trans('admin/hardware/table.checkout_date') }} {{ trans('admin/hardware/form.expected_checkin') }} @foreach(\App\Models\CustomField::all() AS $field) - {{$field->name}} + + + + @if ($field->field_encrypted=='1') + + @endif + + {{$field->name}} + + @endforeach {{ trans('general.created_at') }} {{ trans('admin/hardware/table.change') }} diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 7cfdab9935..676061b8ed 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -121,15 +121,34 @@ @if ($asset->model->fieldset) @foreach($asset->model->fieldset->fields as $field) - {{ $field->name }} - + {{ $field->name }} - @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) - {{ $asset->{$field->db_column_name()} }} - @else - {{ $asset->{$field->db_column_name()} }} + + + + @if ($field->field_encrypted=='1') + + @endif + + @if ($field->isFieldDecryptable($asset->{$field->db_column_name()} )) + + @can('admin') + @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) + {{ \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} + @else + {{ \App\Helpers\Helper::gracefulDecrypt($field, $asset->{$field->db_column_name()}) }} + @endif + @else + {{ strtoupper(trans('admin/custom_fields/general.encrypted')) }} + @endcan + + @else + @if (($field->format=='URL') && ($asset->{$field->db_column_name()}!='')) + {{ $asset->{$field->db_column_name()} }} + @else + {{ $asset->{$field->db_column_name()} }} + @endif @endif - @@ -269,13 +288,13 @@
@if ($asset->image) - + @elseif ($asset->model->image!='') - + @endif @if (App\Models\Setting::getSettings()->qr_code=='1') - + @endif @if (($asset->assigneduser) && ($asset->assigned_to > 0) && ($asset->deleted_at=='')) diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php index 850b6c3fdd..e6b7202ebb 100644 --- a/resources/views/layouts/basic.blade.php +++ b/resources/views/layouts/basic.blade.php @@ -11,9 +11,7 @@ - - - + diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 9b119d9374..d8b2d71c65 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -75,12 +75,20 @@ }; - - - + + +
@@ -405,6 +413,16 @@
  • @lang('general.list_all')
    • + + get(); ?> + @if (count($status_navs) > 0) +
  •  
    • + @foreach ($status_navs as $status_nav) +
  • {{ $status_nav->name }}
    • + @endforeach + @endif + + @lang('general.deployed') @@ -489,8 +507,7 @@
  • @lang('general.asset_report')
  • @lang('general.unaccepted_asset_report')
  • @lang('general.accessory_report')
    • -
  • @lang('general.custom_report')
    • - +
  • @lang('general.custom_report')
    • @endcan diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 0890d7e908..42e2cc70a5 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -299,7 +299,7 @@
    -
    ey +
    diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php index 8097e2c900..9becec8fb4 100644 --- a/resources/views/models/custom_fields_form.blade.php +++ b/resources/views/models/custom_fields_form.blade.php @@ -1,13 +1,40 @@ @if($model->fieldset) @foreach($model->fieldset->fields AS $field) -
    - -
    - +
    + +
    + + @if ($field->element!='text') + + @if ($field->element=='listbox') + {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(), + Input::old($field->db_column_name(),(isset($asset) ? $asset->{$field->db_column_name()} : "")), ['class'=>'format select2 form-control']) }} + + @elseif ($field->element=='checkbox') + + @foreach ($field->formatFieldValuesAsArray() as $key => $value) + +
    + +
    + @endforeach + + @endif + + + @else + + + @can('admin') + + @else + + @endcan + + @endif + first($field->db_column_name()); if ($errormessage) { @@ -16,6 +43,12 @@ } ?>
    + + @if ($field->field_encrypted) +
    + +
    + @endif
    @endforeach @endif diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index 102b4cbcef..1f1a9bc82f 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -68,7 +68,7 @@

    More Info:

    -
      +
        @if ($model->manufacturer)
      • {{ trans('general.manufacturer') }}: @@ -94,7 +94,7 @@ @endif @if ($model->image) -

        • +

        • @endif @if ($model->deleted_at!='') diff --git a/resources/views/partials/modals.blade.php b/resources/views/partials/modals.blade.php index 5ba1bfada4..5a45917c65 100644 --- a/resources/views/partials/modals.blade.php +++ b/resources/views/partials/modals.blade.php @@ -58,7 +58,7 @@
        -
        +
        @@ -68,12 +68,16 @@
        -
        +
        + Generate +
        -
        +
        +
        +
        diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php index 0cec6ac2e3..efb9e5dfb8 100755 --- a/resources/views/statuslabels/edit.blade.php +++ b/resources/views/statuslabels/edit.blade.php @@ -38,9 +38,8 @@
        -
        +
        -
        {!! $errors->first('name', ' :message') !!} @@ -48,9 +47,8 @@
        -
        - +
        +
        {{ Form::select('statuslabel_types', $statuslabel_types, $statuslabel->getStatuslabelType(), array('class'=>'select2', 'style'=>'min-width:400px')) }} {!! $errors->first('statuslabel_types', ' :message') !!} @@ -65,14 +63,12 @@ {{ Form::text('color', Input::old('color', $statuslabel->color), array('class' => 'form-control', 'style' => 'width: 100px;', 'maxlength'=>'10')) }}
        - - {!! $errors->first('header_color', ':message') !!}
        -
        +
        @@ -80,6 +76,15 @@
        + +
        + + +
        + + diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php index 6541bb35da..d040596b48 100755 --- a/resources/views/statuslabels/index.blade.php +++ b/resources/views/statuslabels/index.blade.php @@ -32,6 +32,7 @@ {{ trans('admin/statuslabels/table.name') }} {{ trans('admin/statuslabels/table.status_type') }} {{ trans('admin/statuslabels/table.color') }} + {{ trans('admin/statuslabels/table.show_in_nav') }} {{ trans('table.actions') }} diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 022288e66a..8eae09e113 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -406,8 +406,6 @@ $(document).ready(function(){ } }); - console.dir($('.superuser')); - $('#genPassword').pGenerator({ 'bind': 'click', 'passwordElement': '#password',