.'/uploads/assets/'.$asset->image.')
' : ((($asset->model) && ($asset->model->image!='')) ? '.'/uploads/models/'.$asset->model->image.'){kind=small}
' : ''),
@@ -1328,13 +1452,17 @@ class AssetsController extends AdminController
'category' => (($asset->model) && ($asset->model->category)) ? $asset->model->category->name : '',
'eol' => ($asset->eol_date()) ? $asset->eol_date() : '',
'notes' => $asset->notes,
- 'order_number' => ($asset->order_number!='') ? ''.$asset->order_number.'' : '',
+ 'order_number' => ($asset->order_number!='') ? ''.$asset->order_number.'' : '',
'last_checkout' => ($asset->last_checkout!='') ? $asset->last_checkout : '',
'expected_checkin' => ($asset->expected_checkin!='') ? $asset->expected_checkin : '',
'change' => ($inout) ? $inout : '',
'actions' => ($actions) ? $actions : '',
'companyName' => is_null($asset->company) ? '' : e($asset->company->name)
- );
+ );
+ foreach($all_custom_fields AS $field) {
+ $row[$field->db_column_name()]=$asset->{$field->db_column_name()};
+ }
+ $rows[]=$row;
}
$data = array('total'=>$assetCount, 'rows'=>$rows);
diff --git a/app/controllers/admin/CategoriesController.php b/app/controllers/admin/CategoriesController.php
index cd706d68d8..788c80ddc2 100755
--- a/app/controllers/admin/CategoriesController.php
+++ b/app/controllers/admin/CategoriesController.php
@@ -250,12 +250,11 @@ class CategoriesController extends AdminController
foreach ($categories as $category) {
$actions = '';
-
$rows[] = array(
'id' => $category->id,
'name' => link_to('/admin/settings/categories/'.$category->id.'/view', $category->name) ,
'category_type' => ucwords($category->category_type),
- 'count' => ($category->category_type=='asset') ? $category->assetscount() : $category->accessoriescount(),
+ 'count' => $category->itemCount(),
'acceptance' => ($category->require_acceptance=='1') ? '' : '',
//EULA is still not working correctly
'eula' => ($category->getEula()) ? '' : '',
diff --git a/app/controllers/admin/CustomFieldsController.php b/app/controllers/admin/CustomFieldsController.php
new file mode 100644
index 0000000000..de08ab802f
--- /dev/null
+++ b/app/controllers/admin/CustomFieldsController.php
@@ -0,0 +1,189 @@
+with("custom_fieldsets",CustomFieldset::all())->with("custom_fields",CustomField::all());
+ }
+
+
+ /**
+ * Show the form for creating a new resource.
+ *
+ * @return Response
+ */
+ public function create()
+ {
+ //
+ return View::make("backend.custom_fields.create");
+ }
+
+
+ /**
+ * Store a newly created resource in storage.
+ *
+ * @return Response
+ */
+ public function store()
+ {
+ //
+ $cfset=new CustomFieldset(["name" => Input::get("name")]);
+ $validator=Validator::make(Input::all(),$cfset->rules);
+ if($validator->passes()) {
+ $cfset->save();
+ return Redirect::route("admin.custom_fields.show",[$cfset->id])->with('success',Lang::get('admin/custom_fields/message.fieldset.create.success'));
+ } else {
+ return Redirect::back()->withInput()->withErrors($validator);
+ }
+ }
+
+ public function associate($id)
+ {
+
+ $set = CustomFieldset::find($id);
+
+ foreach($set->fields AS $field) {
+ if($field->id == Input::get('field_id')) {
+ return Redirect::route("admin.custom_fields.show",[$id])->withInput()->withErrors(['field_id' => Lang::get('admin/custom_fields/message.field.already_added')]);
+ }
+ }
+
+ $results=$set->fields()->attach(Input::get('field_id'),["required" => (Input::get('required') == "on"),"order" => Input::get('order')]);
+
+ return Redirect::route("admin.custom_fields.show",[$id])->with("success",Lang::get('admin/custom_fields/message.field.create.assoc_success'));
+ }
+
+ public function createField()
+ {
+ return View::make("backend.custom_fields.create_field");
+ }
+
+ public function storeField()
+ {
+ $field=new CustomField(["name" => Input::get("name"),"element" => Input::get("element")]);
+ if(!in_array(Input::get('format'),["ALPHA","NUMERIC","MAC","IP"])) {
+ $field->format=Input::get("custom_format");
+ } else {
+ $field->format=Input::get('format');
+ }
+
+ $validator=Validator::make(Input::all(),$field->rules);
+ if($validator->passes()) {
+ $results=$field->save();
+ //return "postCreateField: $results";
+ if ($results) {
+ return Redirect::route("admin.custom_fields.index")->with("success",Lang::get('admin/custom_fields/message.field.create.success'));
+ } else {
+ return Redirect::back()->withInput()->with('error', Lang::get('admin/custom_fields/message.field.create.error'));
+ }
+ } else {
+ return Redirect::back()->withInput()->withErrors($validator);
+ }
+ }
+
+ public function deleteField($field_id)
+ {
+ $field=CustomField::find($field_id);
+
+ if($field->fieldset->count()>0) {
+ return Redirect::back()->withErrors(['message' => "Field is in-use"]);
+ } else {
+ $field->delete();
+ return Redirect::route("admin.custom_fields.index")->with("success",Lang::get('admin/custom_fields/message.field.delete.success'));
+ }
+ }
+
+ /**
+ * Display the specified resource.
+ *
+ * @param int $id
+ * @return Response
+ */
+ public function show($id)
+ {
+ //$id=$parameters[0];
+ $cfset=CustomFieldset::find($id);
+
+ //print_r($parameters);
+ //
+ $custom_fields_list=["" => "Add New Field to Fieldset"] + CustomField::lists("name","id");
+ // print_r($custom_fields_list);
+ $maxid=0;
+ foreach($cfset->fields AS $field) {
+ // print "Looking for: ".$field->id;
+ if($field->pivot->order > $maxid) {
+ $maxid=$field->pivot->order;
+ }
+ if(isset($custom_fields_list[$field->id])) {
+ // print "Found ".$field->id.", so removing it."; + unset($custom_fields_list[$field->id]); + } + } + + return View::make("backend.custom_fields.show")->with("custom_fieldset",$cfset)->with("maxid",$maxid+1)->with("custom_fields_list",$custom_fields_list); + } + + + /** + * Show the form for editing the specified resource. + * + * @param int $id + * @return Response + */ + public function edit($id) + { + // + } + + + /** + * Update the specified resource in storage. + * + * @param int $id + * @return Response + */ + public function update($id) + { + // + } + + + /** + * Remove the specified resource from storage. + * + * @param int $id + * @return Response + */ + public function destroy($id) + { + // + $fieldset=CustomFieldset::find($id); + + $models=Model::where("fieldset_id","=",$id); + if($models->count()==0) { + $fieldset->delete(); + return Redirect::route("admin.custom_fields.index")->with("success",Lang::get('admin/custom_fields/message.fieldset.delete.success')); + } + else { + return Redirect::route("admin.custom_fields.index")->with("error",Lang::get('admin/custom_fields/message.fieldset.delete.in_use')); //->with("models",$models); + } + } + + +} diff --git a/app/controllers/admin/LocationsController.php b/app/controllers/admin/LocationsController.php index 06219e988a..47ad5aea71 100755 --- a/app/controllers/admin/LocationsController.php +++ b/app/controllers/admin/LocationsController.php @@ -143,6 +143,7 @@ class LocationsController extends AdminController } // Redirect to the location create page + /** @noinspection PhpUnreachableStatementInspection Known to be unreachable but kept following discussion: https://github.com/snipe/snipe-it/pull/1423 */ return Redirect::to('admin/settings/locations/create')->with('error', Lang::get('admin/locations/message.create.error')); } diff --git a/app/controllers/admin/ModelsController.php b/app/controllers/admin/ModelsController.php index 115147d6e0..c1803ecb63 100755 --- a/app/controllers/admin/ModelsController.php +++ b/app/controllers/admin/ModelsController.php @@ -82,7 +82,7 @@ class ModelsController extends AdminController if ($validator->fails()) { // The given data did not pass validation - return Redirect::back()->withInput()->with('error', Lang::get('admin/models/message.create.duplicate_set'));; + return Redirect::back()->withInput()->with('error', Lang::get('admin/models/message.create.duplicate_set')); } @@ -116,7 +116,11 @@ class ModelsController extends AdminController $model->manufacturer_id = e(Input::get('manufacturer_id')); $model->category_id = e(Input::get('category_id')); $model->user_id = Sentry::getId(); - $model->show_mac_address = e(Input::get('show_mac_address', '0')); + if (Input::get('custom_fieldset')!='') { + $model->fieldset_id = e(Input::get('custom_fieldset')); + } + + //$model->show_mac_address = e(Input::get('show_mac_address', '0')); if (Input::file('image')) { @@ -239,7 +243,9 @@ class ModelsController extends AdminController $model->modelno = e(Input::get('modelno')); $model->manufacturer_id = e(Input::get('manufacturer_id')); $model->category_id = e(Input::get('category_id')); - $model->show_mac_address = e(Input::get('show_mac_address', '0')); + if (Input::get('custom_fieldset')!='') { + $model->fieldset_id = e(Input::get('custom_fieldset')); + } if (Input::file('image')) { $image = Input::file('image'); @@ -375,6 +381,14 @@ class ModelsController extends AdminController } + public function getCustomFields($modelId) + { + $model=Model::find($modelId); + return View::make("backend.models.custom_fields_form")->with("model",$model); + } + + + /** * Get the JSON response for the bootstrap table list view * diff --git a/app/controllers/admin/ReportsController.php b/app/controllers/admin/ReportsController.php index 520215f39f..851c774770 100644 --- a/app/controllers/admin/ReportsController.php +++ b/app/controllers/admin/ReportsController.php @@ -162,7 +162,7 @@ class ReportsController extends AdminController if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser->location_id > 0 )) { $location = Location::find( $asset->assigneduser->location_id ); - if ($location->name) { + if ($location) { $row[] = $location->name; } else { $row[] = ''; @@ -474,23 +474,25 @@ class ReportsController extends AdminController } } if (e( Input::get( 'location' ) ) == '1') { - if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser->location_id > 0 )) { + $show_loc = ''; + if (( $asset->assigned_to > 0 ) && ( $asset->assigneduser->location_id !='' )) { $location = Location::find( $asset->assigneduser->location_id ); if ($location) { - $row[] = $location->name; + $show_loc .= $location->name; } else { - $row[] = ''; + $show_loc .= 'User location '.$asset->assigneduser->location_id.' is invalid'; } - } elseif ($asset->rtd_location_id) { + } elseif ($asset->rtd_location_id!='') { $location = Location::find( $asset->rtd_location_id ); if ($location) { - $row[] = $location->name; + $show_loc .= $location->name; } else { - $row[] = ''; + $show_loc .= 'Default location '.$asset->rtd_location_id.' is invalid'; } - } else { - $row[] = ''; // Empty string if location is not set } + + $row[] = $show_loc; + } if (e( Input::get( 'assigned_to' ) ) == '1') { if ($asset->assigned_to > 0) { diff --git a/app/controllers/admin/SettingsController.php b/app/controllers/admin/SettingsController.php index 98ee49604e..9fcb6d3f91 100755 --- a/app/controllers/admin/SettingsController.php +++ b/app/controllers/admin/SettingsController.php @@ -155,6 +155,7 @@ class SettingsController extends AdminController $setting->slack_botname = e(Input::get('slack_botname')); $setting->ldap_enabled = Input::get('ldap_enabled', '0'); $setting->ldap_server = Input::get('ldap_server'); + $setting->ldap_server_cert_ignore = Input::get('ldap_server_cert_ignore', false); $setting->ldap_uname = Input::get('ldap_uname'); $setting->ldap_pword = Crypt::encrypt(Input::get('ldap_pword')); $setting->ldap_basedn = Input::get('ldap_basedn'); diff --git a/app/controllers/admin/UsersController.php b/app/controllers/admin/UsersController.php index 69e9a2f05a..30721dff9b 100755 --- a/app/controllers/admin/UsersController.php +++ b/app/controllers/admin/UsersController.php @@ -536,6 +536,10 @@ class UsersController extends AdminController { unset($user_raw_array[$key]); } + if (!Sentry::getUser()->isSuperUser()) { + return Redirect::route('users')->with('error', Lang::get('admin/users/message.insufficient_permissions')); + } + if (!Config::get('app.lock_passwords')) { $assets = Asset::whereIn('assigned_to', $user_raw_array)->get(); @@ -587,6 +591,7 @@ class UsersController extends AdminController { return Redirect::route('users')->with('error', 'Bulk delete is not enabled in this installation'); } + /** @noinspection PhpUnreachableStatementInspection Known to be unreachable but kept following discussion: https://github.com/snipe/snipe-it/pull/1423 */ return Redirect::route('users')->with('error', 'An error has occurred'); } } @@ -889,8 +894,8 @@ class UsersController extends AdminController { $sort = e(Input::get('sort')); } - $users = User::select(array('users.id','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes','users.company_id')) - ->with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc','company'); + $users = User::select(array('users.id','users.employee_num','users.email','users.username','users.location_id','users.manager_id','users.first_name','users.last_name','users.created_at','users.notes','users.company_id', 'users.deleted_at')) + ->with('assets','accessories','consumables','licenses','manager','sentryThrottle','groups','userloc','company'); $users = Company::scopeCompanyables($users); switch ($status) { @@ -916,7 +921,7 @@ class UsersController extends AdminController { default: $allowed_columns = [ - 'last_name','first_name','email','username', + 'last_name','first_name','email','username','employee_num', 'assets','accessories', 'consumables','licenses','groups' ]; @@ -972,6 +977,7 @@ class UsersController extends AdminController { 'location' => ($user->userloc) ? $user->userloc->name : '', 'manager' => ($user->manager) ? '' . $user->manager->fullName() . '' : '', 'assets' => $user->assets->count(), + 'employee_num' => $user->employee_num, 'licenses' => $user->licenses->count(), 'accessories' => $user->accessories->count(), 'consumables' => $user->consumables->count(), @@ -1197,6 +1203,13 @@ class UsersController extends AdminController { $ldap_result_active_flag = Setting::getSettings()->ldap_active_flag_field; $ldap_result_emp_num = Setting::getSettings()->ldap_emp_num_field; $ldap_result_email = Setting::getSettings()->ldap_email_field; + $ldap_server_cert_ignore = Setting::getSettings()->ldap_server_cert_ignore; + + // If we are ignoring the SSL cert we need to setup the environment variable + // before we create the connection + if($ldap_server_cert_ignore) { + putenv('LDAPTLS_REQCERT=never'); + } // Connect to LDAP server $ldapconn = @ldap_connect($url); @@ -1216,6 +1229,8 @@ class UsersController extends AdminController { // Binding to ldap server $ldapbind = @ldap_bind($ldapconn, $username, $password); + + Log::error(ldap_errno($ldapconn)); if (!$ldapbind) { return Redirect::route('users')->with('error', Lang::get('admin/users/message.error.ldap_could_not_bind').ldap_error($ldapconn)); } diff --git a/app/database/migrations/2013_11_13_075318_create_models_table.php b/app/database/migrations/2013_11_13_075318_create_models_table.php index 7acb5f1c7e..cbb7eae066 100755 --- a/app/database/migrations/2013_11_13_075318_create_models_table.php +++ b/app/database/migrations/2013_11_13_075318_create_models_table.php @@ -18,6 +18,7 @@ class CreateModelsTable extends Migration $table->integer('manufacturer_id')->nullable(); $table->integer('category_id')->nullable(); $table->timestamps(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_13_075335_create_categories_table.php b/app/database/migrations/2013_11_13_075335_create_categories_table.php index 7c18c1df8b..bb64d87cb0 100755 --- a/app/database/migrations/2013_11_13_075335_create_categories_table.php +++ b/app/database/migrations/2013_11_13_075335_create_categories_table.php @@ -16,6 +16,7 @@ class CreateCategoriesTable extends Migration $table->string('name'); $table->integer('parent')->default(0); $table->timestamps(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_13_075347_create_manufacturers_table.php b/app/database/migrations/2013_11_13_075347_create_manufacturers_table.php index e23100590c..3f2426ea6d 100755 --- a/app/database/migrations/2013_11_13_075347_create_manufacturers_table.php +++ b/app/database/migrations/2013_11_13_075347_create_manufacturers_table.php @@ -15,6 +15,7 @@ class CreateManufacturersTable extends Migration $table->increments('id'); $table->string('name'); $table->timestamps(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_15_190327_create_assets_table.php b/app/database/migrations/2013_11_15_190327_create_assets_table.php index 48f22f48d7..86b1a1c71d 100755 --- a/app/database/migrations/2013_11_15_190327_create_assets_table.php +++ b/app/database/migrations/2013_11_15_190327_create_assets_table.php @@ -24,6 +24,7 @@ class CreateAssetsTable extends Migration $table->text('notes'); $table->integer('user_id'); $table->timestamps(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_15_190357_create_licenses_table.php b/app/database/migrations/2013_11_15_190357_create_licenses_table.php index 8f92b000e4..85ea409643 100755 --- a/app/database/migrations/2013_11_15_190357_create_licenses_table.php +++ b/app/database/migrations/2013_11_15_190357_create_licenses_table.php @@ -25,6 +25,7 @@ class CreateLicensesTable extends Migration $table->text('notes'); $table->integer('user_id'); $table->timestamps(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_16_040323_create_depreciations_table.php b/app/database/migrations/2013_11_16_040323_create_depreciations_table.php index 8f4b739cd4..04edf3d643 100755 --- a/app/database/migrations/2013_11_16_040323_create_depreciations_table.php +++ b/app/database/migrations/2013_11_16_040323_create_depreciations_table.php @@ -17,6 +17,7 @@ class CreateDepreciationsTable extends Migration $table->integer('months'); $table->timestamps(); $table->integer('user_id'); + $table->engine = 'InnoDB'; //$table->foreign('user_id')->references('id')->on('users'); }); } diff --git a/app/database/migrations/2013_11_16_103258_create_locations_table.php b/app/database/migrations/2013_11_16_103258_create_locations_table.php index c2d0b1cbac..acb8f7841f 100755 --- a/app/database/migrations/2013_11_16_103258_create_locations_table.php +++ b/app/database/migrations/2013_11_16_103258_create_locations_table.php @@ -19,6 +19,7 @@ class CreateLocationsTable extends Migration $table->string('country',2); $table->timestamps(); $table->integer('user_id'); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_16_103425_create_history_table.php b/app/database/migrations/2013_11_16_103425_create_history_table.php index fe7fdd14ec..d4e21c8cf8 100755 --- a/app/database/migrations/2013_11_16_103425_create_history_table.php +++ b/app/database/migrations/2013_11_16_103425_create_history_table.php @@ -17,6 +17,7 @@ class CreateHistoryTable extends Migration $table->integer('location_id')->nullable; $table->timestamps(); $table->integer('user_id'); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_17_055126_create_settings_table.php b/app/database/migrations/2013_11_17_055126_create_settings_table.php index 6279ebd526..9b123218de 100755 --- a/app/database/migrations/2013_11_17_055126_create_settings_table.php +++ b/app/database/migrations/2013_11_17_055126_create_settings_table.php @@ -18,6 +18,7 @@ class CreateSettingsTable extends Migration $table->string('option_value'); $table->timestamps(); $table->integer('user_id'); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_20_130248_create_status_labels.php b/app/database/migrations/2013_11_20_130248_create_status_labels.php index 627bfbaf4f..2eb7d3a249 100755 --- a/app/database/migrations/2013_11_20_130248_create_status_labels.php +++ b/app/database/migrations/2013_11_20_130248_create_status_labels.php @@ -17,6 +17,7 @@ class CreateStatusLabels extends Migration $table->integer('user_id'); $table->timestamps(); $table->softDeletes(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_21_002321_add_uploads_table.php b/app/database/migrations/2013_11_21_002321_add_uploads_table.php index d8d629a4d0..07f5eb2d06 100755 --- a/app/database/migrations/2013_11_21_002321_add_uploads_table.php +++ b/app/database/migrations/2013_11_21_002321_add_uploads_table.php @@ -19,6 +19,7 @@ class AddUploadsTable extends Migration $table->string('filenotes')->nullable; $table->timestamps(); $table->softDeletes(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_25_013244_create_licenses_table.php b/app/database/migrations/2013_11_25_013244_create_licenses_table.php index 723f1a427d..2d4ef40ec1 100755 --- a/app/database/migrations/2013_11_25_013244_create_licenses_table.php +++ b/app/database/migrations/2013_11_25_013244_create_licenses_table.php @@ -25,6 +25,7 @@ class ReCreateLicensesTable extends Migration $table->integer('depreciation_id'); $table->timestamps(); $table->softDeletes(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_25_031458_create_license_seats_table.php b/app/database/migrations/2013_11_25_031458_create_license_seats_table.php index 13349789e2..14eeb713dd 100755 --- a/app/database/migrations/2013_11_25_031458_create_license_seats_table.php +++ b/app/database/migrations/2013_11_25_031458_create_license_seats_table.php @@ -20,6 +20,7 @@ class CreateLicenseSeatsTable extends Migration $table->integer('user_id'); $table->timestamps(); $table->softDeletes(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2013_11_25_033131_create_new_licenses_table.php b/app/database/migrations/2013_11_25_033131_create_new_licenses_table.php index 1140b65a52..07b8211143 100755 --- a/app/database/migrations/2013_11_25_033131_create_new_licenses_table.php +++ b/app/database/migrations/2013_11_25_033131_create_new_licenses_table.php @@ -25,6 +25,7 @@ class CreateNewLicensesTable extends Migration $table->integer('depreciation_id'); $table->timestamps(); $table->softDeletes(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2014_06_24_003011_add_suppliers.php b/app/database/migrations/2014_06_24_003011_add_suppliers.php index a0a758efaa..417562056e 100755 --- a/app/database/migrations/2014_06_24_003011_add_suppliers.php +++ b/app/database/migrations/2014_06_24_003011_add_suppliers.php @@ -28,6 +28,7 @@ class AddSuppliers extends Migration $table->timestamps(); $table->integer('user_id'); $table->softDeletes(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2015_02_25_022931_add_eula_fields.php b/app/database/migrations/2015_02_25_022931_add_eula_fields.php index 71f0cb0869..a4eff87120 100644 --- a/app/database/migrations/2015_02_25_022931_add_eula_fields.php +++ b/app/database/migrations/2015_02_25_022931_add_eula_fields.php @@ -29,15 +29,15 @@ class AddEulaFields extends Migration { }); - Schema::create('requested_assets', function ($table) { - $table->increments('id'); - $table->integer('asset_id')->default(NULL); - $table->integer('user_id')->default(NULL); - $table->dateTime('accepted_at')->nullable()->default(NULL); - $table->dateTime('denied_at')->nullable()->default(NULL); - $table->string('notes')->default(NULL); - $table->timestamps(); - }); + Schema::create('requested_assets', function ($table) { + $table->increments('id'); + $table->integer('asset_id')->default(NULL); + $table->integer('user_id')->default(NULL); + $table->dateTime('accepted_at')->nullable()->default(NULL); + $table->dateTime('denied_at')->nullable()->default(NULL); + $table->string('notes')->default(NULL); + $table->timestamps(); + }); } /** diff --git a/app/database/migrations/2015_02_25_204513_add_accessories_table.php b/app/database/migrations/2015_02_25_204513_add_accessories_table.php index e0f51d8224..037351f861 100644 --- a/app/database/migrations/2015_02_25_204513_add_accessories_table.php +++ b/app/database/migrations/2015_02_25_204513_add_accessories_table.php @@ -22,6 +22,7 @@ class AddAccessoriesTable extends Migration { $table->boolean('requestable')->default(0); $table->timestamps(); $table->softDeletes(); + $table->engine = 'InnoDB'; }); Schema::table('asset_logs', function ($table) { diff --git a/app/database/migrations/2015_06_10_003554_create_consumables.php b/app/database/migrations/2015_06_10_003554_create_consumables.php index 094da181c2..cd8c9992f1 100644 --- a/app/database/migrations/2015_06_10_003554_create_consumables.php +++ b/app/database/migrations/2015_06_10_003554_create_consumables.php @@ -17,12 +17,13 @@ class CreateConsumables extends Migration { $table->increments('id'); $table->string('name')->nullable()->default(NULL); $table->integer('category_id')->nullable()->default(NULL); - $table->integer('location_id')->nullable()->default(NULL); + $table->integer('location_id')->nullable()->default(NULL); $table->integer('user_id')->nullable()->default(NULL); $table->integer('qty')->default(0); $table->boolean('requestable')->default(0); $table->timestamps(); $table->softDeletes(); + $table->engine = 'InnoDB'; }); Schema::table('asset_logs', function ($table) { diff --git a/app/database/migrations/2015_07_04_212443_create_custom_fields_table.php b/app/database/migrations/2015_07_04_212443_create_custom_fields_table.php new file mode 100644 index 0000000000..b2dbbebb8c --- /dev/null +++ b/app/database/migrations/2015_07_04_212443_create_custom_fields_table.php @@ -0,0 +1,36 @@ +increments('id'); + $table->string('name'); + $table->string('format'); + $table->string('element'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + Schema::drop('custom_fields'); + } + +} diff --git a/app/database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php b/app/database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php new file mode 100644 index 0000000000..acf920ce73 --- /dev/null +++ b/app/database/migrations/2015_09_21_235926_create_custom_field_custom_fieldset.php @@ -0,0 +1,36 @@ +integer('custom_field_id'); + $table->integer('custom_fieldset_id'); + + $table->integer('order'); + $table->boolean('required'); + $table->engine = 'InnoDB'; + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('custom_field_custom_fieldset'); + } + +} diff --git a/app/database/migrations/2015_09_22_000104_create_custom_fieldsets.php b/app/database/migrations/2015_09_22_000104_create_custom_fieldsets.php new file mode 100644 index 0000000000..436a579692 --- /dev/null +++ b/app/database/migrations/2015_09_22_000104_create_custom_fieldsets.php @@ -0,0 +1,34 @@ +increments('id'); + $table->string('name'); + $table->engine = 'InnoDB'; + // + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::drop('custom_fieldsets'); + } + +} diff --git a/app/database/migrations/2015_09_22_003321_add_fieldset_id_to_assets.php b/app/database/migrations/2015_09_22_003321_add_fieldset_id_to_assets.php new file mode 100644 index 0000000000..7771b30e0e --- /dev/null +++ b/app/database/migrations/2015_09_22_003321_add_fieldset_id_to_assets.php @@ -0,0 +1,33 @@ +integer('fieldset_id')->nullable(); + }); + + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('models',function (Blueprint $table) { + $table->dropColumn('fieldset_id'); + }); + } + +} diff --git a/app/database/migrations/2015_09_22_003413_migrate_mac_address.php b/app/database/migrations/2015_09_22_003413_migrate_mac_address.php new file mode 100644 index 0000000000..f1bf411c93 --- /dev/null +++ b/app/database/migrations/2015_09_22_003413_migrate_mac_address.php @@ -0,0 +1,56 @@ +getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string'); + + $f2=new CustomFieldset(['name' => "Asset with MAC Address"]); + if(!$f2->save()) { + throw new Exception("couldn't save customfieldset"); + } + $macid=DB::table('custom_fields')->insertGetId([ + 'name' => "MAC Address", + 'format' => CustomField::$PredefinedFormats['MAC'], + 'element'=>'text']); + if(!$macid) { + throw new Exception("Can't save MAC Custom field: $macid"); + } + + $f2->fields()->attach($macid,['required' => false, 'order' => 1]); + Model::where(["show_mac_address" => true])->update(["fieldset_id"=>$f2->id]); + + DB::statement("ALTER TABLE assets CHANGE mac_address _snipeit_mac_address varchar(255)"); + + $ans=Schema::table("models",function (Blueprint $table) { + $table->renameColumn('show_mac_address','deprecated_mac_address'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + $f=CustomFieldset::where(["name" => "Asset with MAC Address"])->first(); + $f->fields()->delete(); + $f->delete(); + Schema::table("models",function(Blueprint $table) { + $table->renameColumn("deprecated_mac_address","show_mac_address"); + }); + DB::statement("ALTER TABLE assets CHANGE _snipeit_mac_address mac_address varchar(255)"); + } + +} diff --git a/app/database/migrations/2015_11_05_061015_create_companies_table.php b/app/database/migrations/2015_11_05_061015_create_companies_table.php index c026a87787..d0bc86cbe6 100644 --- a/app/database/migrations/2015_11_05_061015_create_companies_table.php +++ b/app/database/migrations/2015_11_05_061015_create_companies_table.php @@ -17,6 +17,7 @@ class CreateCompaniesTable extends Migration { $table->increments('id'); $table->string('name')->unique(); $table->timestamps(); + $table->engine = 'InnoDB'; }); } diff --git a/app/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php b/app/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php index 62360f7d93..930b47e3c9 100644 --- a/app/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php +++ b/app/database/migrations/2015_11_05_061115_add_company_id_to_consumables_table.php @@ -15,7 +15,7 @@ class AddCompanyIdToConsumablesTable extends Migration { Schema::table('consumables', function(Blueprint $table) { $table->integer('company_id')->unsigned()->nullable(); - $table->foreign('company_id')->references('id')->on('companies'); + //$table->foreign('company_id')->references('id')->on('companies'); }); } @@ -28,7 +28,7 @@ class AddCompanyIdToConsumablesTable extends Migration { { Schema::table('consumables', function(Blueprint $table) { - $table->dropForeign('consumables_company_id_foreign'); + //$table->dropForeign('consumables_company_id_foreign'); $table->dropColumn('company_id'); }); } diff --git a/app/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php b/app/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php index 1d21d9ed8a..cee633bc3d 100644 --- a/app/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php +++ b/app/database/migrations/2015_11_06_092038_add_company_id_to_accessories_table.php @@ -15,7 +15,7 @@ class AddCompanyIdToAccessoriesTable extends Migration { Schema::table('accessories', function(Blueprint $table) { $table->integer('company_id')->unsigned()->nullable(); - $table->foreign('company_id')->references('id')->on('companies'); + //$table->foreign('company_id')->references('id')->on('companies'); }); } @@ -28,7 +28,7 @@ class AddCompanyIdToAccessoriesTable extends Migration { { Schema::table('accessories', function(Blueprint $table) { - $table->dropForeign('accessories_company_id_foreign'); + //$table->dropForeign('accessories_company_id_foreign'); $table->dropColumn('company_id'); }); } diff --git a/app/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php b/app/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php index 90cf4bca9c..aef83fe265 100644 --- a/app/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php +++ b/app/database/migrations/2015_11_06_100045_add_company_id_to_users_table.php @@ -15,7 +15,7 @@ class AddCompanyIdToUsersTable extends Migration { Schema::table('users', function(Blueprint $table) { $table->integer('company_id')->unsigned()->nullable(); - $table->foreign('company_id')->references('id')->on('companies'); + //$table->foreign('company_id')->references('id')->on('companies'); }); } @@ -28,7 +28,7 @@ class AddCompanyIdToUsersTable extends Migration { { Schema::table('users', function(Blueprint $table) { - $table->dropForeign('users_company_id_foreign'); + //$table->dropForeign('users_company_id_foreign'); $table->dropColumn('company_id'); }); } diff --git a/app/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php b/app/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php index ab38db622f..4f0756cf2c 100644 --- a/app/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php +++ b/app/database/migrations/2015_11_06_134742_add_company_id_to_licenses_table.php @@ -15,7 +15,7 @@ class AddCompanyIdToLicensesTable extends Migration { Schema::table('licenses', function(Blueprint $table) { $table->integer('company_id')->unsigned()->nullable(); - $table->foreign('company_id')->references('id')->on('companies'); + //$table->foreign('company_id')->references('id')->on('companies'); }); } @@ -28,7 +28,7 @@ class AddCompanyIdToLicensesTable extends Migration { { Schema::table('licenses', function(Blueprint $table) { - $table->dropForeign('licenses_company_id_foreign'); + //$table->dropForeign('licenses_company_id_foreign'); $table->dropColumn('company_id'); }); } diff --git a/app/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php b/app/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php index 14ab5b9a85..010ec528e7 100644 --- a/app/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php +++ b/app/database/migrations/2015_11_08_035832_add_company_id_to_assets_table.php @@ -15,7 +15,7 @@ class AddCompanyIdToAssetsTable extends Migration { Schema::table('assets', function(Blueprint $table) { $table->integer('company_id')->unsigned()->nullable(); - $table->foreign('company_id')->references('id')->on('companies'); + //$table->foreign('company_id')->references('id')->on('companies'); }); } @@ -28,7 +28,7 @@ class AddCompanyIdToAssetsTable extends Migration { { Schema::table('assets', function(Blueprint $table) { - $table->dropForeign('assets_company_id_foreign'); + // $table->dropForeign('assets_company_id_foreign'); $table->dropColumn('company_id'); }); } diff --git a/app/database/migrations/2015_11_30_191504_remove_fk_company_id.php b/app/database/migrations/2015_11_30_191504_remove_fk_company_id.php index 307585ef3f..bd0a9bda06 100644 --- a/app/database/migrations/2015_11_30_191504_remove_fk_company_id.php +++ b/app/database/migrations/2015_11_30_191504_remove_fk_company_id.php @@ -13,30 +13,30 @@ class RemoveFkCompanyId extends Migration { public function up() { // - Schema::table('users', function(Blueprint $table) - { - $table->dropForeign('users_company_id_foreign'); - }); - - Schema::table('accessories', function(Blueprint $table) - { - $table->dropForeign('accessories_company_id_foreign'); - }); - - Schema::table('assets', function(Blueprint $table) - { - $table->dropForeign('assets_company_id_foreign'); - }); - - Schema::table('consumables', function(Blueprint $table) - { - $table->dropForeign('consumables_company_id_foreign'); - }); - - Schema::table('licenses', function(Blueprint $table) - { - $table->dropForeign('licenses_company_id_foreign'); - }); + // Schema::table('users', function(Blueprint $table) + // { + // $table->dropForeign('users_company_id_foreign'); + // }); + // + // Schema::table('accessories', function(Blueprint $table) + // { + // $table->dropForeign('accessories_company_id_foreign'); + // }); + // + // Schema::table('assets', function(Blueprint $table) + // { + // $table->dropForeign('assets_company_id_foreign'); + // }); + // + // Schema::table('consumables', function(Blueprint $table) + // { + // $table->dropForeign('consumables_company_id_foreign'); + // }); + // + // Schema::table('licenses', function(Blueprint $table) + // { + // $table->dropForeign('licenses_company_id_foreign'); + // }); } diff --git a/app/database/migrations/2015_12_21_193006_add_ldap_server_cert_ignore_to_settings_table.php b/app/database/migrations/2015_12_21_193006_add_ldap_server_cert_ignore_to_settings_table.php new file mode 100644 index 0000000000..0e22c78683 --- /dev/null +++ b/app/database/migrations/2015_12_21_193006_add_ldap_server_cert_ignore_to_settings_table.php @@ -0,0 +1,34 @@ +boolean('ldap_server_cert_ignore')->default(FALSE); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('settings', function(Blueprint $table) + { + $table->dropColumn('ldap_server_cert_ignore'); + }); + } + +} diff --git a/app/helpers.php b/app/helpers.php index a643c5f830..b613292815 100755 --- a/app/helpers.php +++ b/app/helpers.php @@ -5,13 +5,16 @@ * To change this template file, choose Tools | Templates * and open the template in the editor. */ -function ParseFloat($floatString){ - // use comma for thousands until local info is property used - $LocaleInfo = localeconv(); - $floatString = str_replace("," , "", $floatString); - $floatString = str_replace($LocaleInfo["decimal_point"] , ".", $floatString); - return floatval($floatString); +if(!function_exists("ParseFloat")) { + //this may be only necessary to run tests? + function ParseFloat($floatString){ + // use comma for thousands until local info is property used + $LocaleInfo = localeconv(); + $floatString = str_replace("," , "", $floatString); + $floatString = str_replace($LocaleInfo["decimal_point"] , ".", $floatString); + return floatval($floatString); + } } function modelList() { @@ -23,6 +26,14 @@ function modelList() { return $model_list; } +function companyList() { + $company_list = array('' => '') + DB::table('companies') + ->orderBy('name', 'asc') + ->lists('name', 'id'); + return $company_list; +} + + function categoryList() { $category_list = array('' => '') + DB::table('categories') ->whereNull('deleted_at') @@ -86,6 +97,17 @@ function usersList() { return $users_list; } +function customFieldsetList() { + $customfields=CustomFieldset::lists('name','id'); + return array('' => Lang::get('admin/models/general.no_custom_field')) + $customfields; +} + +function predefined_formats() { + $keys=array_keys(CustomField::$PredefinedFormats); + $stuff=array_combine($keys,$keys); + return $stuff+["" => "Custom Format..."]; +} + function barcodeDimensions ($barcode_type = 'QRCODE') { if ($barcode_type == 'C128') { $size['height'] = '-1'; diff --git a/app/lang/ar/admin/hardware/form.php b/app/lang/ar/admin/hardware/form.php index 5cadad3641..e4bf1e3f39 100755 --- a/app/lang/ar/admin/hardware/form.php +++ b/app/lang/ar/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/ar/admin/hardware/message.php b/app/lang/ar/admin/hardware/message.php index 03e9473cbf..403369846d 100755 --- a/app/lang/ar/admin/hardware/message.php +++ b/app/lang/ar/admin/hardware/message.php @@ -52,7 +52,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/ar/admin/models/general.php b/app/lang/ar/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/ar/admin/models/general.php +++ b/app/lang/ar/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/ar/admin/settings/general.php b/app/lang/ar/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/ar/admin/settings/general.php +++ b/app/lang/ar/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/ar/admin/users/message.php b/app/lang/ar/admin/users/message.php index 27c9537962..6b27130daf 100755 --- a/app/lang/ar/admin/users/message.php +++ b/app/lang/ar/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'حدث خطأ أثناء استيراد المستخدمين. حاول مرة أخرى.', 'asset_already_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:', diff --git a/app/lang/ar/general.php b/app/lang/ar/general.php index 3d6d268da0..70b1cd352d 100755 --- a/app/lang/ar/general.php +++ b/app/lang/ar/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'العنوان', 'admin' => 'الإدارة', + 'add_seats' => 'Added seats', 'all_assets' => 'كل الأصول', 'all' => 'الكل', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'ملفك الشخصي', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'جاهزة للتوزيع', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'التقارير', 'requested' => 'Requested', 'save' => 'حفظ', diff --git a/app/lang/bg/admin/accessories/message.php b/app/lang/bg/admin/accessories/message.php index 33b13e03c9..20c0f93f8b 100755 --- a/app/lang/bg/admin/accessories/message.php +++ b/app/lang/bg/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => 'Аксесоарът на съществува.', 'assoc_users' => 'От този аксесоар са предадени :count броя на потребителите. Моля впишете обратно нови или върнати и опитайте отново.', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'Аксесоарът не беше създаден. Моля опитайте отново.', + 'success' => 'Аксесоарът създаден успешно.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'Аксесоарът не беше обновен. Моля опитайте отново.', + 'success' => 'Аксесоарът обновен успешно.' ), 'delete' => array( diff --git a/app/lang/bg/admin/hardware/form.php b/app/lang/bg/admin/hardware/form.php index 8661eba102..d8f1570fd1 100755 --- a/app/lang/bg/admin/hardware/form.php +++ b/app/lang/bg/admin/hardware/form.php @@ -1,7 +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_update' => 'Масово обновяване на активи', 'bulk_update_help' => 'Тук можете да обновите множество активи едновременно. Попълнете единствено полетата, които желаете да промените. Всички празни полета няма да бъдат променени.', 'bulk_update_warn' => 'Ще бъдат променени записите за :asset_count актива.', diff --git a/app/lang/bg/admin/hardware/message.php b/app/lang/bg/admin/hardware/message.php index 33e5f59b1f..ac6bab5aca 100755 --- a/app/lang/bg/admin/hardware/message.php +++ b/app/lang/bg/admin/hardware/message.php @@ -52,6 +52,11 @@ return array( 'error' => 'Активът не беше вписан. Моля опитайте отново.', 'success' => 'Активът вписан успешно.', 'user_does_not_exist' => 'Невалиден потребител. Моля опитайте отново.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/bg/admin/hardware/table.php b/app/lang/bg/admin/hardware/table.php index 4b0d0954e9..7ecb8c6571 100755 --- a/app/lang/bg/admin/hardware/table.php +++ b/app/lang/bg/admin/hardware/table.php @@ -18,7 +18,7 @@ return array( 'serial' => 'Сериен номер', 'status' => 'Статус', 'title' => 'Актив ', - 'image' => 'Device Image', + 'image' => 'Изображение на устройството', 'days_without_acceptance' => 'Дни без да е предаден' ); diff --git a/app/lang/bg/admin/models/general.php b/app/lang/bg/admin/models/general.php index eccf745827..a946e90ace 100755 --- a/app/lang/bg/admin/models/general.php +++ b/app/lang/bg/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Моделът беше изтрит. Възстановяване.', + 'deleted' => 'Моделът беше изтрит. Възстановяване.', 'restore' => 'Възстановяване на модел', - 'show_mac_address' => 'Визуализиране на поле за MAC адрес в активите за този модел', + 'show_mac_address' => 'Визуализиране на поле за MAC адрес в активите за този модел', 'view_deleted' => 'Преглед на изтритите', 'view_models' => 'Преглед на моделите', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/bg/admin/settings/general.php b/app/lang/bg/admin/settings/general.php index cb47920eab..01f043c11e 100755 --- a/app/lang/bg/admin/settings/general.php +++ b/app/lang/bg/admin/settings/general.php @@ -26,27 +26,30 @@ return array( 'header_color' => 'Цвят на хедъра', 'info' => 'Тези настройки позволяват да конфигурирате различни аспекти на Вашата инсталация.', 'laravel' => 'Версия на Laravel', - 'ldap_enabled' => 'LDAP enabled', - 'ldap_integration' => 'LDAP Integration', - 'ldap_settings' => 'LDAP Settings', - 'ldap_server' => '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_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_uname' => 'LDAP потребител за връзка', + 'ldap_pword' => 'LDAP парола на потребител за връзка', + 'ldap_basedn' => 'Базов DN', + 'ldap_filter' => 'LDAP филтър', + '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 версия', diff --git a/app/lang/bg/admin/users/message.php b/app/lang/bg/admin/users/message.php index ca02c4441b..31dccb4825 100755 --- a/app/lang/bg/admin/users/message.php +++ b/app/lang/bg/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'Проблем при зареждането на потребителите. Моля опитайте отново.', 'asset_already_accepted' => 'Този актив е вече приет.', 'accept_or_decline' => 'Трябва да приемете или да откажете този актив.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'Проблем при комуникацията с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.
Грешка от LDAP сървъра: ', 'ldap_could_not_bind' => 'Проблем при връзката с LDAP сървъра. Моля прегледайте конфигурацията на LDAP.
Грешка от LDAP сървъра: ', 'ldap_could_not_search' => 'Проблем при търсенето в LDAP сървъра. Моля прегледайте конфигурацията на LDAP.
Грешка от LDAP сървъра: ', diff --git a/app/lang/bg/general.php b/app/lang/bg/general.php index 3bb27fdc3a..7ce57ccb18 100755 --- a/app/lang/bg/general.php +++ b/app/lang/bg/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Справка за дейностите', 'address' => 'Aдрес', 'admin' => 'Администриране', + 'add_seats' => 'Added seats', 'all_assets' => 'Всички активи', 'all' => 'Всички', 'archived' => 'Архивирани', @@ -30,8 +31,8 @@ 'checkin_from' => 'Форма за вписване', 'checkout' => 'Изписване', 'city' => 'Град', - 'companies' => 'Companies', - 'company' => 'Company', + 'companies' => 'Компании', + 'company' => 'Компания', 'consumable' => 'Консуматив', 'consumables' => 'Консумативи', 'country' => 'Държава', @@ -68,7 +69,7 @@ 'asset_maintenance_report' => 'Справка за поддръжка на активи', 'asset_maintenances' => 'Поддръжки на активи', 'item' => 'Информация', - 'insufficient_permissions' => 'Insufficient permissions!', + 'insufficient_permissions' => 'Нямате необходимите права!', 'last' => 'Последна', 'last_name' => 'Фамилия', 'license' => 'Лиценз', @@ -102,9 +103,10 @@ 'processing' => 'Обработка', 'profile' => 'Вашият профил', 'qty' => 'Количество', - 'quanitity' => 'Количество', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Готово за предоставяне', 'recent_activity' => 'Последни действия', + 'remove_company' => 'Remove Company Association', 'reports' => 'Справки', 'requested' => 'Изискан', 'save' => 'Запис', @@ -143,5 +145,5 @@ 'years' => 'години', 'yes' => 'Да', 'zip' => 'Пощенски код', - 'noimage' => 'No image uploaded or image not found.', + 'noimage' => 'Липсва изображение или не е качено.', ]; diff --git a/app/lang/cs/admin/accessories/general.php b/app/lang/cs/admin/accessories/general.php index 1a335c5f8b..53baa78c15 100755 --- a/app/lang/cs/admin/accessories/general.php +++ b/app/lang/cs/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Příslušenství je cokoliv, co předáte uživatelům, ale nemá to sérivoé číslo (nebo to neevidujete). Např. myš, klávesnice.', 'accessory_category' => 'Kategorie příslušenství', 'accessory_name' => 'Název příslušenství', - 'cost' => 'Purchase Cost', + 'cost' => 'Pořizovací cena', 'create' => 'Vytvoř příslušenství', - 'date' => 'Purchase Date', + 'date' => 'Datum pořízení', 'eula_text' => 'Kategorie EULA', 'eula_text_help' => 'Toto pole umožňuje upravit EULA pro různé druhy majetku. Pokud máte pouze jeden typ pro všechen majetek, můžete zaškrtnout položku níže pro použití jako výchozí.', 'require_acceptance' => 'Požadovat potvrzení převzetí majetku v této kategorii.', 'no_default_eula' => 'Žádná primární EULA. Přidat novou v Nastavení.', - 'order' => 'Order Number', + 'order' => 'Číslo objednávky', 'qty' => 'Množství', 'total' => 'CELKEM', 'remaining' => 'Dostupný', diff --git a/app/lang/cs/admin/accessories/message.php b/app/lang/cs/admin/accessories/message.php index d27d5a241c..8eb5ef508e 100755 --- a/app/lang/cs/admin/accessories/message.php +++ b/app/lang/cs/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => 'Doplněk neexistuje.', 'assoc_users' => 'Tato kategorie má nyní :count položek k předání uživatelům. Zkontrolujte převzetí příslušenství a zkuste to znovu. ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'Doplněk nebyl vytvořen, prosím zkuste to znovu.', + 'success' => 'Doplněk byl úspěšně vytvořen.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'Doplněk nebyl upraven, prosím zkuste to znovu', + 'success' => 'Doplněk byl úspěšně upraven.' ), 'delete' => array( diff --git a/app/lang/cs/admin/accessories/table.php b/app/lang/cs/admin/accessories/table.php index 7797489a3b..f2773f3e88 100755 --- a/app/lang/cs/admin/accessories/table.php +++ b/app/lang/cs/admin/accessories/table.php @@ -1,7 +1,7 @@ 'Download CSV', + 'dl_csv' => 'Stáhnout CSV', 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Přijetí', diff --git a/app/lang/cs/admin/asset_maintenances/form.php b/app/lang/cs/admin/asset_maintenances/form.php index f8602213f9..86d2d92504 100755 --- a/app/lang/cs/admin/asset_maintenances/form.php +++ b/app/lang/cs/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ 'Maintenance Type', - 'title' => 'Title', + 'asset_maintenance_type' => 'Druh údržby', + 'title' => 'Název', 'start_date' => 'Začátek', - 'completion_date' => 'Completed', + 'completion_date' => 'Dokončeno', 'cost' => 'Cena', - 'is_warranty' => 'Warranty Improvement', - 'asset_maintenance_time' => 'Days', + 'is_warranty' => 'Rozšíření záruky', + 'asset_maintenance_time' => 'Dnů', 'notes' => 'Poznámky', - 'update' => 'Update', - 'create' => 'Create' + 'update' => 'Aktualizace', + 'create' => 'Vytvořit' ]; diff --git a/app/lang/cs/admin/asset_maintenances/general.php b/app/lang/cs/admin/asset_maintenances/general.php index 0c59adaf36..e518a2fc61 100755 --- a/app/lang/cs/admin/asset_maintenances/general.php +++ b/app/lang/cs/admin/asset_maintenances/general.php @@ -1,10 +1,10 @@ 'Asset Maintenances', - 'edit' => 'Edit Asset Maintenance', - 'delete' => 'Delete Asset Maintenance', - 'view' => 'View Asset Maintenance Details', + 'asset_maintenances' => 'Záznamy o údržbě zařízení', + 'edit' => 'Upravit záznam o údržbě zařízení', + 'delete' => 'Odstranit záznam o údržbě zařízení', + 'view' => 'Zobrazit podrobnosti o údržbě zařízení', 'repair' => 'Oprava', 'maintenance' => 'Údržba', 'upgrade' => 'Upgradovat' diff --git a/app/lang/cs/admin/asset_maintenances/table.php b/app/lang/cs/admin/asset_maintenances/table.php index f139230b09..9b5d07b0af 100755 --- a/app/lang/cs/admin/asset_maintenances/table.php +++ b/app/lang/cs/admin/asset_maintenances/table.php @@ -1,7 +1,7 @@ 'Asset Maintenance', + 'title' => 'Údržba zařízení', 'asset_name' => 'Název majetku', 'supplier_name' => 'Dodavatel', 'is_warranty' => 'Záruka', diff --git a/app/lang/cs/admin/hardware/form.php b/app/lang/cs/admin/hardware/form.php index 7cb12d981b..669925e35b 100755 --- a/app/lang/cs/admin/hardware/form.php +++ b/app/lang/cs/admin/hardware/form.php @@ -1,7 +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_update' => 'Hromadná aktualizace majetku', 'bulk_update_help' => 'Tento formulář umožňuje hromadnou editaci majetku. Vyplňte pouze položky, které chcete změnit. Jakékoliv prázné položky zůstanou nezměněny. ', 'bulk_update_warn' => 'Budou se editovat vlastnosti :asset_count assets.', diff --git a/app/lang/cs/admin/hardware/message.php b/app/lang/cs/admin/hardware/message.php index af7806d1a9..6101059bd2 100755 --- a/app/lang/cs/admin/hardware/message.php +++ b/app/lang/cs/admin/hardware/message.php @@ -52,7 +52,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/cs/admin/models/general.php b/app/lang/cs/admin/models/general.php index 0a45994e78..3bae9eb115 100755 --- a/app/lang/cs/admin/models/general.php +++ b/app/lang/cs/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Model byl vymazán. Klikněte sem pro jeho obnovení.', + 'deleted' => 'Model byl vymazán. Klikněte sem pro jeho obnovení.', 'restore' => 'Obnovení Modelu', - 'show_mac_address' => 'Show MAC address field in assets in this model', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'Zobrazit smazané', 'view_models' => 'Zobrazit Modely', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/cs/admin/settings/general.php b/app/lang/cs/admin/settings/general.php index b7437b947c..7b01b18612 100755 --- a/app/lang/cs/admin/settings/general.php +++ b/app/lang/cs/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/cs/admin/users/message.php b/app/lang/cs/admin/users/message.php index 32e5fd5b57..f51e1d7833 100755 --- a/app/lang/cs/admin/users/message.php +++ b/app/lang/cs/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/cs/admin/users/table.php b/app/lang/cs/admin/users/table.php index 0bf64e4d2b..4dc391b557 100755 --- a/app/lang/cs/admin/users/table.php +++ b/app/lang/cs/admin/users/table.php @@ -4,7 +4,7 @@ return array( 'activated' => 'Aktivní', 'allow' => 'Povolit', - 'checkedout' => 'Assets', + 'checkedout' => 'Zařízení', 'created_at' => 'Vytvořeno', 'createuser' => 'Nový uživatel', 'deny' => 'Zakázat', @@ -25,8 +25,8 @@ return array( 'password_confirm' => 'Potvrzení hesla', 'password' => 'Heslo', 'phone' => 'Telefon', - 'show_current' => 'Show Current Users', - 'show_deleted' => 'Show Deleted Users', + 'show_current' => 'Zobraz aktuální uživatele', + 'show_deleted' => 'Zobraz smazané uživatele', 'title' => 'Title', 'updateuser' => 'Update User', 'username' => 'Uživatelské jméno', diff --git a/app/lang/cs/button.php b/app/lang/cs/button.php index de5a169a02..06dec4a7f9 100755 --- a/app/lang/cs/button.php +++ b/app/lang/cs/button.php @@ -8,7 +8,7 @@ return array( 'delete' => 'Smazat', 'edit' => 'Upravit', 'restore' => 'Obnovit', - 'request' => 'Request', + 'request' => 'Požadavek', 'submit' => 'Odeslat', 'upload' => 'Nahrát', diff --git a/app/lang/cs/general.php b/app/lang/cs/general.php index 1a80be2429..a2590298db 100755 --- a/app/lang/cs/general.php +++ b/app/lang/cs/general.php @@ -3,11 +3,12 @@ return [ 'accessories' => 'Příslušenství', 'accessory' => 'Příslušenství', - 'accessory_report' => 'Accessory Report', + 'accessory_report' => 'Zpráva o doplňcích', 'action' => 'Akce', 'activity_report' => 'Report aktivity', 'address' => 'Adresa', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'Všechna zařízení', 'all' => 'Vše', 'archived' => 'Archivováno', @@ -30,10 +31,10 @@ 'checkin_from' => 'Převzít od', 'checkout' => 'Výdej', 'city' => 'Město', - 'companies' => 'Companies', - 'company' => 'Company', - 'consumable' => 'Consumable', - 'consumables' => 'Consumables', + 'companies' => 'Firmy', + 'company' => 'Společnost', + 'consumable' => 'Spotřební materiál', + 'consumables' => 'Spotřební materiál', 'country' => 'Země', 'create' => 'Vytvořit nové', 'created_asset' => 'vytvořit majetek', @@ -64,11 +65,11 @@ 'image_delete' => 'Smazat obrázek', 'image_upload' => 'Nahrát obrázek', 'import' => 'Import', - 'asset_maintenance' => 'Asset Maintenance', - 'asset_maintenance_report' => 'Asset Maintenance Report', - 'asset_maintenances' => 'Asset Maintenances', + '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í', 'item' => 'Položka', - 'insufficient_permissions' => 'Insufficient permissions!', + 'insufficient_permissions' => 'Nedostatečná oprávnění!', 'last' => 'Poslední', 'last_name' => 'Příjmení', 'license' => 'Licence', @@ -101,12 +102,13 @@ 'previous' => 'Předchozí', 'processing' => 'Pracuji', 'profile' => 'Váš profil', - 'qty' => 'QTY', - 'quanitity' => 'Množství', + 'qty' => 'Množství', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Připraveno k přidělení', 'recent_activity' => 'Nedávná aktivita', + 'remove_company' => 'Remove Company Association', 'reports' => 'Reporty', - 'requested' => 'Requested', + 'requested' => 'Požadováno', 'save' => 'Uložit', 'select' => 'Zvolit', 'search' => 'Hledat', @@ -143,5 +145,5 @@ 'years' => 'roky', 'yes' => 'Ano', 'zip' => 'PSČ', - 'noimage' => 'No image uploaded or image not found.', + 'noimage' => 'Obrázek nebyl nahrán, nebo nebyl nalezen.', ]; diff --git a/app/lang/da/admin/hardware/form.php b/app/lang/da/admin/hardware/form.php index 8f3793186f..a40c709c3e 100755 --- a/app/lang/da/admin/hardware/form.php +++ b/app/lang/da/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/da/admin/hardware/message.php b/app/lang/da/admin/hardware/message.php index 03e9473cbf..403369846d 100755 --- a/app/lang/da/admin/hardware/message.php +++ b/app/lang/da/admin/hardware/message.php @@ -52,7 +52,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/da/admin/models/general.php b/app/lang/da/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/da/admin/models/general.php +++ b/app/lang/da/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/da/admin/settings/general.php b/app/lang/da/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/da/admin/settings/general.php +++ b/app/lang/da/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/da/admin/users/message.php b/app/lang/da/admin/users/message.php index e37d7301ee..a1a9757e86 100755 --- a/app/lang/da/admin/users/message.php +++ b/app/lang/da/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/da/general.php b/app/lang/da/general.php index 4489f5ad2c..c1f2314e1a 100755 --- a/app/lang/da/general.php +++ b/app/lang/da/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Addresse', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'Alle aktiver', 'all' => 'Alle', 'archived' => 'Arkiveret', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Din profil', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Klar til Implementering', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Rapporter', 'requested' => 'Requested', 'save' => 'Gem', diff --git a/app/lang/de/admin/accessories/message.php b/app/lang/de/admin/accessories/message.php index 88a6a68c16..af4c55467f 100755 --- a/app/lang/de/admin/accessories/message.php +++ b/app/lang/de/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => 'Zubehör existiert nicht.', 'assoc_users' => 'Dieses Zubehör ist derzeit an :count Benutzern zur Verwendung ausgegeben worden. Bitte buchen Sie das Zubehör wieder ein und versuchen es dann noch Einmal. ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'Zubehör wurde nicht erzeugt, bitte versuchen Sie es erneut.', + 'success' => 'Zubehör erfolgreich angelegt.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'Zubehör wurde nicht aktualisiert, bitte versuchen Sie es erneut', + 'success' => 'Zubehör wurde erfolgreich aktualisiert.' ), 'delete' => array( diff --git a/app/lang/de/admin/hardware/form.php b/app/lang/de/admin/hardware/form.php index 936e0fe9b7..bb321e1597 100755 --- a/app/lang/de/admin/hardware/form.php +++ b/app/lang/de/admin/hardware/form.php @@ -1,7 +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_update' => 'Massenaktualisierung von Assets', 'bulk_update_help' => 'Diese Eingabemaske erlaubt Ihnen die Aktualisierung von mehrere Assets zugleich. Füllen Sie die Felder aus welche Sie ändern möchten. Alle leeren Felder bleiben unverändert. ', 'bulk_update_warn' => 'Sie sind dabei die Eigenschaften von :asset_count assets zu bearbeiten.', diff --git a/app/lang/de/admin/hardware/message.php b/app/lang/de/admin/hardware/message.php index fe1fd09559..1d64e874cf 100755 --- a/app/lang/de/admin/hardware/message.php +++ b/app/lang/de/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Asset konnte nicht eingebucht werden. Bitte versuchen Sie es erneut', 'success' => 'Asset wurde erfolgreich eingebucht.', 'user_does_not_exist' => 'Dieser Benutzer existiert nicht. Bitte versuchen Sie es erneut.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/de/admin/hardware/table.php b/app/lang/de/admin/hardware/table.php index fb1469b72c..3847c20b4b 100755 --- a/app/lang/de/admin/hardware/table.php +++ b/app/lang/de/admin/hardware/table.php @@ -18,7 +18,7 @@ return array( 'serial' => 'Seriennummer', 'status' => 'Status', 'title' => 'Asset ', - 'image' => 'Device Image', + 'image' => 'Geräte-Image', 'days_without_acceptance' => 'Tage ohne Akzeptierung' ); diff --git a/app/lang/de/admin/models/general.php b/app/lang/de/admin/models/general.php index 104e1a8d5e..f195701f40 100755 --- a/app/lang/de/admin/models/general.php +++ b/app/lang/de/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Dieses Modell wurde gelöscht.klicken Sie hier um es Wiederzuherstellen.', + 'deleted' => 'Dieses Modell wurde gelöscht.klicken Sie hier um es Wiederzuherstellen.', 'restore' => 'Modell wiederherstellen', - 'show_mac_address' => 'MAC Adressen Feld anzeigen für Assets mit diesses Modell', + 'show_mac_address' => 'MAC Adressen Feld anzeigen für Assets mit diesses Modell', 'view_deleted' => 'Gelöschte anzeigen', 'view_models' => 'Modelle anzeigen', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/de/admin/settings/general.php b/app/lang/de/admin/settings/general.php index b140a1c0ac..d5a568663d 100755 --- a/app/lang/de/admin/settings/general.php +++ b/app/lang/de/admin/settings/general.php @@ -26,27 +26,30 @@ return array( 'header_color' => 'Farbe der Kopfzeile', 'info' => 'Mit diesen Einstellungen können Sie verschieden Aspekte Ihrer Installation bearbeiten.', 'laravel' => 'Laravel Version', - 'ldap_enabled' => 'LDAP enabled', + 'ldap_enabled' => 'LDAP aktiviert', 'ldap_integration' => 'LDAP Integration', - 'ldap_settings' => 'LDAP Settings', + 'ldap_settings' => 'LDAP Einstellungen', 'ldap_server' => 'LDAP Server', - 'ldap_uname' => 'LDAP Bind Username', - 'ldap_pword' => 'LDAP Bind Password', - 'ldap_basedn' => 'Base Bind DN', + '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_uname' => 'LDAP Bind Nutzername', + 'ldap_pword' => 'LDAP Bind Passwort', + 'ldap_basedn' => 'Basis 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_username_field' => 'Benutzername', + 'ldap_lname_field' => 'Familienname', + 'ldap_fname_field' => 'LDAP Vorname', + 'ldap_auth_filter_query' => 'LDAP Authentifikationsabfrage', 'ldap_version' => 'LDAP Version', - 'ldap_active_flag' => 'LDAP Active Flag', - 'ldap_emp_num' => 'LDAP Employee Number', - 'ldap_email' => 'LDAP Email', + 'ldap_active_flag' => 'LDAP Aktiv-Markierung', + 'ldap_emp_num' => 'LDAP Mitarbeiternummer', + 'ldap_email' => 'LDAP E-Mail', 'load_remote_text' => 'Remote Skripte', 'load_remote_help_text' => 'Diese Installation von Snipe-IT kann Skripte von außerhalb laden.', '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' => 'Beschränkung von Benutzern (inklusive Administratoren) die einer Firma zugewiesen sind zu den Assets der Firma.', + 'full_multiple_companies_support_text' => 'Volle Mehrmandanten-Unterstützung für Firmen', 'optional' => 'optional', 'per_page' => 'Ergebnisse pro Seite', 'php' => 'PHP Version', diff --git a/app/lang/de/admin/users/message.php b/app/lang/de/admin/users/message.php index 4d04b88bcd..362b1e0ad3 100755 --- a/app/lang/de/admin/users/message.php +++ b/app/lang/de/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'Es gab ein Problem beim importieren der Benutzer. Bitte noch einmal versuchen.', 'asset_already_accepted' => 'Dieses Asset wurde bereits akzeptiert.', 'accept_or_decline' => 'Sie müssen diesen Gegenstand entweder annehmen oder ablehnen.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:', 'ldap_could_not_bind' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server: ', 'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:', diff --git a/app/lang/de/general.php b/app/lang/de/general.php index c4e051a0a8..cf708f7286 100755 --- a/app/lang/de/general.php +++ b/app/lang/de/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Aktivitätsreport', 'address' => 'Supplier Address', 'admin' => 'Administrator', + 'add_seats' => 'Added seats', 'all_assets' => 'Alle Assets', 'all' => 'Alle', 'archived' => 'Archiviert', @@ -30,8 +31,8 @@ 'checkin_from' => 'Einchecken von', 'checkout' => 'Checkout Asset to User', 'city' => 'Stadt', - 'companies' => 'Companies', - 'company' => 'Company', + 'companies' => 'Firmen', + 'company' => 'Firma', 'consumable' => 'Verbrauchsmaterial', 'consumables' => 'Verbrauchsmaterialien', 'country' => 'Land', @@ -68,7 +69,7 @@ 'asset_maintenance_report' => 'Asset Wartungsbericht', 'asset_maintenances' => 'Asset Wartungen', 'item' => 'Gegenstand', - 'insufficient_permissions' => 'Insufficient permissions!', + 'insufficient_permissions' => 'Unzureichende Berechtigungen!', 'last' => 'Letztes', 'last_name' => 'Familienname', 'license' => 'Lizenz', @@ -102,9 +103,10 @@ 'processing' => 'In Arbeit', 'profile' => 'Ihr Profil', 'qty' => 'St', - 'quanitity' => 'Anzahl', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Fertig zum herausgeben', 'recent_activity' => 'Letzte Aktivität', + 'remove_company' => 'Remove Company Association', 'reports' => 'Berichte', 'requested' => 'Angefragt', 'save' => 'Speichern', @@ -143,5 +145,5 @@ 'years' => 'Jahre', 'yes' => 'Ja', 'zip' => 'Postal Code', - 'noimage' => 'No image uploaded or image not found.', + 'noimage' => 'Kein Bild hochgeladen oder kein Bild gefunden.', ]; diff --git a/app/lang/en-GB/admin/hardware/form.php b/app/lang/en-GB/admin/hardware/form.php index 5cadad3641..e4bf1e3f39 100755 --- a/app/lang/en-GB/admin/hardware/form.php +++ b/app/lang/en-GB/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/en-GB/admin/hardware/message.php b/app/lang/en-GB/admin/hardware/message.php index 03e9473cbf..5bd3798513 100755 --- a/app/lang/en-GB/admin/hardware/message.php +++ b/app/lang/en-GB/admin/hardware/message.php @@ -53,6 +53,11 @@ return 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.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/en-GB/admin/models/general.php b/app/lang/en-GB/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/en-GB/admin/models/general.php +++ b/app/lang/en-GB/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/en-GB/admin/settings/general.php b/app/lang/en-GB/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/en-GB/admin/settings/general.php +++ b/app/lang/en-GB/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/en-GB/admin/users/message.php b/app/lang/en-GB/admin/users/message.php index e37d7301ee..a1a9757e86 100755 --- a/app/lang/en-GB/admin/users/message.php +++ b/app/lang/en-GB/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/en-GB/general.php b/app/lang/en-GB/general.php index 91eed71c20..4874c040dd 100755 --- a/app/lang/en-GB/general.php +++ b/app/lang/en-GB/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'All Assets', 'all' => 'All', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Your profile', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Ready to Deploy', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'requested' => 'Requested', 'save' => 'Save', diff --git a/app/lang/en-ID/admin/accessories/general.php b/app/lang/en-ID/admin/accessories/general.php index a908d4e149..740b0d2c4d 100755 --- a/app/lang/en-ID/admin/accessories/general.php +++ b/app/lang/en-ID/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Aksesoris adalah Aset yang tidak memiliki nomor seri (atau Anda tidak peduli tentang pelacakan mereka secara unik). Misalnya, mouse komputer atau keyboard.', 'accessory_category' => 'Kategori Aksesoris', 'accessory_name' => 'Nama Aksesoris', - 'cost' => 'Purchase Cost', + 'cost' => 'Harga Beli', 'create' => 'Buat Aksesoris', - 'date' => 'Purchase Date', + 'date' => 'Tanggal Pembelian', 'eula_text' => 'Kategori EULA', 'eula_text_help' => 'Bidang ini memungkinkan Anda untuk menyesuaikan EULA Anda untuk jenis tertentu dari aset. Jika Anda hanya memiliki satu EULA untuk semua aset Anda, Anda dapat memeriksa kotak di bawah untuk menggunakan default primer.', 'require_acceptance' => 'Mengharuskan pengguna untuk mengkonfirmasi penerimaan aset dalam kategori ini.', 'no_default_eula' => 'Tidak ada EULA standar utama yang ditemukan. Tambahkan satu di Settings.', - 'order' => 'Order Number', + 'order' => 'Nomor Pembelian', 'qty' => 'QTY', 'total' => 'Total', 'remaining' => 'Tersedia', diff --git a/app/lang/en-ID/admin/accessories/message.php b/app/lang/en-ID/admin/accessories/message.php index 278d8269a5..1bf7a63ba7 100755 --- a/app/lang/en-ID/admin/accessories/message.php +++ b/app/lang/en-ID/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => 'Aksesori tidak ditemukan.', 'assoc_users' => 'Aksesori saat ini memiliki :count item untuk pengguna. Silahkan cek di aksesoris dan dan coba lagi. ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'Aksesori tidak dapat dibuat, silahkan coba kembali.', + 'success' => 'Aksesori berhasil dibuat.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'Aksesori tidak dapat diperbaharui, silahkan coba kembali', + 'success' => 'Aksesori berhasil diperbaharui.' ), 'delete' => array( diff --git a/app/lang/en-ID/admin/consumables/general.php b/app/lang/en-ID/admin/consumables/general.php index 9c0f05e1d9..3de428a624 100755 --- a/app/lang/en-ID/admin/consumables/general.php +++ b/app/lang/en-ID/admin/consumables/general.php @@ -4,10 +4,10 @@ return array( 'about_consumables_title' => 'Tentang Consumables', 'about_consumables_text' => 'Consumables adalah sesuatu yang dibeli yang akan digunakan dari waktu ke waktu. Misalnya, tinta printer atau kertas fotokopi.', 'consumable_name' => 'Nama Consumable', - 'cost' => 'Purchase Cost', + 'cost' => 'Harga Beli', 'create' => 'Buat Consumable', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'date' => 'Tanggal Pembelian', + 'order' => 'Nomor Pembelian', 'remaining' => 'Tersisa', 'total' => 'Total', 'update' => 'Update Consumable', diff --git a/app/lang/en-ID/admin/hardware/form.php b/app/lang/en-ID/admin/hardware/form.php index ea4d98ddf1..5189e1b3f5 100755 --- a/app/lang/en-ID/admin/hardware/form.php +++ b/app/lang/en-ID/admin/hardware/form.php @@ -1,7 +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_update' => 'Perbarui Aset secara massal', 'bulk_update_help' => 'Formulir ini memungkinkan Anda untuk memperbarui beberapa aset sekaligus. Hanya mengisi kolom yang Anda butuhkan untuk mengubah. Setiap bidang dibiarkan kosong tidak berubah. ', 'bulk_update_warn' => 'Anda akan mengedit properti :asset_count aset.', @@ -10,33 +12,33 @@ return array( 'checkin_date' => 'Tanggal Check in', 'checkout_to' => 'Checkout to', 'cost' => 'Purchase Cost', - 'create' => 'Create Asset', + 'create' => 'Buat Aset', 'date' => 'Purchase Date', 'depreciates_on' => 'Depreciates On', 'depreciation' => 'Depreciation', - 'default_location' => 'Default Location', + 'default_location' => 'Lokasi Standar', 'eol_date' => 'EOL Date', 'eol_rate' => 'EOL Rate', 'expected_checkin' => 'Expected Checkin Date', - 'expires' => 'Expires', + 'expires' => 'Kadaluarsa', 'fully_depreciated' => 'Fully Depreciated', 'help_checkout' => 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ', 'mac_address' => 'MAC Address', 'manufacturer' => 'Manufacturer', 'model' => 'Model', - 'months' => 'months', - 'name' => 'Asset Name', - 'notes' => 'Notes', + 'months' => 'bulan', + 'name' => 'Nama Aset', + 'notes' => 'Catatan', 'order' => 'Order Number', 'qr' => 'QR Code', 'requestable' => 'Users may request this asset', - 'select_statustype' => 'Select Status Type', + 'select_statustype' => 'Pilih Jenis Status', 'serial' => 'Serial', 'status' => 'Status', - 'supplier' => 'Supplier', + 'supplier' => 'Pemasok', 'tag' => 'Asset Tag', 'update' => 'Asset Update', - 'warranty' => 'Warranty', - 'years' => 'years', + 'warranty' => 'Garansi', + 'years' => 'tahun', ) ; diff --git a/app/lang/en-ID/admin/hardware/message.php b/app/lang/en-ID/admin/hardware/message.php index 03e9473cbf..403369846d 100755 --- a/app/lang/en-ID/admin/hardware/message.php +++ b/app/lang/en-ID/admin/hardware/message.php @@ -52,7 +52,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/en-ID/admin/models/general.php b/app/lang/en-ID/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/en-ID/admin/models/general.php +++ b/app/lang/en-ID/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/en-ID/admin/settings/general.php b/app/lang/en-ID/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/en-ID/admin/settings/general.php +++ b/app/lang/en-ID/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/en-ID/admin/users/message.php b/app/lang/en-ID/admin/users/message.php index e37d7301ee..a1a9757e86 100755 --- a/app/lang/en-ID/admin/users/message.php +++ b/app/lang/en-ID/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/en-ID/general.php b/app/lang/en-ID/general.php index 026a6c9068..a352c2c3e3 100755 --- a/app/lang/en-ID/general.php +++ b/app/lang/en-ID/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'All Assets', 'all' => 'All', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Your profile', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Ready to Deploy', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'requested' => 'Requested', 'save' => 'Save', diff --git a/app/lang/en/admin/accessories/message.php b/app/lang/en/admin/accessories/message.php index e324708ff3..0bc8cd581c 100755 --- a/app/lang/en/admin/accessories/message.php +++ b/app/lang/en/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + '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. ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'The accessory was not created, please try again.', + 'success' => 'The accessory was successfully created.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'The accessory was not updated, please try again', + 'success' => 'The accessory was updated successfully.' ), 'delete' => array( diff --git a/app/lang/en/admin/custom_fields/general.php b/app/lang/en/admin/custom_fields/general.php new file mode 100644 index 0000000000..7182fecfdc --- /dev/null +++ b/app/lang/en/admin/custom_fields/general.php @@ -0,0 +1,23 @@ + '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', +); diff --git a/app/lang/en/admin/custom_fields/message.php b/app/lang/en/admin/custom_fields/message.php new file mode 100644 index 0000000000..0d34afa9e8 --- /dev/null +++ b/app/lang/en/admin/custom_fields/message.php @@ -0,0 +1,57 @@ + array( + 'invalid' => 'That field does not exist.', + 'already_added' => 'Field already added', + + 'create' => array( + 'error' => 'Field was not created, please try again.', + 'success' => 'Field created successfully.', + 'assoc_success' => 'Field successfully added to fieldset.' + ), + + 'update' => array( + 'error' => 'Field was not updated, please try again', + 'success' => 'Field updated successfully.' + ), + + '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.', + ) + + ), + + 'fieldset' => array( + + + + 'create' => array( + 'error' => 'Fieldset was not created, please try again.', + 'success' => 'Fieldset created successfully.' + ), + + 'update' => array( + 'error' => 'Fieldset was not updated, please try again', + 'success' => 'Fieldset updated successfully.' + ), + + '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.', + ) + + ), + + + + + + +); diff --git a/app/lang/en/admin/hardware/form.php b/app/lang/en/admin/hardware/form.php index 5cadad3641..4428e8f223 100755 --- a/app/lang/en/admin/hardware/form.php +++ b/app/lang/en/admin/hardware/form.php @@ -1,7 +1,9 @@ 'Confirm 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.', diff --git a/app/lang/en/admin/hardware/message.php b/app/lang/en/admin/hardware/message.php index 03e9473cbf..5bd3798513 100755 --- a/app/lang/en/admin/hardware/message.php +++ b/app/lang/en/admin/hardware/message.php @@ -53,6 +53,11 @@ return 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.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/en/admin/locations/table.php b/app/lang/en/admin/locations/table.php index 57e38b3c02..921d0dd66c 100755 --- a/app/lang/en/admin/locations/table.php +++ b/app/lang/en/admin/locations/table.php @@ -1,7 +1,7 @@ 'Assets RTD', + 'assets_rtd' => 'Assets Retired', 'assets_checkedout' => 'Assets Assigned', 'id' => 'ID', 'city' => 'City', diff --git a/app/lang/en/admin/models/general.php b/app/lang/en/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/en/admin/models/general.php +++ b/app/lang/en/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/en/admin/settings/general.php b/app/lang/en/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/en/admin/settings/general.php +++ b/app/lang/en/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/en/admin/users/message.php b/app/lang/en/admin/users/message.php index e37d7301ee..a1a9757e86 100755 --- a/app/lang/en/admin/users/message.php +++ b/app/lang/en/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/en/general.php b/app/lang/en/general.php index 8fa01f3f1a..f1b31b208b 100755 --- a/app/lang/en/general.php +++ b/app/lang/en/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'All Assets', 'all' => 'All', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Your profile', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Ready to Deploy', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'requested' => 'Requested', 'save' => 'Save', diff --git a/app/lang/es-CO/admin/accessories/general.php b/app/lang/es-CO/admin/accessories/general.php index b7955c5d22..48e727eec7 100755 --- a/app/lang/es-CO/admin/accessories/general.php +++ b/app/lang/es-CO/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Accesorios son cualquier cosa que entregues a los usuarios pero que no tenga numero de serie (o no te interese seguirlos). Por ejemplo, ratones o teclados.', 'accessory_category' => 'Categoría de accesorio', 'accessory_name' => 'Nombre de accesorio', - 'cost' => 'Purchase Cost', + 'cost' => 'Precio', 'create' => 'Crear Accesorio', - 'date' => 'Purchase Date', + 'date' => 'Fecha', 'eula_text' => 'Categoría EULA', 'eula_text_help' => 'Este campo permite personalizar sus EULAs para tipos específicos de equipos. Si solo tiene un EULA para todos sus equipos, puede seleccionar la siguiente opción para usar el valor por defecto.', 'require_acceptance' => 'Requerir confirmación de usuarios para la aceptación de equipos en esta categoría.', 'no_default_eula' => 'No se encontró un EULA por defecto. Agregue uno en Configuración.', - 'order' => 'Order Number', + 'order' => 'Nº Pedido', 'qty' => 'Cantidad', 'total' => 'Total ', 'remaining' => 'Disponibles', diff --git a/app/lang/es-CO/admin/accessories/message.php b/app/lang/es-CO/admin/accessories/message.php index 95c12a695d..fab85f47c7 100755 --- a/app/lang/es-CO/admin/accessories/message.php +++ b/app/lang/es-CO/admin/accessories/message.php @@ -2,35 +2,35 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => 'Accesorio no existe.', 'assoc_users' => 'Este accesorio actualmente tiene :count entregados a usuarios. Por favor ingrese los accesorios y vuelva a intentar. ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'Accesorio no fue creado, por favor vuelva a intentarlo.', + 'success' => 'Accesorio creado satisfactoriamente.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'Accesorio no fue actualizado, por favor, inténtalo de nuevo', + 'success' => 'Accesorio creado satisfactoriamente.' ), 'delete' => array( - 'confirm' => 'Are you sure you wish to delete this category?', - 'error' => 'There was an issue deleting the category. Please try again.', - 'success' => 'The category was deleted successfully.' + 'confirm' => 'Estás seguro de eliminar esta categoría?', + 'error' => 'Ha habido un problema eliminando la categoría. Intentalo de nuevo.', + 'success' => 'La categoría fue eliminada exitosamente.' ), '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' => 'El accesorio no fue retirado, por favor vuelva a intentarlo', + 'success' => 'Accesorio retirado correctamente.', + 'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.' ), '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' => 'El accesorio no fue agregado, favor vuelva a intentarlo', + 'success' => 'Accesorio devuelto correctamente.', + 'user_does_not_exist' => 'Este usuario es inválido. Inténtalo de nuevo.' ) diff --git a/app/lang/es-CO/admin/accessories/table.php b/app/lang/es-CO/admin/accessories/table.php index e02d9f22e4..071d960418 100755 --- a/app/lang/es-CO/admin/accessories/table.php +++ b/app/lang/es-CO/admin/accessories/table.php @@ -1,11 +1,11 @@ 'Download CSV', + 'dl_csv' => 'Descargar CSV', 'eula_text' => 'EULA', 'id' => 'ID', - 'require_acceptance' => 'Acceptance', - 'title' => 'Accessory Name', + 'require_acceptance' => 'Aceptación', + 'title' => 'Nombre de accesorio', ); diff --git a/app/lang/es-CO/admin/asset_maintenances/form.php b/app/lang/es-CO/admin/asset_maintenances/form.php index 2aa005c45f..22cfe26eda 100755 --- a/app/lang/es-CO/admin/asset_maintenances/form.php +++ b/app/lang/es-CO/admin/asset_maintenances/form.php @@ -1,14 +1,14 @@ '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' => 'Tipo de Mantenimiento', + 'title' => 'Puesto', + 'start_date' => 'Comenzado', + 'completion_date' => 'Terminado', + 'cost' => 'Precio', + 'is_warranty' => 'Mejora de la Garantía', + 'asset_maintenance_time' => 'Dias', + 'notes' => 'Notas', + 'update' => 'Actualizar', + 'create' => 'Crear' ]; diff --git a/app/lang/es-CO/admin/asset_maintenances/general.php b/app/lang/es-CO/admin/asset_maintenances/general.php index c7ae42d41a..28f8a7531e 100755 --- a/app/lang/es-CO/admin/asset_maintenances/general.php +++ b/app/lang/es-CO/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' => 'Mantenimiento de Activos', + 'edit' => 'Editar Mantenimiento de Activos', + 'delete' => 'Eliminar Mantenimiento de Activos', + 'view' => 'Ver Detalles de Mantenimiento de Activos', + 'repair' => 'Reparación', + 'maintenance' => 'Mantenimiento', + 'upgrade' => 'Mejora' ]; diff --git a/app/lang/es-CO/admin/asset_maintenances/message.php b/app/lang/es-CO/admin/asset_maintenances/message.php index ca4256efbe..daace80c32 100755 --- a/app/lang/es-CO/admin/asset_maintenances/message.php +++ b/app/lang/es-CO/admin/asset_maintenances/message.php @@ -1,17 +1,17 @@ 'Asset Maintenance you were looking for was not found!', + 'not_found' => 'Mantenimiento de Activos que estás buscando no fue encontrado!', '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' => '¿Está seguro que desea eliminar este mantenimiento de activo?', + 'error' => 'Hubo un problema al eliminar el mantenimiento del activo. Por favor intentelo nuevamente.', + 'success' => 'El mantenimiento del activo fue eliminado de manera exitosa.' ], 'create' => [ - 'error' => 'Asset Maintenance was not created, please try again.', - 'success' => 'Asset Maintenance created successfully.' + 'error' => 'Mantenimiento de Activos no fue creado, por favor intentelo de nuevo.', + 'success' => 'Mantenimiento de Activo creado correctamente.' ], - 'asset_maintenance_incomplete' => 'Not Completed Yet', - 'warranty' => 'Warranty', - 'not_warranty' => 'Not Warranty', + 'asset_maintenance_incomplete' => 'Sin Completar', + 'warranty' => 'Garantía', + 'not_warranty' => 'Sin Garantía', ]; \ No newline at end of file diff --git a/app/lang/es-CO/admin/hardware/form.php b/app/lang/es-CO/admin/hardware/form.php index 5cadad3641..e4bf1e3f39 100755 --- a/app/lang/es-CO/admin/hardware/form.php +++ b/app/lang/es-CO/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/es-CO/admin/hardware/message.php b/app/lang/es-CO/admin/hardware/message.php index 03e9473cbf..403369846d 100755 --- a/app/lang/es-CO/admin/hardware/message.php +++ b/app/lang/es-CO/admin/hardware/message.php @@ -52,7 +52,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/es-CO/admin/models/general.php b/app/lang/es-CO/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/es-CO/admin/models/general.php +++ b/app/lang/es-CO/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/es-CO/admin/settings/general.php b/app/lang/es-CO/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/es-CO/admin/settings/general.php +++ b/app/lang/es-CO/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/es-CO/admin/users/message.php b/app/lang/es-CO/admin/users/message.php index e37d7301ee..a1a9757e86 100755 --- a/app/lang/es-CO/admin/users/message.php +++ b/app/lang/es-CO/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/es-CO/general.php b/app/lang/es-CO/general.php index 8fa01f3f1a..f1b31b208b 100755 --- a/app/lang/es-CO/general.php +++ b/app/lang/es-CO/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'All Assets', 'all' => 'All', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Your profile', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Ready to Deploy', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'requested' => 'Requested', 'save' => 'Save', diff --git a/app/lang/es-ES/admin/hardware/form.php b/app/lang/es-ES/admin/hardware/form.php index 0183541967..a62c59c947 100755 --- a/app/lang/es-ES/admin/hardware/form.php +++ b/app/lang/es-ES/admin/hardware/form.php @@ -1,7 +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_update' => 'Actualización masiva de Equipos', 'bulk_update_help' => 'Este formulario le permite actualizar múltiples Equipos simultáneamente. Solo complete los campos que quiere modificar. Todo campo en blanco permanecerá sin cambios. ', 'bulk_update_warn' => 'Esta a punto de editar las propiedades de :asset_count equipos.', diff --git a/app/lang/es-ES/admin/hardware/message.php b/app/lang/es-ES/admin/hardware/message.php index ec5a02ae44..1aaabb2c5c 100755 --- a/app/lang/es-ES/admin/hardware/message.php +++ b/app/lang/es-ES/admin/hardware/message.php @@ -53,6 +53,11 @@ return 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.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/es-ES/admin/models/general.php b/app/lang/es-ES/admin/models/general.php index 79b3933926..473cfc6348 100755 --- a/app/lang/es-ES/admin/models/general.php +++ b/app/lang/es-ES/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.', + 'deleted' => 'Este modelo ha sido borrado.Click aquí para restaurarlo.', 'restore' => 'Restaurar Modelo', - 'show_mac_address' => 'Mostrar el campo de la dirección MAC en los equipos de este modelo', + 'show_mac_address' => 'Mostrar el campo de la dirección MAC en los equipos de este modelo', 'view_deleted' => 'Ver Borrados', 'view_models' => 'Ver Modelos', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/es-ES/admin/settings/general.php b/app/lang/es-ES/admin/settings/general.php index 22d3023ba5..1dd0e2dca4 100755 --- a/app/lang/es-ES/admin/settings/general.php +++ b/app/lang/es-ES/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/es-ES/admin/users/message.php b/app/lang/es-ES/admin/users/message.php index 834273c860..5cbcfa9da0 100755 --- a/app/lang/es-ES/admin/users/message.php +++ b/app/lang/es-ES/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'Ha habido un problema importando los usuarios. Por favor intente nuevamente.', 'asset_already_accepted' => 'Este equipo ya ha sido aceptado.', 'accept_or_decline' => 'Debe aceptar o declinar este equipo.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'No se ha podido conectar con el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:', 'ldap_could_not_bind' => 'No se ha podido vincular con el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP: ', 'ldap_could_not_search' => 'No se ha podido buscar en el servidor LDAP. Por favor verifique la configuración de su servidor LDAP en su archivo de configuración.
Error del servidor LDAP:', diff --git a/app/lang/es-ES/general.php b/app/lang/es-ES/general.php index e518fb9d31..1962ecac33 100755 --- a/app/lang/es-ES/general.php +++ b/app/lang/es-ES/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Reporte de Actividad', 'address' => 'Dirección', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'Todos los Equipos', 'all' => 'Todos los', 'archived' => 'Archivado', @@ -102,9 +103,10 @@ 'processing' => 'Procesando', 'profile' => 'Perfil', 'qty' => 'Cant', - 'quanitity' => 'Cantidad', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Disponibles', 'recent_activity' => 'Actividad Reciente', + 'remove_company' => 'Remove Company Association', 'reports' => 'Informes', 'requested' => 'Solicitado', 'save' => 'Guardar', diff --git a/app/lang/fi/admin/hardware/form.php b/app/lang/fi/admin/hardware/form.php index 1c3bff5b7c..3de4f1dc5f 100755 --- a/app/lang/fi/admin/hardware/form.php +++ b/app/lang/fi/admin/hardware/form.php @@ -1,7 +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_update' => 'Massapäivitä Laitteita', 'bulk_update_help' => 'Tämän lomakkeen avulla voit päivittää useita laitteita kerralla. Täytä vain ne kentät joita haluat muuttaa. Tyhjäksi jätetyt kenttyihin kenttiä ei päivitetä. ', 'bulk_update_warn' => 'Olet päivittämässä :asset_count laitteen ominaisuuksia.', diff --git a/app/lang/fi/admin/hardware/message.php b/app/lang/fi/admin/hardware/message.php index c861442e90..356fb938bc 100755 --- a/app/lang/fi/admin/hardware/message.php +++ b/app/lang/fi/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Laitteen palautus epäonnistui, yritä uudelleen', 'success' => 'Laite palautettu onnistuneesti.', 'user_does_not_exist' => 'Käyttäjä on virheellinen. Yritä uudelleen.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/fi/admin/models/general.php b/app/lang/fi/admin/models/general.php index 3b3daf989b..56afb2f80f 100755 --- a/app/lang/fi/admin/models/general.php +++ b/app/lang/fi/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + 'deleted' => 'This model has been deleted. Click here to restore it.', 'restore' => 'Restore Model', - 'show_mac_address' => 'Näytä MAC-osoitekenttä tämän mallin laitteille', + 'show_mac_address' => 'Näytä MAC-osoitekenttä tämän mallin laitteille', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/fi/admin/settings/general.php b/app/lang/fi/admin/settings/general.php index 8bb3852e09..d2697be12d 100755 --- a/app/lang/fi/admin/settings/general.php +++ b/app/lang/fi/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/fi/admin/users/message.php b/app/lang/fi/admin/users/message.php index dd1a0df7ca..ec36452015 100755 --- a/app/lang/fi/admin/users/message.php +++ b/app/lang/fi/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/fi/general.php b/app/lang/fi/general.php index 3d0f8f8352..442452b5aa 100755 --- a/app/lang/fi/general.php +++ b/app/lang/fi/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Osoite', 'admin' => 'Ylläpitäjä', + 'add_seats' => 'Added seats', 'all_assets' => 'Kaikki Laitteet', 'all' => 'Kaikki', 'archived' => 'Arkistoitu', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Profiilisi', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Käyttöönotettavissa', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Raportit', 'requested' => 'Requested', 'save' => 'Tallenna', diff --git a/app/lang/fr/admin/hardware/form.php b/app/lang/fr/admin/hardware/form.php index 7d9884dbaf..9733d2cee3 100755 --- a/app/lang/fr/admin/hardware/form.php +++ b/app/lang/fr/admin/hardware/form.php @@ -1,7 +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_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. ', 'bulk_update_warn' => 'Vous êtes sur le point de modifier les propriétés de l\'actif :asset_count .', diff --git a/app/lang/fr/admin/hardware/message.php b/app/lang/fr/admin/hardware/message.php index 010e87831a..222a2829cc 100755 --- a/app/lang/fr/admin/hardware/message.php +++ b/app/lang/fr/admin/hardware/message.php @@ -53,6 +53,11 @@ return 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.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/fr/admin/models/general.php b/app/lang/fr/admin/models/general.php index f77c1d6af6..5d4d417fa0 100755 --- a/app/lang/fr/admin/models/general.php +++ b/app/lang/fr/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Ce modèle a été détruit. Cliquez ici pour le restaurer.', + 'deleted' => 'Ce modèle a été détruit. Cliquez ici pour le restaurer.', 'restore' => 'Restaurer le modèle', - 'show_mac_address' => 'Afficher le champ pour l\'adresse MAC pour ce modèle d\'actif', + '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', ); diff --git a/app/lang/fr/admin/settings/general.php b/app/lang/fr/admin/settings/general.php index 5163c8c82c..d9984abb1c 100755 --- a/app/lang/fr/admin/settings/general.php +++ b/app/lang/fr/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/fr/admin/users/message.php b/app/lang/fr/admin/users/message.php index 4529e91b83..e2ee955dc7 100755 --- a/app/lang/fr/admin/users/message.php +++ b/app/lang/fr/admin/users/message.php @@ -33,6 +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.', '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/app/lang/fr/general.php b/app/lang/fr/general.php index 96a0aa2025..27414c64b2 100755 --- a/app/lang/fr/general.php +++ b/app/lang/fr/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Rapport d\'activité', 'address' => 'Adresse', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'Tous les actifs', 'all' => 'Tous', 'archived' => 'Retiré', @@ -102,9 +103,10 @@ 'processing' => 'En cours de traitement', 'profile' => 'Votre profil', 'qty' => 'QTÉ', - 'quanitity' => 'Quantité', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Prêt à être déployé', 'recent_activity' => 'Activité récente', + 'remove_company' => 'Remove Company Association', 'reports' => 'Rapports', 'requested' => 'Demandé', 'save' => 'Sauvegarder', diff --git a/app/lang/hr/admin/hardware/form.php b/app/lang/hr/admin/hardware/form.php index 5cadad3641..e4bf1e3f39 100755 --- a/app/lang/hr/admin/hardware/form.php +++ b/app/lang/hr/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/hr/admin/hardware/message.php b/app/lang/hr/admin/hardware/message.php index 03e9473cbf..403369846d 100755 --- a/app/lang/hr/admin/hardware/message.php +++ b/app/lang/hr/admin/hardware/message.php @@ -52,7 +52,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/hr/admin/models/general.php b/app/lang/hr/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/hr/admin/models/general.php +++ b/app/lang/hr/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/hr/admin/settings/general.php b/app/lang/hr/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/hr/admin/settings/general.php +++ b/app/lang/hr/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/hr/admin/users/message.php b/app/lang/hr/admin/users/message.php index e37d7301ee..a1a9757e86 100755 --- a/app/lang/hr/admin/users/message.php +++ b/app/lang/hr/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/hr/general.php b/app/lang/hr/general.php index 8fa01f3f1a..f1b31b208b 100755 --- a/app/lang/hr/general.php +++ b/app/lang/hr/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Address', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'All Assets', 'all' => 'All', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Your profile', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Ready to Deploy', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'requested' => 'Requested', 'save' => 'Save', diff --git a/app/lang/hu/admin/hardware/form.php b/app/lang/hu/admin/hardware/form.php index e5b1dd51f4..4fd7563696 100755 --- a/app/lang/hu/admin/hardware/form.php +++ b/app/lang/hu/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/hu/admin/hardware/message.php b/app/lang/hu/admin/hardware/message.php index 03e9473cbf..403369846d 100755 --- a/app/lang/hu/admin/hardware/message.php +++ b/app/lang/hu/admin/hardware/message.php @@ -52,7 +52,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/hu/admin/models/general.php b/app/lang/hu/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/hu/admin/models/general.php +++ b/app/lang/hu/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/hu/admin/settings/general.php b/app/lang/hu/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/hu/admin/settings/general.php +++ b/app/lang/hu/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/hu/admin/users/message.php b/app/lang/hu/admin/users/message.php index cfb8c43888..88181565cc 100755 --- a/app/lang/hu/admin/users/message.php +++ b/app/lang/hu/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/hu/general.php b/app/lang/hu/general.php index 37c53c3a44..b090ec7200 100755 --- a/app/lang/hu/general.php +++ b/app/lang/hu/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Cím', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'All Assets', 'all' => 'All', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Your profile', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Ready to Deploy', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'requested' => 'Requested', 'save' => 'Mentés', diff --git a/app/lang/it/admin/hardware/form.php b/app/lang/it/admin/hardware/form.php index d3e7a569ea..a279732b22 100755 --- a/app/lang/it/admin/hardware/form.php +++ b/app/lang/it/admin/hardware/form.php @@ -1,7 +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_update' => 'Aggiornamento quantità beni', 'bulk_update_help' => 'Questo modulo consente di aggiornare più risorse in una sola volta. Riempire solo i campi che è necessario cambiare. Tutti i campi lasciati vuoti rimarranno invariati. ', 'bulk_update_warn' => 'Stai per modificare le proprietà di :asset_count beni.', diff --git a/app/lang/it/admin/hardware/message.php b/app/lang/it/admin/hardware/message.php index 876bc39931..29dfa08c4f 100755 --- a/app/lang/it/admin/hardware/message.php +++ b/app/lang/it/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Il bene non è stato registrato, per favore riprova', 'success' => 'Il bene è stato registrato con successo.', 'user_does_not_exist' => 'Questo utente non è valido. Riprova.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/it/admin/models/general.php b/app/lang/it/admin/models/general.php index 599ad024da..8bf7d50a58 100755 --- a/app/lang/it/admin/models/general.php +++ b/app/lang/it/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Questo modello è stato eliminato.Clicca qui per ripristinarlo.', + 'deleted' => 'Questo modello è stato eliminato.Clicca qui per ripristinarlo.', 'restore' => 'Ripristinare il modello', - 'show_mac_address' => 'Mostra MAC Address dei beni in questo modello', + 'show_mac_address' => 'Mostra MAC Address dei beni in questo modello', 'view_deleted' => 'Visualizza Eliminati', 'view_models' => 'Visualizza i modelli', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/it/admin/settings/general.php b/app/lang/it/admin/settings/general.php index 562cefb131..a11aa24e21 100755 --- a/app/lang/it/admin/settings/general.php +++ b/app/lang/it/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/it/admin/users/message.php b/app/lang/it/admin/users/message.php index 82a4b6c7db..c69532ccf8 100755 --- a/app/lang/it/admin/users/message.php +++ b/app/lang/it/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'C\'è stato un problema durante l\'importazione degli utenti. Riprova per favore.', 'asset_already_accepted' => 'Questo bene è già stato accettato.', 'accept_or_decline' => 'Devi accettare o rifiutare questo prodotto.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'Impossibile connettersi al server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.
Errori dal server LDAP:', 'ldap_could_not_bind' => 'Impossibile unirsi al server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.
Errori dal server LDAP: ', 'ldap_could_not_search' => 'Impossibile trovare il server LDAP. Controlla la configurazione del tuo server LDAP nel file di configurazione LDAP.
Errori dal server LDAP:', diff --git a/app/lang/it/general.php b/app/lang/it/general.php index 03a277d701..865db03313 100755 --- a/app/lang/it/general.php +++ b/app/lang/it/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Rapporto sull\'attività', 'address' => 'Indirizzo', 'admin' => 'Amministratore', + 'add_seats' => 'Added seats', 'all_assets' => 'Tutti gli Asset', 'all' => 'Tutti', 'archived' => 'Archiviato', @@ -102,9 +103,10 @@ 'processing' => 'In elaborazione', 'profile' => 'Il tuo profilo', 'qty' => 'Quantità', - 'quanitity' => 'Quantità', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Pronto per il rilascio', 'recent_activity' => 'Attività Recenti', + 'remove_company' => 'Remove Company Association', 'reports' => 'Reports', 'requested' => 'Richiesto', 'save' => 'Salva', diff --git a/app/lang/ja/admin/accessories/message.php b/app/lang/ja/admin/accessories/message.php index 8f5da08d39..dcd2162aae 100755 --- a/app/lang/ja/admin/accessories/message.php +++ b/app/lang/ja/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', - 'assoc_users' => 'この付属品は、利用者に :count 個チェックされていません。もう一度、付属品をチェックして下さい。 ', + 'does_not_exist' => '付属品は存在しません。', + 'assoc_users' => 'この付属品は、ユーザーに :count 個貸し出されています。もう一度、付属品を返却して下さい。 ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => '付属品は作成されていません。もう一度やり直してください。', + 'success' => '付属品は正常に作成されました。' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => '付属品は更新されませんでした。もう一度、やり直して下さい。', + 'success' => '付属品は正常に更新されました。' ), 'delete' => array( diff --git a/app/lang/ja/admin/hardware/form.php b/app/lang/ja/admin/hardware/form.php index 1d58cee323..fca9f6e9ef 100755 --- a/app/lang/ja/admin/hardware/form.php +++ b/app/lang/ja/admin/hardware/form.php @@ -1,7 +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_update' => '資産を一括更新', 'bulk_update_help' => 'このフォームは一度に複数の資産を更新することが可能です。変更が必要なフィールドにのみ入力をして下さい。ブランクのフィールドは変更されません。 ', 'bulk_update_warn' => '資産群（:asset_count）のプロパティを編集します。', diff --git a/app/lang/ja/admin/hardware/message.php b/app/lang/ja/admin/hardware/message.php index 38950ff4d8..bfc02a9995 100755 --- a/app/lang/ja/admin/hardware/message.php +++ b/app/lang/ja/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => '資産はチェックインされませんでした。もう一度、やり直して下さい。', 'success' => '資産は正常にチェックインされました。', 'user_does_not_exist' => 'その利用者は不正です。もう一度、やり直して下さい。' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/ja/admin/hardware/table.php b/app/lang/ja/admin/hardware/table.php index 99467c102a..b0fe2b8264 100755 --- a/app/lang/ja/admin/hardware/table.php +++ b/app/lang/ja/admin/hardware/table.php @@ -18,7 +18,7 @@ return array( 'serial' => 'シリアル', 'status' => '状態', 'title' => '資産 ', - 'image' => 'Device Image', + 'image' => '写真', 'days_without_acceptance' => '未受理期間' ); diff --git a/app/lang/ja/admin/models/general.php b/app/lang/ja/admin/models/general.php index 410e25b7fc..e20e9f924d 100755 --- a/app/lang/ja/admin/models/general.php +++ b/app/lang/ja/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'この型番は削除されました。元に戻すにはココをクリックして下さい。.', + 'deleted' => 'この型番は削除されました。元に戻すにはココをクリックして下さい。.', 'restore' => '型番を復元', - 'show_mac_address' => 'この型番の資産にMACアドレスフィールドを表示', + 'show_mac_address' => 'この型番の資産にMACアドレスフィールドを表示', 'view_deleted' => '削除したものを表示', 'view_models' => '型番を表示', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/ja/admin/settings/general.php b/app/lang/ja/admin/settings/general.php index c16d3493d4..a0392e1133 100755 --- a/app/lang/ja/admin/settings/general.php +++ b/app/lang/ja/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/ja/admin/users/message.php b/app/lang/ja/admin/users/message.php index 4d2b9a6663..2ff88417ef 100755 --- a/app/lang/ja/admin/users/message.php +++ b/app/lang/ja/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => '利用者をインポートする際に問題が発生しました。もう一度、やり直して下さい。', 'asset_already_accepted' => 'この資産は既に承認されています。', 'accept_or_decline' => 'あなたはこの資産を承認もしくは却下しなけれなばなりません。', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'LDAPサーバーに接続できません。LDAP設定ファイル内のサーバー設定を確認して下さい。
LDAPサーバーからのエラー:', 'ldap_could_not_bind' => 'LDAPサーバーにバインドできません。LDAP設定ファイル内のサーバー設定を確認して下さい。
LDAPサーバーからのエラー: ', 'ldap_could_not_search' => 'LDAPサーバーを検索できません。LDAP設定ファイル内のサーバー設定を確認して下さい。
LDAPサーバーからのエラー:', diff --git a/app/lang/ja/general.php b/app/lang/ja/general.php index c8b5eb9be9..4f6326d41f 100755 --- a/app/lang/ja/general.php +++ b/app/lang/ja/general.php @@ -8,6 +8,7 @@ 'activity_report' => '操作レポート', 'address' => '住所', 'admin' => '管理', + 'add_seats' => 'Added seats', 'all_assets' => '全ての資産', 'all' => 'All', 'archived' => 'アーカイブ', @@ -102,9 +103,10 @@ 'processing' => '処理中', 'profile' => 'あなたのプロファイル', 'qty' => '数量', - 'quanitity' => '数量', + 'quantity' => 'Quantity', 'ready_to_deploy' => '配備完了', 'recent_activity' => '最近のアクティビティ', + 'remove_company' => 'Remove Company Association', 'reports' => 'レポート', 'requested' => '要求済', 'save' => '保存', diff --git a/app/lang/ko/admin/hardware/form.php b/app/lang/ko/admin/hardware/form.php index d562c4a12c..2106f7d16e 100755 --- a/app/lang/ko/admin/hardware/form.php +++ b/app/lang/ko/admin/hardware/form.php @@ -1,7 +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_update' => '대량 자산 갱신', 'bulk_update_help' => '이 양식은 한번에 여러개의 자산들을 갱신하게 해줍니다. 변경하고 싶은 항목만 채워 넣으세요. 빈란으로 남겨둔 항목들은 변경되지 않을 것입니다. ', 'bulk_update_warn' => '당신은 asset_count 자산들의 속성들을 편집하려 합니다.', diff --git a/app/lang/ko/admin/hardware/message.php b/app/lang/ko/admin/hardware/message.php index 4a2c275c36..772f75211a 100755 --- a/app/lang/ko/admin/hardware/message.php +++ b/app/lang/ko/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => '자산이 반입되지 않았습니다. 다시 시도해 주세요.', 'success' => '자산이 반입되었습니다.', 'user_does_not_exist' => '잘못된 사용자 입니다. 다시 시도해 주세요.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/ko/admin/models/general.php b/app/lang/ko/admin/models/general.php index 1e2b30c02e..9325a6e45e 100755 --- a/app/lang/ko/admin/models/general.php +++ b/app/lang/ko/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => '이 모델은 삭제되었습니다. 복원 하려면 여기를 클릭하세요.', + 'deleted' => '이 모델은 삭제되었습니다. 복원 하려면 여기를 클릭하세요.', 'restore' => '모델 복원', - 'show_mac_address' => '이 모델의 자산에서 MAC 어드레스 항목 보기', + 'show_mac_address' => '이 모델의 자산에서 MAC 어드레스 항목 보기', 'view_deleted' => '삭제 목록 보기', 'view_models' => '모델 보기', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/ko/admin/settings/general.php b/app/lang/ko/admin/settings/general.php index 4dbd1b51c0..eac9ef975e 100755 --- a/app/lang/ko/admin/settings/general.php +++ b/app/lang/ko/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/ko/admin/users/message.php b/app/lang/ko/admin/users/message.php index b336d22ebe..6594981f4a 100755 --- a/app/lang/ko/admin/users/message.php +++ b/app/lang/ko/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => '사용자를 내보내기 할 때 문제가 발생했습니다. 다시 시도하세요.', 'asset_already_accepted' => '이 자산은 이미 수락되었습니다.', 'accept_or_decline' => '이 자산을 승인 하거나 거부 하셔야 합니다.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'LDAP 서버에 접속 할 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.
LDAP 서버 오류:', 'ldap_could_not_bind' => 'LDAP 서버와 동기화 할 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.
LDAP 서버 오류: ', 'ldap_could_not_search' => 'LDAP 서버를 찾을 수 없습니다. LDAP 설정 파일의 LDAP 서버 구성을 확인해 보세요.
LDAP 서버 오류:', diff --git a/app/lang/ko/general.php b/app/lang/ko/general.php index 9d16811b01..cf8719b755 100755 --- a/app/lang/ko/general.php +++ b/app/lang/ko/general.php @@ -8,6 +8,7 @@ 'activity_report' => '활동 보고서', 'address' => '주소', 'admin' => '관리자', + 'add_seats' => 'Added seats', 'all_assets' => '모든 자산들', 'all' => '전체', 'archived' => '보관됨', @@ -102,9 +103,10 @@ 'processing' => '처리중', 'profile' => '프로필', 'qty' => '수량', - 'quanitity' => '수량', + 'quantity' => 'Quantity', 'ready_to_deploy' => '사용 준비', 'recent_activity' => '최근 활동', + 'remove_company' => 'Remove Company Association', 'reports' => '보고서', 'requested' => '요청됨', 'save' => '저장', diff --git a/app/lang/lt/admin/hardware/form.php b/app/lang/lt/admin/hardware/form.php index b342f43f99..6a932e4a10 100755 --- a/app/lang/lt/admin/hardware/form.php +++ b/app/lang/lt/admin/hardware/form.php @@ -1,7 +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_update' => 'Visa atnaujinama įranga', 'bulk_update_help' => 'Ši forma leidžia jums atnaujinti kelias įrangas vienu metu. Prašome užpildykite laukelius, kuriuos reikia keisti. Visi laukeliai, kuriuos paliksite tuščius liks nepakeisti. ', 'bulk_update_warn' => 'Jūs ruošiatės keisti sekančius nustatymus :asset_count assets.', diff --git a/app/lang/lt/admin/hardware/message.php b/app/lang/lt/admin/hardware/message.php index 31872e8091..fbabece62e 100755 --- a/app/lang/lt/admin/hardware/message.php +++ b/app/lang/lt/admin/hardware/message.php @@ -52,6 +52,11 @@ return array( 'error' => 'Įranga neišduota, prašome bandyti dar kartą', 'success' => 'Įranga išduota sėkmingai.', 'user_does_not_exist' => 'Šis naudotojas neteisingas. Prašome bandykite dar kartą.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/lt/admin/models/general.php b/app/lang/lt/admin/models/general.php index 11e54629b4..0b987aa4b3 100755 --- a/app/lang/lt/admin/models/general.php +++ b/app/lang/lt/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Šis modelis ištrintas. Spauskite atkurti modelį čia.', + 'deleted' => 'Šis modelis ištrintas. Spauskite atkurti modelį čia.', 'restore' => 'Atkurti modelį', - 'show_mac_address' => 'Rodykite MAC adreso laukelį įrangoje šiam modeliui', + 'show_mac_address' => 'Rodykite MAC adreso laukelį įrangoje šiam modeliui', 'view_deleted' => 'Peržiūrėti ištrintus', 'view_models' => 'Peržiūrėti modelius', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/lt/admin/settings/general.php b/app/lang/lt/admin/settings/general.php index 0bf3424365..b6deec2bf0 100755 --- a/app/lang/lt/admin/settings/general.php +++ b/app/lang/lt/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/lt/admin/users/message.php b/app/lang/lt/admin/users/message.php index f19fc19522..4aa506db79 100755 --- a/app/lang/lt/admin/users/message.php +++ b/app/lang/lt/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'Nepavyko įkelti naudotojų. Prašome bandykite dar kartą.', 'asset_already_accepted' => 'ši įranga jau buvo priimta.', 'accept_or_decline' => 'Jūs turite arba priimti arba atmesti šią įrangą.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'Negali prisijungti prie LDAP serverio. Prašome patikrinkite savo LDAP serverio konfigūraciją LDAP konfigūracijos faile.
Klaida iš LDAP Serverio:', 'ldap_could_not_bind' => 'Negali nustatyti vartotojo prisijungiant prie LDAP serverio. Prašome patikrinkite savo LDAP serverio konfigūraciją LDAP konfigūracijos faile.
Klaida iš LDAP Serverio: ', 'ldap_could_not_search' => 'Negali rasti LDAP serverio. Prašome patikrinkite savo LDAP serverio konfigūraciją LDAP konfigūracijos faile.
Klaida iš LDAP Serverio:', diff --git a/app/lang/lt/general.php b/app/lang/lt/general.php index adfe5be678..e7aa247265 100755 --- a/app/lang/lt/general.php +++ b/app/lang/lt/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Veiksmų ataskaita', 'address' => 'Adresas', 'admin' => 'Administratorius', + 'add_seats' => 'Added seats', 'all_assets' => 'Visa įranga', 'all' => 'Viskas', 'archived' => 'Archyvuota', @@ -102,9 +103,10 @@ 'processing' => 'Vykdoma', 'profile' => 'Jūsų profilis', 'qty' => 'Vnt', - 'quanitity' => 'Kiekis', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Paruošta naudojimui', 'recent_activity' => 'Paskutiniai veiksmai', + 'remove_company' => 'Remove Company Association', 'reports' => 'Ataskaitos', 'requested' => 'Užklausta', 'save' => 'Išsaugoti', diff --git a/app/lang/ms/admin/hardware/form.php b/app/lang/ms/admin/hardware/form.php index 9dcb61548c..4434441ea9 100755 --- a/app/lang/ms/admin/hardware/form.php +++ b/app/lang/ms/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/ms/admin/hardware/message.php b/app/lang/ms/admin/hardware/message.php index 8fd5558ae1..b41a79a82c 100755 --- a/app/lang/ms/admin/hardware/message.php +++ b/app/lang/ms/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Harta tidak diterima, sila cuba lagi', 'success' => 'Harta berjaya diterima.', 'user_does_not_exist' => 'Pengguna tidah sah. Sila cuba lagi.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/ms/admin/models/general.php b/app/lang/ms/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/ms/admin/models/general.php +++ b/app/lang/ms/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/ms/admin/settings/general.php b/app/lang/ms/admin/settings/general.php index b3df7c7c45..34d5300b60 100755 --- a/app/lang/ms/admin/settings/general.php +++ b/app/lang/ms/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/ms/admin/users/message.php b/app/lang/ms/admin/users/message.php index e8bb8e74b7..d0f411cb3d 100755 --- a/app/lang/ms/admin/users/message.php +++ b/app/lang/ms/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/ms/general.php b/app/lang/ms/general.php index ccbc943b60..09aefdb7a1 100755 --- a/app/lang/ms/general.php +++ b/app/lang/ms/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Alamat', 'admin' => 'Pentadbir', + 'add_seats' => 'Added seats', 'all_assets' => 'Semua Harta', 'all' => 'Semua', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Profail Anda', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Sedia untuk diagihkan', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Laporan', 'requested' => 'Requested', 'save' => 'Simpan', diff --git a/app/lang/nl/admin/accessories/general.php b/app/lang/nl/admin/accessories/general.php index 85a199dbfc..0c6de38e44 100755 --- a/app/lang/nl/admin/accessories/general.php +++ b/app/lang/nl/admin/accessories/general.php @@ -1,21 +1,21 @@ 'About Accessories', - 'about_accessories_text' => 'Accessories are anything you issue to users but that do not have a serial number (or you do not care about tracking them uniquely). For example, computer mice or keyboards.', - 'accessory_category' => 'Accessory Category', - 'accessory_name' => 'Accessory Name', - 'cost' => 'Purchase Cost', + 'about_accessories_title' => 'Over Accessoires', + 'about_accessories_text' => 'Accessoires zijn alles wat je uitgeeft aan gebruikers maar welke geen serienummer hebben (of welke niet interessant genoeg zijn om individueel te volgen) Bij voorbeeld computer muizen of toetsenborden.', + 'accessory_category' => 'Accessoire Categorie', + 'accessory_name' => 'Accessoire Naam', + 'cost' => 'Aanschafkosten', 'create' => 'Create Accessory', - 'date' => 'Purchase Date', + 'date' => 'Aanschaf Datum', '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', + 'total' => 'Totaal', + 'remaining' => 'Beschikbaar', 'update' => 'Update Accessory', 'use_default_eula' => 'Use the primary default EULA instead.', 'use_default_eula_disabled' => '
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:', diff --git a/app/lang/nl/general.php b/app/lang/nl/general.php index 228c19e727..933d44c66f 100755 --- a/app/lang/nl/general.php +++ b/app/lang/nl/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activiteitenrapportage', 'address' => 'Adres', 'admin' => 'Beheerder', + 'add_seats' => 'Added seats', 'all_assets' => 'Alle materialen', 'all' => 'Alle', 'archived' => 'Gearchiveerd', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Uw profiel', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Klaar om ingezet te worden', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Rapporten', 'requested' => 'Aangevraagd', 'save' => 'Opslaan', diff --git a/app/lang/no/admin/accessories/general.php b/app/lang/no/admin/accessories/general.php index 8c2811436c..3e08134ffb 100755 --- a/app/lang/no/admin/accessories/general.php +++ b/app/lang/no/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Tilbehør er hva som helst som du tildeler brukere som ikke har et serienummer (eller som du ikke bryr deg om å spore enkeltvis). For eksempel mus og tastatur.', 'accessory_category' => 'Tilbehørskategori', 'accessory_name' => 'Navn tilbehør', - 'cost' => 'Purchase Cost', + 'cost' => 'Innkjøpskostnad', 'create' => 'Legg til tilbehør', - 'date' => 'Purchase Date', + 'date' => 'Innkjøpsdato', 'eula_text' => 'EULA-kategori', 'eula_text_help' => 'Dette feltet lar deg tilpasse dine EULA for spesifikke typer eiendeler. Hvis du har kun en EULA for alle eiendeler kan du krysse av nedenfor for å bruke standard.', 'require_acceptance' => 'Krev at brukere bekrefter aksept av eiendeler i denne kategorien.', 'no_default_eula' => 'Ingen standard EULA funnet. Legg til en i Innstillinger.', - 'order' => 'Order Number', + 'order' => 'Ordrenummer', 'qty' => 'Antall', 'total' => 'Total', 'remaining' => 'Tilgjengelig', diff --git a/app/lang/no/admin/accessories/message.php b/app/lang/no/admin/accessories/message.php index ffffae2952..b59a09cd76 100755 --- a/app/lang/no/admin/accessories/message.php +++ b/app/lang/no/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => 'Tilbehør eksisterer ikke.', 'assoc_users' => 'Dette tilbehøret har for øyeblikket :count enheter utsjekket til brukere. Sjekk inn tilbehøret og prøv igjen. ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'Tilbehør ble ikke opprettet, vennligst prøv igjen.', + 'success' => 'Tilbehør optrettet.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'Tilbehør ble ikke oppdatert, vennligst prøv igjen', + 'success' => 'Tilbehør oppdatert.' ), 'delete' => array( diff --git a/app/lang/no/admin/accessories/table.php b/app/lang/no/admin/accessories/table.php index 151a4ad48a..f154d8fe91 100755 --- a/app/lang/no/admin/accessories/table.php +++ b/app/lang/no/admin/accessories/table.php @@ -1,7 +1,7 @@ 'Download CSV', + 'dl_csv' => 'Last ned CSV', 'eula_text' => 'EULA', 'id' => 'ID', 'require_acceptance' => 'Godtatt', diff --git a/app/lang/no/admin/consumables/general.php b/app/lang/no/admin/consumables/general.php index 9e8eee9944..905ea1b9ae 100755 --- a/app/lang/no/admin/consumables/general.php +++ b/app/lang/no/admin/consumables/general.php @@ -4,10 +4,10 @@ return array( 'about_consumables_title' => 'Om Forbruksvarer', 'about_consumables_text' => 'Forbruksvarer er alle varer som blir brukt opp over tid. For eksempel, skriver toner eller kopi papir.', 'consumable_name' => 'Navn på forbruksvare', - 'cost' => 'Purchase Cost', + 'cost' => 'Innkjøpskostnad', 'create' => 'Legg til forbruksvare', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'date' => 'Innkjøpsdato', + 'order' => 'Ordrenummer', 'remaining' => 'Gjenstår', 'total' => 'Total', 'update' => 'Oppdater forbruksvare', diff --git a/app/lang/no/admin/hardware/form.php b/app/lang/no/admin/hardware/form.php index 62f1200b85..8f3b21671f 100755 --- a/app/lang/no/admin/hardware/form.php +++ b/app/lang/no/admin/hardware/form.php @@ -1,7 +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_update' => 'Masseoppdater eiendeler', 'bulk_update_help' => 'Dette skjemaet lar deg oppdatere flere eiendeler på en gang. Fyll kun ut feltene du ønsker å endre. Tomme felter forblir uendret. ', 'bulk_update_warn' => 'Du er på vei til å endre egenskapene til :asset_count eiendeler.', @@ -20,7 +22,7 @@ return array( 'expected_checkin' => 'Forventet dato for innsjekk', 'expires' => 'Utløper', 'fully_depreciated' => 'Ferdig nedskrevet', - 'help_checkout' => 'If you wish to assign this asset immediately, select "Ready to Deploy" from the status list above. ', + 'help_checkout' => 'Hvis du ønsker å tildele denne eiendelen umiddelbart, velger du "klar til å distribuere" fra status listen ovenfor. ', 'mac_address' => 'MAC-adresse', 'manufacturer' => 'Produsent', 'model' => 'Modell', diff --git a/app/lang/no/admin/hardware/message.php b/app/lang/no/admin/hardware/message.php index 5e08397bd3..abe84eb05b 100755 --- a/app/lang/no/admin/hardware/message.php +++ b/app/lang/no/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Eiendel ble ikke sjekket inn. Prøv igjen', 'success' => 'Vellykket innsjekk av eiendel.', 'user_does_not_exist' => 'Denne brukeren er ugyldig. Vennligst prøv igjen.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/no/admin/hardware/table.php b/app/lang/no/admin/hardware/table.php index c460312bb1..351d4d0a7a 100755 --- a/app/lang/no/admin/hardware/table.php +++ b/app/lang/no/admin/hardware/table.php @@ -18,7 +18,7 @@ return array( 'serial' => 'Serienummer', 'status' => 'Status', 'title' => 'Eiendel ', - 'image' => 'Device Image', + 'image' => 'Enhet bilde', 'days_without_acceptance' => 'Dager uten aksept' ); diff --git a/app/lang/no/admin/models/general.php b/app/lang/no/admin/models/general.php index 6a2b528843..bae0b794b5 100755 --- a/app/lang/no/admin/models/general.php +++ b/app/lang/no/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Denne modellen er slettet. Klikk her for å gjenopprette.', + 'deleted' => 'Denne modellen er slettet. Klikk her for å gjenopprette.', 'restore' => 'Gjenopprett modell', - 'show_mac_address' => 'Vis felt for MAC-adresse for denne modellen', + 'show_mac_address' => 'Vis felt for MAC-adresse for denne modellen', 'view_deleted' => 'Vis slettede', 'view_models' => 'Vis modeller', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/no/admin/settings/general.php b/app/lang/no/admin/settings/general.php index ef59028ce0..6460f1daba 100755 --- a/app/lang/no/admin/settings/general.php +++ b/app/lang/no/admin/settings/general.php @@ -10,7 +10,7 @@ return array( 'backups' => 'Sikkerhetskopier', 'barcode_type' => 'Strekkodetype', 'barcode_settings' => 'Strekkodeinnstillinger', - 'custom_css' => 'Custom CSS', + 'custom_css' => 'Egendefinert CSS', 'custom_css_help' => 'Enter any custom CSS overrides you would like to use. Do not include the <style></style> tags.', 'default_currency' => 'Standardvaluta', 'default_eula_text' => 'Standard EULA', @@ -22,28 +22,31 @@ return array( 'eula_settings' => 'EULA-innstillinger', 'eula_markdown' => 'Denne EULAen tillater Github Flavored markdown.', 'general_settings' => 'Generelle innstillinger', - 'generate_backup' => 'Generate Backup', + 'generate_backup' => 'Generer Sikkerhetskopi', 'header_color' => 'Overskriftsfarge', 'info' => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.', 'laravel' => 'Laravel-versjon', - 'ldap_enabled' => 'LDAP enabled', - 'ldap_integration' => 'LDAP Integration', - 'ldap_settings' => 'LDAP Settings', + 'ldap_enabled' => 'LDAP aktivert', + 'ldap_integration' => 'LDAP Integrering', + 'ldap_settings' => 'LDAP Instillinger', 'ldap_server' => 'LDAP Server', - 'ldap_uname' => 'LDAP Bind Username', + '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_uname' => 'LDAP Bundet brukernavn', '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_username_field' => 'Brukernavn Felt', + 'ldap_lname_field' => 'Etternavn', + 'ldap_fname_field' => 'LDAP Fornavn', + 'ldap_auth_filter_query' => 'LDAP autentisering spørring', '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_email' => 'LDAP E-post', + 'load_remote_text' => 'Eksterne Skript', + 'load_remote_help_text' => 'Denne Snipe-IT-installasjonen kan laste skript fra Internett.', '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', @@ -67,6 +70,6 @@ return array( 'update' => 'Oppdater innstillinger', 'value' => 'Verdi', 'brand' => 'Branding', - 'about_settings_title' => 'About Settings', - 'about_settings_text' => 'These settings let you customize certain aspects of your installation.', + 'about_settings_title' => 'Om Innstillinger', + 'about_settings_text' => 'Disse innstillingene lar deg tilpasse enkelte aspekter av installasjonen din.', ); diff --git a/app/lang/no/admin/settings/message.php b/app/lang/no/admin/settings/message.php index 3fd54f3654..2458c85ff5 100755 --- a/app/lang/no/admin/settings/message.php +++ b/app/lang/no/admin/settings/message.php @@ -8,10 +8,10 @@ return array( 'success' => 'Oppdatering av innstillinger vellykket.' ), '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' => 'Er du sikker på at du vil slette denne sikkerhetskopien? Denne handlingen kan ikke angres. ', + 'file_deleted' => 'Den Sikkerhetskopierte filen ble slettet. ', + 'generated' => 'En ny sikkerhetskopi fil ble opprettet.', + 'file_not_found' => 'Den backup-filen ble ikke funnet på serveren.', ), ); diff --git a/app/lang/no/admin/users/general.php b/app/lang/no/admin/users/general.php index 9b3fc11a72..016c668c0c 100755 --- a/app/lang/no/admin/users/general.php +++ b/app/lang/no/admin/users/general.php @@ -10,7 +10,7 @@ return array( 'filetype_info' => 'Gyldige filtyper er png, gif, jpg, jpeg, doc docx, pdf, txt, zip og rar.', 'history_user' => 'Historikk for :name', 'last_login' => 'Siste innlogging', - 'ldap_config_text' => 'LDAP configuration settings can be found in the app/config folder in a file called ldap.php. The selected location will be set for all imported users. You will need to have at least one location set to use this feature.', + 'ldap_config_text' => 'LDAP konfigurasjon Innstillinger kan bli funnet i app / config mappen, I en fil kalt ldap.php. Den valgte plasseringen vil bli satt for alle importerte brukere. Du må ha minst ett sted satt til å bruke denne funksjonen.', 'ldap_text' => 'Kople til LDAP og opprett brukere. Passord blir automatisk generert.', 'software_user' => 'Programvare utsjekket til :name', 'view_user' => 'Vis bruker :name', diff --git a/app/lang/no/admin/users/message.php b/app/lang/no/admin/users/message.php index 00a26e3f0e..9a235f64fe 100755 --- a/app/lang/no/admin/users/message.php +++ b/app/lang/no/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'Det oppstod et problem under import av brukere. Prøv igjen.', 'asset_already_accepted' => 'Denne eiendelen er allerede akseptert.', 'accept_or_decline' => 'Du må enten akseptere eller avvise denne eiendelen.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'Kunne ikke kople til LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:', 'ldap_could_not_bind' => 'Kunne ikke opprette tilkopling til LDAP-server. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server: ', 'ldap_could_not_search' => 'Kunne ikke utføre søk på LDAP-serveren. Sjekk LDAP-innstillingene i konfigurasjonsfilen.
Feil fra LDAP-server:', diff --git a/app/lang/no/general.php b/app/lang/no/general.php index fc487157ff..1fda15cd2a 100755 --- a/app/lang/no/general.php +++ b/app/lang/no/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Aktivitetsrapport', 'address' => 'Adresse', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'Alle eiendeler', 'all' => 'Alle', 'archived' => 'Arkivert', @@ -30,8 +31,8 @@ 'checkin_from' => 'Innsjekk fra', 'checkout' => 'Sjekk ut', 'city' => 'By', - 'companies' => 'Companies', - 'company' => 'Company', + 'companies' => 'Selskaper', + 'company' => 'Firmanavn', 'consumable' => 'Forbruksvare', 'consumables' => 'Forbruksvarer', 'country' => 'Land', @@ -68,7 +69,7 @@ 'asset_maintenance_report' => 'Rapport Vedlikehold av eiendeler', 'asset_maintenances' => 'Vedlikehold av eiendeler', 'item' => 'Enhet', - 'insufficient_permissions' => 'Insufficient permissions!', + 'insufficient_permissions' => 'Utilstrekkelige rettigheter!', 'last' => 'Siste', 'last_name' => 'Etternavn', 'license' => 'Lisens', @@ -102,9 +103,10 @@ 'processing' => 'Behandler', 'profile' => 'Din profil', 'qty' => 'Antall', - 'quanitity' => 'Antall', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Klar for utlevering', 'recent_activity' => 'Nylig aktivitet', + 'remove_company' => 'Remove Company Association', 'reports' => 'Rapporter', 'requested' => 'Forespurt', 'save' => 'Lagre', diff --git a/app/lang/pl/admin/hardware/form.php b/app/lang/pl/admin/hardware/form.php index 2340e1a02d..36b246ad7d 100755 --- a/app/lang/pl/admin/hardware/form.php +++ b/app/lang/pl/admin/hardware/form.php @@ -1,7 +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_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' => 'Zamierzasz edytować właściwości :asset_count zestawów.', diff --git a/app/lang/pl/admin/hardware/message.php b/app/lang/pl/admin/hardware/message.php index f8440f65f5..7dfb74820f 100755 --- a/app/lang/pl/admin/hardware/message.php +++ b/app/lang/pl/admin/hardware/message.php @@ -53,6 +53,11 @@ return 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.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/pl/admin/models/general.php b/app/lang/pl/admin/models/general.php index a0c50ce1bf..dabe1f208e 100755 --- a/app/lang/pl/admin/models/general.php +++ b/app/lang/pl/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Model został usunięty. Kliknij aby przywrócić.', + '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' => 'Show MAC address field in assets in this model', 'view_deleted' => 'Pokaż usunięte', 'view_models' => 'Pokaż Modele', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/pl/admin/settings/general.php b/app/lang/pl/admin/settings/general.php index 6df3b4ef6b..def581f2f9 100755 --- a/app/lang/pl/admin/settings/general.php +++ b/app/lang/pl/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/pl/admin/users/message.php b/app/lang/pl/admin/users/message.php index ef8785a7a5..85bde569b6 100755 --- a/app/lang/pl/admin/users/message.php +++ b/app/lang/pl/admin/users/message.php @@ -33,6 +33,7 @@ return array( '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.', + '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:', diff --git a/app/lang/pl/general.php b/app/lang/pl/general.php index 2b4bd5df10..a49238d5e0 100755 --- a/app/lang/pl/general.php +++ b/app/lang/pl/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Raport Aktywności', 'address' => 'Adres', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'Wszystkie aktywa', 'all' => 'Wszystko', 'archived' => 'Archiwum', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Twój profil', 'qty' => 'Ilość', - 'quanitity' => 'Ilość', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Gotowe do wdrożenia', 'recent_activity' => 'Ostatnia aktywność', + 'remove_company' => 'Remove Company Association', 'reports' => 'Raporty', 'requested' => 'Requested', 'save' => 'Zapisz', diff --git a/app/lang/pt-BR/admin/accessories/general.php b/app/lang/pt-BR/admin/accessories/general.php index 017fbcc444..67291b3938 100755 --- a/app/lang/pt-BR/admin/accessories/general.php +++ b/app/lang/pt-BR/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Um acessório é qualquer coisa que você emitir aos usuários sem um número de série (ou que você não se preocupar em acompanhá-la unicamente). Por exemplo, mouses ou teclados.', 'accessory_category' => 'Categoria do Acessório', 'accessory_name' => 'Nome do Acessório', - 'cost' => 'Purchase Cost', + 'cost' => 'Valor do produto', 'create' => 'Criar um dispositivo', - 'date' => 'Purchase Date', + 'date' => 'Data da Compra', 'eula_text' => 'EULA da Categoria', 'eula_text_help' => 'Este campo lhe permite personalizar seus EULAs para tipos específicos de ativos. Se você apenas tem um EULA para todos os seus ativos, você pode selecionar a caixa abaixo para usar o padrão primário.', 'require_acceptance' => 'Requer que usuários confirmem a aceitação de ativos nesta categoria.', 'no_default_eula' => 'Nenhum EULA padrão primário foi encontrado. Adicione um nas Configurações.', - 'order' => 'Order Number', + 'order' => 'Número da Ordem', 'qty' => 'QTD', 'total' => 'Total', 'remaining' => 'Disponível', diff --git a/app/lang/pt-BR/admin/accessories/message.php b/app/lang/pt-BR/admin/accessories/message.php index 7e66242333..9bf5a65ed4 100755 --- a/app/lang/pt-BR/admin/accessories/message.php +++ b/app/lang/pt-BR/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => 'Este acessório não existe.', 'assoc_users' => 'Este acessório tem atualmente :count itens alocado para os usuários. Por favor, verifique em acessórios e e tente novamente. ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'Acessório não criado, Por favor tente novamente.', + 'success' => 'Acessório criado com sucesso.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'Acessório não atualizado, Por favor tente novamente', + 'success' => 'Acessório atualizado com sucesso.' ), 'delete' => array( diff --git a/app/lang/pt-BR/admin/hardware/form.php b/app/lang/pt-BR/admin/hardware/form.php index a598c34955..c4d00e51fe 100755 --- a/app/lang/pt-BR/admin/hardware/form.php +++ b/app/lang/pt-BR/admin/hardware/form.php @@ -1,7 +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_update' => 'Ativos da Atualização em Massa', 'bulk_update_help' => 'Este formulário lhe permite atualizar múltiplos ativos de uma vez só. Apenas preencha os campos que você precisa alterar. Qualquer campo deixado em branco permanecerá inalterado. ', 'bulk_update_warn' => 'Você está prestes a editar as propriedades de :asset_count ativos.', diff --git a/app/lang/pt-BR/admin/hardware/message.php b/app/lang/pt-BR/admin/hardware/message.php index 98656a58c5..b2bb9ac1c3 100755 --- a/app/lang/pt-BR/admin/hardware/message.php +++ b/app/lang/pt-BR/admin/hardware/message.php @@ -52,6 +52,11 @@ return array( 'error' => 'Ativo não foi retornado, favor tentar novamente', 'success' => 'Ativo retornado com sucesso.', 'user_does_not_exist' => 'Este usuário é inválido. Tente novamente.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/pt-BR/admin/models/general.php b/app/lang/pt-BR/admin/models/general.php index 2d156b1a52..69b07515c6 100755 --- a/app/lang/pt-BR/admin/models/general.php +++ b/app/lang/pt-BR/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Este modelo foi excluído. Clique aqui para o restaurar.', + 'deleted' => 'Este modelo foi excluído. Clique aqui para o restaurar.', 'restore' => 'Restaurar Modelo', - 'show_mac_address' => 'Exibir o campo de endereço MAC nos ativos neste modelo', + 'show_mac_address' => 'Exibir o campo de endereço MAC nos ativos neste modelo', 'view_deleted' => 'Ver Excluídos', 'view_models' => 'Ver Modelos', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/pt-BR/admin/settings/general.php b/app/lang/pt-BR/admin/settings/general.php index cf1c114755..e6a29511b8 100755 --- a/app/lang/pt-BR/admin/settings/general.php +++ b/app/lang/pt-BR/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/pt-BR/admin/users/message.php b/app/lang/pt-BR/admin/users/message.php index 4b26719f68..8515e65111 100755 --- a/app/lang/pt-BR/admin/users/message.php +++ b/app/lang/pt-BR/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'Houve um problema ao importar usuários. Tente novamente.', 'asset_already_accepted' => 'Este ativo já foi aceito.', 'accept_or_decline' => 'Você precisa aceita ou rejeitar esse ativo.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'Não foi possível conectar ao servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP:', 'ldap_could_not_bind' => 'Não foi possível se ligar ao servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP: ', 'ldap_could_not_search' => 'Não foi possível procurar o servidor LDAP. Por favor verifique as configurações do servidor LDAP no arquivo de configurações.
Erro do Servidor LDAP:', diff --git a/app/lang/pt-BR/general.php b/app/lang/pt-BR/general.php index 35768a49ce..00cf7d2a97 100755 --- a/app/lang/pt-BR/general.php +++ b/app/lang/pt-BR/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Relatório de Atividade', 'address' => 'Endereço', 'admin' => 'Administrador', + 'add_seats' => 'Added seats', 'all_assets' => 'Todos os Ativos', 'all' => 'Todos', 'archived' => 'Arquivado', @@ -30,8 +31,8 @@ 'checkin_from' => 'Verificando', 'checkout' => 'Check-out', 'city' => 'Cidade', - 'companies' => 'Companies', - 'company' => 'Company', + 'companies' => 'Empresas', + 'company' => 'Empresas', 'consumable' => 'Consumíveis', 'consumables' => 'Consumíveis', 'country' => 'País', @@ -68,7 +69,7 @@ 'asset_maintenance_report' => 'Relatório de Manutenção em Ativo', 'asset_maintenances' => 'Manutenções em Ativo', 'item' => 'Item', - 'insufficient_permissions' => 'Insufficient permissions!', + 'insufficient_permissions' => 'Você não tem permissão!', 'last' => 'Última', 'last_name' => 'Último Nome', 'license' => 'Licença', @@ -102,9 +103,10 @@ 'processing' => 'Processando', 'profile' => 'Seu perfil', 'qty' => 'QTD', - 'quanitity' => 'Quantidade', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Pronto para Implantar', 'recent_activity' => 'Atividade Recente', + 'remove_company' => 'Remove Company Association', 'reports' => 'Relatórios', 'requested' => 'Solicitado', 'save' => 'Salvar', @@ -143,5 +145,5 @@ 'years' => 'anos', 'yes' => 'Sim', 'zip' => 'Cep', - 'noimage' => 'No image uploaded or image not found.', + 'noimage' => 'Sem imagem para fazer o upload ou a imagem não foi encontrada.', ]; diff --git a/app/lang/pt-PT/admin/accessories/general.php b/app/lang/pt-PT/admin/accessories/general.php index 2e3b85a5d8..dd389d5e82 100755 --- a/app/lang/pt-PT/admin/accessories/general.php +++ b/app/lang/pt-PT/admin/accessories/general.php @@ -5,14 +5,14 @@ return array( 'about_accessories_text' => 'Um acessório é algo que se aloca aos utilizadores, e que não têm número de série (ou que não se preocupa em acompanhar de forma exclusiva). Por exemplo, ratos ou teclados.', 'accessory_category' => 'Categoria do Acessório', 'accessory_name' => 'Nome do Acessório', - 'cost' => 'Purchase Cost', + 'cost' => 'Preço de compra', 'create' => 'Criar acessório', - 'date' => 'Purchase Date', + 'date' => 'Data de compra', 'eula_text' => 'EULA da Categoria', 'eula_text_help' => 'Este atributo permite-lhe personalizar os seus EULAs para tipos específicos de ativos. Se apenas tem um para todos os seus ativos, pode selecionar a caixa abaixo, para usar o EULA padrão.', 'require_acceptance' => 'Solicitar aos utilizadores que confirmem a aceitação de ativos nesta categoria.', 'no_default_eula' => 'Não foi encontrado o EULA padrão. Defina um nas Configurações.', - 'order' => 'Order Number', + 'order' => 'Número de encomenda', 'qty' => 'QTD', 'total' => 'Total', 'remaining' => 'Disponíveis', diff --git a/app/lang/pt-PT/admin/accessories/message.php b/app/lang/pt-PT/admin/accessories/message.php index e817355951..953120b4e9 100755 --- a/app/lang/pt-PT/admin/accessories/message.php +++ b/app/lang/pt-PT/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => 'Acessório não existe.', 'assoc_users' => 'Esta acessório tem atualmente :count items alocados a utilizadores. Por favor, devolva-os e tente novamente. ', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => 'Acessório não foi criado, por favor tente novamente.', + 'success' => 'Acessório criado com sucesso.' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => 'Acessório não foi actualizado, por favor tente novamente', + 'success' => 'Acessório actualizado com sucesso.' ), 'delete' => array( diff --git a/app/lang/pt-PT/admin/consumables/general.php b/app/lang/pt-PT/admin/consumables/general.php index 0760f68080..8ec8fd7346 100755 --- a/app/lang/pt-PT/admin/consumables/general.php +++ b/app/lang/pt-PT/admin/consumables/general.php @@ -4,10 +4,10 @@ return array( 'about_consumables_title' => 'Acerca de Consumíveis', 'about_consumables_text' => 'Consumíveis são todo e qualquer item comprado que será usado ao longo do tempo. Por exemplo, papel ou tinta de impressora.', 'consumable_name' => 'Nome do consumível', - 'cost' => 'Purchase Cost', + 'cost' => 'Preço de compra', 'create' => 'Criar consumível', - 'date' => 'Purchase Date', - 'order' => 'Order Number', + 'date' => 'Data de compra', + 'order' => 'Número de encomenda', 'remaining' => 'Restantes', 'total' => 'Total', 'update' => 'Atualizar consumível', diff --git a/app/lang/pt-PT/admin/hardware/form.php b/app/lang/pt-PT/admin/hardware/form.php index 3ef2952a2c..07dc9cd058 100755 --- a/app/lang/pt-PT/admin/hardware/form.php +++ b/app/lang/pt-PT/admin/hardware/form.php @@ -1,7 +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_update' => 'Atualização de ativos em massa', 'bulk_update_help' => 'Este formulário permite a atualização em massa de ativos. Preencha apenas os atributos que precisam de alteração. Qualquer atributo deixado em branco permanecerá inalterado. ', 'bulk_update_warn' => 'Está prestes a editar as propriedades :asset_count dos ativos.', diff --git a/app/lang/pt-PT/admin/hardware/message.php b/app/lang/pt-PT/admin/hardware/message.php index c11e4d963c..b494d40c8e 100755 --- a/app/lang/pt-PT/admin/hardware/message.php +++ b/app/lang/pt-PT/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Não foi possível devolver o artigo, por favor tente novamente', 'success' => 'Artigo devolvido com sucesso.', 'user_does_not_exist' => 'O utilizador é inválido. Por favor, tente novamente.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/pt-PT/admin/hardware/table.php b/app/lang/pt-PT/admin/hardware/table.php index 9a7042a44b..3f30fc4529 100755 --- a/app/lang/pt-PT/admin/hardware/table.php +++ b/app/lang/pt-PT/admin/hardware/table.php @@ -18,7 +18,7 @@ return array( 'serial' => 'Nº de Série', 'status' => 'Estado', 'title' => 'Artigo ', - 'image' => 'Device Image', + 'image' => 'Imagem do equipamento', 'days_without_acceptance' => 'Dias sem aceitação' ); diff --git a/app/lang/pt-PT/admin/models/general.php b/app/lang/pt-PT/admin/models/general.php index 2dac957a20..0400fa1f3f 100755 --- a/app/lang/pt-PT/admin/models/general.php +++ b/app/lang/pt-PT/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'O modelo foi removido. Clique aqui para o restaurar.', + 'deleted' => 'O modelo foi removido. Clique aqui para o restaurar.', 'restore' => 'Restaurar Modelo', - 'show_mac_address' => 'Mostrar endereço MAC dos artigos neste modelo', + 'show_mac_address' => 'Mostrar endereço MAC dos artigos neste modelo', 'view_deleted' => 'Ver removidos', 'view_models' => 'Ver modelos', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/pt-PT/admin/settings/general.php b/app/lang/pt-PT/admin/settings/general.php index 396a9285e3..41bdd95db8 100755 --- a/app/lang/pt-PT/admin/settings/general.php +++ b/app/lang/pt-PT/admin/settings/general.php @@ -26,17 +26,20 @@ return array( 'header_color' => 'Cor do cabeçalho', 'info' => 'Estas configurações permitem costumizar certos aspetos desta instalação.', 'laravel' => 'Versão do Laravel', - 'ldap_enabled' => 'LDAP enabled', - 'ldap_integration' => 'LDAP Integration', - 'ldap_settings' => 'LDAP Settings', - 'ldap_server' => '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_enabled' => 'LDAP ativo', + 'ldap_integration' => 'Integração LDAP', + 'ldap_settings' => 'Configurações LDAP', + 'ldap_server' => 'Servidor LDAP', + '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_uname' => 'Utilizador bind LDAP', + 'ldap_pword' => 'Password bind LDAP', + 'ldap_basedn' => 'Base bind DN', + 'ldap_filter' => 'Filtro LDAP', + 'ldap_username_field' => 'Campo nome de utilizador', + 'ldap_lname_field' => 'Campo Último nome', + 'ldap_fname_field' => 'Campo Primeiro nome', 'ldap_auth_filter_query' => 'LDAP Authentication query', 'ldap_version' => 'LDAP Version', 'ldap_active_flag' => 'LDAP Active Flag', diff --git a/app/lang/pt-PT/admin/users/message.php b/app/lang/pt-PT/admin/users/message.php index 91d9e31063..31b9276cea 100755 --- a/app/lang/pt-PT/admin/users/message.php +++ b/app/lang/pt-PT/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'Ocorreu um problema ao importar os utilizadores. Por favor, tente novamente.', 'asset_already_accepted' => 'Este artigo já foi aceite.', 'accept_or_decline' => 'Tem que aceitar ou recusar este artigo.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'Não foi possível estabelecer uma ligação ao servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração.
Error do Servidor LDAP:', 'ldap_could_not_bind' => 'Não foi possível estabelecer uma vinculação com o servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração.
Error do Servidor LDAP: ', 'ldap_could_not_search' => 'Não foi possível pesquisar no servidor LDAP. Por favor, verifique a configuração de servidor no ficheiro de configuração.
Error do Servidor LDAP:', diff --git a/app/lang/pt-PT/general.php b/app/lang/pt-PT/general.php index 7688838956..f8d84dda5a 100755 --- a/app/lang/pt-PT/general.php +++ b/app/lang/pt-PT/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Relatório de atividades', 'address' => 'Morada', 'admin' => 'Administração', + 'add_seats' => 'Added seats', 'all_assets' => 'Todos os Artigos', 'all' => 'Todos', 'archived' => 'Arquivado', @@ -30,8 +31,8 @@ 'checkin_from' => 'Devolver de', 'checkout' => 'Alocar', 'city' => 'Cidade', - 'companies' => 'Companies', - 'company' => 'Company', + 'companies' => 'Empresas', + 'company' => 'Empresa', 'consumable' => 'Consumível', 'consumables' => 'Consumíveis', 'country' => 'País', @@ -68,7 +69,7 @@ 'asset_maintenance_report' => 'Relatório de Manutenção de Artigos', 'asset_maintenances' => 'Manutenções de Artigos', 'item' => 'Item', - 'insufficient_permissions' => 'Insufficient permissions!', + 'insufficient_permissions' => 'Permissões insuficientes!', 'last' => 'Última', 'last_name' => 'Apelido', 'license' => 'Licença', @@ -102,9 +103,10 @@ 'processing' => 'A processar', 'profile' => 'Perfil', 'qty' => 'QTD', - 'quanitity' => 'Quantidade', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Pronto para implementar', 'recent_activity' => 'Actividade Recente', + 'remove_company' => 'Remove Company Association', 'reports' => 'Relatórios', 'requested' => 'Solicitado', 'save' => 'Guardar', diff --git a/app/lang/ro/admin/hardware/form.php b/app/lang/ro/admin/hardware/form.php index c3b09c0472..1c35d58bc9 100755 --- a/app/lang/ro/admin/hardware/form.php +++ b/app/lang/ro/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/ro/admin/hardware/message.php b/app/lang/ro/admin/hardware/message.php index 676461fef0..d87b4ef699 100755 --- a/app/lang/ro/admin/hardware/message.php +++ b/app/lang/ro/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Activul nu a fost primit, va rugam incercati iar', 'success' => 'Activul a fost primit.', 'user_does_not_exist' => 'Utilizatorul este invalid. Va rugam incercati iar.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/ro/admin/models/general.php b/app/lang/ro/admin/models/general.php index 564f6b4fd3..ccd36607ce 100755 --- a/app/lang/ro/admin/models/general.php +++ b/app/lang/ro/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'This model has been deleted. Click here to restore it.', + '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', + 'show_mac_address' => 'Show MAC address field in assets in this model', 'view_deleted' => 'View Deleted', 'view_models' => 'View Models', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/ro/admin/settings/general.php b/app/lang/ro/admin/settings/general.php index 58384ef21d..cf99915ec8 100755 --- a/app/lang/ro/admin/settings/general.php +++ b/app/lang/ro/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/ro/admin/users/message.php b/app/lang/ro/admin/users/message.php index 3c073fc158..bb8167d2c0 100755 --- a/app/lang/ro/admin/users/message.php +++ b/app/lang/ro/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/ro/general.php b/app/lang/ro/general.php index 89b5d15171..c02faa2074 100755 --- a/app/lang/ro/general.php +++ b/app/lang/ro/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Adresa', 'admin' => 'Admin', + 'add_seats' => 'Added seats', 'all_assets' => 'Toate activele', 'all' => 'Toate', 'archived' => 'Archived', @@ -102,9 +103,10 @@ 'processing' => 'Processing', 'profile' => 'Profilul dvs.', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Gata de lansare', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Rapoarte', 'requested' => 'Requested', 'save' => 'Salveaza', diff --git a/app/lang/ru/admin/hardware/form.php b/app/lang/ru/admin/hardware/form.php index 6026f9b90f..386668cd31 100755 --- a/app/lang/ru/admin/hardware/form.php +++ b/app/lang/ru/admin/hardware/form.php @@ -1,7 +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_update' => 'Редактировать выбранное', 'bulk_update_help' => 'Эта форма позволяет Вам обновить несколько объектов за раз. Заполняйте только те поля, которые нужно изменить. Пустые поля останутся без изменений. ', 'bulk_update_warn' => 'Редактирование свойств :asset_count assets.', diff --git a/app/lang/ru/admin/hardware/message.php b/app/lang/ru/admin/hardware/message.php index b0fdb581c8..67b9738926 100755 --- a/app/lang/ru/admin/hardware/message.php +++ b/app/lang/ru/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Актив не был отвязан, пожалуйста попробуйте снова', 'success' => 'Актив успешно отвязан.', 'user_does_not_exist' => 'Этот пользователь является недопустимым. Пожалуйста, попробуйте еще раз.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/ru/admin/models/general.php b/app/lang/ru/admin/models/general.php index bb6ed7f25e..811848dfcf 100755 --- a/app/lang/ru/admin/models/general.php +++ b/app/lang/ru/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Эта модель была удалена. Нажмите здесь, чтобы восстановить.', + 'deleted' => 'Эта модель была удалена. Нажмите здесь, чтобы восстановить.', 'restore' => 'Восстановить модель', - 'show_mac_address' => 'Отображать поле MAC адрес для данной модели', + 'show_mac_address' => 'Отображать поле MAC адрес для данной модели', 'view_deleted' => 'Просмотр удаленных', 'view_models' => 'Просмотр моделей', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/ru/admin/settings/general.php b/app/lang/ru/admin/settings/general.php index f4281f8a57..a9f8d8755d 100755 --- a/app/lang/ru/admin/settings/general.php +++ b/app/lang/ru/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/ru/admin/users/message.php b/app/lang/ru/admin/users/message.php index f5c4ff7f14..1eaf6753df 100755 --- a/app/lang/ru/admin/users/message.php +++ b/app/lang/ru/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'При импорте пользователей произошла ошибка. Попробуйте еще раз.', 'asset_already_accepted' => 'Этот актив уже был принят.', 'accept_or_decline' => 'Примите или отклоните актив.', + '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:', diff --git a/app/lang/ru/general.php b/app/lang/ru/general.php index 3c4a8484f3..900ddd9036 100755 --- a/app/lang/ru/general.php +++ b/app/lang/ru/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Oтчет о деятельности', 'address' => 'Адрес', 'admin' => 'Администратор', + 'add_seats' => 'Added seats', 'all_assets' => 'Все активы', 'all' => 'Все', 'archived' => 'Архивные', @@ -102,9 +103,10 @@ 'processing' => 'Обработка', 'profile' => 'Ваш профиль', 'qty' => 'Кол-во', - 'quanitity' => 'Количество', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Готов к установке', 'recent_activity' => 'Недавняя активность', + 'remove_company' => 'Remove Company Association', 'reports' => 'Отчеты', 'requested' => 'Запрошено', 'save' => 'Сохранить', diff --git a/app/lang/sv-SE/admin/hardware/form.php b/app/lang/sv-SE/admin/hardware/form.php index d0f3426f94..3404cce705 100755 --- a/app/lang/sv-SE/admin/hardware/form.php +++ b/app/lang/sv-SE/admin/hardware/form.php @@ -1,7 +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_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.', diff --git a/app/lang/sv-SE/admin/hardware/message.php b/app/lang/sv-SE/admin/hardware/message.php index 03e9473cbf..403369846d 100755 --- a/app/lang/sv-SE/admin/hardware/message.php +++ b/app/lang/sv-SE/admin/hardware/message.php @@ -52,7 +52,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/sv-SE/admin/models/general.php b/app/lang/sv-SE/admin/models/general.php index cf0b091d07..6433dbb65f 100755 --- a/app/lang/sv-SE/admin/models/general.php +++ b/app/lang/sv-SE/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Den här modellen har tagits bort. Klicka här för att återskapa.', + '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' => 'Show MAC address field in assets in this model', 'view_deleted' => 'Visa Borttagna', 'view_models' => 'Visa Modeller', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/sv-SE/admin/settings/general.php b/app/lang/sv-SE/admin/settings/general.php index bf02983e66..32ff6b6123 100755 --- a/app/lang/sv-SE/admin/settings/general.php +++ b/app/lang/sv-SE/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/sv-SE/admin/users/message.php b/app/lang/sv-SE/admin/users/message.php index e37d7301ee..a1a9757e86 100755 --- a/app/lang/sv-SE/admin/users/message.php +++ b/app/lang/sv-SE/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/sv-SE/general.php b/app/lang/sv-SE/general.php index a995297144..999904e2e8 100755 --- a/app/lang/sv-SE/general.php +++ b/app/lang/sv-SE/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Aktivitets Rapport', 'address' => 'Adress', 'admin' => 'Administratör', + 'add_seats' => 'Added seats', 'all_assets' => 'Alla Tillgångar', 'all' => 'Alla', 'archived' => 'Arkiverad', @@ -102,9 +103,10 @@ 'processing' => 'Bearbetar', 'profile' => 'Din profil', 'qty' => 'Antal', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Ready to Deploy', 'recent_activity' => 'Senaste aktivitet', + 'remove_company' => 'Remove Company Association', 'reports' => 'Rapporter', 'requested' => 'Requested', 'save' => 'Spara', diff --git a/app/lang/th/admin/hardware/form.php b/app/lang/th/admin/hardware/form.php index b3cdf0729a..c9d7151abb 100755 --- a/app/lang/th/admin/hardware/form.php +++ b/app/lang/th/admin/hardware/form.php @@ -1,7 +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_update' => 'ปรับปรุงสินทรัพย์แบบหลายรายการ', 'bulk_update_help' => 'ฟอร์มนี้อนุญาตให้คุณปรับปรุงสินทรัพย์แบบหลายรายการในครั้งเดียว เพียงกรอกข้อมูลที่ต้องการเปลี่ยนแปลงลงในช่อง ช่องใดที่ไม่ได้กรอกข้อมูลจะไม่มีการเปลี่ยนแปลงใดๆ ', 'bulk_update_warn' => 'คุณกำลังแก้ไขคุณสมบัติของสินทรัพย์ :asset_count', diff --git a/app/lang/th/admin/hardware/message.php b/app/lang/th/admin/hardware/message.php index a9cfc2d4ee..8ebabbb0be 100755 --- a/app/lang/th/admin/hardware/message.php +++ b/app/lang/th/admin/hardware/message.php @@ -51,7 +51,12 @@ return array( '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.' + 'user_does_not_exist' => 'That user is invalid.. Please try again.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/th/admin/models/general.php b/app/lang/th/admin/models/general.php index 15e91146c4..00164605c7 100755 --- a/app/lang/th/admin/models/general.php +++ b/app/lang/th/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'โมเดลนี้ถูกลบแล้ว Click here to restore it.', + 'deleted' => 'โมเดลนี้ถูกลบแล้ว Click here to restore it.', 'restore' => 'กู้คืนโมเดล', - 'show_mac_address' => 'แสดง MAC address ในสินทรัพย์ของโมเดลนี้', + 'show_mac_address' => 'แสดง MAC address ในสินทรัพย์ของโมเดลนี้', 'view_deleted' => 'ดูที่ถูกลบ', 'view_models' => 'ดูโมเดล', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/th/admin/settings/general.php b/app/lang/th/admin/settings/general.php index e069fd01f7..b98da20d40 100755 --- a/app/lang/th/admin/settings/general.php +++ b/app/lang/th/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/th/admin/users/message.php b/app/lang/th/admin/users/message.php index cb18629762..cdf56c14e3 100755 --- a/app/lang/th/admin/users/message.php +++ b/app/lang/th/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'มีปัญหาระหว่างการนำเข้าผู้ใช้งาน กรุณาลองใหม่อีกครั้ง', 'asset_already_accepted' => 'ทรัพย์สินนี้ได้รับการยอมรับแล้ว', 'accept_or_decline' => 'คุณต้องยอมรับ หรือปฏิเสธสินทรัพย์นี้', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'ไม่สามารถเชื่อมต่อกับ LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP
ผิดพลาดจาก LDAP Server:', 'ldap_could_not_bind' => 'ไม่สามารถผูกกับ LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP
ผิดพลาดจาก LDAP Server: ', 'ldap_could_not_search' => 'ไม่สามารถค้นหา LDAP Server ได้ กรุณาตรวจสอบการตั้งค่า LDAP Server ของคุณในไฟล์ตั้งค่า LDAP
ผิดพลาดจาก LDAP Server:', diff --git a/app/lang/th/general.php b/app/lang/th/general.php index da1ce56058..ec8bc929a3 100755 --- a/app/lang/th/general.php +++ b/app/lang/th/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'รายงานกิจกรรม', 'address' => 'ที่อยู่', 'admin' => 'ผู้ดูแลระบบ', + 'add_seats' => 'Added seats', 'all_assets' => 'ทรัพย์สินทั้งหมด', 'all' => 'ทั้งหมด', 'archived' => 'ถูกเก็บไว้', @@ -102,9 +103,10 @@ 'processing' => 'กำลังดำเนินการ', 'profile' => 'โปรไฟล์ของคุณ', 'qty' => 'จำนวน', - 'quanitity' => 'จำนวน', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'พร้อมใช้งาน', 'recent_activity' => 'กิจกรรมล่าสุด', + 'remove_company' => 'Remove Company Association', 'reports' => 'รายงาน', 'requested' => 'คำร้องขอ', 'save' => 'บันทึก', diff --git a/app/lang/tr/admin/hardware/form.php b/app/lang/tr/admin/hardware/form.php index b4413653bb..f17672a84e 100755 --- a/app/lang/tr/admin/hardware/form.php +++ b/app/lang/tr/admin/hardware/form.php @@ -1,7 +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_update' => 'Demirbaşları Toplu Güncelle', 'bulk_update_help' => 'Bu form birden çok demirbaşı tek seferde güncellemenizi sağlar. Lütfen sadece değiştirmek istediğiniz alanları doldurunuz. Değiştirilmesini istemediğiniz alanları boş bırakınız. ', 'bulk_update_warn' => ':asset_count adet demirbaşı düzenlemek üzeresiniz.', diff --git a/app/lang/tr/admin/hardware/message.php b/app/lang/tr/admin/hardware/message.php index afd5b359e4..b8a1e276c4 100755 --- a/app/lang/tr/admin/hardware/message.php +++ b/app/lang/tr/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Demirbaş girişi yapılamadı. Lütfen tekrar deneyin', 'success' => 'Demirbaş girişi yapıldı.', 'user_does_not_exist' => 'Bu kullanıcı geçersiz. Lütfen tekrar deneyin.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/tr/admin/models/general.php b/app/lang/tr/admin/models/general.php index 39d0145229..d4ea8231a3 100755 --- a/app/lang/tr/admin/models/general.php +++ b/app/lang/tr/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Model silindi. Geri getirmek için buraya tıklayınız.', + 'deleted' => 'Model silindi. Geri getirmek için buraya tıklayınız.', 'restore' => 'Modeli geri getir', - 'show_mac_address' => 'Bu model demirbaşta MAC adresi göster', + 'show_mac_address' => 'Bu model demirbaşta MAC adresi göster', 'view_deleted' => 'Silinenleri görüntüle', 'view_models' => 'Modelleri görüntüle', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/tr/admin/settings/general.php b/app/lang/tr/admin/settings/general.php index 090d57f52d..a15f6c1f53 100755 --- a/app/lang/tr/admin/settings/general.php +++ b/app/lang/tr/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/tr/admin/users/message.php b/app/lang/tr/admin/users/message.php index e37d7301ee..a1a9757e86 100755 --- a/app/lang/tr/admin/users/message.php +++ b/app/lang/tr/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'There was an issue importing users. Please try again.', 'asset_already_accepted' => 'This asset has already been accepted.', 'accept_or_decline' => 'You must either accept or decline this asset.', + '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:', diff --git a/app/lang/tr/general.php b/app/lang/tr/general.php index 261fff3d41..5c6cbbb3cf 100755 --- a/app/lang/tr/general.php +++ b/app/lang/tr/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Aktivite Raporu', 'address' => 'Adres', 'admin' => 'Yönetici', + 'add_seats' => 'Added seats', 'all_assets' => 'Tüm Demirbaşlar', 'all' => 'Tümü', 'archived' => 'Arşivlenmiş', @@ -102,9 +103,10 @@ 'processing' => 'İşleniyor', 'profile' => 'Profiliniz', 'qty' => 'QTY', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Ready to Deploy', 'recent_activity' => 'Recent Activity', + 'remove_company' => 'Remove Company Association', 'reports' => 'Raporlar', 'requested' => 'Requested', 'save' => 'Kaydet', diff --git a/app/lang/vi/admin/hardware/form.php b/app/lang/vi/admin/hardware/form.php index af591be0d6..c33b3ac19c 100755 --- a/app/lang/vi/admin/hardware/form.php +++ b/app/lang/vi/admin/hardware/form.php @@ -1,7 +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_update' => 'Cập nhật tài sản số lượng lớn', 'bulk_update_help' => 'Form này cho phép bạn cập nhật nhiều tài sản cùng lúc. Chỉ điền vào ô bạn cần thay đổi. Bất kỳ ô nào để trống sẽ thông báo là chưa thay đổi. ', 'bulk_update_warn' => 'Bạn muốn chỉnh sửa các thuộc tính của :asset_count assets.', diff --git a/app/lang/vi/admin/hardware/message.php b/app/lang/vi/admin/hardware/message.php index 868c3c8a3c..d12c1791e0 100755 --- a/app/lang/vi/admin/hardware/message.php +++ b/app/lang/vi/admin/hardware/message.php @@ -53,6 +53,11 @@ return array( 'error' => 'Tài sản chưa được checkin, xin vui lòng thử lại', 'success' => 'Tài sản đã checkin 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.' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/vi/admin/models/general.php b/app/lang/vi/admin/models/general.php index 60ba6ffdd0..8040662e28 100755 --- a/app/lang/vi/admin/models/general.php +++ b/app/lang/vi/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => 'Model này đã bị xoá. Bấm vào đây để khôi phục lại.', + 'deleted' => 'Model này đã bị xoá. Bấm vào đây để khôi phục lại.', 'restore' => 'Khôi phục Model', - 'show_mac_address' => 'Hiển thị trường địa chỉ MAC trong tài sản của model này', + 'show_mac_address' => 'Hiển thị trường địa chỉ MAC trong tài sản của model này', 'view_deleted' => 'Xem Model đã xoá', 'view_models' => 'Xem model', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/vi/admin/settings/general.php b/app/lang/vi/admin/settings/general.php index 07e175f92e..c0789daed1 100755 --- a/app/lang/vi/admin/settings/general.php +++ b/app/lang/vi/admin/settings/general.php @@ -30,6 +30,9 @@ return array( 'ldap_integration' => 'LDAP Integration', 'ldap_settings' => 'LDAP Settings', 'ldap_server' => 'LDAP Server', + '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_uname' => 'LDAP Bind Username', 'ldap_pword' => 'LDAP Bind Password', 'ldap_basedn' => 'Base Bind DN', diff --git a/app/lang/vi/admin/users/message.php b/app/lang/vi/admin/users/message.php index b5dfc2001c..a527615d63 100755 --- a/app/lang/vi/admin/users/message.php +++ b/app/lang/vi/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => 'Có vấn đề xảy ra khi nhập danh sách người dùng. Xin thử lại.', 'asset_already_accepted' => 'Tài sản này đã được chấp thuận.', 'accept_or_decline' => 'Bạn phải chấp nhận hoặc từ chối tài sản này.', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => 'Không thể kết nối đến máy chủ LDAP. Xin vui lòng kiểm tra lại cấu hình máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP.
Lỗi từ máy chủ LDAP:', 'ldap_could_not_bind' => 'Không thể liên kết đến máy chủ LDAP. Xin vui lòng kiểm tra lại cấu hình máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP.
Lỗi từ máy chủ LDAP: ', 'ldap_could_not_search' => 'Không thể tìm thấy máy chủ LDAP. Xin vui lòng kiểm tra cấu hình cài đặt máy chủ LDAP của bạn ở trong tập tin cấu hình LDAP.
Lỗi từ máy chủ LDAP:', diff --git a/app/lang/vi/general.php b/app/lang/vi/general.php index 13dd683320..406f58a62b 100755 --- a/app/lang/vi/general.php +++ b/app/lang/vi/general.php @@ -8,6 +8,7 @@ 'activity_report' => 'Activity Report', 'address' => 'Địa chỉ', 'admin' => 'Quản lý', + 'add_seats' => 'Added seats', 'all_assets' => 'Tất cả tài sản', 'all' => 'Tất cả', 'archived' => 'Đã lưu trữ', @@ -102,9 +103,10 @@ 'processing' => 'Đang xử lý', 'profile' => 'Hồ sơ của bạn', 'qty' => 'Số lượng', - 'quanitity' => 'Quanitity', + 'quantity' => 'Quantity', 'ready_to_deploy' => 'Sẵn sàng để cấp phát', 'recent_activity' => 'Hoạt động gần đây', + 'remove_company' => 'Remove Company Association', 'reports' => 'Các báo cáo', 'requested' => 'Đã yêu cầu', 'save' => 'Lưu', diff --git a/app/lang/zh-CN/admin/accessories/message.php b/app/lang/zh-CN/admin/accessories/message.php index 9240288256..96441c5325 100755 --- a/app/lang/zh-CN/admin/accessories/message.php +++ b/app/lang/zh-CN/admin/accessories/message.php @@ -2,17 +2,17 @@ return array( - 'does_not_exist' => 'Accessory does not exist.', + 'does_not_exist' => '配件不存在。', 'assoc_users' => '配件目前状态：可用数量不足，请检查改配件再重试。', 'create' => array( - 'error' => 'Accessory was not created, please try again.', - 'success' => 'Accessory created successfully.' + 'error' => '配件添加失败，请重试。', + 'success' => '配件添加成功。' ), 'update' => array( - 'error' => 'Accessory was not updated, please try again', - 'success' => 'Accessory updated successfully.' + 'error' => '配件更新失败，请重试。', + 'success' => '配件更新成功。' ), 'delete' => array( diff --git a/app/lang/zh-CN/admin/hardware/form.php b/app/lang/zh-CN/admin/hardware/form.php index 59b8b1bab1..cc34c176f8 100755 --- a/app/lang/zh-CN/admin/hardware/form.php +++ b/app/lang/zh-CN/admin/hardware/form.php @@ -1,7 +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_update' => '批量更新', 'bulk_update_help' => '该表格允许你同时修改多项资产。请仅填写需要修改的字段，留空的字段不会做任何修改。 ', 'bulk_update_warn' => '你即将同时修改 :asset_count 项资产的属性。', diff --git a/app/lang/zh-CN/admin/hardware/message.php b/app/lang/zh-CN/admin/hardware/message.php index e1e4426c19..9ecbe9cd86 100755 --- a/app/lang/zh-CN/admin/hardware/message.php +++ b/app/lang/zh-CN/admin/hardware/message.php @@ -52,6 +52,11 @@ return array( 'error' => '资产还没有借入，请重试。', 'success' => '资产借入成功。', 'user_does_not_exist' => '无效用户，请重试。' + ), + + 'requests' => array( + 'error' => 'Asset was not requested, please try again', + 'success' => 'Asset requested successfully.', ) ); diff --git a/app/lang/zh-CN/admin/hardware/table.php b/app/lang/zh-CN/admin/hardware/table.php index 0b22ef9502..c488684388 100755 --- a/app/lang/zh-CN/admin/hardware/table.php +++ b/app/lang/zh-CN/admin/hardware/table.php @@ -18,7 +18,7 @@ return array( 'serial' => '序列号', 'status' => '状态', 'title' => '资产', - 'image' => 'Device Image', + 'image' => '设备图片', 'days_without_acceptance' => '过期天数' ); diff --git a/app/lang/zh-CN/admin/models/general.php b/app/lang/zh-CN/admin/models/general.php index bf8f62e71c..28024dc4bd 100755 --- a/app/lang/zh-CN/admin/models/general.php +++ b/app/lang/zh-CN/admin/models/general.php @@ -2,10 +2,12 @@ return array( - 'deleted' => '此型号已被删除。点击此处恢复。', + 'deleted' => '此型号已被删除。点击此处恢复。', 'restore' => '恢复型号', - 'show_mac_address' => '在此型号资产中显示MAC地址', + 'show_mac_address' => '在此型号资产中显示MAC地址', 'view_deleted' => '查看已删除', 'view_models' => '查看已型号', + 'fieldset' => 'Fieldset', + 'no_custom_field' => 'No custom fields', ); diff --git a/app/lang/zh-CN/admin/settings/general.php b/app/lang/zh-CN/admin/settings/general.php index f6905971da..75ce211ef4 100755 --- a/app/lang/zh-CN/admin/settings/general.php +++ b/app/lang/zh-CN/admin/settings/general.php @@ -26,27 +26,30 @@ return array( 'header_color' => '标题颜色', 'info' => '这些设置允许您自定义安装的某些方面', 'laravel' => 'Laravel版本', - 'ldap_enabled' => 'LDAP enabled', - 'ldap_integration' => 'LDAP Integration', - 'ldap_settings' => 'LDAP Settings', - 'ldap_server' => 'LDAP Server', - 'ldap_uname' => 'LDAP Bind Username', - 'ldap_pword' => 'LDAP Bind Password', + 'ldap_enabled' => '启用LDAP验证', + 'ldap_integration' => 'LDAP集成', + 'ldap_settings' => 'LDAP 设置', + 'ldap_server' => 'LDAP 服务器', + '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_uname' => 'LDAP 用户名', + 'ldap_pword' => '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_auth_filter_query' => 'LDAP Authentication query', - 'ldap_version' => 'LDAP Version', - 'ldap_active_flag' => 'LDAP Active Flag', - 'ldap_emp_num' => 'LDAP Employee Number', + 'ldap_filter' => 'LDAP 过滤器', + '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 Email', '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版本', diff --git a/app/lang/zh-CN/admin/statuslabels/table.php b/app/lang/zh-CN/admin/statuslabels/table.php index 2f71eaf400..930bfbb68d 100755 --- a/app/lang/zh-CN/admin/statuslabels/table.php +++ b/app/lang/zh-CN/admin/statuslabels/table.php @@ -4,7 +4,7 @@ return array( 'about' => '关于状态标签', 'archived' => '已存档', 'create' => '创建状态标签', - 'deployable' => '可部署', + 'deployable' => '可领用', 'info' => '状态标签用于描述资产的各种状态（例如送外维修、丢失、被窃等等）。你可以为处于可部署、待处理或已存档的资产创建新的状态标签。 ', 'name' => '状态名称', 'pending' => '待处理', diff --git a/app/lang/zh-CN/admin/users/message.php b/app/lang/zh-CN/admin/users/message.php index 6439793117..8ddf79ec97 100755 --- a/app/lang/zh-CN/admin/users/message.php +++ b/app/lang/zh-CN/admin/users/message.php @@ -33,6 +33,7 @@ return array( 'import' => '导入用户出现问题。请再试一次。', 'asset_already_accepted' => '资产已被接受', 'accept_or_decline' => '你必须选择接受或者拒绝该资产。', + 'incorrect_user_accepted' => 'The asset you have attempted to accept was not checked out to you.', 'ldap_could_not_connect' => '无法连接到LDAP服务器，请检查LDAP配置文件中的相关设置。
LDAP服务器错误信息:', 'ldap_could_not_bind' => '无法绑定到LDAP服务器，请检查LDAP配置文件中的相关设置。
LDAP服务器错误信息: ', 'ldap_could_not_search' => '查询LDAP服务器失败，请检查LDAP配置文件中的相关设置。
LDAP服务器错误信息:', diff --git a/app/lang/zh-CN/general.php b/app/lang/zh-CN/general.php index f9b3806e54..bf63840c89 100755 --- a/app/lang/zh-CN/general.php +++ b/app/lang/zh-CN/general.php @@ -8,6 +8,7 @@ 'activity_report' => '活动报告', 'address' => '地址', 'admin' => '管理员', + 'add_seats' => 'Added seats', 'all_assets' => '所有资产', 'all' => '所有', 'archived' => '已存档', @@ -30,8 +31,8 @@ 'checkin_from' => '输入来源', 'checkout' => '借出', 'city' => '城市', - 'companies' => 'Companies', - 'company' => 'Company', + 'companies' => '公司', + 'company' => '公司', 'consumable' => '消耗品', 'consumables' => '消耗品', 'country' => '国家', @@ -102,9 +103,10 @@ 'processing' => '处理中', 'profile' => '您的个人资料', 'qty' => '数量', - 'quanitity' => '数量', + 'quantity' => 'Quantity', 'ready_to_deploy' => '待分配', 'recent_activity' => '最近操作活动', + 'remove_company' => 'Remove Company Association', 'reports' => '报告', 'requested' => '已申请', 'save' => '保存', @@ -143,5 +145,5 @@ 'years' => '年', 'yes' => '是', 'zip' => 'Zip', - 'noimage' => 'No image uploaded or image not found.', + 'noimage' => '图片未上传或图片无法找到。', ]; diff --git a/app/macros.php b/app/macros.php index ca72c4f0b8..2a58c0e19a 100755 --- a/app/macros.php +++ b/app/macros.php @@ -311,30 +311,24 @@ Form::macro('barcode_types', function ($name = "barcode_type", $selected = null, Form::macro('currencies', function ($name = "currency", $selected = null, $class = null) { $currencies = array( - 'USD' => array('name'=>'USD - U.S. Dollars', 'symbol'=>'$','symbol_html'=>'$'), + 'USD' => array('name'=>'US/Canadian/etc Dollar', 'symbol'=>'$','symbol_html'=>'$'), 'GBP' => array('name'=>'GBP - British Pounds', 'symbol'=>'£','symbol_html'=>'£'), 'EUR' => array('name'=>'EUR - Euros', 'symbol'=>'€','symbol_html'=>'€'), - 'AUD' => array('name'=>'AUD - Australian Dollars', 'symbol'=>'$','symbol_html'=>'$'), 'BGN' => array('name'=>'BGN - Bulgarian lev', 'symbol'=>'лв.','symbol_html'=>'лв.'), 'BRL' => array('name'=>'BRL - Brazilian Real', 'symbol'=>'R$','symbol_html'=>'R$'), - 'CAD' => array('name'=>'CAD - Canadian Dollars', 'symbol'=>'$','symbol_html'=>'$'), - 'CZK' => array('name'=>'CZK - Czech koruny', 'symbol'=>'Kč','symbol_html'=>''), + 'CZK' => array('name'=>'CZK - Czech koruny', 'symbol'=>'Kč','symbol_html'=>'CZK'), 'DKK' => array('name'=>'DKK - Danish Kroner', 'symbol'=>'kr','symbol_html'=>'kr'), - 'HKD' => array('name'=>'HKD - Hong Kong Dollars', 'symbol'=>'$','symbol_html'=>'$'), 'HUF' => array('name'=>'HUF - Hungarian Forints', 'symbol'=>'Ft','symbol_html'=>'Ft'), 'ILS' => array('name'=>'ILS - Israeli Shekels', 'symbol'=>'₪','symbol_html'=>'₪'), 'JPY' => array('name'=>'JPY - Japanese Yen', 'symbol'=>'¥','symbol_html'=>'¥'), 'MYR' => array('name'=>'MYR - Malaysian Ringgits', 'symbol'=>'RM','symbol_html'=>'RM'), - 'MXN' => array('name'=>'MXN - Mexican Pesos', 'symbol'=>'$','symbol_html'=>'$'), - 'NZD' => array('name'=>'NZD - New Zealand Dollars', 'symbol'=>'$','symbol_html'=>'$'), 'NOK' => array('name'=>'NOK - Norwegian Kroner', 'symbol'=>'kr','symbol_html'=>'kr'), 'PHP' => array('name'=>'PHP - Philippine Pesos', 'symbol'=>'Php','symbol_html'=>'Php'), - 'PLN' => array('name'=>'PLN - Polish zloty', 'symbol'=>'zł','symbol_html'=>''), + 'PLN' => array('name'=>'PLN - Polish zloty', 'symbol'=>'zł','symbol_html'=>'PLN'), + 'INR' => array('name'=>'INR - Indian Rupee', 'symbol'=>'Rs','symbol_html'=>'₨'), 'RUB' => array('name'=>'RUB - Russian Rubles', 'symbol'=>'₽','symbol_html'=>'₽'), - 'SGD' => array('name'=>'SGD - Singapore Dollars', 'symbol'=>'$','symbol_html'=>'$'), 'SEK' => array('name'=>'SEK - Swedish Kronor', 'symbol'=>'kr','symbol_html'=>'kr'), 'CHF' => array('name'=>'CHF - Swiss Francs', 'symbol'=>'CHF','symbol_html'=>'CHF'), - 'TWD' => array('name'=>'TWD - Taiwan New Dollars', 'symbol'=>'$','symbol_html'=>'$'), 'THB' => array('name'=>'THB - Thai Baht', 'symbol'=>'฿','symbol_html'=>' ฿'), 'TRY' => array('name'=>'TRY - Turkish Liras', 'symbol'=>'TL','symbol_html'=>' ฿'), 'UAH' => array('name'=>'UAH - Ukrainian Hryvnias', 'symbol'=>'₴','symbol_html'=>'₴'), diff --git a/app/models/Asset.php b/app/models/Asset.php index c749e87076..020f82af6f 100755 --- a/app/models/Asset.php +++ b/app/models/Asset.php @@ -677,17 +677,15 @@ return false; }); }); }); - })->orWhere(function($query) use ($search) { - $query->whereHas('assetlog', function($query) use ($search) { - $query->where('action_type','=','checkout') - ->where('created_at','LIKE','%'.$search.'%'); - }); })->orWhere('assets.name','LIKE','%'.$search.'%') ->orWhere('asset_tag','LIKE','%'.$search.'%') ->orWhere('serial','LIKE','%'.$search.'%') ->orWhere('order_number','LIKE','%'.$search.'%') ->orWhere('notes','LIKE','%'.$search.''); } + foreach(CustomField::all() AS $field) { + $query->orWhere($field->db_column_name(),'LIKE',"%$search%"); + } }); } diff --git a/app/models/Category.php b/app/models/Category.php index 6df3fcee5a..08987c77c4 100755 --- a/app/models/Category.php +++ b/app/models/Category.php @@ -35,6 +35,28 @@ class Category extends Elegant return $this->hasMany('Accessory'); } + public function consumablesCount() + { + return $this->hasMany('Consumable')->count(); + } + + public function consumables() + { + return $this->hasMany('Consumable'); + } + + public function itemCount() + { + switch ($this->category_type) { + case 'asset': + return $this->assetscount(); + case 'accessory': + return $this->accessoriescount(); + case 'consumable': + return $this->consumablesCount(); + } + return '0'; + } public function assets() { diff --git a/app/models/CustomField.php b/app/models/CustomField.php new file mode 100644 index 0000000000..d04a246480 --- /dev/null +++ b/app/models/CustomField.php @@ -0,0 +1,107 @@ + "", + "ALPHA" => "[a-zA-Z]*", + "NUMERIC" => "[0-9]*", + "MAC" => "[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" => "([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])" + ]; + + public $rules=[ + "name" => "required|unique:custom_fields" + ]; + + public static $table_name="assets"; + + public static function name_to_db_name($name) + { + return "_snipeit_".preg_replace("/[^a-zA-Z0-9]/","_",strtolower($name)); + } + + public static function boot() + { + self::creating(function ($custom_field) { + + if(in_array($custom_field->db_column_name(),Schema::getColumnListing(DB::getTablePrefix().CustomField::$table_name))) { + //field already exists when making a new custom field; fail. + return false; + } + return DB::statement("ALTER TABLE ".DB::getTablePrefix().CustomField::$table_name." ADD COLUMN (".$custom_field->db_column_name()." TEXT)"); + }); + + self::updating(function ($custom_field) { + //print(" SAVING CALLBACK FIRING!!!!! "); + if($custom_field->isDirty("name")) { + //print("DIRTINESS DETECTED!"); + //$fields=array_keys($custom_field->getAttributes()); + //; + //add timestamp fields, add id column + //array_push($fields,$custom_field->getKeyName()); + /*if($custom_field::timestamps) { + + }*/ + //print("Fields are: ".print_r($fields,true)); + if(in_array($custom_field->db_column_name(),Schema::getColumnListing(CustomField::$table_name))) { + //field already exists when renaming a custom field + return false; + } + return DB::statement("UPDATE ".CustomField::$table_name." RENAME ".self::name_to_db_name($custom_field->get_original("name"))." TO ".$custom_field->db_column_name()); + } + return true; + }); + + self::deleting(function ($custom_field) { + return DB::statement("ALTER TABLE ".CustomField::$table_name." DROP COLUMN ".$custom_field->db_column_name()); + }); + } + + /*public static function boot() { + parent::boot(); + + self::saving(function ($data) { + print("DOES THIS AT LEAST CATCH IT?!"); + self::check_db_name($data); + }); + }*/ + + public function fieldset() { + return $this->belongsToMany('CustomFieldset'); //?!?!?!?!?!? + } + + //public function + + //need helper to go from regex->English + //need helper to go from English->regex + + //need helper for save() stuff - basically to alter table for the fields in question + + public function check_format($value) { + return preg_match('/^'.$this->attributes['format'].'$/',$value)===1; + } + + public function db_column_name() { + return self::name_to_db_name($this->name); + } + + //mutators for 'format' attribute + public function getFormatAttribute($value) { + foreach(self::$PredefinedFormats AS $name => $pattern) { + if($pattern===$value) { + return $name; + } + } + return $value; + } + + public function setFormatAttribute($value) { + if(isset(self::$PredefinedFormats[$value])) { + $this->attributes['format']=self::$PredefinedFormats[$value]; + } else { + $this->attributes['format']=$value; + } + } +} diff --git a/app/models/CustomFieldset.php b/app/models/CustomFieldset.php new file mode 100644 index 0000000000..2af4ae9b9f --- /dev/null +++ b/app/models/CustomFieldset.php @@ -0,0 +1,35 @@ + "required|unique:custom_fieldsets" + ]; + + public function fields() { + return $this->belongsToMany('CustomField')->withPivot(["required","order"])->orderBy("pivot_order"); + } + + public function models() { + return $this->hasMany('Model',"fieldset_id"); + } + + public function validation_rules() + { + $rules=[]; + foreach($this->fields AS $field) { + $rule=[]; + if($field->pivot->required) { + $rule[]="required"; + } + array_push($rule,"regex:/".$field->attributes['format']."/"); + $rules[$field->db_column_name()]=$rule; + } + return $rules; + } + + //requiredness goes *here* + //sequence goes here? +} diff --git a/app/models/Elegant.php b/app/models/Elegant.php index c2f0ddd77e..da85848ff7 100755 --- a/app/models/Elegant.php +++ b/app/models/Elegant.php @@ -1,5 +1,8 @@ 'required|alpha_space|min:3|max:255|unique:locations,name,{id}', 'city' => 'required|alpha_space|min:3|max:255', - 'currency' => 'required', 'state' => 'alpha_space|min:2|max:32', 'country' => 'required|alpha_space|min:2|max:2|max:2', 'address' => 'alpha_space|min:5|max:80', diff --git a/app/models/Model.php b/app/models/Model.php index 23d7297583..80e3384497 100755 --- a/app/models/Model.php +++ b/app/models/Model.php @@ -1,5 +1,7 @@ 'required|alpha_space|min:2|max:255|unique:models,deleted_at,NULL', + 'name' => 'required|alpha_space|min:2|max:255|unique:models,name,{id},deleted_at', 'modelno' => 'alpha_space|min:1|max:255', 'category_id' => 'required|integer', 'manufacturer_id' => 'required|integer', @@ -41,6 +43,11 @@ class Model extends Elegant return $this->belongsTo('Manufacturer','manufacturer_id'); } + public function fieldset() + { + return $this->belongsTo('CustomFieldset','fieldset_id'); + } + /** * ----------------------------------------------- * BEGIN QUERY SCOPES diff --git a/app/models/User.php b/app/models/User.php index f2df7ab1ea..911023311e 100755 --- a/app/models/User.php +++ b/app/models/User.php @@ -228,6 +228,7 @@ public function scopeGetNotDeleted($query) ->orWhere('users.email', 'LIKE', "%$search%") ->orWhere('users.username', 'LIKE', "%$search%") ->orWhere('users.notes', 'LIKE', "%$search%") + ->orWhere('users.employee_num', 'LIKE', "%$search%") ->orWhere(function($query) use ($search) { $query->whereHas('userloc', function($query) use ($search) { $query->where('locations.name','LIKE','%'.$search.'%'); diff --git a/app/routes.php b/app/routes.php index 6a7b35abb0..4f39ccec58 100755 --- a/app/routes.php +++ b/app/routes.php @@ -115,13 +115,6 @@ Route::resource( '/', 'ModelsController' ); Route::get( 'list/{status?}', [ 'as' => 'api.models.list', 'uses' => 'ModelsController@getDatatable' ] ); - Route::get( '{modelId}/check', function ( $modelId ) { - - $model = Model::find( $modelId ); - - return $model->show_mac_address; - } ); - Route::get( '{modelID}/view', [ 'as' => 'api.models.view', 'uses' => 'ModelsController@getDataView' ] ); } ); @@ -206,6 +199,11 @@ 'as' => 'hardware/bulkedit', 'uses' => 'AssetsController@postBulkEdit' ] ); + Route::post( 'bulkdelete', + [ + 'as' => 'hardware/bulkdelete', + 'uses' => 'AssetsController@postBulkDelete' + ] ); Route::post( 'bulksave', [ 'as' => 'hardware/bulksave', @@ -225,6 +223,7 @@ Route::get( '{modelId}/delete', [ 'as' => 'delete/model', 'uses' => 'ModelsController@getDelete' ] ); Route::get( '{modelId}/view', [ 'as' => 'view/model', 'uses' => 'ModelsController@getView' ] ); Route::get( '{modelID}/restore', [ 'as' => 'restore/model', 'uses' => 'ModelsController@getRestore' ] ); + Route::get( '{modelId}/custom_fields',['as' => 'custom_fields/model','uses' => 'ModelsController@getCustomFields']); } ); Route::get( '/', [ @@ -461,6 +460,13 @@ } ); + # Custom fields support + Route::get('custom_fields/create-field',['uses' =>'CustomFieldsController@createField','as' => 'admin.custom_fields.create-field']); + Route::post('custom_fields/create-field',['uses' => 'CustomFieldsController@storeField','as' => 'admin.custom_fields.store-field']); + Route::post('custom_fields/{id}/associate',['uses' => 'CustomFieldsController@associate','as' => 'admin.custom_fields.associate']); + Route::match(['DELETE'],'custom_fields/delete-field/{id}',['uses' => 'CustomFieldsController@deleteField','as' => 'admin.custom_fields.delete-field']); + Route::resource('custom_fields','CustomFieldsController'); + # User Management Route::group( [ 'prefix' => 'users' ], function () { diff --git a/app/tests/CustomFieldTest.php b/app/tests/CustomFieldTest.php new file mode 100644 index 0000000000..e3090ac7bb --- /dev/null +++ b/app/tests/CustomFieldTest.php @@ -0,0 +1,78 @@ +name="test 1"; + $f->format="IP"; + $f->element="text"; + + $f->save(); + + $this->assertFalse($f->check_format("300.2.3.4")); + } + + public function testGoodIP() { + $f=new CustomField(); + $f->name="test 1"; + $f->format="IP"; + $f->element="text"; + + $f->save(); + + $this->assertTrue($f->check_format("1.2.3.4")); + } + + public function testFormat() { + $f=new CustomField(); + $f->name="test 1"; + $f->format="IP"; + $f->element="text"; + + $f->save(); + + //print_r($f->attributes); + //print($f); + //print("Uhm, format is: ".$f->attributes['format']); + //print("Lemme try this: ".$f->getAttribute('format')); + //print("Moar: ".print_r($f->getAttributes(),true)); + $this->assertEquals($f->getAttributes()['format'],CustomField::$PredefinedFormats['IP']); //this seems undocumented... + $this->assertEquals($f->format,"IP"); + } + + public function testDbName() { + $f=new CustomField(); + $f->name="An Example Name"; + $this->assertEquals($f->db_column_name(),"an_example_name"); + } + + public function testValidation() { + $f=new CustomField(); + + $f->name='Id'; + $f->format='IP'; + $f->element="text"; + /*$this->assertDoesntThrow(function () { + $f->save(); + });*/ + $this->assertFalse(CustomField::saving($f)); //horrible hacky workaround to even problems + //for Laravel testing. Blech. + + $g=new CustomField(); + $g->name='totally_unique_name'; + $g->format='IP'; + $g->element="text"; + //$this->assertTrue($g->validate($g->toArray())); + $this->assertTrue(CustomField::saving($g)); + /*$this->assertThrows(function () { + $f->save(); + });*/ + } +} diff --git a/app/validators.php b/app/validators.php index 06becd0b4d..7001c48c1c 100755 --- a/app/validators.php +++ b/app/validators.php @@ -24,3 +24,8 @@ Validator::extend('unique_multiple', function ($attribute, $value, $parameters) // Validation result will be false if any rows match the combination return ($query->count() == 0); }); + +Validator::extend('unique_column',function ($attribute,$value,$parameters) { + + return false; +}); diff --git a/app/views/backend/accessories/view.blade.php b/app/views/backend/accessories/view.blade.php index a8f0809fb0..b91988fbb5 100644 --- a/app/views/backend/accessories/view.blade.php +++ b/app/views/backend/accessories/view.blade.php @@ -61,8 +61,8 @@ - - + + - - + +