diff --git a/.env.example b/.env.example
index f8e1df2987..fd90391973 100644
--- a/.env.example
+++ b/.env.example
@@ -86,6 +86,7 @@ COOKIE_DOMAIN=null
SECURE_COOKIES=false
API_TOKEN_EXPIRATION_YEARS=15
BS_TABLE_STORAGE=cookieStorage
+BS_TABLE_DEEPLINK=true
# --------------------------------------------
# OPTIONAL: SECURITY HEADER SETTINGS
diff --git a/README.md b/README.md
index d237a6856c..b271d88c26 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,8 @@ It is built on [Laravel 8](http://laravel.com).
Snipe-IT is actively developed and we [release quite frequently](https://github.com/snipe/snipe-it/releases). ([Check out the live demo here](https://snipeitapp.com/demo/).)
-__This is web-based software__. This means there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.
+> [!TIP]
+> __This is web-based software__. This means there is no executable file (aka no .exe files), and it must be run on a web server and accessed through a web browser. It runs on any Mac OSX, flavor of Linux, as well as Windows, and we have a [Docker image](https://snipe-it.readme.io/docs/docker) available if that's what you're into.
-----
@@ -21,7 +22,7 @@ For instructions on installing and configuring Snipe-IT on your server, check ou
If you're having trouble with the installation, please check the [Common Issues](https://snipe-it.readme.io/docs/common-issues) and [Getting Help](https://snipe-it.readme.io/docs/getting-help) documentation, and search this repository's open *and* closed issues for help.
-[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy)
+
-----
### User's Manual
@@ -32,8 +33,9 @@ For help using Snipe-IT, check out the [user's manual](https://snipe-it.readme.i
Feel free to check out the [GitHub Issues for this project](https://github.com/snipe/snipe-it/issues) to open a bug report or see what open issues you can help with. Please search through existing issues (open *and* closed) to see if your question has already been answered before opening a new issue.
-**PLEASE see the [Getting Help Guidelines](https://snipe-it.readme.io/docs/getting-help) and [Common Issues](https://snipe-it.readme.io/docs/common-issues) before opening a ticket, and be sure to complete all of the questions in the Github Issue template to help us to help you as quickly as possible.**
-
+> [!IMPORTANT]
+> **PLEASE see the [Getting Help Guidelines](https://snipe-it.readme.io/docs/getting-help) and [Common Issues](https://snipe-it.readme.io/docs/common-issues) before opening a ticket, and be sure to complete all of the questions in the Github Issue template to help us to help you as quickly as possible.**
+>
-----
### Upgrading
@@ -57,6 +59,9 @@ Please see the [translations documentation](https://snipe-it.readme.io/docs/tran
Since the release of the JSON REST API, several third-party developers have been developing modules and libraries to work with Snipe-IT.
+> [!NOTE]
+> As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :)
+
- [Python Module](https://github.com/jbloomer/SnipeIT-PythonAPI) by [@jbloomer](https://github.com/jbloomer)
- [SnipeSharp - .NET module in C#](https://github.com/barrycarey/SnipeSharp) by [@barrycarey](https://github.com/barrycarey)
- [InQRy -unmaintained-](https://github.com/Microsoft/InQRy) by [@Microsoft](https://github.com/Microsoft)
@@ -73,8 +78,6 @@ Since the release of the JSON REST API, several third-party developers have been
- [UniFi to Snipe-IT](https://github.com/RodneyLeeBrands/UnifiSnipeSync) by [@karpadiem](https://github.com/karpadiem) - Python script that synchronizes UniFi devices with Snipe-IT.
- [Kandji2Snipe](https://github.com/grokability/kandji2snipe) by [@briangoldstein](https://github.com/briangoldstein) - Python script that synchronizes Kandji with Snipe-IT.
- [SnipeAgent](https://github.com/ReticentRobot/SnipeAgent) by @ReticentRobot - Windows agent for Snipe-IT
-
-As these were created by third-parties, Snipe-IT cannot provide support for these project, and you should contact the developers directly if you need assistance. Additionally, Snipe-IT makes no guarantees as to the reliability, accuracy or maintainability of these libraries. Use at your own risk. :)
-----
@@ -92,4 +95,5 @@ The ERD is available [online here](https://drawsql.app/templates/snipe-it).
### Security
-To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker.
+> [!IMPORTANT]
+> **To report a security vulnerability, please email security@snipeitapp.com instead of using the issue tracker.**
diff --git a/app/Console/Commands/ToggleCustomfieldEncryption.php b/app/Console/Commands/ToggleCustomfieldEncryption.php
new file mode 100644
index 0000000000..2ba07f7bd1
--- /dev/null
+++ b/app/Console/Commands/ToggleCustomfieldEncryption.php
@@ -0,0 +1,76 @@
+argument('fieldname');
+
+ if ($field = CustomField::where('db_column', $fieldname)->first()) {
+
+ // If the field is not encrypted, make it encrypted and encrypt the data in the assets table for the
+ // corresponding field.
+ DB::transaction(function () use ($field) {
+
+ if ($field->field_encrypted == 0) {
+ $assets = Asset::whereNotNull($field->db_column)->get();
+
+ foreach ($assets as $asset) {
+ $asset->{$field->db_column} = encrypt($asset->{$field->db_column});
+ $asset->save();
+ }
+
+ $field->field_encrypted = 1;
+ $field->save();
+
+ // This field is already encrypted. Do nothing.
+ } else {
+ $this->error('The custom field ' . $field->db_column.' is already encrypted. No action was taken.');
+ }
+ });
+
+ // No matching column name found
+ } else {
+ $this->error('No matching results for unencrypted custom fields with db_column name: ' . $fieldname.'. Please check the fieldname.');
+ }
+
+ }
+}
diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php
index 0f3e271756..e3f2b036e0 100644
--- a/app/Helpers/Helper.php
+++ b/app/Helpers/Helper.php
@@ -842,7 +842,7 @@ class Helper
$filetype = @finfo_file($finfo, $file);
finfo_close($finfo);
- if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif')) {
+ if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif') || ($filetype == 'image/avif')) {
return $filetype;
}
@@ -1106,6 +1106,8 @@ class Helper
'jpeg' => 'far fa-image',
'gif' => 'far fa-image',
'png' => 'far fa-image',
+ 'webp' => 'far fa-image',
+ 'avif' => 'far fa-image',
// word
'doc' => 'far fa-file-word',
'docx' => 'far fa-file-word',
@@ -1141,6 +1143,8 @@ class Helper
case 'jpeg':
case 'gif':
case 'png':
+ case 'webp':
+ case 'avif':
return true;
break;
default:
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index d9e9a2190f..92f1038cbd 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -94,6 +94,7 @@ class AssetsController extends Controller
'serial',
'model_number',
'last_checkout',
+ 'last_checkin',
'notes',
'expected_checkin',
'order_number',
@@ -591,6 +592,11 @@ class AssetsController extends Controller
}
}
}
+ if ($field->element == 'checkbox') {
+ if(is_array($field_val)) {
+ $field_val = implode(',', $field_val);
+ }
+ }
$asset->{$field->db_column} = $field_val;
@@ -614,6 +620,8 @@ class AssetsController extends Controller
}
return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.create.success')));
+
+ return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.create.success')));
}
return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
@@ -659,13 +667,22 @@ class AssetsController extends Controller
// Update custom fields
if (($model) && (isset($model->fieldset))) {
foreach ($model->fieldset->fields as $field) {
+ $field_val = $request->input($field->db_column, null);
+
if ($request->has($field->db_column)) {
if ($field->field_encrypted == '1') {
if (Gate::allows('admin')) {
- $asset->{$field->db_column} = \Crypt::encrypt($request->input($field->db_column));
+ $asset->{$field->db_column} = Crypt::encrypt($field_val);
}
- } else {
- $asset->{$field->db_column} = $request->input($field->db_column);
+ }
+ if ($field->element == 'checkbox') {
+ if(is_array($field_val)) {
+ $field_val = implode(',', $field_val);
+ $asset->{$field->db_column} = $field_val;
+ }
+ }
+ else {
+ $asset->{$field->db_column} = $field_val;
}
}
}
@@ -693,6 +710,7 @@ class AssetsController extends Controller
}
return response()->json(Helper::formatStandardApiResponse('success', $asset, trans('admin/hardware/message.update.success')));
+ return response()->json(Helper::formatStandardApiResponse('success', (new AssetsTransformer)->transformAsset($asset), trans('admin/hardware/message.update.success')));
}
return response()->json(Helper::formatStandardApiResponse('error', null, $asset->getErrors()), 200);
@@ -1062,8 +1080,7 @@ class AssetsController extends Controller
$assets = Asset::select('assets.*')
->with('location', 'assetstatus', 'assetlog', 'company','assignedTo',
- 'model.category', 'model.manufacturer', 'model.fieldset', 'supplier', 'requests')
- ->requestableAssets();
+ 'model.category', 'model.manufacturer', 'model.fieldset', 'supplier', 'requests');
@@ -1071,7 +1088,7 @@ class AssetsController extends Controller
if ($request->filled('search')) {
$assets->TextSearch($request->input('search'));
}
-
+
// Search custom fields by column name
foreach ($all_custom_fields as $field) {
if ($request->filled($field->db_column_name())) {
@@ -1101,6 +1118,7 @@ class AssetsController extends Controller
break;
}
+ $assets->requestableAssets();
// Make sure the offset and limit are actually integers and do not exceed system limits
$offset = ($request->input('offset') > $assets->count()) ? $assets->count() : app('api_offset_value');
diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php
index e1c79dfbe4..b46c13e13e 100644
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -235,7 +235,13 @@ class LocationsController extends Controller
public function destroy($id)
{
$this->authorize('delete', Location::class);
- $location = Location::findOrFail($id);
+ $location = Location::withCount('assignedAssets as assigned_assets_count')
+ ->withCount('assets as assets_count')
+ ->withCount('rtd_assets as rtd_assets_count')
+ ->withCount('children as children_count')
+ ->withCount('users as users_count')
+ ->findOrFail($id);
+
if (! $location->isDeletable()) {
return response()
->json(Helper::formatStandardApiResponse('error', null, trans('admin/companies/message.assoc_users')));
diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php
index a91d8a9bcc..fbeb78fc8f 100644
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -32,19 +32,26 @@ class ReportsController extends Controller
}
if (($request->filled('item_type')) && ($request->filled('item_id'))) {
- $actionlogs = $actionlogs->where('item_id', '=', $request->input('item_id'))
+ $actionlogs = $actionlogs->where(function($query) use ($request)
+ {
+ $query->where('item_id', '=', $request->input('item_id'))
->where('item_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')))
->orWhere(function($query) use ($request)
{
$query->where('target_id', '=', $request->input('item_id'))
->where('target_type', '=', 'App\\Models\\'.ucwords($request->input('item_type')));
});
+ });
}
if ($request->filled('action_type')) {
$actionlogs = $actionlogs->where('action_type', '=', $request->input('action_type'))->orderBy('created_at', 'desc');
}
+ if ($request->filled('user_id')) {
+ $actionlogs = $actionlogs->where('user_id', '=', $request->input('user_id'));
+ }
+
if ($request->filled('action_source')) {
$actionlogs = $actionlogs->where('action_source', '=', $request->input('action_source'))->orderBy('created_at', 'desc');
}
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index 780cc01610..56b61dccf7 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -563,7 +563,26 @@ class UsersController extends Controller
{
$this->authorize('view', User::class);
$this->authorize('view', Asset::class);
- $assets = Asset::where('assigned_to', '=', $id)->where('assigned_type', '=', User::class)->with('model')->get();
+ $assets = Asset::where('assigned_to', '=', $id)->where('assigned_type', '=', User::class)->with('model');
+
+
+ // Filter on category ID
+ if ($request->filled('category_id')) {
+ $assets = $assets->InCategory($request->input('category_id'));
+ }
+
+
+ // Filter on model ID
+ if ($request->filled('model_id')) {
+
+ $model_ids = $request->input('model_id');
+ if (!is_array($model_ids)) {
+ $model_ids = array($model_ids);
+ }
+ $assets = $assets->InModelList($model_ids);
+ }
+
+ $assets = $assets->get();
return (new AssetsTransformer)->transformAssets($assets, $assets->count(), $request);
}
@@ -664,7 +683,17 @@ class UsersController extends Controller
$user = User::find($request->get('id'));
$user->two_factor_secret = null;
$user->two_factor_enrolled = 0;
- $user->save();
+ $user->saveQuietly();
+
+ // Log the reset
+ $logaction = new Actionlog();
+ $logaction->target_type = User::class;
+ $logaction->target_id = $user->id;
+ $logaction->item_type = User::class;
+ $logaction->item_id = $user->id;
+ $logaction->created_at = date('Y-m-d H:i:s');
+ $logaction->user_id = Auth::user()->id;
+ $logaction->logaction('2FA reset');
return response()->json(['message' => trans('admin/settings/general.two_factor_reset_success')], 200);
} catch (\Exception $e) {
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
index 484a2e2f85..8d387f968f 100755
--- a/app/Http/Controllers/AssetModelsController.php
+++ b/app/Http/Controllers/AssetModelsController.php
@@ -7,6 +7,7 @@ use App\Http\Requests\ImageUploadRequest;
use App\Models\Actionlog;
use App\Models\Asset;
use App\Models\AssetModel;
+use App\Models\CustomField;
use App\Models\User;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
@@ -486,11 +487,11 @@ class AssetModelsController extends Controller
* @param array $defaultValues
* @return void
*/
- private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues)
+ private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues): bool
{
$data = array();
foreach ($defaultValues as $customFieldId => $defaultValue) {
- $customField = \App\Models\CustomField::find($customFieldId);
+ $customField = CustomField::find($customFieldId);
$data[$customField->db_column] = $defaultValue;
}
diff --git a/app/Http/Controllers/Assets/AssetsController.php b/app/Http/Controllers/Assets/AssetsController.php
index 0683a54e3a..6054718e6b 100755
--- a/app/Http/Controllers/Assets/AssetsController.php
+++ b/app/Http/Controllers/Assets/AssetsController.php
@@ -102,6 +102,10 @@ class AssetsController extends Controller
{
$this->authorize(Asset::class);
+ // There are a lot more rules to add here but prevents
+ // errors around `asset_tags` not being present below.
+ $this->validate($request, ['asset_tags' => ['required', 'array']]);
+
// Handle asset tags - there could be one, or potentially many.
// This is only necessary on create, not update, since bulk editing is handled
// differently
diff --git a/app/Http/Controllers/Assets/BulkAssetsController.php b/app/Http/Controllers/Assets/BulkAssetsController.php
index 158f318133..561e13b200 100644
--- a/app/Http/Controllers/Assets/BulkAssetsController.php
+++ b/app/Http/Controllers/Assets/BulkAssetsController.php
@@ -14,6 +14,7 @@ use App\View\Label;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
use Illuminate\Support\Facades\Session;
use App\Http\Requests\AssetCheckoutRequest;
use App\Models\CustomField;
@@ -93,6 +94,59 @@ class BulkAssetsController extends Controller
$assets = Asset::with('assignedTo', 'location', 'model')->whereIn('assets.id', $asset_ids);
+ $assets = $assets->get();
+
+ if ($assets->isEmpty()) {
+ Log::debug('No assets were found for the provided IDs', ['ids' => $asset_ids]);
+ return redirect()->back()->with('error', trans('admin/hardware/message.update.assets_do_not_exist_or_are_invalid'));
+ }
+
+ $models = $assets->unique('model_id');
+ $modelNames = [];
+ foreach($models as $model) {
+ $modelNames[] = $model->model->name;
+ }
+
+ if ($request->filled('bulk_actions')) {
+
+
+ switch ($request->input('bulk_actions')) {
+ case 'labels':
+ $this->authorize('view', Asset::class);
+
+ return (new Label)
+ ->with('assets', $assets)
+ ->with('settings', Setting::getSettings())
+ ->with('bulkedit', true)
+ ->with('count', 0);
+
+ case 'delete':
+ $this->authorize('delete', Asset::class);
+ $assets->each(function ($assets) {
+ $this->authorize('delete', $assets);
+ });
+
+ return view('hardware/bulk-delete')->with('assets', $assets);
+
+ case 'restore':
+ $this->authorize('update', Asset::class);
+ $assets = Asset::withTrashed()->find($asset_ids);
+ $assets->each(function ($asset) {
+ $this->authorize('delete', $asset);
+ });
+ return view('hardware/bulk-restore')->with('assets', $assets);
+
+ case 'edit':
+ $this->authorize('update', Asset::class);
+
+ return view('hardware/bulk')
+ ->with('assets', $asset_ids)
+ ->with('statuslabel_list', Helper::statusLabelList())
+ ->with('models', $models->pluck(['model']))
+ ->with('modelNames', $modelNames);
+ }
+ }
+
switch ($sort_override) {
case 'model':
$assets->OrderModels($order);
@@ -128,54 +182,6 @@ class BulkAssetsController extends Controller
break;
}
- $assets = $assets->get();
-
- $models = $assets->unique('model_id');
- $modelNames = [];
- foreach($models as $model) {
- $modelNames[] = $model->model->name;
- }
-
- if ($request->filled('bulk_actions')) {
-
-
- switch ($request->input('bulk_actions')) {
- case 'labels':
- $this->authorize('view', Asset::class);
-
- return (new Label)
- ->with('assets', $assets)
- ->with('settings', Setting::getSettings())
- ->with('bulkedit', true)
- ->with('count', 0);
-
- case 'delete':
- $this->authorize('delete', Asset::class);
- $assets->each(function ($assets) {
- $this->authorize('delete', $assets);
- });
-
- return view('hardware/bulk-delete')->with('assets', $assets);
-
- case 'restore':
- $this->authorize('update', Asset::class);
- $assets = Asset::withTrashed()->find($asset_ids);
- $assets->each(function ($asset) {
- $this->authorize('delete', $asset);
- });
- return view('hardware/bulk-restore')->with('assets', $assets);
-
- case 'edit':
- $this->authorize('update', Asset::class);
-
- return view('hardware/bulk')
- ->with('assets', $asset_ids)
- ->with('statuslabel_list', Helper::statusLabelList())
- ->with('models', $models->pluck(['model']))
- ->with('modelNames', $modelNames);
- }
- }
-
return redirect()->back()->with('error', 'No action selected');
}
diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php
index ffe5eceec2..23ea9da34b 100644
--- a/app/Http/Controllers/CustomFieldsController.php
+++ b/app/Http/Controllers/CustomFieldsController.php
@@ -260,7 +260,7 @@ class CustomFieldsController extends Controller
$field->name = trim(e($request->get("name")));
$field->element = e($request->get("element"));
- $field->field_values = e($request->get("field_values"));
+ $field->field_values = $request->get("field_values");
$field->user_id = Auth::id();
$field->help_text = $request->get("help_text");
$field->show_in_email = $show_in_email;
diff --git a/app/Http/Controllers/LabelsController.php b/app/Http/Controllers/LabelsController.php
index 4fe04dc1c5..799d910384 100755
--- a/app/Http/Controllers/LabelsController.php
+++ b/app/Http/Controllers/LabelsController.php
@@ -71,11 +71,13 @@ class LabelsController extends Controller
collect(explode(';', Setting::getSettings()->label2_fields))
->filter()
->each(function ($item) use ($customFieldColumns, $exampleAsset) {
- $pair = explode('=', $item);
-
- if ($customFieldColumns->contains($pair[1])) {
- $exampleAsset->{$pair[1]} = "{{$pair[0]}}";
- }
+ $pair = explode('=', $item);
+
+ if (array_key_exists(1, $pair)) {
+ if ($customFieldColumns->contains($pair[1])) {
+ $exampleAsset->{$pair[1]} = "{{$pair[0]}}";
+ }
+ }
});
$settings = Setting::getSettings();
diff --git a/app/Http/Controllers/LocationsController.php b/app/Http/Controllers/LocationsController.php
index 7a3691684f..897d127580 100755
--- a/app/Http/Controllers/LocationsController.php
+++ b/app/Http/Controllers/LocationsController.php
@@ -320,7 +320,12 @@ class LocationsController extends Controller
$locations_raw_array = $request->input('ids');
if ((is_array($locations_raw_array)) && (count($locations_raw_array) > 0)) {
- $locations = Location::whereIn('id', $locations_raw_array)->get();
+ $locations = Location::whereIn('id', $locations_raw_array)
+ ->withCount('assignedAssets as assigned_assets_count')
+ ->withCount('assets as assets_count')
+ ->withCount('rtd_assets as rtd_assets_count')
+ ->withCount('children as children_count')
+ ->withCount('users as users_count')->get();
$success_count = 0;
$error_count = 0;
@@ -351,7 +356,7 @@ class LocationsController extends Controller
if ($error_count > 0) {
return redirect()
->route('locations.index')
- ->with('warning', trans('general.bulk.partial_success',
+ ->with('warning', trans('general.bulk.delete.partial',
['success' => $success_count, 'error' => $error_count, 'object_type' => trans('general.locations')]
));
}
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index 33c1f0a938..6372c37beb 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -700,12 +700,13 @@ class ReportsController extends Controller
}
if (($request->filled('checkin_date_start'))) {
- $assets->whereBetween('last_checkin', [
- Carbon::parse($request->input('checkin_date_start'))->startOfDay(),
- // use today's date if `checkin_date_end` is not provided
- Carbon::parse($request->input('checkin_date_end', now()))->endOfDay(),
- ]);
+ $checkin_start = \Carbon::parse($request->input('checkin_date_start'))->startOfDay();
+ // use today's date is `checkin_date_end` is not provided
+ $checkin_end = \Carbon::parse($request->input('checkin_date_end', now()))->endOfDay();
+
+ $assets->whereBetween('assets.last_checkin', [$checkin_start, $checkin_end ]);
}
+ //last checkin is exporting, but currently is a date and not a datetime in the custom report ONLY.
if (($request->filled('expected_checkin_start')) && ($request->filled('expected_checkin_end'))) {
$assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
@@ -1178,6 +1179,10 @@ class ReportsController extends Controller
}
}
+ if ($assetItem->assignedTo->email == ''){
+ return redirect()->route('reports/unaccepted_assets')->with('error', trans('general.no_email'));
+ }
+
return redirect()->route('reports/unaccepted_assets')->with('success', trans('admin/reports/general.reminder_sent'));
}
diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php
index 8c5e41479f..744bd7e619 100755
--- a/app/Http/Controllers/SettingsController.php
+++ b/app/Http/Controllers/SettingsController.php
@@ -20,6 +20,7 @@ use DB;
use enshrined\svgSanitize\Sanitizer;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Storage;
+use Illuminate\Validation\Rule;
use Image;
use Input;
use Redirect;
@@ -500,6 +501,19 @@ class SettingsController extends Controller
*/
public function postSecurity(Request $request)
{
+ $this->validate($request, [
+ 'pwd_secure_complexity' => 'array',
+ 'pwd_secure_complexity.*' => [
+ Rule::in([
+ 'disallow_same_pwd_as_user_fields',
+ 'letters',
+ 'numbers',
+ 'symbols',
+ 'case_diff',
+ ])
+ ]
+ ]);
+
if (is_null($setting = Setting::getSettings())) {
return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
}
diff --git a/app/Http/Livewire/SlackSettingsForm.php b/app/Http/Livewire/SlackSettingsForm.php
index 86f21e0152..6370649373 100644
--- a/app/Http/Livewire/SlackSettingsForm.php
+++ b/app/Http/Livewire/SlackSettingsForm.php
@@ -31,9 +31,7 @@ class SlackSettingsForm extends Component
'webhook_channel' => 'required_with:webhook_endpoint|starts_with:#|nullable',
'webhook_botname' => 'string|nullable',
];
- public $messages = [
- 'webhook_endpoint.starts_with' => 'your webhook endpoint should begin with http://, https:// or other protocol.',
- ];
+
public function mount() {
$this->webhook_text= [
diff --git a/app/Http/Middleware/CheckLocale.php b/app/Http/Middleware/CheckLocale.php
index 3c525d172c..d0dbcffaaf 100644
--- a/app/Http/Middleware/CheckLocale.php
+++ b/app/Http/Middleware/CheckLocale.php
@@ -8,6 +8,12 @@ use \App\Helpers\Helper;
class CheckLocale
{
+ private function warn_legacy_locale($language, $source)
+ {
+ if ($language != Helper::mapLegacyLocale($language)) {
+ \Log::warning("$source $language and should be updated to be ".Helper::mapLegacyLocale($language));
+ }
+ }
/**
* Handle the locale for the user, default to settings otherwise.
*
@@ -22,24 +28,23 @@ class CheckLocale
// Default app settings from config
$language = config('app.locale');
+ $this->warn_legacy_locale($language, "APP_LOCALE in .env is set to");
if ($settings = Setting::getSettings()) {
// User's preference
if (($request->user()) && ($request->user()->locale)) {
$language = $request->user()->locale;
+ $this->warn_legacy_locale($language, "username ".$request->user()->username." (".$request->user()->id.") has a language");
// App setting preference
} elseif ($settings->locale != '') {
$language = $settings->locale;
+ $this->warn_legacy_locale($language, "App Settings is set to");
}
}
-
- if (config('app.locale') != Helper::mapLegacyLocale($language)) {
- \Log::warning('Your current APP_LOCALE in your .env is set to "'.config('app.locale').'" and should be updated to be "'.Helper::mapLegacyLocale($language).'" in '.base_path().'/.env. Translations may display unexpectedly until this is updated.');
- }
-
+
\App::setLocale(Helper::mapLegacyLocale($language));
return $next($request);
}
diff --git a/app/Http/Requests/ImageUploadRequest.php b/app/Http/Requests/ImageUploadRequest.php
index d9947efe7b..25156181e9 100644
--- a/app/Http/Requests/ImageUploadRequest.php
+++ b/app/Http/Requests/ImageUploadRequest.php
@@ -34,8 +34,8 @@ class ImageUploadRequest extends Request
{
return [
- 'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp',
- 'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp',
+ 'image' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif',
+ 'avatar' => 'mimes:png,gif,jpg,jpeg,svg,bmp,svg+xml,webp,avif',
];
}
@@ -103,15 +103,13 @@ class ImageUploadRequest extends Request
\Log::info('File name will be: '.$file_name);
\Log::debug('File extension is: '.$ext);
- if ($image->getMimeType() == 'image/webp') {
- // If the file is a webp, we need to just move it since webp support
+ if (($image->getMimeType() == 'image/avif') || ($image->getMimeType() == 'image/webp')) {
+ // If the file is a webp or avif, we need to just move it since webp support
// needs to be compiled into gd for resizing to be available
-
- \Log::debug('This is a webp, just move it');
Storage::disk('public')->put($path.'/'.$file_name, file_get_contents($image));
+
} elseif($image->getMimeType() == 'image/svg+xml') {
// If the file is an SVG, we need to clean it and NOT encode it
- \Log::debug('This is an SVG');
$sanitizer = new Sanitizer();
$dirtySVG = file_get_contents($image->getRealPath());
$cleanSVG = $sanitizer->sanitize($dirtySVG);
@@ -123,9 +121,6 @@ class ImageUploadRequest extends Request
}
} else {
- \Log::debug('Not an SVG or webp - resize');
- \Log::debug('Trying to upload to: '.$path.'/'.$file_name);
-
try {
$upload = Image::make($image->getRealPath())->setFileInfoFromPath($image->getRealPath())->resize(null, $w, function ($constraint) {
$constraint->aspectRatio();
@@ -147,10 +142,8 @@ class ImageUploadRequest extends Request
// Remove Current image if exists
if (($item->{$form_fieldname}!='') && (Storage::disk('public')->exists($path.'/'.$item->{$db_fieldname}))) {
- \Log::debug('A file already exists that we are replacing - we should delete the old one.');
try {
Storage::disk('public')->delete($path.'/'.$item->{$form_fieldname});
- \Log::debug('Old file '.$path.'/'.$file_name.' has been deleted.');
} catch (\Exception $e) {
\Log::debug('Could not delete old file. '.$path.'/'.$file_name.' does not exist?');
}
diff --git a/app/Http/Requests/StoreAssetRequest.php b/app/Http/Requests/StoreAssetRequest.php
index 74988b6c62..8e7559673e 100644
--- a/app/Http/Requests/StoreAssetRequest.php
+++ b/app/Http/Requests/StoreAssetRequest.php
@@ -4,6 +4,8 @@ namespace App\Http\Requests;
use App\Models\Asset;
use App\Models\Company;
+use Carbon\Carbon;
+use Carbon\Exceptions\InvalidFormatException;
use Illuminate\Support\Facades\Gate;
class StoreAssetRequest extends ImageUploadRequest
@@ -27,6 +29,8 @@ class StoreAssetRequest extends ImageUploadRequest
? Company::getIdForCurrentUser($this->company_id)
: $this->company_id;
+ $this->parseLastAuditDate();
+
$this->merge([
'asset_tag' => $this->asset_tag ?? Asset::autoincrement_asset(),
'company_id' => $idForCurrentUser,
@@ -48,4 +52,21 @@ class StoreAssetRequest extends ImageUploadRequest
return $rules;
}
+
+ private function parseLastAuditDate(): void
+ {
+ if ($this->input('last_audit_date')) {
+ try {
+ $lastAuditDate = Carbon::parse($this->input('last_audit_date'));
+
+ $this->merge([
+ 'last_audit_date' => $lastAuditDate->startOfDay()->format('Y-m-d H:i:s'),
+ ]);
+ } catch (InvalidFormatException $e) {
+ // we don't need to do anything here...
+ // we'll keep the provided date in an
+ // invalid format so validation picks it up later
+ }
+ }
+ }
}
diff --git a/app/Http/Requests/UploadFileRequest.php b/app/Http/Requests/UploadFileRequest.php
index 74d33d58eb..ee5624e3d1 100644
--- a/app/Http/Requests/UploadFileRequest.php
+++ b/app/Http/Requests/UploadFileRequest.php
@@ -27,7 +27,7 @@ class UploadFileRequest extends Request
$max_file_size = \App\Helpers\Helper::file_upload_max_size();
return [
- 'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,json,webp|max:'.$max_file_size,
+ 'file.*' => 'required|mimes:png,gif,jpg,svg,jpeg,doc,docx,pdf,txt,zip,rar,xls,xlsx,lic,xml,rtf,json,webp,avif|max:'.$max_file_size,
];
}
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
index b9191d2e63..8a3fea0d00 100644
--- a/app/Http/Transformers/AssetsTransformer.php
+++ b/app/Http/Transformers/AssetsTransformer.php
@@ -88,6 +88,7 @@ class AssetsTransformer
'purchase_date' => Helper::getFormattedDateObject($asset->purchase_date, 'date'),
'age' => $asset->purchase_date ? $asset->purchase_date->diffForHumans() : '',
'last_checkout' => Helper::getFormattedDateObject($asset->last_checkout, 'datetime'),
+ 'last_checkin' => Helper::getFormattedDateObject($asset->last_checkin, 'datetime'),
'expected_checkin' => Helper::getFormattedDateObject($asset->expected_checkin, 'date'),
'purchase_cost' => Helper::formatCurrencyOutput($asset->purchase_cost),
'checkin_counter' => (int) $asset->checkin_counter,
diff --git a/app/Models/Accessory.php b/app/Models/Accessory.php
index 9a93c386fc..a234b1e570 100755
--- a/app/Models/Accessory.php
+++ b/app/Models/Accessory.php
@@ -305,7 +305,7 @@ class Accessory extends SnipeModel
*/
public function requireAcceptance()
{
- return $this->category->require_acceptance;
+ return $this->category->require_acceptance ?? false;
}
/**
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index c2a2a8d995..1f4079e491 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -96,7 +96,10 @@ class Asset extends Depreciable
'company_id' => 'nullable|integer|exists:companies,id',
'warranty_months' => 'nullable|numeric|digits_between:0,240',
'last_checkout' => 'nullable|date_format:Y-m-d H:i:s',
+ 'last_checkin' => 'nullable|date_format:Y-m-d H:i:s',
'expected_checkin' => 'nullable|date',
+ 'last_audit_date' => 'nullable|date_format:Y-m-d H:i:s',
+ 'next_audit_date' => 'nullable|date|after:last_audit_date',
'location_id' => 'nullable|exists:locations,id',
'rtd_location_id' => 'nullable|exists:locations,id',
'purchase_date' => 'nullable|date|date_format:Y-m-d',
@@ -167,6 +170,8 @@ class Asset extends Depreciable
'expected_checkin',
'next_audit_date',
'last_audit_date',
+ 'last_checkin',
+ 'last_checkout',
'asset_eol_date',
];
diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php
index a62f96d631..71be28e8a3 100644
--- a/app/Models/CustomFieldset.php
+++ b/app/Models/CustomFieldset.php
@@ -5,6 +5,8 @@ namespace App\Models;
use Gate;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Validation\Rule;
use Watson\Validating\ValidatingTrait;
class CustomFieldset extends Model
@@ -92,8 +94,19 @@ class CustomFieldset extends Model
array_push($rule, $field->attributes['format']);
$rules[$field->db_column_name()] = $rule;
- //add not_array to rules for all fields
- $rules[$field->db_column_name()][] = 'not_array';
+
+ // add not_array to rules for all fields but checkboxes
+ if ($field->element != 'checkbox') {
+ $rules[$field->db_column_name()][] = 'not_array';
+ }
+
+ if ($field->element == 'checkbox') {
+ $rules[$field->db_column_name()][] = 'checkboxes';
+ }
+
+ if ($field->element == 'radio') {
+ $rules[$field->db_column_name()][] = 'radio_buttons';
+ }
}
return $rules;
diff --git a/app/Models/Labels/DefaultLabel.php b/app/Models/Labels/DefaultLabel.php
index f06c4582f9..9f7059bcd5 100644
--- a/app/Models/Labels/DefaultLabel.php
+++ b/app/Models/Labels/DefaultLabel.php
@@ -160,75 +160,27 @@ class DefaultLabel extends RectangleSheet
$textY += $this->textSize + self::TEXT_MARGIN;
}
- // Fields
+ // Render the selected fields with their labels
$fieldsDone = 0;
- if ($settings->labels_display_name && $fieldsDone < $this->getSupportFields()) {
- if ($asset->name) {
- static::writeText(
- $pdf, 'N: '.$asset->name,
- $textX1, $textY,
- 'freesans', '', $this->textSize, 'L',
- $textW, $this->textSize,
- true, 0
- );
- $textY += $this->textSize + self::TEXT_MARGIN;
- $fieldsDone++;
- }
- }
- if ($settings->labels_display_company_name && $fieldsDone < $this->getSupportFields()) {
- if ($asset->company) {
- static::writeText(
- $pdf, 'C: '.$asset->company->name,
- $textX1, $textY,
- 'freesans', '', $this->textSize, 'L',
- $textW, $this->textSize,
- true, 0
- );
- $textY += $this->textSize + self::TEXT_MARGIN;
- $fieldsDone++;
- }
- }
- if ($settings->labels_display_tag && $fieldsDone < $this->getSupportFields()) {
- if ($asset->asset_tag) {
- static::writeText(
- $pdf, 'T: '.$asset->asset_tag,
- $textX1, $textY,
- 'freesans', '', $this->textSize, 'L',
- $textW, $this->textSize,
- true, 0
- );
- $textY += $this->textSize + self::TEXT_MARGIN;
- $fieldsDone++;
- }
- }
- if ($settings->labels_display_serial && $fieldsDone < $this->getSupportFields()) {
- if ($asset->serial) {
- static::writeText(
- $pdf, 'S: '.$asset->serial,
- $textX1, $textY,
- 'freesans', '', $this->textSize, 'L',
- $textW, $this->textSize,
- true, 0
- );
- $textY += $this->textSize + self::TEXT_MARGIN;
- $fieldsDone++;
- }
- }
- if ($settings->labels_display_model && $fieldsDone < $this->getSupportFields()) {
- if ($asset->model) {
- static::writeText(
- $pdf, 'M: '.$asset->model->name,
- $textX1, $textY,
- 'freesans', '', $this->textSize, 'L',
- $textW, $this->textSize,
- true, 0
- );
- $textY += $this->textSize + self::TEXT_MARGIN;
- $fieldsDone++;
- }
- }
+ if ($fieldsDone < $this->getSupportFields()) {
+ foreach ($record->get('fields') as $field) {
+
+ // Actually write the selected fields and their matching values
+ static::writeText(
+ $pdf, (($field['label']) ? $field['label'].' ' : '') . $field['value'],
+ $textX1, $textY,
+ 'freesans', '', $this->textSize, 'L',
+ $textW, $this->textSize,
+ true, 0
+ );
+
+ $textY += $this->textSize + self::TEXT_MARGIN;
+ $fieldsDone++;
+ }
+ }
}
+
}
?>
\ No newline at end of file
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
new file mode 100644
index 0000000000..9b56012f7a
--- /dev/null
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_1933081.php
@@ -0,0 +1,89 @@
+getPrintableArea();
+
+ $currentX = $pa->x1;
+ $currentY = $pa->y1;
+ $usableWidth = $pa->w;
+
+ $barcodeSize = $pa->h - self::TAG_SIZE;
+
+ if ($record->has('barcode2d')) {
+ static::writeText(
+ $pdf, $record->get('tag'),
+ $pa->x1, $pa->y2 - self::TAG_SIZE,
+ 'freesans', 'b', self::TAG_SIZE, 'C',
+ $barcodeSize, self::TAG_SIZE, true, 0
+ );
+ static::write2DBarcode(
+ $pdf, $record->get('barcode2d')->content, $record->get('barcode2d')->type,
+ $currentX, $currentY,
+ $barcodeSize, $barcodeSize
+ );
+ $currentX += $barcodeSize + self::BARCODE_MARGIN;
+ $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
+ } else {
+ static::writeText(
+ $pdf, $record->get('tag'),
+ $pa->x1, $pa->y2 - self::TAG_SIZE,
+ 'freesans', 'b', self::TAG_SIZE, 'R',
+ $usableWidth, self::TAG_SIZE, true, 0
+ );
+ }
+
+ if ($record->has('title')) {
+ static::writeText(
+ $pdf, $record->get('title'),
+ $currentX, $currentY,
+ 'freesans', 'b', self::TITLE_SIZE, 'L',
+ $usableWidth, self::TITLE_SIZE, true, 0
+ );
+ $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+ }
+
+ foreach ($record->get('fields') as $field) {
+ static::writeText(
+ $pdf, (($field['label']) ? $field['label'].' ' : '') . $field['value'],
+ $currentX, $currentY,
+ 'freesans', '', self::FIELD_SIZE, 'L',
+ $usableWidth, self::FIELD_SIZE, true, 0, 0.3
+ );
+ $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+ }
+
+ if ($record->has('barcode1d')) {
+ static::write1DBarcode(
+ $pdf, $record->get('barcode1d')->content, $record->get('barcode1d')->type,
+ $currentX, $barcodeSize + self::BARCODE_MARGIN, $usableWidth - self::TAG_SIZE, self::TAG_SIZE
+ );
+ }
+ }
+
+}
diff --git a/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
new file mode 100644
index 0000000000..e1305bd068
--- /dev/null
+++ b/app/Models/Labels/Tapes/Dymo/LabelWriter_2112283.php
@@ -0,0 +1,89 @@
+getPrintableArea();
+
+ $currentX = $pa->x1;
+ $currentY = $pa->y1;
+ $usableWidth = $pa->w;
+
+ $barcodeSize = $pa->h - self::TAG_SIZE;
+
+ if ($record->has('barcode2d')) {
+ static::writeText(
+ $pdf, $record->get('tag'),
+ $pa->x1, $pa->y2 - self::TAG_SIZE,
+ 'freesans', 'b', self::TAG_SIZE, 'C',
+ $barcodeSize, self::TAG_SIZE, true, 0
+ );
+ static::write2DBarcode(
+ $pdf, $record->get('barcode2d')->content, $record->get('barcode2d')->type,
+ $currentX, $currentY,
+ $barcodeSize, $barcodeSize
+ );
+ $currentX += $barcodeSize + self::BARCODE_MARGIN;
+ $usableWidth -= $barcodeSize + self::BARCODE_MARGIN;
+ } else {
+ static::writeText(
+ $pdf, $record->get('tag'),
+ $pa->x1, $pa->y2 - self::TAG_SIZE,
+ 'freesans', 'b', self::TAG_SIZE, 'R',
+ $usableWidth, self::TAG_SIZE, true, 0
+ );
+ }
+
+ if ($record->has('title')) {
+ static::writeText(
+ $pdf, $record->get('title'),
+ $currentX, $currentY,
+ 'freesans', 'b', self::TITLE_SIZE, 'L',
+ $usableWidth, self::TITLE_SIZE, true, 0
+ );
+ $currentY += self::TITLE_SIZE + self::TITLE_MARGIN;
+ }
+
+ foreach ($record->get('fields') as $field) {
+ static::writeText(
+ $pdf, (($field['label']) ? $field['label'].' ' : '') . $field['value'],
+ $currentX, $currentY,
+ 'freesans', '', self::FIELD_SIZE, 'L',
+ $usableWidth, self::FIELD_SIZE, true, 0, 0.3
+ );
+ $currentY += self::FIELD_SIZE + self::FIELD_MARGIN;
+ }
+
+ if ($record->has('barcode1d')) {
+ static::write1DBarcode(
+ $pdf, $record->get('barcode1d')->content, $record->get('barcode1d')->type,
+ $currentX, $barcodeSize + self::BARCODE_MARGIN, $usableWidth - self::TAG_SIZE, self::TAG_SIZE
+ );
+ }
+ }
+
+}
diff --git a/app/Models/Location.php b/app/Models/Location.php
index 2965ff2fc0..9f4c551264 100755
--- a/app/Models/Location.php
+++ b/app/Models/Location.php
@@ -106,6 +106,7 @@ class Location extends SnipeModel
*/
public function isDeletable()
{
+
return Gate::allows('delete', $this)
&& ($this->assets_count === 0)
&& ($this->assigned_assets_count === 0)
diff --git a/app/Models/User.php b/app/Models/User.php
index 0d58a1fd1b..97c3e0aef1 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -337,7 +337,7 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo
*/
public function licenses()
{
- return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id');
+ return $this->belongsToMany(\App\Models\License::class, 'license_seats', 'assigned_to', 'license_id')->withPivot('id', 'created_at', 'updated_at');
}
/**
diff --git a/app/Notifications/CheckinAccessoryNotification.php b/app/Notifications/CheckinAccessoryNotification.php
index 8cfca23e59..f83bff2c64 100644
--- a/app/Notifications/CheckinAccessoryNotification.php
+++ b/app/Notifications/CheckinAccessoryNotification.php
@@ -43,12 +43,12 @@ class CheckinAccessoryNotification extends Notification
public function via()
{
$notifyBy = [];
- if (Setting::getSettings()->webhook_selected == 'google'){
+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class;
}
- if (Setting::getSettings()->webhook_selected == 'microsoft'){
+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class;
}
diff --git a/app/Notifications/CheckinAssetNotification.php b/app/Notifications/CheckinAssetNotification.php
index ed3eae2c72..f62108c50b 100644
--- a/app/Notifications/CheckinAssetNotification.php
+++ b/app/Notifications/CheckinAssetNotification.php
@@ -51,12 +51,12 @@ class CheckinAssetNotification extends Notification
public function via()
{
$notifyBy = [];
- if (Setting::getSettings()->webhook_selected == 'google'){
+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class;
}
- if (Setting::getSettings()->webhook_selected == 'microsoft'){
+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class;
}
diff --git a/app/Notifications/CheckinLicenseSeatNotification.php b/app/Notifications/CheckinLicenseSeatNotification.php
index 7aa02b965a..289e63a162 100644
--- a/app/Notifications/CheckinLicenseSeatNotification.php
+++ b/app/Notifications/CheckinLicenseSeatNotification.php
@@ -48,11 +48,11 @@ class CheckinLicenseSeatNotification extends Notification
{
$notifyBy = [];
- if (Setting::getSettings()->webhook_selected == 'google'){
+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class;
}
- if (Setting::getSettings()->webhook_selected == 'microsoft'){
+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class;
}
diff --git a/app/Notifications/CheckoutAccessoryNotification.php b/app/Notifications/CheckoutAccessoryNotification.php
index 08b80e75ad..1ced92f706 100644
--- a/app/Notifications/CheckoutAccessoryNotification.php
+++ b/app/Notifications/CheckoutAccessoryNotification.php
@@ -42,12 +42,12 @@ class CheckoutAccessoryNotification extends Notification
public function via()
{
$notifyBy = [];
- if (Setting::getSettings()->webhook_selected == 'google'){
+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class;
}
- if (Setting::getSettings()->webhook_selected == 'microsoft'){
+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class;
}
diff --git a/app/Notifications/CheckoutAssetNotification.php b/app/Notifications/CheckoutAssetNotification.php
index 398be13844..6ed3707d64 100644
--- a/app/Notifications/CheckoutAssetNotification.php
+++ b/app/Notifications/CheckoutAssetNotification.php
@@ -62,12 +62,12 @@ class CheckoutAssetNotification extends Notification
public function via()
{
$notifyBy = [];
- if (Setting::getSettings()->webhook_selected == 'google'){
+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class;
}
- if (Setting::getSettings()->webhook_selected == 'microsoft'){
+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class;
}
diff --git a/app/Notifications/CheckoutConsumableNotification.php b/app/Notifications/CheckoutConsumableNotification.php
index 0862d91537..71bf64f362 100644
--- a/app/Notifications/CheckoutConsumableNotification.php
+++ b/app/Notifications/CheckoutConsumableNotification.php
@@ -49,12 +49,12 @@ class CheckoutConsumableNotification extends Notification
public function via()
{
$notifyBy = [];
- if (Setting::getSettings()->webhook_selected == 'google'){
+ if (Setting::getSettings()->webhook_selected == 'google' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = GoogleChatChannel::class;
}
- if (Setting::getSettings()->webhook_selected == 'microsoft'){
+ if (Setting::getSettings()->webhook_selected == 'microsoft' && Setting::getSettings()->webhook_endpoint) {
$notifyBy[] = MicrosoftTeamsChannel::class;
}
diff --git a/app/Presenters/AccessoryPresenter.php b/app/Presenters/AccessoryPresenter.php
index cc4f9badfc..fd6122cab7 100644
--- a/app/Presenters/AccessoryPresenter.php
+++ b/app/Presenters/AccessoryPresenter.php
@@ -41,6 +41,7 @@ class AccessoryPresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('general.name'),
'formatter' => 'accessoriesLinkFormatter',
], [
diff --git a/app/Presenters/ActionlogPresenter.php b/app/Presenters/ActionlogPresenter.php
index ddff10864e..2794b6c5fb 100644
--- a/app/Presenters/ActionlogPresenter.php
+++ b/app/Presenters/ActionlogPresenter.php
@@ -38,10 +38,14 @@ class ActionlogPresenter extends Presenter
public function icon()
{
-
+
// User related icons
if ($this->itemType() == 'user') {
+ if ($this->actionType()=='2fa reset') {
+ return 'fa-solid fa-mobile-screen';
+ }
+
if ($this->actionType()=='create new') {
return 'fa-solid fa-user-plus';
}
@@ -61,6 +65,7 @@ class ActionlogPresenter extends Presenter
if ($this->actionType()=='update') {
return 'fa-solid fa-user-pen';
}
+
return 'fa-solid fa-user';
}
diff --git a/app/Presenters/AssetMaintenancesPresenter.php b/app/Presenters/AssetMaintenancesPresenter.php
index 5f9694b44c..3908720dc3 100644
--- a/app/Presenters/AssetMaintenancesPresenter.php
+++ b/app/Presenters/AssetMaintenancesPresenter.php
@@ -85,6 +85,7 @@ class AssetMaintenancesPresenter extends Presenter
'field' => 'title',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('admin/asset_maintenances/form.title'),
], [
'field' => 'start_date',
diff --git a/app/Presenters/AssetModelPresenter.php b/app/Presenters/AssetModelPresenter.php
index 85a0fa58ec..da93092b91 100644
--- a/app/Presenters/AssetModelPresenter.php
+++ b/app/Presenters/AssetModelPresenter.php
@@ -35,6 +35,7 @@ class AssetModelPresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'visible' => true,
'title' => trans('general.name'),
'formatter' => 'modelsLinkFormatter',
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
index dd88b07fde..163ee1b606 100644
--- a/app/Presenters/AssetPresenter.php
+++ b/app/Presenters/AssetPresenter.php
@@ -55,6 +55,7 @@ class AssetPresenter extends Presenter
'field' => 'asset_tag',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('admin/hardware/table.asset_tag'),
'visible' => true,
'formatter' => 'hardwareLinkFormatter',
@@ -252,6 +253,13 @@ class AssetPresenter extends Presenter
'visible' => false,
'title' => trans('admin/hardware/table.checkout_date'),
'formatter' => 'dateDisplayFormatter',
+ ], [
+ 'field' => 'last_checkin',
+ 'searchable' => false,
+ 'sortable' => true,
+ 'visible' => false,
+ 'title' => trans('admin/hardware/table.last_checkin_date'),
+ 'formatter' => 'dateDisplayFormatter',
], [
'field' => 'expected_checkin',
'searchable' => false,
@@ -316,7 +324,7 @@ class AssetPresenter extends Presenter
'field' => 'checkincheckout',
'searchable' => false,
'sortable' => false,
- 'switchable' => true,
+ 'switchable' => false,
'title' => trans('general.checkin').'/'.trans('general.checkout'),
'visible' => true,
'formatter' => 'hardwareInOutFormatter',
diff --git a/app/Presenters/CategoryPresenter.php b/app/Presenters/CategoryPresenter.php
index e9276a3417..fbf431637c 100644
--- a/app/Presenters/CategoryPresenter.php
+++ b/app/Presenters/CategoryPresenter.php
@@ -25,6 +25,7 @@ class CategoryPresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('general.name'),
'visible' => true,
'formatter' => 'categoriesLinkFormatter',
diff --git a/app/Presenters/CompanyPresenter.php b/app/Presenters/CompanyPresenter.php
index ec2e7cfc5a..7603191fc1 100644
--- a/app/Presenters/CompanyPresenter.php
+++ b/app/Presenters/CompanyPresenter.php
@@ -25,7 +25,7 @@ class CompanyPresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
- 'switchable' => true,
+ 'switchable' => false,
'title' => trans('admin/companies/table.name'),
'visible' => true,
'formatter' => 'companiesLinkFormatter',
diff --git a/app/Presenters/ComponentPresenter.php b/app/Presenters/ComponentPresenter.php
index c7468911a1..d142d7abc2 100644
--- a/app/Presenters/ComponentPresenter.php
+++ b/app/Presenters/ComponentPresenter.php
@@ -126,7 +126,7 @@ class ComponentPresenter extends Presenter
'field' => 'checkincheckout',
'searchable' => false,
'sortable' => false,
- 'switchable' => true,
+ 'switchable' => false,
'title' => trans('general.checkin').'/'.trans('general.checkout'),
'visible' => true,
'formatter' => 'componentsInOutFormatter',
diff --git a/app/Presenters/ConsumablePresenter.php b/app/Presenters/ConsumablePresenter.php
index abb599de4f..d3e73de1cf 100644
--- a/app/Presenters/ConsumablePresenter.php
+++ b/app/Presenters/ConsumablePresenter.php
@@ -35,6 +35,7 @@ class ConsumablePresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('general.name'),
'visible' => true,
'formatter' => 'consumablesLinkFormatter',
diff --git a/app/Presenters/DepreciationPresenter.php b/app/Presenters/DepreciationPresenter.php
index 2a293a46ff..9df1fe1322 100644
--- a/app/Presenters/DepreciationPresenter.php
+++ b/app/Presenters/DepreciationPresenter.php
@@ -25,6 +25,7 @@ class DepreciationPresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('general.name'),
'visible' => true,
'formatter' => 'depreciationsLinkFormatter',
diff --git a/app/Presenters/DepreciationReportPresenter.php b/app/Presenters/DepreciationReportPresenter.php
index ea88342372..50a8b73b54 100644
--- a/app/Presenters/DepreciationReportPresenter.php
+++ b/app/Presenters/DepreciationReportPresenter.php
@@ -34,6 +34,7 @@ class DepreciationReportPresenter extends Presenter
"field" => "name",
"searchable" => true,
"sortable" => true,
+ 'switchable' => false,
"title" => trans('admin/hardware/form.name'),
"visible" => false,
], [
diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php
index c5c8982664..8ca8e120f2 100644
--- a/app/Presenters/LicensePresenter.php
+++ b/app/Presenters/LicensePresenter.php
@@ -33,6 +33,7 @@ class LicensePresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('general.name'),
'formatter' => 'licensesLinkFormatter',
], [
@@ -186,7 +187,7 @@ class LicensePresenter extends Presenter
'field' => 'checkincheckout',
'searchable' => false,
'sortable' => false,
- 'switchable' => true,
+ 'switchable' => false,
'title' => trans('general.checkin').'/'.trans('general.checkout'),
'visible' => true,
'formatter' => 'licensesInOutFormatter',
@@ -280,7 +281,7 @@ class LicensePresenter extends Presenter
'field' => 'checkincheckout',
'searchable' => false,
'sortable' => false,
- 'switchable' => true,
+ 'switchable' => false,
'title' => trans('general.checkin').'/'.trans('general.checkout'),
'visible' => true,
'formatter' => 'licenseSeatInOutFormatter',
diff --git a/app/Presenters/LocationPresenter.php b/app/Presenters/LocationPresenter.php
index 6a9bc0b568..56d710ac96 100644
--- a/app/Presenters/LocationPresenter.php
+++ b/app/Presenters/LocationPresenter.php
@@ -31,6 +31,7 @@ class LocationPresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('admin/locations/table.name'),
'visible' => true,
'formatter' => 'locationsLinkFormatter',
diff --git a/app/Presenters/ManufacturerPresenter.php b/app/Presenters/ManufacturerPresenter.php
index ad6b5443bf..3e36cbcde0 100644
--- a/app/Presenters/ManufacturerPresenter.php
+++ b/app/Presenters/ManufacturerPresenter.php
@@ -27,6 +27,7 @@ class ManufacturerPresenter extends Presenter
'field' => 'name',
'searchable' => true,
'sortable' => true,
+ 'switchable' => false,
'title' => trans('admin/manufacturers/table.name'),
'visible' => true,
'formatter' => 'manufacturersLinkFormatter',
diff --git a/app/Presenters/UserPresenter.php b/app/Presenters/UserPresenter.php
index 211057c548..4726205c72 100644
--- a/app/Presenters/UserPresenter.php
+++ b/app/Presenters/UserPresenter.php
@@ -38,7 +38,7 @@ class UserPresenter extends Presenter
'searchable' => false,
'sortable' => false,
'switchable' => true,
- 'title' => 'Avatar',
+ 'title' => trans('general.importer.avatar'),
'visible' => false,
'formatter' => 'imageFormatter',
],
@@ -175,7 +175,7 @@ class UserPresenter extends Presenter
'field' => 'username',
'searchable' => true,
'sortable' => true,
- 'switchable' => true,
+ 'switchable' => false,
'title' => trans('admin/users/table.username'),
'visible' => true,
'formatter' => 'usersLinkFormatter',
diff --git a/app/Providers/ValidationServiceProvider.php b/app/Providers/ValidationServiceProvider.php
index 50468c8d72..803d540865 100644
--- a/app/Providers/ValidationServiceProvider.php
+++ b/app/Providers/ValidationServiceProvider.php
@@ -2,9 +2,12 @@
namespace App\Providers;
+use App\Models\CustomField;
use App\Models\Department;
use App\Models\Setting;
use DB;
+use Illuminate\Support\Facades\Crypt;
+use Illuminate\Support\Facades\Log;
use Illuminate\Support\ServiceProvider;
use Illuminate\Validation\Rule;
use Validator;
@@ -294,6 +297,39 @@ class ValidationServiceProvider extends ServiceProvider
Validator::extend('not_array', function ($attribute, $value, $parameters, $validator) {
return !is_array($value);
});
+
+ // This is only used in Models/CustomFieldset.php - it does automatic validation for checkboxes by making sure
+ // that the submitted values actually exist in the options.
+ Validator::extend('checkboxes', function ($attribute, $value, $parameters, $validator){
+ $field = CustomField::where('db_column', $attribute)->first();
+ $options = $field->formatFieldValuesAsArray();
+
+ if(is_array($value)) {
+ $invalid = array_diff($value, $options);
+ if(count($invalid) > 0) {
+ return false;
+ }
+ }
+
+ // for legacy, allows users to submit a comma separated string of options
+ elseif(!is_array($value)) {
+ $exploded = array_map('trim', explode(',', $value));
+ $invalid = array_diff($exploded, $options);
+ if(count($invalid) > 0) {
+ return false;
+ }
+ }
+
+ return true;
+ });
+
+ // Validates that a radio button option exists
+ Validator::extend('radio_buttons', function ($attribute, $value) {
+ $field = CustomField::where('db_column', $attribute)->first();
+ $options = $field->formatFieldValuesAsArray();
+
+ return in_array($value, $options);
+ });
}
/**
diff --git a/app/View/Label.php b/app/View/Label.php
index cf69532801..f47ad6acd5 100644
--- a/app/View/Label.php
+++ b/app/View/Label.php
@@ -41,7 +41,7 @@ class Label implements View
$template = LabelModel::find($settings->label2_template);
// If disabled, pass to legacy view
- if ((!$settings->label2_enable) && (!$template)) {
+ if ((!$settings->label2_enable)) {
return view('hardware/labels')
->with('assets', $assets)
->with('settings', $settings)
@@ -105,16 +105,15 @@ class Label implements View
}
}
- if ($template->getSupport1DBarcode()) {
- $barcode1DType = $settings->label2_1d_type;
- $barcode1DType = ($barcode1DType == 'default') ?
- (($settings->alt_barcode_enabled) ? $settings->alt_barcode : null) :
- $barcode1DType;
- if ($barcode1DType != 'none') {
- $assetData->put('barcode1d', (object)[
- 'type' => $barcode1DType,
- 'content' => $asset->asset_tag,
- ]);
+ if ($settings->alt_barcode_enabled) {
+ if ($template->getSupport1DBarcode()) {
+ $barcode1DType = $settings->alt_barcode;
+ if ($barcode1DType != 'none') {
+ $assetData->put('barcode1d', (object)[
+ 'type' => $barcode1DType,
+ 'content' => $asset->asset_tag,
+ ]);
+ }
}
}
@@ -127,7 +126,7 @@ class Label implements View
switch ($settings->label2_2d_target) {
case 'ht_tag': $barcode2DTarget = route('ht/assetTag', $asset->asset_tag); break;
case 'hardware_id':
- default: $barcode2DTarget = route('hardware.show', $asset->id); break;
+ default: $barcode2DTarget = route('hardware.show', ['hardware' => $asset->id]); break;
}
$assetData->put('barcode2d', (object)[
'type' => $barcode2DType,
@@ -147,7 +146,7 @@ class Label implements View
return $toAdd ? $myFields->push($toAdd) : $myFields;
}, new Collection());
-
+
$assetData->put('fields', $fields->take($template->getSupportFields()));
return $assetData;
diff --git a/composer.lock b/composer.lock
index 0f6be7548d..66f7fae7ae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -191,16 +191,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.300.11",
+ "version": "3.303.1",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "b1c05a5d3cb429aa5d9ffa69066ce46e3d7aca52"
+ "reference": "e695623e9f6f278bed69172fddb932de3705030f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/b1c05a5d3cb429aa5d9ffa69066ce46e3d7aca52",
- "reference": "b1c05a5d3cb429aa5d9ffa69066ce46e3d7aca52",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/e695623e9f6f278bed69172fddb932de3705030f",
+ "reference": "e695623e9f6f278bed69172fddb932de3705030f",
"shasum": ""
},
"require": {
@@ -280,9 +280,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.300.11"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.303.1"
},
- "time": "2024-03-05T19:08:14+00:00"
+ "time": "2024-04-02T18:09:38+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -340,23 +340,23 @@
},
{
"name": "barryvdh/laravel-debugbar",
- "version": "v3.10.6",
+ "version": "v3.13.0",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-debugbar.git",
- "reference": "1fcb37307ebb32207dce16fa160a92b14d8b671f"
+ "reference": "354a42f3e0b083cdd6f9da5a9d1c0c63b074547a"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/1fcb37307ebb32207dce16fa160a92b14d8b671f",
- "reference": "1fcb37307ebb32207dce16fa160a92b14d8b671f",
+ "url": "https://api.github.com/repos/barryvdh/laravel-debugbar/zipball/354a42f3e0b083cdd6f9da5a9d1c0c63b074547a",
+ "reference": "354a42f3e0b083cdd6f9da5a9d1c0c63b074547a",
"shasum": ""
},
"require": {
"illuminate/routing": "^9|^10|^11",
"illuminate/session": "^9|^10|^11",
"illuminate/support": "^9|^10|^11",
- "maximebf/debugbar": "~1.20.1",
+ "maximebf/debugbar": "~1.22.0",
"php": "^8.0",
"symfony/finder": "^6|^7"
},
@@ -369,7 +369,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.10-dev"
+ "dev-master": "3.13-dev"
},
"laravel": {
"providers": [
@@ -408,7 +408,7 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-debugbar/issues",
- "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.10.6"
+ "source": "https://github.com/barryvdh/laravel-debugbar/tree/v3.13.0"
},
"funding": [
{
@@ -420,31 +420,31 @@
"type": "github"
}
],
- "time": "2024-03-01T14:41:13+00:00"
+ "time": "2024-04-01T16:39:30+00:00"
},
{
"name": "barryvdh/laravel-dompdf",
- "version": "v2.0.1",
+ "version": "v2.1.1",
"source": {
"type": "git",
"url": "https://github.com/barryvdh/laravel-dompdf.git",
- "reference": "9843d2be423670fb434f4c978b3c0f4dd92c87a6"
+ "reference": "cb37868365f9b937039d316727a1fced1e87b31c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/9843d2be423670fb434f4c978b3c0f4dd92c87a6",
- "reference": "9843d2be423670fb434f4c978b3c0f4dd92c87a6",
+ "url": "https://api.github.com/repos/barryvdh/laravel-dompdf/zipball/cb37868365f9b937039d316727a1fced1e87b31c",
+ "reference": "cb37868365f9b937039d316727a1fced1e87b31c",
"shasum": ""
},
"require": {
- "dompdf/dompdf": "^2.0.1",
- "illuminate/support": "^6|^7|^8|^9|^10",
+ "dompdf/dompdf": "^2.0.3",
+ "illuminate/support": "^6|^7|^8|^9|^10|^11",
"php": "^7.2 || ^8.0"
},
"require-dev": {
- "nunomaduro/larastan": "^1|^2",
- "orchestra/testbench": "^4|^5|^6|^7|^8",
- "phpro/grumphp": "^1",
+ "larastan/larastan": "^1.0|^2.7.0",
+ "orchestra/testbench": "^4|^5|^6|^7|^8|^9",
+ "phpro/grumphp": "^1 || ^2.5",
"squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
@@ -485,7 +485,7 @@
],
"support": {
"issues": "https://github.com/barryvdh/laravel-dompdf/issues",
- "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.0.1"
+ "source": "https://github.com/barryvdh/laravel-dompdf/tree/v2.1.1"
},
"funding": [
{
@@ -497,7 +497,7 @@
"type": "github"
}
],
- "time": "2023-01-12T15:12:49+00:00"
+ "time": "2024-03-15T12:48:39+00:00"
},
{
"name": "brick/math",
@@ -1528,31 +1528,32 @@
},
{
"name": "eduardokum/laravel-mail-auto-embed",
- "version": "2.10.1",
+ "version": "2.11",
"source": {
"type": "git",
"url": "https://github.com/eduardokum/laravel-mail-auto-embed.git",
- "reference": "8017296a5bb1a7ab9dbe3a2400aa24b5156bd9e4"
+ "reference": "ee17be8f4a221593190ca949a1fb036c6884fc2c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/eduardokum/laravel-mail-auto-embed/zipball/8017296a5bb1a7ab9dbe3a2400aa24b5156bd9e4",
- "reference": "8017296a5bb1a7ab9dbe3a2400aa24b5156bd9e4",
+ "url": "https://api.github.com/repos/eduardokum/laravel-mail-auto-embed/zipball/ee17be8f4a221593190ca949a1fb036c6884fc2c",
+ "reference": "ee17be8f4a221593190ca949a1fb036c6884fc2c",
"shasum": ""
},
"require": {
"ext-curl": "*",
"ext-dom": "*",
"ext-fileinfo": "*",
- "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0",
- "illuminate/mail": "^6.0|^7.0|^8.0|^9.0|^10.0",
- "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0",
+ "illuminate/contracts": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+ "illuminate/mail": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
+ "illuminate/support": "^6.0|^7.0|^8.0|^9.0|^10.0|^11.0",
"masterminds/html5": "^2.7",
- "php": "^7.2|^8.0",
- "squizlabs/php_codesniffer": "^3.5"
+ "php": "^7.2|^8.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.5.30|^9.0|^10.0"
+ "orchestra/testbench": "^4.0|^5.0|^6.0|^7.0|^8.0|^9.0",
+ "phpunit/phpunit": "^8.5.30|^9.0|^10.0|^11.0",
+ "squizlabs/php_codesniffer": "^3.5"
},
"type": "library",
"extra": {
@@ -1585,7 +1586,7 @@
],
"support": {
"issues": "https://github.com/eduardokum/laravel-mail-auto-embed/issues",
- "source": "https://github.com/eduardokum/laravel-mail-auto-embed/tree/2.10.1"
+ "source": "https://github.com/eduardokum/laravel-mail-auto-embed/tree/2.11"
},
"funding": [
{
@@ -1593,7 +1594,7 @@
"type": "github"
}
],
- "time": "2023-02-24T17:12:55+00:00"
+ "time": "2024-03-12T22:10:05+00:00"
},
{
"name": "egulias/email-validator",
@@ -2555,27 +2556,27 @@
},
{
"name": "laravel-notification-channels/google-chat",
- "version": "v3.1.0",
+ "version": "3.2.0",
"source": {
"type": "git",
"url": "https://github.com/laravel-notification-channels/google-chat.git",
- "reference": "789c2ef706145b970506696a64149f9546f34061"
+ "reference": "39ec6d130044066c46b891e5620220be5fa166d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel-notification-channels/google-chat/zipball/789c2ef706145b970506696a64149f9546f34061",
- "reference": "789c2ef706145b970506696a64149f9546f34061",
+ "url": "https://api.github.com/repos/laravel-notification-channels/google-chat/zipball/39ec6d130044066c46b891e5620220be5fa166d1",
+ "reference": "39ec6d130044066c46b891e5620220be5fa166d1",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^6.3 || ^7.0",
- "illuminate/notifications": "^9.0.2 || ^10.0",
- "illuminate/support": "^9.0.2 || ^10.0",
+ "illuminate/notifications": "^9.0.2 || ^10.0 || ^11.0",
+ "illuminate/support": "^9.0.2 || ^10.0 || ^11.0",
"php": ">=8.0"
},
"require-dev": {
- "orchestra/testbench": "^7.0",
- "phpunit/phpunit": "^9.5.10"
+ "orchestra/testbench": "^7.0 || ^9.0",
+ "phpunit/phpunit": "^9.5.10 || ^10.5"
},
"type": "library",
"extra": {
@@ -2606,33 +2607,33 @@
"homepage": "https://github.com/laravel-notification-channels/google-chat",
"support": {
"issues": "https://github.com/laravel-notification-channels/google-chat/issues",
- "source": "https://github.com/laravel-notification-channels/google-chat/tree/v3.1.0"
+ "source": "https://github.com/laravel-notification-channels/google-chat/tree/3.2.0"
},
- "time": "2023-02-21T10:38:41+00:00"
+ "time": "2024-03-19T06:42:00+00:00"
},
{
"name": "laravel-notification-channels/microsoft-teams",
- "version": "v1.1.5",
+ "version": "1.2.0",
"source": {
"type": "git",
"url": "https://github.com/laravel-notification-channels/microsoft-teams.git",
- "reference": "a24274e03368c9348dfb7847acc52bae2d21df94"
+ "reference": "41d054c5f603ca10951144a87eb8e9652307ce1b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel-notification-channels/microsoft-teams/zipball/a24274e03368c9348dfb7847acc52bae2d21df94",
- "reference": "a24274e03368c9348dfb7847acc52bae2d21df94",
+ "url": "https://api.github.com/repos/laravel-notification-channels/microsoft-teams/zipball/41d054c5f603ca10951144a87eb8e9652307ce1b",
+ "reference": "41d054c5f603ca10951144a87eb8e9652307ce1b",
"shasum": ""
},
"require": {
"guzzlehttp/guzzle": "^6.3 || ^7.0",
- "illuminate/notifications": "~5.5 || ~6.0 || ~7.0 || ^8.0 || ^9.0 || ^10.0",
- "illuminate/support": "~5.5 || ~6.0 || ~7.0 || ^8.0 || ^9.0 || ^10.0",
+ "illuminate/notifications": "~5.5 || ~6.0 || ~7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
+ "illuminate/support": "~5.5 || ~6.0 || ~7.0 || ^8.0 || ^9.0 || ^10.0 || ^11.0",
"php": ">=7.2"
},
"require-dev": {
"mockery/mockery": "^1.2.3",
- "phpunit/phpunit": "^8.0|^9.5"
+ "phpunit/phpunit": "^8.0 || ^9.5 || ^10.5"
},
"type": "library",
"extra": {
@@ -2663,22 +2664,22 @@
"homepage": "https://github.com/laravel-notification-channels/microsoft-teams",
"support": {
"issues": "https://github.com/laravel-notification-channels/microsoft-teams/issues",
- "source": "https://github.com/laravel-notification-channels/microsoft-teams/tree/v1.1.5"
+ "source": "https://github.com/laravel-notification-channels/microsoft-teams/tree/1.2.0"
},
- "time": "2024-03-03T18:58:34+00:00"
+ "time": "2024-03-11T15:07:16+00:00"
},
{
"name": "laravel/framework",
- "version": "v10.47.0",
+ "version": "v10.48.4",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
- "reference": "fce29b8de62733cdecbe12e3bae801f83fff2ea4"
+ "reference": "7e0701bf59cb76a51f7c1f7bea51c0c0c29c0b72"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/framework/zipball/fce29b8de62733cdecbe12e3bae801f83fff2ea4",
- "reference": "fce29b8de62733cdecbe12e3bae801f83fff2ea4",
+ "url": "https://api.github.com/repos/laravel/framework/zipball/7e0701bf59cb76a51f7c1f7bea51c0c0c29c0b72",
+ "reference": "7e0701bf59cb76a51f7c1f7bea51c0c0c29c0b72",
"shasum": ""
},
"require": {
@@ -2726,6 +2727,7 @@
"conflict": {
"carbonphp/carbon-doctrine-types": ">=3.0",
"doctrine/dbal": ">=4.0",
+ "mockery/mockery": "1.6.8",
"phpunit/phpunit": ">=11.0.0",
"tightenco/collect": "<5.5.33"
},
@@ -2782,7 +2784,7 @@
"league/flysystem-sftp-v3": "^3.0",
"mockery/mockery": "^1.5.1",
"nyholm/psr7": "^1.2",
- "orchestra/testbench-core": "^8.18",
+ "orchestra/testbench-core": "^8.23.4",
"pda/pheanstalk": "^4.0",
"phpstan/phpstan": "^1.4.7",
"phpunit/phpunit": "^10.0.7",
@@ -2871,7 +2873,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
- "time": "2024-03-05T15:18:36+00:00"
+ "time": "2024-03-21T13:36:36+00:00"
},
{
"name": "laravel/helpers",
@@ -3010,16 +3012,16 @@
},
{
"name": "laravel/prompts",
- "version": "v0.1.16",
+ "version": "v0.1.17",
"source": {
"type": "git",
"url": "https://github.com/laravel/prompts.git",
- "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781"
+ "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/prompts/zipball/ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
- "reference": "ca6872ab6aec3ab61db3a61f83a6caf764ec7781",
+ "url": "https://api.github.com/repos/laravel/prompts/zipball/8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
+ "reference": "8ee9f87f7f9eadcbe21e9e72cd4176b2f06cd5b5",
"shasum": ""
},
"require": {
@@ -3061,9 +3063,9 @@
],
"support": {
"issues": "https://github.com/laravel/prompts/issues",
- "source": "https://github.com/laravel/prompts/tree/v0.1.16"
+ "source": "https://github.com/laravel/prompts/tree/v0.1.17"
},
- "time": "2024-02-21T19:25:27+00:00"
+ "time": "2024-03-13T16:05:43+00:00"
},
{
"name": "laravel/serializable-closure",
@@ -3324,16 +3326,16 @@
},
{
"name": "laravel/ui",
- "version": "v4.5.0",
+ "version": "v4.5.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/ui.git",
- "reference": "da3811f409297d13feccd5858ce748e7474b3d11"
+ "reference": "a3562953123946996a503159199d6742d5534e61"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/laravel/ui/zipball/da3811f409297d13feccd5858ce748e7474b3d11",
- "reference": "da3811f409297d13feccd5858ce748e7474b3d11",
+ "url": "https://api.github.com/repos/laravel/ui/zipball/a3562953123946996a503159199d6742d5534e61",
+ "reference": "a3562953123946996a503159199d6742d5534e61",
"shasum": ""
},
"require": {
@@ -3341,7 +3343,8 @@
"illuminate/filesystem": "^9.21|^10.0|^11.0",
"illuminate/support": "^9.21|^10.0|^11.0",
"illuminate/validation": "^9.21|^10.0|^11.0",
- "php": "^8.0"
+ "php": "^8.0",
+ "symfony/console": "^6.0|^7.0"
},
"require-dev": {
"orchestra/testbench": "^7.35|^8.15|^9.0",
@@ -3380,9 +3383,9 @@
"ui"
],
"support": {
- "source": "https://github.com/laravel/ui/tree/v4.5.0"
+ "source": "https://github.com/laravel/ui/tree/v4.5.1"
},
- "time": "2024-03-04T13:58:27+00:00"
+ "time": "2024-03-21T18:12:29+00:00"
},
{
"name": "laravelcollective/html",
@@ -3928,16 +3931,16 @@
},
{
"name": "league/flysystem",
- "version": "3.24.0",
+ "version": "3.26.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem.git",
- "reference": "b25a361508c407563b34fac6f64a8a17a8819675"
+ "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/b25a361508c407563b34fac6f64a8a17a8819675",
- "reference": "b25a361508c407563b34fac6f64a8a17a8819675",
+ "url": "https://api.github.com/repos/thephpleague/flysystem/zipball/072735c56cc0da00e10716dd90d5a7f7b40b36be",
+ "reference": "072735c56cc0da00e10716dd90d5a7f7b40b36be",
"shasum": ""
},
"require": {
@@ -3965,7 +3968,7 @@
"friendsofphp/php-cs-fixer": "^3.5",
"google/cloud-storage": "^1.23",
"microsoft/azure-storage-blob": "^1.1",
- "phpseclib/phpseclib": "^3.0.34",
+ "phpseclib/phpseclib": "^3.0.36",
"phpstan/phpstan": "^1.10",
"phpunit/phpunit": "^9.5.11|^10.0",
"sabre/dav": "^4.6.0"
@@ -4002,7 +4005,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/flysystem/issues",
- "source": "https://github.com/thephpleague/flysystem/tree/3.24.0"
+ "source": "https://github.com/thephpleague/flysystem/tree/3.26.0"
},
"funding": [
{
@@ -4014,20 +4017,20 @@
"type": "github"
}
],
- "time": "2024-02-04T12:10:17+00:00"
+ "time": "2024-03-25T11:49:53+00:00"
},
{
"name": "league/flysystem-aws-s3-v3",
- "version": "3.24.0",
+ "version": "3.26.0",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-aws-s3-v3.git",
- "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513"
+ "reference": "885d0a758c71ae3cd6c503544573a1fdb8dc754f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
- "reference": "809474e37b7fb1d1f8bcc0f8a98bc1cae99aa513",
+ "url": "https://api.github.com/repos/thephpleague/flysystem-aws-s3-v3/zipball/885d0a758c71ae3cd6c503544573a1fdb8dc754f",
+ "reference": "885d0a758c71ae3cd6c503544573a1fdb8dc754f",
"shasum": ""
},
"require": {
@@ -4067,7 +4070,7 @@
"storage"
],
"support": {
- "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.24.0"
+ "source": "https://github.com/thephpleague/flysystem-aws-s3-v3/tree/3.26.0"
},
"funding": [
{
@@ -4079,20 +4082,20 @@
"type": "github"
}
],
- "time": "2024-01-26T18:43:21+00:00"
+ "time": "2024-03-24T21:11:18+00:00"
},
{
"name": "league/flysystem-local",
- "version": "3.23.1",
+ "version": "3.25.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/flysystem-local.git",
- "reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00"
+ "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/b884d2bf9b53bb4804a56d2df4902bb51e253f00",
- "reference": "b884d2bf9b53bb4804a56d2df4902bb51e253f00",
+ "url": "https://api.github.com/repos/thephpleague/flysystem-local/zipball/61a6a90d6e999e4ddd9ce5adb356de0939060b92",
+ "reference": "61a6a90d6e999e4ddd9ce5adb356de0939060b92",
"shasum": ""
},
"require": {
@@ -4126,8 +4129,7 @@
"local"
],
"support": {
- "issues": "https://github.com/thephpleague/flysystem-local/issues",
- "source": "https://github.com/thephpleague/flysystem-local/tree/3.23.1"
+ "source": "https://github.com/thephpleague/flysystem-local/tree/3.25.1"
},
"funding": [
{
@@ -4139,7 +4141,7 @@
"type": "github"
}
],
- "time": "2024-01-26T18:25:23+00:00"
+ "time": "2024-03-15T19:58:44+00:00"
},
{
"name": "league/mime-type-detection",
@@ -4363,16 +4365,16 @@
},
{
"name": "league/uri",
- "version": "7.4.0",
+ "version": "7.4.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/uri.git",
- "reference": "bf414ba956d902f5d98bf9385fcf63954f09dce5"
+ "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/uri/zipball/bf414ba956d902f5d98bf9385fcf63954f09dce5",
- "reference": "bf414ba956d902f5d98bf9385fcf63954f09dce5",
+ "url": "https://api.github.com/repos/thephpleague/uri/zipball/bedb6e55eff0c933668addaa7efa1e1f2c417cc4",
+ "reference": "bedb6e55eff0c933668addaa7efa1e1f2c417cc4",
"shasum": ""
},
"require": {
@@ -4441,7 +4443,7 @@
"docs": "https://uri.thephpleague.com",
"forum": "https://thephpleague.slack.com",
"issues": "https://github.com/thephpleague/uri-src/issues",
- "source": "https://github.com/thephpleague/uri/tree/7.4.0"
+ "source": "https://github.com/thephpleague/uri/tree/7.4.1"
},
"funding": [
{
@@ -4449,20 +4451,20 @@
"type": "github"
}
],
- "time": "2023-12-01T06:24:25+00:00"
+ "time": "2024-03-23T07:42:40+00:00"
},
{
"name": "league/uri-interfaces",
- "version": "7.4.0",
+ "version": "7.4.1",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/uri-interfaces.git",
- "reference": "bd8c487ec236930f7bbc42b8d374fa882fbba0f3"
+ "reference": "8d43ef5c841032c87e2de015972c06f3865ef718"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/bd8c487ec236930f7bbc42b8d374fa882fbba0f3",
- "reference": "bd8c487ec236930f7bbc42b8d374fa882fbba0f3",
+ "url": "https://api.github.com/repos/thephpleague/uri-interfaces/zipball/8d43ef5c841032c87e2de015972c06f3865ef718",
+ "reference": "8d43ef5c841032c87e2de015972c06f3865ef718",
"shasum": ""
},
"require": {
@@ -4525,7 +4527,7 @@
"docs": "https://uri.thephpleague.com",
"forum": "https://thephpleague.slack.com",
"issues": "https://github.com/thephpleague/uri-src/issues",
- "source": "https://github.com/thephpleague/uri-interfaces/tree/7.4.0"
+ "source": "https://github.com/thephpleague/uri-interfaces/tree/7.4.1"
},
"funding": [
{
@@ -4533,7 +4535,7 @@
"type": "github"
}
],
- "time": "2023-11-24T15:40:42+00:00"
+ "time": "2024-03-23T07:42:40+00:00"
},
{
"name": "livewire/livewire",
@@ -4677,25 +4679,27 @@
},
{
"name": "maximebf/debugbar",
- "version": "v1.20.2",
+ "version": "v1.22.1",
"source": {
"type": "git",
"url": "https://github.com/maximebf/php-debugbar.git",
- "reference": "484625c23a4fa4f303617f29fcacd42951c9c01d"
+ "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/484625c23a4fa4f303617f29fcacd42951c9c01d",
- "reference": "484625c23a4fa4f303617f29fcacd42951c9c01d",
+ "url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
+ "reference": "d7b6e1dc2dc85c01ed63ab158b00a7f46abdebcc",
"shasum": ""
},
"require": {
- "php": "^7.1|^8",
+ "php": "^7.2|^8",
"psr/log": "^1|^2|^3",
"symfony/var-dumper": "^4|^5|^6|^7"
},
"require-dev": {
- "phpunit/phpunit": ">=7.5.20 <10.0",
+ "dbrekelmans/bdi": "^1",
+ "phpunit/phpunit": "^8|^9",
+ "symfony/panther": "^1|^2.1",
"twig/twig": "^1.38|^2.7|^3.0"
},
"suggest": {
@@ -4706,7 +4710,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "1.20-dev"
+ "dev-master": "1.22-dev"
}
},
"autoload": {
@@ -4737,9 +4741,9 @@
],
"support": {
"issues": "https://github.com/maximebf/php-debugbar/issues",
- "source": "https://github.com/maximebf/php-debugbar/tree/v1.20.2"
+ "source": "https://github.com/maximebf/php-debugbar/tree/v1.22.1"
},
- "time": "2024-02-15T10:49:09+00:00"
+ "time": "2024-04-01T10:44:20+00:00"
},
{
"name": "monolog/monolog",
@@ -5206,21 +5210,21 @@
},
{
"name": "nikic/php-parser",
- "version": "v4.18.0",
+ "version": "v4.19.1",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
- "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999"
+ "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bcbb2179f97633e98bbbc87044ee2611c7d7999",
- "reference": "1bcbb2179f97633e98bbbc87044ee2611c7d7999",
+ "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4e1b88d21c69391150ace211e9eaf05810858d0b",
+ "reference": "4e1b88d21c69391150ace211e9eaf05810858d0b",
"shasum": ""
},
"require": {
"ext-tokenizer": "*",
- "php": ">=7.0"
+ "php": ">=7.1"
},
"require-dev": {
"ircmaxell/php-yacc": "^0.0.7",
@@ -5256,9 +5260,9 @@
],
"support": {
"issues": "https://github.com/nikic/PHP-Parser/issues",
- "source": "https://github.com/nikic/PHP-Parser/tree/v4.18.0"
+ "source": "https://github.com/nikic/PHP-Parser/tree/v4.19.1"
},
- "time": "2023-12-10T21:03:43+00:00"
+ "time": "2024-03-17T08:10:35+00:00"
},
{
"name": "nunomaduro/collision",
@@ -5816,16 +5820,16 @@
},
{
"name": "phenx/php-svg-lib",
- "version": "0.5.2",
+ "version": "0.5.3",
"source": {
"type": "git",
"url": "https://github.com/dompdf/php-svg-lib.git",
- "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa"
+ "reference": "0e46722c154726a5f9ac218197ccc28adba16fcf"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/732faa9fb4309221e2bd9b2fda5de44f947133aa",
- "reference": "732faa9fb4309221e2bd9b2fda5de44f947133aa",
+ "url": "https://api.github.com/repos/dompdf/php-svg-lib/zipball/0e46722c154726a5f9ac218197ccc28adba16fcf",
+ "reference": "0e46722c154726a5f9ac218197ccc28adba16fcf",
"shasum": ""
},
"require": {
@@ -5844,7 +5848,7 @@
},
"notification-url": "https://packagist.org/downloads/",
"license": [
- "LGPL-3.0"
+ "LGPL-3.0-or-later"
],
"authors": [
{
@@ -5856,9 +5860,9 @@
"homepage": "https://github.com/PhenX/php-svg-lib",
"support": {
"issues": "https://github.com/dompdf/php-svg-lib/issues",
- "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.2"
+ "source": "https://github.com/dompdf/php-svg-lib/tree/0.5.3"
},
- "time": "2024-02-07T12:49:40+00:00"
+ "time": "2024-02-23T20:39:24+00:00"
},
{
"name": "phpdocumentor/reflection-common",
@@ -6284,16 +6288,16 @@
},
{
"name": "phpstan/phpdoc-parser",
- "version": "1.26.0",
+ "version": "1.27.0",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpdoc-parser.git",
- "reference": "231e3186624c03d7e7c890ec662b81e6b0405227"
+ "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/231e3186624c03d7e7c890ec662b81e6b0405227",
- "reference": "231e3186624c03d7e7c890ec662b81e6b0405227",
+ "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/86e4d5a4b036f8f0be1464522f4c6b584c452757",
+ "reference": "86e4d5a4b036f8f0be1464522f4c6b584c452757",
"shasum": ""
},
"require": {
@@ -6325,9 +6329,9 @@
"description": "PHPDoc parser with support for nullable, intersection and generic types",
"support": {
"issues": "https://github.com/phpstan/phpdoc-parser/issues",
- "source": "https://github.com/phpstan/phpdoc-parser/tree/1.26.0"
+ "source": "https://github.com/phpstan/phpdoc-parser/tree/1.27.0"
},
- "time": "2024-02-23T16:05:55+00:00"
+ "time": "2024-03-21T13:14:53+00:00"
},
{
"name": "pragmarx/google2fa",
@@ -6981,16 +6985,16 @@
},
{
"name": "psy/psysh",
- "version": "v0.12.0",
+ "version": "v0.12.3",
"source": {
"type": "git",
"url": "https://github.com/bobthecow/psysh.git",
- "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d"
+ "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/750bf031a48fd07c673dbe3f11f72362ea306d0d",
- "reference": "750bf031a48fd07c673dbe3f11f72362ea306d0d",
+ "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
+ "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73",
"shasum": ""
},
"require": {
@@ -7054,9 +7058,9 @@
],
"support": {
"issues": "https://github.com/bobthecow/psysh/issues",
- "source": "https://github.com/bobthecow/psysh/tree/v0.12.0"
+ "source": "https://github.com/bobthecow/psysh/tree/v0.12.3"
},
- "time": "2023-12-20T15:28:09+00:00"
+ "time": "2024-04-02T15:57:53+00:00"
},
{
"name": "ralouphie/getallheaders",
@@ -7869,16 +7873,16 @@
},
{
"name": "spatie/db-dumper",
- "version": "3.4.2",
+ "version": "3.4.3",
"source": {
"type": "git",
"url": "https://github.com/spatie/db-dumper.git",
- "reference": "59beef7ad612ca7463dfddb64de6e038eb59e0d7"
+ "reference": "c566852826f3e9dceea27eef5173bad93b83e61c"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/db-dumper/zipball/59beef7ad612ca7463dfddb64de6e038eb59e0d7",
- "reference": "59beef7ad612ca7463dfddb64de6e038eb59e0d7",
+ "url": "https://api.github.com/repos/spatie/db-dumper/zipball/c566852826f3e9dceea27eef5173bad93b83e61c",
+ "reference": "c566852826f3e9dceea27eef5173bad93b83e61c",
"shasum": ""
},
"require": {
@@ -7916,7 +7920,7 @@
"spatie"
],
"support": {
- "source": "https://github.com/spatie/db-dumper/tree/3.4.2"
+ "source": "https://github.com/spatie/db-dumper/tree/3.4.3"
},
"funding": [
{
@@ -7928,7 +7932,7 @@
"type": "github"
}
],
- "time": "2023-12-25T11:42:15+00:00"
+ "time": "2024-04-01T07:37:06+00:00"
},
{
"name": "spatie/flare-client-php",
@@ -8001,16 +8005,16 @@
},
{
"name": "spatie/ignition",
- "version": "1.12.0",
+ "version": "1.13.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/ignition.git",
- "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d"
+ "reference": "889bf1dfa59e161590f677728b47bf4a6893983b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/ignition/zipball/5b6f801c605a593106b623e45ca41496a6e7d56d",
- "reference": "5b6f801c605a593106b623e45ca41496a6e7d56d",
+ "url": "https://api.github.com/repos/spatie/ignition/zipball/889bf1dfa59e161590f677728b47bf4a6893983b",
+ "reference": "889bf1dfa59e161590f677728b47bf4a6893983b",
"shasum": ""
},
"require": {
@@ -8080,7 +8084,7 @@
"type": "github"
}
],
- "time": "2024-01-03T15:49:39+00:00"
+ "time": "2024-03-29T14:03:47+00:00"
},
{
"name": "spatie/laravel-backup",
@@ -8183,16 +8187,16 @@
},
{
"name": "spatie/laravel-ignition",
- "version": "2.4.2",
+ "version": "2.5.1",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-ignition.git",
- "reference": "351504f4570e32908839fc5a2dc53bf77d02f85e"
+ "reference": "0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/351504f4570e32908839fc5a2dc53bf77d02f85e",
- "reference": "351504f4570e32908839fc5a2dc53bf77d02f85e",
+ "url": "https://api.github.com/repos/spatie/laravel-ignition/zipball/0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9",
+ "reference": "0c864b3cbd66ce67a2096c5f743e07ce8f1d6ab9",
"shasum": ""
},
"require": {
@@ -8202,7 +8206,7 @@
"illuminate/support": "^10.0|^11.0",
"php": "^8.1",
"spatie/flare-client-php": "^1.3.5",
- "spatie/ignition": "^1.9",
+ "spatie/ignition": "^1.13",
"symfony/console": "^6.2.3|^7.0",
"symfony/var-dumper": "^6.2.3|^7.0"
},
@@ -8271,20 +8275,20 @@
"type": "github"
}
],
- "time": "2024-02-09T16:08:40+00:00"
+ "time": "2024-04-02T06:30:22+00:00"
},
{
"name": "spatie/laravel-package-tools",
- "version": "1.16.2",
+ "version": "1.16.4",
"source": {
"type": "git",
"url": "https://github.com/spatie/laravel-package-tools.git",
- "reference": "e62eeb1fe8a8a0b2e83227a6c279c8c59f7d3a15"
+ "reference": "ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/e62eeb1fe8a8a0b2e83227a6c279c8c59f7d3a15",
- "reference": "e62eeb1fe8a8a0b2e83227a6c279c8c59f7d3a15",
+ "url": "https://api.github.com/repos/spatie/laravel-package-tools/zipball/ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53",
+ "reference": "ddf678e78d7f8b17e5cdd99c0c3413a4a6592e53",
"shasum": ""
},
"require": {
@@ -8323,7 +8327,7 @@
],
"support": {
"issues": "https://github.com/spatie/laravel-package-tools/issues",
- "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.2"
+ "source": "https://github.com/spatie/laravel-package-tools/tree/1.16.4"
},
"funding": [
{
@@ -8331,7 +8335,7 @@
"type": "github"
}
],
- "time": "2024-01-11T08:43:00+00:00"
+ "time": "2024-03-20T07:29:11+00:00"
},
{
"name": "spatie/laravel-signal-aware-command",
@@ -8468,86 +8472,6 @@
],
"time": "2023-12-25T11:46:58+00:00"
},
- {
- "name": "squizlabs/php_codesniffer",
- "version": "3.9.0",
- "source": {
- "type": "git",
- "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
- "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
- "reference": "d63cee4890a8afaf86a22e51ad4d97c91dd4579b",
- "shasum": ""
- },
- "require": {
- "ext-simplexml": "*",
- "ext-tokenizer": "*",
- "ext-xmlwriter": "*",
- "php": ">=5.4.0"
- },
- "require-dev": {
- "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
- },
- "bin": [
- "bin/phpcbf",
- "bin/phpcs"
- ],
- "type": "library",
- "extra": {
- "branch-alias": {
- "dev-master": "3.x-dev"
- }
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "BSD-3-Clause"
- ],
- "authors": [
- {
- "name": "Greg Sherwood",
- "role": "Former lead"
- },
- {
- "name": "Juliette Reinders Folmer",
- "role": "Current lead"
- },
- {
- "name": "Contributors",
- "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
- }
- ],
- "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
- "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
- "keywords": [
- "phpcs",
- "standards",
- "static analysis"
- ],
- "support": {
- "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
- "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
- "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
- "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
- },
- "funding": [
- {
- "url": "https://github.com/PHPCSStandards",
- "type": "github"
- },
- {
- "url": "https://github.com/jrfnl",
- "type": "github"
- },
- {
- "url": "https://opencollective.com/php_codesniffer",
- "type": "open_collective"
- }
- ],
- "time": "2024-02-16T15:06:51+00:00"
- },
{
"name": "stella-maris/clock",
"version": "0.1.7",
@@ -11086,20 +11010,20 @@
},
{
"name": "tecnickcom/tcpdf",
- "version": "6.6.5",
+ "version": "6.7.4",
"source": {
"type": "git",
"url": "https://github.com/tecnickcom/TCPDF.git",
- "reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce"
+ "reference": "d4adef47ca21c90e6483d59dcb9e5b1023696937"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/5fce932fcee4371865314ab7f6c0d85423c5c7ce",
- "reference": "5fce932fcee4371865314ab7f6c0d85423c5c7ce",
+ "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/d4adef47ca21c90e6483d59dcb9e5b1023696937",
+ "reference": "d4adef47ca21c90e6483d59dcb9e5b1023696937",
"shasum": ""
},
"require": {
- "php": ">=5.3.0"
+ "php": ">=5.5.0"
},
"type": "library",
"autoload": {
@@ -11146,7 +11070,7 @@
],
"support": {
"issues": "https://github.com/tecnickcom/TCPDF/issues",
- "source": "https://github.com/tecnickcom/TCPDF/tree/6.6.5"
+ "source": "https://github.com/tecnickcom/TCPDF/tree/6.7.4"
},
"funding": [
{
@@ -11154,7 +11078,7 @@
"type": "custom"
}
],
- "time": "2023-09-06T15:09:26+00:00"
+ "time": "2024-03-25T23:56:24+00:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -11626,24 +11550,24 @@
},
{
"name": "watson/validating",
- "version": "8.1.0",
+ "version": "8.2.0",
"source": {
"type": "git",
"url": "https://github.com/dwightwatson/validating.git",
- "reference": "41f3ca6734bd5c6b3059142b2177b21600f4ad6c"
+ "reference": "7798363f63d05565ccae01ae95c2227519c1739f"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/dwightwatson/validating/zipball/41f3ca6734bd5c6b3059142b2177b21600f4ad6c",
- "reference": "41f3ca6734bd5c6b3059142b2177b21600f4ad6c",
+ "url": "https://api.github.com/repos/dwightwatson/validating/zipball/7798363f63d05565ccae01ae95c2227519c1739f",
+ "reference": "7798363f63d05565ccae01ae95c2227519c1739f",
"shasum": ""
},
"require": {
- "illuminate/contracts": "~9.0|~10.0",
- "illuminate/database": "~9.0|~10.0",
- "illuminate/events": "~9.0|~10.0",
- "illuminate/support": "~9.0|~10.0",
- "illuminate/validation": "~9.0|~10.0",
+ "illuminate/contracts": "~9.0|~10.0|~11.0",
+ "illuminate/database": "~9.0|~10.0|~11.0",
+ "illuminate/events": "~9.0|~10.0|~11.0",
+ "illuminate/support": "~9.0|~10.0|~11.0",
+ "illuminate/validation": "~9.0|~10.0|~11.0",
"php": "^8.1"
},
"require-dev": {
@@ -11674,9 +11598,9 @@
],
"support": {
"issues": "https://github.com/dwightwatson/validating/issues",
- "source": "https://github.com/dwightwatson/validating/tree/8.1.0"
+ "source": "https://github.com/dwightwatson/validating/tree/8.2.0"
},
- "time": "2023-05-03T22:18:57+00:00"
+ "time": "2024-03-13T21:31:03+00:00"
},
{
"name": "webmozart/assert",
@@ -11740,16 +11664,16 @@
"packages-dev": [
{
"name": "amphp/amp",
- "version": "v2.6.2",
+ "version": "v2.6.4",
"source": {
"type": "git",
"url": "https://github.com/amphp/amp.git",
- "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb"
+ "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/amphp/amp/zipball/9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
- "reference": "9d5100cebffa729aaffecd3ad25dc5aeea4f13bb",
+ "url": "https://api.github.com/repos/amphp/amp/zipball/ded3d9be08f526089eb7ee8d9f16a9768f9dec2d",
+ "reference": "ded3d9be08f526089eb7ee8d9f16a9768f9dec2d",
"shasum": ""
},
"require": {
@@ -11761,8 +11685,8 @@
"ext-json": "*",
"jetbrains/phpstorm-stubs": "^2019.3",
"phpunit/phpunit": "^7 | ^8 | ^9",
- "psalm/phar": "^3.11@dev",
- "react/promise": "^2"
+ "react/promise": "^2",
+ "vimeo/psalm": "^3.12"
},
"type": "library",
"extra": {
@@ -11817,7 +11741,7 @@
"support": {
"irc": "irc://irc.freenode.org/amphp",
"issues": "https://github.com/amphp/amp/issues",
- "source": "https://github.com/amphp/amp/tree/v2.6.2"
+ "source": "https://github.com/amphp/amp/tree/v2.6.4"
},
"funding": [
{
@@ -11825,7 +11749,7 @@
"type": "github"
}
],
- "time": "2022-02-20T17:52:18+00:00"
+ "time": "2024-03-21T18:52:26+00:00"
},
{
"name": "amphp/byte-stream",
@@ -11906,16 +11830,16 @@
},
{
"name": "brianium/paratest",
- "version": "v6.11.0",
+ "version": "v6.11.1",
"source": {
"type": "git",
"url": "https://github.com/paratestphp/paratest.git",
- "reference": "8083a421cee7dad847ee7c464529043ba30de380"
+ "reference": "78e297a969049ca7cc370e80ff5e102921ef39a3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/paratestphp/paratest/zipball/8083a421cee7dad847ee7c464529043ba30de380",
- "reference": "8083a421cee7dad847ee7c464529043ba30de380",
+ "url": "https://api.github.com/repos/paratestphp/paratest/zipball/78e297a969049ca7cc370e80ff5e102921ef39a3",
+ "reference": "78e297a969049ca7cc370e80ff5e102921ef39a3",
"shasum": ""
},
"require": {
@@ -11982,7 +11906,7 @@
],
"support": {
"issues": "https://github.com/paratestphp/paratest/issues",
- "source": "https://github.com/paratestphp/paratest/tree/v6.11.0"
+ "source": "https://github.com/paratestphp/paratest/tree/v6.11.1"
},
"funding": [
{
@@ -11994,7 +11918,7 @@
"type": "paypal"
}
],
- "time": "2023-10-31T09:13:57+00:00"
+ "time": "2024-03-13T06:54:29+00:00"
},
{
"name": "cmgmyr/phploc",
@@ -12063,16 +11987,16 @@
},
{
"name": "composer/pcre",
- "version": "3.1.1",
+ "version": "3.1.3",
"source": {
"type": "git",
"url": "https://github.com/composer/pcre.git",
- "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9"
+ "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/pcre/zipball/00104306927c7a0919b4ced2aaa6782c1e61a3c9",
- "reference": "00104306927c7a0919b4ced2aaa6782c1e61a3c9",
+ "url": "https://api.github.com/repos/composer/pcre/zipball/5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
+ "reference": "5b16e25a5355f1f3afdfc2f954a0a80aec4826a8",
"shasum": ""
},
"require": {
@@ -12114,7 +12038,7 @@
],
"support": {
"issues": "https://github.com/composer/pcre/issues",
- "source": "https://github.com/composer/pcre/tree/3.1.1"
+ "source": "https://github.com/composer/pcre/tree/3.1.3"
},
"funding": [
{
@@ -12130,7 +12054,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-11T07:11:09+00:00"
+ "time": "2024-03-19T10:26:25+00:00"
},
{
"name": "composer/semver",
@@ -12215,16 +12139,16 @@
},
{
"name": "composer/xdebug-handler",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/composer/xdebug-handler.git",
- "reference": "ced299686f41dce890debac69273b47ffe98a40c"
+ "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/ced299686f41dce890debac69273b47ffe98a40c",
- "reference": "ced299686f41dce890debac69273b47ffe98a40c",
+ "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
+ "reference": "4f988f8fdf580d53bdb2d1278fe93d1ed5462255",
"shasum": ""
},
"require": {
@@ -12235,7 +12159,7 @@
"require-dev": {
"phpstan/phpstan": "^1.0",
"phpstan/phpstan-strict-rules": "^1.1",
- "symfony/phpunit-bridge": "^6.0"
+ "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
},
"type": "library",
"autoload": {
@@ -12259,9 +12183,9 @@
"performance"
],
"support": {
- "irc": "irc://irc.freenode.org/composer",
+ "irc": "ircs://irc.libera.chat:6697/composer",
"issues": "https://github.com/composer/xdebug-handler/issues",
- "source": "https://github.com/composer/xdebug-handler/tree/3.0.3"
+ "source": "https://github.com/composer/xdebug-handler/tree/3.0.4"
},
"funding": [
{
@@ -12277,7 +12201,7 @@
"type": "tidelift"
}
],
- "time": "2022-02-25T21:32:43+00:00"
+ "time": "2024-03-26T18:29:49+00:00"
},
{
"name": "dealerdirect/phpcodesniffer-composer-installer",
@@ -12621,16 +12545,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.51.0",
+ "version": "v3.52.1",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "127fa74f010da99053e3f5b62672615b72dd6efd"
+ "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/127fa74f010da99053e3f5b62672615b72dd6efd",
- "reference": "127fa74f010da99053e3f5b62672615b72dd6efd",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/6e77207f0d851862ceeb6da63e6e22c01b1587bc",
+ "reference": "6e77207f0d851862ceeb6da63e6e22c01b1587bc",
"shasum": ""
},
"require": {
@@ -12701,7 +12625,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.51.0"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.52.1"
},
"funding": [
{
@@ -12709,7 +12633,7 @@
"type": "github"
}
],
- "time": "2024-02-28T19:50:06+00:00"
+ "time": "2024-03-19T21:02:43+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -12764,16 +12688,16 @@
},
{
"name": "jean85/pretty-package-versions",
- "version": "2.0.5",
+ "version": "2.0.6",
"source": {
"type": "git",
"url": "https://github.com/Jean85/pretty-package-versions.git",
- "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af"
+ "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/ae547e455a3d8babd07b96966b17d7fd21d9c6af",
- "reference": "ae547e455a3d8babd07b96966b17d7fd21d9c6af",
+ "url": "https://api.github.com/repos/Jean85/pretty-package-versions/zipball/f9fdd29ad8e6d024f52678b570e5593759b550b4",
+ "reference": "f9fdd29ad8e6d024f52678b570e5593759b550b4",
"shasum": ""
},
"require": {
@@ -12781,9 +12705,9 @@
"php": "^7.1|^8.0"
},
"require-dev": {
- "friendsofphp/php-cs-fixer": "^2.17",
+ "friendsofphp/php-cs-fixer": "^3.2",
"jean85/composer-provided-replaced-stub-package": "^1.0",
- "phpstan/phpstan": "^0.12.66",
+ "phpstan/phpstan": "^1.4",
"phpunit/phpunit": "^7.5|^8.5|^9.4",
"vimeo/psalm": "^4.3"
},
@@ -12817,9 +12741,9 @@
],
"support": {
"issues": "https://github.com/Jean85/pretty-package-versions/issues",
- "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.5"
+ "source": "https://github.com/Jean85/pretty-package-versions/tree/2.0.6"
},
- "time": "2021-10-08T21:21:46+00:00"
+ "time": "2024-03-08T09:58:59+00:00"
},
{
"name": "justinrainbow/json-schema",
@@ -12893,16 +12817,16 @@
},
{
"name": "league/container",
- "version": "4.2.0",
+ "version": "4.2.2",
"source": {
"type": "git",
"url": "https://github.com/thephpleague/container.git",
- "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab"
+ "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/thephpleague/container/zipball/375d13cb828649599ef5d48a339c4af7a26cd0ab",
- "reference": "375d13cb828649599ef5d48a339c4af7a26cd0ab",
+ "url": "https://api.github.com/repos/thephpleague/container/zipball/ff346319ca1ff0e78277dc2311a42107cc1aab88",
+ "reference": "ff346319ca1ff0e78277dc2311a42107cc1aab88",
"shasum": ""
},
"require": {
@@ -12963,7 +12887,7 @@
],
"support": {
"issues": "https://github.com/thephpleague/container/issues",
- "source": "https://github.com/thephpleague/container/tree/4.2.0"
+ "source": "https://github.com/thephpleague/container/tree/4.2.2"
},
"funding": [
{
@@ -12971,20 +12895,20 @@
"type": "github"
}
],
- "time": "2021-11-16T10:29:06+00:00"
+ "time": "2024-03-13T13:12:53+00:00"
},
{
"name": "mockery/mockery",
- "version": "1.6.7",
+ "version": "1.6.11",
"source": {
"type": "git",
"url": "https://github.com/mockery/mockery.git",
- "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06"
+ "reference": "81a161d0b135df89951abd52296adf97deb0723d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mockery/mockery/zipball/0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
- "reference": "0cc058854b3195ba21dc6b1f7b1f60f4ef3a9c06",
+ "url": "https://api.github.com/repos/mockery/mockery/zipball/81a161d0b135df89951abd52296adf97deb0723d",
+ "reference": "81a161d0b135df89951abd52296adf97deb0723d",
"shasum": ""
},
"require": {
@@ -12996,8 +12920,8 @@
"phpunit/phpunit": "<8.0"
},
"require-dev": {
- "phpunit/phpunit": "^8.5 || ^9.6.10",
- "symplify/easy-coding-standard": "^12.0.8"
+ "phpunit/phpunit": "^8.5 || ^9.6.17",
+ "symplify/easy-coding-standard": "^12.1.14"
},
"type": "library",
"autoload": {
@@ -13054,7 +12978,7 @@
"security": "https://github.com/mockery/mockery/security/advisories",
"source": "https://github.com/mockery/mockery"
},
- "time": "2023-12-10T02:24:34+00:00"
+ "time": "2024-03-21T18:34:15+00:00"
},
{
"name": "myclabs/deep-copy",
@@ -13702,16 +13626,16 @@
},
{
"name": "php-parallel-lint/php-parallel-lint",
- "version": "v1.3.2",
+ "version": "v1.4.0",
"source": {
"type": "git",
"url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
- "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de"
+ "reference": "6db563514f27e19595a19f45a4bf757b6401194e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6483c9832e71973ed29cf71bd6b3f4fde438a9de",
- "reference": "6483c9832e71973ed29cf71bd6b3f4fde438a9de",
+ "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e",
+ "reference": "6db563514f27e19595a19f45a4bf757b6401194e",
"shasum": ""
},
"require": {
@@ -13749,13 +13673,17 @@
"email": "ahoj@jakubonderka.cz"
}
],
- "description": "This tool check syntax of PHP files about 20x faster than serial check.",
+ "description": "This tool checks the syntax of PHP files about 20x faster than serial check.",
"homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint",
+ "keywords": [
+ "lint",
+ "static analysis"
+ ],
"support": {
"issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues",
- "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.3.2"
+ "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0"
},
- "time": "2022-02-21T12:50:22+00:00"
+ "time": "2024-03-27T12:14:49+00:00"
},
{
"name": "phpmyadmin/sql-parser",
@@ -13847,16 +13775,16 @@
},
{
"name": "phpstan/phpstan",
- "version": "1.10.59",
+ "version": "1.10.66",
"source": {
"type": "git",
"url": "https://github.com/phpstan/phpstan.git",
- "reference": "e607609388d3a6d418a50a49f7940e8086798281"
+ "reference": "94779c987e4ebd620025d9e5fdd23323903950bd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpstan/phpstan/zipball/e607609388d3a6d418a50a49f7940e8086798281",
- "reference": "e607609388d3a6d418a50a49f7940e8086798281",
+ "url": "https://api.github.com/repos/phpstan/phpstan/zipball/94779c987e4ebd620025d9e5fdd23323903950bd",
+ "reference": "94779c987e4ebd620025d9e5fdd23323903950bd",
"shasum": ""
},
"require": {
@@ -13905,7 +13833,7 @@
"type": "tidelift"
}
],
- "time": "2024-02-20T13:59:13+00:00"
+ "time": "2024-03-28T16:17:31+00:00"
},
{
"name": "phpunit/php-code-coverage",
@@ -14288,16 +14216,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "9.6.17",
+ "version": "9.6.18",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd"
+ "reference": "32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a156980d78a6666721b7e8e8502fe210b587fcd",
- "reference": "1a156980d78a6666721b7e8e8502fe210b587fcd",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04",
+ "reference": "32c2c2d6580b1d8ab3c10b1e9e4dc263cc69bb04",
"shasum": ""
},
"require": {
@@ -14371,7 +14299,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.17"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.18"
},
"funding": [
{
@@ -14387,7 +14315,7 @@
"type": "tidelift"
}
],
- "time": "2024-02-23T13:14:51+00:00"
+ "time": "2024-03-21T12:07:32+00:00"
},
{
"name": "sebastian/cli-parser",
@@ -14911,16 +14839,16 @@
},
{
"name": "sebastian/resource-operations",
- "version": "3.0.3",
+ "version": "3.0.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/resource-operations.git",
- "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8"
+ "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
- "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8",
+ "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+ "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
"shasum": ""
},
"require": {
@@ -14932,7 +14860,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev"
+ "dev-main": "3.0-dev"
}
},
"autoload": {
@@ -14953,8 +14881,7 @@
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
"support": {
- "issues": "https://github.com/sebastianbergmann/resource-operations/issues",
- "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3"
+ "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
},
"funding": [
{
@@ -14962,7 +14889,7 @@
"type": "github"
}
],
- "time": "2020-09-28T06:45:17+00:00"
+ "time": "2024-03-14T16:00:52+00:00"
},
{
"name": "sebastian/type",
@@ -15075,32 +15002,32 @@
},
{
"name": "slevomat/coding-standard",
- "version": "8.14.1",
+ "version": "8.15.0",
"source": {
"type": "git",
"url": "https://github.com/slevomat/coding-standard.git",
- "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926"
+ "reference": "7d1d957421618a3803b593ec31ace470177d7817"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/fea1fd6f137cc84f9cba0ae30d549615dbc6a926",
- "reference": "fea1fd6f137cc84f9cba0ae30d549615dbc6a926",
+ "url": "https://api.github.com/repos/slevomat/coding-standard/zipball/7d1d957421618a3803b593ec31ace470177d7817",
+ "reference": "7d1d957421618a3803b593ec31ace470177d7817",
"shasum": ""
},
"require": {
"dealerdirect/phpcodesniffer-composer-installer": "^0.6.2 || ^0.7 || ^1.0",
"php": "^7.2 || ^8.0",
"phpstan/phpdoc-parser": "^1.23.1",
- "squizlabs/php_codesniffer": "^3.7.1"
+ "squizlabs/php_codesniffer": "^3.9.0"
},
"require-dev": {
"phing/phing": "2.17.4",
"php-parallel-lint/php-parallel-lint": "1.3.2",
- "phpstan/phpstan": "1.10.37",
+ "phpstan/phpstan": "1.10.60",
"phpstan/phpstan-deprecation-rules": "1.1.4",
- "phpstan/phpstan-phpunit": "1.3.14",
- "phpstan/phpstan-strict-rules": "1.5.1",
- "phpunit/phpunit": "8.5.21|9.6.8|10.3.5"
+ "phpstan/phpstan-phpunit": "1.3.16",
+ "phpstan/phpstan-strict-rules": "1.5.2",
+ "phpunit/phpunit": "8.5.21|9.6.8|10.5.11"
},
"type": "phpcodesniffer-standard",
"extra": {
@@ -15124,7 +15051,7 @@
],
"support": {
"issues": "https://github.com/slevomat/coding-standard/issues",
- "source": "https://github.com/slevomat/coding-standard/tree/8.14.1"
+ "source": "https://github.com/slevomat/coding-standard/tree/8.15.0"
},
"funding": [
{
@@ -15136,7 +15063,7 @@
"type": "tidelift"
}
],
- "time": "2023-10-08T07:28:08+00:00"
+ "time": "2024-03-09T15:20:58+00:00"
},
{
"name": "spatie/array-to-xml",
@@ -15201,6 +15128,86 @@
],
"time": "2024-02-07T10:39:02+00:00"
},
+ {
+ "name": "squizlabs/php_codesniffer",
+ "version": "3.9.1",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
+ "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/267a4405fff1d9c847134db3a3c92f1ab7f77909",
+ "reference": "267a4405fff1d9c847134db3a3c92f1ab7f77909",
+ "shasum": ""
+ },
+ "require": {
+ "ext-simplexml": "*",
+ "ext-tokenizer": "*",
+ "ext-xmlwriter": "*",
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4"
+ },
+ "bin": [
+ "bin/phpcbf",
+ "bin/phpcs"
+ ],
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.x-dev"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Greg Sherwood",
+ "role": "Former lead"
+ },
+ {
+ "name": "Juliette Reinders Folmer",
+ "role": "Current lead"
+ },
+ {
+ "name": "Contributors",
+ "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer/graphs/contributors"
+ }
+ ],
+ "description": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+ "homepage": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+ "keywords": [
+ "phpcs",
+ "standards",
+ "static analysis"
+ ],
+ "support": {
+ "issues": "https://github.com/PHPCSStandards/PHP_CodeSniffer/issues",
+ "security": "https://github.com/PHPCSStandards/PHP_CodeSniffer/security/policy",
+ "source": "https://github.com/PHPCSStandards/PHP_CodeSniffer",
+ "wiki": "https://github.com/PHPCSStandards/PHP_CodeSniffer/wiki"
+ },
+ "funding": [
+ {
+ "url": "https://github.com/PHPCSStandards",
+ "type": "github"
+ },
+ {
+ "url": "https://github.com/jrfnl",
+ "type": "github"
+ },
+ {
+ "url": "https://opencollective.com/php_codesniffer",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2024-03-31T21:03:09+00:00"
+ },
{
"name": "symfony/cache",
"version": "v6.4.4",
@@ -16013,16 +16020,16 @@
},
{
"name": "vimeo/psalm",
- "version": "5.22.2",
+ "version": "5.23.1",
"source": {
"type": "git",
"url": "https://github.com/vimeo/psalm.git",
- "reference": "d768d914152dbbf3486c36398802f74e80cfde48"
+ "reference": "8471a896ccea3526b26d082f4461eeea467f10a4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vimeo/psalm/zipball/d768d914152dbbf3486c36398802f74e80cfde48",
- "reference": "d768d914152dbbf3486c36398802f74e80cfde48",
+ "url": "https://api.github.com/repos/vimeo/psalm/zipball/8471a896ccea3526b26d082f4461eeea467f10a4",
+ "reference": "8471a896ccea3526b26d082f4461eeea467f10a4",
"shasum": ""
},
"require": {
@@ -16119,7 +16126,7 @@
"issues": "https://github.com/vimeo/psalm/issues",
"source": "https://github.com/vimeo/psalm"
},
- "time": "2024-02-22T23:39:07+00:00"
+ "time": "2024-03-11T20:33:46+00:00"
}
],
"aliases": [],
diff --git a/config/session.php b/config/session.php
index a47294a8cb..5c6cb27a9f 100644
--- a/config/session.php
+++ b/config/session.php
@@ -174,4 +174,17 @@ return [
'bs_table_storage' => env('BS_TABLE_STORAGE', 'cookieStorage'),
+
+ /*
+ |--------------------------------------------------------------------------
+ | Bootstrap Table Enable Deeplinking
+ |--------------------------------------------------------------------------
+ |
+ | Use deeplinks to directly link to search results, sorting, and pagination
+ |
+ | More info: https://github.com/generals-space/bootstrap-table-addrbar/blob/master/readme(EN).md
+ */
+
+ 'bs_table_addrbar' => env('BS_TABLE_DEEPLINK', true),
+
];
diff --git a/config/version.php b/config/version.php
index bb78cada7b..9eb8953058 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
'v6.3.2',
- 'full_app_version' => 'v6.3.2 - build 12834-g9a5c1b812',
- 'build_version' => '12834',
+ 'app_version' => 'v6.3.4',
+ 'full_app_version' => 'v6.3.4 - build 13139-g6f9ba6ede',
+ 'build_version' => '13139',
'prerelease_version' => '',
- 'hash_version' => 'g9a5c1b812',
- 'full_hash' => 'v6.3.2-160-g9a5c1b812',
+ 'hash_version' => 'g6f9ba6ede',
+ 'full_hash' => 'v6.3.4-234-g6f9ba6ede',
'branch' => 'develop',
);
\ No newline at end of file
diff --git a/database/migrations/2024_03_18_221612_update_legacy_locale.php b/database/migrations/2024_03_18_221612_update_legacy_locale.php
new file mode 100644
index 0000000000..dc81207b1d
--- /dev/null
+++ b/database/migrations/2024_03_18_221612_update_legacy_locale.php
@@ -0,0 +1,47 @@
+string('locale', 10)->nullable()->default('en-US')->change();
+ });
+
+ Schema::table('settings', function (Blueprint $table) {
+ //
+ $table->string('locale', 10)->nullable()->default('en-US')->change();
+ });
+
+
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ //
+ Schema::table('users', function (Blueprint $table) {
+ //
+ $table->string('locale', 10)->nullable()->default(config('app.locale'))->change();
+ });
+ Schema::table('settings', function (Blueprint $table) {
+ //
+ $table->string('locale', 10)->nullable()->default(config('app.locale'))->change();
+ });
+ }
+}
diff --git a/docker/startup.sh b/docker/startup.sh
index 55ffd66909..62002a2ba0 100644
--- a/docker/startup.sh
+++ b/docker/startup.sh
@@ -17,16 +17,23 @@ else
fi
# create data directories
+# Note: Keep in sync with expected directories by the app
+# https://github.com/snipe/snipe-it/blob/master/app/Console/Commands/RestoreFromBackup.php#L232
for dir in \
'data/private_uploads' \
'data/private_uploads/assets' \
+ 'data/private_uploads/accessories' \
'data/private_uploads/audits' \
+ 'data/private_uploads/components' \
+ 'data/private_uploads/consumables' \
+ 'data/private_uploads/eula-pdfs' \
'data/private_uploads/imports' \
'data/private_uploads/assetmodels' \
'data/private_uploads/users' \
'data/private_uploads/licenses' \
'data/private_uploads/signatures' \
'data/uploads/accessories' \
+ 'data/uploads/assets' \
'data/uploads/avatars' \
'data/uploads/barcodes' \
'data/uploads/categories' \
diff --git a/package-lock.json b/package-lock.json
index 19ff5c869e..fb02c5139e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,13 +10,13 @@
"acorn-import-assertions": "^1.9.0",
"admin-lte": "^2.4.18",
"ajv": "^6.12.6",
- "alpinejs": "^3.13.5",
+ "alpinejs": "3.13.5",
"blueimp-file-upload": "^9.34.0",
"bootstrap": "^3.4.1",
"bootstrap-colorpicker": "^2.5.3",
"bootstrap-datepicker": "^1.10.0",
"bootstrap-less": "^3.3.8",
- "bootstrap-table": "1.22.2",
+ "bootstrap-table": "1.22.3",
"chart.js": "^2.9.4",
"clipboard": "^2.0.11",
"css-loader": "^5.0.0",
@@ -26,7 +26,7 @@
"jquery-ui": "^1.13.2",
"jquery-validation": "^1.20.0",
"jquery.iframe-transport": "^1.0.0",
- "jspdf-autotable": "^3.8.0",
+ "jspdf-autotable": "^3.8.2",
"less": "^4.2.0",
"less-loader": "^6.0",
"list.js": "^1.5.0",
@@ -36,7 +36,7 @@
"sheetjs": "^2.0.0",
"tableexport.jquery.plugin": "1.28.0",
"tether": "^1.4.0",
- "webpack": "^5.90.0"
+ "webpack": "^5.90.2"
},
"devDependencies": {
"all-contributors-cli": "^6.26.1",
@@ -4144,9 +4144,9 @@
"integrity": "sha512-a9MtENtt4r3ttPW5mpIpOFmCaIsm37EGukOgw5cfHlxKvsUSN8AN9JtwKrKuqgEnxs86kUSsMvMn8kqewMorKw=="
},
"node_modules/bootstrap-table": {
- "version": "1.22.2",
- "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.22.2.tgz",
- "integrity": "sha512-ZjZGcEXm/N7N/wAykmANWKKV+U+7AxgoNuBwWLrKbvAGT8XXS2f0OCiFmuMwpkqg7pDbF+ff9bEf/lOAlxcF1w==",
+ "version": "1.22.3",
+ "resolved": "https://registry.npmjs.org/bootstrap-table/-/bootstrap-table-1.22.3.tgz",
+ "integrity": "sha512-YWQTXzmZBX6P4y6YW2mHOxqIAYyLKld2WecHuKSyYamimUE4KZ9YUsmAroSoS2Us1bPYXFaM+JCeTt6X0iKW+g==",
"peerDependencies": {
"jquery": "3"
}
@@ -8136,9 +8136,9 @@
}
},
"node_modules/jspdf-autotable": {
- "version": "3.8.1",
- "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.8.1.tgz",
- "integrity": "sha512-UjJqo80Z3/WUzDi4JipTGp0pAvNvR3Gsm38inJ5ZnwsJH0Lw4pEbssRSH6zMWAhR1ZkTrsDpQo5p6rZk987/AQ==",
+ "version": "3.8.2",
+ "resolved": "https://registry.npmjs.org/jspdf-autotable/-/jspdf-autotable-3.8.2.tgz",
+ "integrity": "sha512-zW1ix99/mtR4MbIni7IqvrpfHmuTaICl6iv6wqjRN86Nxtwaw/QtOeDbpXqYSzHIJK9JvgtLM283sc5x+ipkJg==",
"peerDependencies": {
"jspdf": "^2.5.1"
}
diff --git a/package.json b/package.json
index 769cd26a95..3454c7e16c 100644
--- a/package.json
+++ b/package.json
@@ -30,13 +30,13 @@
"acorn-import-assertions": "^1.9.0",
"admin-lte": "^2.4.18",
"ajv": "^6.12.6",
- "alpinejs": "^3.13.5",
+ "alpinejs": "3.13.5",
"blueimp-file-upload": "^9.34.0",
"bootstrap": "^3.4.1",
"bootstrap-colorpicker": "^2.5.3",
"bootstrap-datepicker": "^1.10.0",
"bootstrap-less": "^3.3.8",
- "bootstrap-table": "1.22.2",
+ "bootstrap-table": "1.22.3",
"chart.js": "^2.9.4",
"clipboard": "^2.0.11",
"css-loader": "^5.0.0",
@@ -46,7 +46,7 @@
"jquery-ui": "^1.13.2",
"jquery.iframe-transport": "^1.0.0",
"jquery-validation": "^1.20.0",
- "jspdf-autotable": "^3.8.0",
+ "jspdf-autotable": "^3.8.2",
"less": "^4.2.0",
"less-loader": "^6.0",
"list.js": "^1.5.0",
@@ -56,6 +56,6 @@
"sheetjs": "^2.0.0",
"tableexport.jquery.plugin": "1.28.0",
"tether": "^1.4.0",
- "webpack": "^5.90.0"
+ "webpack": "^5.90.2"
}
}
diff --git a/public/css/build/app.css b/public/css/build/app.css
index beafe6ce40..346d17981e 100644
Binary files a/public/css/build/app.css and b/public/css/build/app.css differ
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index 7257ad899c..867998daad 100644
Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index c7c0046ac7..b294ed2646 100644
Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ
diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js
index 5b33a61bdd..3ca925451f 100644
Binary files a/public/js/dist/bootstrap-table.js and b/public/js/dist/bootstrap-table.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index bf09fcf05d..fe0f7f3c27 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -2,8 +2,8 @@
"/js/build/app.js": "/js/build/app.js?id=a05df3d0d95cb1cb86b26e858563009f",
"/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=b9a74ec0cd68f83e7480d5ae39919beb",
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=392cc93cfc0be0349bab9697669dd091",
- "/css/build/overrides.css": "/css/build/overrides.css?id=77475bffdab35fb2cd9ebbcd3ebe6dd6",
- "/css/build/app.css": "/css/build/app.css?id=7cc9ef2d080c39e4b940df85f68fdf1b",
+ "/css/build/overrides.css": "/css/build/overrides.css?id=5276161c4e09d905ece0419d16151cbf",
+ "/css/build/app.css": "/css/build/app.css?id=dde7b2ff6869386f242010a9056c9705",
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=a67bd93bed52e6a29967fe472de66d6c",
"/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=268041e902b019730c23ee3875838005",
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=d409d9b1a3b69247df8b98941ba06e33",
@@ -18,7 +18,7 @@
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=0ed42b67f9b02a74815e885bfd9e3f66",
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=b48f4d8af0e1ca5621c161e93951109f",
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=f0fbbb0ac729ea092578fb05ca615460",
- "/css/dist/all.css": "/css/dist/all.css?id=a413275c9c27dbbb0aa60a5a5d81ec74",
+ "/css/dist/all.css": "/css/dist/all.css?id=bd339274b6efdcb815615927d1e734cd",
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
"/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=69e5d8e4e818f05fd882cceb758d1eba",
@@ -29,9 +29,9 @@
"/css/webfonts/fa-solid-900.woff2": "/css/webfonts/fa-solid-900.woff2?id=a0feb384c3c6071947a49708f2b0bc85",
"/css/webfonts/fa-v4compatibility.ttf": "/css/webfonts/fa-v4compatibility.ttf?id=e24ec0b8661f7fa333b29444df39e399",
"/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=e11465c0eff0549edd4e8ea6bbcf242f",
- "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=afa255bf30b2a7c11a97e3165128d183",
+ "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=99c395f0bab5966f32f63f4e55899e64",
"/js/build/vendor.js": "/js/build/vendor.js?id=db2e005808d5a2d2e7f4a82059e5d16f",
- "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=29340c70d13855fa0165cd4d799c6f5b",
+ "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=857da5daffd13e0553510e5ccd410c79",
"/js/dist/all.js": "/js/dist/all.js?id=5f4bdd1b17a98eb4b59085823cf63972",
"/js/dist/all-defer.js": "/js/dist/all-defer.js?id=19ccc62a8f1ea103dede4808837384d4",
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=b48f4d8af0e1ca5621c161e93951109f",
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 5e16953427..f651826ddb 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -887,4 +887,7 @@ input[type="radio"]:checked::before {
.separator:not(:empty)::after {
margin-left: .25em;
+}
+.datepicker.dropdown-menu {
+ z-index: 1030 !important;
}
\ No newline at end of file
diff --git a/resources/lang/aa-ER/admin/hardware/message.php b/resources/lang/aa-ER/admin/hardware/message.php
index f633f942c8..1f152c8cac 100644
--- a/resources/lang/aa-ER/admin/hardware/message.php
+++ b/resources/lang/aa-ER/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'crwdns745:0crwdne745:0',
'nothing_updated' => 'crwdns1186:0crwdne1186:0',
'no_assets_selected' => 'crwdns6810:0crwdne6810:0',
+ 'assets_do_not_exist_or_are_invalid' => 'crwdns12132:0crwdne12132:0',
],
'restore' => [
diff --git a/resources/lang/aa-ER/admin/settings/general.php b/resources/lang/aa-ER/admin/settings/general.php
index 6997c6ba83..cd858068bc 100644
--- a/resources/lang/aa-ER/admin/settings/general.php
+++ b/resources/lang/aa-ER/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'crwdns1778:0crwdne1778:0',
'two_factor_enabled_text' => 'crwdns1779:0crwdne1779:0',
'two_factor_reset' => 'crwdns1780:0crwdne1780:0',
- 'two_factor_reset_help' => 'crwdns1781:0crwdne1781:0',
+ 'two_factor_reset_help' => 'crwdns12150:0crwdne12150:0',
'two_factor_reset_success' => 'crwdns1782:0crwdne1782:0',
'two_factor_reset_error' => 'crwdns1783:0crwdne1783:0',
'two_factor_enabled_warning' => 'crwdns1784:0crwdne1784:0',
diff --git a/resources/lang/aa-ER/general.php b/resources/lang/aa-ER/general.php
index 292c6896de..ec3f1a9968 100644
--- a/resources/lang/aa-ER/general.php
+++ b/resources/lang/aa-ER/general.php
@@ -1,6 +1,7 @@
'crwdns12148:0crwdne12148:0',
'accessories' => 'crwdns1200:0crwdne1200:0',
'activated' => 'crwdns1540:0crwdne1540:0',
'accepted_date' => 'crwdns11295:0crwdne11295:0',
@@ -201,6 +202,7 @@ return [
'new_password' => 'crwdns6141:0crwdne6141:0',
'next' => 'crwdns1275:0crwdne1275:0',
'next_audit_date' => 'crwdns1919:0crwdne1919:0',
+ 'no_email' => 'crwdns12130:0crwdne12130:0',
'last_audit' => 'crwdns1920:0crwdne1920:0',
'new' => 'crwdns1668:0crwdne1668:0',
'no_depreciation' => 'crwdns1073:0crwdne1073:0',
@@ -517,4 +519,13 @@ return [
],
'no_requestable' => 'crwdns12128:0crwdne12128:0',
+ 'countable' => [
+ 'accessories' => 'crwdns12136:0crwdne12136:0',
+ 'assets' => 'crwdns12138:0crwdne12138:0',
+ 'licenses' => 'crwdns12140:0crwdne12140:0',
+ 'license_seats' => 'crwdns12142:0crwdne12142:0',
+ 'consumables' => 'crwdns12144:0crwdne12144:0',
+ 'components' => 'crwdns12146:0crwdne12146:0',
+ ]
+
];
diff --git a/resources/lang/aa-ER/localizations.php b/resources/lang/aa-ER/localizations.php
index 7da17ae8aa..0e695f7a75 100644
--- a/resources/lang/aa-ER/localizations.php
+++ b/resources/lang/aa-ER/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'crwdns10642:0crwdne10642:0',
'sk-SK'=> 'crwdns12002:0crwdne12002:0',
'sl-SI'=> 'crwdns12004:0crwdne12004:0',
+ 'so-SO'=> 'crwdns12134:0crwdne12134:0',
'es-ES'=> 'crwdns10646:0crwdne10646:0',
'es-CO'=> 'crwdns10648:0crwdne10648:0',
'es-MX'=> 'crwdns10650:0crwdne10650:0',
diff --git a/resources/lang/aa-ER/validation.php b/resources/lang/aa-ER/validation.php
index 3fd034cbcd..a932f8e92a 100644
--- a/resources/lang/aa-ER/validation.php
+++ b/resources/lang/aa-ER/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'crwdns6796:0crwdne6796:0'
],
+ 'checkboxes' => 'crwdns12152:0crwdne12152:0',
+ 'radio_buttons' => 'crwdns12154:0crwdne12154:0',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'crwdns12156:0crwdne12156:0',
];
diff --git a/resources/lang/af-ZA/admin/hardware/message.php b/resources/lang/af-ZA/admin/hardware/message.php
index 7706f51a98..b7edd208a9 100644
--- a/resources/lang/af-ZA/admin/hardware/message.php
+++ b/resources/lang/af-ZA/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Bate is suksesvol opgedateer.',
'nothing_updated' => 'Geen velde is gekies nie, dus niks is opgedateer nie.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/af-ZA/admin/settings/general.php b/resources/lang/af-ZA/admin/settings/general.php
index 2fbddc5055..1f22421c2c 100644
--- a/resources/lang/af-ZA/admin/settings/general.php
+++ b/resources/lang/af-ZA/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Twee-faktorinskrywing',
'two_factor_enabled_text' => 'Aktiveer twee faktore',
'two_factor_reset' => 'Herstel twee-faktor geheim',
- 'two_factor_reset_help' => 'Dit sal die gebruiker dwing om hul toestel weer met Google Authenticator in te skryf. Dit kan handig wees as hul toestel wat tans ingeskryf is, verlore of gesteel is.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Twee faktor toestel suksesvol herstel',
'two_factor_reset_error' => 'Twee faktor toestel herstel het misluk',
'two_factor_enabled_warning' => 'As jy twee faktore aktiveer as dit nie tans geaktiveer is nie, sal dit jou dadelik dwing om te verifieer met \'n Google Auth-ingeskrewe toestel. Jy sal die vermoë hê om jou toestel in te skryf as een nie tans ingeskryf is nie.',
diff --git a/resources/lang/af-ZA/general.php b/resources/lang/af-ZA/general.php
index 0a12f0e97f..e168381d4d 100644
--- a/resources/lang/af-ZA/general.php
+++ b/resources/lang/af-ZA/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'bykomstighede',
'activated' => 'geaktiveer',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'volgende',
'next_audit_date' => 'Volgende ouditdatum',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Laaste Oudit',
'new' => 'nuwe!',
'no_depreciation' => 'Geen Waardevermindering',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/af-ZA/localizations.php b/resources/lang/af-ZA/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/af-ZA/localizations.php
+++ b/resources/lang/af-ZA/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/af-ZA/validation.php b/resources/lang/af-ZA/validation.php
index fadb10c6ed..2a12ea3ae8 100644
--- a/resources/lang/af-ZA/validation.php
+++ b/resources/lang/af-ZA/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/am-ET/admin/hardware/message.php b/resources/lang/am-ET/admin/hardware/message.php
index 056692998e..bf050ef974 100644
--- a/resources/lang/am-ET/admin/hardware/message.php
+++ b/resources/lang/am-ET/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset updated successfully.',
'nothing_updated' => 'No fields were selected, so nothing was updated.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/am-ET/admin/settings/general.php b/resources/lang/am-ET/admin/settings/general.php
index 33cfd7b416..71fb8eb2c6 100644
--- a/resources/lang/am-ET/admin/settings/general.php
+++ b/resources/lang/am-ET/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/am-ET/general.php b/resources/lang/am-ET/general.php
index 34327efd31..c793b84ccb 100644
--- a/resources/lang/am-ET/general.php
+++ b/resources/lang/am-ET/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'መለዋወጫዎች',
'activated' => 'Activated',
'accepted_date' => 'የተቀበለበት ቀን',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Next',
'next_audit_date' => 'Next Audit Date',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/am-ET/localizations.php b/resources/lang/am-ET/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/am-ET/localizations.php
+++ b/resources/lang/am-ET/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/am-ET/validation.php b/resources/lang/am-ET/validation.php
index 1c6ad8a148..05374e23af 100644
--- a/resources/lang/am-ET/validation.php
+++ b/resources/lang/am-ET/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/ar-SA/admin/hardware/message.php b/resources/lang/ar-SA/admin/hardware/message.php
index 35dd744145..c3ce467eed 100644
--- a/resources/lang/ar-SA/admin/hardware/message.php
+++ b/resources/lang/ar-SA/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'تم تحديث الأصل بنجاح.',
'nothing_updated' => 'لم يتم اختيار أي حقول، لذلك لم يتم تحديث أي شيء.',
'no_assets_selected' => 'لم يتم اختيار أي أصول، لذلك لم يتم تحديث أي شيء.',
+ 'assets_do_not_exist_or_are_invalid' => 'لا يمكن تحديث الأصول المحددة.',
],
'restore' => [
diff --git a/resources/lang/ar-SA/admin/settings/general.php b/resources/lang/ar-SA/admin/settings/general.php
index 671469ee12..6f551b2c4f 100644
--- a/resources/lang/ar-SA/admin/settings/general.php
+++ b/resources/lang/ar-SA/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'اثنان عامل التسجيل',
'two_factor_enabled_text' => 'تمكين عاملين',
'two_factor_reset' => 'إعادة تعيين سر عاملين',
- 'two_factor_reset_help' => 'سيؤدي هذا إلى إجبار المستخدم على تسجيل أجهزته باستخدام أداة مصادقة غوغل مرة أخرى. ويمكن أن يكون ذلك مفيدا إذا فقدت أو سرقت الجهاز المسجل حاليا.',
+ 'two_factor_reset_help' => 'سيؤدي هذا إلى إجبار المستخدم على تسجيل جهازه مع تطبيق المصادقة الخاص به مرة أخرى. ويمكن أن يكون هذا مفيداً إذا فقدت أو سرقت جهازهم المسجل حالياً. ',
'two_factor_reset_success' => 'جهاز عاملين إعادة تعيين بنجاح',
'two_factor_reset_error' => 'أخفق إعادة تعيين عامل عامل اثنين',
'two_factor_enabled_warning' => 'سيؤدي تمكين عاملين إذا لم يتم تمكينه حاليا إلى إجبارك فورا على المصادقة باستخدام جهاز مسجل في غوغل أوث. سيكون لديك القدرة على تسجيل جهازك إذا كان أحد غير مسجل حاليا.',
diff --git a/resources/lang/ar-SA/general.php b/resources/lang/ar-SA/general.php
index e9e97eaf4e..21098a2c4d 100644
--- a/resources/lang/ar-SA/general.php
+++ b/resources/lang/ar-SA/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'ملحقات',
'activated' => 'مفعل',
'accepted_date' => 'تم تخزين التاريخ',
@@ -201,6 +202,7 @@ return [
'new_password' => 'كلمة المرور الجديدة',
'next' => 'التالى',
'next_audit_date' => 'تاريخ التدقيق التالي',
+ 'no_email' => 'لا يوجد عنوان بريد إلكتروني مرتبط بهذا المستخدم',
'last_audit' => 'آخر مراجعة',
'new' => 'الجديد!',
'no_depreciation' => 'لا يوجد إستهلاك',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'لا توجد أصول أو نماذج للأصول التي يمكن طلبها.',
+ 'countable' => [
+ 'accessories' => ':count ملحقات :count ملحقات',
+ 'assets' => ':count أصول :count أصول',
+ 'licenses' => ':count ترخيص :count تراخيص',
+ 'license_seats' => ':count مقاعد الرخصة Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored. Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date. Качи CSV файл, който съдържа историята на активите. Активите и потребителите ТРЯБВА да ги има създадени в системата в противен слуай няма да се импортират. При импортиране на историята на активите, съвпадението се прави по техния инвентарен номер. Ще се опитаме да намерим потребителя на база неговото потребителско име и критерия който сте избрали по-долу. Ще се опита да намери съвпадение по формата на потребителско име избран в Полетата включени в CSV файла, трябва да съвпадат с Инвентарен номер, Име, Дата на изписване, Дата на вписване. Всякакви допълнителни полета ще бъдат игнорирани. Празна дата на вписване или дата в бъдещето ще изпише актива към асоцийрания потребител. Ако не се включи колона с дата на вписване, същата ще бъде създадена със текущата дата. Wybierz pola, które chcesz uwzględnić w raporcie niestandardowym, i kliknij Generuj. Plik (custom-asset-report-RRRR-mm-dd.csv) zostanie pobrany automatycznie i będzie można go otworzyć w programie Excel. Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored. Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.Admin > General Settings
.jane.smith
) format',
- 'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith
) format',
- 'csv_import_match_first' => 'Try to match users by first name (jane
) format',
- 'csv_import_match_email' => 'Try to match users by email as username',
- 'csv_import_match_username' => 'Try to match users by username',
+ 'import_text' => 'Admin > General Settings
.Иван.Иванов
)',
+ 'csv_import_match_initial_last' => 'Опитай да намериш съвпадение на потребителите по Първа буква, Фамилия (ииванов
)',
+ 'csv_import_match_first' => 'Опитай да намериш съвпадение на потребителите по Име (Иван
)',
+ 'csv_import_match_email' => 'Опитай да намериш съвпадение на потребителите по email, като потребителско име',
+ 'csv_import_match_username' => 'Опитай да намериш съвпадение на потребителите по потребителско име',
'error_messages' => 'Съобщение за грешка:',
'success_messages' => 'Успешно:',
'alert_details' => 'Детайли.',
diff --git a/resources/lang/bg-BG/admin/hardware/message.php b/resources/lang/bg-BG/admin/hardware/message.php
index ee4a45ee3a..63af63ba88 100644
--- a/resources/lang/bg-BG/admin/hardware/message.php
+++ b/resources/lang/bg-BG/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Активът обновен успешно.',
'nothing_updated' => 'Няма избрани полета, съответно нищо не беше обновено.',
'no_assets_selected' => 'Няма избрани активи, така че нищо не бе обновено.',
+ 'assets_do_not_exist_or_are_invalid' => 'Избраните активи не могат да се обновят.',
],
'restore' => [
diff --git a/resources/lang/bg-BG/admin/licenses/general.php b/resources/lang/bg-BG/admin/licenses/general.php
index 2cd4cc645e..126220342d 100644
--- a/resources/lang/bg-BG/admin/licenses/general.php
+++ b/resources/lang/bg-BG/admin/licenses/general.php
@@ -46,6 +46,6 @@ return array(
],
],
- 'below_threshold' => 'There are only :remaining_count seats left for this license with a minimum quantity of :min_amt. You may want to consider purchasing more seats.',
- 'below_threshold_short' => 'This item is below the minimum required quantity.',
+ 'below_threshold' => 'Има само :remaining_count лиценз(а) останали от този лиценз с минимално количество от :min_amt. Може да желаете да поръчате допълнително.',
+ 'below_threshold_short' => 'Този артикул е под минималното необходимо количество.',
);
diff --git a/resources/lang/bg-BG/admin/settings/general.php b/resources/lang/bg-BG/admin/settings/general.php
index 008322676d..ec071c9398 100644
--- a/resources/lang/bg-BG/admin/settings/general.php
+++ b/resources/lang/bg-BG/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Двуфакторово записване',
'two_factor_enabled_text' => 'Разреши два фактор',
'two_factor_reset' => 'Нулиране на двуфакторова тайна',
- 'two_factor_reset_help' => 'Това ще принуди потребителя да запише своето устройство с Google Authenticator отново. Това може да бъде полезно ако записаните понастоящем устройства са изгубени или откраднати.',
+ 'two_factor_reset_help' => 'Това ще принуди потребителя да запише своето устройство с Authenticator отново. Това може да бъде полезно, ако записаните понастоящем устройства са изгубени или откраднати. ',
'two_factor_reset_success' => 'Двуфакторово устройство нулирано успешно',
'two_factor_reset_error' => 'Нулирането на двуфакторово устройство беше неуспешно',
'two_factor_enabled_warning' => 'Разрешаване на два-фактора ако не са разрешени в момента, ще ви принуди незабавно да се удостоверите с устройство записано в Google Auth. Ще имате възможността да запишете устройството си ако нямате такова.',
diff --git a/resources/lang/bg-BG/general.php b/resources/lang/bg-BG/general.php
index a793228492..c68a356d18 100644
--- a/resources/lang/bg-BG/general.php
+++ b/resources/lang/bg-BG/general.php
@@ -1,6 +1,7 @@
'2FA нулиране',
'accessories' => 'Аксесоари',
'activated' => 'Активирано',
'accepted_date' => 'Дата на приемане',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Нова парола',
'next' => 'Следващ',
'next_audit_date' => 'Следваща дата на одита',
+ 'no_email' => 'Няма е-майл адрес към този потребител',
'last_audit' => 'Последният одит',
'new' => 'new!',
'no_depreciation' => 'Без амортизация',
@@ -516,6 +518,15 @@ return [
'partial' => 'Изтрити :success_count :object_type, но :error_count :object_type не можаха да се изтрият',
],
],
- 'no_requestable' => 'There are no requestable assets or asset models.',
+ 'no_requestable' => 'Няма активи или модели, които могат да бъдат изисквани.',
+
+ 'countable' => [
+ 'accessories' => ':count Аксесоар|:count Аксесоари',
+ 'assets' => ':count Актив|:count Активи',
+ 'licenses' => ':count Лиценз|:count Лицензи',
+ 'license_seats' => ':count Лицензно място|:count Лицензни места',
+ 'consumables' => ':count Консуматив|:count Консумативи',
+ 'components' => ':count Компонент|:count Компоненти',
+ ]
];
diff --git a/resources/lang/bg-BG/localizations.php b/resources/lang/bg-BG/localizations.php
index c7496f5f97..359139bd87 100644
--- a/resources/lang/bg-BG/localizations.php
+++ b/resources/lang/bg-BG/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/bg-BG/validation.php b/resources/lang/bg-BG/validation.php
index 9a0a389e5d..6004b5dd0e 100644
--- a/resources/lang/bg-BG/validation.php
+++ b/resources/lang/bg-BG/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Стойността не може да бъде отрицателна'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/ca-ES/admin/hardware/message.php b/resources/lang/ca-ES/admin/hardware/message.php
index 056692998e..bf050ef974 100644
--- a/resources/lang/ca-ES/admin/hardware/message.php
+++ b/resources/lang/ca-ES/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset updated successfully.',
'nothing_updated' => 'No fields were selected, so nothing was updated.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/ca-ES/admin/settings/general.php b/resources/lang/ca-ES/admin/settings/general.php
index 33cfd7b416..71fb8eb2c6 100644
--- a/resources/lang/ca-ES/admin/settings/general.php
+++ b/resources/lang/ca-ES/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/ca-ES/general.php b/resources/lang/ca-ES/general.php
index 6e5553d6e9..f9511fa92c 100644
--- a/resources/lang/ca-ES/general.php
+++ b/resources/lang/ca-ES/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessoris',
'activated' => 'Activat',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Next',
'next_audit_date' => 'Next Audit Date',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/ca-ES/localizations.php b/resources/lang/ca-ES/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/ca-ES/localizations.php
+++ b/resources/lang/ca-ES/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/ca-ES/validation.php b/resources/lang/ca-ES/validation.php
index 1c6ad8a148..05374e23af 100644
--- a/resources/lang/ca-ES/validation.php
+++ b/resources/lang/ca-ES/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/cs-CZ/admin/hardware/message.php b/resources/lang/cs-CZ/admin/hardware/message.php
index 473de58cda..6b707aac51 100644
--- a/resources/lang/cs-CZ/admin/hardware/message.php
+++ b/resources/lang/cs-CZ/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Majetek úspěšně aktualizován.',
'nothing_updated' => 'Nebyla zvolena žádná pole, nic se tedy neupravilo.',
'no_assets_selected' => 'Nebyl zvolen žádný majetek, nic se tedy neupravilo.',
+ 'assets_do_not_exist_or_are_invalid' => 'Vybrané položky nelze aktualizovat.',
],
'restore' => [
diff --git a/resources/lang/cs-CZ/admin/settings/general.php b/resources/lang/cs-CZ/admin/settings/general.php
index 7c87c2be79..72d7dec9cb 100644
--- a/resources/lang/cs-CZ/admin/settings/general.php
+++ b/resources/lang/cs-CZ/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Dvojfaktorový zápis',
'two_factor_enabled_text' => 'Povolit Dvoufaktorové ověření',
'two_factor_reset' => 'Resetovat dvou faktorové tajemství',
- 'two_factor_reset_help' => 'Tímto bude uživatel přinucen, aby znovu zaregistroval své zařízení pomocí aplikace Google Authenticator. To může být užitečné, pokud ztratil nebo mu bylo odcizeno jeho aktuálně zapsané zařízení. ',
+ 'two_factor_reset_help' => 'To uživatele donutí znovu zapsat své zařízení do svého autentizátoru aplikací. To může být užitečné, pokud je jejich aktuálně zapsané zařízení ztraceno nebo odcizeno. ',
'two_factor_reset_success' => 'Resetování dvoufaktorového zařízení bylo úspěšné',
'two_factor_reset_error' => 'Resetování dvoufaktorového zařízení selhalo',
'two_factor_enabled_warning' => 'Povolení dvoufaktorového zabezpečení, pokud již není v současné době povoleno vás okamžitě donutí k ověření pomocí zařízení zapsaného v Google Auth. Pokud není v současné době žádné registrován. Budete mít možnost zapsat svoje zařízení.',
diff --git a/resources/lang/cs-CZ/general.php b/resources/lang/cs-CZ/general.php
index 164bc9f857..0c42a014e8 100644
--- a/resources/lang/cs-CZ/general.php
+++ b/resources/lang/cs-CZ/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Příslušenství',
'activated' => 'Aktivováno',
'accepted_date' => 'Datum přijetí',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nové heslo',
'next' => 'Další',
'next_audit_date' => 'Další datum auditu',
+ 'no_email' => 'K tomuto uživateli není přiřazena žádná e-mailová adresa',
'last_audit' => 'Poslední audit',
'new' => 'nový!',
'no_depreciation' => 'Žádná amortizace',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Neexistují žádné požadované položky nebo modely aktiv.',
+ 'countable' => [
+ 'accessories' => ':count Příslušenství |:count Příslušenství',
+ 'assets' => ':count majetek|:count majetku',
+ 'licenses' => ':count licence|:count licence',
+ 'license_seats' => ':count sídlo licence|:count licenční místa',
+ 'consumables' => ':count Spotřební materiál|:count Spotřební materiál',
+ 'components' => ':count komponenta|:count komponenty',
+ ]
+
];
diff --git a/resources/lang/cs-CZ/localizations.php b/resources/lang/cs-CZ/localizations.php
index 879ebf8c67..87e9750980 100644
--- a/resources/lang/cs-CZ/localizations.php
+++ b/resources/lang/cs-CZ/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovenština',
'sl-SI'=> 'Slovinština',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Španělština',
'es-CO'=> 'Španělština, Kolumbie',
'es-MX'=> 'Španělština, Mexiko',
diff --git a/resources/lang/cs-CZ/validation.php b/resources/lang/cs-CZ/validation.php
index 6b4f0a6a8f..92c41a0c07 100644
--- a/resources/lang/cs-CZ/validation.php
+++ b/resources/lang/cs-CZ/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Hodnota nemůže být záporná'
],
+ 'checkboxes' => ':attribute obsahuje neplatné možnosti.',
+ 'radio_buttons' => ':attribute je neplatný.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Neplatná hodnota zahrnutá v tomto poli',
];
diff --git a/resources/lang/cy-GB/admin/hardware/message.php b/resources/lang/cy-GB/admin/hardware/message.php
index 891f0e76bd..df3e677d9c 100644
--- a/resources/lang/cy-GB/admin/hardware/message.php
+++ b/resources/lang/cy-GB/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Ased wedi diweddaru\'n llwyddiannus.',
'nothing_updated' => 'Dim newid mewn manylder, felly dim byd wedi\'i diweddaru.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/cy-GB/admin/settings/general.php b/resources/lang/cy-GB/admin/settings/general.php
index 883b3e88de..ec432ed118 100644
--- a/resources/lang/cy-GB/admin/settings/general.php
+++ b/resources/lang/cy-GB/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Ymrestru dau factor',
'two_factor_enabled_text' => 'Alluogi dwy factor',
'two_factor_reset' => 'Ailosod cyfrinair dwy factor',
- 'two_factor_reset_help' => 'Wneith hyn gorfodi defnyddiwr i ail ymrestru eu dyfais hefo Google Authenticator. Ellith hyn fod yn fuddiol os ydi\'r dyfais sydd wedi ymrestru yn cael ei ddwyn neu golli. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Dyfais dwy factor wedi\'i ail osod yn llwyddiannus',
'two_factor_reset_error' => 'Wedi methu ailosod dyfais dilysaint dau-factor',
'two_factor_enabled_warning' => 'Bydd galluogi dau ffactor os nad yw wedi\'i alluogi ar hyn o bryd yn eich gorfodi ar unwaith i ddilysu gyda dyfais sydd wedi\'i chofrestru gan Google Auth. Bydd gennych y gallu i gofrestru\'ch dyfais os nad yw un wedi\'i gofrestru ar hyn o bryd.',
diff --git a/resources/lang/cy-GB/general.php b/resources/lang/cy-GB/general.php
index bff6ef4b67..cf2b8a06cc 100644
--- a/resources/lang/cy-GB/general.php
+++ b/resources/lang/cy-GB/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Ategolion',
'activated' => 'Actifadu',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Nesaf',
'next_audit_date' => 'Dyddiad awdit nesaf',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Awdit diwethaf',
'new' => 'newydd!',
'no_depreciation' => 'Dim Dibrisiant',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/cy-GB/localizations.php b/resources/lang/cy-GB/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/cy-GB/localizations.php
+++ b/resources/lang/cy-GB/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/cy-GB/validation.php b/resources/lang/cy-GB/validation.php
index 6b74e67802..14ee3535de 100644
--- a/resources/lang/cy-GB/validation.php
+++ b/resources/lang/cy-GB/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/da-DK/admin/hardware/message.php b/resources/lang/da-DK/admin/hardware/message.php
index 840409721f..fe629998a4 100644
--- a/resources/lang/da-DK/admin/hardware/message.php
+++ b/resources/lang/da-DK/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Asset opdateret med succes.',
'nothing_updated' => 'Ingen felter blev valgt, så intet blev opdateret.',
'no_assets_selected' => 'Ingen aktiver blev valgt, så intet blev opdateret.',
+ 'assets_do_not_exist_or_are_invalid' => 'Valgte aktiver kan ikke opdateres.',
],
'restore' => [
diff --git a/resources/lang/da-DK/admin/settings/general.php b/resources/lang/da-DK/admin/settings/general.php
index a0fe717ac8..03373bfd13 100644
--- a/resources/lang/da-DK/admin/settings/general.php
+++ b/resources/lang/da-DK/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Aktivér to faktorer',
'two_factor_reset' => 'Reset 2-Factor Secret',
- 'two_factor_reset_help' => 'Dette vil tvinge brugeren til at tilmelde deres enhed med Google Authenticator igen. Dette kan være nyttigt, hvis deres tilmeldte enhed er tabt eller stjålet.',
+ 'two_factor_reset_help' => 'Dette vil tvinge brugeren til at tilmelde deres enhed med deres autentificerings-app igen. Dette kan være nyttigt, hvis deres aktuelt tilmeldte enhed er tabt eller stjålet. ',
'two_factor_reset_success' => 'To faktor enhed nulstilles',
'two_factor_reset_error' => 'To-faktor enhed reset mislykkedes',
'two_factor_enabled_warning' => 'Aktivering af to-faktor, hvis den ikke er aktiveret, vil straks tvinge dig til at godkende med en Google Auth-indskrevet enhed. Du vil have mulighed for at tilmelde din enhed, hvis en ikke er indskrevet på nuværende tidspunkt.',
diff --git a/resources/lang/da-DK/general.php b/resources/lang/da-DK/general.php
index cea54503e1..2a000db42f 100644
--- a/resources/lang/da-DK/general.php
+++ b/resources/lang/da-DK/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Tilbehør',
'activated' => 'Aktiveret',
'accepted_date' => 'Dato accepteret',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Ny adgangskode',
'next' => 'Næste',
'next_audit_date' => 'Næste revisionsdato',
+ 'no_email' => 'Ingen e-mailadresse tilknyttet denne bruger',
'last_audit' => 'Seneste revision',
'new' => 'ny!',
'no_depreciation' => 'Ingen Afskrivning',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Der er ingen requestable aktiver eller asset-modeller.',
+ 'countable' => [
+ 'accessories' => ':count Tilbehør:count Tilbehør',
+ 'assets' => ':count Aktiver:count Aktiver',
+ 'licenses' => ':count Licens :count Licenser',
+ 'license_seats' => ':count Licenssæde:count Licenssæder',
+ 'consumables' => ':count Forbrugsparti:count Forbrugsvarer',
+ 'components' => ':count Komponent:count Komponenter',
+ ]
+
];
diff --git a/resources/lang/da-DK/localizations.php b/resources/lang/da-DK/localizations.php
index e0adeab985..755faba880 100644
--- a/resources/lang/da-DK/localizations.php
+++ b/resources/lang/da-DK/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbisk (latin)',
'sk-SK'=> 'Slovakisk',
'sl-SI'=> 'Slovensk',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spansk',
'es-CO'=> 'Spansk (Colombia)',
'es-MX'=> 'Spansk (Mexico)',
diff --git a/resources/lang/da-DK/validation.php b/resources/lang/da-DK/validation.php
index 8dedf30405..f1b5a5cf99 100644
--- a/resources/lang/da-DK/validation.php
+++ b/resources/lang/da-DK/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Værdien må ikke være negativ'
],
+ 'checkboxes' => ':attribute indeholder ugyldige indstillinger.',
+ 'radio_buttons' => ':attribute er ugyldig.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Ugyldig værdi inkluderet i dette felt',
];
diff --git a/resources/lang/de-DE/admin/hardware/message.php b/resources/lang/de-DE/admin/hardware/message.php
index b4f925f8ec..c727b68bb9 100644
--- a/resources/lang/de-DE/admin/hardware/message.php
+++ b/resources/lang/de-DE/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset wurde erfolgreich aktualisiert.',
'nothing_updated' => 'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.',
'no_assets_selected' => 'Es wurden keine Assets ausgewählt, somit wurde auch nichts aktualisiert.',
+ 'assets_do_not_exist_or_are_invalid' => 'Ausgewählte Assets können nicht aktualisiert werden.',
],
'restore' => [
diff --git a/resources/lang/de-DE/admin/settings/general.php b/resources/lang/de-DE/admin/settings/general.php
index 1dbb856d01..58f8970049 100644
--- a/resources/lang/de-DE/admin/settings/general.php
+++ b/resources/lang/de-DE/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Zwei-Faktor Registrierung',
'two_factor_enabled_text' => 'Zwei-Faktor-Authentifizierung aktivieren',
'two_factor_reset' => 'Zwei-Faktor-Geheimnis zurücksetzen',
- 'two_factor_reset_help' => 'Dies zwingt den Benutzer sein Gerät mit der Google Authenticator App erneut zu registrieren. Dies kann nützlich sein, wenn das aktuell registrierte Gerät verloren ging oder gestohlen wurde. ',
+ 'two_factor_reset_help' => 'Dies zwingt den Nutzer dazu, sein Gerät erneut mit seiner Authentifizierungs-App zu registrieren. Dies kann nützlich sein, falls das derzeit registrierte Gerät verloren gegangen oder gestohlen wurde. ',
'two_factor_reset_success' => 'Zwei-Faktor-Gerät erfolgreich zurückgesetzt',
'two_factor_reset_error' => 'Zwei-Faktor-Gerät zurücksetzen fehlgeschlagen',
'two_factor_enabled_warning' => 'Die Aktivierung der Zwei-Faktor-Authentifizierung bewirkt, dass Sie sich sofort mit einem bei der Google Authenticator App registrierten Gerät authentifizieren müssen. Sie haben die Möglichkeit ihr Gerät hinzuzufügen falls derzeit keines registriert ist.',
diff --git a/resources/lang/de-DE/general.php b/resources/lang/de-DE/general.php
index 78a88ed556..400fcef4ff 100644
--- a/resources/lang/de-DE/general.php
+++ b/resources/lang/de-DE/general.php
@@ -1,6 +1,7 @@
'Zurücksetzen der Zwei-Faktor-Authentifizierung',
'accessories' => 'Zubehör',
'activated' => 'Aktiviert',
'accepted_date' => 'Datum akzeptiert',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Neues Passwort',
'next' => 'Nächste',
'next_audit_date' => 'Nächstes Prüfungsdatum',
+ 'no_email' => 'Es ist keine E-Mail-Adresse mit diesem Benutzer verknüpft',
'last_audit' => 'Letzte Prüfung',
'new' => 'Neu!',
'no_depreciation' => 'Nicht abschreiben',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Es gibt keine anforderbaren Assets oder Asset-Modelle.',
+ 'countable' => [
+ 'accessories' => ':count Zubehör|:count Zubehöre',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count Lizenz|:count Lizenzen',
+ 'license_seats' => ':count Lizenzplatz|:count Lizenzplätze',
+ 'consumables' => ':count Verbrauchsmaterial|:count Verbrauchsmaterialien',
+ 'components' => ':count Komponente|:count Komponenten',
+ ]
+
];
diff --git a/resources/lang/de-DE/localizations.php b/resources/lang/de-DE/localizations.php
index 1ce5ce24c9..e261e982f2 100644
--- a/resources/lang/de-DE/localizations.php
+++ b/resources/lang/de-DE/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbisch (Lateinisch)',
'sk-SK'=> 'Slowakisch',
'sl-SI'=> 'Slowenisch',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanisch, Kolumbien',
'es-MX'=> 'Spanisch, Mexiko',
diff --git a/resources/lang/de-DE/validation.php b/resources/lang/de-DE/validation.php
index 247d3c5d15..11c7a92347 100644
--- a/resources/lang/de-DE/validation.php
+++ b/resources/lang/de-DE/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Wert darf nicht negativ sein'
],
+ 'checkboxes' => ':attribute enthält ungültige Optionen.',
+ 'radio_buttons' => ':attribute ist ungültig.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Ungültiger Wert in diesem Feld enthalten',
];
diff --git a/resources/lang/de-if/admin/hardware/message.php b/resources/lang/de-if/admin/hardware/message.php
index 7bc5c5ac09..046e949bb8 100644
--- a/resources/lang/de-if/admin/hardware/message.php
+++ b/resources/lang/de-if/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset wurde erfolgreich aktualisiert.',
'nothing_updated' => 'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.',
'no_assets_selected' => 'Es wurden keine Assets ausgewählt, somit wurde auch nichts aktualisiert.',
+ 'assets_do_not_exist_or_are_invalid' => 'Ausgewählte Assets können nicht aktualisiert werden.',
],
'restore' => [
diff --git a/resources/lang/de-if/admin/settings/general.php b/resources/lang/de-if/admin/settings/general.php
index ebd1286175..85da3988f0 100644
--- a/resources/lang/de-if/admin/settings/general.php
+++ b/resources/lang/de-if/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Zwei-Faktor-Anmeldung',
'two_factor_enabled_text' => 'Zwei-Faktor-Authentifizierung aktivieren',
'two_factor_reset' => 'Zwei-Faktor-Geheimnis zurücksetzen',
- 'two_factor_reset_help' => 'Dies zwingt den Benutzer, sein Gerät erneut mit Google Authenticator zu registrieren. Dies kann nützlich sein, wenn das derzeit registrierte Gerät verloren geht oder gestohlen wurde. ',
+ 'two_factor_reset_help' => 'Dies zwingt den Benutzer, sein Gerät erneut mit seiner Authentifizierungs-App zu registrieren. Dies kann nützlich sein, wenn ihr derzeit angemeldetes Gerät verloren geht oder gestohlen wird. ',
'two_factor_reset_success' => 'Zwei-Faktor-Gerät erfolgreich zurückgesetzt',
'two_factor_reset_error' => 'Zwei-Faktor-Gerät zurücksetzen ist fehlgeschlagen',
'two_factor_enabled_warning' => 'Die Aktivierung der Zwei-Faktor-Authentifizierung bewirkt, dass Du Dich sofort mit einem bei Google Authenticator registrierten Gerät authentifizieren musst. Du hast die Möglichkeit, Dein Gerät hinzuzufügen, falls derzeit keines registriert ist.',
diff --git a/resources/lang/de-if/general.php b/resources/lang/de-if/general.php
index 8eb0552942..ab5377fefc 100644
--- a/resources/lang/de-if/general.php
+++ b/resources/lang/de-if/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Zubehör',
'activated' => 'Aktiviert',
'accepted_date' => 'Datum akzeptiert',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Neues Passwort',
'next' => 'Nächste',
'next_audit_date' => 'Nächstes Prüfdatum',
+ 'no_email' => 'Keine E-Mail-Adresse mit diesem Benutzer verknüpft',
'last_audit' => 'Letzte Prüfung',
'new' => 'Neu!',
'no_depreciation' => 'Nicht abschreiben',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Es gibt keine anforderbaren Assets oder Asset-Modelle.',
+ 'countable' => [
+ 'accessories' => ':count Zubehör|:count Zubehör',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count Lizenz|:count Lizenzen',
+ 'license_seats' => ':count Lizenzsitze|:count Lizenzsitze',
+ 'consumables' => ':count Verbrauchsmaterialien|:count Verbrauchsmaterialien',
+ 'components' => ':count Komponente|:count Komponenten',
+ ]
+
];
diff --git a/resources/lang/de-if/localizations.php b/resources/lang/de-if/localizations.php
index ed3acd5ece..b351a2e499 100644
--- a/resources/lang/de-if/localizations.php
+++ b/resources/lang/de-if/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbisch (Lateinisch)',
'sk-SK'=> 'Slowakisch',
'sl-SI'=> 'Slowenisch',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanisch, Kolumbien',
'es-MX'=> 'Spanisch, Mexiko',
diff --git a/resources/lang/de-if/validation.php b/resources/lang/de-if/validation.php
index bbfc009669..d96cd772f0 100644
--- a/resources/lang/de-if/validation.php
+++ b/resources/lang/de-if/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Wert darf nicht negativ sein'
],
+ 'checkboxes' => ':attribute enthält ungültige Optionen.',
+ 'radio_buttons' => ':attribute ist ungültig.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Ungültiger Wert in diesem Feld enthalten',
];
diff --git a/resources/lang/el-GR/admin/hardware/message.php b/resources/lang/el-GR/admin/hardware/message.php
index eea0343b6b..3918320e06 100644
--- a/resources/lang/el-GR/admin/hardware/message.php
+++ b/resources/lang/el-GR/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Τα περιουσιακά στοιχεία ενημερώθηκαν επιτυχώς.',
'nothing_updated' => 'Δεν επιλέχθηκαν πεδία, επομένως τίποτα δεν ενημερώθηκε.',
'no_assets_selected' => 'Δεν επιλέχθηκαν στοιχεία ενεργητικού, επομένως τίποτα δεν ενημερώθηκε.',
+ 'assets_do_not_exist_or_are_invalid' => 'Τα επιλεγμένα περιουσιακά στοιχεία δεν μπορούν να ενημερωθούν.',
],
'restore' => [
diff --git a/resources/lang/el-GR/admin/settings/general.php b/resources/lang/el-GR/admin/settings/general.php
index 4cb7a16c4a..03ce8459ed 100644
--- a/resources/lang/el-GR/admin/settings/general.php
+++ b/resources/lang/el-GR/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Εγγραφή δύο συντελεστών',
'two_factor_enabled_text' => 'Ενεργοποίηση ελέγχου ταυτότητας δύο παραγόντων',
'two_factor_reset' => 'Επαναφορά του μυστικού δύο παραγόντων',
- 'two_factor_reset_help' => 'Αυτό θα υποχρεώσει τον χρήστη να εγγραφεί ξανά στη συσκευή του με τον Επαληθευτή Google. Αυτό μπορεί να είναι χρήσιμο εάν η τρέχουσα εγγεγραμμένη συσκευή τους χάσει ή κλαπεί.',
+ 'two_factor_reset_help' => 'Αυτό θα αναγκάσει τον χρήστη να εγγράψει τη συσκευή του με την εφαρμογή ελέγχου ταυτότητας και πάλι. Αυτό μπορεί να είναι χρήσιμο εάν χαθεί ή κλαπεί η συσκευή που έχει εγγραφεί. ',
'two_factor_reset_success' => 'Επαναφορά της συσκευής δύο παραγόντων',
'two_factor_reset_error' => 'Επαναφορά συσκευής δύο παραγόντων απέτυχε',
'two_factor_enabled_warning' => 'Εάν ενεργοποιήσετε τον παράγοντα δύο παραγόντων, εάν δεν είναι ενεργοποιημένος, θα σας αναγκάσει αμέσως να επαληθεύσετε την ταυτότητά σας με μια συσκευή εγγραφής στο Google Auth. Θα έχετε τη δυνατότητα να εγγραφείτε στη συσκευή σας εάν δεν είστε εγγεγραμμένος.',
diff --git a/resources/lang/el-GR/general.php b/resources/lang/el-GR/general.php
index 7d95cc6544..3714effef7 100644
--- a/resources/lang/el-GR/general.php
+++ b/resources/lang/el-GR/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Αξεσουάρ',
'activated' => 'Ενεργοποιήθηκε',
'accepted_date' => 'Ημερομηνία Αποδεκτής',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Νέος Κωδικός Πρόσβασης',
'next' => 'Επόμενο',
'next_audit_date' => 'Επόμενη ημερομηνία ελέγχου',
+ 'no_email' => 'Καμία διεύθυνση ηλεκτρονικού ταχυδρομείου δεν συσχετίζεται με αυτόν το χρήστη',
'last_audit' => 'Τελευταίος Έλεγχος',
'new' => 'νεό!',
'no_depreciation' => 'Δεν Αποσβέσεις',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Δεν υπάρχουν απαιτούμενα στοιχεία ενεργητικού ή μοντέλα στοιχείων ενεργητικού.',
+ 'countable' => [
+ 'accessories' => ':count Αξεσουάρ: Μετρήστε Αξεσουάρ',
+ 'assets' => ':count Ενεργητικό:count Περιουσιακών Στοιχείων',
+ 'licenses' => ':count Άδεια Χρήσης:count Άδειες',
+ 'license_seats' => ':count Άδεια Θέση:count Καθίσματα Άδειας',
+ 'consumables' => ':count Αναλώσιμα :count Αναλώσιμα',
+ 'components' => ':count Εξαρτήματα :count',
+ ]
+
];
diff --git a/resources/lang/el-GR/localizations.php b/resources/lang/el-GR/localizations.php
index 067dba5b67..739d55b193 100644
--- a/resources/lang/el-GR/localizations.php
+++ b/resources/lang/el-GR/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Σλοβακικά',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Ισπανικά',
'es-CO'=> 'Ισπανικά, Κολομβία',
'es-MX'=> 'Ισπανικά, Μεξικό',
diff --git a/resources/lang/el-GR/validation.php b/resources/lang/el-GR/validation.php
index 9473a4d3c3..6f631a58f7 100644
--- a/resources/lang/el-GR/validation.php
+++ b/resources/lang/el-GR/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Η τιμή δεν μπορεί να είναι αρνητική'
],
+ 'checkboxes' => ':attribute περιέχει μη έγκυρες επιλογές.',
+ 'radio_buttons' => ':attribute δεν είναι έγκυρο.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Μη έγκυρη τιμή που περιλαμβάνεται σε αυτό το πεδίο',
];
diff --git a/resources/lang/en-GB/admin/hardware/message.php b/resources/lang/en-GB/admin/hardware/message.php
index 9730f61df4..07a81522de 100644
--- a/resources/lang/en-GB/admin/hardware/message.php
+++ b/resources/lang/en-GB/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset updated successfully.',
'nothing_updated' => 'No fields were selected, so nothing was updated.',
'no_assets_selected' => 'Nothing was updated because no assets were selected.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index b41f22f404..d95fb575fa 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 5142033f90..c8a6f90cb9 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessories',
'activated' => 'Activated',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Next',
'next_audit_date' => 'Next Audit Date',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/en-GB/localizations.php b/resources/lang/en-GB/localizations.php
index 104421a0b0..2dfb05a2ac 100644
--- a/resources/lang/en-GB/localizations.php
+++ b/resources/lang/en-GB/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/en-GB/validation.php b/resources/lang/en-GB/validation.php
index 1c6ad8a148..05374e23af 100644
--- a/resources/lang/en-GB/validation.php
+++ b/resources/lang/en-GB/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/en-ID/admin/hardware/message.php b/resources/lang/en-ID/admin/hardware/message.php
index 920dfb61dd..f8b0e5b236 100644
--- a/resources/lang/en-ID/admin/hardware/message.php
+++ b/resources/lang/en-ID/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Aset Berhasil diperbarui.',
'nothing_updated' => 'Tidak ada kategori yang dipilih, jadi tidak ada yang diperbarui.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 6573f500d3..19e655d579 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Pendaftaran Dua Faktor',
'two_factor_enabled_text' => 'Aktifkan Dua Faktor',
'two_factor_reset' => 'Atur Ulang Dua Faktor Rahasia',
- 'two_factor_reset_help' => 'Ini akan memaksa pengguna untuk mendaftarkan perangkat mereka dengan Google Authenticator lagi. Ini bisa berguna jika perangkat mereka saat ini terdaftar hilang atau dicuri. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Dua perangkat faktor berhasil di-reset',
'two_factor_reset_error' => 'Dua faktor perangkat gagal direset',
'two_factor_enabled_warning' => 'Mengaktifkan dua faktor jika saat ini tidak diaktifkan dan akan segera memaksa anda untuk melakukan otentikasi dengan perangkat yang terdaftar di Google Auth. Anda juga akan memiliki kemampuan untuk mendaftarkan perangkat anda jika seseorang belum terdaftar.',
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index 6562a5f211..ea6a6a168a 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Aksesoris',
'activated' => 'Diaktifkan',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Selanjutnya',
'next_audit_date' => 'Tanggal Audit berikutnya',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Audit Terakhir',
'new' => 'baru!',
'no_depreciation' => 'Tidak ada penyusutan',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/en-ID/localizations.php b/resources/lang/en-ID/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/en-ID/localizations.php
+++ b/resources/lang/en-ID/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/en-ID/validation.php b/resources/lang/en-ID/validation.php
index 6807e15dc2..8f562281a1 100644
--- a/resources/lang/en-ID/validation.php
+++ b/resources/lang/en-ID/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/en-US/admin/hardware/message.php b/resources/lang/en-US/admin/hardware/message.php
index 056692998e..bf050ef974 100644
--- a/resources/lang/en-US/admin/hardware/message.php
+++ b/resources/lang/en-US/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset updated successfully.',
'nothing_updated' => 'No fields were selected, so nothing was updated.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php
index 33cfd7b416..71fb8eb2c6 100644
--- a/resources/lang/en-US/admin/settings/general.php
+++ b/resources/lang/en-US/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index f7fb41743e..9f9a0e08c7 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessories',
'activated' => 'Activated',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Next',
'next_audit_date' => 'Next Audit Date',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/en-US/localizations.php b/resources/lang/en-US/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/en-US/localizations.php
+++ b/resources/lang/en-US/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/en-US/validation.php b/resources/lang/en-US/validation.php
index 1c6ad8a148..05374e23af 100644
--- a/resources/lang/en-US/validation.php
+++ b/resources/lang/en-US/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php
index 43871d2fcf..2132b3c79c 100644
--- a/resources/lang/es-CO/admin/hardware/message.php
+++ b/resources/lang/es-CO/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Equipo actualizado correctamente.',
'nothing_updated' => 'No se seleccionaron campos, por lo que no se actualizó nada.',
'no_assets_selected' => 'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
+ 'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
],
'restore' => [
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index e04fb528bd..408de4e159 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Inscripción en dos factores',
'two_factor_enabled_text' => 'Habilitar dos factores',
'two_factor_reset' => 'Restablecer secreto de dos factores',
- 'two_factor_reset_help' => 'Esto obligará al usuario a inscribir su dispositivo con Google Authenticator de nuevo. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
+ 'two_factor_reset_help' => 'Esto obligará al usuario a volver a inscribir su dispositivo en su aplicación de autenticación. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
'two_factor_reset_success' => 'Dispositivo de doble factor restablecido con éxito',
'two_factor_reset_error' => 'Error al restablecer el dispositivo de doble factor',
'two_factor_enabled_warning' => 'Habilitar doble factor si no está habilitado inmediatamente le obligará a autenticarse con un dispositivo inscrito en Google Auth. Tendrás la posibilidad de inscribir tu dispositivo si uno no está actualmente inscrito.',
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index 146840e897..e19bdc9603 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accesorios',
'activated' => 'Activado',
'accepted_date' => 'Fecha aceptada',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nueva contraseña',
'next' => 'Siguiente',
'next_audit_date' => 'Próxima fecha de auditoría',
+ 'no_email' => 'No hay dirección de correo electrónico asociada a este usuario',
'last_audit' => 'Última auditoría',
'new' => 'nuevo!',
'no_depreciation' => 'Sin Depreciación',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'No hay activos o modelos de activos solicitables.',
+ 'countable' => [
+ 'accessories' => ':count Accesorio|:count Accesorios',
+ 'assets' => ':count Activos|:count Activos',
+ 'licenses' => ':count Licencia|:count Licencias',
+ 'license_seats' => ':count Asiento de licencia|:count Asientos de licencia',
+ 'consumables' => ':count Consumible|:count Consumibles',
+ 'components' => ':count component|:count componentes',
+ ]
+
];
diff --git a/resources/lang/es-CO/localizations.php b/resources/lang/es-CO/localizations.php
index 23778098ff..be0ac5f74d 100644
--- a/resources/lang/es-CO/localizations.php
+++ b/resources/lang/es-CO/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Eslovaco',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Español',
'es-CO'=> 'Español, Colombia',
'es-MX'=> 'Español, México',
diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php
index 7bf55ce1db..95ec8816e1 100644
--- a/resources/lang/es-CO/validation.php
+++ b/resources/lang/es-CO/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'El valor no puede ser negativo'
],
+ 'checkboxes' => ':attribute contiene opciones no válidas.',
+ 'radio_buttons' => ':attribute no es válido.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Valor no válido incluido en este campo',
];
diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php
index 4893a0377b..079a7d1580 100644
--- a/resources/lang/es-ES/admin/hardware/message.php
+++ b/resources/lang/es-ES/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Equipo actualizado.',
'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
'no_assets_selected' => 'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
+ 'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
],
'restore' => [
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index 2f5f607bcf..67926f4c38 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Enrolamiento en verificación en dos pasos',
'two_factor_enabled_text' => 'Activar la verificación en dos pasos',
'two_factor_reset' => 'Reiniciar Secreto de verificación en dos pasos',
- 'two_factor_reset_help' => 'Esto forzará al usuario a inscribirse otra vez su dispositivo con Google Authenticator. Esto puede ser útil si la pérdida o robo de su dispositivo actualmente inscrito. ',
+ 'two_factor_reset_help' => 'Esto obligará al usuario a volver a inscribir su dispositivo en su aplicación de autenticación. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
'two_factor_reset_success' => 'Verificación en dos pasos de dispositivo reiniciado exitosamente',
'two_factor_reset_error' => 'Falló la Verificación en dos pasos del dispositivo',
'two_factor_enabled_warning' => 'Permitiendo dos factores si no está activado inmediatamente obliga a autenticar con un dispositivo de autenticación de Google inscritos. Usted tendrá la posibilidad de inscribirse el dispositivo si uno no está inscrito actualmente.',
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index e53c056ff2..302000742e 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accesorios',
'activated' => 'Activado',
'accepted_date' => 'Fecha aceptada',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nueva contraseña',
'next' => 'Siguiente',
'next_audit_date' => 'Próxima fecha de auditoría',
+ 'no_email' => 'No hay dirección de correo electrónico asociada a este usuario',
'last_audit' => 'Última auditoría',
'new' => 'nuevo!',
'no_depreciation' => 'No Amortizar',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'No hay activos o modelos de activos solicitables.',
+ 'countable' => [
+ 'accessories' => ':count Accesorio|:count Accesorios',
+ 'assets' => ':count Activos|:count Activos',
+ 'licenses' => ':count Licencia|:count Licencias',
+ 'license_seats' => ':count Asiento de licencia|:count Asientos de licencia',
+ 'consumables' => ':count Consumible|:count Consumibles',
+ 'components' => ':count component|:count componentes',
+ ]
+
];
diff --git a/resources/lang/es-ES/localizations.php b/resources/lang/es-ES/localizations.php
index 71e19bb33e..7a9161e375 100644
--- a/resources/lang/es-ES/localizations.php
+++ b/resources/lang/es-ES/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbio (Latino)',
'sk-SK'=> 'Eslovaco',
'sl-SI'=> 'Esloveno',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Español',
'es-CO'=> 'Español, Colombia',
'es-MX'=> 'Español, México',
diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php
index 572a5f37e0..cf408dd329 100644
--- a/resources/lang/es-ES/validation.php
+++ b/resources/lang/es-ES/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'El valor no puede ser negativo'
],
+ 'checkboxes' => ':attribute contiene opciones no válidas.',
+ 'radio_buttons' => ':attribute no es válido.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Valor no válido incluido en este campo',
];
diff --git a/resources/lang/es-MX/admin/hardware/message.php b/resources/lang/es-MX/admin/hardware/message.php
index 594fd827fc..fbcff0c0d0 100644
--- a/resources/lang/es-MX/admin/hardware/message.php
+++ b/resources/lang/es-MX/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Equipo actualizado.',
'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
'no_assets_selected' => 'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
+ 'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
],
'restore' => [
diff --git a/resources/lang/es-MX/admin/settings/general.php b/resources/lang/es-MX/admin/settings/general.php
index d6e146285a..f01b22a883 100644
--- a/resources/lang/es-MX/admin/settings/general.php
+++ b/resources/lang/es-MX/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Enrolamiento en verificación en dos pasos',
'two_factor_enabled_text' => 'Activar la verificación en dos pasos',
'two_factor_reset' => 'Reiniciar Secreto de verificación en dos pasos',
- 'two_factor_reset_help' => 'Esto forzará al usuario a inscribirse otra vez su dispositivo con Google Authenticator. Esto puede ser útil si la pérdida o robo de su dispositivo actualmente inscrito. ',
+ 'two_factor_reset_help' => 'Esto obligará al usuario a volver a inscribir su dispositivo en su aplicación de autenticación. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
'two_factor_reset_success' => 'Verificación en dos pasos de dispositivo reiniciado exitosamente',
'two_factor_reset_error' => 'Falló la Verificación en dos pasos del dispositivo',
'two_factor_enabled_warning' => 'Permitiendo dos factores si no está activado inmediatamente obliga a autenticar con un dispositivo de autenticación de Google inscritos. Usted tendrá la posibilidad de inscribirse el dispositivo si uno no está inscrito actualmente.',
diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php
index e29fe14cb4..5992a28a6d 100644
--- a/resources/lang/es-MX/general.php
+++ b/resources/lang/es-MX/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accesorios',
'activated' => 'Activado',
'accepted_date' => 'Fecha de aceptación',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nueva contraseña',
'next' => 'Siguiente',
'next_audit_date' => 'Próxima fecha de auditoría',
+ 'no_email' => 'No hay dirección de correo electrónico asociada a este usuario',
'last_audit' => 'Última auditoría',
'new' => 'nuevo!',
'no_depreciation' => 'No Amortizar',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'No hay activos o modelos de activos solicitables.',
+ 'countable' => [
+ 'accessories' => ':count Accesorio|:count Accesorios',
+ 'assets' => ':count Activos|:count Activos',
+ 'licenses' => ':count Licencia|:count Licencias',
+ 'license_seats' => ':count Asiento de licencia|:count Asientos de licencia',
+ 'consumables' => ':count Consumible|:count Consumibles',
+ 'components' => ':count component|:count componentes',
+ ]
+
];
diff --git a/resources/lang/es-MX/localizations.php b/resources/lang/es-MX/localizations.php
index 21ddca2ee2..35c44db06d 100644
--- a/resources/lang/es-MX/localizations.php
+++ b/resources/lang/es-MX/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Eslovaco',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Español',
'es-CO'=> 'Español, Colombia',
'es-MX'=> 'Español, México',
diff --git a/resources/lang/es-MX/validation.php b/resources/lang/es-MX/validation.php
index e48082a07c..c3866a72d5 100644
--- a/resources/lang/es-MX/validation.php
+++ b/resources/lang/es-MX/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'El valor no puede ser negativo'
],
+ 'checkboxes' => ':attribute contiene opciones no válidas.',
+ 'radio_buttons' => ':attribute no es válido.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Valor no válido incluido en este campo',
];
diff --git a/resources/lang/es-VE/admin/hardware/message.php b/resources/lang/es-VE/admin/hardware/message.php
index 1164f159e7..e9e46eeea9 100644
--- a/resources/lang/es-VE/admin/hardware/message.php
+++ b/resources/lang/es-VE/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Activo actualizado con éxito.',
'nothing_updated' => 'Ningún campo fue seleccionado, así que nada se actualizó.',
'no_assets_selected' => 'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
+ 'assets_do_not_exist_or_are_invalid' => 'Los activos seleccionados no se pueden actualizar.',
],
'restore' => [
diff --git a/resources/lang/es-VE/admin/settings/general.php b/resources/lang/es-VE/admin/settings/general.php
index b2339631d8..87e7a98cd5 100644
--- a/resources/lang/es-VE/admin/settings/general.php
+++ b/resources/lang/es-VE/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Inscripción de verificación en dos pasos',
'two_factor_enabled_text' => 'Activar la verificación en dos pasos',
'two_factor_reset' => 'Reiniciar Secreto de Verificación en dos Pasos',
- 'two_factor_reset_help' => 'Esto forzará al usuario a inscribir sus dispositivos con el Autenticador de Google nuevamente. Esto puede ser útil si su dispositivo inscrito actualmente se pierde o es robado. ',
+ 'two_factor_reset_help' => 'Esto obligará al usuario a volver a inscribir su dispositivo en su aplicación de autenticación. Esto puede ser útil si su dispositivo actualmente inscrito es perdido o robado. ',
'two_factor_reset_success' => 'Verificación de dos pasos del dispositivo reiniciado exitosamente',
'two_factor_reset_error' => 'La verificación de dos pasos del dispositivo ha fallado',
'two_factor_enabled_warning' => 'Habilitar la verificación de dos factores si no está activado actualmente de inmediato te forzará a autenticarte con un dispositivo inscrito en Autenticación de Google. Tendrás la habilidad de inscribir tu dispositivo si uno no está actualmente inscrito.',
diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php
index 00726dd1d8..2c8f6b3f53 100644
--- a/resources/lang/es-VE/general.php
+++ b/resources/lang/es-VE/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accesorios',
'activated' => 'Activado',
'accepted_date' => 'Fecha aceptada',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nueva contraseña',
'next' => 'Siguiente',
'next_audit_date' => 'Próxima fecha de auditoría',
+ 'no_email' => 'No hay dirección de correo electrónico asociada a este usuario',
'last_audit' => 'Última auditoría',
'new' => '¡nuevo!',
'no_depreciation' => 'Sin Depreciación',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'No hay activos o modelos de activos solicitables.',
+ 'countable' => [
+ 'accessories' => ':count Accesorio|:count Accesorios',
+ 'assets' => ':count Activos|:count Activos',
+ 'licenses' => ':count Licencia|:count Licencias',
+ 'license_seats' => ':count Asiento de licencia|:count Asientos de licencia',
+ 'consumables' => ':count Consumible|:count Consumibles',
+ 'components' => ':count component|:count componentes',
+ ]
+
];
diff --git a/resources/lang/es-VE/localizations.php b/resources/lang/es-VE/localizations.php
index 23778098ff..be0ac5f74d 100644
--- a/resources/lang/es-VE/localizations.php
+++ b/resources/lang/es-VE/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Eslovaco',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Español',
'es-CO'=> 'Español, Colombia',
'es-MX'=> 'Español, México',
diff --git a/resources/lang/es-VE/validation.php b/resources/lang/es-VE/validation.php
index da892cd4b1..2dd7274202 100644
--- a/resources/lang/es-VE/validation.php
+++ b/resources/lang/es-VE/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'El valor no puede ser negativo'
],
+ 'checkboxes' => ':attribute contiene opciones no válidas.',
+ 'radio_buttons' => ':attribute no es válido.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Valor no válido incluido en este campo',
];
diff --git a/resources/lang/et-EE/admin/hardware/message.php b/resources/lang/et-EE/admin/hardware/message.php
index 8d6f282d51..538723901a 100644
--- a/resources/lang/et-EE/admin/hardware/message.php
+++ b/resources/lang/et-EE/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Vara värskendati edukalt',
'nothing_updated' => 'Pole ühtegi välju valitud, nii et midagi ei uuendatud.',
'no_assets_selected' => 'Ühtegi vahendit ei valitud, muudatusi ei tehtud.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/et-EE/admin/settings/general.php b/resources/lang/et-EE/admin/settings/general.php
index 89a7488967..1eb8693315 100644
--- a/resources/lang/et-EE/admin/settings/general.php
+++ b/resources/lang/et-EE/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Kahe faktori registreerimine',
'two_factor_enabled_text' => 'Luba kaks tegurit',
'two_factor_reset' => 'Lähtesta kahefaktori saladus',
- 'two_factor_reset_help' => 'See sunnib kasutajat uuesti oma seadet Google Authenticatoriga registreerima. See võib olla kasulik, kui nende praegu registreeritav seade on kadunud või varastatud.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Kahe faktori seade on edukalt lähtestatud',
'two_factor_reset_error' => 'Kaks tegurit seadete lähtestamine nurjus',
'two_factor_enabled_warning' => 'Kaheteguri lubamine, kui see pole praegu lubatud, viib teid otsekohe Google Auth-seadmesse autentimiseks. Teil on võimalus oma seadet registreeruda, kui seda praegu ei ole.',
diff --git a/resources/lang/et-EE/general.php b/resources/lang/et-EE/general.php
index 464f4b55ad..f411c13329 100644
--- a/resources/lang/et-EE/general.php
+++ b/resources/lang/et-EE/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Tarvikud',
'activated' => 'Aktiveeritud',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Uus parool',
'next' => 'Järgmine',
'next_audit_date' => 'Järgmine auditi kuupäev',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Viimane audit',
'new' => 'uus!',
'no_depreciation' => 'Amortisatsioon puudub',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/et-EE/localizations.php b/resources/lang/et-EE/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/et-EE/localizations.php
+++ b/resources/lang/et-EE/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/et-EE/validation.php b/resources/lang/et-EE/validation.php
index 48146bd504..37f292a3ce 100644
--- a/resources/lang/et-EE/validation.php
+++ b/resources/lang/et-EE/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/fa-IR/admin/hardware/message.php b/resources/lang/fa-IR/admin/hardware/message.php
index e2f8e4e68a..54e7b08549 100644
--- a/resources/lang/fa-IR/admin/hardware/message.php
+++ b/resources/lang/fa-IR/admin/hardware/message.php
@@ -20,6 +20,7 @@ return [
'nothing_updated' => 'هیچ زمینه، انتخاب شدند تا هیچ چیز به روز شد.',
'no_assets_selected' => 'هیچ دارایی انتخاب نشد، بنابراین چیزی بهروزرسانی نشد.
',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/fa-IR/admin/settings/general.php b/resources/lang/fa-IR/admin/settings/general.php
index a263070002..3b087ec16b 100644
--- a/resources/lang/fa-IR/admin/settings/general.php
+++ b/resources/lang/fa-IR/admin/settings/general.php
@@ -363,7 +363,7 @@ return [
'two_factor_enrollment' => 'ثبت نام دو عامل',
'two_factor_enabled_text' => 'فعال کردن دو عامل',
'two_factor_reset' => 'تنظیم مجدد دو راز فاکتور',
- 'two_factor_reset_help' => 'این باعث می شود کاربر دوباره دستگاه خود را با Google Authenticator ثبت کند. این می تواند مفید باشد اگر دستگاه ثبت شده فعلی شما گم شده یا دزدیده شود.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'دستگاه دو عامل با موفقیت تنظیم مجدد',
'two_factor_reset_error' => 'تنظیم مجدد دستگاه دو عامل انجام نشد',
'two_factor_enabled_warning' => 'فعال کردن دو عامل اگر آن را در حال حاضر فعال نیست، بلافاصله شما را مجبور به تایید با یک دستگاه ثبت نام Google Auth. اگر کسی در حال حاضر ثبت نام نکند، می توانید دستگاه خود را ثبت نام کنید.',
diff --git a/resources/lang/fa-IR/general.php b/resources/lang/fa-IR/general.php
index c309d4c790..fd9ad64bac 100644
--- a/resources/lang/fa-IR/general.php
+++ b/resources/lang/fa-IR/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'تجهیزات جانبی',
'activated' => 'فعال شد',
'accepted_date' => 'Date Accepted',
@@ -220,6 +221,7 @@ return [
'new_password' => 'رمز عبور جديد:',
'next' => 'بعدی',
'next_audit_date' => 'تاریخ تفتیش بعدی',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'آخرین حسابرسی',
'new' => 'جدید!',
'no_depreciation' => 'بدون استهلاک',
@@ -609,4 +611,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/fa-IR/localizations.php b/resources/lang/fa-IR/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/fa-IR/localizations.php
+++ b/resources/lang/fa-IR/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/fa-IR/validation.php b/resources/lang/fa-IR/validation.php
index c642a43b87..3c5b9bf6fd 100644
--- a/resources/lang/fa-IR/validation.php
+++ b/resources/lang/fa-IR/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'مقدار نباید منفی باشد.'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/fi-FI/admin/hardware/message.php b/resources/lang/fi-FI/admin/hardware/message.php
index 090411121a..1fe5fb29ed 100644
--- a/resources/lang/fi-FI/admin/hardware/message.php
+++ b/resources/lang/fi-FI/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Laite päivitetty onnistuneesti.',
'nothing_updated' => 'Mitään kenttiä ei valittu, joten mitään ei päivitetty.',
'no_assets_selected' => 'Laitetta ei ollut valittuna, joten mitään ei muutettu.',
+ 'assets_do_not_exist_or_are_invalid' => 'Valittuja sisältöjä ei voi päivittää.',
],
'restore' => [
diff --git a/resources/lang/fi-FI/admin/settings/general.php b/resources/lang/fi-FI/admin/settings/general.php
index 89e68ff6eb..6b9a4dfc8b 100644
--- a/resources/lang/fi-FI/admin/settings/general.php
+++ b/resources/lang/fi-FI/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Kaksivaiheisen tunnistautumisen käyttöönotto',
'two_factor_enabled_text' => 'Ota käyttöön kaksivaiheinen tunnistautuminen',
'two_factor_reset' => 'Nollaa MFA salaisuus',
- 'two_factor_reset_help' => 'Tämä pakottaa käyttäjän rekisteröimään laitteen uudelleen Google Authenticator -palveluun. Tämä voi olla hyödyllistä, jos heille tällä hetkellä rekisteröidyt laitteet menetetään tai varastetaan. ',
+ 'two_factor_reset_help' => 'Tämä pakottaa käyttäjän rekisteröimään laitteensa uudelleen niiden todennussovelluksella. Tämä voi olla hyödyllistä, jos heidän tällä hetkellä ilmoittautunut laite katoaa tai varastetaan. ',
'two_factor_reset_success' => 'MFA laite onnistuneesti nollattu',
'two_factor_reset_error' => 'MFA laitteen nollaus epäonnistui',
'two_factor_enabled_warning' => 'Kaksivaiheisen tunnistautumisen ottaminen käyttöön,, pakottaa sinut autentikoimaan Google Auth - laitteella. Voit lisätä sellaisen, jos sellaista ei ole vielä käytössä.',
diff --git a/resources/lang/fi-FI/general.php b/resources/lang/fi-FI/general.php
index 91adaea2fa..7e4a982af5 100644
--- a/resources/lang/fi-FI/general.php
+++ b/resources/lang/fi-FI/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Oheistarvikkeet',
'activated' => 'Aktivoitu',
'accepted_date' => 'Hyväksytty, päiväys',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Uusi salasana',
'next' => 'Seuraava',
'next_audit_date' => 'Seuraava tarkastuspäivä',
+ 'no_email' => 'Tähän käyttäjään liittyvää sähköpostiosoitetta ei ole',
'last_audit' => 'Viimeisin tarkastus',
'new' => 'uusi!',
'no_depreciation' => 'Ei poistoluokkaa',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Pyydettäviä omaisuuseriä tai omaisuusmalleja ei ole.',
+ 'countable' => [
+ 'accessories' => ':count Lisävaruste :count Lisätarvikkeet',
+ 'assets' => ':count Varat :count Varat',
+ 'licenses' => ':count Lisenssi :count Lisenssit',
+ 'license_seats' => ':count Lisenssipaikka:count Lisenssi Istuimet',
+ 'consumables' => ':count Kulutustavara :count Kulutustavarat',
+ 'components' => ':count Komponentti :count Komponentit',
+ ]
+
];
diff --git a/resources/lang/fi-FI/localizations.php b/resources/lang/fi-FI/localizations.php
index 779dcf31ee..0e79f02ef1 100644
--- a/resources/lang/fi-FI/localizations.php
+++ b/resources/lang/fi-FI/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbia (latinalainen)',
'sk-SK'=> 'Slovakki',
'sl-SI'=> 'Slovenia',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Espanja',
'es-CO'=> 'Espanja, Kolumbia',
'es-MX'=> 'Espanja, Meksiko',
diff --git a/resources/lang/fi-FI/validation.php b/resources/lang/fi-FI/validation.php
index c0b9e10795..488a37c911 100644
--- a/resources/lang/fi-FI/validation.php
+++ b/resources/lang/fi-FI/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Arvo ei voi olla negatiivinen'
],
+ 'checkboxes' => ':attribute sisältää virheellisiä vaihtoehtoja.',
+ 'radio_buttons' => ':attribute on virheellinen.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Virheellinen arvo sisältyy tähän kenttään',
];
diff --git a/resources/lang/fil-PH/admin/hardware/message.php b/resources/lang/fil-PH/admin/hardware/message.php
index 1597ca0564..f6090fc442 100644
--- a/resources/lang/fil-PH/admin/hardware/message.php
+++ b/resources/lang/fil-PH/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Ang asset ay matagumpay na nai-update.',
'nothing_updated' => 'Walang napiling mga fields, kaya walang nai-update.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/fil-PH/admin/settings/general.php b/resources/lang/fil-PH/admin/settings/general.php
index 10b914c441..e30660b4ac 100644
--- a/resources/lang/fil-PH/admin/settings/general.php
+++ b/resources/lang/fil-PH/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Ang Two-Factor Enrollment',
'two_factor_enabled_text' => 'Paganahin ang Dalawang Factor',
'two_factor_reset' => 'I-reset ang Two-Factor na Sekreto',
- 'two_factor_reset_help' => 'Ito ay maaaring magpilit sa mga gumagamit na mag-enroll muli sa kanilang device gamit ang Google Authenticator. Ito ay maaaring kapaki-pakinabang kung ang kanilang na-enroll na device ay nawala o ninakaw. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Ang dalawang factor na device ay matagumpay na nai-reset',
'two_factor_reset_error' => 'Ang pag-reset sa dalawang factor na device ay hindi nagtagumpay',
'two_factor_enabled_warning' => 'Paganahin ang dalawang factor kapag ito ay kasalukuyang hindi pinagana ay maaari itong maghatid ng madalian na pagpilit na mag-authenticate gamit ang Google Auth sa na-enroll na device. Ikaw ay mayroong abilidad na i-enroll ang iyong device kapag may isa na hindi pa kasalukuyang naka-enroll.',
diff --git a/resources/lang/fil-PH/general.php b/resources/lang/fil-PH/general.php
index dcd6c0fef3..af873c2f55 100644
--- a/resources/lang/fil-PH/general.php
+++ b/resources/lang/fil-PH/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Mga Aksesorya',
'activated' => 'Pinagana',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Susunod',
'next_audit_date' => 'Ang Susunod na Petsa ng Pag-audit',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Ang Huling Pag-audit',
'new' => 'bago!',
'no_depreciation' => 'Walang Depresasyon',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/fil-PH/localizations.php b/resources/lang/fil-PH/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/fil-PH/localizations.php
+++ b/resources/lang/fil-PH/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/fil-PH/validation.php b/resources/lang/fil-PH/validation.php
index ff478aee79..a47cb26d6f 100644
--- a/resources/lang/fil-PH/validation.php
+++ b/resources/lang/fil-PH/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/fr-FR/admin/hardware/message.php b/resources/lang/fr-FR/admin/hardware/message.php
index 6411084dee..dd1456fa21 100644
--- a/resources/lang/fr-FR/admin/hardware/message.php
+++ b/resources/lang/fr-FR/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Bien actualisé correctement.',
'nothing_updated' => 'Aucun champ n\'a été sélectionné, rien n\'a été actualisé.',
'no_assets_selected' => 'Aucune ressource n\'a été sélectionnée, rien n\'a donc été mis à jour.',
+ 'assets_do_not_exist_or_are_invalid' => 'Les ressources sélectionnées ne peuvent pas être mises à jour.',
],
'restore' => [
diff --git a/resources/lang/fr-FR/admin/settings/general.php b/resources/lang/fr-FR/admin/settings/general.php
index c29de7d036..69a8050deb 100644
--- a/resources/lang/fr-FR/admin/settings/general.php
+++ b/resources/lang/fr-FR/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Inscription à deux facteurs',
'two_factor_enabled_text' => 'Activer l\'authentification à deux facteurs',
'two_factor_reset' => 'Réinitialiser le Secret à deux facteurs',
- 'two_factor_reset_help' => 'Ceci forcera l’utilisateur à inscrire de nouveau leur appareil avec Google Authenticator. Cela peut être utile si leur appareil actuellement inscrit est perdue ou volée. ',
+ 'two_factor_reset_help' => 'Ceci forcera l\'utilisateur à réinscrire son appareil avec son application d\'authentification. Cela peut être utile si leur appareil actuellement inscrit est perdu ou volé. ',
'two_factor_reset_success' => 'Dispositif à deux facteurs réinitialisées avec succès',
'two_factor_reset_error' => 'Échec de réinitialisation du dispositif à deux facteurs',
'two_factor_enabled_warning' => 'L\'activation à deux facteurs si elle n\'est pas actuellement activée vous obligera immédiatement à vous authentifier avec un appareil inscrit Google Auth. Vous aurez la possibilité d\'inscrire votre appareil si aucun n\'est inscrit actuellement.',
diff --git a/resources/lang/fr-FR/general.php b/resources/lang/fr-FR/general.php
index 55b6f828a0..8143f783d5 100644
--- a/resources/lang/fr-FR/general.php
+++ b/resources/lang/fr-FR/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessoires',
'activated' => 'Activé',
'accepted_date' => 'Date d\'acceptation',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nouveau mot de passe',
'next' => 'Prochain',
'next_audit_date' => 'Prochaine date de vérification',
+ 'no_email' => 'Aucune adresse e-mail associée à cet utilisateur',
'last_audit' => 'Dernier audit',
'new' => 'nouveau!',
'no_depreciation' => 'Pas d\'amortissement',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Il n\'y a pas d\'actifs ou de modèles d\'actifs demandés.',
+ 'countable' => [
+ 'accessories' => ':count Accessoire|:count Accessoires',
+ 'assets' => ':count Actif|:count Actifs',
+ 'licenses' => ':count Licence|:count Licences',
+ 'license_seats' => ':count Siège de licence|:count sièges de licence',
+ 'consumables' => ':count Consommable|:count Consommables',
+ 'components' => ':count Composant|:count Composants',
+ ]
+
];
diff --git a/resources/lang/fr-FR/localizations.php b/resources/lang/fr-FR/localizations.php
index a72da355b2..03f030a6e3 100644
--- a/resources/lang/fr-FR/localizations.php
+++ b/resources/lang/fr-FR/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbe (latin)',
'sk-SK'=> 'Slovaque',
'sl-SI'=> 'Slovène',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Espagnol',
'es-CO'=> 'Espagnol, Colombie',
'es-MX'=> 'Espagnol, Mexique',
diff --git a/resources/lang/fr-FR/validation.php b/resources/lang/fr-FR/validation.php
index 1532d5972e..20bc87f255 100644
--- a/resources/lang/fr-FR/validation.php
+++ b/resources/lang/fr-FR/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'La valeur ne peut pas être négative'
],
+ 'checkboxes' => ':attribute contient des options non valides.',
+ 'radio_buttons' => ':attribute est invalide.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Valeur non valide incluse dans ce champ',
];
diff --git a/resources/lang/ga-IE/admin/hardware/message.php b/resources/lang/ga-IE/admin/hardware/message.php
index bbf31db3d8..ab51dd3d78 100644
--- a/resources/lang/ga-IE/admin/hardware/message.php
+++ b/resources/lang/ga-IE/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Nuashonraíodh sócmhainn go rathúil',
'nothing_updated' => 'Níor roghnaíodh réimsí ar bith, mar sin níor nuashonraíodh aon rud.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/ga-IE/admin/settings/general.php b/resources/lang/ga-IE/admin/settings/general.php
index 5c46e86ca0..f1c0ed6477 100644
--- a/resources/lang/ga-IE/admin/settings/general.php
+++ b/resources/lang/ga-IE/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Rollú Dhá Fachtóir',
'two_factor_enabled_text' => 'Cumasaigh Dhá Fachtóir',
'two_factor_reset' => 'Athshocraigh Dhá-Rúnda Fachtóir',
- 'two_factor_reset_help' => 'Cuirfidh sé seo ar an úsáideoir a n-gléas a chlárú le Google Authenticator arís. D\'fhéadfadh sé seo a bheith úsáideach má cailleadh nó goideadh an gléas atá cláraithe faoi láthair.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Athshocraigh dhá fheiste fachtóir go rathúil',
'two_factor_reset_error' => 'Theip ar dhá athshocrú feiste fachtóir',
'two_factor_enabled_warning' => 'Má chuirtear ar chumas dhá fhachtóir mura bhfuil sé á chumasú faoi láthair, cuirfidh tú i bhfeidhm láithreach le d\'fhíordheimhniú le gléas cláraithe Google Auth. Beidh an cumas agat do ghléas a chlárú mura bhfuil duine cláraithe faoi láthair.',
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index e4b80d840c..dde15f12f0 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessories',
'activated' => 'Gníomhachtaithe',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Ar Aghaidh',
'next_audit_date' => 'Ar Aghaidh Dáta Iniúchta',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'An Iniúchadh Deiridh',
'new' => 'nua!',
'no_depreciation' => 'Gan Dímheas',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/ga-IE/localizations.php b/resources/lang/ga-IE/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/ga-IE/localizations.php
+++ b/resources/lang/ga-IE/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/ga-IE/validation.php b/resources/lang/ga-IE/validation.php
index 5cfe472ef3..81bdf6af44 100644
--- a/resources/lang/ga-IE/validation.php
+++ b/resources/lang/ga-IE/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/he-IL/admin/hardware/form.php b/resources/lang/he-IL/admin/hardware/form.php
index 2491e0e9b8..730ab06ce0 100644
--- a/resources/lang/he-IL/admin/hardware/form.php
+++ b/resources/lang/he-IL/admin/hardware/form.php
@@ -11,7 +11,7 @@ return [
'bulk_update_help' => 'טופס זה מאפשר לך לעדכן מספר נכסים בבת אחת. מלא רק את השדות שאתה צריך לשנות. כל השדות שנותרו ריקים יישארו ללא שינוי.',
'bulk_update_warn' => 'You are about to edit the properties of a single asset.|You are about to edit the properties of :asset_count assets.',
'bulk_update_with_custom_field' => 'Note the assets are :asset_model_count different types of models.',
- 'bulk_update_model_prefix' => 'On Models',
+ 'bulk_update_model_prefix' => 'בדגמים',
'bulk_update_custom_field_unique' => 'This is a unique field and can not be bulk edited.',
'checkedout_to' => 'הוצא אל',
'checkout_date' => 'תבדוק את התאריך',
diff --git a/resources/lang/he-IL/admin/hardware/message.php b/resources/lang/he-IL/admin/hardware/message.php
index 774f129cc6..83a5ec4347 100644
--- a/resources/lang/he-IL/admin/hardware/message.php
+++ b/resources/lang/he-IL/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'הנכס עודכן בהצלחה.',
'nothing_updated' => 'לא נבחרו שדות, ולכן דבר לא עודכן.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/he-IL/admin/settings/general.php b/resources/lang/he-IL/admin/settings/general.php
index 70c114b7d1..160b80d3fe 100644
--- a/resources/lang/he-IL/admin/settings/general.php
+++ b/resources/lang/he-IL/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'רישום שני גורמים',
'two_factor_enabled_text' => 'הפעל שני גורמים',
'two_factor_reset' => 'אפס סודי פקטור',
- 'two_factor_reset_help' => 'פעולה זו תאלץ את המשתמש לרשום שוב את המכשיר באמצעות Google Authenticator. זה יכול להיות שימושי אם המכשיר נרשם כעת אבד או נגנב.',
+ 'two_factor_reset_help' => 'פעולה זו תאלץ את המשתמש לרשום שוב את המכשיר באמצעות יישומון האימות שלו. היא יכולה להיות שימושית אם המכשיר שרשום כעת במערכת אבד או נגנב. ',
'two_factor_reset_success' => 'שני מכשיר גורם לאפס בהצלחה',
'two_factor_reset_error' => 'איפוס התקן שני גורמים נכשל',
'two_factor_enabled_warning' => 'הפעלת שני גורמים אם היא אינה מופעלת כעת תאלץ אותך מיד לבצע אימות באמצעות מכשיר רשום של Google Auth. תהיה לך אפשרות לרשום את המכשיר שלך אם אינך רשום כעת.',
diff --git a/resources/lang/he-IL/general.php b/resources/lang/he-IL/general.php
index 2dda6b9f3a..e32c8143fe 100644
--- a/resources/lang/he-IL/general.php
+++ b/resources/lang/he-IL/general.php
@@ -1,6 +1,7 @@
'איפוס אימות דו־שלבי',
'accessories' => 'אביזרים',
'activated' => 'מוּפעָל',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'סיסמה חדשה',
'next' => 'הַבָּא',
'next_audit_date' => 'תאריך הביקורת',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'ביקורת אחרונה',
'new' => 'חָדָשׁ!',
'no_depreciation' => 'לא פחת',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/he-IL/localizations.php b/resources/lang/he-IL/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/he-IL/localizations.php
+++ b/resources/lang/he-IL/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/he-IL/validation.php b/resources/lang/he-IL/validation.php
index 98d4d07165..9cca43938d 100644
--- a/resources/lang/he-IL/validation.php
+++ b/resources/lang/he-IL/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'הערך לא יכול להיות שלילי'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/hr-HR/admin/hardware/message.php b/resources/lang/hr-HR/admin/hardware/message.php
index a62e117423..a14f25e25e 100644
--- a/resources/lang/hr-HR/admin/hardware/message.php
+++ b/resources/lang/hr-HR/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Imovina je uspješno ažurirana.',
'nothing_updated' => 'Nije odabrano nijedno polje, tako da ništa nije ažurirano.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/hr-HR/admin/settings/general.php b/resources/lang/hr-HR/admin/settings/general.php
index 9fa98618e9..f35cf107f5 100644
--- a/resources/lang/hr-HR/admin/settings/general.php
+++ b/resources/lang/hr-HR/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Dva faktora upisa',
'two_factor_enabled_text' => 'Omogući dva faktora',
'two_factor_reset' => 'Poništi dvoznamenkasti faktor',
- 'two_factor_reset_help' => 'To će prisiliti korisnika da ponovno registrira svoj uređaj s Googleovom autentifikatorom. To može biti korisno ako je izgubljen ili ukraden trenutačno upisani uređaj.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Uspješno resetira dva faktorska uređaja',
'two_factor_reset_error' => 'Dva faktora resetiranja uređaja nije uspjela',
'two_factor_enabled_warning' => 'Omogućivanje dva faktora ako trenutačno nije omogućeno odmah će vas prisiliti na provjeru autentičnosti pomoću uređaja za prijavu na Google Auth. Moći ćete upisati svoj uređaj ako ga trenutno niste upisali.',
diff --git a/resources/lang/hr-HR/general.php b/resources/lang/hr-HR/general.php
index ef616313ae..8d791e1bea 100644
--- a/resources/lang/hr-HR/general.php
+++ b/resources/lang/hr-HR/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Pribor',
'activated' => 'aktiviran',
'accepted_date' => 'Datum prihvaćen',
@@ -32,9 +33,9 @@ return [
'assets_checked_in_count' => 'assets checked in',
'assets_checked_out_count' => 'assets checked out',
'asset_deleted_warning' => 'This asset has been deleted. You must restore it before you can assign it to someone.',
- 'assigned_date' => 'Date Assigned',
- 'assigned_to' => 'Assigned to :name',
- 'assignee' => 'Assigned to',
+ 'assigned_date' => 'Datum dodjele',
+ 'assigned_to' => 'Dodijeljeno :name',
+ 'assignee' => 'Dodijeljeno',
'avatar_delete' => 'Obriši avatar',
'avatar_upload' => 'Učitaj avatar',
'back' => 'Nazad',
@@ -42,13 +43,13 @@ return [
'bulkaudit' => 'Skupna revizija',
'bulkaudit_status' => 'Status revizije',
'bulk_checkout' => 'Bulk Checkout',
- 'bulk_edit' => 'Bulk Edit',
- 'bulk_delete' => 'Bulk Delete',
+ 'bulk_edit' => 'Masovno uredi',
+ 'bulk_delete' => 'Masovno briši',
'bulk_actions' => 'Masovne radnje',
'bulk_checkin_delete' => 'Bulk Checkin / Delete Users',
'byod' => 'BYOD',
- 'byod_help' => 'This device is owned by the user',
- 'bystatus' => 'by Status',
+ 'byod_help' => 'Ovaj uređaj je vlasništvo korisnika',
+ 'bystatus' => 'po Statusu',
'cancel' => 'Otkazati',
'categories' => 'Kategorije',
'category' => 'Kategorija',
@@ -72,19 +73,19 @@ return [
'consumable' => 'potrošni',
'consumables' => 'Potrošni',
'country' => 'Zemlja',
- 'could_not_restore' => 'Error restoring :item_type: :error',
- 'not_deleted' => 'The :item_type is not deleted so it cannot be restored',
+ 'could_not_restore' => 'Greška u obnavljanju :item_type: :error',
+ 'not_deleted' => ':item_type nije brisan pa ne može biti ni vraćen',
'create' => 'Izradi novu',
'created' => 'Stavka je stvorena',
'created_asset' => 'stvorio imovinu',
- 'created_at' => 'Created At',
- 'created_by' => 'Created By',
- 'record_created' => 'Record Created',
+ 'created_at' => 'Izrađen',
+ 'created_by' => 'Izradio/la',
+ 'record_created' => 'Zapis izrađen',
'updated_at' => 'Ažurirano u',
'currency' => '$', // this is deprecated
'current' => 'struja',
- 'current_password' => 'Current Password',
- 'customize_report' => 'Customize Report',
+ 'current_password' => 'Postojeća lozinka',
+ 'customize_report' => 'Prilagodi izvještaj',
'custom_report' => 'Prilagođeno izvješće o aktivi',
'dashboard' => 'kontrolna ploča',
'days' => 'dana',
@@ -102,28 +103,28 @@ return [
'department' => 'odjel',
'deployed' => 'razmještene',
'depreciation' => 'deprecijacija',
- 'depreciations' => 'Depreciations',
+ 'depreciations' => 'Amortizacija',
'depreciation_report' => 'Izvješće o amortizaciji',
'details' => 'Detalji',
'download' => 'Preuzimanje',
- 'download_all' => 'Download All',
+ 'download_all' => 'Preuzmi sve',
'editprofile' => 'Uredi svoj profil',
'eol' => 'EOL',
'email_domain' => 'Domena e-pošte',
'email_format' => 'Format e-pošte',
- 'employee_number' => 'Employee Number',
+ 'employee_number' => 'Broj djelatnika',
'email_domain_help' => 'Ovo se koristi za generiranje e-adresa prilikom uvoza',
- 'error' => 'Error',
- 'exclude_archived' => 'Exclude Archived Assets',
- 'exclude_deleted' => 'Exclude Deleted Assets',
- 'example' => 'Example: ',
+ 'error' => 'Greška',
+ 'exclude_archived' => 'Isključi arhiviranu imovinu',
+ 'exclude_deleted' => 'Isključi izbrisanu imovinu',
+ 'example' => 'Primjer: ',
'filastname_format' => 'Prvo početno prezime (jsmith@example.com)',
'firstname_lastname_format' => 'Prezime prezime (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
'lastnamefirstinitial_format' => 'Prezime Prvo slovo imena (smithj@example.com)',
- 'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
- 'firstname_lastname_display' => 'First Name Last Name (Jane Smith)',
- 'lastname_firstname_display' => 'Last Name First Name (Smith Jane)',
+ 'firstintial_dot_lastname_format' => 'Inicijal imena i prezime (i.ivic)',
+ 'firstname_lastname_display' => 'Ime prezime (Ivana Ivić)',
+ 'lastname_firstname_display' => 'Prezime ime (Ivić Ivana)',
'name_display_format' => 'Name Display Format',
'first' => 'Prvi',
'firstnamelastname' => 'First Name Last Name (janesmith@example.com)',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Sljedeći',
'next_audit_date' => 'Sljedeći datum revizije',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Posljednja revizija',
'new' => 'novi!',
'no_depreciation' => 'Nema amortizacije',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/hr-HR/localizations.php b/resources/lang/hr-HR/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/hr-HR/localizations.php
+++ b/resources/lang/hr-HR/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/hr-HR/validation.php b/resources/lang/hr-HR/validation.php
index 616da01722..d9db981195 100644
--- a/resources/lang/hr-HR/validation.php
+++ b/resources/lang/hr-HR/validation.php
@@ -96,15 +96,17 @@ return [
'url' => 'Format atributa nije važeći.',
'unique_undeleted' => ':attribute mora biti jedinstven.',
'non_circular' => 'The :attribute must not create a circular reference.',
- 'not_array' => ':attribute cannot be an array.',
+ 'not_array' => ':attribute ne smije biti niz.',
'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
'letters' => 'Password must contain at least one letter.',
- 'numbers' => 'Password must contain at least one number.',
+ 'numbers' => 'Zaporka treba sadržavati barem jedan broj.',
'case_diff' => 'Password must use mixed case.',
'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/hu-HU/admin/hardware/message.php b/resources/lang/hu-HU/admin/hardware/message.php
index a6415cf40c..ca6ff3b486 100644
--- a/resources/lang/hu-HU/admin/hardware/message.php
+++ b/resources/lang/hu-HU/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Az eszköz sikeresen frissült.',
'nothing_updated' => 'Nem választottak ki mezőket, így semmi sem frissült.',
'no_assets_selected' => 'Egyetlen eszköz sem volt kiválasztva, így semmi sem frissült.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/hu-HU/admin/settings/general.php b/resources/lang/hu-HU/admin/settings/general.php
index e2daa2d8c3..4ce6326d52 100644
--- a/resources/lang/hu-HU/admin/settings/general.php
+++ b/resources/lang/hu-HU/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Két faktoros beiratkozás',
'two_factor_enabled_text' => 'Engedélyezze a két tényezőt',
'two_factor_reset' => 'Törölje a két faktor titkát',
- 'two_factor_reset_help' => 'Ez arra kényszeríti a felhasználót, hogy újból beiktassa eszközét a Google Hitelesítővel. Ez hasznos lehet, ha az éppen beiratkozott eszközüket elveszik vagy ellopják.',
+ 'two_factor_reset_help' => 'A felhasználónak újra fel kell vennie az eszközt a hitelesítő alkalmazásba. Ez hasznos lehet, ha az aktuálisan felvett eszközt elveszette vagy ellopták. ',
'two_factor_reset_success' => 'Két tényező eszköz sikeresen visszaáll',
'two_factor_reset_error' => 'Két faktoros eszköz visszaállítása sikertelen',
'two_factor_enabled_warning' => 'A két tényező bekapcsolása, ha nincs aktuálisan engedélyezve, azonnal kényszeríti Önt arra, hogy hitelesítést végezzen egy Google Auth által beiratkozott eszközzel. Lehetőséged lesz arra, hogy beírja a készüléket, ha nincs beiratkozva.',
diff --git a/resources/lang/hu-HU/general.php b/resources/lang/hu-HU/general.php
index 6be1d224ee..ee68ff9c39 100644
--- a/resources/lang/hu-HU/general.php
+++ b/resources/lang/hu-HU/general.php
@@ -1,6 +1,7 @@
'Kétfaktoros azonosítás alaphelyzetbe állítása',
'accessories' => 'Tartozékok',
'activated' => 'Aktivált',
'accepted_date' => 'Visszaigazolás dátuma',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Új jelszó',
'next' => 'Tovább',
'next_audit_date' => 'Következő ellenőrzési dátum',
+ 'no_email' => 'Ehhez a felhasználóhoz nincs e-mail társítva',
'last_audit' => 'Utolsó ellenőrzés',
'new' => 'új!',
'no_depreciation' => 'Nincs értékcsökkentés',
@@ -461,31 +463,31 @@ return [
'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.',
'modal_confirm_generic' => 'Biztos benne?',
'cannot_be_deleted' => 'Ez az elem nem törölhető',
- 'cannot_be_edited' => 'This item cannot be edited.',
- 'undeployable_tooltip' => 'This item cannot be checked out. Check the quantity remaining.',
+ 'cannot_be_edited' => 'Ez az elem nem szerkeszthető.',
+ 'undeployable_tooltip' => 'Ez az elem nem kiadható. Ellenőrizd a fennmaradó mennyiséget.',
'serial_number' => 'Sorozatszám',
'item_notes' => ':item Megjegyzések',
'item_name_var' => ':eszköz neve',
- 'error_user_company' => 'Checkout target company and asset company do not match',
- 'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
+ 'error_user_company' => 'A kiadásban szereplő cég nem egyezik meg az eszköznél megadott céggel',
+ 'error_user_company_accept_view' => 'Egy hozzád rendelt eszköz egy másik céghez tartozik, így nem fogadhatod el vagy utasíthatod vissza, kérlek egyeztess a vezetőddel',
'importer' => [
'checked_out_to_fullname' => 'Kiadva a következőnek: Full Name',
'checked_out_to_first_name' => 'Kiadva a következőnek: First Name',
'checked_out_to_last_name' => 'Kiadva a következőnek: Last Name',
'checked_out_to_username' => 'Kiadva a következőnek: Username',
'checked_out_to_email' => 'Kiadva a következőnek: Email',
- 'checked_out_to_tag' => 'Checked Out to: Asset Tag',
+ 'checked_out_to_tag' => 'Kiadva a következőnek: Asset Tag',
'manager_first_name' => 'Manager Keresztnév',
'manager_last_name' => 'Manager Vezetéknév',
'manager_full_name' => 'Manager Teljes Név',
'manager_username' => 'Manager Felhasználónév',
'checkout_type' => 'Kiadás Típusa',
- 'checkout_location' => 'Checkout to Location',
+ 'checkout_location' => 'Kiadás helyszínre',
'image_filename' => 'kép fájlnév',
'do_not_import' => 'Ne importáld',
'vip' => 'VIP',
'avatar' => 'Profilkép',
- 'gravatar' => 'Gravatar Email',
+ 'gravatar' => 'Gravatar e-mail',
'currency' => 'Pénznem',
'address2' => 'Cím sor 2',
'import_note' => 'A CSV importálóval betöltve',
@@ -496,7 +498,7 @@ return [
'copy_to_clipboard' => 'Másolás a vágólapra',
'copied' => 'Másolva!',
'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.',
- 'rtd_location_help' => 'This is the location of the asset when it is not checked out',
+ 'rtd_location_help' => 'Ez az eszköz helye, amikor nincs kiadva',
'item_not_found' => ':item_type ID :id nem létezik, vagy törölve lett',
'action_permission_denied' => 'Nincs jogosultsága a következőhöz: :action :item_type ID :id',
'action_permission_generic' => 'Nincs jogosultsága a következő művelethez: :action a következőn: :item_type',
@@ -511,11 +513,20 @@ return [
'header' => 'Bulk Delete :object_type',
'warn' => 'You are about to delete one :object_type|You are about to delete :count :object_type',
'success' => ':object_type successfully deleted|Successfully deleted :count :object_type',
- 'error' => 'Could not delete :object_type',
+ 'error' => 'A(z) :object_type törlése sikertelen volt',
'nothing_selected' => 'No :object_type selected - nothing to do',
'partial' => 'Deleted :success_count :object_type, but :error_count :object_type could not be deleted',
],
],
- 'no_requestable' => 'There are no requestable assets or asset models.',
+ 'no_requestable' => 'Nincs kikérhető eszköz, vagy eszköz modell.',
+
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
];
diff --git a/resources/lang/hu-HU/localizations.php b/resources/lang/hu-HU/localizations.php
index 70623335b5..e70829c9c6 100644
--- a/resources/lang/hu-HU/localizations.php
+++ b/resources/lang/hu-HU/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Szerb (latin betűs)',
'sk-SK'=> 'szlovák',
'sl-SI'=> 'Szlovèn',
+ 'so-SO'=> 'Szomáli',
'es-ES'=> 'Spanyol',
'es-CO'=> 'Spanyol, Kolumbia',
'es-MX'=> 'Spanyol, Mexikó',
diff --git a/resources/lang/hu-HU/validation.php b/resources/lang/hu-HU/validation.php
index 056c9e1fbf..72fe9af32c 100644
--- a/resources/lang/hu-HU/validation.php
+++ b/resources/lang/hu-HU/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Az érték nem lehet negatív'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/id-ID/admin/hardware/message.php b/resources/lang/id-ID/admin/hardware/message.php
index 5166beb5c4..5048ccf6bc 100644
--- a/resources/lang/id-ID/admin/hardware/message.php
+++ b/resources/lang/id-ID/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Sukses perbarui aset.',
'nothing_updated' => 'Tidak ada kolom yang dipilih, jadi tidak ada yang diperbaharui.',
'no_assets_selected' => 'Tidak ada aset yang dipilih, jadi tidak ada yang diperbarui.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/id-ID/admin/settings/general.php b/resources/lang/id-ID/admin/settings/general.php
index 1e2ed502f1..157b6339ff 100644
--- a/resources/lang/id-ID/admin/settings/general.php
+++ b/resources/lang/id-ID/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Pendaftaran Dua Faktor',
'two_factor_enabled_text' => 'Aktifkan Dua Faktor',
'two_factor_reset' => 'Reset Dua Faktor Rahasia',
- 'two_factor_reset_help' => 'Ini akan memaksa pengguna untuk mendaftarkan perangkat mereka dengan Google Authenticator lagi. Ini bisa berguna jika perangkat mereka saat ini terdaftar hilang atau dicuri.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Dua perangkat faktor berhasil di-reset',
'two_factor_reset_error' => 'Dua faktor perangkat reset gagal',
'two_factor_enabled_warning' => 'Mengaktifkan dua faktor jika saat ini tidak diaktifkan akan segera memaksa Anda untuk melakukan otentikasi dengan perangkat yang terdaftar di Google Auth. Anda akan memiliki kemampuan untuk mendaftarkan perangkat Anda jika seseorang tidak terdaftar saat ini.',
diff --git a/resources/lang/id-ID/general.php b/resources/lang/id-ID/general.php
index d0a9702667..644f947a46 100644
--- a/resources/lang/id-ID/general.php
+++ b/resources/lang/id-ID/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Aksesoris',
'activated' => 'Diaktifkan',
'accepted_date' => 'Tanggal Diterima',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Kata Sandi Baru',
'next' => 'Berikutnya',
'next_audit_date' => 'Tanggal Audit berikutnya',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Audit terakhir',
'new' => 'baru!',
'no_depreciation' => 'Tidak ada penyusutan',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/id-ID/localizations.php b/resources/lang/id-ID/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/id-ID/localizations.php
+++ b/resources/lang/id-ID/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/id-ID/validation.php b/resources/lang/id-ID/validation.php
index 8434e8f754..3d20f64887 100644
--- a/resources/lang/id-ID/validation.php
+++ b/resources/lang/id-ID/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/is-IS/admin/hardware/message.php b/resources/lang/is-IS/admin/hardware/message.php
index 923b64b88a..c6aa531ff9 100644
--- a/resources/lang/is-IS/admin/hardware/message.php
+++ b/resources/lang/is-IS/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset updated successfully.',
'nothing_updated' => 'No fields were selected, so nothing was updated.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/is-IS/admin/settings/general.php b/resources/lang/is-IS/admin/settings/general.php
index 466e9e93f6..a8a5c122f7 100644
--- a/resources/lang/is-IS/admin/settings/general.php
+++ b/resources/lang/is-IS/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/is-IS/general.php b/resources/lang/is-IS/general.php
index 90adb65a15..63acf5863f 100644
--- a/resources/lang/is-IS/general.php
+++ b/resources/lang/is-IS/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Aukahlutir',
'activated' => 'Virkjað',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nýtt lykilorð',
'next' => 'Næst',
'next_audit_date' => 'Dagsetning næstu úttektar',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Síðasta úttekt',
'new' => 'Nýtt',
'no_depreciation' => 'Engar afskriftir',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/is-IS/localizations.php b/resources/lang/is-IS/localizations.php
index 4df45857b9..aa6176add1 100644
--- a/resources/lang/is-IS/localizations.php
+++ b/resources/lang/is-IS/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/is-IS/validation.php b/resources/lang/is-IS/validation.php
index 7b54b3c7a2..34dffb25c7 100644
--- a/resources/lang/is-IS/validation.php
+++ b/resources/lang/is-IS/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/it-IT/admin/depreciations/general.php b/resources/lang/it-IT/admin/depreciations/general.php
index fced8ad21a..b1e9e9ef81 100644
--- a/resources/lang/it-IT/admin/depreciations/general.php
+++ b/resources/lang/it-IT/admin/depreciations/general.php
@@ -1,16 +1,16 @@
'About Obsolescenza Asset',
- 'about_depreciations' => 'Puoi settare l\'obsolescenza di un Asset per deprezzarlo in base alle percentuale di Obsolescenza.',
- 'asset_depreciations' => 'Obsolescenza Asset',
+ 'about_asset_depreciations' => 'Riguardo al deprezzamento dei Beni',
+ 'about_depreciations' => 'Puoi configurare i deprezzamenti dei Beni con criterio lineare costante.',
+ 'asset_depreciations' => 'Deprezzamento Beni',
'create' => 'Crea un deprezzamento',
- 'depreciation_name' => 'Nome Obsolescenza',
- 'depreciation_min' => 'Valore Finale Svalutazione',
+ 'depreciation_name' => 'Nome del deprezzamento',
+ 'depreciation_min' => 'Valore Finale del deprezzamento',
'number_of_months' => 'Numero di Mesi',
- 'update' => 'Aggiorna l\'ammortamento',
- 'depreciation_min' => 'Valore minimo dopo ammortamento',
+ 'update' => 'Aggiorna il deprezzamento',
+ 'depreciation_min' => 'Valore minimo dopo il deprezzamento',
'no_depreciations_warning' => 'Attenzione:
- Nessuna svalutazione impostata.
- Si prega di impostare almeno una Svalutazione per visualizzarne il report.',
+ Nessun deprezzamento impostato.
+ Si prega di impostare almeno un deprezzamento per visualizzarne il report.',
];
diff --git a/resources/lang/it-IT/admin/depreciations/message.php b/resources/lang/it-IT/admin/depreciations/message.php
index 0a1a770f49..9fcaaf69b8 100644
--- a/resources/lang/it-IT/admin/depreciations/message.php
+++ b/resources/lang/it-IT/admin/depreciations/message.php
@@ -2,24 +2,24 @@
return array(
- 'does_not_exist' => 'La classe di Obsolescenza non esiste.',
- 'assoc_users' => 'Il tipo di obsolescenza è associato con una o più modelli e non può essere cancellato. Prima cancella i modelli correlati e poi riprova a cancellarlo.',
+ 'does_not_exist' => 'La classe di deprezzamento non esiste.',
+ 'assoc_users' => 'Questo deprezzamento è associato con una o più modelli e non può essere cancellato. Prima toglilo dai modelli correlati e poi riprova a cancellarlo. ',
'create' => array(
- 'error' => 'La classe di Obsolescenza non è stata creata, riprova per favore. :(',
- 'success' => 'La classe di Obsolescenza è stata creata correttamente. :)'
+ 'error' => 'La classe di deprezzamento non è stata creata, riprova per favore. :(',
+ 'success' => 'Il deprezzamento è stato creato correttamente. :)'
),
'update' => array(
- 'error' => 'La classe di Obsolescenza non è stata aggiornata, per favore riprova',
- 'success' => 'La Classe di obsolescenza è stata aggiornate correttamente.'
+ 'error' => 'La classe di deprezzamento non è stata aggiornata, per favore riprova',
+ 'success' => 'La classe di deprezzamento è stata aggiornata correttamente.'
),
'delete' => array(
- 'confirm' => 'Sei sicuro di voler cancellare la classe di obsolescenza?',
+ 'confirm' => 'Sei sicuro di voler cancellare la classe di deprezzamento?',
'error' => 'C\'è stato un problema durante la cancellazione della classe. Per favore riprova.',
- 'success' => 'La classe è stata cancellata con successo.'
+ 'success' => 'La classe di deprezzamento è stata cancellata con successo.'
)
);
diff --git a/resources/lang/it-IT/admin/hardware/message.php b/resources/lang/it-IT/admin/hardware/message.php
index 8eccc15f44..f0304f6b68 100644
--- a/resources/lang/it-IT/admin/hardware/message.php
+++ b/resources/lang/it-IT/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Bene aggiornato con successo.',
'nothing_updated' => 'Non è stato selezionato nessun campo, nulla è stato aggiornato.',
'no_assets_selected' => 'Nessun asset è stato selezionato, quindi niente è stato eliminato.',
+ 'assets_do_not_exist_or_are_invalid' => 'Gli asset selezionati non possono essere aggiornati.',
],
'restore' => [
diff --git a/resources/lang/it-IT/admin/settings/general.php b/resources/lang/it-IT/admin/settings/general.php
index 9920b6e539..07051a200b 100644
--- a/resources/lang/it-IT/admin/settings/general.php
+++ b/resources/lang/it-IT/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Iscrizione a due fattori',
'two_factor_enabled_text' => 'Abilita due fattori',
'two_factor_reset' => 'Resettare il segreto a due fattori',
- 'two_factor_reset_help' => 'Ciò obbligherà l\'utente a registrare nuovamente il proprio dispositivo con Google Authenticator. Ciò può essere utile se il dispositivo correntemente iscritto viene perso o rubato.',
+ 'two_factor_reset_help' => 'Questo obbligherà l\'utente a registrare nuovamente il proprio dispositivo con l\'app di autenticazione. Questo può essere utile se il loro dispositivo attualmente iscritto viene perso o rubato. ',
'two_factor_reset_success' => 'Il dispositivo a due fattori viene resettato con successo',
'two_factor_reset_error' => 'Il reset del dispositivo a due fattori è fallito',
'two_factor_enabled_warning' => 'L\'abilitazione di due fattori se non è attualmente abilitata vi obbliga immediatamente a autenticare con un dispositivo di accesso a Google Auth. Avrai la possibilità di registrare il tuo dispositivo se uno non è attualmente iscritto.',
diff --git a/resources/lang/it-IT/general.php b/resources/lang/it-IT/general.php
index fe2e0a0ca2..949030aecc 100644
--- a/resources/lang/it-IT/general.php
+++ b/resources/lang/it-IT/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessori',
'activated' => 'Attivato',
'accepted_date' => 'Accettato Il',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nuova password',
'next' => 'Successivo',
'next_audit_date' => 'Prossima data di controllo',
+ 'no_email' => 'Nessun indirizzo email associato a questo utente',
'last_audit' => 'Ultimo Controllo Inventario',
'new' => 'nuovo!',
'no_depreciation' => 'Nessuna Svalutazione',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Non ci sono asset o modelli di asset richiesti.',
+ 'countable' => [
+ 'accessories' => ':count Accessorio|:count Accessori',
+ 'assets' => ':count Bene|:count Beni',
+ 'licenses' => ':count Licenza|:count Licenze',
+ 'license_seats' => ':count Disponibilità Licenza|:count Disponibilità Licenza',
+ 'consumables' => ':count Consumabile|:count Consumabili',
+ 'components' => ':count Componente|:count Componenti',
+ ]
+
];
diff --git a/resources/lang/it-IT/localizations.php b/resources/lang/it-IT/localizations.php
index bccff39b89..cc7ff23b16 100644
--- a/resources/lang/it-IT/localizations.php
+++ b/resources/lang/it-IT/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbo (Latino)',
'sk-SK'=> 'Slovacco',
'sl-SI'=> 'Sloveno',
+ 'so-SO'=> 'Somalo',
'es-ES'=> 'Spagnolo',
'es-CO'=> 'Spagnolo (Colombia)',
'es-MX'=> 'Spagnolo (Messico)',
diff --git a/resources/lang/it-IT/validation.php b/resources/lang/it-IT/validation.php
index e00696e2ad..bfe552ec6c 100644
--- a/resources/lang/it-IT/validation.php
+++ b/resources/lang/it-IT/validation.php
@@ -16,7 +16,7 @@ return [
'accepted' => ':attribute deve essere accettato.',
'active_url' => ':attribute non è un URL valido.',
'after' => ':attribute deve essere una data oltre il :date.',
- 'after_or_equal' => ':attribute deve essere una data successiva o uguale a :data .',
+ 'after_or_equal' => ':attribute deve essere una data successiva o uguale a :date .',
'alpha' => ':attribute può contenere solo lettere.',
'alpha_dash' => ':attribute può contenere solo lettere numeri e trattini.',
'alpha_num' => ':attribute può contenere solo lettere e numeri.',
@@ -30,7 +30,7 @@ return [
'array' => ':attribute deve avere tra: min e: max elementi.',
],
'boolean' => ':attribute deve essere o vero o falso.',
- 'confirmed' => 'il :attribute non corrisponde.',
+ 'confirmed' => 'La conferma di :attribute non corrisponde.',
'date' => ':attribute non è una data valida.',
'date_format' => 'il :attribute non corrisponde al :format.',
'different' => ':attribute e :other devono essere differenti.',
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Il valore non può essere negativo'
],
+ 'checkboxes' => ':attribute contiene opzioni non valide.',
+ 'radio_buttons' => ':attribute non è valido.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Valore non valido incluso in questo campo',
];
diff --git a/resources/lang/iu-NU/admin/hardware/message.php b/resources/lang/iu-NU/admin/hardware/message.php
index 056692998e..bf050ef974 100644
--- a/resources/lang/iu-NU/admin/hardware/message.php
+++ b/resources/lang/iu-NU/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset updated successfully.',
'nothing_updated' => 'No fields were selected, so nothing was updated.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/iu-NU/admin/settings/general.php b/resources/lang/iu-NU/admin/settings/general.php
index 33cfd7b416..71fb8eb2c6 100644
--- a/resources/lang/iu-NU/admin/settings/general.php
+++ b/resources/lang/iu-NU/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/iu-NU/general.php b/resources/lang/iu-NU/general.php
index f7fb41743e..9f9a0e08c7 100644
--- a/resources/lang/iu-NU/general.php
+++ b/resources/lang/iu-NU/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessories',
'activated' => 'Activated',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Next',
'next_audit_date' => 'Next Audit Date',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/iu-NU/localizations.php b/resources/lang/iu-NU/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/iu-NU/localizations.php
+++ b/resources/lang/iu-NU/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/iu-NU/validation.php b/resources/lang/iu-NU/validation.php
index 1c6ad8a148..05374e23af 100644
--- a/resources/lang/iu-NU/validation.php
+++ b/resources/lang/iu-NU/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/ja-JP/admin/hardware/message.php b/resources/lang/ja-JP/admin/hardware/message.php
index cf7a5e8d2b..53144df171 100644
--- a/resources/lang/ja-JP/admin/hardware/message.php
+++ b/resources/lang/ja-JP/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => '資産は正常に更新されました。',
'nothing_updated' => 'フィールドが選択されていないため、更新されませんでした。',
'no_assets_selected' => '資産が選択されていないため、何も更新されませんでした。',
+ 'assets_do_not_exist_or_are_invalid' => '選択したアセットは更新できません。',
],
'restore' => [
diff --git a/resources/lang/ja-JP/admin/settings/general.php b/resources/lang/ja-JP/admin/settings/general.php
index 3615d03235..1633de6d32 100644
--- a/resources/lang/ja-JP/admin/settings/general.php
+++ b/resources/lang/ja-JP/admin/settings/general.php
@@ -264,7 +264,7 @@ return [
'two_factor_enrollment' => '二段階認証登録',
'two_factor_enabled_text' => '二段階認証を有効',
'two_factor_reset' => '二段階認証をリセット',
- 'two_factor_reset_help' => 'ユーザーはGoogle Authenticatorでデバイスを再度登録する必要があります。これは、現在登録されているデバイスを紛失または盗難した場合に便利です。 ',
+ 'two_factor_reset_help' => 'これにより、ユーザーは認証アプリでデバイスを再度登録することが強制されます。 これは、現在登録されているデバイスを紛失または盗難された場合に便利です。 ',
'two_factor_reset_success' => '二段階認証は正常にリセットされました。',
'two_factor_reset_error' => '二段階認証のデバイスリセットに失敗しました。',
'two_factor_enabled_warning' => '二段階認証を有効にすると、Google Authenticatorでの認証が強制されます。あなたがお持ちのデバイスを登録することができます。',
diff --git a/resources/lang/ja-JP/general.php b/resources/lang/ja-JP/general.php
index 13517b9ada..33e65f9a1e 100644
--- a/resources/lang/ja-JP/general.php
+++ b/resources/lang/ja-JP/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => '付属品',
'activated' => 'アクティベート',
'accepted_date' => '受理日',
@@ -201,6 +202,7 @@ return [
'new_password' => '新しいパスワード',
'next' => '次へ',
'next_audit_date' => '次の監査日',
+ 'no_email' => 'このユーザーに関連付けられているメールアドレスがありません',
'last_audit' => '前回の監査日',
'new' => '新規',
'no_depreciation' => '非減価償却資産',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => '要求可能な資産または資産モデルはありません。',
+ 'countable' => [
+ 'accessories' => ':count アクセサリー',
+ 'assets' => ':count アセット',
+ 'licenses' => ':count ライセンス',
+ 'license_seats' => ':count個のライセンスシート',
+ 'consumables' => ':count 消耗品数',
+ 'components' => ':count コンポーネント',
+ ]
+
];
diff --git a/resources/lang/ja-JP/localizations.php b/resources/lang/ja-JP/localizations.php
index 0f3cff3d38..07edf8a503 100644
--- a/resources/lang/ja-JP/localizations.php
+++ b/resources/lang/ja-JP/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'スロバキア語',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'ソマリ語',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/ja-JP/validation.php b/resources/lang/ja-JP/validation.php
index a86f58a761..98f080b3e2 100644
--- a/resources/lang/ja-JP/validation.php
+++ b/resources/lang/ja-JP/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => '負の値にすることはできません'
],
+ 'checkboxes' => ':attribute に無効なオプションが含まれています。',
+ 'radio_buttons' => ':attribute は不正です。',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'このフィールドに含まれる値が無効です',
];
diff --git a/resources/lang/km-KH/account/general.php b/resources/lang/km-KH/account/general.php
index 7fc060a849..545f423b9c 100644
--- a/resources/lang/km-KH/account/general.php
+++ b/resources/lang/km-KH/account/general.php
@@ -1,12 +1,12 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
+ 'personal_api_keys' => 'សោ API ផ្ទាល់ខ្លួន',
+ 'api_key_warning' => 'នៅពេលបង្កើតនិមិត្តសញ្ញា API ត្រូវប្រាកដថាចម្លងវាភ្លាមៗដូចដែលពួកវា
+ នឹងមិនបង្ហាញឱ្យអ្នកឃើញម្តងទៀតទេ។',
+ 'api_base_url' => 'Url មូលដ្ឋាន API របស់អ្នកមានទីតាំងនៅ៖',
'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'api_token_expiration_time' => 'និមិត្តសញ្ញា API ត្រូវបានកំណត់ឱ្យផុតកំណត់នៅក្នុង៖',
+ 'api_reference' => 'សូមពិនិត្យមើល ឯកសារយោង API ទៅ
+ ស្វែងរកចំណុចបញ្ចប់ API ជាក់លាក់ និងឯកសារ API បន្ថែម',
);
diff --git a/resources/lang/km-KH/admin/hardware/message.php b/resources/lang/km-KH/admin/hardware/message.php
index e6bd7a39c4..f593f9c774 100644
--- a/resources/lang/km-KH/admin/hardware/message.php
+++ b/resources/lang/km-KH/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'ទ្រព្យសកម្មបានធ្វើបច្ចុប្បន្នភាពដោយជោគជ័យ។',
'nothing_updated' => 'គ្មានវាលត្រូវបានជ្រើស ដូច្នេះមិនមានអ្វីត្រូវបានធ្វើបច្ចុប្បន្នភាព។',
'no_assets_selected' => 'គ្មានទ្រព្យសម្បត្តិត្រូវបានជ្រើសរើស ដូច្នេះគ្មានអ្វីត្រូវបានធ្វើបច្ចុប្បន្នភាពទេ។',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/km-KH/admin/settings/general.php b/resources/lang/km-KH/admin/settings/general.php
index db82420714..3d199fce15 100644
--- a/resources/lang/km-KH/admin/settings/general.php
+++ b/resources/lang/km-KH/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/km-KH/admin/statuslabels/message.php b/resources/lang/km-KH/admin/statuslabels/message.php
index b1b4034d0d..863102d7b0 100644
--- a/resources/lang/km-KH/admin/statuslabels/message.php
+++ b/resources/lang/km-KH/admin/statuslabels/message.php
@@ -2,31 +2,31 @@
return [
- 'does_not_exist' => 'Status Label does not exist.',
- 'deleted_label' => 'Deleted Status Label',
- 'assoc_assets' => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
+ 'does_not_exist' => 'ស្លាកស្ថានភាពមិនមានទេ។',
+ 'deleted_label' => 'បានលុបស្លាកស្ថានភាព',
+ 'assoc_assets' => 'ស្លាកស្ថានភាពនេះបច្ចុប្បន្នត្រូវបានភ្ជាប់ជាមួយទ្រព្យសម្បត្តិយ៉ាងហោចណាស់មួយ ហើយមិនអាចលុបបានទេ។ សូមធ្វើបច្ចុប្បន្នភាពទ្រព្យសកម្មរបស់អ្នកដើម្បីលែងយោងស្ថានភាពនេះហើយព្យាយាមម្ដងទៀត។ ',
'create' => [
- 'error' => 'Status Label was not created, please try again.',
- 'success' => 'Status Label created successfully.',
+ 'error' => 'ស្លាកស្ថានភាពមិនត្រូវបានបង្កើតទេ សូមព្យាយាមម្តងទៀត។',
+ 'success' => 'ស្លាកស្ថានភាពបានបង្កើតដោយជោគជ័យ។',
],
'update' => [
- 'error' => 'Status Label was not updated, please try again',
- 'success' => 'Status Label updated successfully.',
+ 'error' => 'ស្លាកស្ថានភាពមិនត្រូវបានធ្វើបច្ចុប្បន្នភាពទេ សូមព្យាយាមម្តងទៀត',
+ 'success' => 'បានធ្វើបច្ចុប្បន្នភាពស្លាកស្ថានភាពដោយជោគជ័យ។',
],
'delete' => [
- 'confirm' => 'Are you sure you wish to delete this Status Label?',
- 'error' => 'There was an issue deleting the Status Label. Please try again.',
- 'success' => 'The Status Label was deleted successfully.',
+ 'confirm' => 'តើអ្នកប្រាកដថាចង់លុបស្លាកស្ថានភាពនេះទេ?',
+ 'error' => 'មានបញ្ហាក្នុងការលុបស្លាកស្ថានភាព។ សូមព្យាយាមម្តងទៀត។',
+ 'success' => 'ស្លាកស្ថានភាពត្រូវបានលុបដោយជោគជ័យ។',
],
'help' => [
- 'undeployable' => 'These assets cannot be assigned to anyone.',
+ 'undeployable' => 'ទ្រព្យសម្បត្តិទាំងនេះមិនអាចប្រគល់ឱ្យអ្នកណាម្នាក់បានទេ។',
'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.',
'archived' => 'These assets cannot be checked out, and will only show up in the Archived view. This is useful for retaining information about assets for budgeting/historic purposes but keeping them out of the day-to-day asset list.',
- 'pending' => 'These assets can not yet be assigned to anyone, often used for items that are out for repair, but are expected to return to circulation.',
+ 'pending' => 'ទ្រព្យសម្បត្តិទាំងនេះមិនទាន់អាចប្រគល់ឱ្យអ្នកណាម្នាក់បានទេ ដែលជារឿយៗត្រូវបានប្រើប្រាស់សម្រាប់វត្ថុដែលអស់សម្រាប់ការជួសជុល ប៉ុន្តែត្រូវបានគេរំពឹងថានឹងត្រឡប់មកចរាចរវិញ។',
],
];
diff --git a/resources/lang/km-KH/general.php b/resources/lang/km-KH/general.php
index d8b777b5bd..ce1f27a699 100644
--- a/resources/lang/km-KH/general.php
+++ b/resources/lang/km-KH/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'គ្រឿងបន្លាស់',
'activated' => 'បានធ្វើឱ្យសកម្ម',
'accepted_date' => 'កាលបរិច្ឆេទទទួលយក',
@@ -201,6 +202,7 @@ return [
'new_password' => 'ពាក្យសម្ងាត់ថ្មី',
'next' => 'បន្ទាប់',
'next_audit_date' => 'កាលបរិច្ឆេទសវនកម្មបន្ទាប់',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'សវនកម្មចុងក្រោយ',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/km-KH/localizations.php b/resources/lang/km-KH/localizations.php
index bd458e625f..7abb9b3d5e 100644
--- a/resources/lang/km-KH/localizations.php
+++ b/resources/lang/km-KH/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'ស៊ែប៊ី (ឡាតាំង)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'ស្លូវេនី',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'ភាសាអេស្ប៉ាញ',
'es-CO'=> 'អេស្ប៉ាញ កូឡុំប៊ី',
'es-MX'=> 'អេស្ប៉ាញ ម៉ិកស៊ិក',
diff --git a/resources/lang/km-KH/passwords.php b/resources/lang/km-KH/passwords.php
index 41a87f98ed..56003e7e9c 100644
--- a/resources/lang/km-KH/passwords.php
+++ b/resources/lang/km-KH/passwords.php
@@ -1,9 +1,9 @@
'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
- 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
- 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
- 'reset' => 'Your password has been reset!',
- 'password_change' => 'Your password has been updated!',
+ 'sent' => 'ប្រសិនបើអ្នកប្រើដែលត្រូវគ្នាជាមួយអាសយដ្ឋានអ៊ីមែលត្រឹមត្រូវមាននៅក្នុងប្រព័ន្ធរបស់យើង អ៊ីមែលសង្គ្រោះពាក្យសម្ងាត់ត្រូវបានផ្ញើ។',
+ 'user' => 'ប្រសិនបើអ្នកប្រើដែលត្រូវគ្នាជាមួយអាសយដ្ឋានអ៊ីមែលត្រឹមត្រូវមាននៅក្នុងប្រព័ន្ធរបស់យើង អ៊ីមែលសង្គ្រោះពាក្យសម្ងាត់ត្រូវបានផ្ញើ។',
+ 'token' => 'និមិត្តសញ្ញាកំណត់ពាក្យសម្ងាត់ឡើងវិញនេះគឺមិនត្រឹមត្រូវ ឬផុតកំណត់ ឬមិនត្រូវគ្នានឹងឈ្មោះអ្នកប្រើប្រាស់ដែលបានផ្តល់។',
+ 'reset' => 'ពាក្យសម្ងាត់របស់អ្នកត្រូវបានកំណត់ឡើងវិញ!',
+ 'password_change' => 'ពាក្យសម្ងាត់របស់អ្នកត្រូវបានធ្វើបច្ចុប្បន្នភាព!',
];
diff --git a/resources/lang/km-KH/reminders.php b/resources/lang/km-KH/reminders.php
index 8a197467df..b0285bce30 100644
--- a/resources/lang/km-KH/reminders.php
+++ b/resources/lang/km-KH/reminders.php
@@ -13,9 +13,9 @@ return array(
|
*/
- "password" => "Passwords must be six characters and match the confirmation.",
- "user" => "Username or email address is incorrect",
- "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
- 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ "password" => "ពាក្យសម្ងាត់ត្រូវតែមានប្រាំមួយតួអក្សរ ហើយត្រូវគ្នានឹងការបញ្ជាក់។",
+ "user" => "ឈ្មោះអ្នកប្រើ ឬអាសយដ្ឋានអ៊ីមែលមិនត្រឹមត្រូវ។",
+ "token" => 'និមិត្តសញ្ញាកំណត់ពាក្យសម្ងាត់ឡើងវិញនេះគឺមិនត្រឹមត្រូវ ឬផុតកំណត់ ឬមិនត្រូវគ្នានឹងឈ្មោះអ្នកប្រើប្រាស់ដែលបានផ្តល់។',
+ 'sent' => 'ប្រសិនបើអ្នកប្រើដែលត្រូវគ្នាជាមួយអាសយដ្ឋានអ៊ីមែលត្រឹមត្រូវមាននៅក្នុងប្រព័ន្ធរបស់យើង អ៊ីមែលសង្គ្រោះពាក្យសម្ងាត់ត្រូវបានផ្ញើ។',
);
diff --git a/resources/lang/km-KH/validation.php b/resources/lang/km-KH/validation.php
index 1c6ad8a148..cd6d9d7e8b 100644
--- a/resources/lang/km-KH/validation.php
+++ b/resources/lang/km-KH/validation.php
@@ -13,13 +13,13 @@ return [
|
*/
- 'accepted' => 'The :attribute must be accepted.',
- 'active_url' => 'The :attribute is not a valid URL.',
- 'after' => 'The :attribute must be a date after :date.',
- 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
- 'alpha' => 'The :attribute may only contain letters.',
- 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
- 'alpha_num' => 'The :attribute may only contain letters and numbers.',
+ 'accepted' => 'គុណលក្ខណៈ : ត្រូវតែទទួលយក។',
+ 'active_url' => ':attribute មិនមែនជា URL ត្រឹមត្រូវទេ។',
+ 'after' => ':attribute ត្រូវតែជាកាលបរិច្ឆេទបន្ទាប់ពី :date ។',
+ 'after_or_equal' => ':attribute ត្រូវតែជាកាលបរិច្ឆេទបន្ទាប់ពី ឬស្មើនឹង :date។',
+ 'alpha' => ':attribute អាចមានត្រឹមតែអក្សរប៉ុណ្ណោះ។',
+ 'alpha_dash' => ':attribute អាចមានតែអក្សរ លេខ និងសញ្ញាដាច់ៗប៉ុណ្ណោះ។',
+ 'alpha_num' => ':attribute អាចមានត្រឹមតែអក្សរ និងលេខប៉ុណ្ណោះ។',
'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/ko-KR/admin/hardware/message.php b/resources/lang/ko-KR/admin/hardware/message.php
index 2fa56ebd83..31482a0c70 100644
--- a/resources/lang/ko-KR/admin/hardware/message.php
+++ b/resources/lang/ko-KR/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => '자산이 갱신되었습니다.',
'nothing_updated' => '선택된 항목이 없어서, 갱신 되지 않습니다.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/ko-KR/admin/settings/general.php b/resources/lang/ko-KR/admin/settings/general.php
index de7c71fe24..586a2fc99b 100644
--- a/resources/lang/ko-KR/admin/settings/general.php
+++ b/resources/lang/ko-KR/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => '2단계 등록',
'two_factor_enabled_text' => '2중 활성화',
'two_factor_reset' => '2중 보안 재설정',
- 'two_factor_reset_help' => '이 기능은 강제로 사용자들을 구글 인증을 사용하여 각각의 장치에 다시 등록하게 합니다. 이 기능은 현재 등록한 장치들이 분실이나 도난 당했다면 유용할 것입니다. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => '2중 장치 재설정이 되었습니다',
'two_factor_reset_error' => '2중 장치 재설정이 실패했습니다',
'two_factor_enabled_warning' => '2중 활성화가 현재 활성화되지 않다면 구글 인증으로 등록된 장치를 즉시 강제로 인증하게 할 것입니다. 당신은 하나가 현재 등록되지 않았다면 당신의 장치를 등록할 수 있어야 합니다.',
diff --git a/resources/lang/ko-KR/general.php b/resources/lang/ko-KR/general.php
index 437e543520..a987a9e881 100644
--- a/resources/lang/ko-KR/general.php
+++ b/resources/lang/ko-KR/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => '부속품들',
'activated' => '활성화',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => '새로운 비밀번호',
'next' => '다음',
'next_audit_date' => '다음 감사 일자',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => '최근 감사',
'new' => '신규!',
'no_depreciation' => '감가 상각 없음',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/ko-KR/localizations.php b/resources/lang/ko-KR/localizations.php
index b5b079d9ce..863b6890a9 100644
--- a/resources/lang/ko-KR/localizations.php
+++ b/resources/lang/ko-KR/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/ko-KR/validation.php b/resources/lang/ko-KR/validation.php
index ff1ab0a6f2..edd447f250 100644
--- a/resources/lang/ko-KR/validation.php
+++ b/resources/lang/ko-KR/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/lt-LT/admin/hardware/message.php b/resources/lang/lt-LT/admin/hardware/message.php
index 394a8fa6c9..df1b51e3b0 100644
--- a/resources/lang/lt-LT/admin/hardware/message.php
+++ b/resources/lang/lt-LT/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Įranga sėkmingai atnaujinta.',
'nothing_updated' => 'Nei vienas laukelis nepasirinktas, tad niekas nebuvo atnaujinta.',
'no_assets_selected' => 'Nebuvo pasirinkta jokio turto, taigi niekas nebuvo pakeistas.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/lt-LT/admin/settings/general.php b/resources/lang/lt-LT/admin/settings/general.php
index 32b0f9f7a1..bd121a145e 100644
--- a/resources/lang/lt-LT/admin/settings/general.php
+++ b/resources/lang/lt-LT/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Dviejų veiksnių registracija',
'two_factor_enabled_text' => 'Įgalinti du veiksnius',
'two_factor_reset' => 'Atstatyti dviejų veiksnių paslaptį',
- 'two_factor_reset_help' => 'Tai privers naudotoją vėl įrašyti įrenginį "Google" autentifikavimo priemone. Tai gali būti naudinga, jei jų šiuo metu užregistruotas įrenginys yra pamestas ar pavogtas.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Dviejų veiksnių įrenginys sėkmingai iš naujo nustatomas',
'two_factor_reset_error' => 'Dviejų veiksnių įrenginio atstatymas nepavyko',
'two_factor_enabled_warning' => 'Įjungus dviejų faktorių, jei jis šiuo metu neįjungtas, iš karto privers jus patvirtinti autentifikavimu naudojant "Google" prijungtą įrenginį. Jūs turėsite galimybę įregistruoti savo įrenginį, jei jis šiuo metu nėra įtrauktas.',
diff --git a/resources/lang/lt-LT/general.php b/resources/lang/lt-LT/general.php
index 7566d40f40..11faab8d2a 100644
--- a/resources/lang/lt-LT/general.php
+++ b/resources/lang/lt-LT/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Įrangos',
'activated' => 'Aktyvuota',
'accepted_date' => 'Priėmimo data',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Naujas slaptažodis',
'next' => 'Kitas',
'next_audit_date' => 'Kito audito data',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Paskutinis auditas',
'new' => 'naujas!',
'no_depreciation' => 'Nėra nusidėvėjimo',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/lt-LT/localizations.php b/resources/lang/lt-LT/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/lt-LT/localizations.php
+++ b/resources/lang/lt-LT/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/lt-LT/validation.php b/resources/lang/lt-LT/validation.php
index 04ed2b947c..644cea938c 100644
--- a/resources/lang/lt-LT/validation.php
+++ b/resources/lang/lt-LT/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/lv-LV/admin/hardware/message.php b/resources/lang/lv-LV/admin/hardware/message.php
index 973d964c7c..077060ff91 100644
--- a/resources/lang/lv-LV/admin/hardware/message.php
+++ b/resources/lang/lv-LV/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Īpašums ir veiksmīgi atjaunināts.',
'nothing_updated' => 'Lauki nav atlasīti, tāpēc nekas netika atjaunināts.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/lv-LV/admin/settings/general.php b/resources/lang/lv-LV/admin/settings/general.php
index e1f76c7bf5..56d4044e47 100644
--- a/resources/lang/lv-LV/admin/settings/general.php
+++ b/resources/lang/lv-LV/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Divu faktoru uzņemšana',
'two_factor_enabled_text' => 'Iespējot divus faktorus',
'two_factor_reset' => 'Atiestatīt divfaktora noslēpumu',
- 'two_factor_reset_help' => 'Tas liks lietotājam vēlreiz reģistrēt savu ierīci, izmantojot Google autentifikatoru. Tas var būt noderīgi, ja to pašreizējā reģistrētā ierīce tiek nozaudēta vai nozagta.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Divu faktoru ierīce ir veiksmīgi atiestatīta',
'two_factor_reset_error' => 'Divu faktoru ierīces atiestatīšana neizdevās',
'two_factor_enabled_warning' => 'Iespējojot divu faktoru darbību, ja tas pašlaik nav iespējots, jūs nekavējoties piespiedīs autentificēt ar Google Auth reģistrēto ierīci. Jums būs iespēja ierakstīt savu ierīci, ja tā pašlaik nav reģistrēta.',
diff --git a/resources/lang/lv-LV/general.php b/resources/lang/lv-LV/general.php
index 0dac5434bf..a59892661a 100644
--- a/resources/lang/lv-LV/general.php
+++ b/resources/lang/lv-LV/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Aksesuāri',
'activated' => 'Aktivizēts',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Jauna parole',
'next' => 'Nākamais',
'next_audit_date' => 'Nākamā audita datums',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Pēdējais audits',
'new' => 'jauns!',
'no_depreciation' => 'Nav nolietojuma',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/lv-LV/localizations.php b/resources/lang/lv-LV/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/lv-LV/localizations.php
+++ b/resources/lang/lv-LV/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/lv-LV/validation.php b/resources/lang/lv-LV/validation.php
index 007fbc3e99..bb08c9734a 100644
--- a/resources/lang/lv-LV/validation.php
+++ b/resources/lang/lv-LV/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/mi-NZ/admin/hardware/message.php b/resources/lang/mi-NZ/admin/hardware/message.php
index 281d887e47..38ee35778b 100644
--- a/resources/lang/mi-NZ/admin/hardware/message.php
+++ b/resources/lang/mi-NZ/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Kua whakahoutia te tahua.',
'nothing_updated' => 'Kaore i whiriwhiria he mahinga, na reira kaore i whakahoutia.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/mi-NZ/admin/settings/general.php b/resources/lang/mi-NZ/admin/settings/general.php
index c50b5e5e74..3f2e091a65 100644
--- a/resources/lang/mi-NZ/admin/settings/general.php
+++ b/resources/lang/mi-NZ/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Te whakaurunga e rua',
'two_factor_enabled_text' => 'Whakahohehia te Mea Tuarua',
'two_factor_reset' => 'Tautuhi anō i te Tino Tuarua',
- 'two_factor_reset_help' => 'Ma tenei ka akiaki te kaiwhakamahi ki te whakauru i to raatau mahi ki a Google Authenticator. Ka taea e tenei te whai hua ki te ngaro, ki te tahaehia ranei to raanei.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'E rua tautuhinga pūrere e tautuhi ana',
'two_factor_reset_error' => 'I rahua nga tautuhinga tautuhi piti',
'two_factor_enabled_warning' => 'Ka taea e koe te whakauru i nga take e rua ki te kore e taea te mahi i tenei wa ka akiaki koe ki te whakauru ki te kaupapa a Google Auth. Ka taea e koe te whakauru i to raatau ki te kore tetahi e whakauruhia ana.',
diff --git a/resources/lang/mi-NZ/general.php b/resources/lang/mi-NZ/general.php
index 32d3b2c7ec..39330f5f33 100644
--- a/resources/lang/mi-NZ/general.php
+++ b/resources/lang/mi-NZ/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Tuhinga',
'activated' => 'Kua whakahohe',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Tuhinga o mua',
'next_audit_date' => 'Ko te Raa Whakakitea',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Whakamutunga whakamutunga',
'new' => 'hou!',
'no_depreciation' => 'Kaore he utu whakaheke',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/mi-NZ/localizations.php b/resources/lang/mi-NZ/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/mi-NZ/localizations.php
+++ b/resources/lang/mi-NZ/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/mi-NZ/validation.php b/resources/lang/mi-NZ/validation.php
index 57a1043b86..6aff446fe4 100644
--- a/resources/lang/mi-NZ/validation.php
+++ b/resources/lang/mi-NZ/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/mk-MK/admin/hardware/message.php b/resources/lang/mk-MK/admin/hardware/message.php
index 08ad1e3319..24d11d225f 100644
--- a/resources/lang/mk-MK/admin/hardware/message.php
+++ b/resources/lang/mk-MK/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Основното средство е успешно ажурирано.',
'nothing_updated' => 'Не беа избрани полиња, затоа ништо не беше ажурирано.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/mk-MK/admin/settings/general.php b/resources/lang/mk-MK/admin/settings/general.php
index 329a213cac..bfae7b8336 100644
--- a/resources/lang/mk-MK/admin/settings/general.php
+++ b/resources/lang/mk-MK/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/mk-MK/general.php b/resources/lang/mk-MK/general.php
index 508c31a6bc..bfaabcc1e2 100644
--- a/resources/lang/mk-MK/general.php
+++ b/resources/lang/mk-MK/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Додатоци',
'activated' => 'Активиран',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Следно',
'next_audit_date' => 'Следен датум на ревизија',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Последна ревизија',
'new' => 'ново!',
'no_depreciation' => 'Не се амортизира',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/mk-MK/localizations.php b/resources/lang/mk-MK/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/mk-MK/localizations.php
+++ b/resources/lang/mk-MK/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/mk-MK/validation.php b/resources/lang/mk-MK/validation.php
index b28274b9b9..457dc73d11 100644
--- a/resources/lang/mk-MK/validation.php
+++ b/resources/lang/mk-MK/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/ml-IN/admin/hardware/message.php b/resources/lang/ml-IN/admin/hardware/message.php
index 056692998e..bf050ef974 100644
--- a/resources/lang/ml-IN/admin/hardware/message.php
+++ b/resources/lang/ml-IN/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset updated successfully.',
'nothing_updated' => 'No fields were selected, so nothing was updated.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/ml-IN/admin/settings/general.php b/resources/lang/ml-IN/admin/settings/general.php
index 33cfd7b416..71fb8eb2c6 100644
--- a/resources/lang/ml-IN/admin/settings/general.php
+++ b/resources/lang/ml-IN/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Two-Factor Enrollment',
'two_factor_enabled_text' => 'Enable Two Factor',
'two_factor_reset' => 'Reset Two-Factor Secret',
- 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Two factor device successfully reset',
'two_factor_reset_error' => 'Two factor device reset failed',
'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.',
diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php
index 07ef6a5e41..e9f23a1df8 100644
--- a/resources/lang/ml-IN/general.php
+++ b/resources/lang/ml-IN/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessories',
'activated' => 'Activated',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Next',
'next_audit_date' => 'Next Audit Date',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/ml-IN/localizations.php b/resources/lang/ml-IN/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/ml-IN/localizations.php
+++ b/resources/lang/ml-IN/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/ml-IN/validation.php b/resources/lang/ml-IN/validation.php
index 1c6ad8a148..05374e23af 100644
--- a/resources/lang/ml-IN/validation.php
+++ b/resources/lang/ml-IN/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/mn-MN/admin/hardware/message.php b/resources/lang/mn-MN/admin/hardware/message.php
index b67e01d594..3fb528eaa0 100644
--- a/resources/lang/mn-MN/admin/hardware/message.php
+++ b/resources/lang/mn-MN/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Акт амжилттай шинэчлэгдсэн.',
'nothing_updated' => 'Ямар ч талбар сонгогдоогүй тул шинэчлэгдээгүй байна.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/mn-MN/admin/settings/general.php b/resources/lang/mn-MN/admin/settings/general.php
index 86058803e4..b10dfcaebb 100644
--- a/resources/lang/mn-MN/admin/settings/general.php
+++ b/resources/lang/mn-MN/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Хоёр хүчин зүйлийн элсэлт',
'two_factor_enabled_text' => 'Хоёр хүчин зүйлийг идэвхжүүлэх',
'two_factor_reset' => 'Хоёр хүчин зүйлийн нууцыг дахин тохируулна уу',
- 'two_factor_reset_help' => 'Энэ нь хэрэглэгчийг Google Authenticator-т дахин ашиглах боломжтой болно. Энэ нь одоогоор бүртгэгдсэн төхөөрөмжөө алдсан эсвэл хулгайлсан тохиолдолд ашигтай байж болно.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Хоёр хүчин зүйл төхөөрөмжийг амжилттай дахин тохируулах',
'two_factor_reset_error' => 'Хоёр хүчин зүйлийн төхөөрөмжийн дахин тохируулга амжилтгүй боллоо',
'two_factor_enabled_warning' => 'Хэрэв та одоогоор идэвхжээгүй бол хоёр хүчин зүйлийг идэвхжүүлэх нь таныг Google Auth бүртгэлтэй төхөөрөмжтэй таныг баталгаажуулахыг шаардана. Хэрэв та элсээгүй бол та төхөөрөмжөө бүртгүүлэх боломжтой болно.',
diff --git a/resources/lang/mn-MN/general.php b/resources/lang/mn-MN/general.php
index 509a1ddaf9..475cac16a3 100644
--- a/resources/lang/mn-MN/general.php
+++ b/resources/lang/mn-MN/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Дагалдах хэрэгсэл',
'activated' => 'Идэвхжүүлсэн',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Дараачийн',
'next_audit_date' => 'Дараагийн аудитын огноо',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Сүүлийн аудит',
'new' => 'шинэ!',
'no_depreciation' => 'Элэгдэлгүй',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/mn-MN/localizations.php b/resources/lang/mn-MN/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/mn-MN/localizations.php
+++ b/resources/lang/mn-MN/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/mn-MN/validation.php b/resources/lang/mn-MN/validation.php
index 42716de814..70a99c5323 100644
--- a/resources/lang/mn-MN/validation.php
+++ b/resources/lang/mn-MN/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/ms-MY/admin/hardware/message.php b/resources/lang/ms-MY/admin/hardware/message.php
index a6d12da771..0797909a0d 100644
--- a/resources/lang/ms-MY/admin/hardware/message.php
+++ b/resources/lang/ms-MY/admin/hardware/message.php
@@ -18,6 +18,7 @@ return [
'success' => 'Harta berjaya dikemaskini.',
'nothing_updated' => 'Tiada medan dipilih, jadi tiada apa yang dikemas kini.',
'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.',
],
'restore' => [
diff --git a/resources/lang/ms-MY/admin/settings/general.php b/resources/lang/ms-MY/admin/settings/general.php
index 929d8a3fd7..292cf1771f 100644
--- a/resources/lang/ms-MY/admin/settings/general.php
+++ b/resources/lang/ms-MY/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Pendaftaran Dua Faktor',
'two_factor_enabled_text' => 'Dayakan Dua Faktor',
'two_factor_reset' => 'Menetapkan semula Rahsia Dua Faktor',
- 'two_factor_reset_help' => 'Ini akan memaksa pengguna untuk mendaftarkan peranti mereka dengan Pengesah Google sekali lagi. Ini berguna jika peranti yang sedang didaftarkan sekarang hilang atau dicuri.',
+ 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ',
'two_factor_reset_success' => 'Peranti dua faktor berjaya diset semula',
'two_factor_reset_error' => 'Penetapan peranti dua faktor gagal',
'two_factor_enabled_warning' => 'Mengaktifkan dua faktor sekiranya ia tidak didayakan akan segera memaksa anda untuk mengesahkan dengan peranti Google Auth terdaftar. Anda akan mempunyai keupayaan untuk mendaftarkan peranti anda jika seseorang tidak mendaftar pada masa ini.',
diff --git a/resources/lang/ms-MY/general.php b/resources/lang/ms-MY/general.php
index ab27557885..968af0ce52 100644
--- a/resources/lang/ms-MY/general.php
+++ b/resources/lang/ms-MY/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Aksesori',
'activated' => 'Diaktifkan',
'accepted_date' => 'Date Accepted',
@@ -201,6 +202,7 @@ return [
'new_password' => 'New Password',
'next' => 'Seterusnya',
'next_audit_date' => 'Tarikh Audit Seterusnya',
+ 'no_email' => 'No email address associated with this user',
'last_audit' => 'Audit lepas',
'new' => 'baru!',
'no_depreciation' => 'Tiada Susut Nilai',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'There are no requestable assets or asset models.',
+ 'countable' => [
+ 'accessories' => ':count Accessory|:count Accessories',
+ 'assets' => ':count Asset|:count Assets',
+ 'licenses' => ':count License|:count Licenses',
+ 'license_seats' => ':count License Seat|:count License Seats',
+ 'consumables' => ':count Consumable|:count Consumables',
+ 'components' => ':count Component|:count Components',
+ ]
+
];
diff --git a/resources/lang/ms-MY/localizations.php b/resources/lang/ms-MY/localizations.php
index 2de8b42526..f1232dd138 100644
--- a/resources/lang/ms-MY/localizations.php
+++ b/resources/lang/ms-MY/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbian (Latin)',
'sk-SK'=> 'Slovak',
'sl-SI'=> 'Slovenian',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spanish',
'es-CO'=> 'Spanish, Colombia',
'es-MX'=> 'Spanish, Mexico',
diff --git a/resources/lang/ms-MY/validation.php b/resources/lang/ms-MY/validation.php
index 352324ca40..85e8b13b95 100644
--- a/resources/lang/ms-MY/validation.php
+++ b/resources/lang/ms-MY/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Value cannot be negative'
],
+ 'checkboxes' => ':attribute contains invalid options.',
+ 'radio_buttons' => ':attribute is invalid.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Invalid value included in this field',
];
diff --git a/resources/lang/nl-NL/admin/hardware/message.php b/resources/lang/nl-NL/admin/hardware/message.php
index 10691ee888..e7ac1ae4e3 100644
--- a/resources/lang/nl-NL/admin/hardware/message.php
+++ b/resources/lang/nl-NL/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Asset is succesvol bijgewerkt.',
'nothing_updated' => 'Geen veld is geselecteerd, er is dus niks gewijzigd.',
'no_assets_selected' => 'Er zijn geen assets geselecteerd, er is dus niets bijgewerkt.',
+ 'assets_do_not_exist_or_are_invalid' => 'Geselecteerde assets kunnen niet worden bijgewerkt.',
],
'restore' => [
diff --git a/resources/lang/nl-NL/admin/settings/general.php b/resources/lang/nl-NL/admin/settings/general.php
index 12eca509ef..70fb0b25bb 100644
--- a/resources/lang/nl-NL/admin/settings/general.php
+++ b/resources/lang/nl-NL/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Twee factor uitrol',
'two_factor_enabled_text' => 'Twee factor inschakelen',
'two_factor_reset' => 'Twee factor geheim herstellen',
- 'two_factor_reset_help' => 'Dit zal de gebruiker dwingen om zijn apparaat opnieuw met Google Authenticator te activeren. Dit kan handig zijn als het huidig geactiveerde apparaat gestolen of verloren is. ',
+ 'two_factor_reset_help' => 'Dit zal de gebruiker dwingen om zijn apparaat opnieuw met zijn authenticatie-app te activeren. Dit kan handig zijn als hun huidig ingeschreven apparaat verloren of gestolen is. ',
'two_factor_reset_success' => 'Twee factor apparaat succesvol opnieuw ingesteld',
'two_factor_reset_error' => 'Twee factor apparaat opnieuw instellen mislukt',
'two_factor_enabled_warning' => 'Het inschakelen van twee factor authenticatie zal direct vereisen dat je authenticeert met een Google Auth geactiveerd apparaat. Je krijgt de mogelijkheid om een apparaat te activeren als dat nog niet het geval is.',
diff --git a/resources/lang/nl-NL/general.php b/resources/lang/nl-NL/general.php
index dde4c4d0a8..3a3d50bb47 100644
--- a/resources/lang/nl-NL/general.php
+++ b/resources/lang/nl-NL/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Accessoires',
'activated' => 'Geactiveerd',
'accepted_date' => 'Datum geaccepteerd',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nieuw wachtwoord',
'next' => 'Volgende',
'next_audit_date' => 'Volgende datum van de Audit',
+ 'no_email' => 'Er is geen e-mailadres gekoppeld aan deze gebruiker',
'last_audit' => 'Laatste controle',
'new' => 'nieuw!',
'no_depreciation' => 'Geen afschrijving',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Er zijn geen aanvraagbare activa of modellen voor activa.',
+ 'countable' => [
+ 'accessories' => ':count Accessory~:count accessoires',
+ 'assets' => ':count Asset×:count Assets',
+ 'licenses' => ':count licentie|:count licenties',
+ 'license_seats' => ':count Licentie Zater|:count Licentie zitplaatsen',
+ 'consumables' => ':count Verbruiksverbruiker|:count Verbruiksartikelen',
+ 'components' => ':count Component|:count componenten',
+ ]
+
];
diff --git a/resources/lang/nl-NL/localizations.php b/resources/lang/nl-NL/localizations.php
index aedabc0f78..0af43adbc1 100644
--- a/resources/lang/nl-NL/localizations.php
+++ b/resources/lang/nl-NL/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Servisch (latijns)',
'sk-SK'=> 'Slowaaks',
'sl-SI'=> 'Sloveens',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spaans',
'es-CO'=> 'Spaans (Colombia)',
'es-MX'=> 'Spaans (Mexico)',
diff --git a/resources/lang/nl-NL/validation.php b/resources/lang/nl-NL/validation.php
index b517049d10..315895bdad 100644
--- a/resources/lang/nl-NL/validation.php
+++ b/resources/lang/nl-NL/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Waarde mag niet negatief zijn'
],
+ 'checkboxes' => ':attribute bevat ongeldige opties.',
+ 'radio_buttons' => ':attribute is ongeldig.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Ongeldige waarde ingevoerd in dit veld',
];
diff --git a/resources/lang/no-NO/admin/hardware/message.php b/resources/lang/no-NO/admin/hardware/message.php
index b0505bb9ba..33f6b548d1 100644
--- a/resources/lang/no-NO/admin/hardware/message.php
+++ b/resources/lang/no-NO/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Oppdatering av eiendel vellykket.',
'nothing_updated' => 'Ingen felter er valgt, så ingenting ble endret.',
'no_assets_selected' => 'Ingen felter er valgt, så ingenting ble endret.',
+ 'assets_do_not_exist_or_are_invalid' => 'Valgte eiendeler kan ikke oppdateres.',
],
'restore' => [
diff --git a/resources/lang/no-NO/admin/settings/general.php b/resources/lang/no-NO/admin/settings/general.php
index 580d9f16c3..0ea8fa630b 100644
--- a/resources/lang/no-NO/admin/settings/general.php
+++ b/resources/lang/no-NO/admin/settings/general.php
@@ -262,7 +262,7 @@ Linjeskift, topptekst, bilder, osv. kan føre til uventede resultater.',
'two_factor_enrollment' => 'To-faktor registrering',
'two_factor_enabled_text' => 'Aktiver to-faktor autentisering',
'two_factor_reset' => 'Tilbakestill to-faktor hemmelighet',
- 'two_factor_reset_help' => 'Tving brukeren til å legge til enheten på nytt i Google Authenticator. Dette er nyttig hvis brukerens enhet er mistet eller stjålet. ',
+ 'two_factor_reset_help' => 'Dette vil tvinge brukeren til å legge inn enheten på nytt med autentiseringsappen. Dette kan være nyttig hvis enheten deres er mistet eller stjålet. ',
'two_factor_reset_success' => 'To-faktor enhet resatt',
'two_factor_reset_error' => 'Reset av to-faktor enhet feilet',
'two_factor_enabled_warning' => 'Aktivering av to-faktor autentisering hvis ikke allerede aktivert vil øyeblikkelig tvinge deg til å autentisere med enhet som er aktivert i Google Authenticator. Du vil ha mulighet til å aktivere enheten din hvis ingen er aktivert fra før.',
diff --git a/resources/lang/no-NO/general.php b/resources/lang/no-NO/general.php
index 8af6afcc3a..7e6a6adc28 100644
--- a/resources/lang/no-NO/general.php
+++ b/resources/lang/no-NO/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Tilbehør',
'activated' => 'Aktivert',
'accepted_date' => 'Akseptdato',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nytt passord',
'next' => 'Neste',
'next_audit_date' => 'Neste revisjon dato',
+ 'no_email' => 'Ingen e-postadresse tilknyttet denne brukeren',
'last_audit' => 'Siste revisjon',
'new' => 'ny!',
'no_depreciation' => 'Ingen avskrivning',
@@ -518,4 +520,13 @@ return [
],
'no_requestable' => 'Det finnes ingen forespørselbare eiendeler eller modeller.',
+ 'countable' => [
+ 'accessories' => ':count Tilbehør|:count tilbehør',
+ 'assets' => ':count Eiendeler|:count',
+ 'licenses' => ':count Lisens|:count lisenser',
+ 'license_seats' => ':count lisenssete|:count Lisensseter',
+ 'consumables' => ':count Forbruksvare|:count Forbruksvarer',
+ 'components' => ':count Komponenter|:count komponenter',
+ ]
+
];
diff --git a/resources/lang/no-NO/localizations.php b/resources/lang/no-NO/localizations.php
index ab85bb6ace..ec2ee04a80 100644
--- a/resources/lang/no-NO/localizations.php
+++ b/resources/lang/no-NO/localizations.php
@@ -50,6 +50,7 @@ return [
'sr-CS' => 'Serbisk (Latin)',
'sk-SK'=> 'Slovakisk',
'sl-SI'=> 'Slovensk',
+ 'so-SO'=> 'Somali',
'es-ES'=> 'Spansk',
'es-CO'=> 'Spansk, Colombia',
'es-MX'=> 'Spansk, Mexico',
diff --git a/resources/lang/no-NO/validation.php b/resources/lang/no-NO/validation.php
index cb761d587e..19d16ae394 100644
--- a/resources/lang/no-NO/validation.php
+++ b/resources/lang/no-NO/validation.php
@@ -105,6 +105,8 @@ return [
'gte' => [
'numeric' => 'Verdi kan ikke være negativ'
],
+ 'checkboxes' => ':attribute inneholder ugyldige valg.',
+ 'radio_buttons' => ':attribute er ugyldig.',
/*
@@ -151,4 +153,10 @@ return [
'attributes' => [],
+ /*
+ |--------------------------------------------------------------------------
+ | Generic Validation Messages
+ |--------------------------------------------------------------------------
+ */
+ 'invalid_value_in_field' => 'Ugyldig verdi inkludert i dette feltet',
];
diff --git a/resources/lang/pl-PL/admin/hardware/message.php b/resources/lang/pl-PL/admin/hardware/message.php
index 0f890f5578..5f4571344f 100644
--- a/resources/lang/pl-PL/admin/hardware/message.php
+++ b/resources/lang/pl-PL/admin/hardware/message.php
@@ -19,6 +19,7 @@ return [
'success' => 'Aktualizacja poprawna.',
'nothing_updated' => 'Żadne pole nie zostało wybrane, więc nic nie zostało zmienione.',
'no_assets_selected' => 'Żadne aktywa nie zostały wybrane, więc nic nie zostało zmienione.',
+ 'assets_do_not_exist_or_are_invalid' => 'Wybrane zasoby nie mogą zostać zaktualizowane.',
],
'restore' => [
diff --git a/resources/lang/pl-PL/admin/settings/general.php b/resources/lang/pl-PL/admin/settings/general.php
index 4f6633f1c6..bb187b7957 100644
--- a/resources/lang/pl-PL/admin/settings/general.php
+++ b/resources/lang/pl-PL/admin/settings/general.php
@@ -261,7 +261,7 @@ return [
'two_factor_enrollment' => 'Rejestracja dwóch czynników',
'two_factor_enabled_text' => 'Włącz uwieżytelnianie dwuskładnikowe',
'two_factor_reset' => 'Zresetować dwuskładnikowy klucz',
- 'two_factor_reset_help' => 'Spowoduje to zmuszenie użytkownika do ponownego zapisu swojego urządzenia w usłudze Google Authenticator. Może to być przydatne, jeśli ich aktualnie zapisane urządzenie zostanie utracone lub skradzione.',
+ 'two_factor_reset_help' => 'Spowoduje to zmuszenie użytkownika do zapisania urządzenia do aplikacji uwierzytelniającej. Może to być użyteczne w przypadku zagubienia lub kradzieży aktualnie zamontowanego urządzenia. ',
'two_factor_reset_success' => 'Dwa urządzenia współczynnikowe z powodzeniem zresetowane',
'two_factor_reset_error' => 'Nie udało się zresetować urządzenia',
'two_factor_enabled_warning' => 'Włączenie dwóch czynników, jeśli nie jest aktualnie włączone, natychmiast zmusi Cię do uwierzytelnienia przy użyciu urządzenia z certyfikatem Google Authentication. Będziesz mieć możliwość zapisania urządzenia, jeśli nie jest on aktualnie zapisany.',
diff --git a/resources/lang/pl-PL/general.php b/resources/lang/pl-PL/general.php
index 9332bb8434..1286384160 100644
--- a/resources/lang/pl-PL/general.php
+++ b/resources/lang/pl-PL/general.php
@@ -1,6 +1,7 @@
'2FA reset',
'accessories' => 'Akcesoria',
'activated' => 'Aktywowana',
'accepted_date' => 'Data akceptacji',
@@ -201,6 +202,7 @@ return [
'new_password' => 'Nowe hasło',
'next' => 'Następny',
'next_audit_date' => 'Data następnej inspekcji',
+ 'no_email' => 'Brak adresu e-mail skojarzonego z tym użytkownikiem',
'last_audit' => 'Ostatnia inspekcja',
'new' => 'nowy!',
'no_depreciation' => 'Nie Amortyzowany',
@@ -340,7 +342,7 @@ return [
'last_checkout' => 'Ostatnie zamówienie',
'due_to_checkin' => 'Następuje:liczba pozycji ma zostać wkrótce sprawdzona:',
'expected_checkin' => 'Przewidywana data zwrotu',
- 'reminder_checked_out_items' => 'To jest przypomnienie o aktualnie wydanych Tobie przedmiotach. Jeśli uważasz, że ta lista jest niedokładna (brakuje czegoś lub pojawia się tutaj coś, czego nigdy nie otrzymałeś), prosimy o e-mail :reply_to_name pod adresem: :reply_to_addresse.',
+ 'reminder_checked_out_items' => 'To jest przypomnienie o aktualnie wydanych Tobie przedmiotach. Jeśli uważasz, że ta lista jest niedokładna (brakuje czegoś lub pojawia się tutaj coś, czego nigdy nie otrzymałeś), prosimy o e-mail :reply_to_name pod adresem: :reply_to_address.',
'changed' => 'Zmieniono',
'to' => 'Do',
'report_fields_info' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.',
- 'clone' => 'Clone Accessory',
- 'delete_disabled' => 'This accessory cannot be deleted yet because some items are still checked out.',
+ 'accessory_category' => 'Qaybta Agabka',
+ 'accessory_name' => 'Magaca dheeriga ah',
+ 'checkout' => 'Hubinta Agabka',
+ 'checkin' => 'Hubi Agabka',
+ 'create' => 'Abuur Agabka',
+ 'edit' => 'Wax ka beddel Agabka',
+ 'eula_text' => 'Qaybta EULA',
+ 'eula_text_help' => 'Goobtani waxay kuu ogolaanaysaa inaad u habayso EULA-gaaga noocyo gaar ah oo hanti ah. Haddii aad haysato hal EULA oo keliya dhammaan hantidaada, waxaad calamdi kartaa sanduuqa hoose si aad u isticmaasho asalka aasaasiga ah.',
+ 'require_acceptance' => 'U baahan isticmaalayaashu inay xaqiijiyaan aqbalaadda hantida qaybtan.',
+ 'no_default_eula' => 'Ma jiro EULA aasaasiga ah oo la helay Mid ku dar Settings',
+ 'total' => 'Wadarta',
+ 'remaining' => 'Ka faaideyso',
+ 'update' => 'Cusbooneysii Agabka',
+ 'use_default_eula' => 'Isticmaal horta u ah EULA beddelkeeda.',
+ 'use_default_eula_disabled' => 'Isticmaal beddelka EULA-ga aasaasiga ah. Ma jiro EULA aasaasiga ah oo la dejiyay. Fadlan ku dar mid Settings',
+ 'clone' => 'Qalabka Clone',
+ 'delete_disabled' => 'Qalabkan weli lama tirtiri karo sababtoo ah walxaha qaarkood weli waa la hubiyay.',
);
diff --git a/resources/lang/so-SO/admin/accessories/message.php b/resources/lang/so-SO/admin/accessories/message.php
index c688d5e03d..c3d08b8a41 100644
--- a/resources/lang/so-SO/admin/accessories/message.php
+++ b/resources/lang/so-SO/admin/accessories/message.php
@@ -2,37 +2,37 @@
return array(
- 'does_not_exist' => 'The accessory [:id] does not exist.',
- 'not_found' => 'That accessory was not found.',
- 'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
+ 'does_not_exist' => 'Qalabka [:id] ma jiro',
+ 'not_found' => 'Qalabkaas lama helin.',
+ 'assoc_users' => 'Qalabkan waxa uu hadda hayaa :count walxo la hubiyay isticmaalayaasha Fadlan iska hubi agabka oo isku day markale. ',
'create' => array(
- 'error' => 'The accessory was not created, please try again.',
- 'success' => 'The accessory was successfully created.'
+ 'error' => 'Qalabka lama abuurin, fadlan isku day mar kale.',
+ 'success' => 'Qalabka si guul leh ayaa loo sameeyay'
),
'update' => array(
- 'error' => 'The accessory was not updated, please try again',
- 'success' => 'The accessory was updated successfully.'
+ 'error' => 'Qalabka lama cusboonaysiin, fadlan isku day mar kale',
+ 'success' => 'Qalabka si guul leh ayaa loo cusboonaysiiyay'
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
- 'error' => 'There was an issue deleting the accessory. Please try again.',
- 'success' => 'The accessory was deleted successfully.'
+ 'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto qalabkan?',
+ 'error' => 'Waxaa jiray arrin la tirtiray qalabyada Fadlan isku day mar kale',
+ 'success' => 'Qalabka si guul leh ayaa loo tirtiray'
),
'checkout' => array(
- 'error' => 'Accessory was not checked out, please try again',
- 'success' => 'Accessory checked out successfully.',
- 'unavailable' => 'Accessory is not available for checkout. Check quantity available',
- 'user_does_not_exist' => 'That user is invalid. Please try again.'
+ 'error' => 'Agabka lama hubin, fadlan isku day mar kale',
+ 'success' => 'Qalabka si guul leh ayaa loo hubiyay',
+ 'unavailable' => 'Agabka looma hayo hubinta Hubi tirada la heli karo',
+ 'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale'
),
'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' => 'Agabka lama hubin, fadlan isku day mar kale',
+ 'success' => 'Qalabka si guul leh ayaa loo hubiyay',
+ 'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale'
)
diff --git a/resources/lang/so-SO/admin/accessories/table.php b/resources/lang/so-SO/admin/accessories/table.php
index e02d9f22e4..f2a41e6701 100644
--- a/resources/lang/so-SO/admin/accessories/table.php
+++ b/resources/lang/so-SO/admin/accessories/table.php
@@ -1,11 +1,11 @@
'Download CSV',
+ 'dl_csv' => 'Soo deji CSV',
'eula_text' => 'EULA',
- 'id' => 'ID',
- 'require_acceptance' => 'Acceptance',
- 'title' => 'Accessory Name',
+ 'id' => 'Aqoonsi',
+ 'require_acceptance' => 'Ogolaanshaha',
+ 'title' => 'Magaca dheeriga ah',
);
diff --git a/resources/lang/so-SO/admin/asset_maintenances/form.php b/resources/lang/so-SO/admin/asset_maintenances/form.php
index 785d06b08f..bf2c5b44c4 100644
--- a/resources/lang/so-SO/admin/asset_maintenances/form.php
+++ b/resources/lang/so-SO/admin/asset_maintenances/form.php
@@ -1,14 +1,14 @@
'Asset Maintenance Type',
- 'title' => 'Title',
- 'start_date' => 'Start Date',
- 'completion_date' => 'Completion Date',
- 'cost' => 'Cost',
- 'is_warranty' => 'Warranty Improvement',
- 'asset_maintenance_time' => 'Asset Maintenance Time (in days)',
- 'notes' => 'Notes',
- 'update' => 'Update Asset Maintenance',
- 'create' => 'Create Asset Maintenance'
+ 'asset_maintenance_type' => 'Nooca Dayactirka Hantida',
+ 'title' => 'Ciwaanka',
+ 'start_date' => 'Taariikhda billowga',
+ 'completion_date' => 'Taariikhda Dhamaystirka',
+ 'cost' => 'Qiimaha',
+ 'is_warranty' => 'Hagaajinta dammaanadda',
+ 'asset_maintenance_time' => 'Waqtiga Dayactirka Hantida (maalmo gudaheed)',
+ 'notes' => 'Xusuusin',
+ 'update' => 'Cusbooneysii Dayactirka Hantida',
+ 'create' => 'Abuur Dayactirka Hantida'
];
diff --git a/resources/lang/so-SO/admin/asset_maintenances/general.php b/resources/lang/so-SO/admin/asset_maintenances/general.php
index 0f9a4547a2..924f4cda36 100644
--- a/resources/lang/so-SO/admin/asset_maintenances/general.php
+++ b/resources/lang/so-SO/admin/asset_maintenances/general.php
@@ -1,16 +1,16 @@
'Asset Maintenances',
- 'edit' => 'Edit Asset Maintenance',
- 'delete' => 'Delete Asset Maintenance',
- 'view' => 'View Asset Maintenance Details',
- 'repair' => 'Repair',
- 'maintenance' => 'Maintenance',
- 'upgrade' => 'Upgrade',
+ 'asset_maintenances' => 'Dayactirka hantida',
+ 'edit' => 'Wax ka beddel Dayactirka Hantida',
+ 'delete' => 'Tirtir Dayactirka Hantida',
+ 'view' => 'Daawo Faahfaahinta Dayactirka Hantida',
+ 'repair' => 'Dayactirka',
+ 'maintenance' => 'Dayactirka',
+ 'upgrade' => 'Cusboonaysii',
'calibration' => 'Calibration',
- 'software_support' => 'Software Support',
- 'hardware_support' => 'Hardware Support',
- 'configuration_change' => 'Configuration Change',
- 'pat_test' => 'PAT Test',
+ 'software_support' => 'Taageerada Software',
+ 'hardware_support' => 'Taageerada Hardware',
+ 'configuration_change' => 'Isbeddelka Qaabaynta',
+ 'pat_test' => 'Imtixaanka PAT',
];
diff --git a/resources/lang/so-SO/admin/asset_maintenances/message.php b/resources/lang/so-SO/admin/asset_maintenances/message.php
index b44f618207..3592ffe495 100644
--- a/resources/lang/so-SO/admin/asset_maintenances/message.php
+++ b/resources/lang/so-SO/admin/asset_maintenances/message.php
@@ -1,21 +1,21 @@
'Asset Maintenance you were looking for was not found!',
+ 'not_found' => 'Dayactirka hantida aad raadinaysay lama helin!',
'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' => 'Ma hubtaa inaad rabto inaad tirtirto dayactirka hantida?',
+ 'error' => 'Waxaa jirtay arrin lagu tirtirayo dayactirka hantida. Fadlan isku day mar kale',
+ 'success' => 'Dayactirka hantida ayaa si guul leh loo tirtiray',
],
'create' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.',
+ 'error' => 'Dayactirka hantida lama abuurin, fadlan isku day mar kale.',
+ 'success' => 'Dayactirka hantida ayaa loo sameeyay si guul leh.',
],
'edit' => [
- 'error' => 'Asset Maintenance was not edited, please try again.',
- 'success' => 'Asset Maintenance edited successfully.',
+ 'error' => 'Dayactirka hantida lama tafatirin, fadlan isku day mar kale.',
+ 'success' => 'Dayactirka hantida ayaa si guul leh loo tafatiray',
],
- 'asset_maintenance_incomplete' => 'Not Completed Yet',
- 'warranty' => 'Warranty',
- 'not_warranty' => 'Not Warranty',
+ 'asset_maintenance_incomplete' => 'Wali lama dhamaystirin',
+ 'warranty' => 'Dammaanad',
+ 'not_warranty' => 'Ma aha damaanad',
];
diff --git a/resources/lang/so-SO/admin/asset_maintenances/table.php b/resources/lang/so-SO/admin/asset_maintenances/table.php
index 3ba895038d..3072331b71 100644
--- a/resources/lang/so-SO/admin/asset_maintenances/table.php
+++ b/resources/lang/so-SO/admin/asset_maintenances/table.php
@@ -1,8 +1,8 @@
'Asset Maintenance',
- 'asset_name' => 'Asset Name',
- 'is_warranty' => 'Warranty',
- 'dl_csv' => 'Download CSV',
+ 'title' => 'Dayactirka hantida',
+ 'asset_name' => 'Magaca Hantida',
+ 'is_warranty' => 'Dammaanad',
+ 'dl_csv' => 'Soo deji CSV',
];
diff --git a/resources/lang/so-SO/admin/categories/general.php b/resources/lang/so-SO/admin/categories/general.php
index 2fe448b44e..f8bf04ca8a 100644
--- a/resources/lang/so-SO/admin/categories/general.php
+++ b/resources/lang/so-SO/admin/categories/general.php
@@ -1,25 +1,25 @@
'Asset Categories',
- 'category_name' => 'Category Name',
- 'checkin_email' => 'Send email to user on checkin/checkout.',
- 'checkin_email_notification' => 'This user will be sent an email on checkin/checkout.',
- 'clone' => 'Clone Category',
- 'create' => 'Create Category',
- 'edit' => 'Edit Category',
- 'email_will_be_sent_due_to_global_eula' => 'An email will be sent to the user because the global EULA is being used.',
- 'email_will_be_sent_due_to_category_eula' => 'An email will be sent to the user because a EULA is set for this category.',
- 'eula_text' => 'Category EULA',
- 'eula_text_help' => 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
- 'name' => 'Category Name',
- 'require_acceptance' => 'Require users to confirm acceptance of assets in this category.',
- 'required_acceptance' => 'This user will be emailed with a link to confirm acceptance of this item.',
- 'required_eula' => 'This user will be emailed a copy of the EULA',
- 'no_default_eula' => 'No primary default EULA found. Add one in Settings.',
- 'update' => 'Update Category',
- 'use_default_eula' => 'Use the primary default EULA instead.',
- 'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.',
- 'use_default_eula_column' => 'Use default EULA',
+ 'asset_categories' => 'Qaybaha Hantida',
+ 'category_name' => 'Magaca Qaybta',
+ 'checkin_email' => 'U dir iimaylka isticmaalaha marka la jeegeynayo/baaro.',
+ 'checkin_email_notification' => 'Isticmaalahan waxa loo soo diri doonaa iimayl marka la hubinayo/baaro.',
+ 'clone' => 'Qaybta Clone',
+ 'create' => 'Abuur Qaybta',
+ 'edit' => 'Wax ka beddel qaybta',
+ 'email_will_be_sent_due_to_global_eula' => 'Iimayl ayaa loo diri doonaa isticmaalaha sababtoo ah EULA caalamiga ah ayaa la isticmaalayaa.',
+ 'email_will_be_sent_due_to_category_eula' => 'Iimayl ayaa loo diri doona isticmaalaha sababtoo ah EULA ayaa loo dejiyay qaybtan.',
+ 'eula_text' => 'Qaybta EULA',
+ 'eula_text_help' => 'Goobtani waxay kuu ogolaanaysaa inaad u habayso EULA-gaaga noocyo gaar ah oo hanti ah. Haddii aad haysato hal EULA oo keliya dhammaan hantidaada, waxaad calamdi kartaa sanduuqa hoose si aad u isticmaasho asalka aasaasiga ah.',
+ 'name' => 'Magaca Qaybta',
+ 'require_acceptance' => 'U baahan isticmaalayaashu inay xaqiijiyaan aqbalaadda hantida qaybtan.',
+ 'required_acceptance' => 'Isticmaalahan waxaa iimayl loogu soo diri doonaa xiriiriye si loo xaqiijiyo aqbalaada shaygan.',
+ 'required_eula' => 'Isticmaalahan waxaa iimayl loogu soo diri doonaa koobiga EULA',
+ 'no_default_eula' => 'Ma jiro EULA aasaasiga ah oo la helay Mid ku dar Settings.',
+ 'update' => 'Cusbooneysii Qaybta',
+ 'use_default_eula' => 'Isticmaal horta u ah EULA beddelkeeda.',
+ 'use_default_eula_disabled' => 'Isticmaal beddelka EULA-ga aasaasiga ah. Ma jiro EULA aasaasiga ah oo la dejiyay. Fadlan ku dar mid Settings.',
+ 'use_default_eula_column' => 'Isticmaal EULA caadiga ah',
);
diff --git a/resources/lang/so-SO/admin/categories/message.php b/resources/lang/so-SO/admin/categories/message.php
index 4e493f68b6..e1a3ae6aa9 100644
--- a/resources/lang/so-SO/admin/categories/message.php
+++ b/resources/lang/so-SO/admin/categories/message.php
@@ -2,25 +2,25 @@
return array(
- 'does_not_exist' => 'Category does not exist.',
- 'assoc_models' => 'This category is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this category and try again. ',
- 'assoc_items' => 'This category is currently associated with at least one :asset_type and cannot be deleted. Please update your :asset_type to no longer reference this category and try again. ',
+ 'does_not_exist' => 'Qaybta ma jirto.',
+ 'assoc_models' => 'Qaybtan hadda waxay la xidhiidhaa ugu yaraan hal nooc oo lama tirtiri karo. Fadlan cusboonaysii moodooyinkaaga si aanay u tixraacin qaybtan oo isku day mar kale. ',
+ 'assoc_items' => 'Qaybtan hadda waxa lala xidhiidhiyaa ugu yaraan hal :asset_type lamana tirtiri karo. Fadlan cusboonaysii :asset_type kaaga si aanad mar dambe tixraac qaybtan oo isku day mar kale. ',
'create' => array(
- 'error' => 'Category was not created, please try again.',
- 'success' => 'Category created successfully.'
+ 'error' => 'Qaybta lama abuurin, fadlan isku day mar kale.',
+ 'success' => 'Qaybta si guul leh ayaa loo sameeyay.'
),
'update' => array(
- 'error' => 'Category was not updated, please try again',
- 'success' => 'Category updated successfully.',
- 'cannot_change_category_type' => 'You cannot change the category type once it has been created',
+ 'error' => 'Qaybta lama cusboonaysiin, fadlan isku day mar kale',
+ 'success' => 'Qaybta si guul leh ayaa loo cusboonaysiiyay.',
+ 'cannot_change_category_type' => 'Ma beddeli kartid nooca qaybta marka la abuuro',
),
'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' => 'Ma hubtaa inaad doonayso inaad tirtirto qaybtan?',
+ 'error' => 'Waxaa jirtay arrin la tirtiray qaybta Fadlan isku day mar kale.',
+ 'success' => 'Qaybta si guul leh ayaa loo tirtiray.'
)
);
diff --git a/resources/lang/so-SO/admin/categories/table.php b/resources/lang/so-SO/admin/categories/table.php
index a3ee96ae7f..ce07a08901 100644
--- a/resources/lang/so-SO/admin/categories/table.php
+++ b/resources/lang/so-SO/admin/categories/table.php
@@ -2,9 +2,9 @@
return array(
'eula_text' => 'EULA',
- 'id' => 'ID',
- 'parent' => 'Parent',
- 'require_acceptance' => 'Acceptance',
- 'title' => 'Asset Category Name',
+ 'id' => 'Aqoonsi',
+ 'parent' => 'Waalid',
+ 'require_acceptance' => 'Ogolaanshaha',
+ 'title' => 'Magaca Qaybta Hantida',
);
diff --git a/resources/lang/so-SO/admin/companies/general.php b/resources/lang/so-SO/admin/companies/general.php
index 37781012ba..31e10eafaa 100644
--- a/resources/lang/so-SO/admin/companies/general.php
+++ b/resources/lang/so-SO/admin/companies/general.php
@@ -1,7 +1,7 @@
'Select Company',
- 'about_companies' => 'About Companies',
- 'about_companies_description' => ' You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+ 'select_company' => 'Dooro Shirkad',
+ 'about_companies' => 'Ku saabsan Shirkadaha',
+ 'about_companies_description' => ' Waxaad u isticmaali kartaa shirkadaha sidii goob wargelineed oo fudud, ama waxaad u isticmaali kartaa si aad u xaddiddo muuqaalka hantida iyo helitaanka isticmaalayaasha shirkad gaar ah adiga oo awood u siinaya Taageerada Shirkadda Buuxa ee goobaha maamulkaaga.',
];
diff --git a/resources/lang/so-SO/admin/companies/message.php b/resources/lang/so-SO/admin/companies/message.php
index e440b7ac5f..1710670cec 100644
--- a/resources/lang/so-SO/admin/companies/message.php
+++ b/resources/lang/so-SO/admin/companies/message.php
@@ -1,20 +1,20 @@
'Company does not exist.',
- 'deleted' => 'Deleted company',
- 'assoc_users' => 'This company is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this company and try again. ',
+ 'does_not_exist' => 'Shirkaddu ma jirto.',
+ 'deleted' => 'Shirkadda la tirtiray',
+ 'assoc_users' => 'Shirkaddan hadda waxay ku xidhan tahay ugu yaraan hal nooc oo lama tirtiri karo. Fadlan cusboonaysii moodooyinkaaga si aanay u tixraacin shirkaddan oo isku day mar kale. ',
'create' => [
- 'error' => 'Company was not created, please try again.',
- 'success' => 'Company created successfully.',
+ 'error' => 'Shirkadda lama abuurin, fadlan isku day mar kale.',
+ 'success' => 'Shirkadda si guul leh ayaa loo abuuray',
],
'update' => [
- 'error' => 'Company was not updated, please try again',
- 'success' => 'Company updated successfully.',
+ 'error' => 'Shirkadda lama cusboonaysiin, fadlan isku day mar kale',
+ 'success' => 'Shirkadda si guul leh ayaa loo cusboonaysiiyay',
],
'delete' => [
- 'confirm' => 'Are you sure you wish to delete this company?',
- 'error' => 'There was an issue deleting the company. Please try again.',
- 'success' => 'The Company was deleted successfully.',
+ 'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto shirkaddan?',
+ 'error' => 'Waxaa jirtay arrin la tirtiray shirkadda. Fadlan isku day mar kale',
+ 'success' => 'Shirkadda si guul leh ayaa loo tirtiray',
],
];
diff --git a/resources/lang/so-SO/admin/companies/table.php b/resources/lang/so-SO/admin/companies/table.php
index 100b258240..dd5c859436 100644
--- a/resources/lang/so-SO/admin/companies/table.php
+++ b/resources/lang/so-SO/admin/companies/table.php
@@ -1,11 +1,11 @@
'Companies',
- 'create' => 'Create Company',
+ 'companies' => 'Shirkadaha',
+ 'create' => 'Abuur Shirkad',
'email' => 'Company Email',
- 'title' => 'Company',
+ 'title' => 'Shirkadda',
'phone' => 'Company Phone',
- 'update' => 'Update Company',
- 'name' => 'Company Name',
- 'id' => 'ID',
+ 'update' => 'Shirkada Cusbooneysii',
+ 'name' => 'Magaca Shirkadda',
+ 'id' => 'Aqoonsi',
);
diff --git a/resources/lang/so-SO/admin/components/general.php b/resources/lang/so-SO/admin/components/general.php
index 5b788a51ec..4ed0d02969 100644
--- a/resources/lang/so-SO/admin/components/general.php
+++ b/resources/lang/so-SO/admin/components/general.php
@@ -1,16 +1,16 @@
'Component Name',
- 'checkin' => 'Checkin Component',
- 'checkout' => 'Checkout Component',
- 'cost' => 'Purchase Cost',
- 'create' => 'Create Component',
- 'edit' => 'Edit Component',
- 'date' => 'Purchase Date',
- 'order' => 'Order Number',
- 'remaining' => 'Remaining',
- 'total' => 'Total',
- 'update' => 'Update Component',
- 'checkin_limit' => 'Amount checked in must be equal to or less than :assigned_qty'
+ 'component_name' => 'Magaca Qaybta',
+ 'checkin' => 'Hubi Qaybta',
+ 'checkout' => 'Qaybta hubinta',
+ 'cost' => 'Qiimaha iibka',
+ 'create' => 'Abuur Qayb',
+ 'edit' => 'Wax ka beddel qaybta',
+ 'date' => 'Taariikhda Iibka',
+ 'order' => 'Nambarka dalbashada',
+ 'remaining' => 'Haraaga',
+ 'total' => 'Wadarta',
+ 'update' => 'Cusbooneysii Qaybta',
+ 'checkin_limit' => 'Qadarka la hubiyay waa in ay la mid tahay ama ka yar tahay :assigned_qty'
);
diff --git a/resources/lang/so-SO/admin/components/message.php b/resources/lang/so-SO/admin/components/message.php
index 0a7dd8d954..4953cc0e61 100644
--- a/resources/lang/so-SO/admin/components/message.php
+++ b/resources/lang/so-SO/admin/components/message.php
@@ -2,35 +2,35 @@
return array(
- 'does_not_exist' => 'Component does not exist.',
+ 'does_not_exist' => 'Qayb ma jiraan',
'create' => array(
- 'error' => 'Component was not created, please try again.',
- 'success' => 'Component created successfully.'
+ 'error' => 'Qayb lama abuurin, fadlan isku day mar kale.',
+ 'success' => 'Qayb ayaa loo sameeyay si guul leh'
),
'update' => array(
- 'error' => 'Component was not updated, please try again',
- 'success' => 'Component updated successfully.'
+ 'error' => 'Qaybaha lama cusboonaysiin, fadlan isku day mar kale',
+ 'success' => 'Qaybta si guul leh ayaa loo cusboonaysiiyay'
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this component?',
- 'error' => 'There was an issue deleting the component. Please try again.',
- 'success' => 'The component was deleted successfully.'
+ 'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto qaybtan?',
+ 'error' => 'Waxaa jirtay arrin la tirtirayo qaybta Fadlan isku day mar kale',
+ 'success' => 'Qaybta si guul leh ayaa loo tirtiray'
),
'checkout' => array(
- 'error' => 'Component was not checked out, please try again',
- 'success' => 'Component checked out successfully.',
- 'user_does_not_exist' => 'That user is invalid. Please try again.',
- 'unavailable' => 'Not enough components remaining: :remaining remaining, :requested requested ',
+ 'error' => 'Qaybaha lama hubin, fadlan isku day mar kale',
+ 'success' => 'Qaybta si guul leh ayaa loo hubiyay',
+ 'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale',
+ 'unavailable' => 'Qaybo aan ku filnayn ayaa hadhsan: :remaining hadhay, :requested waa la codsaday ',
),
'checkin' => array(
- 'error' => 'Component was not checked in, please try again',
- 'success' => 'Component checked in successfully.',
- 'user_does_not_exist' => 'That user is invalid. Please try again.'
+ 'error' => 'Qaybaha lama hubin, fadlan isku day mar kale',
+ 'success' => 'Qaybta si guul leh ayaa loo hubiyay',
+ 'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale'
)
diff --git a/resources/lang/so-SO/admin/components/table.php b/resources/lang/so-SO/admin/components/table.php
index 3d4fed6a7f..f6eccbb372 100644
--- a/resources/lang/so-SO/admin/components/table.php
+++ b/resources/lang/so-SO/admin/components/table.php
@@ -1,5 +1,5 @@
'Component Name',
+ 'title' => 'Magaca Qaybta',
);
diff --git a/resources/lang/so-SO/admin/consumables/general.php b/resources/lang/so-SO/admin/consumables/general.php
index 7c6bb32968..3a8e013a02 100644
--- a/resources/lang/so-SO/admin/consumables/general.php
+++ b/resources/lang/so-SO/admin/consumables/general.php
@@ -1,11 +1,11 @@
'Checkout Consumable to User',
- 'consumable_name' => 'Consumable Name',
- 'create' => 'Create Consumable',
- 'item_no' => 'Item No.',
- 'remaining' => 'Remaining',
- 'total' => 'Total',
- 'update' => 'Update Consumable',
+ 'checkout' => 'Hubinta Isticmaalka Isticmaalka',
+ 'consumable_name' => 'Magaca la isticmaali karo',
+ 'create' => 'Abuur la isticmaali karo',
+ 'item_no' => 'Shayga No.',
+ 'remaining' => 'Haraaga',
+ 'total' => 'Wadarta',
+ 'update' => 'Cusbooneysii Isticmaalka',
);
diff --git a/resources/lang/so-SO/admin/consumables/message.php b/resources/lang/so-SO/admin/consumables/message.php
index c0d0aa7f68..6a672d9941 100644
--- a/resources/lang/so-SO/admin/consumables/message.php
+++ b/resources/lang/so-SO/admin/consumables/message.php
@@ -2,35 +2,35 @@
return array(
- 'does_not_exist' => 'Consumable does not exist.',
+ 'does_not_exist' => 'Wax la isticmaali karo ma jiro.',
'create' => array(
- 'error' => 'Consumable was not created, please try again.',
- 'success' => 'Consumable created successfully.'
+ 'error' => 'La isticmaali karo lama abuurin, fadlan isku day mar kale.',
+ 'success' => 'Isticmaalka ayaa si guul leh loo abuuray'
),
'update' => array(
- 'error' => 'Consumable was not updated, please try again',
- 'success' => 'Consumable updated successfully.'
+ 'error' => 'Isticmaalka lama cusboonaysiin, fadlan isku day mar kale',
+ 'success' => 'Isticmaalka si guul leh ayaa loo cusboonaysiiyay'
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this consumable?',
- 'error' => 'There was an issue deleting the consumable. Please try again.',
- 'success' => 'The consumable was deleted successfully.'
+ 'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto alaabtan?',
+ 'error' => 'Waxaa jirtay arrin la tirtirayo alaabta. Fadlan isku day mar kale',
+ 'success' => 'Isticmaalka si guul leh ayaa loo tirtiray'
),
'checkout' => array(
- 'error' => 'Consumable was not checked out, please try again',
- 'success' => 'Consumable checked out successfully.',
- 'user_does_not_exist' => 'That user is invalid. Please try again.',
- 'unavailable' => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+ 'error' => 'Isticmaalka lama hubin, fadlan isku day mar kale',
+ 'success' => 'Isticmaalka si guul leh ayaa loo hubiyay',
+ 'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale',
+ 'unavailable' => 'Ma jiraan alaabooyin ku filan hubintan. Fadlan hubi tirada hadhay ',
),
'checkin' => array(
- 'error' => 'Consumable was not checked in, please try again',
- 'success' => 'Consumable checked in successfully.',
- 'user_does_not_exist' => 'That user is invalid. Please try again.'
+ 'error' => 'Isticmaalka lama hubin, fadlan isku day mar kale',
+ 'success' => 'Isticmaalka si guul leh ayaa loo hubiyay',
+ 'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale'
)
diff --git a/resources/lang/so-SO/admin/consumables/table.php b/resources/lang/so-SO/admin/consumables/table.php
index bb76721f17..7cfcd4a797 100644
--- a/resources/lang/so-SO/admin/consumables/table.php
+++ b/resources/lang/so-SO/admin/consumables/table.php
@@ -1,5 +1,5 @@
'Consumable Name',
+ 'title' => 'Magaca la isticmaali karo',
);
diff --git a/resources/lang/so-SO/admin/custom_fields/general.php b/resources/lang/so-SO/admin/custom_fields/general.php
index e3c21d1f0c..b87fb43829 100644
--- a/resources/lang/so-SO/admin/custom_fields/general.php
+++ b/resources/lang/so-SO/admin/custom_fields/general.php
@@ -1,61 +1,61 @@
'Custom Fields',
- 'manage' => 'Manage',
- 'field' => 'Field',
- 'about_fieldsets_title' => 'About Fieldsets',
- 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
- 'custom_format' => 'Custom Regex format...',
- 'encrypt_field' => 'Encrypt the value of this field in the database',
- 'encrypt_field_help' => 'WARNING: Encrypting a field makes it unsearchable.',
- 'encrypted' => 'Encrypted',
- 'fieldset' => 'Fieldset',
- 'qty_fields' => 'Qty Fields',
- 'fieldsets' => 'Fieldsets',
- 'fieldset_name' => 'Fieldset Name',
- 'field_name' => 'Field Name',
- 'field_values' => 'Field Values',
- 'field_values_help' => 'Add selectable options, one per line. Blank lines other than the first line will be ignored.',
- 'field_element' => 'Form Element',
- 'field_element_short' => 'Element',
- 'field_format' => 'Format',
- 'field_custom_format' => 'Custom Regex Format',
- 'field_custom_format_help' => 'This field allows you to use a regex expression for validation. It should start with "regex:" - for example, to validate that a custom field value contains a valid IMEI (15 numeric digits), you would use regex:/^[0-9]{15}$/
.',
- 'required' => 'Required',
+ 'custom_fields' => 'Goobaha gaarka ah',
+ 'manage' => 'Maamul',
+ 'field' => 'Garoonka',
+ 'about_fieldsets_title' => 'Ku saabsan Fieldsets',
+ 'about_fieldsets_text' => 'Fieldsets waxay kuu oggolaanayaan inaad abuurto kooxo garoomo gaar ah kuwaas oo inta badan dib loogu isticmaalo noocyada moodooyinka hantida gaarka ah.',
+ 'custom_format' => 'Qaabka Regex ee gaarka ah...',
+ 'encrypt_field' => 'Siri qiimaha goobtan kaydka xogta',
+ 'encrypt_field_help' => 'DIGNIIN: Siraynta goobta ayaa ka dhigaysa mid aan la baari karin.',
+ 'encrypted' => 'Qarsoon',
+ 'fieldset' => 'Goobta garoonka',
+ 'qty_fields' => 'Goobaha Qty',
+ 'fieldsets' => 'Goobaha garoonka',
+ 'fieldset_name' => 'Magaca Goobta',
+ 'field_name' => 'Magaca Goobta',
+ 'field_values' => 'Qiimaha Goobta',
+ 'field_values_help' => 'Ku dar xulashooyinka la dooran karo, midkiiba. Khadadka maran ee aan ahayn xariiqda koowaad waa la iska indhatiraa',
+ 'field_element' => 'Qaybta Foomka',
+ 'field_element_short' => 'Cunsurka',
+ 'field_format' => 'Qaabka',
+ 'field_custom_format' => 'Qaabka Regex Custom',
+ 'field_custom_format_help' => 'Goobtani waxay kuu ogolaanaysaa inaad isticmaasho odhaah regex si loo xaqiijiyo Waa inay ku bilaabataa "regex:" - tusaale ahaan, si loo xaqiijiyo in qiimaha goobta gaarka ahi ka kooban yahay IMEI sax ah (15 lambar), waxaad isticmaali doontaa regex:/^[0-9]{15}$ /
',
+ 'required' => 'Loo baahan yahay',
'req' => 'Req.',
- 'used_by_models' => 'Used By Models',
- 'order' => 'Order',
- 'create_fieldset' => 'New Fieldset',
- 'update_fieldset' => 'Update Fieldset',
- 'fieldset_does_not_exist' => 'Fieldset :id does not exist',
- 'fieldset_updated' => 'Fieldset updated',
- 'create_fieldset_title' => 'Create a new fieldset',
- 'create_field' => 'New Custom Field',
- 'create_field_title' => 'Create a new custom field',
- 'value_encrypted' => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
- 'show_in_email' => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
- 'show_in_email_short' => 'Include in emails.',
- 'help_text' => 'Help Text',
- 'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
- 'about_custom_fields_title' => 'About Custom Fields',
- 'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
- 'add_field_to_fieldset' => 'Add Field to Fieldset',
- 'make_optional' => 'Required - click to make optional',
- 'make_required' => 'Optional - click to make required',
- 'reorder' => 'Reorder',
- 'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
- 'is_unique' => 'This value must be unique across all assets',
- 'unique' => 'Unique',
- 'display_in_user_view' => 'Allow the checked out user to view these values in their View Assigned Assets page',
- 'display_in_user_view_table' => 'Visible to User',
- 'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
- 'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
- 'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
- 'show_in_listview_short' => 'Show in lists',
- 'show_in_requestable_list_short' => 'Show in requestable assets list',
- 'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
- 'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
+ 'used_by_models' => 'Waxaa Isticmaala Moodooyinka',
+ 'order' => 'Dalbo',
+ 'create_fieldset' => 'Goob Cusub',
+ 'update_fieldset' => 'Cusbooneysii Fieldset',
+ 'fieldset_does_not_exist' => 'Fieldset :id ma jiro',
+ 'fieldset_updated' => 'Goobta goobta waa la cusboonaysiiyay',
+ 'create_fieldset_title' => 'Samee goob cusub',
+ 'create_field' => 'Garoonka Cusub ee Custom',
+ 'create_field_title' => 'Samee goob cusub oo caado ah',
+ 'value_encrypted' => 'Qiimaha goobtan waxa lagu sir ah kaydka xogta. Kaliya isticmaalayaasha maamulka ayaa awoodi doona inay arkaan qiimaha la furay',
+ 'show_in_email' => 'Ku dar qiimaha goobtan fariimaha hubinta ee loo soo diray isticmaalaha? Goobaha sirta ah laguma dari karo iimaylada',
+ 'show_in_email_short' => 'Ku dar emails',
+ 'help_text' => 'Qoraalka Caawinta',
+ 'help_text_description' => 'Kani waa qoraal ikhtiyaari ah oo ka soo bixi doona hoosta qaybaha foomka marka la tafatiro hantida si loo bixiyo macnaha guud ee goobta.',
+ 'about_custom_fields_title' => 'Ku saabsan Goobaha Gaarka ah',
+ 'about_custom_fields_text' => 'Goobaha gaarka ah waxay kuu oggolaanayaan inaad ku darto sifooyin aan sabab lahayn hantida.',
+ 'add_field_to_fieldset' => 'Kudar Goobta Goobta',
+ 'make_optional' => 'Loo baahan yahay - dhagsii si aad ikhtiyaar u sameyso',
+ 'make_required' => 'Ikhtiyaar-guji si loo baahdo',
+ 'reorder' => 'Dib u dalbo',
+ 'db_field' => 'Goobta DB',
+ 'db_convert_warning' => 'DIGNIIN. Goobtani waxay ku dhex jirtaa shaxda qaaska ah ee beeraha sida :db_column
laakiin waa inay noqotaa Admin > General Settings
.jane.smith
) format',
- 'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith
) format',
- 'csv_import_match_first' => 'Try to match users by first name (jane
) format',
- 'csv_import_match_email' => 'Try to match users by email as username',
- 'csv_import_match_username' => 'Try to match users by username',
- 'error_messages' => 'Error messages:',
- 'success_messages' => 'Success messages:',
- 'alert_details' => 'Please see below for details.',
- 'custom_export' => 'Custom Export',
- 'mfg_warranty_lookup' => ':manufacturer Warranty Status Lookup',
- 'user_department' => 'User Department',
+ 'about_assets_title' => 'Ku saabsan Hantida',
+ 'about_assets_text' => 'Hantidu waa shay lagu raadraaco lambar taxane ah ama sumad hanti ah. Waxay u muuqdaan inay yihiin shay qiimo sare leh marka la aqoonsanayo shay gaar ah.',
+ 'archived' => 'Kaydsan',
+ 'asset' => 'Hantida',
+ 'bulk_checkout' => 'Hubinta Hantida',
+ 'bulk_checkin' => 'Hubi Hantida',
+ 'checkin' => 'Hubi Hantida',
+ 'checkout' => 'Hubi Hantida',
+ 'clone' => 'Hantida Clone',
+ 'deployable' => 'La geyn karo',
+ 'deleted' => 'Hantidan waa la tirtiray.',
+ 'delete_confirm' => 'Ma hubtaa inaad doonayso inaad tirtirto hantidan?',
+ 'edit' => 'Wax ka beddel hantida',
+ 'model_deleted' => 'Qaabkan Hantida waa la tirtiray Waa inaad soo celisaa qaabka ka hor inta aanad soo celin Hantida.',
+ 'model_invalid' => 'Qaabka hantidani waa mid aan shaqayn.',
+ 'model_invalid_fix' => 'Hantida waa in la tafatiraa si tan loo saxo ka hor inta aan la isku dayin in la hubiyo ama laga saaro.',
+ 'requestable' => 'La codsan karo',
+ 'requested' => 'La codsaday',
+ 'not_requestable' => 'Looma baahna',
+ 'requestable_status_warning' => 'Ha bedelin heerka la codsan karo',
+ 'restore' => 'Soo Celinta Hantida',
+ 'pending' => 'La sugayo',
+ 'undeployable' => 'Aan la hawlgelin',
+ 'undeployable_tooltip' => 'Hantidani waxay leedahay calaamad xaaladeed oo aan la hawlgelin oo aan la hubin karin wakhtigan.',
+ 'view' => 'Daawo Hantida',
+ 'csv_error' => 'Khalad baad ku leedahay faylkaaga CSV:',
+ 'import_text' => 'Soo rar CSV oo ka kooban taariikhda hantida Hantida iyo isticmaalayaashu waa inay hore ugu jiraan nidaamka, ama waa laga boodi doonaa. Hantida ku habboon soo dejinta taariikhda waxay ku dhacdaa calaamadda hantida Waxaan isku dayi doonaa inaan helno isticmaale u dhigma iyadoo lagu salaynayo magaca isticmaalaha aad bixisay, iyo shuruudaha aad hoos ku doorato. Haddii aadan hoos dooran wax shuruud ah, waxay si fudud isku dayi doontaa inay ku habboonaato qaabka isticmaale ee aad ku habaysay Admin > Goobaha Guud
Meelaha ku jira CSV-ga waa in ay iswaafaqaan madaxyada: Hanti Tag, Magaca, Taariikhda hubinta, Taariikhda hubinta. Goob kasta oo dheeri ah waa la iska indhatiraa
Taariikhda jeegeynta: taariikhaha jeegeynta banaan ama mustaqbalka waxay hubin doontaa alaabta isticmaalaha. Marka laga reebo tiirka Taariikhda Jeegaynta waxay abuuri doontaa taariikh hubin leh taariikhda maanta.
', + 'csv_import_match_f-l' => 'Isku day inaad isticmaalayaasha ku wajahdo qaabkafirstname.name(jane.smith
)',
+ 'csv_import_match_initial_last' => 'Isku day inaad isticmaalayaasha ku wajahdo qaabkafirstname. name(jane. smith
)',
+ 'csv_import_match_first' => 'Isku day inaad isticmaalayaasha ku wajahdo qaabka firstname. name(jane. smith
) format',
+ 'csv_import_match_email' => 'Isku day inaad isticmaalayaasha ku waafajisoemail sidii isticmaale ahaan',
+ 'csv_import_match_username' => 'Isku day inaad isticmaalayaasha ku waafajisousername',
+ 'error_messages' => 'Fariimaha khaldan:',
+ 'success_messages' => 'Farriimaha guusha:',
+ 'alert_details' => 'Fadlan hoos ka eeg faahfaahinta.',
+ 'custom_export' => 'Dhoofinta gaarka ah',
+ 'mfg_warranty_lookup' => ':manufacturer Raadinta Xaaladda damaanada',
+ 'user_department' => 'Waaxda Isticmaalaha',
];
diff --git a/resources/lang/so-SO/admin/hardware/message.php b/resources/lang/so-SO/admin/hardware/message.php
index 056692998e..bc9da76b30 100644
--- a/resources/lang/so-SO/admin/hardware/message.php
+++ b/resources/lang/so-SO/admin/hardware/message.php
@@ -2,89 +2,90 @@
return [
- 'undeployable' => 'Warning: This asset has been marked as currently undeployable.
- If this status has changed, please update the asset status.',
- 'does_not_exist' => 'Asset does not exist.',
- 'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
- 'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
+ 'undeployable' => 'Digniin: Hantidan waxaa loo calaamadeeyay mid aan hadda la daabul karin.
+ Haddii heerkan uu isbedelay, fadlan cusboonaysii heerka hantida.',
+ 'does_not_exist' => 'Hantidu ma jirto.',
+ 'does_not_exist_or_not_requestable' => 'Hantidaas ma jirto ama lama codsan karo.',
+ 'assoc_users' => 'Hantidan hadda waa la hubiyay isticmaale lamana tirtiri karo Fadlan marka hore hubi hantida, ka dibna isku day mar kale in aad tirtirto. ',
'create' => [
- 'error' => 'Asset was not created, please try again. :(',
- 'success' => 'Asset created successfully. :)',
- 'success_linked' => 'Asset with tag :tag was created successfully. Click here to view.',
+ 'error' => 'Hantida lama abuurin, fadlan isku day mar kale. :(',
+ 'success' => 'Hantida loo sameeyay si guul leh :)',
+ 'success_linked' => 'Hanti leh sumad :tag si guul leh ayaa loo abuuray. Riix halkan si aad u aragto.',
],
'update' => [
- 'error' => 'Asset was not updated, please try again',
- 'success' => 'Asset updated successfully.',
- 'nothing_updated' => 'No fields were selected, so nothing was updated.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'error' => 'Hantida lama cusboonaysiin, fadlan isku day mar kale',
+ 'success' => 'Hantida si guul leh ayaa loo cusboonaysiiyay.',
+ 'nothing_updated' => 'Goobo lama dooran, markaa waxba lama cusboonaysiin.',
+ 'no_assets_selected' => 'Wax hanti ah lama dooran, markaa waxba lama cusboonaysiin.',
+ 'assets_do_not_exist_or_are_invalid' => 'Hantida la xushay lama cusboonaysiin karo.',
],
'restore' => [
- 'error' => 'Asset was not restored, please try again',
- 'success' => 'Asset restored successfully.',
- 'bulk_success' => 'Asset restored successfully.',
- 'nothing_updated' => 'No assets were selected, so nothing was restored.',
+ 'error' => 'Hantidii lama soo celin, fadlan isku day mar kale',
+ 'success' => 'Hantida si guul leh ayaa loo soo celiyay.',
+ 'bulk_success' => 'Hantida si guul leh ayaa loo soo celiyay.',
+ 'nothing_updated' => 'Wax hanti ah lama dooran, markaa waxba lama soo celin.',
],
'audit' => [
- 'error' => 'Asset audit was unsuccessful. Please try again.',
- 'success' => 'Asset audit successfully logged.',
+ 'error' => 'Hantidhawrka hantida waa lagu guulaysan waayay. Fadlan isku day mar kale.',
+ 'success' => 'Hantidhawrka hantida ayaa si guul leh loo diiwaan geliyay.',
],
'deletefile' => [
- 'error' => 'File not deleted. Please try again.',
- 'success' => 'File successfully deleted.',
+ 'error' => 'Faylka lama tirtirin Fadlan isku day mar kale.',
+ 'success' => 'Faylka si guul leh waa la tirtiray.',
],
'upload' => [
- 'error' => 'File(s) not uploaded. Please try again.',
- 'success' => 'File(s) successfully uploaded.',
- 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
- 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.',
+ 'error' => 'Faylka lama soo rarin Fadlan isku day mar kale.',
+ 'success' => 'Faylka(yada) si guul leh loo soo raray.',
+ 'nofiles' => 'Ma aadan dooran wax fayl ah oo la soo geliyo, ama faylka aad isku dayeyso inaad geliyaan waa mid aad u weyn',
+ 'invalidfiles' => 'Mid ama in ka badan oo faylashaada ah aad bay u weyn yihiin ama waa nooc faylal ah oo aan la oggolayn. Noocyada faylalka la oggol yahay waa png, gif, jpg, doc, docx, pdf, iyo txt.',
],
'import' => [
- 'error' => 'Some items did not import correctly.',
- 'errorDetail' => 'The following Items were not imported because of errors.',
- 'success' => 'Your file has been imported',
- 'file_delete_success' => 'Your file has been been successfully deleted',
- 'file_delete_error' => 'The file was unable to be deleted',
- 'file_missing' => 'The file selected is missing',
- 'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
- 'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
+ 'error' => 'Alaabta qaar si sax ah uma soo dejin.',
+ 'errorDetail' => 'Alaabta soo socota looma soo dejin khaladaad dartood.',
+ 'success' => 'Faylkaaga waa la soo dejiyay',
+ 'file_delete_success' => 'Faylkaaga si guul leh ayaa loo tirtiray',
+ 'file_delete_error' => 'Faylka waa la tirtiri waayay',
+ 'file_missing' => 'Faylka la doortay waa maqan yahay',
+ 'header_row_has_malformed_characters' => 'Hal ama in ka badan oo sifooyin ah oo ku jira safka madaxa waxa ku jira xarfaha UTF-8 oo khaldan',
+ 'content_row_has_malformed_characters' => 'Hal ama in ka badan oo sifooyin ah safka koowaad ee nuxurka waxa ku jira xarfo UTF-8 oo khaldan',
],
'delete' => [
- 'confirm' => 'Are you sure you wish to delete this asset?',
- 'error' => 'There was an issue deleting the asset. Please try again.',
- 'nothing_updated' => 'No assets were selected, so nothing was deleted.',
- 'success' => 'The asset was deleted successfully.',
+ 'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto hantidan?',
+ 'error' => 'Waxaa jirtay arrin la tirtiray hantida Fadlan isku day mar kale.',
+ 'nothing_updated' => 'Wax hanti ah lama dooran, markaa waxba lama tirtirin.',
+ 'success' => 'Hantida si guul leh ayaa loo tirtiray.',
],
'checkout' => [
- 'error' => 'Asset was not checked out, please try again',
- 'success' => 'Asset checked out successfully.',
- 'user_does_not_exist' => 'That user is invalid. Please try again.',
- 'not_available' => 'That asset is not available for checkout!',
- 'no_assets_selected' => 'You must select at least one asset from the list',
+ 'error' => 'Hantida lama hubin, fadlan isku day mar kale',
+ 'success' => 'Hantida si guul leh ayaa loo hubiyay.',
+ 'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale.',
+ 'not_available' => 'Hantidaas looma hayo hubin!',
+ 'no_assets_selected' => 'Waa inaad liiska ka doorataa ugu yaraan hal hanti',
],
'checkin' => [
- 'error' => 'Asset was not checked in, please try again',
- 'success' => 'Asset checked in successfully.',
- 'user_does_not_exist' => 'That user is invalid. Please try again.',
- 'already_checked_in' => 'That asset is already checked in.',
+ 'error' => 'Hantida lama hubin, fadlan isku day mar kale',
+ 'success' => 'Hantida si guul leh ayaa loo hubiyay.',
+ 'user_does_not_exist' => 'Isticmaalahaasi waa khalad Fadlan isku day mar kale.',
+ 'already_checked_in' => 'Hantidaas mar horeba waa la hubiyay.',
],
'requests' => [
- 'error' => 'Asset was not requested, please try again',
- 'success' => 'Asset requested successfully.',
- 'canceled' => 'Checkout request successfully canceled',
+ 'error' => 'Hantida lama codsan, fadlan isku day mar kale',
+ 'success' => 'Hantida ayaa si guul leh u codsatay.',
+ 'canceled' => 'Codsiga hubinta si guul leh waa la joojiyay',
],
];
diff --git a/resources/lang/so-SO/admin/hardware/table.php b/resources/lang/so-SO/admin/hardware/table.php
index 92b228dccd..5311631d97 100644
--- a/resources/lang/so-SO/admin/hardware/table.php
+++ b/resources/lang/so-SO/admin/hardware/table.php
@@ -2,32 +2,32 @@
return [
- 'asset_tag' => 'Asset Tag',
- 'asset_model' => 'Model',
- 'assigned_to' => 'Assigned To',
- 'book_value' => 'Current Value',
- 'change' => 'In/Out',
- 'checkout_date' => 'Checkout Date',
- 'checkoutto' => 'Checked Out',
- 'components_cost' => 'Total Components Cost',
- 'current_value' => 'Current Value',
- 'diff' => 'Diff',
- 'dl_csv' => 'Download CSV',
+ 'asset_tag' => 'Hantida Tag',
+ 'asset_model' => 'Qaabka',
+ 'assigned_to' => 'Loo xilsaaray',
+ 'book_value' => 'Qiimaha hadda',
+ 'change' => 'Gudaha/kabaxsan',
+ 'checkout_date' => 'Taariikhda Bixinta',
+ 'checkoutto' => 'La Hubiyay',
+ 'components_cost' => 'Wadarta Qiimaha Qaybaha',
+ 'current_value' => 'Qiimaha hadda',
+ 'diff' => 'Kala duwanaansho',
+ 'dl_csv' => 'Soo deji CSV',
'eol' => 'EOL',
- 'id' => 'ID',
- 'last_checkin_date' => 'Last Checkin Date',
- 'location' => 'Location',
- 'purchase_cost' => 'Cost',
- 'purchase_date' => 'Purchased',
- 'serial' => 'Serial',
- 'status' => 'Status',
- 'title' => 'Asset ',
- 'image' => 'Device Image',
- 'days_without_acceptance' => 'Days Without Acceptance',
- 'monthly_depreciation' => 'Monthly Depreciation',
- 'assigned_to' => 'Assigned To',
- 'requesting_user' => 'Requesting User',
- 'requested_date' => 'Requested Date',
- 'changed' => 'Changed',
- 'icon' => 'Icon',
+ 'id' => 'Aqoonsi',
+ 'last_checkin_date' => 'Taariikhda Jeedintii Ugu Dambeysay',
+ 'location' => 'Goobta',
+ 'purchase_cost' => 'Qiimaha',
+ 'purchase_date' => 'Iibsaday',
+ 'serial' => 'Taxane',
+ 'status' => 'Xaalada',
+ 'title' => 'Hantida. ',
+ 'image' => 'Sawirka Qalabka',
+ 'days_without_acceptance' => 'Maalmo Aqbali La\'aan',
+ 'monthly_depreciation' => 'Qiima dhaca bishii',
+ 'assigned_to' => 'Loo xilsaaray',
+ 'requesting_user' => 'Codsada Isticmaalaha',
+ 'requested_date' => 'Taariikhda la codsaday',
+ 'changed' => 'Bedelay',
+ 'icon' => 'Astaan',
];
diff --git a/resources/lang/so-SO/admin/kits/general.php b/resources/lang/so-SO/admin/kits/general.php
index f57fb645c4..f2f5e7c933 100644
--- a/resources/lang/so-SO/admin/kits/general.php
+++ b/resources/lang/so-SO/admin/kits/general.php
@@ -1,50 +1,50 @@
'About Predefined Kits',
- 'about_kits_text' => 'Predefined Kits let you quickly check out a collection of items (assets, licenses, etc) to a user. This can be helpful when your onboarding process is consistent across many users and all users receive the same items.',
- 'checkout' => 'Checkout Kit ',
- 'create_success' => 'Kit was successfully created.',
- 'create' => 'Create Predefined Kit',
- 'update' => 'Update Predefined Kit',
- 'delete_success' => 'Kit was successfully deleted.',
- 'update_success' => 'Kit was successfully updated.',
- 'none_models' => 'There are not enough available assets for :model to checkout. :qty are required. ',
- 'none_licenses' => 'There are not enough available seats for :license to checkout. :qty are required. ',
- 'none_consumables' => 'There are not enough available units of :consumable to checkout. :qty are required. ',
- 'none_accessory' => 'There are not enough available units of :accessory to checkout. :qty are required. ',
- 'append_accessory' => 'Append Accessory',
- 'update_appended_accessory' => 'Update appended Accessory',
- 'append_consumable' => 'Append Consumable',
- 'update_appended_consumable' => 'Update appended Consumable',
- 'append_license' => 'Append license',
- 'update_appended_license' => 'Update appended license',
- 'append_model' => 'Append model',
- 'update_appended_model' => 'Update appended model',
- 'license_error' => 'License already attached to kit',
- 'license_added_success' => 'License added successfully',
- 'license_updated' => 'License was successfully updated',
- 'license_none' => 'License does not exist',
- 'license_detached' => 'License was successfully detached',
- 'consumable_added_success' => 'Consumable added successfully',
- 'consumable_updated' => 'Consumable was successfully updated',
- 'consumable_error' => 'Consumable already attached to kit',
- 'consumable_deleted' => 'Delete was successful',
- 'consumable_none' => 'Consumable does not exist',
- 'consumable_detached' => 'Consumable was successfully detached',
- 'accessory_added_success' => 'Accessory added successfully',
- 'accessory_updated' => 'Accessory was successfully updated',
- 'accessory_detached' => 'Accessory was successfully detached',
- 'accessory_error' => 'Accessory already attached to kit',
- 'accessory_deleted' => 'Delete was successful',
+ 'about_kits_title' => 'Ku saabsan Xirmooyinka Horay loo Qeexay',
+ 'about_kits_text' => 'Xirmooyinka Horay loo Qeexay ayaa kuu oggolaanaya inaad si dhakhso leh u hubiso ururinta alaabta (hanti, shatiyada, iwm) ee isticmaalaha. Tani waxay noqon kartaa mid waxtar leh marka habka fuuliddu uu yahay mid joogto ah isticmaalayaasha badan oo dhammaan isticmaalayaasha ay helaan shay isku mid ah.',
+ 'checkout' => 'Qalabka hubinta ',
+ 'create_success' => 'Qalabka si guul leh ayaa loo sameeyay',
+ 'create' => 'Samee xirmo horay loo sii qeexay',
+ 'update' => 'Cusbooneysii Kit Horay u Qeexay',
+ 'delete_success' => 'Qalabka si guul leh ayaa loo tirtiray',
+ 'update_success' => 'Qalabka si guul leh ayaa loo cusboonaysiiyay',
+ 'none_models' => 'Ma jiraan hanti ku filan oo la heli karo :model si loo hubiyo :qty ayaa loo baahan yahay ',
+ 'none_licenses' => 'Ma jiraan kuraas ku filan oo la heli karo :license si loo hubiyo. :qty ayaa loo baahan yahay ',
+ 'none_consumables' => 'Ma jiraan unugyo :consumable ku filan oo la heli karo si loo hubiyo. :qty ayaa loo baahan yahay ',
+ 'none_accessory' => 'Ma jiraan unugyo :accessory ku filan oo la heli karo si loo hubiyo. :qty ayaa loo baahan yahay ',
+ 'append_accessory' => 'Qalabka ku lifaaqan',
+ 'update_appended_accessory' => 'Cusbooneysii Agabka ku lifaaqan',
+ 'append_consumable' => 'Lifaaqa Isticmaalka',
+ 'update_appended_consumable' => 'Cusbooneysii ku lifaaqan Consumable',
+ 'append_license' => 'Liisan ku lifaaq',
+ 'update_appended_license' => 'Cusbooneysii shatiga lifaaqan',
+ 'append_model' => 'Qaabka ku lifaaq',
+ 'update_appended_model' => 'Cusbooneysii qaabka ku lifaaqan',
+ 'license_error' => 'Ruqsadda hore loogu xidhay xirmada',
+ 'license_added_success' => 'Shatiga si guul leh loogu daray',
+ 'license_updated' => 'Shatiga si guul leh ayaa loo cusboonaysiiyay',
+ 'license_none' => 'Shatiga ma jiro',
+ 'license_detached' => 'Shatiga si guul leh ayaa loo jaray',
+ 'consumable_added_success' => 'Isticmaalka ayaa si guul leh loogu daray',
+ 'consumable_updated' => 'Isticmaalka si guul leh ayaa loo cusboonaysiiyay',
+ 'consumable_error' => 'Isticmaalka horeba ugu xidhan xirmada',
+ 'consumable_deleted' => 'Tirtiridda waa lagu guulaystay',
+ 'consumable_none' => 'Wax la isticmaali karo ma jiro',
+ 'consumable_detached' => 'Isticmaalka ayaa si guul leh u go\'ay',
+ 'accessory_added_success' => 'Qalabka lagu daray si guul leh',
+ 'accessory_updated' => 'Qalabka si guul leh ayaa loo cusboonaysiiyay',
+ 'accessory_detached' => 'Qalabka si guul leh ayaa loo go\'ay',
+ 'accessory_error' => 'Agabka horeba loogu xidhay xirmada',
+ 'accessory_deleted' => 'Tirtiridda waa lagu guulaystay',
'accessory_none' => 'The accessory does not exist',
- 'checkout_success' => 'Checkout was successful',
- 'checkout_error' => 'Checkout error',
- 'kit_none' => 'Kit does not exist',
- 'kit_created' => 'Kit was successfully created',
- 'kit_updated' => 'Kit was successfully updated',
- 'kit_not_found' => 'Kit not found',
- 'kit_deleted' => 'Kit was successfully deleted',
- 'kit_model_updated' => 'Model was successfully updated',
- 'kit_model_detached' => 'Model was successfully detached',
+ 'checkout_success' => 'Jeedintu waa lagu guulaystay',
+ 'checkout_error' => 'Khaladka hubinta',
+ 'kit_none' => 'Kitaabku ma jiro',
+ 'kit_created' => 'Qalabka si guul leh ayaa loo sameeyay',
+ 'kit_updated' => 'Qalabka si guul leh ayaa loo cusboonaysiiyay',
+ 'kit_not_found' => 'Qalabka lama helin',
+ 'kit_deleted' => 'Qalabka si guul leh ayaa loo tirtiray',
+ 'kit_model_updated' => 'Qaabka si guul leh ayaa loo cusboonaysiiyay',
+ 'kit_model_detached' => 'Qaabka ayaa si guul leh u go\'ay',
];
diff --git a/resources/lang/so-SO/admin/labels/message.php b/resources/lang/so-SO/admin/labels/message.php
index 96785f0754..82b9784385 100644
--- a/resources/lang/so-SO/admin/labels/message.php
+++ b/resources/lang/so-SO/admin/labels/message.php
@@ -2,10 +2,10 @@
return [
- 'invalid_return_count' => 'Invalid count returned from :name. Expected :expected, got :actual.',
- 'invalid_return_type' => 'Invalid type returned from :name. Expected :expected, got :actual.',
- 'invalid_return_value' => 'Invalid value returned from :name. Expected :expected, got :actual.',
+ 'invalid_return_count' => 'Tiro aan sax ahayn ayaa laga soo celiyay :name. la filayo :expected, helay :actual.',
+ 'invalid_return_type' => 'Nooca aan sax ahayn ayaa laga soo celiyay :name. la filayo :expected, helay :actual.',
+ 'invalid_return_value' => 'Qiimo aan sax ahayn ayaa laga soo celiyay :name. la filayo :expected, helay :actual.',
- 'does_not_exist' => 'Label does not exist',
+ 'does_not_exist' => 'Calaamaduhu ma jiraan',
];
diff --git a/resources/lang/so-SO/admin/labels/table.php b/resources/lang/so-SO/admin/labels/table.php
index bef4ba170e..310c6f6076 100644
--- a/resources/lang/so-SO/admin/labels/table.php
+++ b/resources/lang/so-SO/admin/labels/table.php
@@ -8,12 +8,12 @@ return [
'example_manufacturer' => 'Test Manufacturing Inc.',
'example_model' => 'Test Model',
'example_supplier' => 'Test Company Limited',
- 'labels_per_page' => 'Labels',
- 'support_fields' => 'Fields',
+ 'labels_per_page' => 'Calaamadaha',
+ 'support_fields' => 'Beeraha',
'support_asset_tag' => 'Tag',
'support_1d_barcode' => '1D',
'support_2d_barcode' => '2D',
'support_logo' => 'Logo',
- 'support_title' => 'Title',
+ 'support_title' => 'Ciwaanka',
];
\ No newline at end of file
diff --git a/resources/lang/so-SO/admin/licenses/form.php b/resources/lang/so-SO/admin/licenses/form.php
index ce29167874..6a12b96763 100644
--- a/resources/lang/so-SO/admin/licenses/form.php
+++ b/resources/lang/so-SO/admin/licenses/form.php
@@ -2,21 +2,21 @@
return array(
- 'asset' => 'Asset',
- 'checkin' => 'Checkin',
- 'create' => 'Create License',
- 'expiration' => 'Expiration Date',
- 'license_key' => 'Product Key',
- 'maintained' => 'Maintained',
- 'name' => 'Software Name',
- 'no_depreciation' => 'Do Not Depreciate',
- 'purchase_order' => 'Purchase Order Number',
- 'reassignable' => 'Reassignable',
- 'remaining_seats' => 'Remaining Seats',
- 'seats' => 'Seats',
- 'termination_date' => 'Termination Date',
- 'to_email' => 'Licensed to Email',
- 'to_name' => 'Licensed to Name',
- 'update' => 'Update License',
- 'checkout_help' => 'You must check a license out to a hardware asset or a person. You can select both, but the owner of the asset must match the person you\'re checking the asset out to.'
+ 'asset' => 'Hantida',
+ 'checkin' => 'Is xaadiri',
+ 'create' => 'Samee shatiga',
+ 'expiration' => 'Taariikhda uu dhacayo',
+ 'license_key' => 'Furaha Alaabta',
+ 'maintained' => 'La ilaaliyo',
+ 'name' => 'Magaca Software',
+ 'no_depreciation' => 'Ha Qiimayn',
+ 'purchase_order' => 'Lambarka Dalabka Iibka',
+ 'reassignable' => 'Dib loo magacaabi karo',
+ 'remaining_seats' => 'Kuraasta hadhay',
+ 'seats' => 'Kuraasta',
+ 'termination_date' => 'Taariikhda Joojinta',
+ 'to_email' => 'Ruqsad u siisay iimaylka',
+ 'to_name' => 'Ruqsad u siisay Magaca',
+ 'update' => 'Cusbooneysii shatiga',
+ 'checkout_help' => 'Waa inaad ka hubisaa shatiga hantida qalabka ama qofka. Waad dooran kartaa labadaba, laakiin mulkiilaha hantidu waa inuu la mid yahay qofka aad ka hubinayso hantida.'
);
diff --git a/resources/lang/so-SO/admin/licenses/general.php b/resources/lang/so-SO/admin/licenses/general.php
index 79b69a3d94..4d45176581 100644
--- a/resources/lang/so-SO/admin/licenses/general.php
+++ b/resources/lang/so-SO/admin/licenses/general.php
@@ -1,46 +1,46 @@
'About Licenses',
- 'about_licenses' => 'Licenses are used to track software. They have a specified number of seats that can be checked out to individuals',
- 'checkin' => 'Checkin License Seat',
- 'checkout_history' => 'Checkout History',
- 'checkout' => 'Checkout License Seat',
- 'edit' => 'Edit License',
- 'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
- 'clone' => 'Clone License',
- 'history_for' => 'History for ',
- 'in_out' => 'In/Out',
- 'info' => 'License Info',
- 'license_seats' => 'License Seats',
- 'seat' => 'Seat',
- 'seats' => 'Seats',
- 'software_licenses' => 'Software Licenses',
- 'user' => 'User',
- 'view' => 'View License',
- 'delete_disabled' => 'This license cannot be deleted yet because some seats are still checked out.',
+ 'about_licenses_title' => 'Ku saabsan shatiyada',
+ 'about_licenses' => 'Shatiyada waxaa loo isticmaalaa in lagu raad raaco software. Waxay haystaan tiro cayiman oo kuraas ah oo laga hubin karo shakhsiyaadka',
+ 'checkin' => 'Hubinta Kursiga Shatiga',
+ 'checkout_history' => 'Hubi Taariikhda',
+ 'checkout' => 'Kursiga shatiga jeegaga',
+ 'edit' => 'Wax ka beddel shatiga',
+ 'filetype_info' => 'Noocyada faylalka la oggol yahay waa png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, iyo rar.',
+ 'clone' => 'Shatiga Clone',
+ 'history_for' => 'Taariikhda',
+ 'in_out' => 'Gudaha/kabaxsan',
+ 'info' => 'Macluumaadka shatiga',
+ 'license_seats' => 'Kuraasta shatiga',
+ 'seat' => 'Kursiga',
+ 'seats' => 'Kuraasta',
+ 'software_licenses' => 'Shatiyada Software',
+ 'user' => 'Isticmaale',
+ 'view' => 'Eeg shatiga',
+ 'delete_disabled' => 'Shatigan weli lama tirtiri karo sababtoo ah kuraasta qaarkood weli waa la hubiyay.',
'bulk' =>
[
'checkin_all' => [
- 'button' => 'Checkin All Seats',
- 'modal' => 'This will action checkin one seat. | This action will checkin all :checkedout_seats_count seats for this license.',
- 'enabled_tooltip' => 'Checkin ALL seats for this license from both users and assets',
- 'disabled_tooltip' => 'This is disabled because there are no seats currently checked out',
- 'disabled_tooltip_reassignable' => 'This is disabled because the License is not reassignable',
- 'success' => 'License successfully checked in! | All licenses were successfully checked in!',
- 'log_msg' => 'Checked in via bulk license checkout in license GUI',
+ 'button' => 'Hubi Dhammaan Kuraasta',
+ 'modal' => 'Tani waxay tallaabo ku hubin doontaa hal kursi. | Tallaabadani waxay hubin doontaa dhammaan :checkedout_seats_count kuraasida shatigan.',
+ 'enabled_tooltip' => 'Hubi dhammaan kuraasta shatigan isticmaalayaasha iyo hantida labadaba',
+ 'disabled_tooltip' => 'Tani waa naafo sababtoo ah ma jiraan kuraas hadda la hubiyay',
+ 'disabled_tooltip_reassignable' => 'Tani waa naafo sababtoo ah shatiga dib looma wareejin karo',
+ 'success' => 'Shatiga si guul leh ayaa loo hubiyay! | Dhammaan shatiyada si guul leh ayaa loo hubiyay!',
+ 'log_msg' => 'Lagu hubiyay hubinta shatiga bulk ee shatiga GUI',
],
'checkout_all' => [
- 'button' => 'Checkout All Seats',
- 'modal' => 'This action will checkout one seat to the first available user. | This action will checkout all :available_seats_count seats to the first available users. A user is considered available for this seat if they do not already have this license checked out to them, and the Auto-Assign License property is enabled on their user account.',
- 'enabled_tooltip' => 'Checkout ALL seats (or as many as are available) to ALL users',
- 'disabled_tooltip' => 'This is disabled because there are no seats currently available',
- 'success' => 'License successfully checked out! | :count licenses were successfully checked out!',
- 'error_no_seats' => 'There are no remaining seats left for this license.',
- 'warn_not_enough_seats' => ':count users were assigned this license, but we ran out of available license seats.',
- 'warn_no_avail_users' => 'Nothing to do. There are no users who do not already have this license assigned to them.',
- 'log_msg' => 'Checked out via bulk license checkout in license GUI',
+ 'button' => 'Hubi Dhammaan Kuraasta',
+ 'modal' => 'Tallaabadani waxay hubin doontaa hal kursi isticmaalayaasha ugu horreeya ee jira. | Tallaabadani waxay hubin doontaa dhammaan :available_seats_count kuraasta isticmaalayaasha ugu horreeya ee la heli karo. Isticmaale waxa loo tixgalinayaa inuu u diyaar yahay kursigan haddii aanu horeba u haysan shatigan iyaga la hubiyay, iyo shatiga Auto-Assign-ka waxa loo ogolyahay akoonkiisa isticmaale.',
+ 'enabled_tooltip' => 'Hubi dhammaan kuraasta (ama inta la heli karo) DHAMMAAN isticmaalayaasha',
+ 'disabled_tooltip' => 'Tani waa naafo sababtoo ah ma jiraan kuraas hadda la heli karo',
+ 'success' => 'Shatiga si guul leh loo hubiyay! | :count shatiyada si guul leh ayaa loo hubiyay!',
+ 'error_no_seats' => 'Ma jiraan kuraas hadhay oo shatigan u hadhay.',
+ 'warn_not_enough_seats' => ':count isticmaalayaasha waxa loo qoondeeyay shatigan, laakiin waxa naga dhamaaday kuraas shatiga la heli karo.',
+ 'warn_no_avail_users' => 'Wax la sameeyo. Ma jiraan isticmaaleyaal aan horay u haysan shatigan iyaga loo qoondeeyay.',
+ 'log_msg' => 'Lagu hubiyay iyada oo loo marayo hubinta shatiga badan ee GUI shatiga',
],
diff --git a/resources/lang/so-SO/admin/licenses/message.php b/resources/lang/so-SO/admin/licenses/message.php
index c79f631680..2ad98b7c75 100644
--- a/resources/lang/so-SO/admin/licenses/message.php
+++ b/resources/lang/so-SO/admin/licenses/message.php
@@ -2,53 +2,53 @@
return array(
- 'does_not_exist' => 'License does not exist or you do not have permission to view it.',
- 'user_does_not_exist' => 'User does not exist.',
- 'asset_does_not_exist' => 'The asset you are trying to associate with this license does not exist.',
- 'owner_doesnt_match_asset' => 'The asset you are trying to associate with this license is owned by somene other than the person selected in the assigned to dropdown.',
- 'assoc_users' => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
- 'select_asset_or_person' => 'You must select an asset or a user, but not both.',
- 'not_found' => 'License not found',
+ 'does_not_exist' => 'Shatiga ma jiro ama ma haysatid fasax aad ku aragto.',
+ 'user_does_not_exist' => 'Isticmaaluhu ma jiro',
+ 'asset_does_not_exist' => 'Hantida aad isku dayayso inaad ku xidho shatigan ma jiro.',
+ 'owner_doesnt_match_asset' => 'Hantida aad isku dayayso inaad ku xidho shatigan waxa iska leh cid kale oo aan ahayn qofka lagu doortay meesha hoos u dhigida.',
+ 'assoc_users' => 'Shatigan hadda waa la hubiyay isticmaale lamana tirtiri karo. Fadlan marka hore iska hubi shatiga, ka dibna isku day mar kale in aad tirtirto. ',
+ 'select_asset_or_person' => 'Waa inaad doorataa hanti ama isticmaale, laakiin labadaba maaha.',
+ 'not_found' => 'Shatiga lama helin',
'seats_available' => ':seat_count seats available',
'create' => array(
- 'error' => 'License was not created, please try again.',
- 'success' => 'License created successfully.'
+ 'error' => 'Shatiga lama abuurin, fadlan isku day mar kale.',
+ 'success' => 'Shatiga loo sameeyay si guul leh.'
),
'deletefile' => array(
- 'error' => 'File not deleted. Please try again.',
- 'success' => 'File successfully deleted.',
+ 'error' => 'Faylka lama tirtirin Fadlan isku day mar kale',
+ 'success' => 'Faylka si guul leh waa la tirtiray',
),
'upload' => array(
- 'error' => 'File(s) not uploaded. Please try again.',
- 'success' => 'File(s) successfully uploaded.',
- 'nofiles' => 'You did not select any files for upload, or the file you are trying to upload is too large',
- 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, and lic.',
+ 'error' => 'Faylka lama soo rarin Fadlan isku day mar kale',
+ 'success' => 'Faylka(yada) si guul leh loo soo raray.',
+ 'nofiles' => 'Ma aadan dooran wax fayl ah oo la soo geliyo, ama faylka aad isku dayeyso inaad geliyaan waa mid aad u weyn',
+ 'invalidfiles' => 'Mid ama in ka badan oo ka mid ah faylalkaagu aad bay u weyn yihiin ama waa nooc faylal ah oo aan la oggolayn. Noocyada faylalka la oggol yahay waa png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar, rtf, xml, iyo lic.',
),
'update' => array(
- 'error' => 'License was not updated, please try again',
- 'success' => 'License updated successfully.'
+ 'error' => 'Shatiga lama cusboonaysiin, fadlan isku day mar kale',
+ 'success' => 'Shatiga si guul leh ayaa loo cusboonaysiiyay'
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this license?',
- 'error' => 'There was an issue deleting the license. Please try again.',
- 'success' => 'The license was deleted successfully.'
+ 'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto shatigan?',
+ 'error' => 'Waxaa jirtay arrin la tirtiray shatiga Fadlan isku day mar kale',
+ 'success' => 'Shatiga si guul leh ayaa loo tirtiray'
),
'checkout' => array(
- 'error' => 'There was an issue checking out the license. Please try again.',
- 'success' => 'The license was checked out successfully',
+ 'error' => 'Waxaa jirtay arrin lagu hubinayo shatiga. Fadlan isku day mar kale',
+ 'success' => 'Shatiga si guul leh ayaa loo hubiyay',
'not_enough_seats' => 'Not enough license seats available for checkout',
),
'checkin' => array(
- 'error' => 'There was an issue checking in the license. Please try again.',
- 'success' => 'The license was checked in successfully'
+ 'error' => 'Waxaa jirtay arrin hubinta shatiga. Fadlan isku day mar kale',
+ 'success' => 'Shatiga si guul leh ayaa loo hubiyay'
),
);
diff --git a/resources/lang/so-SO/admin/licenses/table.php b/resources/lang/so-SO/admin/licenses/table.php
index dfce4136cb..6bd4c84084 100644
--- a/resources/lang/so-SO/admin/licenses/table.php
+++ b/resources/lang/so-SO/admin/licenses/table.php
@@ -2,16 +2,16 @@
return array(
- 'assigned_to' => 'Assigned To',
- 'checkout' => 'In/Out',
- 'id' => 'ID',
- 'license_email' => 'License Email',
- 'license_name' => 'Licensed To',
- 'purchase_date' => 'Purchase Date',
- 'purchased' => 'Purchased',
- 'seats' => 'Seats',
+ 'assigned_to' => 'Loo xilsaaray',
+ 'checkout' => 'Gudaha/kabaxsan',
+ 'id' => 'Aqoonsi',
+ 'license_email' => 'Iimayl shatiga',
+ 'license_name' => 'Ruqsad u haysta',
+ 'purchase_date' => 'Taariikhda Iibka',
+ 'purchased' => 'Iibsaday',
+ 'seats' => 'Kuraasta',
'hardware' => 'Hardware',
- 'serial' => 'Serial',
- 'title' => 'License',
+ 'serial' => 'Taxane',
+ 'title' => 'Shatiga',
);
diff --git a/resources/lang/so-SO/admin/locations/message.php b/resources/lang/so-SO/admin/locations/message.php
index 22c7fe8f70..472868cdf9 100644
--- a/resources/lang/so-SO/admin/locations/message.php
+++ b/resources/lang/so-SO/admin/locations/message.php
@@ -2,28 +2,28 @@
return array(
- 'does_not_exist' => 'Location does not exist.',
- 'assoc_users' => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
- 'assoc_assets' => 'This location is currently associated with at least one asset and cannot be deleted. Please update your assets to no longer reference this location and try again. ',
- 'assoc_child_loc' => 'This location is currently the parent of at least one child location and cannot be deleted. Please update your locations to no longer reference this location and try again. ',
- 'assigned_assets' => 'Assigned Assets',
- 'current_location' => 'Current Location',
+ 'does_not_exist' => 'Goobtu ma jirto.',
+ 'assoc_users' => 'Goobtan hadda waxa lala xidhiidhiyaa ugu yaraan hal isticmaale lamana tirtiri karo Fadlan cusboonaysii isticmaaleyaashaada si aanay mardambe u tixraacin goobtan oo isku day mar kale. ',
+ 'assoc_assets' => 'Goobtan hadda waxa lala xidhiidhiyaa ugu yaraan hal hanti lamana tirtiri karo. Fadlan cusboonaysii hantidaada si aanay meeshan u tixraacin oo mar kale isku day. ',
+ 'assoc_child_loc' => 'Goobtan hadda waa waalidka ugu yaraan hal meel oo caruur ah lamana tirtiri karo. Fadlan cusboonaysii goobahaaga si aanay mar dambe tixraac goobtan oo isku day mar kale. ',
+ 'assigned_assets' => 'Hantida loo qoondeeyay',
+ 'current_location' => 'Goobta Hadda',
'create' => array(
- 'error' => 'Location was not created, please try again.',
- 'success' => 'Location created successfully.'
+ 'error' => 'Goobta lama abuurin, fadlan isku day mar kale.',
+ 'success' => 'Goobta si guul leh ayaa loo sameeyay.'
),
'update' => array(
- 'error' => 'Location was not updated, please try again',
- 'success' => 'Location updated successfully.'
+ 'error' => 'Goobta lama cusboonaysiin, fadlan isku day mar kale',
+ 'success' => 'Goobta si guul leh ayaa loo cusboonaysiiyay.'
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this location?',
- 'error' => 'There was an issue deleting the location. Please try again.',
- 'success' => 'The location was deleted successfully.'
+ 'confirm' => 'Ma hubtaa inaad rabto inaad tirtirto goobtan?',
+ 'error' => 'Waxaa jirtay arrin meesha laga saarayo. Fadlan isku day mar kale.',
+ 'success' => 'Goobta si guul leh ayaa loo tirtiray.'
)
);
diff --git a/resources/lang/so-SO/admin/locations/table.php b/resources/lang/so-SO/admin/locations/table.php
index ed3f96f6b4..0942c3e77d 100644
--- a/resources/lang/so-SO/admin/locations/table.php
+++ b/resources/lang/so-SO/admin/locations/table.php
@@ -1,42 +1,42 @@
'About Locations',
- 'about_locations' => 'Locations are used to track location information for users, assets, and other items',
- 'assets_rtd' => 'Assets', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
- 'assets_checkedout' => 'Assets Assigned',
- 'id' => 'ID',
- 'city' => 'City',
- 'state' => 'State',
- 'country' => 'Country',
- 'create' => 'Create Location',
- 'update' => 'Update Location',
- 'print_assigned' => 'Print Assigned',
- 'print_all_assigned' => 'Print All Assigned',
- 'name' => 'Location Name',
- 'address' => 'Address',
- 'address2' => 'Address Line 2',
- 'zip' => 'Postal Code',
- 'locations' => 'Locations',
- 'parent' => 'Parent',
- 'currency' => 'Location Currency',
- 'ldap_ou' => 'LDAP Search OU',
- 'user_name' => 'User Name',
- 'department' => 'Department',
- 'location' => 'Location',
- 'asset_tag' => 'Assets Tag',
- 'asset_name' => 'Name',
- 'asset_category' => 'Category',
- 'asset_manufacturer' => 'Manufacturer',
- 'asset_model' => 'Model',
- 'asset_serial' => 'Serial',
- 'asset_location' => 'Location',
- 'asset_checked_out' => 'Checked Out',
- 'asset_expected_checkin' => 'Expected Checkin',
- 'date' => 'Date:',
- 'phone' => 'Location Phone',
- 'signed_by_asset_auditor' => 'Signed By (Asset Auditor):',
- 'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
- 'signed_by_location_manager' => 'Signed By (Location Manager):',
- 'signed_by' => 'Signed Off By:',
+ 'about_locations_title' => 'Ku saabsan Goobaha',
+ 'about_locations' => 'Goobaha waxaa loo isticmaalaa si loola socdo macluumaadka goobta isticmaalayaasha, hantida, iyo walxaha kale',
+ 'assets_rtd' => 'Hantida', // This has NEVER meant Assets Retired. I don't know how it keeps getting reverted.
+ 'assets_checkedout' => 'Hantida loo qoondeeyay',
+ 'id' => 'Aqoonsi',
+ 'city' => 'Magaalada',
+ 'state' => 'Gobolka',
+ 'country' => 'Dalka',
+ 'create' => 'Samee Goobta',
+ 'update' => 'Cusbooneysii Goobta',
+ 'print_assigned' => 'Daabacaadda loo qoondeeyay',
+ 'print_all_assigned' => 'Daabac Dhammaan Ku-meel-gaadhka ah',
+ 'name' => 'Magaca Goobta',
+ 'address' => 'Cinwaanka',
+ 'address2' => 'Khadka Ciwaanka 2',
+ 'zip' => 'Koodhka Boostada',
+ 'locations' => 'Goobaha',
+ 'parent' => 'Waalid',
+ 'currency' => 'Lacagta Goobta',
+ 'ldap_ou' => 'Raadi LDAP',
+ 'user_name' => 'Magaca isticmaalaha',
+ 'department' => 'Waaxda',
+ 'location' => 'Goobta',
+ 'asset_tag' => 'Hantida Tag',
+ 'asset_name' => 'Magaca',
+ 'asset_category' => 'Qaybta',
+ 'asset_manufacturer' => 'Soo saaraha',
+ 'asset_model' => 'Qaabka',
+ 'asset_serial' => 'Taxane',
+ 'asset_location' => 'Goobta',
+ 'asset_checked_out' => 'La Hubiyay',
+ 'asset_expected_checkin' => 'Hubinta la filayo',
+ 'date' => 'Taariikhda:',
+ 'phone' => 'Magaca Goobta',
+ 'signed_by_asset_auditor' => 'Waxa saxeexay (Hantidhawraha Hantida):',
+ 'signed_by_finance_auditor' => 'Waxa saxeexay (Hantidhawraha Maaliyadda):',
+ 'signed_by_location_manager' => 'Waxa saxeexay (Maamulaha Goobta):',
+ 'signed_by' => 'Saxiixay:',
];
diff --git a/resources/lang/so-SO/admin/manufacturers/message.php b/resources/lang/so-SO/admin/manufacturers/message.php
index 61416e0230..44e42e1cca 100644
--- a/resources/lang/so-SO/admin/manufacturers/message.php
+++ b/resources/lang/so-SO/admin/manufacturers/message.php
@@ -2,29 +2,29 @@
return array(
- 'support_url_help' => 'Variables {LOCALE}
, {SERIAL}
, {MODEL_NUMBER}
, and {MODEL_NAME}
may be used in your URL to have those values auto-populate when viewing assets - for example https://checkcoverage.apple.com/{LOCALE}/{SERIAL}.',
- 'does_not_exist' => 'Manufacturer does not exist.',
- 'assoc_users' => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
+ 'support_url_help' => 'Doorsoomayaasha {LOCALE}
, {SERIAL}
, {MODEL_NUMBER}
, iyo :path
',
- 'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.):path
',
+ 'backups_restore_warning' => 'Isticmaal badhanka soo celinta si looga soo celiyo kayd hore.(Tani hadda kuma shaqaynayso kaydinta faylka S3 ama Docker.)0
or false
, user login will be disabled. If the value in the AD/LDAP field is set to 1
or true
or any other text means the user can log in. When the field is blank in your AD, we respect the userAccountControl
attribute, which usually allows non-suspended users to log in.',
- 'ldap_emp_num' => 'LDAP Employee Number',
- 'ldap_email' => 'LDAP Email',
- 'ldap_test' => 'Test LDAP',
- 'ldap_test_sync' => 'Test LDAP Synchronization',
- 'license' => 'Software License',
+ 'ldap_emp_num' => 'Lambarka Shaqaalaha LDAP',
+ 'ldap_email' => 'LDAP iimaylka',
+ 'ldap_test' => 'Tijaabi LDAP',
+ 'ldap_test_sync' => 'Tijaabi wada shaqaynta LDAP',
+ 'license' => 'Shatiga Software',
'load_remote' => 'Use Gravatar',
'load_remote_help_text' => 'Uncheck this box if your install cannot load scripts from the outside internet. This will prevent Snipe-IT from trying load images from Gravatar.',
- 'login' => 'Login Attempts',
- 'login_attempt' => 'Login Attempt',
- 'login_ip' => 'IP Address',
- 'login_success' => 'Success?',
- 'login_user_agent' => 'User Agent',
- 'login_help' => 'List of attempted logins',
- 'login_note' => 'Login Note',
- 'login_note_help' => 'Optionally include a few sentences on your login screen, for example to assist people who have found a lost or stolen device. This field accepts Github flavored markdown',
- 'login_remote_user_text' => 'Remote User login options',
- 'login_remote_user_enabled_text' => 'Enable Login with Remote User Header',
- 'login_remote_user_enabled_help' => 'This option enables Authentication via the REMOTE_USER header according to the "Common Gateway Interface (rfc3875)"',
- 'login_common_disabled_text' => 'Disable other authentication mechanisms',
- 'login_common_disabled_help' => 'This option disables other authentication mechanisms. Just enable this option if you are sure that your REMOTE_USER login is already working',
- 'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
- 'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
- 'login_remote_user_header_name_text' => 'Custom user name header',
- 'login_remote_user_header_name_help' => 'Use the specified header instead of REMOTE_USER',
+ 'login' => 'Isku-dayga Galitaanka',
+ 'login_attempt' => 'Isku day Login',
+ 'login_ip' => 'Ciwaanka IP-ga',
+ 'login_success' => 'Guul?',
+ 'login_user_agent' => 'Wakiilka Isticmaalaha',
+ 'login_help' => 'Liiska la isku dayay in la galo',
+ 'login_note' => 'Xusuusin soo gal',
+ 'login_note_help' => 'Ikhtiyaar ahaan ku dar jumlado kooban shaashaddaada soo gelida, tusaale ahaan si aad u caawiso dadka helay qalab lumay ama la xaday. Goobtani waxa ay aqbashaa {COMPANY}
will be replaced with the asset's company name',
- 'label2_asset_logo' => 'Use Asset Logo',
- 'label2_asset_logo_help' => 'Use the logo of the asset's assigned company, rather than the value at :setting_name
',
- 'label2_1d_type' => '1D Barcode Type',
- 'label2_1d_type_help' => 'Format for 1D barcodes',
- 'label2_2d_type' => '2D Barcode Type',
- 'label2_2d_type_help' => 'Format for 2D barcodes',
- 'label2_2d_target' => '2D Barcode Target',
- 'label2_2d_target_help' => 'The URL the 2D barcode points to when scanned',
- 'label2_fields' => 'Field Definitions',
- 'label2_fields_help' => 'Fields can be added, removed, and reordered in the left column. For each field, multiple options for Label and DataSource can be added, removed, and reordered in the right column.',
- 'help_asterisk_bold' => 'Text entered as **text**
will be displayed as bold',
- 'help_blank_to_use' => 'Leave blank to use the value from :setting_name
',
+ 'label2_asset_logo' => 'Isticmaal Logo Hantida',
+ 'label2_asset_logo_help' => 'Adeegso astaanta hantida' ee shirkadda loo qoondeeyay, halkii aad ka isticmaali lahayd qiimaha :setting_name
',
+ 'label2_1d_type' => '1D nooca barcode',
+ 'label2_1d_type_help' => 'Qaabka barcode 1D',
+ 'label2_2d_type' => 'Nooca Barcode 2D',
+ 'label2_2d_type_help' => 'Qaabka barcode 2D',
+ 'label2_2d_target' => 'Barcode Barcode 2D',
+ 'label2_2d_target_help' => 'URL-ka 2D barcode wuxuu tilmaamayaa marka la sawiro',
+ 'label2_fields' => 'Qeexitaannada goobta',
+ 'label2_fields_help' => 'Goobaha waa lagu dari karaa, laga saari karaa, oo dib loo habayn karaa tiirka bidix. Goob kasta, xulashooyin badan oo ah Label iyo DataSource ayaa lagu dari karaa, laga saari karaa, oo dib loo dalbi karaa tiirka saxda ah.',
+ 'help_asterisk_bold' => 'Qoraalka loo galiyay sida :setting_name
',
'help_default_will_use' => ':default
will use the value from :setting_name
. APP_DEBUG
value in your .env
file to false
.',
- 'delete' => 'Delete',
- 'delete_confirm' => 'Are you sure you wish to delete :item?',
- 'delete_confirm_no_undo' => 'Are you sure you wish to delete :item? This can not be undone.',
- 'deleted' => 'Deleted',
- 'delete_seats' => 'Deleted Seats',
- 'deletion_failed' => 'Deletion failed',
- 'departments' => 'Departments',
- 'department' => 'Department',
- 'deployed' => 'Deployed',
- 'depreciation' => 'Depreciation',
- 'depreciations' => 'Depreciations',
- 'depreciation_report' => 'Depreciation Report',
- 'details' => 'Details',
+ 'current' => 'Hadda',
+ 'current_password' => 'Magaca Sirta Hadda',
+ 'customize_report' => 'Habbee Warbixinta',
+ 'custom_report' => 'Warbixinta Hantida Gaarka ah',
+ 'dashboard' => 'Dashboard-ka',
+ 'days' => 'maalmo',
+ 'days_to_next_audit' => 'Maalmo ku xiga Hanti-dhawrka',
+ 'date' => 'Taariikhda',
+ 'debug_warning' => 'Digniin!',
+ 'debug_warning_text' => 'Codsigan waxa uu ku shaqaynayaa qaabka wax soo saarka iyada oo la furayo cilladaha Tani waxay soo bandhigi kartaa xogta xasaasiga ah haddii codsigaaga la heli karo adduunka ka baxsan. Dami qaabka qaladka adoo dejinaya APP_DEBUG
qiimaha ku jira .env
faylka beenta
.',
+ 'delete' => 'Tirtir',
+ 'delete_confirm' => 'Ma hubtaa inaad rabto inaad tirtirto :item?',
+ 'delete_confirm_no_undo' => 'Ma hubtaa inaad rabto inaad tirtirto :item? Tan lama celin karo',
+ 'deleted' => 'La tirtiray',
+ 'delete_seats' => 'Kuraasta la tirtiray',
+ 'deletion_failed' => 'Tirtiridda waa fashilantay',
+ 'departments' => 'Waaxyaha',
+ 'department' => 'Waaxda',
+ 'deployed' => 'La geeyay',
+ 'depreciation' => 'Qiimo dhaca',
+ 'depreciations' => 'Qiimo dhaca',
+ 'depreciation_report' => 'Warbixinta Qiima dhaca',
+ 'details' => 'Faahfaahin',
'download' => 'Download',
'download_all' => 'Download All',
- 'editprofile' => 'Edit Your Profile',
+ 'editprofile' => 'Wax ka beddel xogtaada',
'eol' => 'EOL',
'email_domain' => 'Email Domain',
- 'email_format' => 'Email Format',
- 'employee_number' => 'Employee Number',
- 'email_domain_help' => 'This is used to generate email addresses when importing',
- 'error' => 'Error',
- 'exclude_archived' => 'Exclude Archived Assets',
- 'exclude_deleted' => 'Exclude Deleted Assets',
- 'example' => 'Example: ',
- 'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
- 'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
- 'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
- 'lastnamefirstinitial_format' => 'Last Name First Initial (smithj@example.com)',
- 'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
- 'firstname_lastname_display' => 'First Name Last Name (Jane Smith)',
- 'lastname_firstname_display' => 'Last Name First Name (Smith Jane)',
- 'name_display_format' => 'Name Display Format',
- 'first' => 'First',
- 'firstnamelastname' => 'First Name Last Name (janesmith@example.com)',
- 'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
- 'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
- 'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)',
- 'first_name' => 'First Name',
- 'first_name_format' => 'First Name (jane@example.com)',
- 'files' => 'Files',
- 'file_name' => 'File',
- 'file_type' => 'File Type',
- 'filesize' => 'File Size',
- 'file_uploads' => 'File Uploads',
- 'file_upload' => 'File Upload',
- 'generate' => 'Generate',
- 'generate_labels' => 'Generate Labels',
- 'github_markdown' => 'This field accepts Github flavored markdown.',
- 'groups' => 'Groups',
- 'gravatar_email' => 'Gravatar Email Address',
- 'gravatar_url' => 'Change your avatar at Gravatar.com.',
- 'history' => 'History',
- 'history_for' => 'History for',
- 'id' => 'ID',
- 'image' => 'Image',
- 'image_delete' => 'Delete Image',
- 'include_deleted' => 'Include Deleted Assets',
- 'image_upload' => 'Upload Image',
- 'filetypes_accepted_help' => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
- 'filetypes_size_help' => 'Max upload size allowed is :size.',
- 'image_filetypes_help' => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
- 'unaccepted_image_type' => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
- 'import' => 'Import',
- 'import_this_file' => 'Map fields and process this file',
- 'importing' => 'Importing',
- 'importing_help' => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
-If you would like to export only certain assets, use the options below to fine-tune your results.
', + 'noimage' => 'Ma jiro sawir la soo geliyay ama sawir lama helin.', + 'file_does_not_exist' => 'Faylka la codsaday kuma jiro server-ka', + 'file_upload_success' => 'Guusha soo dejinta faylka!', + 'no_files_uploaded' => 'Guusha soo dejinta faylka!', + 'token_expired' => 'Fadhiga foomku wuu dhacay Fadlan isku day mar kale', + 'login_enabled' => 'Login waa la dajiyay', + 'audit_due' => 'Hanti-dhawrka awgeed', + 'audit_overdue' => 'Dib u dhac ku yimid Hanti-dhawrka', + 'accept' => 'Aqbal :asset', + 'i_accept' => 'Waan aqbalay', + 'i_decline' => 'Waan diiday', + 'accept_decline' => 'Aqbal/Diiday', + 'sign_tos' => 'Hoos Saxiix si aad u muujiso inaad ogolaatay shuruudaha adeega:', + 'clear_signature' => 'Saxeexa Saxeexa', + 'show_help' => 'Muuji caawimo', + 'hide_help' => 'Qari caawimada', + 'view_all' => 'Daawo Dhammaan', + 'hide_deleted' => 'Qari la tirtiray', + 'email' => 'Iimaylka', + 'do_not_change' => 'Ha Bedelin', + 'bug_report' => 'Ka warbixi cilad', + 'user_manual' => 'Buugga Isticmaalaha', + 'setup_step_1' => 'Tallaabada 1', + 'setup_step_2' => 'Tallaabada 2', + 'setup_step_3' => 'Tallaabada 3', + 'setup_step_4' => 'Tallaabada 4', + 'setup_config_check' => 'Hubinta qaabeynta', + 'setup_create_database' => 'Samee Shaxanka Xogta', + 'setup_create_admin' => 'Abuur Admin User', + 'setup_done' => 'Dhammaatay!', + 'bulk_edit_about_to' => 'Waxaad ku dhowdahay inaad wax ka beddesho kuwa soo socda: ', + 'checked_out' => 'La Hubiyay', + 'checked_out_to' => 'La Hubiyay', + 'fields' => 'Beeraha', + 'last_checkout' => 'Jeedintii u dambaysay', + 'due_to_checkin' => 'Waxyaabaha soo socda :count waa in la hubiyaa dhawaan:', + 'expected_checkin' => 'Hubinta la filayo', + 'reminder_checked_out_items' => 'Tani waa xasuusin alaabta hadda laguu hubiyay. Haddii aad dareento in liiskani aanu sax ahayn (wax maqan, ama wax halkan ka muuqda oo aad aaminsan tahay inaadan waligaa helin), fadlan iimayl u dir :reply_to_name at :reply_to_address.', + 'changed' => 'Bedelay', + 'to' => 'Ku', + 'report_fields_info' => 'Dooro goobaha aad jeclaan lahayd inaad ku darto warbixintaada gaarka ah, oo guji Abuur. Faylka (custom-asset-report-YYYY-mm-dd.csv) ayaa si toos ah u soo dejisan doona, oo waxaad ku furi kartaa gudaha Excel.
Haddii aad jeclaan lahayd inaad dhoofiso hantida qaarkood, isticmaal xulashooyinka hoose si aad u hagaajiso natiijooyinkaaga.
', 'range' => 'Range', - 'bom_remark' => 'Add a BOM (byte-order mark) to this CSV', - 'improvements' => 'Improvements', - 'information' => 'Information', - 'permissions' => 'Permissions', - 'managed_ldap' => '(Managed via LDAP)', - 'export' => 'Export', - 'ldap_sync' => 'LDAP Sync', - 'ldap_user_sync' => 'LDAP User Sync', - 'synchronize' => 'Synchronize', - 'sync_results' => 'Synchronization Results', - 'license_serial' => 'Serial/Product Key', + 'bom_remark' => 'Kudar BOM (calaamada dalbashada-byte) CSV-gan', + 'improvements' => 'Horumar', + 'information' => 'Xog', + 'permissions' => 'Ogolaanshaha', + 'managed_ldap' => '(Waxaa lagu maareeyaa LDAP)', + 'export' => 'Dhoofinta', + 'ldap_sync' => 'Iskuxidhka LDAP', + 'ldap_user_sync' => 'Isku-xidhka Isticmaalaha LDAP', + 'synchronize' => 'Isku xidh', + 'sync_results' => 'Natiijooyinka isku xidhka', + 'license_serial' => 'Furaha Taxanaha / Alaabta', 'invalid_category' => 'Invalid or missing category', 'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.', - 'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.', - '60_percent_warning' => '60% Complete (warning)', - 'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!', - 'new_asset' => 'New Asset', - 'new_license' => 'New License', - 'new_accessory' => 'New Accessory', - 'new_consumable' => 'New Consumable', - 'collapse' => 'Collapse', - 'assigned' => 'Assigned', - 'asset_count' => 'Asset Count', - 'accessories_count' => 'Accessories Count', - 'consumables_count' => 'Consumables Count', - 'components_count' => 'Components Count', - 'licenses_count' => 'Licenses Count', - 'notification_error' => 'Error', - 'notification_error_hint' => 'Please check the form below for errors', - 'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:', - 'notification_success' => 'Success', - 'notification_warning' => 'Warning', - 'notification_info' => 'Info', - 'asset_information' => 'Asset Information', - 'model_name' => 'Model Name', - 'asset_name' => 'Asset Name', - 'consumable_information' => 'Consumable Information:', - 'consumable_name' => 'Consumable Name:', - 'accessory_information' => 'Accessory Information:', - 'accessory_name' => 'Accessory Name:', - 'clone_item' => 'Clone Item', - 'checkout_tooltip' => 'Check this item out', - 'checkin_tooltip' => 'Check this item in', - 'checkout_user_tooltip' => 'Check this item out to a user', - 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', - 'maintenance_mode_title' => 'System Temporarily Unavailable', - 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', - 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', - 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', - 'additional_files' => 'Additional Files', - 'shitty_browser' => 'No signature detected. If you are using an older browser, please use a more modern browser to complete your asset acceptance.', - 'bulk_soft_delete' =>'Also soft-delete these users. Their asset history will remain intact unless/until you purge deleted records in the Admin Settings.', - 'bulk_checkin_delete_success' => 'Your selected users have been deleted and their items have been checked in.', - 'bulk_checkin_success' => 'The items for the selected users have been checked in.', - 'set_to_null' => 'Delete values for this asset|Delete values for all :asset_count assets ', - 'set_users_field_to_null' => 'Delete :field values for this user|Delete :field values for all :user_count users ', - 'na_no_purchase_date' => 'N/A - No purchase date provided', - 'assets_by_status' => 'Assets by Status', - 'assets_by_status_type' => 'Assets by Status Type', - 'pie_chart_type' => 'Dashboard Pie Chart Type', + 'dashboard_info' => 'Kani waa dashboardkaaga. Waxaa jira qaar badan oo la mid ah, laakiin kan adigaa leh.', + '60_percent_warning' => '60% Buuxsan (digniin)', + 'dashboard_empty' => 'Waxay u egtahay inaadan wali waxba ku darin, markaa ma hayno wax cajiib ah oo aan soo bandhigno. Ku bilow inaad ku darto qaar hanti, agabka, agabka la isticmaalo, ama shatiyada hadda!', + 'new_asset' => 'Hanti Cusub', + 'new_license' => 'Shatiga Cusub', + 'new_accessory' => 'Qalabka Cusub', + 'new_consumable' => 'La Isticmaali karo Cusub', + 'collapse' => 'Burbur', + 'assigned' => 'Loo xilsaaray', + 'asset_count' => 'Tirada Hantida', + 'accessories_count' => 'Agabka lagu xidho', + 'consumables_count' => 'Tirinta Alaabta', + 'components_count' => 'Qaybaha Tirinta', + 'licenses_count' => 'Tirinta shatiyada', + 'notification_error' => 'Khalad', + 'notification_error_hint' => 'Fadlan ka hubi foomamka hoose khaladaadka', + 'notification_bulk_error_hint' => 'Goobaha soo socdaa waxay lahaayeen khaladaad ansaxinta lamana tafatirin:', + 'notification_success' => 'Guul', + 'notification_warning' => 'Digniin', + 'notification_info' => 'Xog', + 'asset_information' => 'Macluumaadka Hantida', + 'model_name' => 'Magaca Model', + 'asset_name' => 'Magaca Hantida', + 'consumable_information' => 'Macluumaadka la isticmaali karo:', + 'consumable_name' => 'Magaca la isticmaali karo:', + 'accessory_information' => 'Macluumaadka Dheeraadka ah:', + 'accessory_name' => 'Magaca Agabka:', + 'clone_item' => 'Shayga Clone', + 'checkout_tooltip' => 'Hubi shaygan', + 'checkin_tooltip' => 'Hubi shaygan gudaha', + 'checkout_user_tooltip' => 'Hubi shaygan isticmaalaha', + 'maintenance_mode' => 'Adeeggu si ku meel gaar ah uma heli karo cusboonaysiinta nidaamka. Fadlan dib u eeg hadhow', + 'maintenance_mode_title' => 'Nidaamka Si Ku Meel Gaar Ah Aan Loo Helin', + 'ldap_import' => 'Furaha isticmaalaha waa in uusan maamulin LDAP. (Tani waxay kuu ogolaanaysaa inaad soo dirto codsiyada sirta ah ee la illoobay.)', + 'purge_not_allowed' => 'Nadiifinta xogta la tirtiray waa la joojiyay faylka .env La xidhiidh taageerada ama maamulaha nidaamkaaga.', + 'backup_delete_not_allowed' => 'Tirtiridda kaydka waa lagu naafiyay faylka .env. La xidhiidh taageerada ama maamulaha nidaamkaaga.', + 'additional_files' => 'Faylasha Dheeraadka ah', + 'shitty_browser' => 'Wax saxiix ah lama ogaan Haddii aad isticmaalayso browser duug ah, fadlan isticmaal browser ka casri ah si aad u dhamaystirto aqbalaadda hantidaada.', + 'bulk_soft_delete' =>'Sidoo kale jilicsan-tirtir isticmaalayaashan. Taariikhdooda hantiyeed way ahaan doontaa ilaa aad ka nadiifiso diiwaanada la tirtiray ee goobaha maamulka.', + 'bulk_checkin_delete_success' => 'Isticmaalayaasha aad dooratay waa la tirtiray oo alaabtooda waa la hubiyay.', + 'bulk_checkin_success' => 'Alaabta isticmaalayaasha la xushay waa la hubiyay', + 'set_to_null' => 'Tirtir qiyamka hantidan|Tirtir qiyamka dhammaan :asset_count hantida ', + 'set_users_field_to_null' => 'Tirtir :field qiyamka isticmaalaha|Tirtir :field qiimayaasha dhammaan :user_count isticmaalayaasha ', + 'na_no_purchase_date' => 'N/A - Taariikhda iibsi lama bixin', + 'assets_by_status' => 'Hantida xaalka', + 'assets_by_status_type' => 'Hantida Xaaladda Nooca', + 'pie_chart_type' => 'Nooca Shaxda Dashboard Pie', 'hello_name' => 'Hello, :name!', - 'unaccepted_profile_warning' => 'You have :count items requiring acceptance. Click here to accept or decline them', - 'start_date' => 'Start Date', - 'end_date' => 'End Date', - 'alt_uploaded_image_thumbnail' => 'Uploaded thumbnail', - 'placeholder_kit' => 'Select a kit', - 'file_not_found' => 'File not found', - 'preview_not_available' => '(no preview)', - 'setup' => 'Setup', - 'pre_flight' => 'Pre-Flight', - 'skip_to_main_content' => 'Skip to main content', - 'toggle_navigation' => 'Toggle navigation', - 'alerts' => 'Alerts', - 'tasks_view_all' => 'View all tasks', - 'true' => 'True', - 'false' => 'False', - 'integration_option' => 'Integration Option', - 'log_does_not_exist' => 'No matching log record exists.', - 'merge_users' => 'Merge Users', - 'merge_information' => 'This will merge the :count users into a single user. Select the user you wish to merge the others into below, and the associated assets, licenses, etc will be moved over to the selected user and the other users will be marked as deleted.', - 'warning_merge_information' => 'This action CANNOT be undone and should ONLY be used when you need to merge users because of a bad import or sync. Be sure to run a backup first.', - 'no_users_selected' => 'No users selected', - 'not_enough_users_selected' => 'At least :count users must be selected', - 'merge_success' => ':count users merged successfully into :into_username!', - 'merged' => 'merged', - 'merged_log_this_user_into' => 'Merged this user (ID :to_id - :to_username) into user ID :from_id (:from_username) ', - 'merged_log_this_user_from' => 'Merged user ID :from_id (:from_username) into this user (ID :to_id - :to_username)', - 'clear_and_save' => 'Clear & Save', - 'update_existing_values' => 'Update Existing Values?', - 'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Generating auto-incrementing asset tags is disabled so all rows need to have the "Asset Tag" column populated.', - 'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Note: Generating auto-incrementing asset tags is enabled so assets will be created for rows that do not have "Asset Tag" populated. Rows that do have "Asset Tag" populated will be updated with the provided information.', - 'send_welcome_email_to_users' => ' Send Welcome Email for new Users?', + 'unaccepted_profile_warning' => 'Waxaad haysaa :count walxo u baahan aqbalid Riix halkan si aad u aqbasho ama u diido', + 'start_date' => 'Taariikhda billowga', + 'end_date' => 'Taariikhda dhamaadka', + 'alt_uploaded_image_thumbnail' => 'La soo galiyay thumbnail', + 'placeholder_kit' => 'Dooro qalab', + 'file_not_found' => 'Faylka lama helin', + 'preview_not_available' => '(ma jiro horudhac)', + 'setup' => 'Dejinta', + 'pre_flight' => 'Duulimaadka kahor', + 'skip_to_main_content' => 'U gudub nuxurka muhiimka ah', + 'toggle_navigation' => 'Beddel marinka', + 'alerts' => 'Digniin', + 'tasks_view_all' => 'Eeg dhammaan hawlaha', + 'true' => 'Run', + 'false' => 'Been', + 'integration_option' => 'Xulashada is-dhexgalka', + 'log_does_not_exist' => 'Ma jiro diiwaan qoraal ah oo u dhigma.', + 'merge_users' => 'Isku-darka Isticmaalayaasha', + 'merge_information' => 'Tani waxay ku milmi doontaa isticmaalayaasha :count hal isticmaale Dooro isticmaalaha aad rabto in aad ku dhex miro kuwa kale hoos, iyo hantida la xidhiidha, shatiyada, iwm waxaa loo wareejin doonaa isticmaala la doortay iyo isticmaalayaasha kale waxaa lagu calaamadayn doonaa in la tirtiray.', + 'warning_merge_information' => 'Tallaabadan dib looma celin karo oo waa in la isticmaalo oo keliya marka aad u baahan tahay inaad ku biirto isticmaalayaasha sababtoo ah soo dejin xun ama isku xidhid. Hubi inaad marka hore socodsiiso kaydka.', + 'no_users_selected' => 'Isticmaalayaal ma dooran', + 'not_enough_users_selected' => 'Ugu yaraan :count isticmaalayaasha waa in la doortaa', + 'merge_success' => ':count isticmaalayaashu waxay si guul leh ugu biireen :into_username!', + 'merged' => 'isku darsaday', + 'merged_log_this_user_into' => 'Wuxuu ku daray isticmaale kan (ID :to_id - :to_username) galay aqoonsiga isticmaalaha :from_id (:from_username) ', + 'merged_log_this_user_from' => 'Aqoonsiga isticmaalaha :from_id (:from_username) lagu daray isticmaalaha (ID :to_id - :to_username)', + 'clear_and_save' => 'Nadiifi & Keydi', + 'update_existing_values' => 'Cusbooneysii qiyamka jira?', + 'auto_incrementing_asset_tags_disabled_so_tags_required' => 'Soo saarista calaamadaha hantida si toos ah u kordhiya waa naafo sidaa darteed dhammaan safafka waxay u baahan yihiin inay lahaadaan tiirka "Asset Tag" oo la buux dhaafiyay.', + 'auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created' => 'Fiiro gaar ah: Soo saarista sumadaha hantida si toos ah u kordhiya si hantida waxaa loo abuuri doonaa safaf aan lahayn "Hanti Tag" oo ay dadku ku badan yihiin. Safafka leh "Tag Hantida" oo ay buuxsameen ayaa lagu cusboonaysiin doonaa macluumaadka la bixiyay.', + 'send_welcome_email_to_users' => ' U dir email soo dhawayn ah isticmaalayaasha cusub?', 'send_email' => 'Send Email', 'call' => 'Call number', - 'back_before_importing' => 'Backup before importing?', - 'csv_header_field' => 'CSV Header Field', - 'import_field' => 'Import Field', - 'sample_value' => 'Sample Value', - 'no_headers' => 'No Columns Found', - 'error_in_import_file' => 'There was an error reading the CSV file: :error', - 'errors_importing' => 'Some Errors occurred while importing: ', - 'warning' => 'WARNING: :warning', - 'success_redirecting' => '"Success... Redirecting.', - 'cancel_request' => 'Cancel this item request', - 'setup_successful_migrations' => 'Your database tables have been created', - 'setup_migration_output' => 'Migration output:', - 'setup_migration_create_user' => 'Next: Create User', - 'importer_generic_error' => 'Your file import is complete, but we did receive an error. This is usually caused by third-party API throttling from a notification webhook (such as Slack) and would not have interfered with the import itself, but you should confirm this.', - 'confirm' => 'Confirm', - 'autoassign_licenses' => 'Auto-Assign Licenses', - 'autoassign_licenses_help' => 'Allow this user to have licenses assigned via the bulk-assign license UI or cli tools.', - 'autoassign_licenses_help_long' => 'This allows a user to be have licenses assigned via the bulk-assign license UI or cli tools. (For example, you might not want contractors to be auto-assigned a license you would provide to only staff members. You can still individually assign licenses to those users, but they will not be included in the Checkout License to All Users functions.)', - 'no_autoassign_licenses_help' => 'Do not include user for bulk-assigning through the license UI or cli tools.', - 'modal_confirm_generic' => 'Are you sure?', - 'cannot_be_deleted' => 'This item cannot be deleted', + 'back_before_importing' => 'Kaabta ka hor inta aan la soo dejin?', + 'csv_header_field' => 'Goobta Madaxa CSV', + 'import_field' => 'Goobta Soo Dejinta', + 'sample_value' => 'Tusaalaha Qiimaha', + 'no_headers' => 'Lama helin Tiirar', + 'error_in_import_file' => 'Waxaa jiray khalad akhrinta faylka CSV: :error', + 'errors_importing' => 'Khaladaadka qaar ayaa dhacay markii la soo dejinayay: ', + 'warning' => 'Digniin: :warning', + 'success_redirecting' => '"Guusha... Dib u habayn.', + 'cancel_request' => 'Jooji codsiga shaygan', + 'setup_successful_migrations' => 'Miisaska xogtaada waa la sameeyay', + 'setup_migration_output' => 'Soo saarista socdaalka:', + 'setup_migration_create_user' => 'Xiga: Abuur Isticmaalaha', + 'importer_generic_error' => 'Soo dejinta faylkaagu waa dhammaatay, laakiin waxa aanu helnay cilad Tan waxaa badanaa sababa qolo saddexaad oo API ah oo ka soo rogtay shabkada ogeysiinta (sida Slack) mana faragelin la\'aanta soo dejinta lafteeda, laakiin waa inaad xaqiijisaa tan.', + 'confirm' => 'Xaqiiji', + 'autoassign_licenses' => 'Si otomaatig ah u qoondee shatiyada', + 'autoassign_licenses_help' => 'U oggolow isticmaaleha in uu haysto shatiyo loo qoondeeyay shatiga UI ama cli', + 'autoassign_licenses_help_long' => 'Tani waxay u oggolaanaysaa isticmaalaha in loo qoondeeyo shatiyada loo qoondeeyey shatiga UI ama cli qalabyada. (Tusaale ahaan, waxaa laga yaabaa inaadan rabin qandaraaslayaasha in si toos ah loogu qoondeeyo shatiga aad siin lahayd xubnaha shaqaalaha oo kaliya. Wali waxaad si gaar ah u siin kartaa shatiga isticmaalayaasha, laakiin laguma dari doono shatiga hubinta ee dhammaan howlaha isticmaalayaasha.)', + 'no_autoassign_licenses_help' => 'Ha ku darin isticmaale ku meelaynta bulk-ku-meelaynta iyada oo loo marayo shatiga UI ama cli qalabyada.', + 'modal_confirm_generic' => 'Ma hubtaa?', + 'cannot_be_deleted' => 'Shaygan lama tirtiri karo', 'cannot_be_edited' => 'This item cannot be edited.', - 'undeployable_tooltip' => 'This item cannot be checked out. Check the quantity remaining.', - 'serial_number' => 'Serial Number', - 'item_notes' => ':item Notes', - 'item_name_var' => ':item Name', - 'error_user_company' => 'Checkout target company and asset company do not match', - 'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager', + 'undeployable_tooltip' => 'Shaygan lama hubin karo Hubi inta hartay', + 'serial_number' => 'Nambarada taxan', + 'item_notes' => ':item Xusuusin', + 'item_name_var' => ':item Magaca', + 'error_user_company' => 'Hubinta shirkadda bartilmaameedka ah iyo shirkadda hantidu isma dhigmaan', + 'error_user_company_accept_view' => 'Hanti laguu qoondeeyay waxaa iska leh shirkad kale si aadan aqbali karin mana u diidi kartid, fadlan la xiriir maamulahaaga', 'importer' => [ - 'checked_out_to_fullname' => 'Checked Out to: Full Name', - 'checked_out_to_first_name' => 'Checked Out to: First Name', - 'checked_out_to_last_name' => 'Checked Out to: Last Name', - 'checked_out_to_username' => 'Checked Out to: Username', - 'checked_out_to_email' => 'Checked Out to: Email', - 'checked_out_to_tag' => 'Checked Out to: Asset Tag', - 'manager_first_name' => 'Manager First Name', - 'manager_last_name' => 'Manager Last Name', - 'manager_full_name' => 'Manager Full Name', - 'manager_username' => 'Manager Username', - 'checkout_type' => 'Checkout Type', - 'checkout_location' => 'Checkout to Location', - 'image_filename' => 'Image Filename', - 'do_not_import' => 'Do Not Import', + 'checked_out_to_fullname' => 'Lagu hubiyay: Magaca oo buuxa', + 'checked_out_to_first_name' => 'Lagu Hubiyay: Magaca Koowaad', + 'checked_out_to_last_name' => 'La Hubiyay: Magaca Dambe', + 'checked_out_to_username' => 'Lagu hubiyay: Username', + 'checked_out_to_email' => 'Lagu hubiyay: iimaylka', + 'checked_out_to_tag' => 'La hubiyay: Hantida Tag', + 'manager_first_name' => 'Magaca Hore ee Maareeyaha', + 'manager_last_name' => 'Magaca Dambe ee Maareeyaha', + 'manager_full_name' => 'Maareeyaha Magaca oo buuxa', + 'manager_username' => 'Magaca isticmaalaha Maareeyaha', + 'checkout_type' => 'Nooca hubinta', + 'checkout_location' => 'Hubi goobta', + 'image_filename' => 'Magaca faylka sawirka', + 'do_not_import' => 'Ha soo dejin', 'vip' => 'VIP', 'avatar' => 'Avatar', 'gravatar' => 'Gravatar Email', - 'currency' => 'Currency', - 'address2' => 'Address Line 2', - 'import_note' => 'Imported using csv importer', + 'currency' => 'Lacagta', + 'address2' => 'Khadka Ciwaanka 2', + 'import_note' => 'Lagu soo dejiyo iyadoo la isticmaalayo csv soodejiye', ], - 'percent_complete' => '% complete', - 'uploading' => 'Uploading... ', + 'percent_complete' => '% dhamaystiran', + 'uploading' => 'Soo dejinta... ', 'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.', - 'copy_to_clipboard' => 'Copy to Clipboard', - 'copied' => 'Copied!', + 'copy_to_clipboard' => 'Ku koobi kara sabuuradda', + 'copied' => 'La guuriyay!', 'status_compatibility' => 'If assets are already assigned, they cannot be changed to a non-deployable status type and this value change will be skipped.', 'rtd_location_help' => 'This is the location of the asset when it is not checked out', 'item_not_found' => ':item_type ID :id does not exist or has been deleted', 'action_permission_denied' => 'You do not have permission to :action :item_type ID :id', 'action_permission_generic' => 'You do not have permission to :action this :item_type', - 'edit' => 'edit', + 'edit' => 'wax ka beddel', 'action_source' => 'Action Source', 'or' => 'or', 'url' => 'URL', @@ -518,4 +519,13 @@ return [ ], 'no_requestable' => 'There are no requestable assets or asset models.', + 'countable' => [ + 'accessories' => ':count Accessory|:count Accessories', + 'assets' => ':count Asset|:count Assets', + 'licenses' => ':count License|:count Licenses', + 'license_seats' => ':count License Seat|:count License Seats', + 'consumables' => ':count Consumable|:count Consumables', + 'components' => ':count Component|:count Components', + ] + ]; diff --git a/resources/lang/so-SO/help.php b/resources/lang/so-SO/help.php index a59e0056be..b665ff3c8a 100644 --- a/resources/lang/so-SO/help.php +++ b/resources/lang/so-SO/help.php @@ -13,23 +13,23 @@ return [ | */ - 'more_info_title' => 'More Info', + 'more_info_title' => 'Macluumaad dheeraad ah', - 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log.Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
-If you would like to export only certain assets, use the options below to fine-tune your results.
', + 'report_fields_info' => 'Chọn các trường bạn muốn đưa vào báo cáo tùy chỉnh của mình và nhấp vào Tạo. Tệp (custom-asset-report-YYYY-mm-dd.csv) sẽ tự động tải xuống và bạn có thể mở tệp đó trong Excel.
+Nếu bạn chỉ muốn xuất một số nội dung nhất định, hãy sử dụng các tùy chọn bên dưới để tinh chỉnh kết quả của mình.
', 'range' => 'Range', - 'bom_remark' => 'Add a BOM (byte-order mark) to this CSV', + 'bom_remark' => 'Thêm BOM (dấu thứ tự byte) vào CSV này', 'improvements' => 'Improvements', 'information' => 'Information', 'permissions' => 'Permissions', - 'managed_ldap' => '(Managed via LDAP)', + 'managed_ldap' => '(Được quản lý qua LDAP)', 'export' => 'Export', - 'ldap_sync' => 'LDAP Sync', - 'ldap_user_sync' => 'LDAP User Sync', - 'synchronize' => 'Synchronize', - 'sync_results' => 'Synchronization Results', - 'license_serial' => 'Serial/Product Key', - 'invalid_category' => 'Invalid or missing category', - 'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.', - 'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.', - '60_percent_warning' => '60% Complete (warning)', - 'dashboard_empty' => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!', + 'ldap_sync' => 'Đồng bộ hóa LDAP', + 'ldap_user_sync' => 'Đồng bộ hóa người dùng LDAP', + 'synchronize' => 'Đồng bộ', + 'sync_results' => 'Kết quả đồng bộ hóa', + 'license_serial' => 'Sê-ri/Khóa sản phẩm', + 'invalid_category' => 'Loại tài sản không hợp lệ hoặc bị thiếu', + 'invalid_item_category_single' => 'Danh mục :type không hợp lệ hoặc bị thiếu. Vui lòng cập nhật danh mục :type này để bao gồm danh mục hợp lệ trước khi thanh toán.', + 'dashboard_info' => 'Đây là bảng điều khiển của bạn. Có nhiều cái giống như vậy, nhưng cái này là của bạn.', + '60_percent_warning' => 'Hoàn thành 60% (cảnh báo)', + 'dashboard_empty' => 'Có vẻ như bạn chưa thêm bất kỳ điều gì nên chúng tôi không có gì để hiển thị. Hãy bắt đầu bằng cách thêm một số nội dung, phụ kiện, vật tư tiêu hao hoặc giấy phép ngay bây giờ!', 'new_asset' => 'New Asset', 'new_license' => 'New License', 'new_accessory' => 'New Accessory', @@ -518,4 +520,13 @@ return [ ], 'no_requestable' => 'There are no requestable assets or asset models.', + 'countable' => [ + 'accessories' => ':count Accessory|:count Accessories', + 'assets' => ':count Asset|:count Assets', + 'licenses' => ':count License|:count Licenses', + 'license_seats' => ':count License Seat|:count License Seats', + 'consumables' => ':count Consumable|:count Consumables', + 'components' => ':count Component|:count Components', + ] + ]; diff --git a/resources/lang/vi-VN/localizations.php b/resources/lang/vi-VN/localizations.php index 2de8b42526..f1232dd138 100644 --- a/resources/lang/vi-VN/localizations.php +++ b/resources/lang/vi-VN/localizations.php @@ -50,6 +50,7 @@ return [ 'sr-CS' => 'Serbian (Latin)', 'sk-SK'=> 'Slovak', 'sl-SI'=> 'Slovenian', + 'so-SO'=> 'Somali', 'es-ES'=> 'Spanish', 'es-CO'=> 'Spanish, Colombia', 'es-MX'=> 'Spanish, Mexico', diff --git a/resources/lang/vi-VN/validation.php b/resources/lang/vi-VN/validation.php index e6dd0b1561..c6f30d7cbf 100644 --- a/resources/lang/vi-VN/validation.php +++ b/resources/lang/vi-VN/validation.php @@ -105,6 +105,8 @@ return [ 'gte' => [ 'numeric' => 'Giá trị không thể âm' ], + 'checkboxes' => ':attribute contains invalid options.', + 'radio_buttons' => ':attribute is invalid.', /* @@ -151,4 +153,10 @@ return [ 'attributes' => [], + /* + |-------------------------------------------------------------------------- + | Generic Validation Messages + |-------------------------------------------------------------------------- + */ + 'invalid_value_in_field' => 'Invalid value included in this field', ]; diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php index ee61df25bf..f4ac46032a 100644 --- a/resources/lang/zh-CN/admin/hardware/message.php +++ b/resources/lang/zh-CN/admin/hardware/message.php @@ -18,6 +18,7 @@ return [ 'success' => '资产更新成功。', 'nothing_updated' => '一个也没有选,所以什么也不会更新。', 'no_assets_selected' => '没有选择任何资产,因此没有更新任何内容。', + 'assets_do_not_exist_or_are_invalid' => '无法更新选定的资产。', ], 'restore' => [ diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php index 10b5805cf0..04a1fa50c1 100644 --- a/resources/lang/zh-CN/admin/settings/general.php +++ b/resources/lang/zh-CN/admin/settings/general.php @@ -261,7 +261,7 @@ return [ 'two_factor_enrollment' => '加入两步验证', 'two_factor_enabled_text' => '启用两步验证', 'two_factor_reset' => '重设两步验证密钥', - 'two_factor_reset_help' => '此操作会强制用户再次通过 Google Authenticator 登记设备,此操作可以解决上一部移动设备丢失的问题。', + 'two_factor_reset_help' => '这将迫使用户再次选用他们的身份验证器应用程序。 如果他们目前登记的设备丢失或被盗,这样做可能是有用的。 ', 'two_factor_reset_success' => '成功重设两步验证设备', 'two_factor_reset_error' => '两步验证设备重设失败', 'two_factor_enabled_warning' => '启用两步验证将需要您立即用登记的移动设备验证身份。如您尚未设置两步验证,您现在可以登记您的设备。', diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php index 0c3b2b5455..a1a23a1556 100644 --- a/resources/lang/zh-CN/general.php +++ b/resources/lang/zh-CN/general.php @@ -1,6 +1,7 @@ '2FA(双因素认证) 重置', 'accessories' => '附属品', 'activated' => '已激活', 'accepted_date' => '接受日期', @@ -201,6 +202,7 @@ return [ 'new_password' => '新密码', 'next' => '下一页', 'next_audit_date' => '下一次盘点时间', + 'no_email' => '没有与此用户关联的电子邮件地址', 'last_audit' => '上一次盘点', 'new' => '新!', 'no_depreciation' => '永久', @@ -518,4 +520,13 @@ return [ ], 'no_requestable' => '没有可申领的资产或资产型号。', + 'countable' => [ + 'accessories' => ':count 配件|:count 配件', + 'assets' => ':count 资产|:count 资产', + 'licenses' => ':count 许可证|:count 许可证', + 'license_seats' => ':count 许可证席位|:count 许可证席位', + 'consumables' => ':count 耗材|:count 耗材', + 'components' => ':count 组件|:count 组件', + ] + ]; diff --git a/resources/lang/zh-CN/localizations.php b/resources/lang/zh-CN/localizations.php index b7343f1bd3..6219123977 100644 --- a/resources/lang/zh-CN/localizations.php +++ b/resources/lang/zh-CN/localizations.php @@ -50,6 +50,7 @@ return [ 'sr-CS' => 'Serbian (Latin)', 'sk-SK'=> '斯洛伐克语', 'sl-SI'=> 'Slovenian', + 'so-SO'=> '索马里语', 'es-ES'=> '西班牙语', 'es-CO'=> '西班牙文(哥伦比亚)', 'es-MX'=> '西班牙文(墨西哥)', diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php index aa7f7999dc..a87a53ec0e 100644 --- a/resources/lang/zh-CN/validation.php +++ b/resources/lang/zh-CN/validation.php @@ -105,6 +105,8 @@ return [ 'gte' => [ 'numeric' => '数值不能为负数' ], + 'checkboxes' => ':attribute 包含无效的选项。', + 'radio_buttons' => ':attribute 无效。', /* @@ -151,4 +153,10 @@ return [ 'attributes' => [], + /* + |-------------------------------------------------------------------------- + | Generic Validation Messages + |-------------------------------------------------------------------------- + */ + 'invalid_value_in_field' => '此字段中包含的值无效', ]; diff --git a/resources/lang/zh-HK/admin/hardware/message.php b/resources/lang/zh-HK/admin/hardware/message.php index 056692998e..bf050ef974 100644 --- a/resources/lang/zh-HK/admin/hardware/message.php +++ b/resources/lang/zh-HK/admin/hardware/message.php @@ -19,6 +19,7 @@ return [ 'success' => 'Asset updated successfully.', 'nothing_updated' => 'No fields were selected, so nothing was updated.', 'no_assets_selected' => 'No assets were selected, so nothing was updated.', + 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.', ], 'restore' => [ diff --git a/resources/lang/zh-HK/admin/settings/general.php b/resources/lang/zh-HK/admin/settings/general.php index 33cfd7b416..71fb8eb2c6 100644 --- a/resources/lang/zh-HK/admin/settings/general.php +++ b/resources/lang/zh-HK/admin/settings/general.php @@ -261,7 +261,7 @@ return [ 'two_factor_enrollment' => 'Two-Factor Enrollment', 'two_factor_enabled_text' => 'Enable Two Factor', 'two_factor_reset' => 'Reset Two-Factor Secret', - 'two_factor_reset_help' => 'This will force the user to enroll their device with Google Authenticator again. This can be useful if their currently enrolled device is lost or stolen. ', + 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ', 'two_factor_reset_success' => 'Two factor device successfully reset', 'two_factor_reset_error' => 'Two factor device reset failed', 'two_factor_enabled_warning' => 'Enabling two-factor if it is not currently enabled will immediately force you to authenticate with a Google Auth enrolled device. You will have the ability to enroll your device if one is not currently enrolled.', diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php index 77c5c1dafd..1d0575ab2e 100644 --- a/resources/lang/zh-HK/general.php +++ b/resources/lang/zh-HK/general.php @@ -1,6 +1,7 @@ '2FA reset', 'accessories' => 'Accessories', 'activated' => 'Activated', 'accepted_date' => 'Date Accepted', @@ -201,6 +202,7 @@ return [ 'new_password' => 'New Password', 'next' => 'Next', 'next_audit_date' => 'Next Audit Date', + 'no_email' => 'No email address associated with this user', 'last_audit' => 'Last Audit', 'new' => 'new!', 'no_depreciation' => 'No Depreciation', @@ -518,4 +520,13 @@ return [ ], 'no_requestable' => 'There are no requestable assets or asset models.', + 'countable' => [ + 'accessories' => ':count Accessory|:count Accessories', + 'assets' => ':count Asset|:count Assets', + 'licenses' => ':count License|:count Licenses', + 'license_seats' => ':count License Seat|:count License Seats', + 'consumables' => ':count Consumable|:count Consumables', + 'components' => ':count Component|:count Components', + ] + ]; diff --git a/resources/lang/zh-HK/localizations.php b/resources/lang/zh-HK/localizations.php index 2de8b42526..f1232dd138 100644 --- a/resources/lang/zh-HK/localizations.php +++ b/resources/lang/zh-HK/localizations.php @@ -50,6 +50,7 @@ return [ 'sr-CS' => 'Serbian (Latin)', 'sk-SK'=> 'Slovak', 'sl-SI'=> 'Slovenian', + 'so-SO'=> 'Somali', 'es-ES'=> 'Spanish', 'es-CO'=> 'Spanish, Colombia', 'es-MX'=> 'Spanish, Mexico', diff --git a/resources/lang/zh-HK/validation.php b/resources/lang/zh-HK/validation.php index 1c6ad8a148..05374e23af 100644 --- a/resources/lang/zh-HK/validation.php +++ b/resources/lang/zh-HK/validation.php @@ -105,6 +105,8 @@ return [ 'gte' => [ 'numeric' => 'Value cannot be negative' ], + 'checkboxes' => ':attribute contains invalid options.', + 'radio_buttons' => ':attribute is invalid.', /* @@ -151,4 +153,10 @@ return [ 'attributes' => [], + /* + |-------------------------------------------------------------------------- + | Generic Validation Messages + |-------------------------------------------------------------------------- + */ + 'invalid_value_in_field' => 'Invalid value included in this field', ]; diff --git a/resources/lang/zh-TW/admin/hardware/message.php b/resources/lang/zh-TW/admin/hardware/message.php index 73f5c6f9ab..ebce130632 100644 --- a/resources/lang/zh-TW/admin/hardware/message.php +++ b/resources/lang/zh-TW/admin/hardware/message.php @@ -18,6 +18,7 @@ return [ 'success' => '更新資產成功。', 'nothing_updated' => '沒有欄位被選擇,因此沒有更新任何內容。', 'no_assets_selected' => '沒有資產被選取,因此沒有更新任何內容。', + 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.', ], 'restore' => [ diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php index be62969d75..b219b83f36 100644 --- a/resources/lang/zh-TW/admin/settings/general.php +++ b/resources/lang/zh-TW/admin/settings/general.php @@ -262,7 +262,7 @@ return [ 'two_factor_enrollment' => '登記雙因素驗證', 'two_factor_enabled_text' => '啟用雙因素驗證', 'two_factor_reset' => '重設雙因素驗證', - 'two_factor_reset_help' => '此動作會強制使用者再次透過 Google Authenticator 登記行動裝置,此動作可解決原登記行動裝置遺失的問題。', + 'two_factor_reset_help' => 'This will force the user to enroll their device with their authenticator app again. This can be useful if their currently enrolled device is lost or stolen. ', 'two_factor_reset_success' => '重設雙因素驗證裝置成功', 'two_factor_reset_error' => '重設雙因素驗證裝置失敗', 'two_factor_enabled_warning' => '啟用雙因素認證將需要您立即用登記的行動裝置驗證身份。如您尚未設置雙因素認證,您現在可以登記您的設備', diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php index 3764d568f1..3702ed351c 100644 --- a/resources/lang/zh-TW/general.php +++ b/resources/lang/zh-TW/general.php @@ -1,6 +1,7 @@ '2FA reset', 'accessories' => '配件', 'activated' => '已啟用', 'accepted_date' => '接受日期', @@ -201,6 +202,7 @@ return [ 'new_password' => '新密碼', 'next' => '下一頁', 'next_audit_date' => '下次稽核日期', + 'no_email' => 'No email address associated with this user', 'last_audit' => '最後稽核日期', 'new' => 'new!', 'no_depreciation' => '永久', @@ -518,4 +520,13 @@ return [ ], 'no_requestable' => 'There are no requestable assets or asset models.', + 'countable' => [ + 'accessories' => ':count Accessory|:count Accessories', + 'assets' => ':count Asset|:count Assets', + 'licenses' => ':count License|:count Licenses', + 'license_seats' => ':count License Seat|:count License Seats', + 'consumables' => ':count Consumable|:count Consumables', + 'components' => ':count Component|:count Components', + ] + ]; diff --git a/resources/lang/zh-TW/localizations.php b/resources/lang/zh-TW/localizations.php index ea204de756..ac89b30746 100644 --- a/resources/lang/zh-TW/localizations.php +++ b/resources/lang/zh-TW/localizations.php @@ -50,6 +50,7 @@ return [ 'sr-CS' => '塞爾維亞語(拉丁文)', 'sk-SK'=> 'Slovak', 'sl-SI'=> '斯洛維尼亞語', + 'so-SO'=> 'Somali', 'es-ES'=> '西班牙語', 'es-CO'=> '哥倫比亞西班牙語', 'es-MX'=> '墨西哥西班牙語', diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php index 0dcf0908a6..432e9d2817 100644 --- a/resources/lang/zh-TW/validation.php +++ b/resources/lang/zh-TW/validation.php @@ -105,6 +105,8 @@ return [ 'gte' => [ 'numeric' => '值不能為負' ], + 'checkboxes' => ':attribute contains invalid options.', + 'radio_buttons' => ':attribute is invalid.', /* @@ -151,4 +153,10 @@ return [ 'attributes' => [], + /* + |-------------------------------------------------------------------------- + | Generic Validation Messages + |-------------------------------------------------------------------------- + */ + 'invalid_value_in_field' => 'Invalid value included in this field', ]; diff --git a/resources/lang/zu-ZA/admin/hardware/message.php b/resources/lang/zu-ZA/admin/hardware/message.php index a622d95074..829db3f461 100644 --- a/resources/lang/zu-ZA/admin/hardware/message.php +++ b/resources/lang/zu-ZA/admin/hardware/message.php @@ -18,6 +18,7 @@ return [ 'success' => 'Ifa libuyekezwe ngempumelelo.', 'nothing_updated' => 'Awekho amasimu akhethiwe, ngakho-ke akukho lutho olubuyekeziwe.', 'no_assets_selected' => 'No assets were selected, so nothing was updated.', + 'assets_do_not_exist_or_are_invalid' => 'Selected assets cannot be updated.', ], 'restore' => [ diff --git a/resources/lang/zu-ZA/general.php b/resources/lang/zu-ZA/general.php index ff14392b7f..fba19b7755 100644 --- a/resources/lang/zu-ZA/general.php +++ b/resources/lang/zu-ZA/general.php @@ -1,6 +1,7 @@ '2FA reset', 'accessories' => 'Izesekeli', 'activated' => 'Kuvunyelwe', 'accepted_date' => 'Date Accepted', @@ -201,6 +202,7 @@ return [ 'new_password' => 'New Password', 'next' => 'Olandelayo', 'next_audit_date' => 'Usuku Lolwazi Olulandelayo', + 'no_email' => 'No email address associated with this user', 'last_audit' => 'Ukucwaninga kokugcina', 'new' => 'okusha!', 'no_depreciation' => 'Akukho ukwehla', @@ -518,4 +520,13 @@ return [ ], 'no_requestable' => 'There are no requestable assets or asset models.', + 'countable' => [ + 'accessories' => ':count Accessory|:count Accessories', + 'assets' => ':count Asset|:count Assets', + 'licenses' => ':count License|:count Licenses', + 'license_seats' => ':count License Seat|:count License Seats', + 'consumables' => ':count Consumable|:count Consumables', + 'components' => ':count Component|:count Components', + ] + ]; diff --git a/resources/lang/zu-ZA/localizations.php b/resources/lang/zu-ZA/localizations.php index 2de8b42526..f1232dd138 100644 --- a/resources/lang/zu-ZA/localizations.php +++ b/resources/lang/zu-ZA/localizations.php @@ -50,6 +50,7 @@ return [ 'sr-CS' => 'Serbian (Latin)', 'sk-SK'=> 'Slovak', 'sl-SI'=> 'Slovenian', + 'so-SO'=> 'Somali', 'es-ES'=> 'Spanish', 'es-CO'=> 'Spanish, Colombia', 'es-MX'=> 'Spanish, Mexico', diff --git a/resources/lang/zu-ZA/validation.php b/resources/lang/zu-ZA/validation.php index 05382f751d..6aaea0d2a3 100644 --- a/resources/lang/zu-ZA/validation.php +++ b/resources/lang/zu-ZA/validation.php @@ -105,6 +105,8 @@ return [ 'gte' => [ 'numeric' => 'Value cannot be negative' ], + 'checkboxes' => ':attribute contains invalid options.', + 'radio_buttons' => ':attribute is invalid.', /* @@ -151,4 +153,10 @@ return [ 'attributes' => [], + /* + |-------------------------------------------------------------------------- + | Generic Validation Messages + |-------------------------------------------------------------------------- + */ + 'invalid_value_in_field' => 'Invalid value included in this field', ]; diff --git a/resources/macros/macros.php b/resources/macros/macros.php index c5c7824edc..695fa86b06 100644 --- a/resources/macros/macros.php +++ b/resources/macros/macros.php @@ -32,12 +32,18 @@ Form::macro('countries', function ($name = 'country', $selected = null, $class = $idclause = (!is_null($id)) ? $id : ''; - $select = '