diff --git a/resources/lang/af/admin/asset_maintenances/message.php b/resources/lang/af/admin/asset_maintenances/message.php
index 83fbf698d6..d121115825 100644
--- a/resources/lang/af/admin/asset_maintenances/message.php
+++ b/resources/lang/af/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'Warranty',
diff --git a/resources/lang/af/admin/hardware/general.php b/resources/lang/af/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/af/admin/hardware/general.php
+++ b/resources/lang/af/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/af/admin/hardware/message.php b/resources/lang/af/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/af/admin/hardware/message.php
+++ b/resources/lang/af/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/af/admin/settings/general.php b/resources/lang/af/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/af/admin/settings/general.php
+++ b/resources/lang/af/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/af/admin/users/general.php b/resources/lang/af/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/af/admin/users/general.php
+++ b/resources/lang/af/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php
index 5a5fc5f7da..eb6409ddbb 100644
--- a/resources/lang/af/general.php
+++ b/resources/lang/af/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Back',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Cancel',
'categories' => 'Categories',
@@ -52,6 +56,8 @@
'current' => 'Current',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'More Info',
'name' => 'Name',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/af/validation.php b/resources/lang/af/validation.php
index 7a26a6515f..02cb1fa981 100644
--- a/resources/lang/af/validation.php
+++ b/resources/lang/af/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min and :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/ar/admin/asset_maintenances/message.php b/resources/lang/ar/admin/asset_maintenances/message.php
index b2d81a3f87..af80f580c4 100644
--- a/resources/lang/ar/admin/asset_maintenances/message.php
+++ b/resources/lang/ar/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'تم إنشاء سند صيانة الأصل بنجاح.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'لم يكتمل بعد',
'warranty' => 'الضمان',
diff --git a/resources/lang/ar/admin/custom_fields/message.php b/resources/lang/ar/admin/custom_fields/message.php
index 112dd8b151..87584c723e 100644
--- a/resources/lang/ar/admin/custom_fields/message.php
+++ b/resources/lang/ar/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(
'fieldset' => array(
- 'does_not_exist' => 'Fieldset does not exist',
+ 'does_not_exist' => 'مجموعة الحقول غير موجودة',
'create' => array(
'error' => 'لم يتم إنشاء مجموعة-الحقول، الرجاء المحاولة مرة اخرى.',
diff --git a/resources/lang/ar/admin/departments/message.php b/resources/lang/ar/admin/departments/message.php
index d65f4fbb2b..4d4ad8eccf 100644
--- a/resources/lang/ar/admin/departments/message.php
+++ b/resources/lang/ar/admin/departments/message.php
@@ -2,20 +2,20 @@
return array(
- 'does_not_exist' => 'Department does not exist.',
- 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
+ 'does_not_exist' => 'القسم الاداري غير موجود.',
+ 'assoc_users' => 'هذا القسم الإداري مرتبط حاليا مع مستخدم واحد على الأقل ولا يمكن حذفه. الرجاء تحديث تفاصيل المستخدمين حيث لا تحتوي هذا القسم وحاول مرة أخرى. ',
'create' => array(
- 'error' => 'Department was not created, please try again.',
- 'success' => 'Department created successfully.'
+ 'error' => 'لم يتم إنشاء القسم الإداري، الرجاء المحاولة مرة أخرى.',
+ 'success' => 'تم انشاء القسم الاداري بنجاح.'
),
'update' => array(
- 'error' => 'Department was not updated, please try again',
- 'success' => 'Department updated successfully.'
+ 'error' => 'لم يتم تحديث القسم الإداري، الرجاء المحاولة مرة أخرى',
+ 'success' => 'تم تحديث القسم الاداري بنجاح.'
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this department?',
- 'error' => 'There was an issue deleting the department. Please try again.',
- 'success' => 'The department was deleted successfully.'
+ 'confirm' => 'هل أنت متأكد من رغبتك في حذف هذا القسم؟',
+ 'error' => 'حدثت مشكلة اثناء عملية حذف القسم الاداري. الرجاء المحاولة مرة اُخرى.',
+ 'success' => 'تم حذف القسم الاداري بنجاح.'
)
);
diff --git a/resources/lang/ar/admin/departments/table.php b/resources/lang/ar/admin/departments/table.php
index 76494247be..92f7df1ea8 100644
--- a/resources/lang/ar/admin/departments/table.php
+++ b/resources/lang/ar/admin/departments/table.php
@@ -2,10 +2,10 @@
return array(
- 'id' => 'ID',
- 'name' => 'Department Name',
- 'manager' => 'Manager',
- 'location' => 'Location',
- 'create' => 'Create Department',
- 'update' => 'Update Department',
+ 'id' => 'رقم التعريف',
+ 'name' => 'اسم القسم الإداري',
+ 'manager' => 'المدير',
+ 'location' => 'الموقع',
+ 'create' => 'إنشاء قسم اداري',
+ 'update' => 'تحديث قسم اداري',
);
diff --git a/resources/lang/ar/admin/hardware/form.php b/resources/lang/ar/admin/hardware/form.php
index 8a94e98253..8032e8f1c9 100644
--- a/resources/lang/ar/admin/hardware/form.php
+++ b/resources/lang/ar/admin/hardware/form.php
@@ -2,9 +2,9 @@
return array(
'bulk_delete' => 'تاكيد إجراء حذف متعدد للاُصول',
- 'bulk_delete_help' => 'Review the assets for bulk deletion below. Once deleted, these assets can be restored, but they will no longer be associated with any users they are currently assigned to.',
- 'bulk_delete_warn' => 'You are about to delete :asset_count assets.',
- 'bulk_update' => 'Bulk Update Assets',
+ 'bulk_delete_help' => 'الرجاء مراجعة الأصول المعينة للحذف بالجملة أدناه. بمجرد الحذف، يمكن استعادة هذه الأصول، لكنها لن تكون مقترنة مع أي من المستخدمين اللذين تم تعيين الاصول لهم من قبل.',
+ 'bulk_delete_warn' => 'أنت على وشك حذف اصول asset_count: .',
+ 'bulk_update' => 'تحديث الاصول بالجملة',
'bulk_update_help' => 'This form allows you to update multiple assets at once. Only fill in the fields you need to change. Any fields left blank will remain unchanged. ',
'bulk_update_warn' => 'You are about to edit the properties of :asset_count assets.',
'checkedout_to' => 'Checked Out To',
diff --git a/resources/lang/ar/admin/hardware/general.php b/resources/lang/ar/admin/hardware/general.php
index b6cf51769d..a20df43729 100644
--- a/resources/lang/ar/admin/hardware/general.php
+++ b/resources/lang/ar/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'أصل',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'استنساخ الأصل',
'deployable' => 'قابل للنشر',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/ar/admin/hardware/message.php b/resources/lang/ar/admin/hardware/message.php
index b3c9f1cbb2..cef50b45f1 100644
--- a/resources/lang/ar/admin/hardware/message.php
+++ b/resources/lang/ar/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'لم يتم حذف الملف. الرجاء المحاولة مرة اخرى.',
'success' => 'تم حذف الملف بنجاح.',
diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php
index 8e8cf0c9a4..93f5c51258 100644
--- a/resources/lang/ar/admin/settings/general.php
+++ b/resources/lang/ar/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'البادئة (اختياري)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/ar/admin/users/general.php b/resources/lang/ar/admin/users/general.php
index 7c6c2499fe..ee405ce3b4 100644
--- a/resources/lang/ar/admin/users/general.php
+++ b/resources/lang/ar/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'انواع صيغ الملفات المسوح بها هي png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'الأرشيف الخاص بـ :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'آخر دخول للمستخدم',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'البرامج المسجلة لـ :name',
diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php
index d1ad169d9d..29c04945b5 100644
--- a/resources/lang/ar/general.php
+++ b/resources/lang/ar/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'وسم الأصول',
'assets_available' => 'الأصول المتاحة',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'الأصول',
'avatar_delete' => 'حذف الصورة الرمزية',
'avatar_upload' => 'رفع صورة رمزية',
'back' => 'الرجوع للخلف',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'إلغاء',
'categories' => 'التصنيفات',
@@ -52,6 +56,8 @@
'current' => 'الحالي',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'التاريخ',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'المزيد من المعلومات',
'name' => 'الإسم',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'لا يوجد إستهلاك',
'no_results' => 'لا يوجد نتائج.',
diff --git a/resources/lang/ar/validation.php b/resources/lang/ar/validation.php
index bc004518c8..e890e5be0d 100644
--- a/resources/lang/ar/validation.php
+++ b/resources/lang/ar/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute يجب ان يكون مقبولا.",
- "active_url" => ":attribute موقع غير صحيح.",
- "after" => ":attribute يجب ان يكون تاريخ قبل :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.",
- "before" => ":attribute يجب ان يكون تاريخ قبل :date.",
- "between" => array(
- "numeric" => ":attribute يجب ان يكون بين :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => ":attribute تاريخ غير صحيح.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => ':attribute يجب ان يكون مقبولا.',
+ 'active_url' => ':attribute موقع غير صحيح.',
+ 'after' => ':attribute يجب ان يكون تاريخ قبل :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.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute يجب ان يكون تاريخ قبل :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute يجب ان يكون بين :min - :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => ':attribute تاريخ غير صحيح.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/bg/admin/asset_maintenances/message.php b/resources/lang/bg/admin/asset_maintenances/message.php
index 3d1f911971..92327660f0 100644
--- a/resources/lang/bg/admin/asset_maintenances/message.php
+++ b/resources/lang/bg/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Поддръжката на актив създадена успешно.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Все още неприключила',
'warranty' => 'Гаранция',
diff --git a/resources/lang/bg/admin/departments/table.php b/resources/lang/bg/admin/departments/table.php
index 76494247be..f40782d7f4 100644
--- a/resources/lang/bg/admin/departments/table.php
+++ b/resources/lang/bg/admin/departments/table.php
@@ -2,10 +2,10 @@
return array(
- 'id' => 'ID',
+ 'id' => 'ИД№',
'name' => 'Department Name',
- 'manager' => 'Manager',
- 'location' => 'Location',
+ 'manager' => 'Ръководител',
+ 'location' => 'Местоположение',
'create' => 'Create Department',
'update' => 'Update Department',
);
diff --git a/resources/lang/bg/admin/hardware/general.php b/resources/lang/bg/admin/hardware/general.php
index 6b17e77271..856908b22d 100644
--- a/resources/lang/bg/admin/hardware/general.php
+++ b/resources/lang/bg/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Актив',
'bulk_checkout' => 'Отписване на активи към потребител',
'checkin' => 'Връщане на актив',
- 'checkout' => 'Изписване на актив към потребител',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Копиране на актив',
'deployable' => 'Може да бъде предоставен',
'deleted' => 'Активът беше изтрит. Възстановяване.',
diff --git a/resources/lang/bg/admin/hardware/message.php b/resources/lang/bg/admin/hardware/message.php
index adb26742d8..23b7e8f8c0 100644
--- a/resources/lang/bg/admin/hardware/message.php
+++ b/resources/lang/bg/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => 'Активът възстановен успешно.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Файлът не беше изтрит. Моля опитайте отново.',
'success' => 'Файлът изтрит успешно.',
diff --git a/resources/lang/bg/admin/models/message.php b/resources/lang/bg/admin/models/message.php
index f5a0cfeb80..398bdc9f9a 100644
--- a/resources/lang/bg/admin/models/message.php
+++ b/resources/lang/bg/admin/models/message.php
@@ -29,8 +29,8 @@ return array(
),
'bulkedit' => array(
- 'error' => 'No fields were changed, so nothing was updated.',
- 'success' => 'Models updated.'
+ 'error' => 'Няма полета, който да са се променили, така че нищо не е осъвременено.',
+ 'success' => 'Моделите са осъвременени.'
),
);
diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php
index 1d4711dc98..f2c8e974b1 100644
--- a/resources/lang/bg/admin/settings/general.php
+++ b/resources/lang/bg/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Изтичаш праг на известия (в дни)',
'alert_inv_threshold' => 'Праг на известия за запаси',
'asset_ids' => 'ID на активи',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Автоматично генериране на инвентарни номера на активите',
'auto_increment_prefix' => 'Префикс (незадължително)',
'auto_incrementing_help' => 'Първо включете автоматично генериране на инвентарни номера, за да включите тази опция.',
diff --git a/resources/lang/bg/admin/users/general.php b/resources/lang/bg/admin/users/general.php
index add36f87c0..a29d09326f 100644
--- a/resources/lang/bg/admin/users/general.php
+++ b/resources/lang/bg/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Позволените типове файлове са png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
'history_user' => 'История за :name',
'info' => 'Информация',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Последен достъп до системата',
'ldap_config_text' => 'LDAP конфигурационните настройки могат да бъдат намерени в Admin > Settings. Избраното (по изобр) местоположение ще бъде настроено за всички въведени потребители.',
'software_user' => 'Софтуерни продукти, изписани на :name',
diff --git a/resources/lang/bg/admin/users/table.php b/resources/lang/bg/admin/users/table.php
index 769aa6b0b3..e97ac8285a 100644
--- a/resources/lang/bg/admin/users/table.php
+++ b/resources/lang/bg/admin/users/table.php
@@ -19,7 +19,7 @@ return array(
'location' => 'Местоположение',
'lock_passwords' => 'Настройките за вход не могат да бъдат променяни в текущата инсталация.',
'manager' => 'Ръководител',
- 'managed_locations' => 'Managed Locations',
+ 'managed_locations' => 'Управлявани места',
'name' => 'Име',
'notes' => 'Бележки',
'password_confirm' => 'Потвърждение на паролата',
diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php
index e9106355b3..1c2693d449 100644
--- a/resources/lang/bg/general.php
+++ b/resources/lang/bg/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Справка за активите',
'asset_tag' => 'Инвентарен номер',
'assets_available' => 'налични активи',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Активи',
'avatar_delete' => 'Изтриване на аватар',
'avatar_upload' => 'Качване на аватар',
'back' => 'Назад',
'bad_data' => 'Няма резултати.',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Общо отписване',
'cancel' => 'Отказ',
'categories' => 'Категории',
@@ -52,6 +56,8 @@
'current' => 'Текущи',
'custom_report' => 'Потребителски справки за активи',
'dashboard' => 'Табло',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Дата',
'debug_warning' => 'Предупреждение!',
'debug_warning_text' => 'Това приложение се изпълнява в режим на производство с разрешено отстраняване на грешки. Това може да изложи чувствителни данни, ако приложението ви е достъпно за външния свят. Забранете режим отстраняване на грешки чрез задаване на стойността APP_DEBUF .env във файла false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Повече информация',
'name' => 'Име',
'next' => 'Следващ',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'Без амортизация',
'no_results' => 'Няма резултат.',
@@ -152,7 +160,7 @@
'select_model' => 'Избор на модел',
'select_supplier' => 'Избор на доставчик',
'select_user' => 'Избор на потребител',
- 'select_date' => 'Select Date (YYYY-MM-DD)',
+ 'select_date' => 'Изберете дата (ГГГГ-ММ-ДД)',
'select_statuslabel' => 'Избор на статус',
'select_company' => 'Изберете компания',
'select_asset' => 'Изберете актив',
diff --git a/resources/lang/bg/validation.php b/resources/lang/bg/validation.php
index 477e599f84..c923d7873e 100644
--- a/resources/lang/bg/validation.php
+++ b/resources/lang/bg/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute трябва да бъде потвърден.",
- "active_url" => ":attribute не е валиден URL адрес.",
- "after" => ":attribute трябва да бъде дата след :date.",
- "alpha" => ":attribute може да съдържа единствено букви.",
- "alpha_dash" => ":attribute може да съдържа единствено букви, числа и тире.",
- "alpha_num" => ":attribute може да съдържа единствено букви и числа.",
- "before" => ":attribute трябва да бъде дата преди :date.",
- "between" => array(
- "numeric" => ":attribute трябва да бъде между :min и :max.",
- "file" => ":attribute трябва да бъде с големина между :min и :max KB.",
- "string" => ":attribute трябва да бъде с дължина между :min и :max символа.",
- ),
- "boolean" => ":attribute трябва да е верен или грешен.",
- "confirmed" => ":attribute потвърждение не съвпада.",
- "date" => ":attribute не е валидна дата.",
- "date_format" => ":attribute не съвпада с формата :format.",
- "different" => ":attribute и :other трябва да се различават.",
- "digits" => ":attribute трябва да бъде с дължина :digits цифри.",
- "digits_between" => ":attribute трябва да бъде с дължина между :min и :max цифри.",
- "email" => ":attribute е с невалиден формат.",
- "exists" => "Избраният :attribute е невалиден.",
- "email_array" => "Един или повече email адреси е невалиден.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute трябва да бъде изображение.",
- "in" => "Избраният :attribute е невалиден.",
- "integer" => ":attribute трябва да бъде целочислен.",
- "ip" => ":attribute трябва да бъде валиден IP адрес.",
- "max" => array(
- "numeric" => ":attribute не може да бъде по-дълъг от :max.",
- "file" => ":attribute не може да бъде по-голям от :max KB.",
- "string" => ":attribute не може да бъде по-дълъг от :max символа.",
- ),
- "mimes" => ":attribute трябва да бъде файл с един от следните типове: :values.",
- "min" => array(
- "numeric" => ":attribute трябва да бъде минимум :min.",
- "file" => ":attribute трябва да бъде с големина минимум :min KB.",
- "string" => ":attribute трябва да бъде минимум :min символа.",
- ),
- "not_in" => "Избраният :attribute е невалиден.",
- "numeric" => ":attribute трябва да бъде число.",
- "regex" => "Форматът на :attribute е невалиден.",
- "required" => "Полето :attribute е задължително.",
- "required_if" => "Полето :attribute е задължително, когато :other е :value.",
- "required_with" => ":attribute е задължителен, когато са избрани :values.",
- "required_without" => ":attribute е задължителен, когато не са избрани :values.",
- "same" => ":attribute и :other трябва да съвпадат.",
- "size" => array(
- "numeric" => ":attribute трябва да бъде с дължина :size.",
- "file" => ":attribute трябва да бъде с големина :size KB.",
- "string" => ":attribute трябва да бъде с дължина :size символа.",
- ),
- "unique" => ":attribute вече е вписан.",
- "url" => "Форматът на :attribute е невалиден.",
- "statuslabel_type" => "Трябва да изберете валиден тип етикет за статус",
- "unique_undeleted" => ":attribute трябва да е единствен по рода си.",
+ 'accepted' => ':attribute трябва да бъде потвърден.',
+ 'active_url' => ':attribute не е валиден URL адрес.',
+ 'after' => ':attribute трябва да бъде дата след :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute може да съдържа единствено букви.',
+ 'alpha_dash' => ':attribute може да съдържа единствено букви, числа и тире.',
+ 'alpha_num' => ':attribute може да съдържа единствено букви и числа.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute трябва да бъде дата преди :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute трябва да бъде между :min и :max.',
+ 'file' => ':attribute трябва да бъде с големина между :min и :max KB.',
+ 'string' => ':attribute трябва да бъде с дължина между :min и :max символа.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute трябва да е верен или грешен.',
+ 'confirmed' => ':attribute потвърждение не съвпада.',
+ 'date' => ':attribute не е валидна дата.',
+ 'date_format' => ':attribute не съвпада с формата :format.',
+ 'different' => ':attribute и :other трябва да се различават.',
+ 'digits' => ':attribute трябва да бъде с дължина :digits цифри.',
+ 'digits_between' => ':attribute трябва да бъде с дължина между :min и :max цифри.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute е с невалиден формат.',
+ 'exists' => 'Избраният :attribute е невалиден.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute трябва да бъде изображение.',
+ 'in' => 'Избраният :attribute е невалиден.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute трябва да бъде целочислен.',
+ 'ip' => ':attribute трябва да бъде валиден IP адрес.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute не може да бъде по-дълъг от :max.',
+ 'file' => ':attribute не може да бъде по-голям от :max KB.',
+ 'string' => ':attribute не може да бъде по-дълъг от :max символа.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute трябва да бъде файл с един от следните типове: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute трябва да бъде минимум :min.',
+ 'file' => ':attribute трябва да бъде с големина минимум :min KB.',
+ 'string' => ':attribute трябва да бъде минимум :min символа.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Избраният :attribute е невалиден.',
+ 'numeric' => ':attribute трябва да бъде число.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Форматът на :attribute е невалиден.',
+ 'required' => 'Полето :attribute е задължително.',
+ 'required_if' => 'Полето :attribute е задължително, когато :other е :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute е задължителен, когато са избрани :values.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute е задължителен, когато не са избрани :values.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute и :other трябва да съвпадат.',
+ 'size' => [
+ 'numeric' => ':attribute трябва да бъде с дължина :size.',
+ 'file' => ':attribute трябва да бъде с големина :size KB.',
+ 'string' => ':attribute трябва да бъде с дължина :size символа.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute вече е вписан.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Форматът на :attribute е невалиден.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => ":attribute съдържа символи, които са забранени.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/cs/admin/asset_maintenances/message.php b/resources/lang/cs/admin/asset_maintenances/message.php
index 08e37084aa..8582ccecbd 100644
--- a/resources/lang/cs/admin/asset_maintenances/message.php
+++ b/resources/lang/cs/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Údržba zařízení byla v pořádku vytvořena.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Prozatím nedokončeno',
'warranty' => 'Záruka',
diff --git a/resources/lang/cs/admin/hardware/general.php b/resources/lang/cs/admin/hardware/general.php
index 3f8c8e1d15..37b129d873 100644
--- a/resources/lang/cs/admin/hardware/general.php
+++ b/resources/lang/cs/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Majetek',
'bulk_checkout' => 'Předat majetek uživateli',
'checkin' => 'Převzít majetek',
- 'checkout' => 'Předat majetek uživateli',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Klonovat majetek',
'deployable' => 'Připraveno k nasazení',
'deleted' => 'Toto zařízení bylo odstraněno. Klepněte zde pro jeho obnovení.',
diff --git a/resources/lang/cs/admin/hardware/message.php b/resources/lang/cs/admin/hardware/message.php
index 40610fa940..d5dbe486ba 100644
--- a/resources/lang/cs/admin/hardware/message.php
+++ b/resources/lang/cs/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Majetek byl v pořádku obnoven.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Soubor se nesmazal, prosím zkuste to znovu.',
'success' => 'Soubor byl úspěšně smazán.',
diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php
index 687b94328a..4b58757ab5 100644
--- a/resources/lang/cs/admin/settings/general.php
+++ b/resources/lang/cs/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Mez upozornění na vypršení (ve dnech)',
'alert_inv_threshold' => 'Mez upozornění skladu',
'asset_ids' => 'ID majetku',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Vygenerovat zvyšující se ID majetku',
'auto_increment_prefix' => 'Předpona (volitnelná)',
'auto_incrementing_help' => 'Nastavte nejdříve automaticky se zvyšující ID majetku pro nastavení tohoto',
diff --git a/resources/lang/cs/admin/users/general.php b/resources/lang/cs/admin/users/general.php
index 6747b2eab4..f863940905 100644
--- a/resources/lang/cs/admin/users/general.php
+++ b/resources/lang/cs/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Povolené přílohy: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'Historie:',
'info' => 'Informace',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Poslední přihlášení',
'ldap_config_text' => 'Nastavení konfigurace LDAP lze nalézt v menu Správce> Nastavení. Vybrané (volitelně) místo bude nastaven pro všechny importované uživatele.',
'software_user' => 'Software vydaný pro :name',
diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php
index ac44c4ba7f..b220fd1a82 100644
--- a/resources/lang/cs/general.php
+++ b/resources/lang/cs/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Report majetku',
'asset_tag' => 'Označení majetku',
'assets_available' => 'dostupných zařízení',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Zařízení',
'avatar_delete' => 'Smazat avatara',
'avatar_upload' => 'Nahrát avatara',
'back' => 'Zpět',
'bad_data' => 'Nic nebylo nalezeno. Možná zadáváte špatná data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Hromadný výdej',
'cancel' => 'Storno',
'categories' => 'Kategorie',
@@ -52,6 +56,8 @@
'current' => 'Aktuální',
'custom_report' => 'Vlastní report majetku',
'dashboard' => 'Nástěnka',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Datum',
'debug_warning' => 'Varování!',
'debug_warning_text' => 'Tato aplikace běží ve výrobním režimu s povoleným laděním. To znamená že citlivá data mohou být přístupná vnějšímu světu. Deaktivujte režim ladění nastavením hodnoty APP_DEBUG v souboru .env na false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Další informace',
'name' => 'Název',
'next' => 'Další',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'nový!',
'no_depreciation' => 'Žádná amortizace',
'no_results' => 'Žádné výsledky.',
diff --git a/resources/lang/cs/validation.php b/resources/lang/cs/validation.php
index e73d09dfb9..9594ffe5f3 100644
--- a/resources/lang/cs/validation.php
+++ b/resources/lang/cs/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "Je potřeba potvrdit :attribute.",
- "active_url" => ":attribute není platnou URL.",
- "after" => ":attribute nemůže být dříve než :date.",
- "alpha" => ":attribute může obsahovat pouze písmena.",
- "alpha_dash" => ":attribute může obsahovat pouze písmena, čísla, a pomlčky.",
- "alpha_num" => ":attribute může obsahovat pouze písmena čísla.",
- "before" => ":attribute nemůže být později než :date.",
- "between" => array(
- "numeric" => ":attribute musí být mezi :min - :max.",
- "file" => ":attribute musí být mezi :min - :max kilobajtů.",
- "string" => ":attribute smí obsahovat pouze :min - :max znaků.",
- ),
- "boolean" => ":attribute musí být true nebo false.",
- "confirmed" => "Potvrzení :attribute se neshoduje.",
- "date" => ":attribute není platným datem.",
- "date_format" => "Atribut :attribute nesouhlasí s formátem :format.",
- "different" => ":attribute a :other se musí lišit.",
- "digits" => ":attribute musí být :digits číslo.",
- "digits_between" => ":attribute musí být mezi hodnotami :min a :max.",
- "email" => "Formát :attribute je neplatný.",
- "exists" => "Zvolený :attribute je neplatný.",
- "email_array" => "Jedna nebo více e-mailových adres je neplatná.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute musí být obrázek.",
- "in" => "Zvolený :attribute je neplatný.",
- "integer" => ":attribute musí být celočíselný.",
- "ip" => ":attribute musí být platná IP adresa.",
- "max" => array(
- "numeric" => ":attribute nesmí být větší než :max.",
- "file" => ":attribute nesmí být větší než :max kilobajtů.",
- "string" => ":attribute nesmí být větší než :max znaků.",
- ),
- "mimes" => ":attribute musí být soubor typu: :values.",
- "min" => array(
- "numeric" => ":attribute musí být minimálne :min.",
- "file" => ":attribute musí být minimálně :min kilobajtů.",
- "string" => ":attribute musí mít minimálně :min znaků.",
- ),
- "not_in" => "Zvolený :attribute je neplatný.",
- "numeric" => ":attribute musí být číslo.",
- "regex" => "Formát :attribute je neplatný.",
- "required" => "Pole :attribute je požadováno.",
- "required_if" => "Položka :attribute je vyžadována, když :other je :value.",
- "required_with" => "Hodnota :attribute je vyžadována, když je přítomno :values.",
- "required_without" => "Hodnota :attribute je vyžadována, když není přítomno :values.",
- "same" => ":attribute a :other se musí shodovat.",
- "size" => array(
- "numeric" => ":attribute musí být :size.",
- "file" => ":attribute musí být :size kilobajtů.",
- "string" => ":attribute musí mít :size znaků.",
- ),
- "unique" => ":attribute byl již vybrán.",
- "url" => "Formát :attribute je neplatný.",
- "statuslabel_type" => "Musíte vybrat platný status typu štítku",
- "unique_undeleted" => ":attribute musí být jedinečný.",
+ 'accepted' => 'Je potřeba potvrdit :attribute.',
+ 'active_url' => ':attribute není platnou URL.',
+ 'after' => ':attribute nemůže být dříve než :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute může obsahovat pouze písmena.',
+ 'alpha_dash' => ':attribute může obsahovat pouze písmena, čísla, a pomlčky.',
+ 'alpha_num' => ':attribute může obsahovat pouze písmena čísla.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute nemůže být později než :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute musí být mezi :min - :max.',
+ 'file' => ':attribute musí být mezi :min - :max kilobajtů.',
+ 'string' => ':attribute smí obsahovat pouze :min - :max znaků.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute musí být true nebo false.',
+ 'confirmed' => 'Potvrzení :attribute se neshoduje.',
+ 'date' => ':attribute není platným datem.',
+ 'date_format' => 'Atribut :attribute nesouhlasí s formátem :format.',
+ 'different' => ':attribute a :other se musí lišit.',
+ 'digits' => ':attribute musí být :digits číslo.',
+ 'digits_between' => ':attribute musí být mezi hodnotami :min a :max.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Formát :attribute je neplatný.',
+ 'exists' => 'Zvolený :attribute je neplatný.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute musí být obrázek.',
+ 'in' => 'Zvolený :attribute je neplatný.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute musí být celočíselný.',
+ 'ip' => ':attribute musí být platná IP adresa.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute nesmí být větší než :max.',
+ 'file' => ':attribute nesmí být větší než :max kilobajtů.',
+ 'string' => ':attribute nesmí být větší než :max znaků.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute musí být soubor typu: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute musí být minimálne :min.',
+ 'file' => ':attribute musí být minimálně :min kilobajtů.',
+ 'string' => ':attribute musí mít minimálně :min znaků.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Zvolený :attribute je neplatný.',
+ 'numeric' => ':attribute musí být číslo.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Formát :attribute je neplatný.',
+ 'required' => 'Pole :attribute je požadováno.',
+ 'required_if' => 'Položka :attribute je vyžadována, když :other je :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'Hodnota :attribute je vyžadována, když je přítomno :values.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'Hodnota :attribute je vyžadována, když není přítomno :values.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute a :other se musí shodovat.',
+ 'size' => [
+ 'numeric' => ':attribute musí být :size.',
+ 'file' => ':attribute musí být :size kilobajtů.',
+ 'string' => ':attribute musí mít :size znaků.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute byl již vybrán.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Formát :attribute je neplatný.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Pole :attribute obsahuje nepovolené znaky.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/da/admin/asset_maintenances/message.php b/resources/lang/da/admin/asset_maintenances/message.php
index 7c8c64f95f..9d33c48b04 100644
--- a/resources/lang/da/admin/asset_maintenances/message.php
+++ b/resources/lang/da/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Aktivets vedligeholdelse blev oprettet med succes.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Ikke afsluttet endnu',
'warranty' => 'Garanti',
diff --git a/resources/lang/da/admin/hardware/general.php b/resources/lang/da/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/da/admin/hardware/general.php
+++ b/resources/lang/da/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/da/admin/hardware/message.php b/resources/lang/da/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/da/admin/hardware/message.php
+++ b/resources/lang/da/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/da/admin/settings/general.php b/resources/lang/da/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/da/admin/settings/general.php
+++ b/resources/lang/da/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/da/admin/users/general.php b/resources/lang/da/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/da/admin/users/general.php
+++ b/resources/lang/da/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php
index d851a43d7e..51b22016b5 100644
--- a/resources/lang/da/general.php
+++ b/resources/lang/da/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Aktiv Rapport',
'asset_tag' => 'Aktiv Mærkat',
'assets_available' => 'aktiver tilgængelige',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Aktiver',
'avatar_delete' => 'Slet avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Tilbage',
'bad_data' => 'Intet fundet. Måske dårlig data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Masseudtjekning',
'cancel' => 'Annuller',
'categories' => 'Kategorier',
@@ -52,6 +56,8 @@
'current' => 'Aktuelle',
'custom_report' => 'Tilpasset Aktiv Rapport',
'dashboard' => 'Oversigtspanel',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Dato',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Mere Info',
'name' => 'Navn',
'next' => 'Næste',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'ny!',
'no_depreciation' => 'Ingen Afskrivning',
'no_results' => 'Ingen Resultater.',
diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php
index 9e75c95df5..f68ea67ed9 100644
--- a/resources/lang/da/validation.php
+++ b/resources/lang/da/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute skal være accepteret.",
- "active_url" => ":attribute er ikke en gyldig URL.",
- "after" => ":attribute skal være en dato efter :date.",
- "alpha" => ":attribute må kun indeholde bogstaver.",
- "alpha_dash" => ":attribute må kun indeholde bogstaver, tal eller bindestreger.",
- "alpha_num" => ":attribute må kun indeholde bogstaver eller tal.",
- "before" => ":attribute skal være en dato før :date.",
- "between" => array(
- "numeric" => ":attribute skal være imellem :min - :max.",
- "file" => ":attribute skal være imellem :min - :max kilobytes.",
- "string" => ":attribute skal være imellem :min - :max tegn.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => ":attribute er ikke en gyldig dato.",
- "date_format" => ":attribute svarer ikke til formatet :format.",
- "different" => ":attribute og :other skal være forskellige.",
- "digits" => ":attribute skal være :digits cifre.",
- "digits_between" => ":attribute skal være imellem :min og :max cifre.",
- "email" => ":attribute formatet er ugylidgt.",
- "exists" => "Den valgte :attribute er ugyldig.",
- "email_array" => "En eller flere email-adresser er ugyldige.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute skal være et billede.",
- "in" => "Det valgte :attribute er ugyldigt.",
- "integer" => ":attribute skal være et heltal.",
- "ip" => ":attribute skal være en gyldig IP adresse.",
- "max" => array(
- "numeric" => ":attribute må ikke overstige :max.",
- "file" => ":attribute må ikke overstige :max. kilobytes.",
- "string" => ":attribute må ikke overstige :max. tegn.",
- ),
- "mimes" => ":attribute skal være en fil af typen: :values.",
- "min" => array(
- "numeric" => ":attribute skal mindst være :min.",
- "file" => ":attribute skal mindst være :min kilobytes.",
- "string" => ":attribute skal mindst være :min tegn.",
- ),
- "not_in" => "Den valgte :attribute er ugyldig.",
- "numeric" => ":attribute skal være et tal.",
- "regex" => ":attribute formatet er ugyldigt.",
- "required" => ":attribute feltet er krævet.",
- "required_if" => ":attribute feltet er krævet når :other er :value.",
- "required_with" => ":attribute er krævet når :values forekommer.",
- "required_without" => ":attribute er krævet når :values ikke forekommer.",
- "same" => ":attribute og :other skal være ens.",
- "size" => array(
- "numeric" => ":attribute skal være :size.",
- "file" => ":attribute skal være :size kilobytes.",
- "string" => ":attribute skal være :size tegn.",
- ),
- "unique" => ":attribute er allerede taget.",
- "url" => ":attribute formatet er ugyldigt.",
- "statuslabel_type" => "Du skal vælge en gyldig statusmærke type",
- "unique_undeleted" => ":attribute skal være unik.",
+ 'accepted' => ':attribute skal være accepteret.',
+ 'active_url' => ':attribute er ikke en gyldig URL.',
+ 'after' => ':attribute skal være en dato efter :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute må kun indeholde bogstaver.',
+ 'alpha_dash' => ':attribute må kun indeholde bogstaver, tal eller bindestreger.',
+ 'alpha_num' => ':attribute må kun indeholde bogstaver eller tal.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute skal være en dato før :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute skal være imellem :min - :max.',
+ 'file' => ':attribute skal være imellem :min - :max kilobytes.',
+ 'string' => ':attribute skal være imellem :min - :max tegn.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => ':attribute er ikke en gyldig dato.',
+ 'date_format' => ':attribute svarer ikke til formatet :format.',
+ 'different' => ':attribute og :other skal være forskellige.',
+ 'digits' => ':attribute skal være :digits cifre.',
+ 'digits_between' => ':attribute skal være imellem :min og :max cifre.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute formatet er ugylidgt.',
+ 'exists' => 'Den valgte :attribute er ugyldig.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute skal være et billede.',
+ 'in' => 'Det valgte :attribute er ugyldigt.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute skal være et heltal.',
+ 'ip' => ':attribute skal være en gyldig IP adresse.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute må ikke overstige :max.',
+ 'file' => ':attribute må ikke overstige :max. kilobytes.',
+ 'string' => ':attribute må ikke overstige :max. tegn.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute skal være en fil af typen: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute skal mindst være :min.',
+ 'file' => ':attribute skal mindst være :min kilobytes.',
+ 'string' => ':attribute skal mindst være :min tegn.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Den valgte :attribute er ugyldig.',
+ 'numeric' => ':attribute skal være et tal.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute formatet er ugyldigt.',
+ 'required' => ':attribute feltet er krævet.',
+ 'required_if' => ':attribute feltet er krævet når :other er :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute er krævet når :values forekommer.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute er krævet når :values ikke forekommer.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute og :other skal være ens.',
+ 'size' => [
+ 'numeric' => ':attribute skal være :size.',
+ 'file' => ':attribute skal være :size kilobytes.',
+ 'string' => ':attribute skal være :size tegn.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute er allerede taget.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute formatet er ugyldigt.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => ":attribute feltet indeholder en karakter der ikke er tilladt.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/de/admin/asset_maintenances/message.php b/resources/lang/de/admin/asset_maintenances/message.php
index b5ab75d6cd..3c12c35b0c 100644
--- a/resources/lang/de/admin/asset_maintenances/message.php
+++ b/resources/lang/de/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Wartungsvertrag erfolgreich erstellt.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Wartungsvertrag noch nicht komplett ausgefüllt',
'warranty' => 'Garantie',
diff --git a/resources/lang/de/admin/custom_fields/message.php b/resources/lang/de/admin/custom_fields/message.php
index 3aa0d78261..0762ec1d5f 100644
--- a/resources/lang/de/admin/custom_fields/message.php
+++ b/resources/lang/de/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(
'fieldset' => array(
- 'does_not_exist' => 'Fieldset does not exist',
+ 'does_not_exist' => 'Feldsatz existiert nicht',
'create' => array(
'error' => 'Feldsatz wurde nicht erstellt. Bitte erneut versuchen.',
diff --git a/resources/lang/de/admin/hardware/general.php b/resources/lang/de/admin/hardware/general.php
index 06eb298cf1..b6d9ed0309 100644
--- a/resources/lang/de/admin/hardware/general.php
+++ b/resources/lang/de/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Assets an Benutzer herausgeben',
'checkin' => 'Asset zurücknehmen',
- 'checkout' => 'Asset an Benutzer herausgeben',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Asset duplizieren',
'deployable' => 'Einsetzbar',
'deleted' => 'Dieses Asset wurde gelöscht. Zur Wiederherstellung hier klicken.',
diff --git a/resources/lang/de/admin/hardware/message.php b/resources/lang/de/admin/hardware/message.php
index a5647df064..4c350adeda 100644
--- a/resources/lang/de/admin/hardware/message.php
+++ b/resources/lang/de/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset erfolgreich wiederhergestellt.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Datei wurde nicht gelöscht. Bitte noch einmal Probieren.',
'success' => 'Datei erfolgreich gelöscht.',
diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php
index 209992f19e..4cf6644299 100644
--- a/resources/lang/de/admin/settings/general.php
+++ b/resources/lang/de/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Ablauf Alarmschwelle (in Tagen)',
'alert_inv_threshold' => 'Inventar Alarmschwelle',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Erzeugen von fortlaufenden Asset IDs',
'auto_increment_prefix' => 'Präfix (optional)',
'auto_incrementing_help' => 'Aktiviere zuerst fortlaufende Asset IDs um dies zu setzen',
@@ -63,8 +67,8 @@ return array(
'ldap_email' => 'LDAP E-Mail',
'load_remote_text' => 'Remote Skripte',
'load_remote_help_text' => 'Diese Installation von Snipe-IT kann Skripte von außerhalb laden.',
- '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_note' => 'Anmeldenotiz',
+ 'login_note_help' => 'Fügen Sie optional ein paar Sätze zu Ihrem Anmeldebildschirm hinzu, beispielsweise um Personen zu helfen, welche ein verlorenes oder gestohlenes Gerät gefunden haben. Dieses Feld akzeptiert Github flavored markdown',
'logo' => 'Logo',
'full_multiple_companies_support_help_text' => 'Beschränkung von Benutzern (inklusive Administratoren) die einer Firma zugewiesen sind zu den Assets der Firma.',
'full_multiple_companies_support_text' => 'Volle Mehrmandanten-Unterstützung für Firmen',
@@ -73,12 +77,12 @@ return array(
'php' => 'PHP Version',
'php_gd_info' => 'Um QR-Codes anzeigen zu können muss php-gd installiert sein, siehe Installationshinweise.',
'php_gd_warning' => 'PHP Image Processing and GD Plugin ist NICHT installiert.',
- 'pwd_secure_complexity' => 'Password Complexity',
- 'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
- 'pwd_secure_min' => 'Password minimum characters',
- 'pwd_secure_min_help' => 'Minimum permitted value is 5',
- 'pwd_secure_uncommon' => 'Prevent common passwords',
- 'pwd_secure_uncommon_help' => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
+ 'pwd_secure_complexity' => 'Passwortkomplexität',
+ 'pwd_secure_complexity_help' => 'Wählen Sie aus, welche Komplexitätsregeln Sie für Passwörter erzwingen möchten.',
+ 'pwd_secure_min' => 'Minimale Passwortlänge',
+ 'pwd_secure_min_help' => 'Minimal zulässiger Wert ist 5',
+ 'pwd_secure_uncommon' => 'Gebräuchliche Passwörter verhindern',
+ 'pwd_secure_uncommon_help' => 'Verhindert die Verwendung der 10.000 häufigsten Passwörter aus im Internet geleakten Quellen.',
'qr_help' => 'Schalte zuerst QR Codes an um dies zu setzen',
'qr_text' => 'QR Code Text',
'setting' => 'Einstellung',
@@ -113,8 +117,8 @@ return array(
'width_w' => 'b',
'height_h' => 'h',
'text_pt' => 'pt',
- 'thumbnail_max_h' => 'Max thumbnail height',
- 'thumbnail_max_h_help' => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
+ 'thumbnail_max_h' => 'Maximale Höhe der Miniaturansicht',
+ 'thumbnail_max_h_help' => 'Maximale Höhe für Miniaturansichten in der Listenansicht in Pixel. Min. 25, Max. 500.',
'two_factor' => 'Zwei-Faktor-Authentifizierung',
'two_factor_secret' => 'Zwei-Faktor Code',
'two_factor_enrollment' => 'Zwei-Faktor Registrierung',
diff --git a/resources/lang/de/admin/users/general.php b/resources/lang/de/admin/users/general.php
index eea36cca58..150420d691 100644
--- a/resources/lang/de/admin/users/general.php
+++ b/resources/lang/de/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, und rar.',
'history_user' => 'Historie von :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Letzte Anmeldung',
'ldap_config_text' => 'Die LDAP Konfigurations Einstellungen finden Sie hier Admin -> Einstellungen. Der (optional) wählbare Standort wird für alle importierten Benutzer gesetzt.',
'software_user' => 'Software herausgegeben an :name',
diff --git a/resources/lang/de/admin/users/message.php b/resources/lang/de/admin/users/message.php
index 2ea15c4d97..4b3fee8eb7 100644
--- a/resources/lang/de/admin/users/message.php
+++ b/resources/lang/de/admin/users/message.php
@@ -31,7 +31,7 @@ return array(
'create' => 'Beim Erstellen des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
'update' => 'Beim Aktualisieren des Benutzers ist ein Fehler aufgetreten. Bitte probieren Sie es noch einmal.',
'delete' => 'Beim Entfernen des Benutzers ist ein Fehler aufgetreten. Bitte versuchen Sie es erneut.',
- 'delete_has_assets' => 'This user has items assigned and could not be deleted.',
+ 'delete_has_assets' => 'Der Benutzer konnte nicht gelöscht werden, da ihm Gegenstände zugeordnet sind.',
'unsuspend' => 'Es gab ein Problem beim reaktivieren des Benutzers. Bitte versuche es erneut.',
'import' => 'Es gab ein Problem beim importieren der Benutzer. Bitte noch einmal versuchen.',
'asset_already_accepted' => 'Dieses Asset wurde bereits akzeptiert.',
@@ -41,7 +41,7 @@ return array(
'ldap_could_not_bind' => 'Konnte keine Verbindung zum LDAP Server herstellen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server: ',
'ldap_could_not_search' => 'Konnte LDAP Server nicht suchen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:',
'ldap_could_not_get_entries' => 'Konnte keine Einträge vom LDAP Server abrufen. Bitte LDAP Einstellungen in der LDAP Konfigurationsdatei prüfen.
Fehler vom LDAP Server:',
- 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'password_ldap' => 'Das Passwort für diesen Account wird vom LDAP/Active Directory verwaltet. Bitte kontaktieren Sie Ihre IT-Abteilung, um Ihr Passwort zu ändern. ',
),
'deletefile' => array(
diff --git a/resources/lang/de/admin/users/table.php b/resources/lang/de/admin/users/table.php
index 0af2e7a915..92d1c1d167 100644
--- a/resources/lang/de/admin/users/table.php
+++ b/resources/lang/de/admin/users/table.php
@@ -19,7 +19,7 @@ return array(
'location' => 'Ort',
'lock_passwords' => 'Die Login-Daten können auf dieser Installation nicht geändert werden.',
'manager' => 'Manager',
- 'managed_locations' => 'Managed Locations',
+ 'managed_locations' => 'Verwaltete Standorte',
'name' => 'Name',
'notes' => 'Notizen',
'password_confirm' => 'Kennwort bestätigen',
diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php
index 7c385b5be6..c8ba8e677f 100644
--- a/resources/lang/de/general.php
+++ b/resources/lang/de/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Bericht',
'asset_tag' => 'Asset Tag',
'assets_available' => 'verfügbare Assets',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Avatar löschen',
'avatar_upload' => 'Avatar hochladen',
'back' => 'Zurück',
'bad_data' => 'Nichts gefunden. Vielleicht defekte Daten?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Massen-Checkout',
'cancel' => 'Abbrechen',
'categories' => 'Kategorien',
@@ -52,6 +56,8 @@
'current' => 'Aktuell',
'custom_report' => 'Spezieller Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Purchase Date',
'debug_warning' => 'Warnung!',
'debug_warning_text' => 'Diese Anwendung läuft im Produktionsmodus mit debugging aktiviert. Dies kann sensible Daten verfügbar machen, wenn Ihre Anwendung öffentlich zugänglich ist. Deaktivieren Sie den Debug-Modus, indem Sie den APP_DEBUG-Wert in der .env Datei auf false setzen.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Mehr Informationen',
'name' => 'Location Name',
'next' => 'Nächstes',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'Neu!',
'no_depreciation' => 'Do Not Depreciate',
'no_results' => 'Keine Treffer.',
diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php
index 10d4dec75e..6f0822db3b 100644
--- a/resources/lang/de/validation.php
+++ b/resources/lang/de/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute muss akzeptiert werden.",
- "active_url" => ":attribute ist keine gültige URL.",
- "after" => ":attribute muss ein Datum nach dem :date sein.",
- "alpha" => ":attribute darf nur aus Buchstaben bestehen.",
- "alpha_dash" => ":attribute darf nur aus Buchstaben, Zahlen und Gedankenstrichen bestehen.",
- "alpha_num" => ":attribute darf nur aus Buchstaben und Zahlen bestehen.",
- "before" => ":attribute muss ein Datum vor dem :date sein.",
- "between" => array(
- "numeric" => ":attribute muss zwischen :min und :max liegen.",
- "file" => ":attribute darf nur zwischen :min und :max kilobytes groß sein.",
- "string" => ":attribute muss mindestens :min und maximal :max Zeichen enthalten.",
- ),
- "boolean" => ":attribute muss wahr oder falsch sein.",
- "confirmed" => ":attribute Bestätigung stimmt nicht überein.",
- "date" => ":attribute ist kein gültiges Datum.",
- "date_format" => ":attribute passt nicht zur :format Formatierung.",
- "different" => ":attribute und :other müssen sich unterscheiden.",
- "digits" => ":attribute muss :digits Stellen haben.",
- "digits_between" => ":attribute soll mindestens :min und darf maximal :max Stellen haben.",
- "email" => "Das Format von :attribute ist ungültig.",
- "exists" => "Das ausgewählte :attribute ist ungültig.",
- "email_array" => "Eine oder mehrere Email Adressen sind ungültig.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute muss ein Bild sein.",
- "in" => "Auswahl :attribute ist ungültig.",
- "integer" => ":attribute muss eine ganze Zahl sein.",
- "ip" => ":attribute muss eine gültige IP Adresse sein.",
- "max" => array(
- "numeric" => ":attribute darf nicht größer als :max sein.",
- "file" => ":attribute darf nicht größer als :max Kilobyte sein.",
- "string" => ":attribute darf nicht mehr als :max Zeichen sein.",
- ),
- "mimes" => ":attribute muss eine Datei des Typs :values sein.",
- "min" => array(
- "numeric" => ":attribute muss kleiner als :min sein.",
- "file" => ":attribute muss mindestens :min Kilobyte groß sein.",
- "string" => ":attribute benötigt mindestens :min Zeichen.",
- ),
- "not_in" => "Auswahl :attribute ist ungültig.",
- "numeric" => ":attribute muss eine Zahl sein.",
- "regex" => ":attribute Format ungültig.",
- "required" => ":attribute Feld muss ausgefüllt sein.",
- "required_if" => ":attribute wird benötigt wenn :other :value entspricht.",
- "required_with" => ":attribute wird benötigt wenn :value ausgewählt ist.",
- "required_without" => ":attribute wird benötigt wenn :value nicht ausgewählt ist.",
- "same" => ":attribute und :other müssen übereinstimmen.",
- "size" => array(
- "numeric" => ":attribute muss :size groß sein.",
- "file" => ":attribute muss :size Kilobyte groß sein.",
- "string" => ":attribute muss :size Zeichen haben.",
- ),
- "unique" => ":attribute schon benutzt.",
- "url" => ":attribute Format ist ungültig.",
- "statuslabel_type" => "Gültigen Status Beschriftungstyp auswählen!",
- "unique_undeleted" => ":attribute muss eindeutig sein.",
+ 'accepted' => ':attribute muss akzeptiert werden.',
+ 'active_url' => ':attribute ist keine gültige URL.',
+ 'after' => ':attribute muss ein Datum nach dem :date sein.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute darf nur aus Buchstaben bestehen.',
+ 'alpha_dash' => ':attribute darf nur aus Buchstaben, Zahlen und Gedankenstrichen bestehen.',
+ 'alpha_num' => ':attribute darf nur aus Buchstaben und Zahlen bestehen.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute muss ein Datum vor dem :date sein.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute muss zwischen :min und :max liegen.',
+ 'file' => ':attribute darf nur zwischen :min und :max kilobytes groß sein.',
+ 'string' => ':attribute muss mindestens :min und maximal :max Zeichen enthalten.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute muss wahr oder falsch sein.',
+ 'confirmed' => ':attribute Bestätigung stimmt nicht überein.',
+ 'date' => ':attribute ist kein gültiges Datum.',
+ 'date_format' => ':attribute passt nicht zur :format Formatierung.',
+ 'different' => ':attribute und :other müssen sich unterscheiden.',
+ 'digits' => ':attribute muss :digits Stellen haben.',
+ 'digits_between' => ':attribute soll mindestens :min und darf maximal :max Stellen haben.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Das Format von :attribute ist ungültig.',
+ 'exists' => 'Das ausgewählte :attribute ist ungültig.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute muss ein Bild sein.',
+ 'in' => 'Auswahl :attribute ist ungültig.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute muss eine ganze Zahl sein.',
+ 'ip' => ':attribute muss eine gültige IP Adresse sein.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute darf nicht größer als :max sein.',
+ 'file' => ':attribute darf nicht größer als :max Kilobyte sein.',
+ 'string' => ':attribute darf nicht mehr als :max Zeichen sein.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute muss eine Datei des Typs :values sein.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute muss kleiner als :min sein.',
+ 'file' => ':attribute muss mindestens :min Kilobyte groß sein.',
+ 'string' => ':attribute benötigt mindestens :min Zeichen.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Auswahl :attribute ist ungültig.',
+ 'numeric' => ':attribute muss eine Zahl sein.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute Format ungültig.',
+ 'required' => ':attribute Feld muss ausgefüllt sein.',
+ 'required_if' => ':attribute wird benötigt wenn :other :value entspricht.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute wird benötigt wenn :value ausgewählt ist.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute wird benötigt wenn :value nicht ausgewählt ist.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute und :other müssen übereinstimmen.',
+ 'size' => [
+ 'numeric' => ':attribute muss :size groß sein.',
+ 'file' => ':attribute muss :size Kilobyte groß sein.',
+ 'string' => ':attribute muss :size Zeichen haben.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute schon benutzt.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute Format ist ungültig.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Das :attribute Feld enthält ein nicht erlaubtes Zeichen.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/el/admin/accessories/message.php b/resources/lang/el/admin/accessories/message.php
index 56222c4484..04b059f48f 100644
--- a/resources/lang/el/admin/accessories/message.php
+++ b/resources/lang/el/admin/accessories/message.php
@@ -6,19 +6,19 @@ return array(
'assoc_users' => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
'create' => array(
- 'error' => 'The accessory was not created, please try again.',
+ 'error' => 'Το εξάρτημα δεν δημιουργήθηκε, παρακαλώ προσπαθήστε ξανά.',
'success' => 'Το εξάρτημα δημιουργήθηκε με επιτυχία.'
),
'update' => array(
- 'error' => 'The accessory was not updated, please try again',
- 'success' => 'The accessory was updated successfully.'
+ 'error' => 'Το εξάρτημα δεν ενημερώθηκε, παρακαλώ προσπαθήστε ξανά',
+ 'success' => 'Το εξάρτημα ενημερώθηκε με επιτυχία.'
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this accessory?',
+ 'confirm' => 'Είστε σίγουροι ότι θέλετε να διαγράψετε αυτό το εξάρτημα;',
'error' => 'Υπήρξε ένα ζήτημα διαγράφοντας το αξεσουάρ. Παρακαλώ δοκιμάστε ξανά.',
- 'success' => 'The accessory was deleted successfully.'
+ 'success' => 'Το εξάρτημα διαγράφηκε με επιτυχία.'
),
'checkout' => array(
diff --git a/resources/lang/el/admin/asset_maintenances/message.php b/resources/lang/el/admin/asset_maintenances/message.php
index d5609e78fb..ad4af89a6a 100644
--- a/resources/lang/el/admin/asset_maintenances/message.php
+++ b/resources/lang/el/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Επιτυχής δημιουργία συντήρησης παγίου.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Δεν ολοκληρώθηκε ακόμη',
'warranty' => 'Εγγύηση',
diff --git a/resources/lang/el/admin/categories/general.php b/resources/lang/el/admin/categories/general.php
index a8adbc5dea..a7819516b2 100644
--- a/resources/lang/el/admin/categories/general.php
+++ b/resources/lang/el/admin/categories/general.php
@@ -6,7 +6,7 @@ return array(
'asset_categories' => 'Κατηγορίες στοιχείων παγίων',
'category_name' => 'Όνομα κατηγορίας',
'checkin_email' => 'Send email to user on checkin.',
- 'clone' => 'Clone Category',
+ 'clone' => 'Αντιγραφή Κατηγορίας',
'create' => 'Δημιουργία Κατηγορίας',
'edit' => 'Επεξεργασία Κατηγορίας',
'eula_text' => 'Category EULA',
@@ -16,7 +16,7 @@ return array(
'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',
+ 'update' => 'Ενημέρωση Κατηγορίας',
'use_default_eula' => 'Χρησιμοποιήστε την προεπιλεγμένη primary EULA.',
'use_default_eula_disabled' => 'Use the primary default EULA instead. No primary default EULA is set. Please add one in Settings.',
diff --git a/resources/lang/el/admin/hardware/general.php b/resources/lang/el/admin/hardware/general.php
index 0e3a1539dc..9e0e761939 100644
--- a/resources/lang/el/admin/hardware/general.php
+++ b/resources/lang/el/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Πάγιο',
'bulk_checkout' => 'Checkout παγίων σε χρήστη',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Κλώνος χρήστη',
'deployable' => 'Προς ανάπτυξη',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/el/admin/hardware/message.php b/resources/lang/el/admin/hardware/message.php
index d490fd3d93..68a8d71330 100644
--- a/resources/lang/el/admin/hardware/message.php
+++ b/resources/lang/el/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Τα πάγια επαναφέρθηκαν επιτυχώς.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Το αρχείο δεν έχει διαγραφεί. Παρακαλώ δοκιμάστε ξανά.',
'success' => 'Το αρχείο διαγράφηκε με επιτυχία.',
diff --git a/resources/lang/el/admin/settings/general.php b/resources/lang/el/admin/settings/general.php
index 26f66ee9a0..d2a10c72ce 100644
--- a/resources/lang/el/admin/settings/general.php
+++ b/resources/lang/el/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Ειδοποιήση ορίου αποθήκης',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Πρόθεμα (μη υποχρεωτικό)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/el/admin/users/general.php b/resources/lang/el/admin/users/general.php
index c7cbaa5158..fe8211afba 100644
--- a/resources/lang/el/admin/users/general.php
+++ b/resources/lang/el/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'Ιστορικό: όνομα',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Τελευταία σύνδεση',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php
index 59571b573b..3b7701a431 100644
--- a/resources/lang/el/general.php
+++ b/resources/lang/el/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Αναφορά παγίων',
'asset_tag' => 'Ετικέτα παγίων',
'assets_available' => 'διαθέσιμα πάγια',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Πάγια',
'avatar_delete' => 'Διαγραφή Avatar',
'avatar_upload' => 'Ανεβάστε την εικόνα προφίλ σας',
'back' => 'Προηγούμενο',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Ακύρωση',
'categories' => 'Kατηγορίες',
@@ -52,6 +56,8 @@
'current' => 'Τρέχουσα',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Πίνακας ελέγχου',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Ημερομηνία',
'debug_warning' => 'Προσοχή!',
'debug_warning_text' => 'Αυτή η εφαρμογή εκτελείται σε λειτουργία παραγωγής με ενεργοποιημένο τον εντοπισμό σφαλμάτων. Αυτό μπορεί να εκθέσει τα ευαίσθητα δεδομένα, εάν η εφαρμογή σας είναι προσβάσιμη στον έξω κόσμο. Απενεργοποιήσετε την κατάσταση λειτουργίας εντοπισμού σφαλμάτων, ορίζοντας την τιμή APP_DEBUG στο αρχείο .env για να false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Περισσότερες Πληροφορίες',
'name' => 'Όνομα',
'next' => 'Επόμενο',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'νεό!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'Δεν βρέθηκαν αποτελέσματα.',
diff --git a/resources/lang/el/validation.php b/resources/lang/el/validation.php
index b64e50009d..43de91f701 100644
--- a/resources/lang/el/validation.php
+++ b/resources/lang/el/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "Το: χαρακτηριστικό πρέπει να γίνει δεκτό.",
- "active_url" => "Η: το χαρακτηριστικό δεν έχει έγκυρη διεύθυνση URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "Η: το χαρακτηριστικό μπορεί να περιέχει μόνο γράμματα.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "Το χαρακτηριστικό πρέπει να είναι μεταξύ: min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "Το: χαρακτηριστικό πρέπει να είναι μια εικόνα.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => 'Το: χαρακτηριστικό πρέπει να γίνει δεκτό.',
+ 'active_url' => 'Η: το χαρακτηριστικό δεν έχει έγκυρη διεύθυνση 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' => 'Η: το χαρακτηριστικό μπορεί να περιέχει μόνο γράμματα.',
+ 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.',
+ 'alpha_num' => 'The :attribute may only contain letters and numbers.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'Το χαρακτηριστικό πρέπει να είναι μεταξύ: min - :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'Το: χαρακτηριστικό πρέπει να είναι μια εικόνα.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Το επιλεγμένο: χαρακτηριστικό δεν είναι έγκυρο.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/en-GB/admin/asset_maintenances/message.php b/resources/lang/en-GB/admin/asset_maintenances/message.php
index 83fbf698d6..d121115825 100644
--- a/resources/lang/en-GB/admin/asset_maintenances/message.php
+++ b/resources/lang/en-GB/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'Warranty',
diff --git a/resources/lang/en-GB/admin/hardware/general.php b/resources/lang/en-GB/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/en-GB/admin/hardware/general.php
+++ b/resources/lang/en-GB/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/en-GB/admin/hardware/message.php b/resources/lang/en-GB/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/en-GB/admin/hardware/message.php
+++ b/resources/lang/en-GB/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/en-GB/admin/settings/general.php b/resources/lang/en-GB/admin/settings/general.php
index 6fd0399024..bb12b53538 100644
--- a/resources/lang/en-GB/admin/settings/general.php
+++ b/resources/lang/en-GB/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/en-GB/admin/users/general.php b/resources/lang/en-GB/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/en-GB/admin/users/general.php
+++ b/resources/lang/en-GB/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index 2e1d0250b4..78bbbd6881 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Back',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Cancel',
'categories' => 'Categories',
@@ -52,6 +56,8 @@
'current' => 'Current',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'More Info',
'name' => 'Name',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/en-GB/validation.php b/resources/lang/en-GB/validation.php
index 7a26a6515f..1e902ebbbd 100644
--- a/resources/lang/en-GB/validation.php
+++ b/resources/lang/en-GB/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min - :max.',
+ 'file' => 'The :attribute must be between :min - :max kilobytes.',
+ 'string' => 'The :attribute must be between :min - :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute format is invalid.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/en-ID/admin/asset_maintenances/message.php b/resources/lang/en-ID/admin/asset_maintenances/message.php
index 5aa13d79c2..8fe4ac8486 100644
--- a/resources/lang/en-ID/admin/asset_maintenances/message.php
+++ b/resources/lang/en-ID/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Pemeliharaan Aset berhasil dibuat.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Belum selesai',
'warranty' => 'Jaminan',
diff --git a/resources/lang/en-ID/admin/hardware/general.php b/resources/lang/en-ID/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/en-ID/admin/hardware/general.php
+++ b/resources/lang/en-ID/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/en-ID/admin/hardware/message.php b/resources/lang/en-ID/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/en-ID/admin/hardware/message.php
+++ b/resources/lang/en-ID/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/en-ID/admin/settings/general.php b/resources/lang/en-ID/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/en-ID/admin/settings/general.php
+++ b/resources/lang/en-ID/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/en-ID/admin/users/general.php b/resources/lang/en-ID/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/en-ID/admin/users/general.php
+++ b/resources/lang/en-ID/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index 45b26dccf7..3c688aada1 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Back',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Cancel',
'categories' => 'Categories',
@@ -52,6 +56,8 @@
'current' => 'Current',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'More Info',
'name' => 'Name',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/en-ID/validation.php b/resources/lang/en-ID/validation.php
index 7a26a6515f..1e902ebbbd 100644
--- a/resources/lang/en-ID/validation.php
+++ b/resources/lang/en-ID/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min - :max.',
+ 'file' => 'The :attribute must be between :min - :max kilobytes.',
+ 'string' => 'The :attribute must be between :min - :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute format is invalid.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php
index 02cb1fa981..1e902ebbbd 100644
--- a/resources/lang/en/validation.php
+++ b/resources/lang/en/validation.php
@@ -24,12 +24,12 @@ return array(
'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [
- 'numeric' => 'The :attribute must be between :min and :max.',
- 'file' => 'The :attribute must be between :min and :max kilobytes.',
- 'string' => 'The :attribute must be between :min and :max characters.',
+ 'numeric' => 'The :attribute must be between :min - :max.',
+ 'file' => 'The :attribute must be between :min - :max kilobytes.',
+ 'string' => 'The :attribute must be between :min - :max characters.',
'array' => 'The :attribute must have between :min and :max items.',
],
- 'boolean' => 'The :attribute field must be true or false.',
+ 'boolean' => 'The :attribute must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.',
'date' => 'The :attribute is not a valid date.',
'date_format' => 'The :attribute does not match the format :format.',
@@ -38,7 +38,7 @@ return array(
'digits_between' => 'The :attribute must be between :min and :max digits.',
'dimensions' => 'The :attribute has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
- 'email' => 'The :attribute must be a valid email address.',
+ 'email' => 'The :attribute format is invalid.',
'exists' => 'The selected :attribute is invalid.',
'file' => 'The :attribute must be a file.',
'filled' => 'The :attribute field must have a value.',
diff --git a/resources/lang/es-CO/admin/asset_maintenances/message.php b/resources/lang/es-CO/admin/asset_maintenances/message.php
index 1914c96947..e1ef11e4e8 100644
--- a/resources/lang/es-CO/admin/asset_maintenances/message.php
+++ b/resources/lang/es-CO/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Mantenimiento de Activo creado correctamente.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Sin Completar',
'warranty' => 'Garantía',
diff --git a/resources/lang/es-CO/admin/departments/message.php b/resources/lang/es-CO/admin/departments/message.php
index b13062b3d1..740b38b39d 100644
--- a/resources/lang/es-CO/admin/departments/message.php
+++ b/resources/lang/es-CO/admin/departments/message.php
@@ -2,7 +2,7 @@
return array(
- 'does_not_exist' => 'Department does not exist.',
+ 'does_not_exist' => 'El departamento no existe.',
'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
'create' => array(
'error' => 'Department was not created, please try again.',
diff --git a/resources/lang/es-CO/admin/hardware/general.php b/resources/lang/es-CO/admin/hardware/general.php
index c0f47cc577..16d2083afc 100644
--- a/resources/lang/es-CO/admin/hardware/general.php
+++ b/resources/lang/es-CO/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Equipo',
'bulk_checkout' => 'Asignar activos a un usuario',
'checkin' => 'Quitar Equipo',
- 'checkout' => 'Asignar a un usuario',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clonar Equipo',
'deployable' => 'Desplegable',
'deleted' => 'Este equipo ha sido eliminado. Click aqui para restaurarlot.',
diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php
index 8d85244a84..96c3b9a6dd 100644
--- a/resources/lang/es-CO/admin/hardware/message.php
+++ b/resources/lang/es-CO/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Equipo restaurado correctamente.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
'success' => 'Archivo eliminado correctamente.',
diff --git a/resources/lang/es-CO/admin/settings/general.php b/resources/lang/es-CO/admin/settings/general.php
index e0a350227f..d6dbb8a90c 100644
--- a/resources/lang/es-CO/admin/settings/general.php
+++ b/resources/lang/es-CO/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Limite de alertas de expiración (en días)',
'alert_inv_threshold' => 'Umbral de alerta del inventario',
'asset_ids' => 'IDs de Recurso',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generar IDs de equipo autoincrementales',
'auto_increment_prefix' => 'Prefijo (opcional)',
'auto_incrementing_help' => 'Activa la generación automática de IDs de equipo antes de configurar esto',
diff --git a/resources/lang/es-CO/admin/users/general.php b/resources/lang/es-CO/admin/users/general.php
index ddec4b4d3b..ea715cd169 100644
--- a/resources/lang/es-CO/admin/users/general.php
+++ b/resources/lang/es-CO/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
'history_user' => 'Historial de :name',
'info' => 'Información',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Último acceso',
'ldap_config_text' => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.',
'software_user' => 'Software asignado a :name',
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index 84a686d0f5..25857fc6d0 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Reporte de Equipos',
'asset_tag' => 'Etiqueta',
'assets_available' => 'equipos disponibles',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Equipos',
'avatar_delete' => 'Eliminar Avatar',
'avatar_upload' => 'Subir Avatar',
'back' => 'Atras',
'bad_data' => 'Ningún resultado. ¿Quizá un dato incorrecto?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Procesar en Lote',
'cancel' => 'Cancelar',
'categories' => 'Categorías',
@@ -52,6 +56,8 @@
'current' => 'Actual',
'custom_report' => 'Reporte de Equipos Personalizado',
'dashboard' => 'Tablero',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Fecha Compra',
'debug_warning' => '¡Advertencia!',
'debug_warning_text' => 'Esta aplicación esta corriendo en modo producción con debugging activado. Esto puede exponer datos sensibles si su aplicación es accesible desde el exterior. Desactive el modo debug cambiando el valor APP_DEBUG en su archivo .env a false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Más Info',
'name' => 'Nombre Localización',
'next' => 'Siguiente',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'nuevo!',
'no_depreciation' => 'No Amortizar',
'no_results' => 'Sin Resultados.',
diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php
index e31c1dcfc1..5c3a3cb37e 100644
--- a/resources/lang/es-CO/validation.php
+++ b/resources/lang/es-CO/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute debe ser aceptado.",
- "active_url" => ":attribute no es una URL correcta.",
- "after" => ":attribute debe ser posterior a :date.",
- "alpha" => ":attribute solo acepta letras.",
- "alpha_dash" => ":attribute solo acepta letras, números y guiones.",
- "alpha_num" => ":attribute solo acepta letras y números.",
- "before" => ":attribute debe ser anterior a :date.",
- "between" => array(
- "numeric" => ":attribute debe estar entre :min - :max.",
- "file" => ":attribute debe estar entre :min - :max kilobytes.",
- "string" => ":attribute debe estar entre :min - :max caracteres.",
- ),
- "boolean" => ":attribute debe ser verdadero o falso.",
- "confirmed" => ":attribute la confirmación no coincide.",
- "date" => ":attribute no es una fecha correcta.",
- "date_format" => ":attribute no cumple el formato :format.",
- "different" => ":attribute y :other deben ser diferentes.",
- "digits" => ":attribute debe tener :digits dígitos.",
- "digits_between" => ":attribute debe tener entre :min y :max dígitos.",
- "email" => ":attribute formato incorrecto.",
- "exists" => "El :attribute seleccionado no es correcto.",
- "email_array" => "Una o más direcciones de correo electrónico no es válido.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute debe ser una imagen.",
- "in" => "El :attribute seleccionado no es correcto.",
- "integer" => ":attribute debe ser un número entero.",
- "ip" => ":attribute debe ser una dirección IP correcta.",
- "max" => array(
- "numeric" => ":attribute no debe ser mayor que :max.",
- "file" => ":attribute no debe ser mayor que :max kilobytes.",
- "string" => ":attribute no debe tener como máximo :max caracteres.",
- ),
- "mimes" => ":attribute debe ser un archivo del tipo: :values.",
- "min" => array(
- "numeric" => ":attribute debe ser como mínimo :min.",
- "file" => ":attribute debe ser como mínimo de :min kilobytes.",
- "string" => ":attribute debe contener como mínimo :min caracteres.",
- ),
- "not_in" => "El :attribute seleccionado no es correcto.",
- "numeric" => ":attribute debe ser un número.",
- "regex" => ":attribute formato incorrecto.",
- "required" => ":attribute es obligatorio.",
- "required_if" => ":attribute es obligatrio cuando :other es :value.",
- "required_with" => ":attribute es obligatrio cuando :values es present.",
- "required_without" => ":attribute es obligatrio cuando :values es not present.",
- "same" => ":attribute y :other deben coincidir.",
- "size" => array(
- "numeric" => ":attribute debe tener :size.",
- "file" => ":attribute debe tener :size kilobytes.",
- "string" => ":attribute debe tener :size caracteres.",
- ),
- "unique" => ":attribute ya ha sido introducido.",
- "url" => ":attribute formato incorrecto.",
- "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido",
- "unique_undeleted" => ":attribute debe ser único.",
+ 'accepted' => ':attribute debe ser aceptado.',
+ 'active_url' => ':attribute no es una URL correcta.',
+ 'after' => ':attribute debe ser posterior a :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute solo acepta letras.',
+ 'alpha_dash' => ':attribute solo acepta letras, números y guiones.',
+ 'alpha_num' => ':attribute solo acepta letras y números.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute debe ser anterior a :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute debe estar entre :min - :max.',
+ 'file' => ':attribute debe estar entre :min - :max kilobytes.',
+ 'string' => ':attribute debe estar entre :min - :max caracteres.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute debe ser verdadero o falso.',
+ 'confirmed' => ':attribute la confirmación no coincide.',
+ 'date' => ':attribute no es una fecha correcta.',
+ 'date_format' => ':attribute no cumple el formato :format.',
+ 'different' => ':attribute y :other deben ser diferentes.',
+ 'digits' => ':attribute debe tener :digits dígitos.',
+ 'digits_between' => ':attribute debe tener entre :min y :max dígitos.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute formato incorrecto.',
+ 'exists' => 'El :attribute seleccionado no es correcto.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute debe ser una imagen.',
+ 'in' => 'El :attribute seleccionado no es correcto.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute debe ser un número entero.',
+ 'ip' => ':attribute debe ser una dirección IP correcta.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute no debe ser mayor que :max.',
+ 'file' => ':attribute no debe ser mayor que :max kilobytes.',
+ 'string' => ':attribute no debe tener como máximo :max caracteres.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute debe ser un archivo del tipo: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute debe ser como mínimo :min.',
+ 'file' => ':attribute debe ser como mínimo de :min kilobytes.',
+ 'string' => ':attribute debe contener como mínimo :min caracteres.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'El :attribute seleccionado no es correcto.',
+ 'numeric' => ':attribute debe ser un número.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute formato incorrecto.',
+ 'required' => ':attribute es obligatorio.',
+ 'required_if' => ':attribute es obligatrio cuando :other es :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute es obligatrio cuando :values es present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute es obligatrio cuando :values es not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute y :other deben coincidir.',
+ 'size' => [
+ 'numeric' => ':attribute debe tener :size.',
+ 'file' => ':attribute debe tener :size kilobytes.',
+ 'string' => ':attribute debe tener :size caracteres.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute ya ha sido introducido.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute formato incorrecto.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "El campo :attribute contiene un caracter que no está permitido.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/es-ES/admin/asset_maintenances/message.php b/resources/lang/es-ES/admin/asset_maintenances/message.php
index 810e3f84f8..48953f8be7 100644
--- a/resources/lang/es-ES/admin/asset_maintenances/message.php
+++ b/resources/lang/es-ES/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'El Mantenimiento de Equipo fue creado de manera exitosa.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Sin Completar',
'warranty' => 'Garantía',
diff --git a/resources/lang/es-ES/admin/departments/message.php b/resources/lang/es-ES/admin/departments/message.php
index b13062b3d1..740b38b39d 100644
--- a/resources/lang/es-ES/admin/departments/message.php
+++ b/resources/lang/es-ES/admin/departments/message.php
@@ -2,7 +2,7 @@
return array(
- 'does_not_exist' => 'Department does not exist.',
+ 'does_not_exist' => 'El departamento no existe.',
'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
'create' => array(
'error' => 'Department was not created, please try again.',
diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php
index c0f47cc577..16d2083afc 100644
--- a/resources/lang/es-ES/admin/hardware/general.php
+++ b/resources/lang/es-ES/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Equipo',
'bulk_checkout' => 'Asignar activos a un usuario',
'checkin' => 'Quitar Equipo',
- 'checkout' => 'Asignar a un usuario',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clonar Equipo',
'deployable' => 'Desplegable',
'deleted' => 'Este equipo ha sido eliminado. Click aqui para restaurarlot.',
diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php
index 8d85244a84..96c3b9a6dd 100644
--- a/resources/lang/es-ES/admin/hardware/message.php
+++ b/resources/lang/es-ES/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Equipo restaurado correctamente.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Archivo no eliminado. Por favor, vuelva a intentarlo.',
'success' => 'Archivo eliminado correctamente.',
diff --git a/resources/lang/es-ES/admin/settings/general.php b/resources/lang/es-ES/admin/settings/general.php
index e0a350227f..d6dbb8a90c 100644
--- a/resources/lang/es-ES/admin/settings/general.php
+++ b/resources/lang/es-ES/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Limite de alertas de expiración (en días)',
'alert_inv_threshold' => 'Umbral de alerta del inventario',
'asset_ids' => 'IDs de Recurso',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generar IDs de equipo autoincrementales',
'auto_increment_prefix' => 'Prefijo (opcional)',
'auto_incrementing_help' => 'Activa la generación automática de IDs de equipo antes de configurar esto',
diff --git a/resources/lang/es-ES/admin/users/general.php b/resources/lang/es-ES/admin/users/general.php
index ddec4b4d3b..ea715cd169 100644
--- a/resources/lang/es-ES/admin/users/general.php
+++ b/resources/lang/es-ES/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Tipos de archivos permitidos son png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, y rar.',
'history_user' => 'Historial de :name',
'info' => 'Información',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Último acceso',
'ldap_config_text' => 'Las configuraciones de LDAP estàn en: Admin -> Settings. La ubicaciòn seleccionadada sera asignada a todos los usuarios importados.',
'software_user' => 'Software asignado a :name',
diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php
index 84a686d0f5..25857fc6d0 100644
--- a/resources/lang/es-ES/general.php
+++ b/resources/lang/es-ES/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Reporte de Equipos',
'asset_tag' => 'Etiqueta',
'assets_available' => 'equipos disponibles',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Equipos',
'avatar_delete' => 'Eliminar Avatar',
'avatar_upload' => 'Subir Avatar',
'back' => 'Atras',
'bad_data' => 'Ningún resultado. ¿Quizá un dato incorrecto?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Procesar en Lote',
'cancel' => 'Cancelar',
'categories' => 'Categorías',
@@ -52,6 +56,8 @@
'current' => 'Actual',
'custom_report' => 'Reporte de Equipos Personalizado',
'dashboard' => 'Tablero',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Fecha Compra',
'debug_warning' => '¡Advertencia!',
'debug_warning_text' => 'Esta aplicación esta corriendo en modo producción con debugging activado. Esto puede exponer datos sensibles si su aplicación es accesible desde el exterior. Desactive el modo debug cambiando el valor APP_DEBUG en su archivo .env a false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Más Info',
'name' => 'Nombre Localización',
'next' => 'Siguiente',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'nuevo!',
'no_depreciation' => 'No Amortizar',
'no_results' => 'Sin Resultados.',
diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php
index e31c1dcfc1..5c3a3cb37e 100644
--- a/resources/lang/es-ES/validation.php
+++ b/resources/lang/es-ES/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute debe ser aceptado.",
- "active_url" => ":attribute no es una URL correcta.",
- "after" => ":attribute debe ser posterior a :date.",
- "alpha" => ":attribute solo acepta letras.",
- "alpha_dash" => ":attribute solo acepta letras, números y guiones.",
- "alpha_num" => ":attribute solo acepta letras y números.",
- "before" => ":attribute debe ser anterior a :date.",
- "between" => array(
- "numeric" => ":attribute debe estar entre :min - :max.",
- "file" => ":attribute debe estar entre :min - :max kilobytes.",
- "string" => ":attribute debe estar entre :min - :max caracteres.",
- ),
- "boolean" => ":attribute debe ser verdadero o falso.",
- "confirmed" => ":attribute la confirmación no coincide.",
- "date" => ":attribute no es una fecha correcta.",
- "date_format" => ":attribute no cumple el formato :format.",
- "different" => ":attribute y :other deben ser diferentes.",
- "digits" => ":attribute debe tener :digits dígitos.",
- "digits_between" => ":attribute debe tener entre :min y :max dígitos.",
- "email" => ":attribute formato incorrecto.",
- "exists" => "El :attribute seleccionado no es correcto.",
- "email_array" => "Una o más direcciones de correo electrónico no es válido.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute debe ser una imagen.",
- "in" => "El :attribute seleccionado no es correcto.",
- "integer" => ":attribute debe ser un número entero.",
- "ip" => ":attribute debe ser una dirección IP correcta.",
- "max" => array(
- "numeric" => ":attribute no debe ser mayor que :max.",
- "file" => ":attribute no debe ser mayor que :max kilobytes.",
- "string" => ":attribute no debe tener como máximo :max caracteres.",
- ),
- "mimes" => ":attribute debe ser un archivo del tipo: :values.",
- "min" => array(
- "numeric" => ":attribute debe ser como mínimo :min.",
- "file" => ":attribute debe ser como mínimo de :min kilobytes.",
- "string" => ":attribute debe contener como mínimo :min caracteres.",
- ),
- "not_in" => "El :attribute seleccionado no es correcto.",
- "numeric" => ":attribute debe ser un número.",
- "regex" => ":attribute formato incorrecto.",
- "required" => ":attribute es obligatorio.",
- "required_if" => ":attribute es obligatrio cuando :other es :value.",
- "required_with" => ":attribute es obligatrio cuando :values es present.",
- "required_without" => ":attribute es obligatrio cuando :values es not present.",
- "same" => ":attribute y :other deben coincidir.",
- "size" => array(
- "numeric" => ":attribute debe tener :size.",
- "file" => ":attribute debe tener :size kilobytes.",
- "string" => ":attribute debe tener :size caracteres.",
- ),
- "unique" => ":attribute ya ha sido introducido.",
- "url" => ":attribute formato incorrecto.",
- "statuslabel_type" => "Debe seleccionar un tipo de etiqueta de estado válido",
- "unique_undeleted" => ":attribute debe ser único.",
+ 'accepted' => ':attribute debe ser aceptado.',
+ 'active_url' => ':attribute no es una URL correcta.',
+ 'after' => ':attribute debe ser posterior a :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute solo acepta letras.',
+ 'alpha_dash' => ':attribute solo acepta letras, números y guiones.',
+ 'alpha_num' => ':attribute solo acepta letras y números.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute debe ser anterior a :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute debe estar entre :min - :max.',
+ 'file' => ':attribute debe estar entre :min - :max kilobytes.',
+ 'string' => ':attribute debe estar entre :min - :max caracteres.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute debe ser verdadero o falso.',
+ 'confirmed' => ':attribute la confirmación no coincide.',
+ 'date' => ':attribute no es una fecha correcta.',
+ 'date_format' => ':attribute no cumple el formato :format.',
+ 'different' => ':attribute y :other deben ser diferentes.',
+ 'digits' => ':attribute debe tener :digits dígitos.',
+ 'digits_between' => ':attribute debe tener entre :min y :max dígitos.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute formato incorrecto.',
+ 'exists' => 'El :attribute seleccionado no es correcto.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute debe ser una imagen.',
+ 'in' => 'El :attribute seleccionado no es correcto.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute debe ser un número entero.',
+ 'ip' => ':attribute debe ser una dirección IP correcta.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute no debe ser mayor que :max.',
+ 'file' => ':attribute no debe ser mayor que :max kilobytes.',
+ 'string' => ':attribute no debe tener como máximo :max caracteres.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute debe ser un archivo del tipo: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute debe ser como mínimo :min.',
+ 'file' => ':attribute debe ser como mínimo de :min kilobytes.',
+ 'string' => ':attribute debe contener como mínimo :min caracteres.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'El :attribute seleccionado no es correcto.',
+ 'numeric' => ':attribute debe ser un número.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute formato incorrecto.',
+ 'required' => ':attribute es obligatorio.',
+ 'required_if' => ':attribute es obligatrio cuando :other es :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute es obligatrio cuando :values es present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute es obligatrio cuando :values es not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute y :other deben coincidir.',
+ 'size' => [
+ 'numeric' => ':attribute debe tener :size.',
+ 'file' => ':attribute debe tener :size kilobytes.',
+ 'string' => ':attribute debe tener :size caracteres.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute ya ha sido introducido.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute formato incorrecto.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "El campo :attribute contiene un caracter que no está permitido.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/et/admin/asset_maintenances/message.php b/resources/lang/et/admin/asset_maintenances/message.php
index 83fbf698d6..d121115825 100644
--- a/resources/lang/et/admin/asset_maintenances/message.php
+++ b/resources/lang/et/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'Warranty',
diff --git a/resources/lang/et/admin/hardware/general.php b/resources/lang/et/admin/hardware/general.php
index a7ceceab1b..51fdd99ff5 100644
--- a/resources/lang/et/admin/hardware/general.php
+++ b/resources/lang/et/admin/hardware/general.php
@@ -7,17 +7,17 @@ return array(
'asset' => 'Vahend',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Klooni vahend',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
'edit' => 'Muuda vahendit',
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'model_deleted' => 'This Assets model has been deleted. You must restore the model before you can restore the Asset.
Click here to restore the model.',
- 'requestable' => 'Requestable',
- 'requested' => 'Requested',
- 'restore' => 'Restore Asset',
- 'pending' => 'Pending',
+ 'requestable' => 'Taodeldav',
+ 'requested' => 'Taotletud',
+ 'restore' => 'Taasta vara',
+ 'pending' => 'Ootel',
'undeployable' => 'Undeployable',
'view' => 'Vaata vahendit',
);
diff --git a/resources/lang/et/admin/hardware/message.php b/resources/lang/et/admin/hardware/message.php
index df20960b2d..3f4d46aea1 100644
--- a/resources/lang/et/admin/hardware/message.php
+++ b/resources/lang/et/admin/hardware/message.php
@@ -4,13 +4,13 @@ return array(
'undeployable' => 'Warning: This asset has been marked as currently undeployable.
If this status has changed, please update the asset status.',
- 'does_not_exist' => 'Asset does not exist.',
+ 'does_not_exist' => 'Vahend puudub.',
'does_not_exist_or_not_requestable' => 'Nice try. That asset does not exist or is not requestable.',
'assoc_users' => 'This asset is currently checked out to a user and cannot be deleted. Please check the asset in first, and then try deleting again. ',
'create' => array(
- 'error' => 'Asset was not created, please try again. :(',
- 'success' => 'Asset created successfully. :)'
+ 'error' => 'Vahendit ei loodud, palun proovi uuesti. :(',
+ 'success' => 'Vahendi loomine õnnestus. :)'
),
'update' => array(
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/et/admin/settings/general.php b/resources/lang/et/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/et/admin/settings/general.php
+++ b/resources/lang/et/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/et/admin/users/general.php b/resources/lang/et/admin/users/general.php
index c65ee2dfb2..934b27e422 100644
--- a/resources/lang/et/admin/users/general.php
+++ b/resources/lang/et/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Lubatud failitüübid on png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, ja rar.',
'history_user' => 'Kasutaja :name ajalugu',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Viimane sisselogimine',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Kasutaja :name valdusesse antud tarkvara',
diff --git a/resources/lang/et/general.php b/resources/lang/et/general.php
index aee4d321ca..ab683f3259 100644
--- a/resources/lang/et/general.php
+++ b/resources/lang/et/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Vahendite aruanne',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Vahendid',
'avatar_delete' => 'Kustuta profiilipilt',
'avatar_upload' => 'Lae profiilipilt',
'back' => 'Tagasi',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Loobu',
'categories' => 'Kategooriad',
@@ -52,6 +56,8 @@
'current' => 'Praegune',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Töölaud',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Kuupäev',
'debug_warning' => 'Hoiatus!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Lisainfo',
'name' => 'Nimi',
'next' => 'Järgmine',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'uus!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/et/validation.php b/resources/lang/et/validation.php
index 7a26a6515f..02cb1fa981 100644
--- a/resources/lang/et/validation.php
+++ b/resources/lang/et/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min and :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/fa/admin/asset_maintenances/message.php b/resources/lang/fa/admin/asset_maintenances/message.php
index 3bf0023749..fd5863fd01 100644
--- a/resources/lang/fa/admin/asset_maintenances/message.php
+++ b/resources/lang/fa/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'نگهدارنده دارایی با موفقیت ایجاد شد.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'هنوز تکمیل نشده',
'warranty' => 'ضمانت',
diff --git a/resources/lang/fa/admin/hardware/general.php b/resources/lang/fa/admin/hardware/general.php
index 82362a5c92..bd262581bd 100644
--- a/resources/lang/fa/admin/hardware/general.php
+++ b/resources/lang/fa/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'دارایی',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'دارایی checkin',
- 'checkout' => 'پرداخت سرمایه به کاربر',
+ 'checkout' => 'Checkout Asset',
'clone' => 'دارایی شگرف',
'deployable' => 'گسترش',
'deleted' => 'این دارایی حذف شده است. اینجا به بازگرداندن آن کلیک کنید .',
diff --git a/resources/lang/fa/admin/hardware/message.php b/resources/lang/fa/admin/hardware/message.php
index c815ad6ea0..716d1ad124 100644
--- a/resources/lang/fa/admin/hardware/message.php
+++ b/resources/lang/fa/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => 'دارایی با موفقیت بازیابی شد.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'فایل حذف نمی شود. لطفا دوباره تلاش کنید.',
'success' => 'فایل با موفقیت حذف شده است.',
diff --git a/resources/lang/fa/admin/settings/general.php b/resources/lang/fa/admin/settings/general.php
index 4193f4c6da..c6b7057b74 100644
--- a/resources/lang/fa/admin/settings/general.php
+++ b/resources/lang/fa/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'آستانه ی انقضای هشدارها( به روز)',
'alert_inv_threshold' => 'فهرست آستانه ی هشدار',
'asset_ids' => 'ID حساب',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'تولید شناسه دارایی (افزایش خودکار)',
'auto_increment_prefix' => 'پیشوند (اختیاری)',
'auto_incrementing_help' => 'فعال کردن شناسه دارایی (افزایش خودکار) اول به این مجموعه',
diff --git a/resources/lang/fa/admin/users/general.php b/resources/lang/fa/admin/users/general.php
index 873b5138fe..65653ac52c 100644
--- a/resources/lang/fa/admin/users/general.php
+++ b/resources/lang/fa/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'پسوند های مجاز:png, gif, jpg, jpeg, doc, docx, pdf, txt, zip,Rar',
'history_user' => 'تاریخچه برای:',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'آخرین ورود',
'ldap_config_text' => 'تنظشیمات تاییدیه LDPA در فولدر app/config در فایلی به نام idap.php وجود دارد.مکان مشخص شده برای تمامی کاربران وارد شده تنظیم میشود.شما نیاز دارید که حداقل یه مکان را اضافه کرده باشید تا بتوانید از این ویژگی استفاده کنید.',
'software_user' => 'برنامه چک شد برای:',
diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php
index 8d341c0841..757d6e56ac 100644
--- a/resources/lang/fa/general.php
+++ b/resources/lang/fa/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'گزارش دارایی',
'asset_tag' => 'برچسب دارایی',
'assets_available' => 'دارایی های موجود',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'دارایی ها',
'avatar_delete' => 'حذف آواتار',
'avatar_upload' => 'بارگذاری آواتار',
'back' => 'بازگشت',
'bad_data' => 'چیزی پیدا نشد. شاید داده بد است؟',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'انصراف',
'categories' => 'دستهبندیها',
@@ -53,6 +57,8 @@
'custom_report' => 'گزارش های سفارشی دارایی
',
'dashboard' => 'میز کار',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'تاریخ',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -121,6 +127,8 @@
'moreinfo' => 'اطلاعات بیشتر',
'name' => 'نام',
'next' => 'بعدی',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'بدون استهلاک',
'no_results' => 'بدون نتیجه.',
diff --git a/resources/lang/fa/validation.php b/resources/lang/fa/validation.php
index 730d3a4ad9..eec84db638 100644
--- a/resources/lang/fa/validation.php
+++ b/resources/lang/fa/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "ویژگی باید تایید شود.",
- "active_url" => "ویژگی یک URL معتبر نیست.",
- "after" => "ویژگی باید در تاریخی بعد از تاریخ باشد.",
- "alpha" => "ویژگی ممکن است فقط شامل حروف باشد.",
- "alpha_dash" => "ویژگی ممکن است فقط شامل حروف، اعداد و خط های فاصله باشد.",
- "alpha_num" => "ویژگی ممکن است فقط شامل حروف و اعداد باشد.",
- "before" => "ویژگی باید در تاریخی قبل از تاریخ باشد.",
- "between" => array(
- "numeric" => "ویژگی باید بین حداقل حداکثر باشد.",
- "file" => "ویژگی باید بین حداقل حداکثر کیلوبایت باشد.",
- "string" => "ویژگی باید بین حداقل حداکثر کاراکتر باشد.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "تایید ویژگی منطبق نیست.",
- "date" => "تاریخ ویژگی معتبر نیست.",
- "date_format" => "ویژگی منطبق بر شکل شکل نیست.",
- "different" => "ویژگی و دیگر باید متفاوت باشد.",
- "digits" => "ویژگی باید رقم رقم باشد.",
- "digits_between" => "ویژگی باید بین حداقل و حداکثر رقم باشد.",
- "email" => "شکل ویژگی نامعتبر است.",
- "exists" => "ویژگی انتخاب شده نامعتبر است.",
- "email_array" => "یک یا بیش از یک آدرس ایمیل نامعتبر است.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "ویژگی باید یک عکس باشد.",
- "in" => "ویژگی انتخاب شده نامعتبر است.",
- "integer" => "ویژگی باید یک عدد باشد.",
- "ip" => "ویژگی باید یک آدرس IP معتبر باشد.",
- "max" => array(
- "numeric" => "ویژگی نباید بزرگتر از حداکثر باشد.",
- "file" => "ویژگی نباید بزرگتر از حداکثر کیلوبایت باشد.",
- "string" => "ویژگی نباید بزرگتر از حداکثر کاراکتر باشد.",
- ),
- "mimes" => "ویژگی باید فایلی از نوع ارزش ها باشد.",
- "min" => array(
- "numeric" => "ویژگی باید حداقل: حداقل باشد.",
- "file" => "ویژگی باید حداقل: حداقل کیلوبایت باشد.",
- "string" => "ویژگی باید حداقل: حداقل کاراکتر باشد.",
- ),
- "not_in" => "ویژگی انتخاب شده نامعتبر است.",
- "numeric" => "ویژگی باید عدد باشد.",
- "regex" => "شکل ویژگی نامعتبر است.",
- "required" => "فیلد ویژگی ضروری است.",
- "required_if" => "فیلد ویژگی ضروری است، وقتی که دیگری ارزش است.",
- "required_with" => "فیلد ویژگی ضروری است، وقتی که ارزش موجود باشد.",
- "required_without" => "فیلد ویژگی ضروری است، وقتی که ارزش ها حاضر نباشند.",
- "same" => "ویژگی و دیگری باید بر هم منطبق باشند.",
- "size" => array(
- "numeric" => "ویژگی باید به اندازه ی : سایز باشد.",
- "file" => "ویژگی باید به اندازه ی: سایز کیلوبایت باشد.",
- "string" => "ویژگی باید به اندازه ی : سایز کاراکتر باشد.",
- ),
- "unique" => "ویژگی در حال حاضر گرفته شده است.",
- "url" => "شکل ویژگی نامعتبر است.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => 'ویژگی باید تایید شود.',
+ 'active_url' => 'ویژگی یک URL معتبر نیست.',
+ 'after' => 'ویژگی باید در تاریخی بعد از تاریخ باشد.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => 'ویژگی ممکن است فقط شامل حروف باشد.',
+ 'alpha_dash' => 'ویژگی ممکن است فقط شامل حروف، اعداد و خط های فاصله باشد.',
+ 'alpha_num' => 'ویژگی ممکن است فقط شامل حروف و اعداد باشد.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => 'ویژگی باید در تاریخی قبل از تاریخ باشد.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => 'ویژگی باید بین حداقل حداکثر باشد.',
+ 'file' => 'ویژگی باید بین حداقل حداکثر کیلوبایت باشد.',
+ 'string' => 'ویژگی باید بین حداقل حداکثر کاراکتر باشد.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'تایید ویژگی منطبق نیست.',
+ 'date' => 'تاریخ ویژگی معتبر نیست.',
+ 'date_format' => 'ویژگی منطبق بر شکل شکل نیست.',
+ 'different' => 'ویژگی و دیگر باید متفاوت باشد.',
+ 'digits' => 'ویژگی باید رقم رقم باشد.',
+ 'digits_between' => 'ویژگی باید بین حداقل و حداکثر رقم باشد.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'شکل ویژگی نامعتبر است.',
+ 'exists' => 'ویژگی انتخاب شده نامعتبر است.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'ویژگی باید یک عکس باشد.',
+ 'in' => 'ویژگی انتخاب شده نامعتبر است.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'ویژگی باید یک عدد باشد.',
+ 'ip' => 'ویژگی باید یک آدرس IP معتبر باشد.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'ویژگی نباید بزرگتر از حداکثر باشد.',
+ 'file' => 'ویژگی نباید بزرگتر از حداکثر کیلوبایت باشد.',
+ 'string' => 'ویژگی نباید بزرگتر از حداکثر کاراکتر باشد.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'ویژگی باید فایلی از نوع ارزش ها باشد.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'ویژگی باید حداقل: حداقل باشد.',
+ 'file' => 'ویژگی باید حداقل: حداقل کیلوبایت باشد.',
+ 'string' => 'ویژگی باید حداقل: حداقل کاراکتر باشد.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'ویژگی انتخاب شده نامعتبر است.',
+ 'numeric' => 'ویژگی باید عدد باشد.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'شکل ویژگی نامعتبر است.',
+ 'required' => 'فیلد ویژگی ضروری است.',
+ 'required_if' => 'فیلد ویژگی ضروری است، وقتی که دیگری ارزش است.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'فیلد ویژگی ضروری است، وقتی که ارزش موجود باشد.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'فیلد ویژگی ضروری است، وقتی که ارزش ها حاضر نباشند.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'ویژگی و دیگری باید بر هم منطبق باشند.',
+ 'size' => [
+ 'numeric' => 'ویژگی باید به اندازه ی : سایز باشد.',
+ 'file' => 'ویژگی باید به اندازه ی: سایز کیلوبایت باشد.',
+ 'string' => 'ویژگی باید به اندازه ی : سایز کاراکتر باشد.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'ویژگی در حال حاضر گرفته شده است.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'شکل ویژگی نامعتبر است.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "فیلد ویژگی شامل یک کاراکتر غیرمجاز است.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/fi/admin/asset_maintenances/message.php b/resources/lang/fi/admin/asset_maintenances/message.php
index 6f723c2311..beebe4bfba 100644
--- a/resources/lang/fi/admin/asset_maintenances/message.php
+++ b/resources/lang/fi/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'Takuu',
diff --git a/resources/lang/fi/admin/hardware/general.php b/resources/lang/fi/admin/hardware/general.php
index 65fe065c91..13fb78f618 100644
--- a/resources/lang/fi/admin/hardware/general.php
+++ b/resources/lang/fi/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Laite',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Palauta Laite',
- 'checkout' => 'Luovuta Laite Käyttäjälle',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Monista Laite',
'deployable' => 'Käyttööotettavissa',
'deleted' => 'Tämä laite on poistettu. Klikkaa tästä palauttaaksesi sen.',
diff --git a/resources/lang/fi/admin/hardware/message.php b/resources/lang/fi/admin/hardware/message.php
index 77e4b5fe3e..bddd1ff472 100644
--- a/resources/lang/fi/admin/hardware/message.php
+++ b/resources/lang/fi/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Laite palautettiin onnistuneesti.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Tiedostoa ei poistettu. Ole hyvä ja yritä uudelleen.',
'success' => 'Tiedosto poistettiin onnistuneesti.',
diff --git a/resources/lang/fi/admin/settings/general.php b/resources/lang/fi/admin/settings/general.php
index d559957f8b..c8bcc102e2 100644
--- a/resources/lang/fi/admin/settings/general.php
+++ b/resources/lang/fi/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Luo automaattisesti kasvavat laite-ID:t',
'auto_increment_prefix' => 'Etuliite (valinnainen)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/fi/admin/users/general.php b/resources/lang/fi/admin/users/general.php
index 58d1f4135a..0fa470b46e 100644
--- a/resources/lang/fi/admin/users/general.php
+++ b/resources/lang/fi/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Sallitut tiedostotyypit ovat png, gif, jpg, jpeg, doc, docx, pdf, txt, zip ja rar.',
'history_user' => 'Historia käyttäjälle :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Viimeisin kirjautuminen',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Käyttäjälle :name luovutetut ohjelmistot',
diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php
index 6049a3e98f..5ce2d5bba2 100644
--- a/resources/lang/fi/general.php
+++ b/resources/lang/fi/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Laiteraportti',
'asset_tag' => 'Laitetunnus',
'assets_available' => 'laitetta vapaana',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Laitteet',
'avatar_delete' => 'Poista käyttäjäkuva',
'avatar_upload' => 'Lähetä Käyttäjäkuva',
'back' => 'Edellinen',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Peruuta',
'categories' => 'Kategoriat',
@@ -52,6 +56,8 @@
'current' => 'Käytössä Olevat',
'custom_report' => 'Muokattu Laiteraportti',
'dashboard' => 'Hallintasivu',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Päivä',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Lisätiedot',
'name' => 'Nimi',
'next' => 'Seuraava',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'Ei poistoluokkaa',
'no_results' => 'Ei tuloksia.',
diff --git a/resources/lang/fi/validation.php b/resources/lang/fi/validation.php
index 45f63f0952..bcada1d4cc 100644
--- a/resources/lang/fi/validation.php
+++ b/resources/lang/fi/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute tulee hyväksyä.",
- "active_url" => ":attribute ei ole oikea URL-osoite.",
- "after" => ":attribute tulee olla päivämäärä päivän :date jälkeen.",
- "alpha" => ":attribute saa sisältää ainoastaan kirjaimia.",
- "alpha_dash" => ":attribute voi sisältää vain kirjaimia, numeroita ja viivoja.",
- "alpha_num" => ":attribute voi sisältää ainoastaan kirjaimia ja numeroita.",
- "before" => ":attribute tulee olla päivämäärä ennen päivää :date.",
- "between" => array(
- "numeric" => ":attribute tulee olla välillä :min - :max.",
- "file" => ":attribute tulee olla välillä :min - :max kilotavua.",
- "string" => ":attribute tulee olla :min - :max merkkiä.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => ":attribute vahvistus ei täsmää.",
- "date" => ":attribute ei ole oikea päivämäärä.",
- "date_format" => ":attribute ei täsmää muotoiluun :format.",
- "different" => ":attribute ja :other tulee olla erilaisia.",
- "digits" => ":attribute tulee olla :digits numeroa pitkä.",
- "digits_between" => ":attribute tulee olla numero väliltä :min ja :max.",
- "email" => ":attribute muotoilu on virheellinen.",
- "exists" => "Valittu :attribute on virheellinen.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute tulee olla kuva.",
- "in" => "Valittu :attribute on virheellinen.",
- "integer" => ":attribute tulee olla kokonaisluku.",
- "ip" => ":attribute tulee olla oikea IP-osoite.",
- "max" => array(
- "numeric" => ":attribute ei saa olla suurempi kuin :max.",
- "file" => ":attribute ei saa olla suurempi kuin :max kilotavua.",
- "string" => ":attribute ei saa olla suurempi kuin :max merkkiä.",
- ),
- "mimes" => ":attribute tulee olla tiedosto jonka tyyppi on: :values.",
- "min" => array(
- "numeric" => ":attribute tulee olla vähintään :min.",
- "file" => ":attribute tulee olla vähintään :min kilotavua.",
- "string" => ":attribute tulee olla vähintään :min merkkiä.",
- ),
- "not_in" => "Valittu :attribute on virheellinen.",
- "numeric" => ":attribute tulee olla numero.",
- "regex" => ":attribute muotoilu on virheellinen.",
- "required" => ":attribute on vaadittu.",
- "required_if" => ":attribute on vaadittu kun :other on :value.",
- "required_with" => ":attribute on vaadittu kun :values on määritettynä.",
- "required_without" => ":attribute on vaadittu kun :values ei ole määritettynä.",
- "same" => ":attribute ja :other tulee olla samat.",
- "size" => array(
- "numeric" => ":attributetulee olla :size.",
- "file" => ":attribute tulee olla :size kilotavua.",
- "string" => ":attribute tulee olla :size merkkiä.",
- ),
- "unique" => ":attribute on jo käytössä.",
- "url" => ":attribute muotoilu on virheellinen.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => ':attribute tulee hyväksyä.',
+ 'active_url' => ':attribute ei ole oikea URL-osoite.',
+ 'after' => ':attribute tulee olla päivämäärä päivän :date jälkeen.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute saa sisältää ainoastaan kirjaimia.',
+ 'alpha_dash' => ':attribute voi sisältää vain kirjaimia, numeroita ja viivoja.',
+ 'alpha_num' => ':attribute voi sisältää ainoastaan kirjaimia ja numeroita.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute tulee olla päivämäärä ennen päivää :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute tulee olla välillä :min - :max.',
+ 'file' => ':attribute tulee olla välillä :min - :max kilotavua.',
+ 'string' => ':attribute tulee olla :min - :max merkkiä.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => ':attribute vahvistus ei täsmää.',
+ 'date' => ':attribute ei ole oikea päivämäärä.',
+ 'date_format' => ':attribute ei täsmää muotoiluun :format.',
+ 'different' => ':attribute ja :other tulee olla erilaisia.',
+ 'digits' => ':attribute tulee olla :digits numeroa pitkä.',
+ 'digits_between' => ':attribute tulee olla numero väliltä :min ja :max.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute muotoilu on virheellinen.',
+ 'exists' => 'Valittu :attribute on virheellinen.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute tulee olla kuva.',
+ 'in' => 'Valittu :attribute on virheellinen.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute tulee olla kokonaisluku.',
+ 'ip' => ':attribute tulee olla oikea IP-osoite.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute ei saa olla suurempi kuin :max.',
+ 'file' => ':attribute ei saa olla suurempi kuin :max kilotavua.',
+ 'string' => ':attribute ei saa olla suurempi kuin :max merkkiä.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute tulee olla tiedosto jonka tyyppi on: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute tulee olla vähintään :min.',
+ 'file' => ':attribute tulee olla vähintään :min kilotavua.',
+ 'string' => ':attribute tulee olla vähintään :min merkkiä.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Valittu :attribute on virheellinen.',
+ 'numeric' => ':attribute tulee olla numero.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute muotoilu on virheellinen.',
+ 'required' => ':attribute on vaadittu.',
+ 'required_if' => ':attribute on vaadittu kun :other on :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute on vaadittu kun :values on määritettynä.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute on vaadittu kun :values ei ole määritettynä.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute ja :other tulee olla samat.',
+ 'size' => [
+ 'numeric' => ':attributetulee olla :size.',
+ 'file' => ':attribute tulee olla :size kilotavua.',
+ 'string' => ':attribute tulee olla :size merkkiä.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute on jo käytössä.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute muotoilu on virheellinen.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/fr/admin/asset_maintenances/message.php b/resources/lang/fr/admin/asset_maintenances/message.php
index e8bc4441cb..a238ef77ee 100644
--- a/resources/lang/fr/admin/asset_maintenances/message.php
+++ b/resources/lang/fr/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Le type d\'entretien d\'actif a été créé correctement.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Pas encore complété',
'warranty' => 'Garantie',
diff --git a/resources/lang/fr/admin/hardware/general.php b/resources/lang/fr/admin/hardware/general.php
index 86c5ef1c65..0bd475e10b 100644
--- a/resources/lang/fr/admin/hardware/general.php
+++ b/resources/lang/fr/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Biens',
'bulk_checkout' => 'Attribuer les objets à l\'utilisateur',
'checkin' => 'Retour des Biens',
- 'checkout' => 'Sortie des Biens',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Cloner le Bien',
'deployable' => 'Déployable',
'deleted' => 'Cet actif a été détruit. Cliquez ici pour le restaurer.',
diff --git a/resources/lang/fr/admin/hardware/message.php b/resources/lang/fr/admin/hardware/message.php
index 16198f2e4d..a63c9174d5 100644
--- a/resources/lang/fr/admin/hardware/message.php
+++ b/resources/lang/fr/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Actif restauré correctement.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Le fichier n\'a pas été détruit. Veuillez réessayer.',
'success' => 'Fichier détruit correctement.',
diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php
index 3fa7a8e489..c6e2f32c50 100644
--- a/resources/lang/fr/admin/settings/general.php
+++ b/resources/lang/fr/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Seuil d\'expiration des alertes (en jours)',
'alert_inv_threshold' => 'Seuil d\'alerte d\'inventaire',
'asset_ids' => 'ID de l\'actif',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Générer des identifiants d\'actifs auto-incrémentés',
'auto_increment_prefix' => 'Préfixe (optionnel)',
'auto_incrementing_help' => 'Activer l\'auto-incrémentation des ID d\'actif avant de sélectionner cette option',
diff --git a/resources/lang/fr/admin/users/general.php b/resources/lang/fr/admin/users/general.php
index 4a93beaf62..656e97938c 100644
--- a/resources/lang/fr/admin/users/general.php
+++ b/resources/lang/fr/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Types de fichier autorisés: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'Historique pour :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Dernière connexion',
'ldap_config_text' => 'Les paramètres de configuration LDAP se trouvent sous Admin > Réglages. La localisation sélectionnée (optionnelle) sera définie pour tous les utilisateurs importés.',
'software_user' => 'Logiciels associés avec :name',
diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php
index 72278ffbf8..694237fc34 100644
--- a/resources/lang/fr/general.php
+++ b/resources/lang/fr/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Rapport d\'actif',
'asset_tag' => 'Étiquette de l\'actif',
'assets_available' => 'Actifs disponibles',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Actifs',
'avatar_delete' => 'Supprimer l\'Avatar',
'avatar_upload' => 'Charger un Avatar',
'back' => 'Retour',
'bad_data' => 'Aucun résultat, les données sont peut-être erronées?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Attribution par lot',
'cancel' => 'Annuler',
'categories' => 'Catégories',
@@ -52,6 +56,8 @@
'current' => 'Actuels',
'custom_report' => 'Rapport d\'actif personnalisé',
'dashboard' => 'Tableau de bord',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Attention !',
'debug_warning_text' => 'Cette application fonctionne en mode de production avec le débogage activé. Cela peut exposer des données sensibles si votre application est accessible au monde extérieur. Désactivez le mode de débogage en définissant la valeur APP_DEBUG dans votre fichier .env sur false .',
@@ -117,6 +123,8 @@
'moreinfo' => 'Plus d\'info',
'name' => 'Nom',
'next' => 'Prochain',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'nouveau!',
'no_depreciation' => 'Pas d\'amortissement',
'no_results' => 'Pas de résultat.',
diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
index 814996f0e8..7b1993377e 100644
--- a/resources/lang/fr/validation.php
+++ b/resources/lang/fr/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "L'attribut \":attribute\" doit être accepté.",
- "active_url" => "L'attribut \":attribute\" n'est pas une URL valide.",
- "after" => "L'attribut \":attribute\" doit être une date après :date.",
- "alpha" => "L'attribut \":attribute\" ne peut contenir que des lettres.",
- "alpha_dash" => "L'attribut \":attribute\" ne peut contenir que des lettres, des nombres, et des tirets.",
- "alpha_num" => "L'attribut \":attribute\" ne peut contenir que des caractères alphanumériques.",
- "before" => "L'attribut \":attribute\" doit être une date avant :date.",
- "between" => array(
- "numeric" => "L'attribut \":attribute\" doit être entre :min et :max.",
- "file" => "L'attribut \":attribute\" doit être entre :min et :max kilo-octets.",
- "string" => "L'attribut \":attribute\" doit contenir entre :min et :max caractères.",
- ),
- "boolean" => "L'attribut : doit être vrai ou faux.",
- "confirmed" => "La confirmation et l'attribut \":attribute\" ne concordent pas.",
- "date" => "L'attribut \":attribute\" n'est pas une date valide.",
- "date_format" => "L'attribut \":attribute\" ne respecte pas le format \":format\".",
- "different" => "L'attribut \":attribute\" et l'attribut \":other\" doivent être différents.",
- "digits" => "L'attribut \":attribute\" doit contenir :digits chiffres.",
- "digits_between" => "L'attribut \":attribute\" doit contenir entre :min et :max chiffres.",
- "email" => "Le format de l'attribut \":attribute\" est invalide.",
- "exists" => "L'attribut \":attribute\" est invalide.",
- "email_array" => "Une ou plusieurs adresses e-mail sont invalides.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "L'attribut \":attribute\" doit être une image.",
- "in" => "Le :attribute selectionné est invalide.",
- "integer" => "L'attribut \":attribute\" doit être un nombre entier.",
- "ip" => "L'attribut \":attribute\" doit être une adresse IP valide.",
- "max" => array(
- "numeric" => "L'attribut \":attribute\" ne peut pas être plus grand que :max.",
- "file" => "L'attribut \":attribute\" ne doit pas dépasser :max kilo-octets.",
- "string" => "L'attribut \":attribute\" ne doit pas faire plus de :max caractères.",
- ),
- "mimes" => "Le fichier :attribute doit être de type :values.",
- "min" => array(
- "numeric" => "L'attribut \":attribute\" doit être au moins :min.",
- "file" => "L'attribut \":attribute\" doit faire au moins :min kilo-octets.",
- "string" => "L'attribut \":attribute\" doit faire au moins :min caractères.",
- ),
- "not_in" => "L'attribut \":attribute\" est invalide.",
- "numeric" => "L'attribut \":attribute\" doit être un nombre.",
- "regex" => "Le format de l'attribut \":attribute\" est invalide.",
- "required" => "Le champs :attribute est nécessaire.",
- "required_if" => "Le champ :attribute est nécessaire quand :other vaut :value.",
- "required_with" => "Le champ :attribute est nécessaire quand :values est présent.",
- "required_without" => "Le champ :attribute est nécessaire quand :values n'est pas présent.",
- "same" => "L'attribut \":attribute\" et :other doivent correspondre.",
- "size" => array(
- "numeric" => "L'attribut \":attribute\" doit faire :size.",
- "file" => "L'attribut \":attribute\" doit faire :size kilo-octets.",
- "string" => "L'attribut \":attribute\" doit faire :size caractères.",
- ),
- "unique" => "Cet-te :attribute a déjà été pris-e.",
- "url" => "Le format de cet-te :attribute est invalide.",
- "statuslabel_type" => "Vous devez sélectionner un type d'étiquette de statut valide",
- "unique_undeleted" => "L'attribut :attribute doit être unique.",
+ 'accepted' => 'L\'attribut ":attribute" doit être accepté.',
+ 'active_url' => 'L\'attribut ":attribute" n\'est pas une URL valide.',
+ 'after' => 'L\'attribut ":attribute" doit être une date après :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => 'L\'attribut ":attribute" ne peut contenir que des lettres.',
+ 'alpha_dash' => 'L\'attribut ":attribute" ne peut contenir que des lettres, des nombres, et des tirets.',
+ 'alpha_num' => 'L\'attribut ":attribute" ne peut contenir que des caractères alphanumériques.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => 'L\'attribut ":attribute" doit être une date avant :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => 'L\'attribut ":attribute" doit être entre :min et :max.',
+ 'file' => 'L\'attribut ":attribute" doit être entre :min et :max kilo-octets.',
+ 'string' => 'L\'attribut ":attribute" doit contenir entre :min et :max caractères.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'L\'attribut : doit être vrai ou faux.',
+ 'confirmed' => 'La confirmation et l\'attribut ":attribute" ne concordent pas.',
+ 'date' => 'L\'attribut ":attribute" n\'est pas une date valide.',
+ 'date_format' => 'L\'attribut ":attribute" ne respecte pas le format ":format".',
+ 'different' => 'L\'attribut ":attribute" et l\'attribut ":other" doivent être différents.',
+ 'digits' => 'L\'attribut ":attribute" doit contenir :digits chiffres.',
+ 'digits_between' => 'L\'attribut ":attribute" doit contenir entre :min et :max chiffres.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Le format de l\'attribut ":attribute" est invalide.',
+ 'exists' => 'L\'attribut ":attribute" est invalide.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'L\'attribut ":attribute" doit être une image.',
+ 'in' => 'Le :attribute selectionné est invalide.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'L\'attribut ":attribute" doit être un nombre entier.',
+ 'ip' => 'L\'attribut ":attribute" doit être une adresse IP valide.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'L\'attribut ":attribute" ne peut pas être plus grand que :max.',
+ 'file' => 'L\'attribut ":attribute" ne doit pas dépasser :max kilo-octets.',
+ 'string' => 'L\'attribut ":attribute" ne doit pas faire plus de :max caractères.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'Le fichier :attribute doit être de type :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'L\'attribut ":attribute" doit être au moins :min.',
+ 'file' => 'L\'attribut ":attribute" doit faire au moins :min kilo-octets.',
+ 'string' => 'L\'attribut ":attribute" doit faire au moins :min caractères.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'L\'attribut ":attribute" est invalide.',
+ 'numeric' => 'L\'attribut ":attribute" doit être un nombre.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Le format de l\'attribut ":attribute" est invalide.',
+ 'required' => 'Le champs :attribute est nécessaire.',
+ 'required_if' => 'Le champ :attribute est nécessaire quand :other vaut :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'Le champ :attribute est nécessaire quand :values est présent.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'Le champ :attribute est nécessaire quand :values n\'est pas présent.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'L\'attribut ":attribute" et :other doivent correspondre.',
+ 'size' => [
+ 'numeric' => 'L\'attribut ":attribute" doit faire :size.',
+ 'file' => 'L\'attribut ":attribute" doit faire :size kilo-octets.',
+ 'string' => 'L\'attribut ":attribute" doit faire :size caractères.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'Cet-te :attribute a déjà été pris-e.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Le format de cet-te :attribute est invalide.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "L'attribut \":attribute\" contient un caractère invalide.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/he/admin/asset_maintenances/message.php b/resources/lang/he/admin/asset_maintenances/message.php
index 6104415d0d..5329e65b0e 100644
--- a/resources/lang/he/admin/asset_maintenances/message.php
+++ b/resources/lang/he/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'אחריות',
diff --git a/resources/lang/he/admin/hardware/general.php b/resources/lang/he/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/he/admin/hardware/general.php
+++ b/resources/lang/he/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/he/admin/hardware/message.php b/resources/lang/he/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/he/admin/hardware/message.php
+++ b/resources/lang/he/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/he/admin/settings/general.php b/resources/lang/he/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/he/admin/settings/general.php
+++ b/resources/lang/he/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/he/admin/users/general.php b/resources/lang/he/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/he/admin/users/general.php
+++ b/resources/lang/he/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php
index 5a5fc5f7da..eb6409ddbb 100644
--- a/resources/lang/he/general.php
+++ b/resources/lang/he/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Back',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Cancel',
'categories' => 'Categories',
@@ -52,6 +56,8 @@
'current' => 'Current',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'More Info',
'name' => 'Name',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/he/validation.php b/resources/lang/he/validation.php
index 7a26a6515f..02cb1fa981 100644
--- a/resources/lang/he/validation.php
+++ b/resources/lang/he/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min and :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/hr/admin/asset_maintenances/message.php b/resources/lang/hr/admin/asset_maintenances/message.php
index 83fbf698d6..d121115825 100644
--- a/resources/lang/hr/admin/asset_maintenances/message.php
+++ b/resources/lang/hr/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'Warranty',
diff --git a/resources/lang/hr/admin/hardware/general.php b/resources/lang/hr/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/hr/admin/hardware/general.php
+++ b/resources/lang/hr/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/hr/admin/hardware/message.php b/resources/lang/hr/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/hr/admin/hardware/message.php
+++ b/resources/lang/hr/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/hr/admin/settings/general.php b/resources/lang/hr/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/hr/admin/settings/general.php
+++ b/resources/lang/hr/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/hr/admin/users/general.php b/resources/lang/hr/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/hr/admin/users/general.php
+++ b/resources/lang/hr/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php
index 5a5fc5f7da..eb6409ddbb 100644
--- a/resources/lang/hr/general.php
+++ b/resources/lang/hr/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Back',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Cancel',
'categories' => 'Categories',
@@ -52,6 +56,8 @@
'current' => 'Current',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'More Info',
'name' => 'Name',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/hr/validation.php b/resources/lang/hr/validation.php
index 3fff7fbfe1..770909373e 100644
--- a/resources/lang/hr/validation.php
+++ b/resources/lang/hr/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute mora biti prihvaćen.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => ':attribute mora biti prihvaćen.',
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min and :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/hu/admin/asset_maintenances/message.php b/resources/lang/hu/admin/asset_maintenances/message.php
index e0a6265676..a98111cb2d 100644
--- a/resources/lang/hu/admin/asset_maintenances/message.php
+++ b/resources/lang/hu/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Eszköz karbantartás sikeresen létrejött.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Nincs kitöltve teljesen',
'warranty' => 'Garancia',
diff --git a/resources/lang/hu/admin/hardware/general.php b/resources/lang/hu/admin/hardware/general.php
index 36129e3cfd..c77f2829cd 100644
--- a/resources/lang/hu/admin/hardware/general.php
+++ b/resources/lang/hu/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Eszköz',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Eszköz visszavétele',
- 'checkout' => 'Eszköz kiadása felhasználónak',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Eszköz klónozása',
'deployable' => 'Kiadható',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/hu/admin/hardware/message.php b/resources/lang/hu/admin/hardware/message.php
index 15d033bde0..fa77fc6d06 100644
--- a/resources/lang/hu/admin/hardware/message.php
+++ b/resources/lang/hu/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php
index ca5f853442..28bcb56ed3 100644
--- a/resources/lang/hu/admin/settings/general.php
+++ b/resources/lang/hu/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Eszköz ID',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/hu/admin/users/general.php b/resources/lang/hu/admin/users/general.php
index 6f76c11d0c..b090b55499 100644
--- a/resources/lang/hu/admin/users/general.php
+++ b/resources/lang/hu/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php
index d583a85edf..e9339c4e1b 100644
--- a/resources/lang/hu/general.php
+++ b/resources/lang/hu/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Eszköz riport',
'asset_tag' => 'Eszköz azonosító',
'assets_available' => 'elérhető eszközök',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Eszközök',
'avatar_delete' => 'Avatar törlése',
'avatar_upload' => 'Avatar frissítése',
'back' => 'Vissza',
'bad_data' => 'Nincs találat. Talán rossz adat?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Mégse',
'categories' => 'Kategóriák',
@@ -52,6 +56,8 @@
'current' => 'Aktuális',
'custom_report' => 'Egyedi eszköz riport',
'dashboard' => 'Irányítópult',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Dátum',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'További információ',
'name' => 'Név',
'next' => 'Tovább',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'Nincs értékcsökkentés',
'no_results' => 'Nincs találat.',
diff --git a/resources/lang/hu/validation.php b/resources/lang/hu/validation.php
index e3ded39be9..22ff6358f7 100644
--- a/resources/lang/hu/validation.php
+++ b/resources/lang/hu/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "A :attribute el kell fogadni.",
- "active_url" => "A :attribute nem valós URL.",
- "after" => "Az :attribute ezután a dátum után kell, hogy legyen :date.",
- "alpha" => "A :attribute csak betűket tartalmazhat.",
- "alpha_dash" => "A :attribute csak betűket, számokat és perjelet tartalmazhat.",
- "alpha_num" => "A :attribute csak betűket, számokat tartalmazhat.",
- "before" => "A :attribute csak :date elötti dátum lehet.",
- "between" => array(
- "numeric" => "A :attribute az érték között kell lennie :min -:max.",
- "file" => "A :attribute :min - :max kilobájt között kell lenni.",
- "string" => "A :attribute :min - :max karakter között kell lenni.",
- ),
- "boolean" => "Az attribútumnak igaznak, vagy hamisnak kell lennie (true/false).",
- "confirmed" => "A :attribute ellenörzés nem egyezik.",
- "date" => "A :attribute nem egy valós dátum.",
- "date_format" => "A :attribute nem egyezik a formátummal :format.",
- "different" => "A :attribute és :other különböznie kell.",
- "digits" => "A :attribute :digits számjegynek kell lenni.",
- "digits_between" => "A :attribute :min - :max számjegy között kell lenni.",
- "email" => "Az :attribute formátuma érvénytelen.",
- "exists" => "A kiválasztott :attribute étvénytelen.",
- "email_array" => "Egy vagy több email cím érvénytelen.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "A :attribute képnek kell lenni.",
- "in" => "A kiválasztott :attribute étvénytelen.",
- "integer" => "A :attribute számnak kell lennie.",
- "ip" => "A :attribute érvényes IP címnek kell lenni.",
- "max" => array(
- "numeric" => "A :attribute nem lehet nagyobb, mint :max.",
- "file" => "A :attribute nem lehet nagyobb, mint :max kilobájt.",
- "string" => "A :attribute nem lehet nagyobb, mint :max karakter.",
- ),
- "mimes" => "A :attribute ilyen fájl típusnak kell lennie: :values.",
- "min" => array(
- "numeric" => "A :attribute legalább :min kell lenni.",
- "file" => "A :attribute legalább :min kilobájt kell lenni.",
- "string" => "A :attribute legalább :min karakter kell lenni.",
- ),
- "not_in" => "A kiválasztott :attribute étvénytelen.",
- "numeric" => "A :attribute csak szám lehet.",
- "regex" => "Az :attribute formátuma érvénytelen.",
- "required" => "A :attribute mező kötelező.",
- "required_if" => "A :attribute mező kötelező ha :other egy :value.",
- "required_with" => "A :attribute mező kötelező ha :value jelen van.",
- "required_without" => "A :attribute mező kötelező ha :value nincs jelen.",
- "same" => "A :attribute és :other egyeznie kell.",
- "size" => array(
- "numeric" => "A :attribute kötelező mérete :size.",
- "file" => "A :attribute kötelező mérete :size kilobájt.",
- "string" => "A :attribute kötelező mérete :size karakter.",
- ),
- "unique" => "A :attribute már foglalt.",
- "url" => "Az :attribute formátuma érvénytelen.",
- "statuslabel_type" => "Érvényes állapot jelzőt kell választani",
- "unique_undeleted" => "Az attribútumnak egyedinek kell lennie.",
+ 'accepted' => 'A :attribute el kell fogadni.',
+ 'active_url' => 'A :attribute nem valós URL.',
+ 'after' => 'Az :attribute ezután a dátum után kell, hogy legyen :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => 'A :attribute csak betűket tartalmazhat.',
+ 'alpha_dash' => 'A :attribute csak betűket, számokat és perjelet tartalmazhat.',
+ 'alpha_num' => 'A :attribute csak betűket, számokat tartalmazhat.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => 'A :attribute csak :date elötti dátum lehet.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => 'A :attribute az érték között kell lennie :min -:max.',
+ 'file' => 'A :attribute :min - :max kilobájt között kell lenni.',
+ 'string' => 'A :attribute :min - :max karakter között kell lenni.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'Az attribútumnak igaznak, vagy hamisnak kell lennie (true/false).',
+ 'confirmed' => 'A :attribute ellenörzés nem egyezik.',
+ 'date' => 'A :attribute nem egy valós dátum.',
+ 'date_format' => 'A :attribute nem egyezik a formátummal :format.',
+ 'different' => 'A :attribute és :other különböznie kell.',
+ 'digits' => 'A :attribute :digits számjegynek kell lenni.',
+ 'digits_between' => 'A :attribute :min - :max számjegy között kell lenni.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Az :attribute formátuma érvénytelen.',
+ 'exists' => 'A kiválasztott :attribute étvénytelen.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'A :attribute képnek kell lenni.',
+ 'in' => 'A kiválasztott :attribute étvénytelen.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'A :attribute számnak kell lennie.',
+ 'ip' => 'A :attribute érvényes IP címnek kell lenni.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'A :attribute nem lehet nagyobb, mint :max.',
+ 'file' => 'A :attribute nem lehet nagyobb, mint :max kilobájt.',
+ 'string' => 'A :attribute nem lehet nagyobb, mint :max karakter.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'A :attribute ilyen fájl típusnak kell lennie: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'A :attribute legalább :min kell lenni.',
+ 'file' => 'A :attribute legalább :min kilobájt kell lenni.',
+ 'string' => 'A :attribute legalább :min karakter kell lenni.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'A kiválasztott :attribute étvénytelen.',
+ 'numeric' => 'A :attribute csak szám lehet.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Az :attribute formátuma érvénytelen.',
+ 'required' => 'A :attribute mező kötelező.',
+ 'required_if' => 'A :attribute mező kötelező ha :other egy :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'A :attribute mező kötelező ha :value jelen van.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'A :attribute mező kötelező ha :value nincs jelen.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'A :attribute és :other egyeznie kell.',
+ 'size' => [
+ 'numeric' => 'A :attribute kötelező mérete :size.',
+ 'file' => 'A :attribute kötelező mérete :size kilobájt.',
+ 'string' => 'A :attribute kötelező mérete :size karakter.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'A :attribute már foglalt.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Az :attribute formátuma érvénytelen.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "A :attribute mező tartalmaz egy érvénytelen karaktert.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/id/admin/asset_maintenances/message.php b/resources/lang/id/admin/asset_maintenances/message.php
index 49659bf372..be87396015 100644
--- a/resources/lang/id/admin/asset_maintenances/message.php
+++ b/resources/lang/id/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Perawatan aset telah sukses di buat.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Belum selesai',
'warranty' => 'Garansi',
diff --git a/resources/lang/id/admin/hardware/general.php b/resources/lang/id/admin/hardware/general.php
index fa9953efec..a4095cf936 100644
--- a/resources/lang/id/admin/hardware/general.php
+++ b/resources/lang/id/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Aset',
'bulk_checkout' => 'Pemberian aset kepada pengguna',
'checkin' => 'Pengembalian aset',
- 'checkout' => 'Pemberian aset kepada pengguna',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Klon Aset',
'deployable' => 'Dapat digunakan',
'deleted' => 'Aset ini telah di hapus. Klik disini untuk memulihkan.',
diff --git a/resources/lang/id/admin/hardware/message.php b/resources/lang/id/admin/hardware/message.php
index 4c3a4348ff..9cef28417c 100644
--- a/resources/lang/id/admin/hardware/message.php
+++ b/resources/lang/id/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Aset berhasil dikembalikan.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Berkas tidak terhapus. Silahkan coba kembali.',
'success' => 'Berkas berhasil dihapus.',
diff --git a/resources/lang/id/admin/settings/general.php b/resources/lang/id/admin/settings/general.php
index fa49a6adc3..714aefba5e 100644
--- a/resources/lang/id/admin/settings/general.php
+++ b/resources/lang/id/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Ambang batas pemberitahuan kadaluarsa (dalam hari)',
'alert_inv_threshold' => 'Ambang pemberitahuan persediaan',
'asset_ids' => 'Aset id',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Membuat otomatis pembahan nomor ID aset',
'auto_increment_prefix' => 'Awalan (pilihan)',
'auto_incrementing_help' => 'Hidupkan penambahan otomatis terlebih dahulu sebelumnya',
diff --git a/resources/lang/id/admin/users/general.php b/resources/lang/id/admin/users/general.php
index a06c50ffb1..eef4f4ea13 100644
--- a/resources/lang/id/admin/users/general.php
+++ b/resources/lang/id/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Jenis berkas diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, dan rar.',
'history_user' => 'Riwayat untuk :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Terakhir masuk',
'ldap_config_text' => 'Konfigurasi LDAP terdapat di Admin > Pengaturan. Jika lokasi di pilih, maka akan di impor untuk semua pengguna.',
'software_user' => 'Perangkat lunak pada :name',
diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php
index e8799ac1c4..77bc100792 100644
--- a/resources/lang/id/general.php
+++ b/resources/lang/id/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Laporan aset',
'asset_tag' => 'Tag Aset',
'assets_available' => 'Aset yang tersedia',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Aset',
'avatar_delete' => 'Hapus avatar',
'avatar_upload' => 'Unggah avatar',
'back' => 'Kembali',
'bad_data' => 'Tidak di temukan. Kemungkinan data rusak?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'check-out masal',
'cancel' => 'Batalkan',
'categories' => 'Kategori',
@@ -52,6 +56,8 @@
'current' => 'Saat ini',
'custom_report' => 'Laporan kustom aset',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Tanggal',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Lebih Lanjut',
'name' => 'Nama',
'next' => 'Berikutnya',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'baru!',
'no_depreciation' => 'Tidak ada penyusutan',
'no_results' => 'Tidak ada hasil.',
diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php
index 2f52ea9aea..295db5131f 100644
--- a/resources/lang/id/validation.php
+++ b/resources/lang/id/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ": Atribut harus diterima.",
- "active_url" => ": Atribut ini URL-nya tidak valid.",
- "after" => ": Atribut harus tanggal setelah: tanggal.",
- "alpha" => ": Atribut hanya boleh berisi huruf.",
- "alpha_dash" => ": Atribut hanya boleh berisi angka, huruf dan garis.",
- "alpha_num" => ": Atribut hanya boleh berisi huruf dan angka.",
- "before" => ": Atribut harus tanggal sebelum: tanggal.",
- "between" => array(
- "numeric" => ": Atribut harus di antara: min -: maks.",
- "file" => ": Atribut harus di antara: min -: maks kilobytes.",
- "string" => ": Atribut harus di antara: min -: maks jumlah karakter.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "Konfirmasi :attribute tidak cocok.",
- "date" => "Tanggal :attribute tidak valid.",
- "date_format" => ":attribute tidak cocok dengan format :format.",
- "different" => ":attribute dan :other harus berbeda.",
- "digits" => ":attribute harus dengan :digits digit.",
- "digits_between" => "Digit :attribute harus di antara :min dan :max.",
- "email" => "Format :attribute tidak benar.",
- "exists" => ":attribute yang di pilih tidak benar.",
- "email_array" => "Satu atau lebih alamat email tidak benar.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute harus dalam bentuk gambar.",
- "in" => ":attribute yang di pilih tidak benar.",
- "integer" => ":attribute harus dalam bentuk integer.",
- "ip" => ":attribute harus memilik alamat IP yang benar.",
- "max" => array(
- "numeric" => ":attribute tidak boleh lebih dari :max.",
- "file" => ":attribute tidak boleh lebih dari :max kilobyte.",
- "string" => ":attribute tidak boleh lebih dari :max karakter.",
- ),
- "mimes" => ":attribute harus memiliki tipe data :values.",
- "min" => array(
- "numeric" => ":attribute seharusnya :min.",
- "file" => ":attribute harus memiliki :min kilobyte.",
- "string" => ":attribute harus memiliki :min jumlah karakter.",
- ),
- "not_in" => ":attribute yang di pilih tidak benar.",
- "numeric" => ":attribute harus dalam angka.",
- "regex" => "Format :attribute tidak benar.",
- "required" => "Kolom :attribute wajib di-isi.",
- "required_if" => "Kolom :attribute wajib di-isi ketika :other nya :value.",
- "required_with" => "Kolom :attribute wajib di-isi ketika terdapat :values.",
- "required_without" => "Kolom :attribute wajib di-isi ketika :values tidak ada.",
- "same" => ":attribute dan :other harus cocok.",
- "size" => array(
- "numeric" => "Ukuran :attribute harus :size.",
- "file" => ":attribute harus memiliki :size kilobyte.",
- "string" => ":attribute harus memiliki :size karakter.",
- ),
- "unique" => ":attribute sudah digunakan.",
- "url" => "Format :attribute tidak benar.",
- "statuslabel_type" => "Anda harus memilih tipe status label yang benar",
- "unique_undeleted" => ":attribute harus unik.",
+ 'accepted' => ': Atribut harus diterima.',
+ 'active_url' => ': Atribut ini URL-nya tidak valid.',
+ 'after' => ': Atribut harus tanggal setelah: tanggal.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ': Atribut hanya boleh berisi huruf.',
+ 'alpha_dash' => ': Atribut hanya boleh berisi angka, huruf dan garis.',
+ 'alpha_num' => ': Atribut hanya boleh berisi huruf dan angka.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ': Atribut harus tanggal sebelum: tanggal.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ': Atribut harus di antara: min -: maks.',
+ 'file' => ': Atribut harus di antara: min -: maks kilobytes.',
+ 'string' => ': Atribut harus di antara: min -: maks jumlah karakter.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'Konfirmasi :attribute tidak cocok.',
+ 'date' => 'Tanggal :attribute tidak valid.',
+ 'date_format' => ':attribute tidak cocok dengan format :format.',
+ 'different' => ':attribute dan :other harus berbeda.',
+ 'digits' => ':attribute harus dengan :digits digit.',
+ 'digits_between' => 'Digit :attribute harus di antara :min dan :max.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Format :attribute tidak benar.',
+ 'exists' => ':attribute yang di pilih tidak benar.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute harus dalam bentuk gambar.',
+ 'in' => ':attribute yang di pilih tidak benar.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute harus dalam bentuk integer.',
+ 'ip' => ':attribute harus memilik alamat IP yang benar.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute tidak boleh lebih dari :max.',
+ 'file' => ':attribute tidak boleh lebih dari :max kilobyte.',
+ 'string' => ':attribute tidak boleh lebih dari :max karakter.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute harus memiliki tipe data :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute seharusnya :min.',
+ 'file' => ':attribute harus memiliki :min kilobyte.',
+ 'string' => ':attribute harus memiliki :min jumlah karakter.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => ':attribute yang di pilih tidak benar.',
+ 'numeric' => ':attribute harus dalam angka.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Format :attribute tidak benar.',
+ 'required' => 'Kolom :attribute wajib di-isi.',
+ 'required_if' => 'Kolom :attribute wajib di-isi ketika :other nya :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'Kolom :attribute wajib di-isi ketika terdapat :values.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'Kolom :attribute wajib di-isi ketika :values tidak ada.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute dan :other harus cocok.',
+ 'size' => [
+ 'numeric' => 'Ukuran :attribute harus :size.',
+ 'file' => ':attribute harus memiliki :size kilobyte.',
+ 'string' => ':attribute harus memiliki :size karakter.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute sudah digunakan.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Format :attribute tidak benar.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Kolom :attribute tidak boleh di isi karakter yang tidak di perbolehkan.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/it/admin/asset_maintenances/message.php b/resources/lang/it/admin/asset_maintenances/message.php
index 751291984e..2cc9762f63 100644
--- a/resources/lang/it/admin/asset_maintenances/message.php
+++ b/resources/lang/it/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Manutenzione prodotto creata con successo.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Non ancora completato',
'warranty' => 'Garanzia',
diff --git a/resources/lang/it/admin/hardware/general.php b/resources/lang/it/admin/hardware/general.php
index 6b62e68b53..daf99ae1d5 100644
--- a/resources/lang/it/admin/hardware/general.php
+++ b/resources/lang/it/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Ingresso Asset',
- 'checkout' => 'Uscita Asset',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Copia Asset',
'deployable' => 'Distribuibile',
'deleted' => 'Questo asset è stato cancellato. Clicca qui per ripristinarlo.',
diff --git a/resources/lang/it/admin/hardware/message.php b/resources/lang/it/admin/hardware/message.php
index 825d45fdd7..ba75882462 100644
--- a/resources/lang/it/admin/hardware/message.php
+++ b/resources/lang/it/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Bene ripristinato con successo.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File non cancellato. Riprova.',
'success' => 'File cancellato con successo.',
diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php
index 2a22928d3b..ba687a65ec 100644
--- a/resources/lang/it/admin/settings/general.php
+++ b/resources/lang/it/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'ID modello',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Genera auto-incremento ID beni',
'auto_increment_prefix' => 'Prefisso (Opzionale)',
'auto_incrementing_help' => 'Abilita auto-incremento ID beni prima di impostare questa',
diff --git a/resources/lang/it/admin/users/general.php b/resources/lang/it/admin/users/general.php
index a3a0a11926..d539b5eda4 100644
--- a/resources/lang/it/admin/users/general.php
+++ b/resources/lang/it/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'I formati di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.',
'history_user' => 'Storico di :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Ultimo accesso',
'ldap_config_text' => 'Le impostazioni di configurazione di LDAP possono essere trovate su Admin > Impostazioni. La posizione selezionata (facoltativa) verrà impostata per tutti gli utenti importati.',
'software_user' => 'Software estratto a :name',
diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php
index f1ed6d053c..186cbb7def 100644
--- a/resources/lang/it/general.php
+++ b/resources/lang/it/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Report degli Asset',
'asset_tag' => 'Tag Asset',
'assets_available' => 'Asset Disponibili',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Asset',
'avatar_delete' => 'Cancella Avatar',
'avatar_upload' => 'Carica Avatar',
'back' => 'Indietro',
'bad_data' => 'Non è stato trovato nulla. Forse informazioni errate?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'annulla',
'categories' => 'Categorie',
@@ -52,6 +56,8 @@
'current' => 'Attuale',
'custom_report' => 'Report assets personalizzato',
'dashboard' => 'Pannello amministrativo',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Data',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Altre informazioni',
'name' => 'Nome',
'next' => 'Successivo',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'nuovo!',
'no_depreciation' => 'Non Obsololeto',
'no_results' => 'Nessun risultato.',
diff --git a/resources/lang/it/validation.php b/resources/lang/it/validation.php
index a10b59054c..b1a7504abc 100644
--- a/resources/lang/it/validation.php
+++ b/resources/lang/it/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "il :attribute è stato accettato.",
- "active_url" => ":attribute non è un URL valido.",
- "after" => ":attribute deve essere una data oltre il :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.",
- "before" => ":attribute deve essere una data dopo :date.",
- "between" => array(
- "numeric" => ":attribute deve essere tra :min - :max.",
- "file" => "il :attribute deve essere tra :min - :max kilobytes.",
- "string" => "il :attribute deve essere tra :min - :max caratteri.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "il :attribute non corrisponde.",
- "date" => "la :attribute non è valida.",
- "date_format" => "il :attribute non corrisponde al :format.",
- "different" => "il :attribute e :other devono essere differenti.",
- "digits" => "il :attribute deve essere :digits digits.",
- "digits_between" => "il :attribute deve essere tra :min e :max digits.",
- "email" => "il formato del :attribute è invalido.",
- "exists" => ":attribute selezzionato è invalido.",
- "email_array" => "Una o più email sono invalidi.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "il :attribute deve essere un immagine.",
- "in" => "Il selezionato :attribute è invalido.",
- "integer" => "L' :attribute deve essere un numero intero.",
- "ip" => "L' :attribute deve essere un indirizzo IP valido.",
- "max" => array(
- "numeric" => "L' :attribute non può essere superiore di :max.",
- "file" => "L' :attribute non può essere maggiore di :max kilobytes.",
- "string" => "L' :attribute non può essere maggiore di :max caratteri.",
- ),
- "mimes" => "L' :attribute deve essere un file di type: :values.",
- "min" => array(
- "numeric" => "L' :attribute deve essere almeno :min.",
- "file" => "L' :attribute deve essere almeno :min kilobytes.",
- "string" => "L' :attribute deve essere almeno :min caratteri.",
- ),
- "not_in" => "L' :attribute selezionato è invalido.",
- "numeric" => "L' :attribute deve essere un numero.",
- "regex" => "Il formato dell' :attribute è invalido.",
- "required" => "Il campo :attribute è obblogatorio.",
- "required_if" => "L' :attribute è richiesto quando :other è :value.",
- "required_with" => "Il campo :attribute è richiesto quando :values è presente.",
- "required_without" => "Il campo :attribute è richiesto quando :values non è presente.",
- "same" => "L' :attribute e :other devono corrispondere.",
- "size" => array(
- "numeric" => "L' :attribute deve essere :size.",
- "file" => "L' :attribute deve essere :size kilobytes.",
- "string" => "L' :attribute deve essere :size characters.",
- ),
- "unique" => "L' :attribute è già stato preso.",
- "url" => "Il formato dell' :attribute è invalido.",
- "statuslabel_type" => "Devi selezionare un tipo di stato valido",
- "unique_undeleted" => "L'attributo deve essere univoco.",
+ 'accepted' => 'il :attribute è stato accettato.',
+ 'active_url' => ':attribute non è un URL valido.',
+ 'after' => ':attribute deve essere una data oltre il :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :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.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute deve essere una data dopo :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute deve essere tra :min - :max.',
+ 'file' => 'il :attribute deve essere tra :min - :max kilobytes.',
+ 'string' => 'il :attribute deve essere tra :min - :max caratteri.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'il :attribute non corrisponde.',
+ 'date' => 'la :attribute non è valida.',
+ 'date_format' => 'il :attribute non corrisponde al :format.',
+ 'different' => 'il :attribute e :other devono essere differenti.',
+ 'digits' => 'il :attribute deve essere :digits digits.',
+ 'digits_between' => 'il :attribute deve essere tra :min e :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'il formato del :attribute è invalido.',
+ 'exists' => ':attribute selezzionato è invalido.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'il :attribute deve essere un immagine.',
+ 'in' => 'Il selezionato :attribute è invalido.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'L\' :attribute deve essere un numero intero.',
+ 'ip' => 'L\' :attribute deve essere un indirizzo IP valido.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'L\' :attribute non può essere superiore di :max.',
+ 'file' => 'L\' :attribute non può essere maggiore di :max kilobytes.',
+ 'string' => 'L\' :attribute non può essere maggiore di :max caratteri.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'L\' :attribute deve essere un file di type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'L\' :attribute deve essere almeno :min.',
+ 'file' => 'L\' :attribute deve essere almeno :min kilobytes.',
+ 'string' => 'L\' :attribute deve essere almeno :min caratteri.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'L\' :attribute selezionato è invalido.',
+ 'numeric' => 'L\' :attribute deve essere un numero.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Il formato dell\' :attribute è invalido.',
+ 'required' => 'Il campo :attribute è obblogatorio.',
+ 'required_if' => 'L\' :attribute è richiesto quando :other è :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'Il campo :attribute è richiesto quando :values è presente.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'Il campo :attribute è richiesto quando :values non è presente.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'L\' :attribute e :other devono corrispondere.',
+ 'size' => [
+ 'numeric' => 'L\' :attribute deve essere :size.',
+ 'file' => 'L\' :attribute deve essere :size kilobytes.',
+ 'string' => 'L\' :attribute deve essere :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'L\' :attribute è già stato preso.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Il formato dell\' :attribute è invalido.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Il campo :attribute contiene un carattere che non è permesso.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/ja/admin/asset_maintenances/message.php b/resources/lang/ja/admin/asset_maintenances/message.php
index 543ec8b7d5..5c304861eb 100644
--- a/resources/lang/ja/admin/asset_maintenances/message.php
+++ b/resources/lang/ja/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => '資産管理の作成に成功しました。'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => '不完全です。',
'warranty' => '保証',
diff --git a/resources/lang/ja/admin/hardware/general.php b/resources/lang/ja/admin/hardware/general.php
index ff31713b93..a7d33fd7c1 100644
--- a/resources/lang/ja/admin/hardware/general.php
+++ b/resources/lang/ja/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => '資産',
'bulk_checkout' => '利用者に資産をチェックアウトする',
'checkin' => '資産をチェックイン',
- 'checkout' => '利用者に資産をチェックアウト',
+ 'checkout' => 'Checkout Asset',
'clone' => '資産を複製',
'deployable' => '配備可能',
'deleted' => 'この資産は削除されました。復元するにはココをクリックして下さい。',
diff --git a/resources/lang/ja/admin/hardware/message.php b/resources/lang/ja/admin/hardware/message.php
index 6c084c2b1d..0e55642a15 100644
--- a/resources/lang/ja/admin/hardware/message.php
+++ b/resources/lang/ja/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => '資産は正常に復元されました。'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'ファイルが削除できませんでした。もう一度、やり直して下さい。',
'success' => 'ファイルは正常に削除されました。',
diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php
index 5575980419..c6f89317f0 100644
--- a/resources/lang/ja/admin/settings/general.php
+++ b/resources/lang/ja/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'アラートを無視する期間',
'alert_inv_threshold' => 'インベントリのアラート間隔',
'asset_ids' => '資産ID',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => '資産IDを自動採番で生成',
'auto_increment_prefix' => 'プレフィクス (オプション)',
'auto_incrementing_help' => 'この初期値を使って資産IDの自動採番を有効化',
diff --git a/resources/lang/ja/admin/users/general.php b/resources/lang/ja/admin/users/general.php
index 6cb9179046..87c4bd03dc 100644
--- a/resources/lang/ja/admin/users/general.php
+++ b/resources/lang/ja/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => '許可するファイルタイプ（png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar）',
'history_user' => ':nameの履歴',
'info' => '情報',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => '最終ログイン',
'ldap_config_text' => 'LDAP 構成設定 管理者 > 設定。 選択した場所は、インポートされたすべてのユーザーに対して設定されます。',
'software_user' => 'ソフトウェアは :name にチェックアウトしました。',
diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php
index 3b9c7068ef..01ec5ba7a1 100644
--- a/resources/lang/ja/general.php
+++ b/resources/lang/ja/general.php
@@ -18,11 +18,15 @@
'asset_report' => '資産レポート',
'asset_tag' => '資産タグ',
'assets_available' => '利用可能な資産',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => '資産数',
'avatar_delete' => 'アバターを削除',
'avatar_upload' => 'アバターをアップロード',
'back' => '戻る',
'bad_data' => '存在しませんでした。データに誤りがあるかもしれません。',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => '一括チェックアウト',
'cancel' => 'キャンセル',
'categories' => 'カテゴリー',
@@ -52,6 +56,8 @@
'current' => '現在の状況',
'custom_report' => '資産レポートをカスタム',
'dashboard' => 'ダッシュボード',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => '日付',
'debug_warning' => '警告!',
'debug_warning_text' => 'このアプリケーションはデバッグモードがONのままプロダクションモードで実行されています。もしアプリケーションが外部からアクセス可能な場合、機密データが抜き取られる可能性があります。.envのAPP_DEBUGをfalseにしてください。',
@@ -117,6 +123,8 @@
'moreinfo' => '詳細',
'name' => '名前',
'next' => '次へ',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => '新規',
'no_depreciation' => '非減価償却資産',
'no_results' => '結果はありません。',
diff --git a/resources/lang/ja/validation.php b/resources/lang/ja/validation.php
index c77eea93f9..36d936988d 100644
--- a/resources/lang/ja/validation.php
+++ b/resources/lang/ja/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute は、承認される必要があります。",
- "active_url" => ":attribute は、有効なURLではありません。",
- "after" => ":attribute は :date よりも後の日付にして下さい。",
- "alpha" => ":attribute は、文字が含まれている必要があります。",
- "alpha_dash" => ":attribute は、文字列、数字、ダッシュ（−）のみ含めることが出来ます。",
- "alpha_num" => ":attribute は、文字列と数字のみ含めることが出来ます。",
- "before" => ":attribute は :date よりも前の日付にして下さい。",
- "between" => array(
- "numeric" => ":attribute は :min - :max の範囲内にして下さい。",
- "file" => ":attribute は :min - :max キロバイトの範囲内にして下さい。",
- "string" => ":attribute は :min - :max 文字の範囲内にして下さい。",
- ),
- "boolean" => ":attribute は、 true もしくは false にしてください。",
- "confirmed" => ":attribute が、一致しませんでした。",
- "date" => ":attribute は、無効な日付です。",
- "date_format" => ":attribute フォーマット :format に一致しません。",
- "different" => ":attribute と :other は、異なっている必要があります。",
- "digits" => ":attribute は :digits 数値にして下さい。",
- "digits_between" => ":attribute は :min - :max 内の数値にして下さい。",
- "email" => ":attribute フォーマットが不正です。",
- "exists" => "選択された :attribute は不正です。",
- "email_array" => "指定の電子メールアドレスは無効です。",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute は画像にして下さい。",
- "in" => "選択された :attribute は不正です。",
- "integer" => ":attribute は整数にして下さい。",
- "ip" => ":attribute は有効なIPアドレスにして下さい。",
- "max" => array(
- "numeric" => ":attribute は :max 以上にして下さい。",
- "file" => ":attribute は :max キロバイト以上にして下さい。",
- "string" => ":attribute は :max 文字以上にして下さい。",
- ),
- "mimes" => ":attribute は ファイルタイプ :values にして下さい。",
- "min" => array(
- "numeric" => ":attribute は、少なくとも :min 以上にして下さい。",
- "file" => ":attribute は、少なくとも :min キロバイト以上にして下さい。",
- "string" => ":attribute は、少なくとも :min 文字以上にして下さい。",
- ),
- "not_in" => "選択された :attribute は不正です。",
- "numeric" => ":attribute は数字にして下さい。",
- "regex" => ":attribute フォーマットが不正です。",
- "required" => ":attribute フィールドは、必須です。",
- "required_if" => ":other が :value の時、:attribute フィールドは必須です。",
- "required_with" => ":value が存在する場合、:attribute フィールドは必須です。",
- "required_without" => ":value が存在しな場合、:attribute フィールドは必須です。",
- "same" => ":attribute と :other は、一致しなければなりません。",
- "size" => array(
- "numeric" => ":attribute は :size にして下さい。",
- "file" => ":attribute は :size キロバイトにして下さい。",
- "string" => ":attribute は :size 文字にして下さい。",
- ),
- "unique" => ":attribute は、取得済みです。",
- "url" => ":attribute フォーマットが不正です。",
- "statuslabel_type" => "有効なステータス ラベルの種類を選択する必要があります。",
- "unique_undeleted" => ":attribute は 一意の値である必要があります。",
+ 'accepted' => ':attribute は、承認される必要があります。',
+ 'active_url' => ':attribute は、有効なURLではありません。',
+ 'after' => ':attribute は :date よりも後の日付にして下さい。',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute は、文字が含まれている必要があります。',
+ 'alpha_dash' => ':attribute は、文字列、数字、ダッシュ（−）のみ含めることが出来ます。',
+ 'alpha_num' => ':attribute は、文字列と数字のみ含めることが出来ます。',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute は :date よりも前の日付にして下さい。',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute は :min - :max の範囲内にして下さい。',
+ 'file' => ':attribute は :min - :max キロバイトの範囲内にして下さい。',
+ 'string' => ':attribute は :min - :max 文字の範囲内にして下さい。',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute は、 true もしくは false にしてください。',
+ 'confirmed' => ':attribute が、一致しませんでした。',
+ 'date' => ':attribute は、無効な日付です。',
+ 'date_format' => ':attribute フォーマット :format に一致しません。',
+ 'different' => ':attribute と :other は、異なっている必要があります。',
+ 'digits' => ':attribute は :digits 数値にして下さい。',
+ 'digits_between' => ':attribute は :min - :max 内の数値にして下さい。',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute フォーマットが不正です。',
+ 'exists' => '選択された :attribute は不正です。',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute は画像にして下さい。',
+ 'in' => '選択された :attribute は不正です。',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute は整数にして下さい。',
+ 'ip' => ':attribute は有効なIPアドレスにして下さい。',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute は :max 以上にして下さい。',
+ 'file' => ':attribute は :max キロバイト以上にして下さい。',
+ 'string' => ':attribute は :max 文字以上にして下さい。',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute は ファイルタイプ :values にして下さい。',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute は、少なくとも :min 以上にして下さい。',
+ 'file' => ':attribute は、少なくとも :min キロバイト以上にして下さい。',
+ 'string' => ':attribute は、少なくとも :min 文字以上にして下さい。',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => '選択された :attribute は不正です。',
+ 'numeric' => ':attribute は数字にして下さい。',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute フォーマットが不正です。',
+ 'required' => ':attribute フィールドは、必須です。',
+ 'required_if' => ':other が :value の時、:attribute フィールドは必須です。',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':value が存在する場合、:attribute フィールドは必須です。',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':value が存在しな場合、:attribute フィールドは必須です。',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute と :other は、一致しなければなりません。',
+ 'size' => [
+ 'numeric' => ':attribute は :size にして下さい。',
+ 'file' => ':attribute は :size キロバイトにして下さい。',
+ 'string' => ':attribute は :size 文字にして下さい。',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute は、取得済みです。',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute フォーマットが不正です。',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => ":attribute フィールドに、禁止文字列が含まれています。",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/ko/admin/asset_maintenances/message.php b/resources/lang/ko/admin/asset_maintenances/message.php
index c653e2d8d0..229e6e699a 100644
--- a/resources/lang/ko/admin/asset_maintenances/message.php
+++ b/resources/lang/ko/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => '자산 관리가 생성되었습니다.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => '아직 완료되지 않았습니다.',
'warranty' => '보증',
diff --git a/resources/lang/ko/admin/hardware/general.php b/resources/lang/ko/admin/hardware/general.php
index 757dc1b6a4..cee997a06b 100644
--- a/resources/lang/ko/admin/hardware/general.php
+++ b/resources/lang/ko/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => '자산',
'bulk_checkout' => '사용자에게 반출할 자산',
'checkin' => '반입 자산',
- 'checkout' => '사용자에게 반출된 자산',
+ 'checkout' => 'Checkout Asset',
'clone' => '자산 복제',
'deployable' => '사용가능',
'deleted' => '이 자산은 삭제되었습니다. 복원하려면 여기를 클릭하세요.',
diff --git a/resources/lang/ko/admin/hardware/message.php b/resources/lang/ko/admin/hardware/message.php
index 7094dc66d7..53f107bf23 100644
--- a/resources/lang/ko/admin/hardware/message.php
+++ b/resources/lang/ko/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => '자산이 복원되었습니다.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => '파일이 삭제되지 않았습니다. 다시 시도해 주세요.',
'success' => '파일이 삭제되었습니다.',
diff --git a/resources/lang/ko/admin/settings/general.php b/resources/lang/ko/admin/settings/general.php
index c2cb61227d..b8833574ac 100644
--- a/resources/lang/ko/admin/settings/general.php
+++ b/resources/lang/ko/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => '(일자) 최대값 만료 알림',
'alert_inv_threshold' => '재고 알림 최대값',
'asset_ids' => '자산 ID',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => '자동-증가 자산 ID 생성',
'auto_increment_prefix' => '접두사 (부가적)',
'auto_incrementing_help' => '이 것을 설정하려면 자동-증가 자산 ID 사용을 하세요.',
diff --git a/resources/lang/ko/admin/users/general.php b/resources/lang/ko/admin/users/general.php
index 48bc9c237f..a42cf355e0 100644
--- a/resources/lang/ko/admin/users/general.php
+++ b/resources/lang/ko/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => '허용되는 형식들은 png, gif, jpeg, doc, docx, pdf, txt, zip, rar 입니다.',
'history_user' => '이력 :name',
'info' => '정보',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => '마지막 로그인',
'ldap_config_text' => 'LDAP 구성 설정들은 Admin > Settings 에서 찾을 수 있습니다. (부가적으로) 선택된 장소는 불러온 모든 사용자들에게 설정됩니다.',
'software_user' => '소프트웨어 반출 목록 :name',
diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php
index f3730dd66c..4d8d670398 100644
--- a/resources/lang/ko/general.php
+++ b/resources/lang/ko/general.php
@@ -18,11 +18,15 @@
'asset_report' => '자산 보고서',
'asset_tag' => '자산 태그',
'assets_available' => '사용가능 자산',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => '자산',
'avatar_delete' => '아바타 삭제',
'avatar_upload' => '아바타 올리기',
'back' => '이전',
'bad_data' => '찾을 수 없습니다. 잘못된 데이터 인가요?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => '대량 반출',
'cancel' => '취소',
'categories' => '분류',
@@ -52,6 +56,8 @@
'current' => '현재',
'custom_report' => '맞춤형 자산 보고서',
'dashboard' => '대시보드',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => '날짜',
'debug_warning' => '경고!',
'debug_warning_text' => '이 프로그램은 디버깅이 가능한 제품 모드에서 구동중입니다. 당신의 프로그램이 외부 환경과 접속이 가능하다면 중요한 자료가 유출될 수 있습니다. .env 파일의 APP_DEBUG 값을 false 로 설정하여 디버깅을 비활성화 하세요.',
@@ -117,6 +123,8 @@
'moreinfo' => '추가 정보',
'name' => '이름',
'next' => '다음',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => '신규!',
'no_depreciation' => '감가 상각 없음',
'no_results' => '결과 없음.',
diff --git a/resources/lang/ko/validation.php b/resources/lang/ko/validation.php
index 38732668f4..3f6cae0f39 100644
--- a/resources/lang/ko/validation.php
+++ b/resources/lang/ko/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute 가 수락되었습니다.",
- "active_url" => ":attribute 는 잘못된 URL 입니다.",
- "after" => ":attribute 는 :date 뒤에 오는 날짜 형식이어야 합니다.",
- "alpha" => ":attribute 는 문자만 포함해야 합니다.",
- "alpha_dash" => ":attribute는 문자, 숫자, 대쉬기호만 포함 할 수 있습니다.",
- "alpha_num" => ":attribute 는 문자와 숫자만 포함할 수 있습니다.",
- "before" => ":attribute 는 :date 앞의 날짜 형식이 되야 합니다.",
- "between" => array(
- "numeric" => ":attribute 는 :min - :max 사이의 값입니다.",
- "file" => ":attribute 는 :min - :max Kbyte 사이의 값입니다.",
- "string" => ":attribute 는 :min - :max 자 사이의 문자입니다.",
- ),
- "boolean" => ":attribute 는 참 또는 거짓의 속성만 지정 가능합니다.",
- "confirmed" => ":attribute 확인이 일치 하지 않습니다.",
- "date" => ":attribute 는 잘못된 날짜 입니다.",
- "date_format" => ":attribute 는 :format 형식과 일치하지 않습니다.",
- "different" => ":attribute 와 :other 는 서로 달라야 합니다.",
- "digits" => ":attribute 는 :digits 자리수여야 합니다.",
- "digits_between" => ":attribute 는 :min - :max 자릿수 사이여야 합니다.",
- "email" => ":attribute 형식이 부정확 합니다.",
- "exists" => "선택한 :attribute 가 부정확 합니다.",
- "email_array" => "하나 이상의 주소가 유효하지 않습니다.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute 는 이미지 형식만 가능합니다.",
- "in" => "선택한 :attribute 가 부정확 합니다.",
- "integer" => ":attribute 는 정수이어야 합니다.",
- "ip" => ":attribute 는 유효한 IP 주소이어야 합니다.",
- "max" => array(
- "numeric" => ":attribute 는 :max 보다 작아야 합니다.",
- "file" => ":attribute 는 :max Kbyte보다 작아야 합니다.",
- "string" => ":attribute 는 :max 자보다 작아야 합니다.",
- ),
- "mimes" => ":attribute 는 :values 형식의 파일만 가능합니다.",
- "min" => array(
- "numeric" => ":attribute 는 최소 :min 이어야 합니다.",
- "file" => ":attribute 는 최소 :min Kbyte 이어야 합니다.",
- "string" => ":attribute 는 최소 :min 자 이어야 합니다.",
- ),
- "not_in" => "선택한 :attribute 가 부정확 합니다.",
- "numeric" => ":attribute 는 숫자만 가능합니다.",
- "regex" => ":attribute 형식이 부정확 합니다.",
- "required" => ":attribute 항목을 입력해 주세요.",
- "required_if" => ":attribute 항목은 :other가 :value 일때 필요합니다.",
- "required_with" => ":attribute 항목은 :values 가 존재할 때 필요합니다.",
- "required_without" => ":attribute 항목은 :values 가 존재하지 않을 때 필요합니다.",
- "same" => ":attribute 와 :other 는 일치해야 합니다.",
- "size" => array(
- "numeric" => ":attribute 는 :size 가 되야 합니다.",
- "file" => ":attribute 는 :size Kbyte 가 되야 합니다.",
- "string" => ":attribute 는 :size 자가 되야 합니다.",
- ),
- "unique" => ":attribute 는 이미 획득하였습니다.",
- "url" => ":attribute 형식이 부정확 합니다.",
- "statuslabel_type" => "올바른 상태 꼬리표 형식을 선택해 주셔야 합니다",
- "unique_undeleted" => ":attribute 는 고유의 값만 가져야 합니다.",
+ 'accepted' => ':attribute 가 수락되었습니다.',
+ 'active_url' => ':attribute 는 잘못된 URL 입니다.',
+ 'after' => ':attribute 는 :date 뒤에 오는 날짜 형식이어야 합니다.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute 는 문자만 포함해야 합니다.',
+ 'alpha_dash' => ':attribute는 문자, 숫자, 대쉬기호만 포함 할 수 있습니다.',
+ 'alpha_num' => ':attribute 는 문자와 숫자만 포함할 수 있습니다.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute 는 :date 앞의 날짜 형식이 되야 합니다.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute 는 :min - :max 사이의 값입니다.',
+ 'file' => ':attribute 는 :min - :max Kbyte 사이의 값입니다.',
+ 'string' => ':attribute 는 :min - :max 자 사이의 문자입니다.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute 는 참 또는 거짓의 속성만 지정 가능합니다.',
+ 'confirmed' => ':attribute 확인이 일치 하지 않습니다.',
+ 'date' => ':attribute 는 잘못된 날짜 입니다.',
+ 'date_format' => ':attribute 는 :format 형식과 일치하지 않습니다.',
+ 'different' => ':attribute 와 :other 는 서로 달라야 합니다.',
+ 'digits' => ':attribute 는 :digits 자리수여야 합니다.',
+ 'digits_between' => ':attribute 는 :min - :max 자릿수 사이여야 합니다.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute 형식이 부정확 합니다.',
+ 'exists' => '선택한 :attribute 가 부정확 합니다.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute 는 이미지 형식만 가능합니다.',
+ 'in' => '선택한 :attribute 가 부정확 합니다.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute 는 정수이어야 합니다.',
+ 'ip' => ':attribute 는 유효한 IP 주소이어야 합니다.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute 는 :max 보다 작아야 합니다.',
+ 'file' => ':attribute 는 :max Kbyte보다 작아야 합니다.',
+ 'string' => ':attribute 는 :max 자보다 작아야 합니다.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute 는 :values 형식의 파일만 가능합니다.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute 는 최소 :min 이어야 합니다.',
+ 'file' => ':attribute 는 최소 :min Kbyte 이어야 합니다.',
+ 'string' => ':attribute 는 최소 :min 자 이어야 합니다.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => '선택한 :attribute 가 부정확 합니다.',
+ 'numeric' => ':attribute 는 숫자만 가능합니다.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute 형식이 부정확 합니다.',
+ 'required' => ':attribute 항목을 입력해 주세요.',
+ 'required_if' => ':attribute 항목은 :other가 :value 일때 필요합니다.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute 항목은 :values 가 존재할 때 필요합니다.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute 항목은 :values 가 존재하지 않을 때 필요합니다.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute 와 :other 는 일치해야 합니다.',
+ 'size' => [
+ 'numeric' => ':attribute 는 :size 가 되야 합니다.',
+ 'file' => ':attribute 는 :size Kbyte 가 되야 합니다.',
+ 'string' => ':attribute 는 :size 자가 되야 합니다.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute 는 이미 획득하였습니다.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute 형식이 부정확 합니다.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => ":attribute 항목에는 문자를 입력할 수 없습니다.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/lt/admin/asset_maintenances/message.php b/resources/lang/lt/admin/asset_maintenances/message.php
index 0b2cbae117..bfe3632c9b 100644
--- a/resources/lang/lt/admin/asset_maintenances/message.php
+++ b/resources/lang/lt/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Įrangos priežiūra sukurta sėkmingai.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Nebaigta',
'warranty' => 'Garantija',
diff --git a/resources/lang/lt/admin/hardware/general.php b/resources/lang/lt/admin/hardware/general.php
index 5d385175e2..f3f8fd1a24 100644
--- a/resources/lang/lt/admin/hardware/general.php
+++ b/resources/lang/lt/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Įranga',
'bulk_checkout' => 'Išduoti įrangą naudotojui',
'checkin' => 'Išduota įranga',
- 'checkout' => 'Įranga išduota naudotojui',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Kopijuoti įrangą',
'deployable' => 'Naudojamas',
'deleted' => 'Ši įranga buvo ištrinta. Paspauskit čia ją atkurti.',
diff --git a/resources/lang/lt/admin/hardware/message.php b/resources/lang/lt/admin/hardware/message.php
index f70e814497..e7e3a42064 100644
--- a/resources/lang/lt/admin/hardware/message.php
+++ b/resources/lang/lt/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => 'Įranga atkurta sėkmingai.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Failas neištrintas. Prašome bandykite dar kartą.',
'success' => 'Failas sėkmingai ištrintas.',
diff --git a/resources/lang/lt/admin/settings/general.php b/resources/lang/lt/admin/settings/general.php
index 09d4ecc292..0554016bba 100644
--- a/resources/lang/lt/admin/settings/general.php
+++ b/resources/lang/lt/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Įrangos ID',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Sukurti automatiškai didėjantį įragos ID nr.',
'auto_increment_prefix' => 'Papilomas priedėlis (pasirinktinai)',
'auto_incrementing_help' => 'Įjungti automatiškai didėjantį įrangos ID pirmajam suteikiant šį nr.',
diff --git a/resources/lang/lt/admin/users/general.php b/resources/lang/lt/admin/users/general.php
index 2e2f997942..add252e077 100644
--- a/resources/lang/lt/admin/users/general.php
+++ b/resources/lang/lt/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Leidžiami dokumentų formatai png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.',
'history_user' => ':name naudotojo istorija',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Paskutinis prisijungimas',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => ':name išduota įranga',
diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php
index 6ab4f0902d..c20402b3ba 100644
--- a/resources/lang/lt/general.php
+++ b/resources/lang/lt/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Įrangos ataskaitos',
'asset_tag' => 'Įrangos nr.',
'assets_available' => 'laisva įranga',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Įranga',
'avatar_delete' => 'Ištrinti ikoną',
'avatar_upload' => 'Įkelti ikoną',
'back' => 'Grįžti',
'bad_data' => 'Nieko nerasta. Galbūt blogi duomenys?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Atšaukti',
'categories' => 'Kategorijos',
@@ -52,6 +56,8 @@
'current' => 'Dabartinis',
'custom_report' => 'Pasirenkama įrangos ataskaita',
'dashboard' => 'Valdymo skydelis',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Data',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Daugiau informacijos',
'name' => 'Vardas',
'next' => 'Kitas',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'Nėra nusidėvėjimo',
'no_results' => 'Rezultatų nerasta.',
diff --git a/resources/lang/lt/validation.php b/resources/lang/lt/validation.php
index b4fa613227..f52071e56a 100644
--- a/resources/lang/lt/validation.php
+++ b/resources/lang/lt/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute turi būti patvirtintas.",
- "active_url" => ":attribute nėra tinkamas interentinis puslapis.",
- "after" => ":attribute privalo būti data po :date.",
- "alpha" => ":attribute gali būti tik raidės.",
- "alpha_dash" => ":attribute gali būti tik raidės, skaičiai ir brūkšneliai.",
- "alpha_num" => ":attribute gali būti tik raidės ir skaičiai.",
- "before" => ":attribute turi būti data prieš :date.",
- "between" => array(
- "numeric" => ":attribute privalo būti tarp :min - :max.",
- "file" => ":attribute privalo būti tarp :min - :max kilobaitų.",
- "string" => ":attribute privalo būti tarp :min - :max ženklų.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => ":attribute patvirtinimas nesutampa.",
- "date" => ":attribute nėra galiojanti data.",
- "date_format" => ":attribute nesutampa su formatu :format.",
- "different" => ":attribute ir :other turi būti skirtingi.",
- "digits" => ":attribute privalo būti :digits skaičiai.",
- "digits_between" => ":attribute privalo būti tarp :min ir:max skaičių.",
- "email" => ":attribute formatas neteisingas.",
- "exists" => "Pasirinktas :attribute neteisingas.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute privalo būti paveikslėlis.",
- "in" => "Pasirinktas :attribute neteisingas.",
- "integer" => ":attribute turi būti sveikas skaičius.",
- "ip" => ":attribute privalo būti tinkamas IP adresas.",
- "max" => array(
- "numeric" => ":attribute negali būti didesnis nei :max.",
- "file" => ":attribute negali būti didesnis nei :max kilobaitų.",
- "string" => ":attribute negali būti didesnis nei :max ženklai.",
- ),
- "mimes" => ":attribute privalo būti failas, kurio formatas :values.",
- "min" => array(
- "numeric" => ":attribute privalo būti ne mažesnis nei :min.",
- "file" => ":attribute turi būti bent :min kilobaitų.",
- "string" => ":attribute privalo būti bent :min ženklai.",
- ),
- "not_in" => "Pasirinktas :attribute neteisingas.",
- "numeric" => ":attribute privalo būti skaičius.",
- "regex" => ":attribute formatas neteisingas.",
- "required" => ":attribute laukelis privalomas.",
- "required_if" => ":attribute laukelis yra privalomas kai :other yra :value.",
- "required_with" => ":attribute laukelis privalomas kai :values yra nurodytas.",
- "required_without" => ":attribute laukelis privalomas kai :values yra nenurodytas.",
- "same" => ":attribute ir :other privalo sutapti.",
- "size" => array(
- "numeric" => ":attribute privalo būti :size.",
- "file" => ":attribute privalo būti :size kilobaitų.",
- "string" => ":attribute privalo būti :size ženklų.",
- ),
- "unique" => ":attribute jau užimtas.",
- "url" => ":attribute formatas neteisingas.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => ':attribute turi būti patvirtintas.',
+ 'active_url' => ':attribute nėra tinkamas interentinis puslapis.',
+ 'after' => ':attribute privalo būti data po :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute gali būti tik raidės.',
+ 'alpha_dash' => ':attribute gali būti tik raidės, skaičiai ir brūkšneliai.',
+ 'alpha_num' => ':attribute gali būti tik raidės ir skaičiai.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute turi būti data prieš :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute privalo būti tarp :min - :max.',
+ 'file' => ':attribute privalo būti tarp :min - :max kilobaitų.',
+ 'string' => ':attribute privalo būti tarp :min - :max ženklų.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => ':attribute patvirtinimas nesutampa.',
+ 'date' => ':attribute nėra galiojanti data.',
+ 'date_format' => ':attribute nesutampa su formatu :format.',
+ 'different' => ':attribute ir :other turi būti skirtingi.',
+ 'digits' => ':attribute privalo būti :digits skaičiai.',
+ 'digits_between' => ':attribute privalo būti tarp :min ir:max skaičių.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute formatas neteisingas.',
+ 'exists' => 'Pasirinktas :attribute neteisingas.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute privalo būti paveikslėlis.',
+ 'in' => 'Pasirinktas :attribute neteisingas.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute turi būti sveikas skaičius.',
+ 'ip' => ':attribute privalo būti tinkamas IP adresas.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute negali būti didesnis nei :max.',
+ 'file' => ':attribute negali būti didesnis nei :max kilobaitų.',
+ 'string' => ':attribute negali būti didesnis nei :max ženklai.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute privalo būti failas, kurio formatas :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute privalo būti ne mažesnis nei :min.',
+ 'file' => ':attribute turi būti bent :min kilobaitų.',
+ 'string' => ':attribute privalo būti bent :min ženklai.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Pasirinktas :attribute neteisingas.',
+ 'numeric' => ':attribute privalo būti skaičius.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute formatas neteisingas.',
+ 'required' => ':attribute laukelis privalomas.',
+ 'required_if' => ':attribute laukelis yra privalomas kai :other yra :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute laukelis privalomas kai :values yra nurodytas.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute laukelis privalomas kai :values yra nenurodytas.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute ir :other privalo sutapti.',
+ 'size' => [
+ 'numeric' => ':attribute privalo būti :size.',
+ 'file' => ':attribute privalo būti :size kilobaitų.',
+ 'string' => ':attribute privalo būti :size ženklų.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute jau užimtas.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute formatas neteisingas.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => ":attribute laukelis turi ženklų, kurie neleidžiami.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/lv/admin/asset_maintenances/message.php b/resources/lang/lv/admin/asset_maintenances/message.php
index 83fbf698d6..d121115825 100644
--- a/resources/lang/lv/admin/asset_maintenances/message.php
+++ b/resources/lang/lv/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'Warranty',
diff --git a/resources/lang/lv/admin/hardware/general.php b/resources/lang/lv/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/lv/admin/hardware/general.php
+++ b/resources/lang/lv/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/lv/admin/hardware/message.php b/resources/lang/lv/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/lv/admin/hardware/message.php
+++ b/resources/lang/lv/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/lv/admin/settings/general.php b/resources/lang/lv/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/lv/admin/settings/general.php
+++ b/resources/lang/lv/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/lv/admin/users/general.php b/resources/lang/lv/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/lv/admin/users/general.php
+++ b/resources/lang/lv/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/lv/general.php b/resources/lang/lv/general.php
index 5a5fc5f7da..eb6409ddbb 100644
--- a/resources/lang/lv/general.php
+++ b/resources/lang/lv/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Back',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Cancel',
'categories' => 'Categories',
@@ -52,6 +56,8 @@
'current' => 'Current',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'More Info',
'name' => 'Name',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/lv/validation.php b/resources/lang/lv/validation.php
index 7a26a6515f..02cb1fa981 100644
--- a/resources/lang/lv/validation.php
+++ b/resources/lang/lv/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min and :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/mn/admin/asset_maintenances/message.php b/resources/lang/mn/admin/asset_maintenances/message.php
index 77b4773bf8..27a4c56818 100644
--- a/resources/lang/mn/admin/asset_maintenances/message.php
+++ b/resources/lang/mn/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Амжилттай үүсгэлээ.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Дуусаагүй',
'warranty' => 'Баталгаа',
diff --git a/resources/lang/mn/admin/hardware/general.php b/resources/lang/mn/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/mn/admin/hardware/general.php
+++ b/resources/lang/mn/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/mn/admin/hardware/message.php b/resources/lang/mn/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/mn/admin/hardware/message.php
+++ b/resources/lang/mn/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/mn/admin/settings/general.php b/resources/lang/mn/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/mn/admin/settings/general.php
+++ b/resources/lang/mn/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/mn/admin/users/general.php b/resources/lang/mn/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/mn/admin/users/general.php
+++ b/resources/lang/mn/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/mn/general.php b/resources/lang/mn/general.php
index a7fd0a94d5..bdde4d2cdb 100644
--- a/resources/lang/mn/general.php
+++ b/resources/lang/mn/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Буцах',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Болих',
'categories' => 'Категориуд',
@@ -52,6 +56,8 @@
'current' => 'Current',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'More Info',
'name' => 'Name',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/mn/validation.php b/resources/lang/mn/validation.php
index 7a26a6515f..02cb1fa981 100644
--- a/resources/lang/mn/validation.php
+++ b/resources/lang/mn/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min and :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/ms/admin/asset_maintenances/message.php b/resources/lang/ms/admin/asset_maintenances/message.php
index 2b0af86f04..5b57c72e42 100644
--- a/resources/lang/ms/admin/asset_maintenances/message.php
+++ b/resources/lang/ms/admin/asset_maintenances/message.php
@@ -1,21 +1,21 @@
'Asset Maintenance you were looking for was not found!',
+ 'not_found' => 'Penyelenggaraan aset yang anda cari tidak ditemui!',
'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' => 'Adakah anda pasti untuk menghapuskan penyelenggaraan aset ini?',
+ 'error' => 'Tidak dapat menghapuskan penyelenggaraan aset. Sila cuba lagi.',
+ 'success' => 'Penyelenggaraan aset telah berjaya dihapuskan.'
],
'create' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Penyelenggaraan aset belum dicipta, sila cuba lagi.',
+ 'success' => 'Penyelenggaraan aset berjaya dicipta.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
- 'asset_maintenance_incomplete' => 'Not Completed Yet',
+ 'asset_maintenance_incomplete' => 'Tidak dilengkapkan lagi',
'warranty' => 'Waranti',
- 'not_warranty' => 'Not Warranty',
+ 'not_warranty' => 'Bukan Jaminan',
];
\ No newline at end of file
diff --git a/resources/lang/ms/admin/hardware/general.php b/resources/lang/ms/admin/hardware/general.php
index fd7320aa2e..fc095844bb 100644
--- a/resources/lang/ms/admin/hardware/general.php
+++ b/resources/lang/ms/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Harta',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Terima Harta',
- 'checkout' => 'Agih Harta Kepada Pengguna',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Pendua Harta',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/ms/admin/hardware/message.php b/resources/lang/ms/admin/hardware/message.php
index f2c97fef8f..05e84aa2c2 100644
--- a/resources/lang/ms/admin/hardware/message.php
+++ b/resources/lang/ms/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/ms/admin/settings/general.php b/resources/lang/ms/admin/settings/general.php
index a1d146014a..2ff4ba3302 100644
--- a/resources/lang/ms/admin/settings/general.php
+++ b/resources/lang/ms/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/ms/admin/users/general.php b/resources/lang/ms/admin/users/general.php
index bf685372f4..68150fec8d 100644
--- a/resources/lang/ms/admin/users/general.php
+++ b/resources/lang/ms/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'Sejarah untuk :nama',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Log masuk terakhir',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Perisian diagihkan kepada :nama',
diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php
index b5c6f54f0e..57f32f4392 100644
--- a/resources/lang/ms/general.php
+++ b/resources/lang/ms/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Laporan Harta',
'asset_tag' => 'Tag Harta',
'assets_available' => 'Harta yang ada',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Harta',
'avatar_delete' => 'Hapuskan Avatar',
'avatar_upload' => 'Muat naik Avatar',
'back' => 'Belakang',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Batalkan',
'categories' => 'Categories',
@@ -52,6 +56,8 @@
'current' => 'Semasa',
'custom_report' => 'Laporan Harta Pilihan',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Tarikh',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Maklumat tambahan',
'name' => 'Nama',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'Tiada Susut Nilai',
'no_results' => 'Tiada kepututsan.',
diff --git a/resources/lang/ms/validation.php b/resources/lang/ms/validation.php
index c874a5d3e1..5057df387e 100644
--- a/resources/lang/ms/validation.php
+++ b/resources/lang/ms/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute mesti diterima.",
- "active_url" => ":attribute URL yang tidak sah.",
- "after" => ":attribute mesti tarik selepas must :date.",
- "alpha" => ":attribute hanya boleh mengandungi huruf.",
- "alpha_dash" => ":attribute hanya boleh mengandungi huruf, nombor dan tanda tolak.",
- "alpha_num" => ":attribute hanya boleh mengadungi huruf dan nombor.",
- "before" => ":attribute mestilah tarikh sebelum :date.",
- "between" => array(
- "numeric" => ":attribute mesti berada diantara :min - :max.",
- "file" => ":attribute mesti diantara :min - :max kilobytes.",
- "string" => ":attribute mesti diantara :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => ":attribute pengesahan tidak sama.",
- "date" => ":attribute tarikh yang tidak sah.",
- "date_format" => ":attribute tidak mengikut format :format.",
- "different" => ":attribute dan :other mesti berbeza.",
- "digits" => ":attribute mesti :digits digit.",
- "digits_between" => ":attribute mesti diantara :min and :max digit.",
- "email" => ":attribute format tidak sah.",
- "exists" => "Piliah :attribute tidak sah.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute mesti imej.",
- "in" => "Piliah :attribute tidak sah.",
- "integer" => ":attribute mesti integer.",
- "ip" => ":attribute mesti alamat IP yang sah.",
- "max" => array(
- "numeric" => ":attribute tidak boleh lebih besar dari :max.",
- "file" => ":attribute tidak boleh lebih besar dari :max kilobytes.",
- "string" => ":attribute tidak boleh lebih besar dari :max characters.",
- ),
- "mimes" => ":attribute mesti fail jenis: :values.",
- "min" => array(
- "numeric" => ":attribute mesti sekurang2nya :min.",
- "file" => ":attribute mesti sekurang2nya :min kilobytes.",
- "string" => ":attribute mesti sekurang2nya :min characters.",
- ),
- "not_in" => "Piliah :attribute tidak sah.",
- "numeric" => ":attribute mesti nombor.",
- "regex" => ":attribute format tidak sah.",
- "required" => ":attribute ruangan diperlukan.",
- "required_if" => ":attribute rungan diperlukan bila :other adalah :value.",
- "required_with" => ":attribute ruangan diperlukan bila :values wujud.",
- "required_without" => ":attribute ruangan diperlukan bila :values tidak wujud.",
- "same" => ":attribute dan :other mesti sama.",
- "size" => array(
- "numeric" => ":attribute mesti :size.",
- "file" => ":attribute mesti :size kilobytes.",
- "string" => ":attribute mesti :size aksara.",
- ),
- "unique" => ":attribute telah diambil.",
- "url" => ":attribute format tidak sah.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => ':attribute mesti diterima.',
+ 'active_url' => ':attribute URL yang tidak sah.',
+ 'after' => ':attribute mesti tarik selepas must :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute hanya boleh mengandungi huruf.',
+ 'alpha_dash' => ':attribute hanya boleh mengandungi huruf, nombor dan tanda tolak.',
+ 'alpha_num' => ':attribute hanya boleh mengadungi huruf dan nombor.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute mestilah tarikh sebelum :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute mesti berada diantara :min - :max.',
+ 'file' => ':attribute mesti diantara :min - :max kilobytes.',
+ 'string' => ':attribute mesti diantara :min - :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => ':attribute pengesahan tidak sama.',
+ 'date' => ':attribute tarikh yang tidak sah.',
+ 'date_format' => ':attribute tidak mengikut format :format.',
+ 'different' => ':attribute dan :other mesti berbeza.',
+ 'digits' => ':attribute mesti :digits digit.',
+ 'digits_between' => ':attribute mesti diantara :min and :max digit.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute format tidak sah.',
+ 'exists' => 'Piliah :attribute tidak sah.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute mesti imej.',
+ 'in' => 'Piliah :attribute tidak sah.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute mesti integer.',
+ 'ip' => ':attribute mesti alamat IP yang sah.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute tidak boleh lebih besar dari :max.',
+ 'file' => ':attribute tidak boleh lebih besar dari :max kilobytes.',
+ 'string' => ':attribute tidak boleh lebih besar dari :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute mesti fail jenis: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute mesti sekurang2nya :min.',
+ 'file' => ':attribute mesti sekurang2nya :min kilobytes.',
+ 'string' => ':attribute mesti sekurang2nya :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Piliah :attribute tidak sah.',
+ 'numeric' => ':attribute mesti nombor.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute format tidak sah.',
+ 'required' => ':attribute ruangan diperlukan.',
+ 'required_if' => ':attribute rungan diperlukan bila :other adalah :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute ruangan diperlukan bila :values wujud.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute ruangan diperlukan bila :values tidak wujud.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute dan :other mesti sama.',
+ 'size' => [
+ 'numeric' => ':attribute mesti :size.',
+ 'file' => ':attribute mesti :size kilobytes.',
+ 'string' => ':attribute mesti :size aksara.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute telah diambil.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute format tidak sah.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/nl/admin/asset_maintenances/message.php b/resources/lang/nl/admin/asset_maintenances/message.php
index f5dfbe028b..caf55eeccd 100644
--- a/resources/lang/nl/admin/asset_maintenances/message.php
+++ b/resources/lang/nl/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Materiaal onderhoud is met succes aangemaakt.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Nog niet voltooid',
'warranty' => 'Garantie',
diff --git a/resources/lang/nl/admin/hardware/general.php b/resources/lang/nl/admin/hardware/general.php
index 478d7a7bf9..15f667adbf 100644
--- a/resources/lang/nl/admin/hardware/general.php
+++ b/resources/lang/nl/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Materiaal',
'bulk_checkout' => 'Materiaal aan gebruiker uitleveren',
'checkin' => 'Materiaal uitlenen',
- 'checkout' => 'Leen materiaal uit aan deze gebruiker',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Kloon Materiaal',
'deployable' => 'Uitrolbaar',
'deleted' => 'Dit materiaal is verwijderd. Klik hier om te herstellen.',
diff --git a/resources/lang/nl/admin/hardware/message.php b/resources/lang/nl/admin/hardware/message.php
index 315ce0de84..8e283f0db8 100644
--- a/resources/lang/nl/admin/hardware/message.php
+++ b/resources/lang/nl/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => 'Gereedschap is succesvol hersteld.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Bestand is niet verwijderd. Probeer het opnieuw.',
'success' => 'Bestand is met succes verwijderd.',
diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php
index c407745d9e..9f488026c0 100644
--- a/resources/lang/nl/admin/settings/general.php
+++ b/resources/lang/nl/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Drempel verlopende meldingen (in dagen)',
'alert_inv_threshold' => 'Inventaris melding drempel',
'asset_ids' => 'Product ID\'s',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Genereer een auto-verhoging product ID\'s',
'auto_increment_prefix' => 'Voorvoegsel (niet verplicht)',
'auto_incrementing_help' => 'Schakel eerst auto-verhoging voor product ID\'s in',
diff --git a/resources/lang/nl/admin/users/general.php b/resources/lang/nl/admin/users/general.php
index a1e2a87d3f..ba3dc82f04 100644
--- a/resources/lang/nl/admin/users/general.php
+++ b/resources/lang/nl/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Toegestane bestandstypes zijn png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'Geschiedenis voor :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Laatst aangemeld',
'ldap_config_text' => 'LDAP configuratie kan worden gevonden in Admin > Instellingen. De (optioneel) geselecteerde locatie zal voor alle geimporteerde gebruikers ingesteld worden.',
'software_user' => 'Software toegekend aan :name',
diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php
index c5e342a98e..7789977e9f 100644
--- a/resources/lang/nl/general.php
+++ b/resources/lang/nl/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Materiaalrapport',
'asset_tag' => 'Materiaaltag',
'assets_available' => 'beschikbare materialen',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Materialen',
'avatar_delete' => 'Verwijder profielafbeelding',
'avatar_upload' => 'Upload profielafbeelding',
'back' => 'Terug',
'bad_data' => 'Niks gevonden. Misschien verkeerde data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk uitlevering',
'cancel' => 'Annuleren',
'categories' => 'Categorieën',
@@ -52,6 +56,8 @@
'current' => 'Huidige',
'custom_report' => 'Handmatig Materiaal Rapport',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Datum',
'debug_warning' => 'Waarschuwing!',
'debug_warning_text' => 'Deze applicatie draait in productie modus met foutopsporing ingeschakeld. Dit kan betekenen dat mogelijk gevoelige gegevens zichtbaar zijn voor de buitenwereld. Schakel foutopsporing uit door de APP_DEBUG variabele in je .env bestand op false te zetten.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Meer Info',
'name' => 'Naam',
'next' => 'Volgende',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'nieuw!',
'no_depreciation' => 'Geen afschrijving',
'no_results' => 'Geen resultaten.',
diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php
index 5389a6bf41..5b1c38359f 100644
--- a/resources/lang/nl/validation.php
+++ b/resources/lang/nl/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute moet geaccepteerd worden.",
- "active_url" => ":attribute is geen geldige URL.",
- "after" => ":attribute moet een datum zijn later dan :date.",
- "alpha" => ":attribute mag enkel letters bevatten.",
- "alpha_dash" => ":attribute mag enkel letters, cijfers of koppeltekens bevatten.",
- "alpha_num" => ":attribute mag enkel letters en cijfers bevatten.",
- "before" => ":attribute moet een datum zijn voor :date.",
- "between" => array(
- "numeric" => ":attribute moet een waarde hebben tussen :min en :max.",
- "file" => ":attribute moet een waarde hebben tussen :min en :max kilobytes.",
- "string" => ":attribute moet tussen de :min en :max aantal karakters lang zijn.",
- ),
- "boolean" => ":attribute moet waar of onwaar zijn.",
- "confirmed" => ":attribute bevestiging komt niet overeen.",
- "date" => ":attribute is geen geldige datum.",
- "date_format" => ":attribute komt niet overeen met het volgende formaat :format.",
- "different" => ":attribute en :other moeten verschillend zijn.",
- "digits" => ":attribute moet :digits cijfers lang zijn.",
- "digits_between" => ":attribute moet tussen de :min en :max cijfers bevatten.",
- "email" => "Het formaat van :attribute is ongeldig.",
- "exists" => "Het geselecteerde kenmerk :attribute is ongeldig.",
- "email_array" => "Een of meerdere e-mail adressen kloppen niet.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute moet een afbeelding zijn.",
- "in" => "Het geselecteerde kenmerk :attribute is ongeldig.",
- "integer" => ":attribute moet van het type integer zijn.",
- "ip" => ":attribute moet een geldig IP-adres zijn.",
- "max" => array(
- "numeric" => ":attribute moet groter zijn dan :max.",
- "file" => ":attribute mag niet groter zijn dan :max kilobytes.",
- "string" => ":attribute mag niet langer zijn dan :max karakters.",
- ),
- "mimes" => ":attribute moet een bestand zijn van het type: :values.",
- "min" => array(
- "numeric" => ":attribute moet minimum :min zijn.",
- "file" => ":attribute moet minstens :min kilobytes groot zijn.",
- "string" => ":attribute moet tenminste :min karakters bevatten.",
- ),
- "not_in" => "Het geselecteerde kenmerk :attribute is ongeldig.",
- "numeric" => ":attribute moet een getal zijn.",
- "regex" => "Het formaat van :attribute is ongeldig.",
- "required" => "Het veld :attribute is verplicht.",
- "required_if" => "het veld :attribute is verplicht als :other gelijk is aan :value.",
- "required_with" => "Het veld :attribute is verplicht als :values ingesteld staan.",
- "required_without" => "Het veld :attribute is verplicht als :values niet ingesteld staan.",
- "same" => ":attribute en :other moeten gelijk zijn.",
- "size" => array(
- "numeric" => ":attribute moet :size zijn.",
- "file" => ":attribute moet :size kilobytes groot zijn.",
- "string" => ":attribute moet :size karakters zijn.",
- ),
- "unique" => "Het veld :attribute is reeds in gebruik.",
- "url" => "Het formaat van :attribute is ongeldig.",
- "statuslabel_type" => "Je moet een geldig status label type selecteren",
- "unique_undeleted" => "Het :attribute moet uniek zijn.",
+ 'accepted' => ':attribute moet geaccepteerd worden.',
+ 'active_url' => ':attribute is geen geldige URL.',
+ 'after' => ':attribute moet een datum zijn later dan :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute mag enkel letters bevatten.',
+ 'alpha_dash' => ':attribute mag enkel letters, cijfers of koppeltekens bevatten.',
+ 'alpha_num' => ':attribute mag enkel letters en cijfers bevatten.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute moet een datum zijn voor :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute moet een waarde hebben tussen :min en :max.',
+ 'file' => ':attribute moet een waarde hebben tussen :min en :max kilobytes.',
+ 'string' => ':attribute moet tussen de :min en :max aantal karakters lang zijn.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute moet waar of onwaar zijn.',
+ 'confirmed' => ':attribute bevestiging komt niet overeen.',
+ 'date' => ':attribute is geen geldige datum.',
+ 'date_format' => ':attribute komt niet overeen met het volgende formaat :format.',
+ 'different' => ':attribute en :other moeten verschillend zijn.',
+ 'digits' => ':attribute moet :digits cijfers lang zijn.',
+ 'digits_between' => ':attribute moet tussen de :min en :max cijfers bevatten.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Het formaat van :attribute is ongeldig.',
+ 'exists' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute moet een afbeelding zijn.',
+ 'in' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute moet van het type integer zijn.',
+ 'ip' => ':attribute moet een geldig IP-adres zijn.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute moet groter zijn dan :max.',
+ 'file' => ':attribute mag niet groter zijn dan :max kilobytes.',
+ 'string' => ':attribute mag niet langer zijn dan :max karakters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute moet een bestand zijn van het type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute moet minimum :min zijn.',
+ 'file' => ':attribute moet minstens :min kilobytes groot zijn.',
+ 'string' => ':attribute moet tenminste :min karakters bevatten.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Het geselecteerde kenmerk :attribute is ongeldig.',
+ 'numeric' => ':attribute moet een getal zijn.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Het formaat van :attribute is ongeldig.',
+ 'required' => 'Het veld :attribute is verplicht.',
+ 'required_if' => 'het veld :attribute is verplicht als :other gelijk is aan :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'Het veld :attribute is verplicht als :values ingesteld staan.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'Het veld :attribute is verplicht als :values niet ingesteld staan.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute en :other moeten gelijk zijn.',
+ 'size' => [
+ 'numeric' => ':attribute moet :size zijn.',
+ 'file' => ':attribute moet :size kilobytes groot zijn.',
+ 'string' => ':attribute moet :size karakters zijn.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'Het veld :attribute is reeds in gebruik.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Het formaat van :attribute is ongeldig.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Het :attribuut veld bevat een karakter dat is niet toegestaan.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/no/admin/asset_maintenances/message.php b/resources/lang/no/admin/asset_maintenances/message.php
index 69b5cf8afb..5bae887af6 100644
--- a/resources/lang/no/admin/asset_maintenances/message.php
+++ b/resources/lang/no/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Vedlikeholdet ble opprettet.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Enda Ikke fullført',
'warranty' => 'Garanti',
diff --git a/resources/lang/no/admin/hardware/general.php b/resources/lang/no/admin/hardware/general.php
index dd340133e9..9b0af49612 100644
--- a/resources/lang/no/admin/hardware/general.php
+++ b/resources/lang/no/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Eiendel',
'bulk_checkout' => 'Sjekk ut Eiendel til Bruker',
'checkin' => 'Sjekk inn eiendel',
- 'checkout' => 'Sjekk ut eiendel til bruker',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Klon eiendel',
'deployable' => 'Utleverbar',
'deleted' => 'Denne eiendelen har blitt slettet. Klikk for å gjenopprette den.',
diff --git a/resources/lang/no/admin/hardware/message.php b/resources/lang/no/admin/hardware/message.php
index ed41901aa4..2ed1f8bbed 100644
--- a/resources/lang/no/admin/hardware/message.php
+++ b/resources/lang/no/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Vellykket gjenoppretting av eiendel.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Fil ble ikke slettet. Prøv igjen.',
'success' => 'Vellykket sletting av fil.',
diff --git a/resources/lang/no/admin/settings/general.php b/resources/lang/no/admin/settings/general.php
index 34846ded71..9905779c9b 100644
--- a/resources/lang/no/admin/settings/general.php
+++ b/resources/lang/no/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Terskel for utløpende varslinger (dager)',
'alert_inv_threshold' => 'Terskel for eiendelsvarslinger',
'asset_ids' => 'Eiendels-IDer',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generer automatisk økende eiendels-IDer',
'auto_increment_prefix' => 'Prefiks (valgfritt)',
'auto_incrementing_help' => 'Aktiver først automatisk øking av eiendels-IDer for å velge dette alternativet',
diff --git a/resources/lang/no/admin/users/general.php b/resources/lang/no/admin/users/general.php
index 73707f5cd1..7f939e5253 100644
--- a/resources/lang/no/admin/users/general.php
+++ b/resources/lang/no/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Gyldige filtyper er png, gif, jpg, jpeg, doc docx, pdf, txt, zip og rar.',
'history_user' => 'Historikk for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Siste innlogging',
'ldap_config_text' => 'LDAP-konfigurasjonsinnstillingene kan finnes på Admin > innstillinger. Den (Valgfrie) valgte plasseringen angis for alle importerte brukere.',
'software_user' => 'Programvare utsjekket til :name',
diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php
index 721a2a38f6..51cd59f43a 100644
--- a/resources/lang/no/general.php
+++ b/resources/lang/no/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Eiendelsrapport',
'asset_tag' => 'Eiendelsmerke',
'assets_available' => 'Tilgjengelige eiendeler',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Eiendeler',
'avatar_delete' => 'Slett Avatar',
'avatar_upload' => 'Last opp Avatar',
'back' => 'Tilbake',
'bad_data' => 'Fant ingenting. Kanskje feil i data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Masseutsjekk',
'cancel' => 'Avbryt',
'categories' => 'Kategorier',
@@ -52,6 +56,8 @@
'current' => 'Nåværende',
'custom_report' => 'Tilpasset eiendelsrapport',
'dashboard' => 'Kontrollpanel',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Dato',
'debug_warning' => 'Advarsel!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Mer info',
'name' => 'Navn',
'next' => 'Neste',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'ny!',
'no_depreciation' => 'Ingen avskrivning',
'no_results' => 'Ingen treff.',
diff --git a/resources/lang/no/validation.php b/resources/lang/no/validation.php
index f50883c19c..241bf70653 100644
--- a/resources/lang/no/validation.php
+++ b/resources/lang/no/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "Attributtet :attribute må velges.",
- "active_url" => "Attributtet :attribute er ikke en gyldig URL.",
- "after" => "Attributtet :attribute må være en dato etter :date.",
- "alpha" => "Attributtet :attribute kan kun inneholde bokstaver.",
- "alpha_dash" => "Attributtet :attribute kan kun inneholde bokstaver, nummer eller bindestrek.",
- "alpha_num" => "Attributtet :attribute kan kun inneholde bokstaver og numre.",
- "before" => "Attributtet :attribute må være en dato før :date.",
- "between" => array(
- "numeric" => "Attributtet :attribute må være mellom :min og :max.",
- "file" => "Attributtet :attribute må være mellom :min og :max kilobytes.",
- "string" => "Attributtet :attribute må være mellom :min og :max tegn.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "Bekreftelse på attributtet :attribute stemmer ikke.",
- "date" => "Attributtet :attribute er ikke en gyldig dato.",
- "date_format" => "Attributtet :attribute passer ikke formatet :format.",
- "different" => "Attributtet :attribute og :other er forskjellige.",
- "digits" => "Attributtet :attribute må være :digits sifre.",
- "digits_between" => "Attributtet :attribute må være mellom :min og :max sifre.",
- "email" => "Attributtet :attribute er ugyldig.",
- "exists" => "Valgt attributt :attribute er ugyldig.",
- "email_array" => "En eller flere e-postadresser er ugyldig.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "Attributtet :attribute må være et bilde.",
- "in" => "Det valgte attributtet :attribute er ugyldig.",
- "integer" => "Attributtet :attribute må være et heltall.",
- "ip" => "Attributtet :attribute må være en gyldig IP-adresse.",
- "max" => array(
- "numeric" => "Attributtet :attribute må ikke være større enn :max.",
- "file" => "Attributtet :attribute kan ikke være større enn :max kilobytes.",
- "string" => "Attributtet :attribute kan ikke være større enn :max tegn.",
- ),
- "mimes" => "Attributtet :attribute må være en fil av typen: :values.",
- "min" => array(
- "numeric" => "Attributtet :attribute må være minst :min.",
- "file" => "Attributtet :attribute må være minst :min kilobytes.",
- "string" => "Attributtet :attribute må være minst :min tegn.",
- ),
- "not_in" => "Attributtet :attribute er ugyldig.",
- "numeric" => "Attributtet :attribute må være et nummer.",
- "regex" => "Attributt-formatet til :attribute er ugyldig.",
- "required" => "Attributt-feltet :attribute er påkrevd.",
- "required_if" => "Attributt-feltet :attribute er påkrevd når :oher er :value.",
- "required_with" => "Attributt-feltet :attribute er påkrevd når :values er tilstede.",
- "required_without" => "Attributt-feltet :attribute er påkrevd når :values ikke er tilstede.",
- "same" => "Attributtet :attribute og :other må være like.",
- "size" => array(
- "numeric" => "Attributtet :attribute må være :size.",
- "file" => "Attributtet :attribute må være :size kilobytes.",
- "string" => "Attributtet :attribute må være :size tegn.",
- ),
- "unique" => "Attributtet :attribute er allerede tatt.",
- "url" => "Attributt-formatet :attribute er ugyldig.",
- "statuslabel_type" => "Du må velge en gyldig statusetikett-type",
- "unique_undeleted" => ":attribute må være unik.",
+ 'accepted' => 'Attributtet :attribute må velges.',
+ 'active_url' => 'Attributtet :attribute er ikke en gyldig URL.',
+ 'after' => 'Attributtet :attribute må være en dato etter :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => 'Attributtet :attribute kan kun inneholde bokstaver.',
+ 'alpha_dash' => 'Attributtet :attribute kan kun inneholde bokstaver, nummer eller bindestrek.',
+ 'alpha_num' => 'Attributtet :attribute kan kun inneholde bokstaver og numre.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => 'Attributtet :attribute må være en dato før :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => 'Attributtet :attribute må være mellom :min og :max.',
+ 'file' => 'Attributtet :attribute må være mellom :min og :max kilobytes.',
+ 'string' => 'Attributtet :attribute må være mellom :min og :max tegn.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'Bekreftelse på attributtet :attribute stemmer ikke.',
+ 'date' => 'Attributtet :attribute er ikke en gyldig dato.',
+ 'date_format' => 'Attributtet :attribute passer ikke formatet :format.',
+ 'different' => 'Attributtet :attribute og :other er forskjellige.',
+ 'digits' => 'Attributtet :attribute må være :digits sifre.',
+ 'digits_between' => 'Attributtet :attribute må være mellom :min og :max sifre.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Attributtet :attribute er ugyldig.',
+ 'exists' => 'Valgt attributt :attribute er ugyldig.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'Attributtet :attribute må være et bilde.',
+ 'in' => 'Det valgte attributtet :attribute er ugyldig.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'Attributtet :attribute må være et heltall.',
+ 'ip' => 'Attributtet :attribute må være en gyldig IP-adresse.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'Attributtet :attribute må ikke være større enn :max.',
+ 'file' => 'Attributtet :attribute kan ikke være større enn :max kilobytes.',
+ 'string' => 'Attributtet :attribute kan ikke være større enn :max tegn.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'Attributtet :attribute må være en fil av typen: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'Attributtet :attribute må være minst :min.',
+ 'file' => 'Attributtet :attribute må være minst :min kilobytes.',
+ 'string' => 'Attributtet :attribute må være minst :min tegn.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Attributtet :attribute er ugyldig.',
+ 'numeric' => 'Attributtet :attribute må være et nummer.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Attributt-formatet til :attribute er ugyldig.',
+ 'required' => 'Attributt-feltet :attribute er påkrevd.',
+ 'required_if' => 'Attributt-feltet :attribute er påkrevd når :oher er :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'Attributt-feltet :attribute er påkrevd når :values er tilstede.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'Attributt-feltet :attribute er påkrevd når :values ikke er tilstede.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'Attributtet :attribute og :other må være like.',
+ 'size' => [
+ 'numeric' => 'Attributtet :attribute må være :size.',
+ 'file' => 'Attributtet :attribute må være :size kilobytes.',
+ 'string' => 'Attributtet :attribute må være :size tegn.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'Attributtet :attribute er allerede tatt.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Attributt-formatet :attribute er ugyldig.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Feltet :attribute innholder ugyldige tegn.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/pl/admin/asset_maintenances/message.php b/resources/lang/pl/admin/asset_maintenances/message.php
index 62fe2e247f..dd7346b7c8 100644
--- a/resources/lang/pl/admin/asset_maintenances/message.php
+++ b/resources/lang/pl/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Konserwacja aktywa utworzona pomyślnie.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Nieukończone',
'warranty' => 'Gwarancja',
diff --git a/resources/lang/pl/admin/hardware/general.php b/resources/lang/pl/admin/hardware/general.php
index 7a755e9f5e..7a7ceba93e 100644
--- a/resources/lang/pl/admin/hardware/general.php
+++ b/resources/lang/pl/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Nabytek',
'bulk_checkout' => 'Przypisane aktywa do użytkownika',
'checkin' => 'Potwierdzanie zasobu/aktywa',
- 'checkout' => 'Przypisanie aktywa do Użytkownika',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Klonuj zasób',
'deployable' => 'Gotowe do wdrożenia',
'deleted' => 'To aktywo zostało usunięte. Kliknij tutaj, aby je przywrócić.',
diff --git a/resources/lang/pl/admin/hardware/message.php b/resources/lang/pl/admin/hardware/message.php
index e25785761e..ef00371e50 100644
--- a/resources/lang/pl/admin/hardware/message.php
+++ b/resources/lang/pl/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Aktywo zostało przywrócone.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Plik nie zostały usunięte. Spróbuj ponownie.',
'success' => 'Plik zostały usunięty.',
diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php
index 1127680b41..fe224e41c8 100644
--- a/resources/lang/pl/admin/settings/general.php
+++ b/resources/lang/pl/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Próg wygasających alarmów (w dniach)',
'alert_inv_threshold' => 'Inwentarz progu alarmów',
'asset_ids' => 'ID Aktywa',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generuj automatycznie zwiększane ID aktywa',
'auto_increment_prefix' => 'Prefix (opcjonalnie)',
'auto_incrementing_help' => 'Najpierw aktywuj automatycznie zwiększane ID Aktywa, by móc ustawić te opcje.',
diff --git a/resources/lang/pl/admin/users/general.php b/resources/lang/pl/admin/users/general.php
index cc9c77dcca..5cce99cdff 100644
--- a/resources/lang/pl/admin/users/general.php
+++ b/resources/lang/pl/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Dozwolone typy plików: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.',
'history_user' => 'Historia',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Ostatnie logowanie',
'ldap_config_text' => 'Ustawienia konfiguracji LDAP mogą być znalezione w Administracja -> Ustawienia. Opcjonalnie wybierz lokalizacje, która będzie ustawiona dla zaimportowanych użytkowników.',
'software_user' => 'Oprogramowanie przypisane do :name',
diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php
index 62f365fb67..8e4e54b1e4 100644
--- a/resources/lang/pl/general.php
+++ b/resources/lang/pl/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Raporty Aktywów',
'asset_tag' => 'Krótka nazwa',
'assets_available' => 'Aktywa dostępne',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Aktywa',
'avatar_delete' => 'Skasuj Avatara',
'avatar_upload' => 'Wgraj Avatara',
'back' => 'Powrót',
'bad_data' => 'Nie znaleziono niczego. Może coś jest nie tak z twoim zapytaniem?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Zbiorcze Przypisanie',
'cancel' => 'Anuluj',
'categories' => 'Kategorie',
@@ -52,6 +56,8 @@
'current' => 'Lista urzytkowników',
'custom_report' => 'Raport niestandardowy składnik aktywów',
'dashboard' => 'Panel główny',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Data',
'debug_warning' => 'Ostrzeżenie!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Więcej informacji',
'name' => 'Nazwa',
'next' => 'Następny',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'nowy!',
'no_depreciation' => 'Nie Amortyzowany',
'no_results' => 'Brak wyników.',
diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php
index 866700e1be..52cb372de1 100644
--- a/resources/lang/pl/validation.php
+++ b/resources/lang/pl/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute musi zostać zaakceptowany.",
- "active_url" => ":attribute nie jest poprawnym adresem URL.",
- "after" => ":attribute musi być późniejszą datą w stosunku do :date.",
- "alpha" => ":attribute może zawierać tylko litery.",
- "alpha_dash" => ":attribute może zawierać tylko litery, cyfry i myślniki.",
- "alpha_num" => ":attribute może zawierać tylko litery i cyfry.",
- "before" => ":attribute musi być późniejszą datą w stosunku do :date.",
- "between" => array(
- "numeric" => ":attribute musi być pomiędzy :min - :max.",
- "file" => ":attribute musi być pomiędzy :min - :max kilobajtów.",
- "string" => ":attribute musi być pomiędzy :min - :max znaków.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "Potwierdzenie :attribute nie pasuje.",
- "date" => ":attribute nie jest prawidłową datą.",
- "date_format" => "Format :attribute nie pasuje do :format.",
- "different" => ":attribute musi różnić się od :other.",
- "digits" => ":attribute musi posiadać cyfry :digits.",
- "digits_between" => ":attribute musi być pomiędzy cyframi :min i :max.",
- "email" => "Format pola :attribute jest niewłaściwy.",
- "exists" => "Wybrane :attribute jest niewłaściwe.",
- "email_array" => "Jeden lub więcej wprowadzonych adresów jest nieprawidłowy.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute musi być obrazkiem.",
- "in" => "Wybrane :attribute jest niewłaściwe.",
- "integer" => ":attribute must musi być liczbą całkowitą.",
- "ip" => ":attribute musi być poprawnym adresem IP.",
- "max" => array(
- "numeric" => ":attribute nie może być większy niż :max.",
- "file" => ":attribute nie może być więszky niż :max kilobajtów.",
- "string" => ":attribute nie może posiadać więcej znaków niż :max.",
- ),
- "mimes" => ":attribute musi być plikiem z rozszerzeniami :values.",
- "min" => array(
- "numeric" => ":attribute musi być przynajmniej :min.",
- "file" => ":attribute musi być przynajmniej wielkości :min kilobajtów.",
- "string" => ":attribute musi być posiadać minimum :min znaki.",
- ),
- "not_in" => "Wybrany :attribute jest nieprawidłowy.",
- "numeric" => ":attribute musi być liczbą.",
- "regex" => "Format :attribute jest niewłaściwy.",
- "required" => ":attribute nie może być puste.",
- "required_if" => "Pole :attribute jest wymagane gdy :other jest :value.",
- "required_with" => "Pole :attribute jest wymagane gdy :values jest podana.",
- "required_without" => "Pole :attribute jest wymagane gdy :values nie jest podana.",
- "same" => ":attribute i :other muszą pasować.",
- "size" => array(
- "numeric" => ":attribute musi być wielkości :size.",
- "file" => ":attribute musi być :size kilobajtów.",
- "string" => ":attribute musi być :size znakowy.",
- ),
- "unique" => ":attribute został już wzięty.",
- "url" => "Format pola :attribute jest niewłaściwy.",
- "statuslabel_type" => "Musisz wybrać poprawny status typu etykiety",
- "unique_undeleted" => ":attribute musi być unikalny.",
+ 'accepted' => ':attribute musi zostać zaakceptowany.',
+ 'active_url' => ':attribute nie jest poprawnym adresem URL.',
+ 'after' => ':attribute musi być późniejszą datą w stosunku do :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute może zawierać tylko litery.',
+ 'alpha_dash' => ':attribute może zawierać tylko litery, cyfry i myślniki.',
+ 'alpha_num' => ':attribute może zawierać tylko litery i cyfry.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute musi być późniejszą datą w stosunku do :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute musi być pomiędzy :min - :max.',
+ 'file' => ':attribute musi być pomiędzy :min - :max kilobajtów.',
+ 'string' => ':attribute musi być pomiędzy :min - :max znaków.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'Potwierdzenie :attribute nie pasuje.',
+ 'date' => ':attribute nie jest prawidłową datą.',
+ 'date_format' => 'Format :attribute nie pasuje do :format.',
+ 'different' => ':attribute musi różnić się od :other.',
+ 'digits' => ':attribute musi posiadać cyfry :digits.',
+ 'digits_between' => ':attribute musi być pomiędzy cyframi :min i :max.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Format pola :attribute jest niewłaściwy.',
+ 'exists' => 'Wybrane :attribute jest niewłaściwe.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute musi być obrazkiem.',
+ 'in' => 'Wybrane :attribute jest niewłaściwe.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute must musi być liczbą całkowitą.',
+ 'ip' => ':attribute musi być poprawnym adresem IP.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute nie może być większy niż :max.',
+ 'file' => ':attribute nie może być więszky niż :max kilobajtów.',
+ 'string' => ':attribute nie może posiadać więcej znaków niż :max.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute musi być plikiem z rozszerzeniami :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute musi być przynajmniej :min.',
+ 'file' => ':attribute musi być przynajmniej wielkości :min kilobajtów.',
+ 'string' => ':attribute musi być posiadać minimum :min znaki.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Wybrany :attribute jest nieprawidłowy.',
+ 'numeric' => ':attribute musi być liczbą.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Format :attribute jest niewłaściwy.',
+ 'required' => ':attribute nie może być puste.',
+ 'required_if' => 'Pole :attribute jest wymagane gdy :other jest :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'Pole :attribute jest wymagane gdy :values jest podana.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'Pole :attribute jest wymagane gdy :values nie jest podana.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute i :other muszą pasować.',
+ 'size' => [
+ 'numeric' => ':attribute musi być wielkości :size.',
+ 'file' => ':attribute musi być :size kilobajtów.',
+ 'string' => ':attribute musi być :size znakowy.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute został już wzięty.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Format pola :attribute jest niewłaściwy.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Pole :attribute posiada znak, który jest niedozwolony.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/pt-BR/admin/asset_maintenances/message.php b/resources/lang/pt-BR/admin/asset_maintenances/message.php
index dc3535eeb7..a1814b008e 100644
--- a/resources/lang/pt-BR/admin/asset_maintenances/message.php
+++ b/resources/lang/pt-BR/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Manutenção do ativo criada com sucesso.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Não foi Completada Ainda',
'warranty' => 'Garantia',
diff --git a/resources/lang/pt-BR/admin/hardware/general.php b/resources/lang/pt-BR/admin/hardware/general.php
index 27b8731842..4e0b41797b 100644
--- a/resources/lang/pt-BR/admin/hardware/general.php
+++ b/resources/lang/pt-BR/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Ativo',
'bulk_checkout' => 'Atribuir ativo a utilizador',
'checkin' => 'Retornar Ativo',
- 'checkout' => 'Registrar Ativo ao Usuário',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clonar Ativo',
'deployable' => 'Implementável',
'deleted' => 'Este ativo foi excluído. Clique aqui para restaurá-lo.',
diff --git a/resources/lang/pt-BR/admin/hardware/message.php b/resources/lang/pt-BR/admin/hardware/message.php
index 2646d4f061..fcb39a7efe 100644
--- a/resources/lang/pt-BR/admin/hardware/message.php
+++ b/resources/lang/pt-BR/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => 'Ativo restaurado com sucesso.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'O arquivo não foi excluído. Tente novamente.',
'success' => 'Arquivo excluído com sucesso.',
diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php
index 34b0383679..1544a17fcd 100644
--- a/resources/lang/pt-BR/admin/settings/general.php
+++ b/resources/lang/pt-BR/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Limite de Expiração dos Alertas (em dias)',
'alert_inv_threshold' => 'Limite de Alerta de Inventário',
'asset_ids' => 'ID do ativo',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Gerar ID de ativo crescente',
'auto_increment_prefix' => 'Prefixo (opcional)',
'auto_incrementing_help' => 'Permitir auto insercao dessa ID de ativo antes de configurar isso',
diff --git a/resources/lang/pt-BR/admin/users/general.php b/resources/lang/pt-BR/admin/users/general.php
index 3b1d6f1e34..40cc104ce1 100644
--- a/resources/lang/pt-BR/admin/users/general.php
+++ b/resources/lang/pt-BR/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Tipo de arquivos permitidos são png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, e rar.',
'history_user' => 'Histórico para :name',
'info' => 'Informações',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Último Login',
'ldap_config_text' => 'As configurações do LDAP podem ser encontradas em \'Administrador > Definições\'. A localização (opcional) selecionada será definida para todos os usuários importados.',
'software_user' => 'Check-out de software para :name',
diff --git a/resources/lang/pt-BR/general.php b/resources/lang/pt-BR/general.php
index 9521c318ae..fa5242a6a7 100644
--- a/resources/lang/pt-BR/general.php
+++ b/resources/lang/pt-BR/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Relatório de Ativos',
'asset_tag' => 'Marcação do Ativo',
'assets_available' => 'ativos disponíveis',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Ativos',
'avatar_delete' => 'Excluir Avatar',
'avatar_upload' => 'Carregar Avatar',
'back' => 'Voltar',
'bad_data' => 'Nada encontrado. Informações correta?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Check-out em massa',
'cancel' => 'Cancelar',
'categories' => 'Categorias',
@@ -52,6 +56,8 @@
'current' => 'Atuais',
'custom_report' => 'Relatório de Ativos Personalizado',
'dashboard' => 'Painel de Controle',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Data',
'debug_warning' => 'Atenção!',
'debug_warning_text' => 'Esta aplicação está em execução no modo de produção com a depuração ativada. Isso pode expor dados sensíveis se seu aplicativo é acessível para o mundo exterior. Desative o modo de depuração mudando o valor de APP_DEBUG no seu arquivo.env para false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Mais Informações',
'name' => 'Nome',
'next' => 'Próxima',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'novo!',
'no_depreciation' => 'Sem Depreciação',
'no_results' => 'Sem Resultados.',
diff --git a/resources/lang/pt-BR/validation.php b/resources/lang/pt-BR/validation.php
index 583c4723c3..ab8755865e 100644
--- a/resources/lang/pt-BR/validation.php
+++ b/resources/lang/pt-BR/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "O :attribute dever ser aceito.",
- "active_url" => "O :attribute não é uma URL válida.",
- "after" => "O :attribute deve ser uma data após :date.",
- "alpha" => "O :attribute pode apenas conter letras.",
- "alpha_dash" => "O :attribute pode apenas conter letras, números, e traços.",
- "alpha_num" => "O :attribute pode apenas conter letras e números.",
- "before" => "O :attribute deve ser uma data antes de :date.",
- "between" => array(
- "numeric" => "O :attribute deve estar entre :min - :max.",
- "file" => "O :attribute deve estar entre :min - :max kilobytes.",
- "string" => "O :attribute deve estar entre :min - :max caracteres.",
- ),
- "boolean" => "O :atributo têm que ser verdadeiro ou falso.",
- "confirmed" => "A confirmação do :attribute não corresponde.",
- "date" => "O :attribute não é uma data válida.",
- "date_format" => "O :attribute não corresponde ao formato :format.",
- "different" => "O :attribute e :other devem ser diferentes.",
- "digits" => "O :attribute deve ter :digits dígitos.",
- "digits_between" => "O :attribute deve ter entre :min e :max dígitos.",
- "email" => "O formato de :attribute é inválido.",
- "exists" => "O :attribute selecionado é inválido.",
- "email_array" => "Um ou mais endereços de email são invalidos.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "O :attribute deve ser uma imagem.",
- "in" => "O :attribute selecionado é inválido.",
- "integer" => "O :attribute deve ser um número inteiro.",
- "ip" => "O :attribute deve ser um endereço de IP válido.",
- "max" => array(
- "numeric" => "O :attribute não pode ser maior do que :max.",
- "file" => "O :attribute não pode ser maior do que :max kilobytes.",
- "string" => "O :attribute não pode ser maior do que :max caracteres.",
- ),
- "mimes" => "O :attribute deve ser um arquivo do tipo: :values.",
- "min" => array(
- "numeric" => "O :attribute deve ter pelo menos :min.",
- "file" => "O :attribute deve ter pelo menos :min kilobytes.",
- "string" => "O :attribute deve ter pelo menos :min caracteres.",
- ),
- "not_in" => "O :attribute selecionado é inválido.",
- "numeric" => "O :attribute deve ser um número.",
- "regex" => "O formato de :attribute é inválido.",
- "required" => "O campo de :attribute é requerido.",
- "required_if" => "O campo de :attribute é requerido quando :other é :value.",
- "required_with" => "O campo de :attribute é requerido quando :values está presente.",
- "required_without" => "O campo de :attribute é requerido quando :values não está presente.",
- "same" => "O :attribute e :other devem corresponderem.",
- "size" => array(
- "numeric" => "O :attribute deve ser :size.",
- "file" => "O :attribute deve ter :size kilobytes.",
- "string" => "O :attribute deve ter :size caracteres.",
- ),
- "unique" => "O :attribute já foi tomado.",
- "url" => "O formato de :attribute é inválido.",
- "statuslabel_type" => "Você deve selecionar um tipo de rótulo de status válido",
- "unique_undeleted" => "O :attribute deve ser exclusivo.",
+ 'accepted' => 'O :attribute dever ser aceito.',
+ 'active_url' => 'O :attribute não é uma URL válida.',
+ 'after' => 'O :attribute deve ser uma data após :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => 'O :attribute pode apenas conter letras.',
+ 'alpha_dash' => 'O :attribute pode apenas conter letras, números, e traços.',
+ 'alpha_num' => 'O :attribute pode apenas conter letras e números.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => 'O :attribute deve ser uma data antes de :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => 'O :attribute deve estar entre :min - :max.',
+ 'file' => 'O :attribute deve estar entre :min - :max kilobytes.',
+ 'string' => 'O :attribute deve estar entre :min - :max caracteres.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'O :atributo têm que ser verdadeiro ou falso.',
+ 'confirmed' => 'A confirmação do :attribute não corresponde.',
+ 'date' => 'O :attribute não é uma data válida.',
+ 'date_format' => 'O :attribute não corresponde ao formato :format.',
+ 'different' => 'O :attribute e :other devem ser diferentes.',
+ 'digits' => 'O :attribute deve ter :digits dígitos.',
+ 'digits_between' => 'O :attribute deve ter entre :min e :max dígitos.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'O formato de :attribute é inválido.',
+ 'exists' => 'O :attribute selecionado é inválido.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'O :attribute deve ser uma imagem.',
+ 'in' => 'O :attribute selecionado é inválido.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'O :attribute deve ser um número inteiro.',
+ 'ip' => 'O :attribute deve ser um endereço de IP válido.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'O :attribute não pode ser maior do que :max.',
+ 'file' => 'O :attribute não pode ser maior do que :max kilobytes.',
+ 'string' => 'O :attribute não pode ser maior do que :max caracteres.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'O :attribute deve ser um arquivo do tipo: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'O :attribute deve ter pelo menos :min.',
+ 'file' => 'O :attribute deve ter pelo menos :min kilobytes.',
+ 'string' => 'O :attribute deve ter pelo menos :min caracteres.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'O :attribute selecionado é inválido.',
+ 'numeric' => 'O :attribute deve ser um número.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'O formato de :attribute é inválido.',
+ 'required' => 'O campo de :attribute é requerido.',
+ 'required_if' => 'O campo de :attribute é requerido quando :other é :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'O campo de :attribute é requerido quando :values está presente.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'O campo de :attribute é requerido quando :values não está presente.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'O :attribute e :other devem corresponderem.',
+ 'size' => [
+ 'numeric' => 'O :attribute deve ser :size.',
+ 'file' => 'O :attribute deve ter :size kilobytes.',
+ 'string' => 'O :attribute deve ter :size caracteres.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'O :attribute já foi tomado.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'O formato de :attribute é inválido.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "O campo :attribute contém um caractere que não é permitido.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/pt-PT/admin/asset_maintenances/message.php b/resources/lang/pt-PT/admin/asset_maintenances/message.php
index 97573acc92..46a918c552 100644
--- a/resources/lang/pt-PT/admin/asset_maintenances/message.php
+++ b/resources/lang/pt-PT/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Manutenção do artigo criada com sucesso.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Incompleto',
'warranty' => 'Garantia',
diff --git a/resources/lang/pt-PT/admin/hardware/general.php b/resources/lang/pt-PT/admin/hardware/general.php
index 1f95248005..0c86a54d42 100644
--- a/resources/lang/pt-PT/admin/hardware/general.php
+++ b/resources/lang/pt-PT/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Ativo',
'bulk_checkout' => 'Atribuir artigo a utilizador',
'checkin' => 'Devolver Ativo',
- 'checkout' => 'Alocar ativo ao utilizador',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clonar Ativo',
'deployable' => 'Implementável',
'deleted' => 'Este ativo foi removido. Clique aqui para restaurar.',
diff --git a/resources/lang/pt-PT/admin/hardware/message.php b/resources/lang/pt-PT/admin/hardware/message.php
index 8dbbb1271b..621123dcdb 100644
--- a/resources/lang/pt-PT/admin/hardware/message.php
+++ b/resources/lang/pt-PT/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Artigo restaurado com sucesso.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Ficheiro não removido. Por favor, tente novamente.',
'success' => 'Ficheiro removido com sucesso.',
diff --git a/resources/lang/pt-PT/admin/settings/general.php b/resources/lang/pt-PT/admin/settings/general.php
index 878bd0c061..6fbb2c8a7a 100644
--- a/resources/lang/pt-PT/admin/settings/general.php
+++ b/resources/lang/pt-PT/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Alertas expiram (em dias)',
'alert_inv_threshold' => 'Alerta limite do inventário',
'asset_ids' => 'IDs dos Artigos',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Gerar IDs de artigos auto-incrementais',
'auto_increment_prefix' => 'Prefixo (opcional)',
'auto_incrementing_help' => 'Ative IDs auto-incrementais antes da configuração',
diff --git a/resources/lang/pt-PT/admin/users/general.php b/resources/lang/pt-PT/admin/users/general.php
index 97673da8c0..fba06cd5cf 100644
--- a/resources/lang/pt-PT/admin/users/general.php
+++ b/resources/lang/pt-PT/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Os tipos de ficheiro permitidos são png, gif, jpg, jpeg, doc, docx, pdf, txt, zip e rar.',
'history_user' => 'Histórico para :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Último início de sessão',
'ldap_config_text' => 'As definições de configuração do LDAP podem ser encontradas em Administrador > Definições. A localização (opcional) selecionada vai ser defenida para todos os utilizadores importados.',
'software_user' => 'Software alocado a :name',
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index ae9d3e7249..fc7a1c78c2 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Relatório de Artigo',
'asset_tag' => 'Etiqueta de Artigo',
'assets_available' => 'artigos disponíveis',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Artigos',
'avatar_delete' => 'Remover Avatar',
'avatar_upload' => 'Carregar Avatar',
'back' => 'Voltar',
'bad_data' => 'Nada foi encontrado. Talvez dados errados?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Saída em massa',
'cancel' => 'Cancelar',
'categories' => 'Categorias',
@@ -52,6 +56,8 @@
'current' => 'Atuais',
'custom_report' => 'Relatório de Artigo personalizado',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Data',
'debug_warning' => 'Atenção!',
'debug_warning_text' => 'Esta aplicação está em execução no modo de produção com a depuração activada. Isso pode expor dados sensíveis se seu aplicativo é acessível para o mundo exterior. Desactive o modo de depuração mudando o valor de APP_DEBUG no teu ficheiro .env para false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Mais informação',
'name' => 'Nome',
'next' => 'Próximo',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'novo!',
'no_depreciation' => 'Sem Depreciação',
'no_results' => 'Sem Resultados.',
diff --git a/resources/lang/pt-PT/validation.php b/resources/lang/pt-PT/validation.php
index cd7e6abb77..1ebfc3f225 100644
--- a/resources/lang/pt-PT/validation.php
+++ b/resources/lang/pt-PT/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "O :attribute tem que ser aceite.",
- "active_url" => "O :attribute não é um URL válido.",
- "after" => "A :attribute tem que ser superior a :date.",
- "alpha" => "O :attribute só pode conter letras.",
- "alpha_dash" => "O :attribute só pode conter letras, números e traços.",
- "alpha_num" => "O :attribute só pode conter letras e números.",
- "before" => "A :attribute tem que ser anterior a :date.",
- "between" => array(
- "numeric" => "O :attribute deve estar entre :min e :max.",
- "file" => "O :attribute deve estar entre :min e :max kilobytes.",
- "string" => "O :attribute deve estar entre :min e :max caracteres.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "A confirmação da :attribute não coincide.",
- "date" => "A :attribute não é uma data válida.",
- "date_format" => ":attribute não corresponde ao formato :format.",
- "different" => ":attribute e :other têm que ser diferentes.",
- "digits" => ":attribute de contem :digits dígitos.",
- "digits_between" => "O :attribute deve estar entre :min e :max dígitos.",
- "email" => "O formato do :attribute é inválido.",
- "exists" => "O :attribute é inválido.",
- "email_array" => "Um ou mais endereços de email são invalidos.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "O :attribute tem que ser uma imagem.",
- "in" => "O :attribute selecionado é inválido.",
- "integer" => "O :attribute tem que ser um inteiro.",
- "ip" => "O :attribute tem que ser um IP válido.",
- "max" => array(
- "numeric" => "O :attribute não pode ser maior do que :max.",
- "file" => "O :attribute não pode ter mais do que :max kilobytes.",
- "string" => "O :attribute não pode tem mais do que :max caracteres.",
- ),
- "mimes" => "O :attribute só pode contem os seguintes formatos: :values.",
- "min" => array(
- "numeric" => ":attribute deve ter pelos menos :min.",
- "file" => ":attribute deve ter pelos menos :min kilobytes.",
- "string" => "O :attribute deve conter pelos menos :min caracteres.",
- ),
- "not_in" => "O :attribute selecionado é inválido.",
- "numeric" => ":attribute tem que ser um número.",
- "regex" => "O formato do :attribute é inválido.",
- "required" => ":attribute é obrigatório.",
- "required_if" => "O :attribute é obrigatório quando :other é :value.",
- "required_with" => "O :attribute é obrigatório quando :values existem.",
- "required_without" => "O :attribute é obrigatório quando :values não existem.",
- "same" => ":attribute e :other devem coincidir.",
- "size" => array(
- "numeric" => "O :attribute deve ser maior que :size.",
- "file" => "O :attribute deve ter :size kilobytes.",
- "string" => "O :attribute deve conter :size caracteres.",
- ),
- "unique" => "Este :attribute já existe.",
- "url" => "O formato do :attribute é inválido.",
- "statuslabel_type" => "Deve selecionar um tipo de rótulo de estado valido",
- "unique_undeleted" => "O :atribute deve ser único.",
+ 'accepted' => 'O :attribute tem que ser aceite.',
+ 'active_url' => 'O :attribute não é um URL válido.',
+ 'after' => 'A :attribute tem que ser superior a :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => 'O :attribute só pode conter letras.',
+ 'alpha_dash' => 'O :attribute só pode conter letras, números e traços.',
+ 'alpha_num' => 'O :attribute só pode conter letras e números.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => 'A :attribute tem que ser anterior a :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => 'O :attribute deve estar entre :min e :max.',
+ 'file' => 'O :attribute deve estar entre :min e :max kilobytes.',
+ 'string' => 'O :attribute deve estar entre :min e :max caracteres.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'A confirmação da :attribute não coincide.',
+ 'date' => 'A :attribute não é uma data válida.',
+ 'date_format' => ':attribute não corresponde ao formato :format.',
+ 'different' => ':attribute e :other têm que ser diferentes.',
+ 'digits' => ':attribute de contem :digits dígitos.',
+ 'digits_between' => 'O :attribute deve estar entre :min e :max dígitos.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'O formato do :attribute é inválido.',
+ 'exists' => 'O :attribute é inválido.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'O :attribute tem que ser uma imagem.',
+ 'in' => 'O :attribute selecionado é inválido.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'O :attribute tem que ser um inteiro.',
+ 'ip' => 'O :attribute tem que ser um IP válido.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'O :attribute não pode ser maior do que :max.',
+ 'file' => 'O :attribute não pode ter mais do que :max kilobytes.',
+ 'string' => 'O :attribute não pode tem mais do que :max caracteres.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'O :attribute só pode contem os seguintes formatos: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute deve ter pelos menos :min.',
+ 'file' => ':attribute deve ter pelos menos :min kilobytes.',
+ 'string' => 'O :attribute deve conter pelos menos :min caracteres.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'O :attribute selecionado é inválido.',
+ 'numeric' => ':attribute tem que ser um número.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'O formato do :attribute é inválido.',
+ 'required' => ':attribute é obrigatório.',
+ 'required_if' => 'O :attribute é obrigatório quando :other é :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'O :attribute é obrigatório quando :values existem.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'O :attribute é obrigatório quando :values não existem.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute e :other devem coincidir.',
+ 'size' => [
+ 'numeric' => 'O :attribute deve ser maior que :size.',
+ 'file' => 'O :attribute deve ter :size kilobytes.',
+ 'string' => 'O :attribute deve conter :size caracteres.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'Este :attribute já existe.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'O formato do :attribute é inválido.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "O :attribute contem um caracter que não é permitido.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/ro/admin/asset_maintenances/message.php b/resources/lang/ro/admin/asset_maintenances/message.php
index 83fbf698d6..d121115825 100644
--- a/resources/lang/ro/admin/asset_maintenances/message.php
+++ b/resources/lang/ro/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'Warranty',
diff --git a/resources/lang/ro/admin/hardware/general.php b/resources/lang/ro/admin/hardware/general.php
index 77092c0014..e745b93c0a 100644
--- a/resources/lang/ro/admin/hardware/general.php
+++ b/resources/lang/ro/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Activ',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Verifica activ',
- 'checkout' => 'Checkout activ catre utilizator',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Cloneaza activ',
'deployable' => 'Lansabil',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/ro/admin/hardware/message.php b/resources/lang/ro/admin/hardware/message.php
index deb1267d37..0b77c216e2 100644
--- a/resources/lang/ro/admin/hardware/message.php
+++ b/resources/lang/ro/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/ro/admin/settings/general.php b/resources/lang/ro/admin/settings/general.php
index deb1cbb26a..6141a11265 100644
--- a/resources/lang/ro/admin/settings/general.php
+++ b/resources/lang/ro/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Genereaza ID-uri crescatoare de active',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/ro/admin/users/general.php b/resources/lang/ro/admin/users/general.php
index 08db370ac7..ba41510dcf 100644
--- a/resources/lang/ro/admin/users/general.php
+++ b/resources/lang/ro/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'Istoric pentru :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Ultima logare',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software predat catre :name',
diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php
index 9c448444cc..d275c2d808 100644
--- a/resources/lang/ro/general.php
+++ b/resources/lang/ro/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Raport de active',
'asset_tag' => 'Eticheta activ',
'assets_available' => 'Active disponibile',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Active',
'avatar_delete' => 'Sterge avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Inapoi',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Anuleaza',
'categories' => 'Categorii',
@@ -52,6 +56,8 @@
'current' => 'Curent',
'custom_report' => 'Raport active custom',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Data',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Mai multe',
'name' => 'Nume',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'Fara depreciere',
'no_results' => 'Nici un rezultat.',
diff --git a/resources/lang/ro/validation.php b/resources/lang/ro/validation.php
index 92e70ef353..222e50c955 100644
--- a/resources/lang/ro/validation.php
+++ b/resources/lang/ro/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute a fost acceptat.",
- "active_url" => ":attribute nu este un URL valid.",
- "after" => ":attribute trebuie sa fie o data dupa :date.",
- "alpha" => ":attribute trebuie sa contina numai litere.",
- "alpha_dash" => ":attribute poate sa contina numai litere, cifre si linia de punctuatie.",
- "alpha_num" => ":attribute poate sa contina numai litere si cifre.",
- "before" => ":attribute trebuie sa contina o data inainte de :date.",
- "between" => array(
- "numeric" => ":attribute trebuie sa fie intre :min - :max.",
- "file" => ":attribute trebuie sa fie intre :min - :max kilobytes.",
- "string" => ":attribute trebuie sa aiba intre :min - :max caractere.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "Confirmarea la :attribute nu este asemanatoare.",
- "date" => ":attribute nu este o data.",
- "date_format" => ":attribute nu se leaga cu formatul :format.",
- "different" => ":attribute si :other trebuie sa fie diferite.",
- "digits" => ":attribute trebuie sa fie de :digits cifre.",
- "digits_between" => ":attribute trebuie sa fie intre :min si :max cifre.",
- "email" => "Formatul :attribute nu este valid.",
- "exists" => ":attribute selectat nu e valid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute trebuie sa fie o imagine.",
- "in" => ":attribute selectat nu este valid.",
- "integer" => ":attribute trebuie sa fie numar intreg.",
- "ip" => ":attribute trebuie sa fie o adresa IP valida.",
- "max" => array(
- "numeric" => ":attribute nu poate sa fie mai mare de :max.",
- "file" => ":attribute nu poate sa fie mai mare de :max kilobytes.",
- "string" => ":attribute nu trebuie sa fie mai mare de :max caractere.",
- ),
- "mimes" => ":attribute trebuie sa fie un fisier de tipul :values.",
- "min" => array(
- "numeric" => ":attribute trebuie sa aiba cel putin :min.",
- "file" => ":attribute trebuie sa aiba minim :min kilobytes.",
- "string" => ":attribute trebuie sa aiba cel putin :min caractere.",
- ),
- "not_in" => ":attribute selectat nu e valid.",
- "numeric" => ":attribute trebuie sa fie un numar.",
- "regex" => "Formatul :attribute nu este valid.",
- "required" => "Campul :attribute este obligatoriu.",
- "required_if" => ":attribute este obligatoriu atunci cand :other este :value.",
- "required_with" => ":attribute este obligatoriu atunci cand :values este prezent.",
- "required_without" => ":attribute este obligatoriu atunci cand :values nu este prezent.",
- "same" => ":attribute si :other trebuie sa fie la fel.",
- "size" => array(
- "numeric" => ":attribute trebuie sa aiba :size.",
- "file" => ":attribute trebuie sa aiba :size kilobytes.",
- "string" => ":attribute trebuie sa aiba :size caractere.",
- ),
- "unique" => ":attribute este deja folosit.",
- "url" => "Formatul :attribute nu este valid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => ':attribute a fost acceptat.',
+ 'active_url' => ':attribute nu este un URL valid.',
+ 'after' => ':attribute trebuie sa fie o data dupa :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute trebuie sa contina numai litere.',
+ 'alpha_dash' => ':attribute poate sa contina numai litere, cifre si linia de punctuatie.',
+ 'alpha_num' => ':attribute poate sa contina numai litere si cifre.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute trebuie sa contina o data inainte de :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute trebuie sa fie intre :min - :max.',
+ 'file' => ':attribute trebuie sa fie intre :min - :max kilobytes.',
+ 'string' => ':attribute trebuie sa aiba intre :min - :max caractere.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'Confirmarea la :attribute nu este asemanatoare.',
+ 'date' => ':attribute nu este o data.',
+ 'date_format' => ':attribute nu se leaga cu formatul :format.',
+ 'different' => ':attribute si :other trebuie sa fie diferite.',
+ 'digits' => ':attribute trebuie sa fie de :digits cifre.',
+ 'digits_between' => ':attribute trebuie sa fie intre :min si :max cifre.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Formatul :attribute nu este valid.',
+ 'exists' => ':attribute selectat nu e valid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute trebuie sa fie o imagine.',
+ 'in' => ':attribute selectat nu este valid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute trebuie sa fie numar intreg.',
+ 'ip' => ':attribute trebuie sa fie o adresa IP valida.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute nu poate sa fie mai mare de :max.',
+ 'file' => ':attribute nu poate sa fie mai mare de :max kilobytes.',
+ 'string' => ':attribute nu trebuie sa fie mai mare de :max caractere.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute trebuie sa fie un fisier de tipul :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute trebuie sa aiba cel putin :min.',
+ 'file' => ':attribute trebuie sa aiba minim :min kilobytes.',
+ 'string' => ':attribute trebuie sa aiba cel putin :min caractere.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => ':attribute selectat nu e valid.',
+ 'numeric' => ':attribute trebuie sa fie un numar.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Formatul :attribute nu este valid.',
+ 'required' => 'Campul :attribute este obligatoriu.',
+ 'required_if' => ':attribute este obligatoriu atunci cand :other este :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute este obligatoriu atunci cand :values este prezent.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute este obligatoriu atunci cand :values nu este prezent.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute si :other trebuie sa fie la fel.',
+ 'size' => [
+ 'numeric' => ':attribute trebuie sa aiba :size.',
+ 'file' => ':attribute trebuie sa aiba :size kilobytes.',
+ 'string' => ':attribute trebuie sa aiba :size caractere.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute este deja folosit.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Formatul :attribute nu este valid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/ru/admin/asset_maintenances/message.php b/resources/lang/ru/admin/asset_maintenances/message.php
index d1b540a9a6..d6c3ee9148 100644
--- a/resources/lang/ru/admin/asset_maintenances/message.php
+++ b/resources/lang/ru/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Выполнено.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Ещё не готово',
'warranty' => 'Гарантия',
diff --git a/resources/lang/ru/admin/custom_fields/message.php b/resources/lang/ru/admin/custom_fields/message.php
index 663cb7fe76..0d074fc69c 100644
--- a/resources/lang/ru/admin/custom_fields/message.php
+++ b/resources/lang/ru/admin/custom_fields/message.php
@@ -28,7 +28,7 @@ return array(
'fieldset' => array(
- 'does_not_exist' => 'Fieldset does not exist',
+ 'does_not_exist' => 'Набор полей не существует',
'create' => array(
'error' => 'Набор полей не был создан, попробуйте ещё раз.',
diff --git a/resources/lang/ru/admin/departments/message.php b/resources/lang/ru/admin/departments/message.php
index d65f4fbb2b..a81a1f977c 100644
--- a/resources/lang/ru/admin/departments/message.php
+++ b/resources/lang/ru/admin/departments/message.php
@@ -2,20 +2,20 @@
return array(
- 'does_not_exist' => 'Department does not exist.',
- 'assoc_users' => 'This department is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this department and try again. ',
+ 'does_not_exist' => 'Департамент не существует.',
+ 'assoc_users' => 'Департамент в данный момент связан с одним или несколькими пользователями и не может быть удалён. Удалите или измените связи в пользователях и попробуйте ещё раз. ',
'create' => array(
- 'error' => 'Department was not created, please try again.',
- 'success' => 'Department created successfully.'
+ 'error' => 'Департамент не был создан, попробуйте ещё раз.',
+ 'success' => 'Департамент успешно создан.'
),
'update' => array(
- 'error' => 'Department was not updated, please try again',
- 'success' => 'Department updated successfully.'
+ 'error' => 'Департамент не был изменён, попробуйте ещё раз',
+ 'success' => 'Департамент успешно изменён.'
),
'delete' => array(
- 'confirm' => 'Are you sure you wish to delete this department?',
- 'error' => 'There was an issue deleting the department. Please try again.',
- 'success' => 'The department was deleted successfully.'
+ 'confirm' => 'Вы уверены, что хотите удалить этот департамент?',
+ 'error' => 'При удалении департамента возникла проблема. Пожалуйста, попробуйте ещё раз.',
+ 'success' => 'Департамент был успешно удалён.'
)
);
diff --git a/resources/lang/ru/admin/departments/table.php b/resources/lang/ru/admin/departments/table.php
index 76494247be..3c88e259b3 100644
--- a/resources/lang/ru/admin/departments/table.php
+++ b/resources/lang/ru/admin/departments/table.php
@@ -3,9 +3,9 @@
return array(
'id' => 'ID',
- 'name' => 'Department Name',
- 'manager' => 'Manager',
- 'location' => 'Location',
- 'create' => 'Create Department',
- 'update' => 'Update Department',
+ 'name' => 'Название департамента',
+ 'manager' => 'Руководитель',
+ 'location' => 'Расположение',
+ 'create' => 'Создать департамент',
+ 'update' => 'Изменить департамент',
);
diff --git a/resources/lang/ru/admin/hardware/general.php b/resources/lang/ru/admin/hardware/general.php
index 163ea10c1e..8948efd118 100644
--- a/resources/lang/ru/admin/hardware/general.php
+++ b/resources/lang/ru/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Актив',
'bulk_checkout' => 'Выдать активы пользователю',
'checkin' => 'Вернуть актив на склад',
- 'checkout' => 'Выдать актив пользователю',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Клонировать актив',
'deployable' => 'Доступные',
'deleted' => 'Этот актив был удален. Нажмите, чтобы восстановить.',
diff --git a/resources/lang/ru/admin/hardware/message.php b/resources/lang/ru/admin/hardware/message.php
index 279880b1c6..32f362e593 100644
--- a/resources/lang/ru/admin/hardware/message.php
+++ b/resources/lang/ru/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Актив успешно восстановлен.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Не удалось удалить файл. Повторите попытку.',
'success' => 'Файл успешно удален.',
@@ -48,7 +54,7 @@ return array(
'delete' => array(
'confirm' => 'Вы уверены что хотите удалить этот актив?',
'error' => 'При удалении актива возникла проблема. Пожалуйста попробуйте снова.',
- 'nothing_updated' => 'No assets were selected, so nothing was deleted.',
+ 'nothing_updated' => 'Ни один из активов не выбран, поэтому ничего не удалено.',
'success' => 'Актив был успешно удален.'
),
diff --git a/resources/lang/ru/admin/models/message.php b/resources/lang/ru/admin/models/message.php
index eaa2f8eab6..1c9687421b 100644
--- a/resources/lang/ru/admin/models/message.php
+++ b/resources/lang/ru/admin/models/message.php
@@ -29,8 +29,8 @@ return array(
),
'bulkedit' => array(
- 'error' => 'No fields were changed, so nothing was updated.',
- 'success' => 'Models updated.'
+ 'error' => 'Никаких изменений нет, поэтому ничего не обновлено.',
+ 'success' => 'Модели обновлены.'
),
);
diff --git a/resources/lang/ru/admin/settings/general.php b/resources/lang/ru/admin/settings/general.php
index 36148c139f..bab6914b24 100644
--- a/resources/lang/ru/admin/settings/general.php
+++ b/resources/lang/ru/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Предупреждение об истечении срока (в днях)',
'alert_inv_threshold' => 'Порог оповещения о запасах',
'asset_ids' => 'ID актива',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Генерировать автоматическое возрастание идентификационных номеров активов',
'auto_increment_prefix' => 'Префикс ( не обязательно )',
'auto_incrementing_help' => 'Включить автоматические возрастание ID активов начиная с',
@@ -63,8 +67,8 @@ return array(
'ldap_email' => 'Email LDAP',
'load_remote_text' => 'Внешние скрипты',
'load_remote_help_text' => 'Данная установка Snipe-IT может загружать внешние скрипты.',
- '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_note' => 'Комментарий для экрана логина',
+ 'login_note_help' => 'Опционально выводит несколько предложений на экране логина. Например, чтобы помочь людям, которые нашли потерянное или украденное устройство. Здесь можно использовать Github flavored markdown',
'logo' => 'Логотип',
'full_multiple_companies_support_help_text' => 'Ограничить доступ пользователям (включая админов) только активами их компаний.',
'full_multiple_companies_support_text' => 'Полная поддержка нескольких компаний',
@@ -73,12 +77,12 @@ return array(
'php' => 'Версия PHP',
'php_gd_info' => 'Для отображения QR кодов необходимо установить модуль php-gd.',
'php_gd_warning' => 'Библиотеки PHP Image Processing и GD plugin не установлены.',
- 'pwd_secure_complexity' => 'Password Complexity',
- 'pwd_secure_complexity_help' => 'Select whichever password complexity rules you wish to enforce.',
- 'pwd_secure_min' => 'Password minimum characters',
- 'pwd_secure_min_help' => 'Minimum permitted value is 5',
- 'pwd_secure_uncommon' => 'Prevent common passwords',
- 'pwd_secure_uncommon_help' => 'This will disallow users from using common passwords from the top 10,000 passwords reported in breaches.',
+ 'pwd_secure_complexity' => 'Сложность пароля',
+ 'pwd_secure_complexity_help' => 'Выберете необходимые вам правила сложности паролей.',
+ 'pwd_secure_min' => 'Минимальное количество символов',
+ 'pwd_secure_min_help' => 'Минимальное значение — 5',
+ 'pwd_secure_uncommon' => 'Запретить простые пароли',
+ 'pwd_secure_uncommon_help' => 'Запретит пользователям использовать пароли входящие в 10 000 самых популярных.',
'qr_help' => 'Включить QR коды',
'qr_text' => 'Текст QR кода',
'setting' => 'Настройка',
@@ -98,7 +102,7 @@ return array(
'about_settings_text' => 'Эти настройки позволяют персонализировать некоторые аспекты вашей установки.',
'labels_per_page' => 'Этикеток на странице',
'label_dimensions' => 'Размеры наклеек (в дюймах)',
- 'next_auto_tag_base' => 'Next auto-increment',
+ 'next_auto_tag_base' => 'Следующий автоинкремент',
'page_padding' => 'Поля страницы (в дюймах)',
'purge' => 'Очистка удалённых записей',
'labels_display_bgutter' => 'Метка внизу страницы',
@@ -113,8 +117,8 @@ return array(
'width_w' => 'ширина',
'height_h' => 'высота',
'text_pt' => 'pt',
- 'thumbnail_max_h' => 'Max thumbnail height',
- 'thumbnail_max_h_help' => 'Maximum height in pixels that thumbnails may display in the listing view. Min 25, max 500.',
+ 'thumbnail_max_h' => 'Максимальная высота иконки',
+ 'thumbnail_max_h_help' => 'Максимальная высота в пикселях для отображения в списке. Минимум 25, максимум 500.',
'two_factor' => 'Двухфакторная аутентификация',
'two_factor_secret' => 'Двухфакторный код',
'two_factor_enrollment' => 'Двухфакторная регистрация',
diff --git a/resources/lang/ru/admin/users/general.php b/resources/lang/ru/admin/users/general.php
index ca4a5f6fae..208dfe78df 100644
--- a/resources/lang/ru/admin/users/general.php
+++ b/resources/lang/ru/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Разрешенные типы файлов: png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, и rar.',
'history_user' => 'История для :name',
'info' => 'Информация',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Последний вход',
'ldap_config_text' => 'Параметры конфигурации LDAP можно найти Администратор > Параметры. Выбранное местоположение будет установлено для всех импортируемых пользователей. (Необязательно).',
'software_user' => 'Программное обеспечение привязано к :name',
diff --git a/resources/lang/ru/admin/users/message.php b/resources/lang/ru/admin/users/message.php
index 2e4c67c96c..6c717a6ee4 100644
--- a/resources/lang/ru/admin/users/message.php
+++ b/resources/lang/ru/admin/users/message.php
@@ -31,7 +31,7 @@ return array(
'create' => 'При создании пользователя возникла проблема. Пожалуйста попробуйте снова.',
'update' => 'При изменении пользователя возникла проблема. Пожалуйста попробуйте снова.',
'delete' => 'При удалении пользователя возникла проблема. Пожалуйста попробуйте снова.',
- 'delete_has_assets' => 'This user has items assigned and could not be deleted.',
+ 'delete_has_assets' => 'У пользователя есть назначенные ему активы и не может быть удалён.',
'unsuspend' => 'При разморозке пользователя возникла проблема. Пожалуйста попробуйте снова.',
'import' => 'При импорте пользователей произошла ошибка. Попробуйте еще раз.',
'asset_already_accepted' => 'Этот актив уже был принят.',
@@ -41,7 +41,7 @@ return array(
'ldap_could_not_bind' => 'Не могу связаться (bind) с сервером LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера: ',
'ldap_could_not_search' => 'Не могу найти сервер LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера:',
'ldap_could_not_get_entries' => 'Не могу загрузить записи с сервера LDAP. Проверьте настройки LDAP сервера в файле конфигурации LDAP.
Ошибка от LDAP сервера:',
- 'password_ldap' => 'The password for this account is managed by LDAP/Active Directory. Please contact your IT department to change your password. ',
+ 'password_ldap' => 'Пароль для этой учетной записи управляется LDAP/Active Directory. Пожалуйста, свяжитесь с департаментом ИТ, чтобы изменить свой пароль. ',
),
'deletefile' => array(
diff --git a/resources/lang/ru/admin/users/table.php b/resources/lang/ru/admin/users/table.php
index 1be40a3d74..128ed8a3cb 100644
--- a/resources/lang/ru/admin/users/table.php
+++ b/resources/lang/ru/admin/users/table.php
@@ -19,7 +19,7 @@ return array(
'location' => 'Расположение',
'lock_passwords' => 'Подробности логина не могут быть изменены на этой конфигурации.',
'manager' => 'Руководитель',
- 'managed_locations' => 'Managed Locations',
+ 'managed_locations' => 'Управляемые расположения',
'name' => 'Имя',
'notes' => 'Заметки',
'password_confirm' => 'Подтверждение пароля',
diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php
index 5720e16670..45b24f8b5e 100644
--- a/resources/lang/ru/general.php
+++ b/resources/lang/ru/general.php
@@ -18,16 +18,20 @@
'asset_report' => 'Отчет по активам',
'asset_tag' => 'Тег актива',
'assets_available' => 'Доступные активы',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Активы',
'avatar_delete' => 'Удалить аватар',
'avatar_upload' => 'Загрузить аватар',
'back' => 'Назад',
'bad_data' => 'Ничего не найдено. Что-то неправильно ввели?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Массовая выдача',
'cancel' => 'Отмена',
'categories' => 'Категории',
'category' => 'Категория',
- 'change' => 'In/Out',
+ 'change' => 'В/Из',
'changeemail' => 'Изменить адрес почты',
'changepassword' => 'Изменить пароль',
'checkin' => 'Привязать',
@@ -52,14 +56,16 @@
'current' => 'Текущий',
'custom_report' => 'Пользовательский отчет по активам',
'dashboard' => 'Панель мониторинга',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Дата',
'debug_warning' => 'Предупреждение!',
'debug_warning_text' => 'Это приложение выполняется в режиме с включенной отладкой. Это может нарушить конфиденциальность данных, если приложение доступно для внешнего мира. Отключите режим отладки, поменяв значение APP_DEBUG в файле .env на false.',
'delete' => 'Удалить',
'deleted' => 'Удалено',
'delete_seats' => 'Удаленные лицензии',
- 'departments' => 'Departments',
- 'department' => 'Department',
+ 'departments' => 'Департаменты',
+ 'department' => 'Департамент',
'deployed' => 'Развернут',
'depreciation_report' => 'Отчет по амортизации',
'download' => 'Загрузка',
@@ -117,6 +123,8 @@
'moreinfo' => 'Подробнее',
'name' => 'Имя',
'next' => 'Далее',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'новое!',
'no_depreciation' => 'Нет аммортизации',
'no_results' => 'Нет результатов.',
@@ -145,14 +153,14 @@
'select' => 'Выбор',
'search' => 'Поиск',
'select_category' => 'Выберите категорию',
- 'select_department' => 'Select a Department',
+ 'select_department' => 'Выбрать департамент',
'select_depreciation' => 'Выберите тип амортизации',
'select_location' => 'Выберите местоположение',
'select_manufacturer' => 'Выберите производителя',
'select_model' => 'Выберите модель',
'select_supplier' => 'Выберите поставщика',
'select_user' => 'Выберите пользователя',
- 'select_date' => 'Select Date (YYYY-MM-DD)',
+ 'select_date' => 'Выберите дату (ГГГГ-ММ-ДД)',
'select_statuslabel' => 'Выбрать статус',
'select_company' => 'Выберите компанию',
'select_asset' => 'Выбрать актив',
diff --git a/resources/lang/ru/validation.php b/resources/lang/ru/validation.php
index 7353e9c6bd..f041674754 100644
--- a/resources/lang/ru/validation.php
+++ b/resources/lang/ru/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute должен быть принят.",
- "active_url" => ":attribute некорректный URL.",
- "after" => "The :attribute должен быть после :date.",
- "alpha" => ":attribute может содержать только символы.",
- "alpha_dash" => ":attribute может содержать только буквы, цифры и тире.",
- "alpha_num" => ":attribute может содержать только буквы и цифры.",
- "before" => ":attribute должен быть датой до :date.",
- "between" => array(
- "numeric" => ":attribute должен быть между :min - :max.",
- "file" => ":attribute должен быть между :min - :max килобайт.",
- "string" => ":attribute должен быть между :min - :max символов.",
- ),
- "boolean" => ":attribute должен быть true или false.",
- "confirmed" => "Подтверждение :attribute не совпадает.",
- "date" => ":attribute неправильная дата.",
- "date_format" => ":attribute не совпадает с форматом :format.",
- "different" => ":attribute и :other должны быть разными.",
- "digits" => ":attribute должен содержать :digits цифр.",
- "digits_between" => ":attribute должно быть между :min и :max цифр.",
- "email" => "Неправильный формат :attribute.",
- "exists" => "Выбранный :attribute неправильный.",
- "email_array" => "Один или несколько адресов эл. почты являются недействительным.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute должен быть изображением.",
- "in" => "Выбранный :attribute неправильный.",
- "integer" => ":attribute должно быть числом.",
- "ip" => ":attribute должно быть IP адресом.",
- "max" => array(
- "numeric" => ":attribute не должно быть больше :max.",
- "file" => ":attribute не должен превышать :max килобайт.",
- "string" => ":attribute не должно превышать :max символов.",
- ),
- "mimes" => ":attribute тип файла должен быть: :values.",
- "min" => array(
- "numeric" => ":attribute должно быть не менее :min.",
- "file" => ":attribute должно быть не менее :min килобайт.",
- "string" => ":attribute должно быть не менее :min символов.",
- ),
- "not_in" => "Выбранный :attribute неправильный.",
- "numeric" => ":attribute должно быть числом.",
- "regex" => "Неправильный формат :attribute.",
- "required" => ":attribute обязательное поле.",
- "required_if" => ":attribute обязательное поле, когда :other :value.",
- "required_with" => ":attribute обязательное поле, когда присутствует :values.",
- "required_without" => ":attribute обязательное поле, когда отсутствует :values.",
- "same" => ":attribute и :other должны совпадать.",
- "size" => array(
- "numeric" => ":attribute должен быть :size.",
- "file" => ":attribute должен быть :size килобайт.",
- "string" => ":attribute должен быть :size символов.",
- ),
- "unique" => ":attribute уже занят.",
- "url" => "Неправильный формат :attribute.",
- "statuslabel_type" => "Вы должны выбрать правильное название статуса",
- "unique_undeleted" => "Свойство :attribute должно быть уникальным.",
+ 'accepted' => ':attribute должен быть принят.',
+ 'active_url' => ':attribute некорректный URL.',
+ 'after' => 'The :attribute должен быть после :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute может содержать только символы.',
+ 'alpha_dash' => ':attribute может содержать только буквы, цифры и тире.',
+ 'alpha_num' => ':attribute может содержать только буквы и цифры.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute должен быть датой до :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute должен быть между :min - :max.',
+ 'file' => ':attribute должен быть между :min - :max килобайт.',
+ 'string' => ':attribute должен быть между :min - :max символов.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute должен быть true или false.',
+ 'confirmed' => 'Подтверждение :attribute не совпадает.',
+ 'date' => ':attribute неправильная дата.',
+ 'date_format' => ':attribute не совпадает с форматом :format.',
+ 'different' => ':attribute и :other должны быть разными.',
+ 'digits' => ':attribute должен содержать :digits цифр.',
+ 'digits_between' => ':attribute должно быть между :min и :max цифр.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Неправильный формат :attribute.',
+ 'exists' => 'Выбранный :attribute неправильный.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute должен быть изображением.',
+ 'in' => 'Выбранный :attribute неправильный.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute должно быть числом.',
+ 'ip' => ':attribute должно быть IP адресом.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute не должно быть больше :max.',
+ 'file' => ':attribute не должен превышать :max килобайт.',
+ 'string' => ':attribute не должно превышать :max символов.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute тип файла должен быть: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute должно быть не менее :min.',
+ 'file' => ':attribute должно быть не менее :min килобайт.',
+ 'string' => ':attribute должно быть не менее :min символов.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'Выбранный :attribute неправильный.',
+ 'numeric' => ':attribute должно быть числом.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Неправильный формат :attribute.',
+ 'required' => ':attribute обязательное поле.',
+ 'required_if' => ':attribute обязательное поле, когда :other :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute обязательное поле, когда присутствует :values.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute обязательное поле, когда отсутствует :values.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute и :other должны совпадать.',
+ 'size' => [
+ 'numeric' => ':attribute должен быть :size.',
+ 'file' => ':attribute должен быть :size килобайт.',
+ 'string' => ':attribute должен быть :size символов.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute уже занят.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Неправильный формат :attribute.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Поле :attribute содержит запрещенные символы.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/sv-SE/admin/asset_maintenances/message.php b/resources/lang/sv-SE/admin/asset_maintenances/message.php
index 0291f4c41c..edf79cf84f 100644
--- a/resources/lang/sv-SE/admin/asset_maintenances/message.php
+++ b/resources/lang/sv-SE/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Inventarieunderhållet skapades.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Inte klar ännu',
'warranty' => 'Garanti',
diff --git a/resources/lang/sv-SE/admin/hardware/general.php b/resources/lang/sv-SE/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/sv-SE/admin/hardware/general.php
+++ b/resources/lang/sv-SE/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/sv-SE/admin/hardware/message.php b/resources/lang/sv-SE/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/sv-SE/admin/hardware/message.php
+++ b/resources/lang/sv-SE/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/sv-SE/admin/settings/general.php b/resources/lang/sv-SE/admin/settings/general.php
index 42a6ff8620..35f87c7a84 100644
--- a/resources/lang/sv-SE/admin/settings/general.php
+++ b/resources/lang/sv-SE/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Inventarienummer',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generera automatiskt stigande inventarienummer',
'auto_increment_prefix' => 'Prefix (frivilligt)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/sv-SE/admin/users/general.php b/resources/lang/sv-SE/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/sv-SE/admin/users/general.php
+++ b/resources/lang/sv-SE/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index 7cdeae5a9c..eb1991941d 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Inventarie Rapport',
'asset_tag' => 'Inventarie Etikett',
'assets_available' => 'tillgängliga inventarier',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Inventarier',
'avatar_delete' => 'Ta bort Avatar',
'avatar_upload' => 'Ladda upp Avatar',
'back' => 'Bakåt',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Avbryt',
'categories' => 'Kategorier',
@@ -52,6 +56,8 @@
'current' => 'Nuvarande',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Översikt',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Datum',
'debug_warning' => 'Varning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Mer information',
'name' => 'Namn',
'next' => 'Nästa',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'Ingen avskrivning',
'no_results' => 'Inga resultat.',
diff --git a/resources/lang/sv-SE/validation.php b/resources/lang/sv-SE/validation.php
index 7a26a6515f..02cb1fa981 100644
--- a/resources/lang/sv-SE/validation.php
+++ b/resources/lang/sv-SE/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min and :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/ta/admin/asset_maintenances/message.php b/resources/lang/ta/admin/asset_maintenances/message.php
index 83fbf698d6..d121115825 100644
--- a/resources/lang/ta/admin/asset_maintenances/message.php
+++ b/resources/lang/ta/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Asset Maintenance created successfully.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Not Completed Yet',
'warranty' => 'Warranty',
diff --git a/resources/lang/ta/admin/hardware/general.php b/resources/lang/ta/admin/hardware/general.php
index f7644eb730..1def86dc9e 100644
--- a/resources/lang/ta/admin/hardware/general.php
+++ b/resources/lang/ta/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Asset',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin Asset',
- 'checkout' => 'Checkout Asset to User',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Clone Asset',
'deployable' => 'Deployable',
'deleted' => 'This asset has been deleted. Click here to restore it.',
diff --git a/resources/lang/ta/admin/hardware/message.php b/resources/lang/ta/admin/hardware/message.php
index df20960b2d..112cf77ded 100644
--- a/resources/lang/ta/admin/hardware/message.php
+++ b/resources/lang/ta/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/ta/admin/settings/general.php b/resources/lang/ta/admin/settings/general.php
index 43195baa4c..73fd052a58 100644
--- a/resources/lang/ta/admin/settings/general.php
+++ b/resources/lang/ta/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'Asset IDs',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Generate auto-incrementing asset IDs',
'auto_increment_prefix' => 'Prefix (optional)',
'auto_incrementing_help' => 'Enable auto-incrementing asset IDs first to set this',
diff --git a/resources/lang/ta/admin/users/general.php b/resources/lang/ta/admin/users/general.php
index cc1c2b2403..985138d065 100644
--- a/resources/lang/ta/admin/users/general.php
+++ b/resources/lang/ta/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'History for :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Last Login',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Software Checked out to :name',
diff --git a/resources/lang/ta/general.php b/resources/lang/ta/general.php
index 5a5fc5f7da..eb6409ddbb 100644
--- a/resources/lang/ta/general.php
+++ b/resources/lang/ta/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Asset Report',
'asset_tag' => 'Asset Tag',
'assets_available' => 'assets available',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Assets',
'avatar_delete' => 'Delete Avatar',
'avatar_upload' => 'Upload Avatar',
'back' => 'Back',
'bad_data' => 'Nothing found. Maybe bad data?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Cancel',
'categories' => 'Categories',
@@ -52,6 +56,8 @@
'current' => 'Current',
'custom_report' => 'Custom Asset Report',
'dashboard' => 'Dashboard',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Date',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'More Info',
'name' => 'Name',
'next' => 'Next',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'No Depreciation',
'no_results' => 'No Results.',
diff --git a/resources/lang/ta/validation.php b/resources/lang/ta/validation.php
index 7a26a6515f..02cb1fa981 100644
--- a/resources/lang/ta/validation.php
+++ b/resources/lang/ta/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => "The :attribute must be accepted.",
- "active_url" => "The :attribute is not a valid URL.",
- "after" => "The :attribute must be a date after :date.",
- "alpha" => "The :attribute may only contain letters.",
- "alpha_dash" => "The :attribute may only contain letters, numbers, and dashes.",
- "alpha_num" => "The :attribute may only contain letters and numbers.",
- "before" => "The :attribute must be a date before :date.",
- "between" => array(
- "numeric" => "The :attribute must be between :min - :max.",
- "file" => "The :attribute must be between :min - :max kilobytes.",
- "string" => "The :attribute must be between :min - :max characters.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => "The :attribute confirmation does not match.",
- "date" => "The :attribute is not a valid date.",
- "date_format" => "The :attribute does not match the format :format.",
- "different" => "The :attribute and :other must be different.",
- "digits" => "The :attribute must be :digits digits.",
- "digits_between" => "The :attribute must be between :min and :max digits.",
- "email" => "The :attribute format is invalid.",
- "exists" => "The selected :attribute is invalid.",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => "The :attribute must be an image.",
- "in" => "The selected :attribute is invalid.",
- "integer" => "The :attribute must be an integer.",
- "ip" => "The :attribute must be a valid IP address.",
- "max" => array(
- "numeric" => "The :attribute may not be greater than :max.",
- "file" => "The :attribute may not be greater than :max kilobytes.",
- "string" => "The :attribute may not be greater than :max characters.",
- ),
- "mimes" => "The :attribute must be a file of type: :values.",
- "min" => array(
- "numeric" => "The :attribute must be at least :min.",
- "file" => "The :attribute must be at least :min kilobytes.",
- "string" => "The :attribute must be at least :min characters.",
- ),
- "not_in" => "The selected :attribute is invalid.",
- "numeric" => "The :attribute must be a number.",
- "regex" => "The :attribute format is invalid.",
- "required" => "The :attribute field is required.",
- "required_if" => "The :attribute field is required when :other is :value.",
- "required_with" => "The :attribute field is required when :values is present.",
- "required_without" => "The :attribute field is required when :values is not present.",
- "same" => "The :attribute and :other must match.",
- "size" => array(
- "numeric" => "The :attribute must be :size.",
- "file" => "The :attribute must be :size kilobytes.",
- "string" => "The :attribute must be :size characters.",
- ),
- "unique" => "The :attribute has already been taken.",
- "url" => "The :attribute format is invalid.",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ '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.',
+ '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.',
+ 'between' => [
+ 'numeric' => 'The :attribute must be between :min and :max.',
+ 'file' => 'The :attribute must be between :min and :max kilobytes.',
+ 'string' => 'The :attribute must be between :min and :max characters.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => 'The :attribute confirmation does not match.',
+ 'date' => 'The :attribute is not a valid date.',
+ 'date_format' => 'The :attribute does not match the format :format.',
+ 'different' => 'The :attribute and :other must be different.',
+ 'digits' => 'The :attribute must be :digits digits.',
+ 'digits_between' => 'The :attribute must be between :min and :max digits.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'The :attribute must be a valid email address.',
+ 'exists' => 'The selected :attribute is invalid.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => 'The :attribute must be an image.',
+ 'in' => 'The selected :attribute is invalid.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => 'The :attribute must be an integer.',
+ 'ip' => 'The :attribute must be a valid IP address.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => 'The :attribute may not be greater than :max.',
+ 'file' => 'The :attribute may not be greater than :max kilobytes.',
+ 'string' => 'The :attribute may not be greater than :max characters.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => 'The :attribute must be a file of type: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => 'The :attribute must be at least :min.',
+ 'file' => 'The :attribute must be at least :min kilobytes.',
+ 'string' => 'The :attribute must be at least :min characters.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => 'The selected :attribute is invalid.',
+ 'numeric' => 'The :attribute must be a number.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'The :attribute format is invalid.',
+ 'required' => 'The :attribute field is required.',
+ 'required_if' => 'The :attribute field is required when :other is :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'The :attribute field is required when :values is present.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'The :attribute field is required when :values is not present.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => 'The :attribute and :other must match.',
+ 'size' => [
+ 'numeric' => 'The :attribute must be :size.',
+ 'file' => 'The :attribute must be :size kilobytes.',
+ 'string' => 'The :attribute must be :size characters.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => 'The :attribute has already been taken.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'The :attribute format is invalid.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/th/admin/asset_maintenances/message.php b/resources/lang/th/admin/asset_maintenances/message.php
index b034c63e3e..fc96db07ca 100644
--- a/resources/lang/th/admin/asset_maintenances/message.php
+++ b/resources/lang/th/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'สร้างการซ่อมบำรุงสินทรัพย์เรียบร้อยแล้ว'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'ยังไม่แล้วเสร็จ',
'warranty' => 'การรับประกัน',
diff --git a/resources/lang/th/admin/hardware/general.php b/resources/lang/th/admin/hardware/general.php
index fc81a06637..6475b1c8d5 100644
--- a/resources/lang/th/admin/hardware/general.php
+++ b/resources/lang/th/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'สินทรัพย์',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'เช็คอินสินทรัพย์',
- 'checkout' => 'เช็คเอ้าท์สินทรัพย์ให้ผู้ใช้งาน',
+ 'checkout' => 'Checkout Asset',
'clone' => 'คัดลอกแบบสินทรัพย์',
'deployable' => 'สามารถใช้งานได้',
'deleted' => 'สินทรัพย์นี้ถูกลบแล้ว คลิกที่นี่เพื่อกู้คืน.',
diff --git a/resources/lang/th/admin/hardware/message.php b/resources/lang/th/admin/hardware/message.php
index 28334653d5..114d295111 100644
--- a/resources/lang/th/admin/hardware/message.php
+++ b/resources/lang/th/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => 'Asset restored successfully.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'File not deleted. Please try again.',
'success' => 'File successfully deleted.',
diff --git a/resources/lang/th/admin/settings/general.php b/resources/lang/th/admin/settings/general.php
index 48abc3543d..3ab27f1e9a 100644
--- a/resources/lang/th/admin/settings/general.php
+++ b/resources/lang/th/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'รหัสทรัพย์สิน',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'สร้างการเพิ่มรหัสทรัพย์สินอัตโนมัติ',
'auto_increment_prefix' => 'Prefix (ส่วนเสริม)',
'auto_incrementing_help' => 'เปิดใช้งานการเพิ่มรหัสสินทรัพย์อัตโนมัติก่อนตั้งค่าส่วนนี้',
diff --git a/resources/lang/th/admin/users/general.php b/resources/lang/th/admin/users/general.php
index 4b1cd8a5af..f1b89aaa65 100644
--- a/resources/lang/th/admin/users/general.php
+++ b/resources/lang/th/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'ประเภทของไฟล์ที่อนุญาตแล้ว มีดังนี้ png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar',
'history_user' => 'ประวัติของ :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'เข้าสู่ระบบล่าสุด',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'ซอฟต์แวร์ที่กำหนดให้ :name',
diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php
index 68b962f724..f5a5789584 100644
--- a/resources/lang/th/general.php
+++ b/resources/lang/th/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'รายงานทรัพย์สิน',
'asset_tag' => 'รหัสทรัพย์สิน',
'assets_available' => 'ทรัพย์สินพร้อมใช้งาน',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'ทรัพย์สิน',
'avatar_delete' => 'ลบรูปภาพประจำตัว',
'avatar_upload' => 'อัพโหลดภาพประจำตัว',
'back' => 'ย้อนกลับ',
'bad_data' => 'ไม่พบข้อมูลใดๆ หรือข้อมูลอาจไม่ถูกต้อง?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'ยกเลิก',
'categories' => 'ประเภท',
@@ -52,6 +56,8 @@
'current' => 'ปัจจุบัน',
'custom_report' => 'รายงานทรัพย์สินแบบกำหนดเอง',
'dashboard' => 'หน้าหลัก',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'วันเดือนปี',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'ข้อมูลเพิ่มเติม',
'name' => 'ชื่อ',
'next' => 'ถัดไป',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'ไม่มีค่าเสื่อมราคา',
'no_results' => 'ไม่มีผลการค้นหา',
diff --git a/resources/lang/th/validation.php b/resources/lang/th/validation.php
index c2ef9ec6bd..a461876d3b 100644
--- a/resources/lang/th/validation.php
+++ b/resources/lang/th/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute ต้องได้รับการยอมรับ",
- "active_url" => ":attribute ไม่ใช่ URL ที่ถูกต้อง",
- "after" => ":attribute ต้องเป็นวันที่หลังจาก :date",
- "alpha" => ":attribute ต้องมีเฉพาะตัวอักษรเท่านั้น",
- "alpha_dash" => ":attribute ต้องมีเฉพาะตัวอักษร ตัวเลข หรือเครื่องหมายลบเท่านั้น",
- "alpha_num" => ":attribute ต้องมีเฉพาะตัวอักษรและตัวเลขเท่านั้น",
- "before" => ":attribute ต้องเป็นวันที่ก่อน :date",
- "between" => array(
- "numeric" => ":attribute ต้องอยู่ระหว่าง :min - :max",
- "file" => ":attribute ต้องมีขนาดระหว่าง :min - :max กิโลไบต์",
- "string" => ":attribute ต้องมีจำนวนระหว่าง :min - :max ตัวอักษร",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => ":attribute ไม่ตรงกัน",
- "date" => ":attribute เป็นรูปแบบวันที่ที่ไม่ถูกต้อง",
- "date_format" => ":attribute ไม่ตรงตามรูปแบบ :format",
- "different" => ":attribute และ :other ต้องไม่เหมือนกัน",
- "digits" => ":attribute ต้องเป็น :digits ตัวเลข",
- "digits_between" => ":attribute ต้องเป็นตัวเลขระหว่าง :min และ :max",
- "email" => "รูปแบบของ :attribute ไม่ถูกต้อง",
- "exists" => ":attribute ที่เลือกไม่ถูกต้อง",
- "email_array" => "One or more email addresses is invalid.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute ต้องเป็นรูปภาพเท่านั้น",
- "in" => ":attribute ที่เลือกไม่ถูกต้อง",
- "integer" => ":attribute ต้องเป็นจำนวนเต็มเท่านั้น",
- "ip" => ":attribute ต้องเป็นรูปแบบไอพีแอดเดรสเท่านั้น",
- "max" => array(
- "numeric" => ":attribute ต้องไม่มากกว่า :max",
- "file" => ":attribute ต้องไม่มีขนาดมากกว่า :max กิโลไบต์",
- "string" => ":attribute ต้องไม่มีจำนวนตัวอักษรมากกว่า :max ตัวอักษร",
- ),
- "mimes" => ":attribute ต้องเป็นรูปแบบไฟล์ดังนี้: :values",
- "min" => array(
- "numeric" => ":attribute ต้องมีอย่างน้อย :min",
- "file" => ":attribute ต้องมีขนาดอย่างน้อย :min กิโลไบต์",
- "string" => ":attribute ต้องมีจำนวนอย่างน้อย :min ตัวอักษร",
- ),
- "not_in" => ":attribute ที่เลือกไม่ถูกต้อง",
- "numeric" => ":attribute ต้องเป็นตัวเลขเท่านั้น",
- "regex" => "รูปแบบของ :attribute ไม่ถูกต้อง",
- "required" => "กรุณากรอกข้อมูลในฟิลด์ :attribute",
- "required_if" => "ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :other เป็น :value",
- "required_with" => "ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :value มีข้อมูลอยู่ด้วย",
- "required_without" => "ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :value ไม่มีข้อมูล",
- "same" => ":attribute และ :other ต้องตรงกัน",
- "size" => array(
- "numeric" => ":attribute ต้องมีขนาด :size",
- "file" => ":attribute ต้องมีขนาด :size กิโลไบต์",
- "string" => ":attribute ต้องมีจำนวน :size ตัวอักษร",
- ),
- "unique" => ":attribute กำลังใช้งานอยู่",
- "url" => "รูปแบบของ :attribute ไม่ถูกต้อง",
- "statuslabel_type" => "You must select a valid status label type",
- "unique_undeleted" => "The :attribute must be unique.",
+ 'accepted' => ':attribute ต้องได้รับการยอมรับ',
+ 'active_url' => ':attribute ไม่ใช่ URL ที่ถูกต้อง',
+ 'after' => ':attribute ต้องเป็นวันที่หลังจาก :date',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute ต้องมีเฉพาะตัวอักษรเท่านั้น',
+ 'alpha_dash' => ':attribute ต้องมีเฉพาะตัวอักษร ตัวเลข หรือเครื่องหมายลบเท่านั้น',
+ 'alpha_num' => ':attribute ต้องมีเฉพาะตัวอักษรและตัวเลขเท่านั้น',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute ต้องเป็นวันที่ก่อน :date',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute ต้องอยู่ระหว่าง :min - :max',
+ 'file' => ':attribute ต้องมีขนาดระหว่าง :min - :max กิโลไบต์',
+ 'string' => ':attribute ต้องมีจำนวนระหว่าง :min - :max ตัวอักษร',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => ':attribute ไม่ตรงกัน',
+ 'date' => ':attribute เป็นรูปแบบวันที่ที่ไม่ถูกต้อง',
+ 'date_format' => ':attribute ไม่ตรงตามรูปแบบ :format',
+ 'different' => ':attribute และ :other ต้องไม่เหมือนกัน',
+ 'digits' => ':attribute ต้องเป็น :digits ตัวเลข',
+ 'digits_between' => ':attribute ต้องเป็นตัวเลขระหว่าง :min และ :max',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'รูปแบบของ :attribute ไม่ถูกต้อง',
+ 'exists' => ':attribute ที่เลือกไม่ถูกต้อง',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute ต้องเป็นรูปภาพเท่านั้น',
+ 'in' => ':attribute ที่เลือกไม่ถูกต้อง',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute ต้องเป็นจำนวนเต็มเท่านั้น',
+ 'ip' => ':attribute ต้องเป็นรูปแบบไอพีแอดเดรสเท่านั้น',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute ต้องไม่มากกว่า :max',
+ 'file' => ':attribute ต้องไม่มีขนาดมากกว่า :max กิโลไบต์',
+ 'string' => ':attribute ต้องไม่มีจำนวนตัวอักษรมากกว่า :max ตัวอักษร',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute ต้องเป็นรูปแบบไฟล์ดังนี้: :values',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute ต้องมีอย่างน้อย :min',
+ 'file' => ':attribute ต้องมีขนาดอย่างน้อย :min กิโลไบต์',
+ 'string' => ':attribute ต้องมีจำนวนอย่างน้อย :min ตัวอักษร',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => ':attribute ที่เลือกไม่ถูกต้อง',
+ 'numeric' => ':attribute ต้องเป็นตัวเลขเท่านั้น',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'รูปแบบของ :attribute ไม่ถูกต้อง',
+ 'required' => 'กรุณากรอกข้อมูลในฟิลด์ :attribute',
+ 'required_if' => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :other เป็น :value',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :value มีข้อมูลอยู่ด้วย',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'ฟิลด์ :attribute จำเป็นต้องมีข้อมูล เมื่อ :value ไม่มีข้อมูล',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute และ :other ต้องตรงกัน',
+ 'size' => [
+ 'numeric' => ':attribute ต้องมีขนาด :size',
+ 'file' => ':attribute ต้องมีขนาด :size กิโลไบต์',
+ 'string' => ':attribute ต้องมีจำนวน :size ตัวอักษร',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute กำลังใช้งานอยู่',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'รูปแบบของ :attribute ไม่ถูกต้อง',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "ฟิลด์ :attribute ประกอบไปด้วยอักขระที่ไม่อนุญาต",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/tr/admin/asset_maintenances/message.php b/resources/lang/tr/admin/asset_maintenances/message.php
index 837faa7b44..ef95845414 100644
--- a/resources/lang/tr/admin/asset_maintenances/message.php
+++ b/resources/lang/tr/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Varlık Bakımı başarıyla oluşturuldu.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Henüz Tamamlanmadı',
'warranty' => 'Garanti',
diff --git a/resources/lang/tr/admin/hardware/general.php b/resources/lang/tr/admin/hardware/general.php
index aaae2e6062..ee3559cade 100644
--- a/resources/lang/tr/admin/hardware/general.php
+++ b/resources/lang/tr/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Demirbaş',
'bulk_checkout' => 'Varlıkları kullanıcıya ata',
'checkin' => 'Demirbaş Girişi Yap',
- 'checkout' => 'Demirbaşı bu kullanıcıya çıkış yap',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Demirbaşı Kopyala',
'deployable' => 'Dağıtılabilir',
'deleted' => 'Bu demirbaş silindi. Geri getirmek için tıklayınız.',
diff --git a/resources/lang/tr/admin/hardware/message.php b/resources/lang/tr/admin/hardware/message.php
index 388611fb79..45d2a75f01 100644
--- a/resources/lang/tr/admin/hardware/message.php
+++ b/resources/lang/tr/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Demirbaş geri getirildi.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Dosya silinemedi. Lütfen tekrar deneyin.',
'success' => 'Dosya silindi.',
diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php
index aaa4d1ec8d..f000c8b014 100644
--- a/resources/lang/tr/admin/settings/general.php
+++ b/resources/lang/tr/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Uyarı bitiş zamanı (gün içinde)',
'alert_inv_threshold' => 'Son uyarı zamanı',
'asset_ids' => 'Demirbaş No',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Otomatik artan Demirbaş No üret',
'auto_increment_prefix' => 'Ünvan (opsiyonel)',
'auto_incrementing_help' => 'Otomatik artan demirbaş No ilk buradan başlasın',
diff --git a/resources/lang/tr/admin/users/general.php b/resources/lang/tr/admin/users/general.php
index 11e5f36e23..86a3edc3ac 100644
--- a/resources/lang/tr/admin/users/general.php
+++ b/resources/lang/tr/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'İzin verilen dosya türleri; png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar.',
'history_user' => ':name Kişisi ile iligli geçmiş',
'info' => 'Bilgi',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Son oturum açma tarihi',
'ldap_config_text' => 'LDAP yapılandırma ayarları Yönetici> Ayarlar\'da bulunabilir. Seçilen yer (isteğe bağlı), tüm içe aktarılan kullanıcılar için ayarlanır.',
'software_user' => 'Yazılıma :name için çıkış yapılmış',
diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php
index 7cdff9f353..aaec83567f 100644
--- a/resources/lang/tr/general.php
+++ b/resources/lang/tr/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Demirbaş Raporu',
'asset_tag' => 'Demirbaş Etiketi',
'assets_available' => 'Kullanılabilir Demirbaşlar',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Demirbaşlar',
'avatar_delete' => 'Profil Resmini Sil',
'avatar_upload' => 'Profil Resmi Yükle',
'back' => 'Geri',
'bad_data' => 'Hiçbir veri bulunamadı. Bozuk veri olabilir.',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Toplu Atama',
'cancel' => 'İptal',
'categories' => 'Kategoriler',
@@ -52,6 +56,8 @@
'current' => 'Geçerli',
'custom_report' => 'Özel demirbaş raporu',
'dashboard' => 'Pano',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Tarih',
'debug_warning' => 'Uyarı!',
'debug_warning_text' => 'Bu uygulama, hata ayıklamanın etkin olduğu üretim modunda çalışıyor. Bu, hassas verilerinizi, uygulamanıza dış dünyadan erişebilirse ortaya çıkarabilir. Ayarını yaparak hata ayıklama modunu devre dışı bırakın. APP_DEBUG value in your .env file to false.
@@ -120,6 +126,8 @@ Context | Request Context
'moreinfo' => 'Daha Fazla Bilgi',
'name' => 'Adı',
'next' => 'Sonraki',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'yeni!',
'no_depreciation' => 'Değer kaybı yok',
'no_results' => 'Sonuç Bulunamadı.',
diff --git a/resources/lang/tr/validation.php b/resources/lang/tr/validation.php
index 3e64efce07..27f40fd5ea 100644
--- a/resources/lang/tr/validation.php
+++ b/resources/lang/tr/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ": attribute benzersiz olması gerekir.",
- "active_url" => ":attribute geçersiz URL.",
- "after" => ":attribute :date sonra olmalı.",
- "alpha" => ":attribute sadece harf içermeli.",
- "alpha_dash" => ":attribute sadece harf, rakam ve noktalama işaretleri olabilir.",
- "alpha_num" => ":attribute sadece harf ve rakam olabilir.",
- "before" => ":attribute :date den önce olmalı.",
- "between" => array(
- "numeric" => ":attribute :min - :max arasında olmalı.",
- "file" => ":attribute :min - :max Kb arasında olmalı.",
- "string" => ":attribute :min - :max karakter arasında olmalı.",
- ),
- "boolean" => ":attribute doğru veya yanlış olabilir.",
- "confirmed" => ":attribute doğrulama uyuşmuyor.",
- "date" => ":attribute geçerli bir tarih değil.",
- "date_format" => ":attribute biçim geçersiz.",
- "different" => ":attribute ve :other farklı olmalı.",
- "digits" => ":attribute :digits numara olmalı.",
- "digits_between" => ":attribute :min ve :max numara.",
- "email" => ":attribute biçim geçersiz.",
- "exists" => ":attribute seçim geçersiz.",
- "email_array" => "Bir veya daha fazla e-posta adresi geçerli değil.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute bir görüntü olması gerekir.",
- "in" => ":attribute geçersiz.",
- "integer" => ":attribute bir tamsayı olmalıdır.",
- "ip" => ":attribute geçerli bir IP adresi olması gerekir.",
- "max" => array(
- "numeric" => ":attribute :max dan büyük olmalı.",
- "file" => ":attribute :max Kb tan büyük olmalı.",
- "string" => ":attribute :max karakterden büyük olamaz.",
- ),
- "mimes" => ":attribute :values türleri olmalı.",
- "min" => array(
- "numeric" => ":attribute :min den küçük olmalı.",
- "file" => ":attribute :min Kb tan küçük olmalı.",
- "string" => ":attribute :min karakterden küçük olmalı.",
- ),
- "not_in" => ":attribute geçersiz.",
- "numeric" => ":attribute sayı olmalıdır.",
- "regex" => ":attribute formatı geçersiz.",
- "required" => ":attribute alanı zorunludur.",
- "required_if" => ":attribute :other :value geçersiz.",
- "required_with" => ":attribute :values geçersiz.",
- "required_without" => ":attribute :values geçersiz.",
- "same" => ":attribute ve :other aynı olmalı.",
- "size" => array(
- "numeric" => ":attribute :size olmalı.",
- "file" => ":attribute :size Kb olmalı.",
- "string" => ":attribute :size karakter olmalı.",
- ),
- "unique" => ":attribute zaten alınmış.",
- "url" => ":attribute biçim geçersiz.",
- "statuslabel_type" => "Geçerli bir durum etiketi türü seçmelisiniz",
- "unique_undeleted" => ": attribute benzersiz olması gerekir.",
+ 'accepted' => ': attribute benzersiz olması gerekir.',
+ 'active_url' => ':attribute geçersiz URL.',
+ 'after' => ':attribute :date sonra olmalı.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute sadece harf içermeli.',
+ 'alpha_dash' => ':attribute sadece harf, rakam ve noktalama işaretleri olabilir.',
+ 'alpha_num' => ':attribute sadece harf ve rakam olabilir.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute :date den önce olmalı.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute :min - :max arasında olmalı.',
+ 'file' => ':attribute :min - :max Kb arasında olmalı.',
+ 'string' => ':attribute :min - :max karakter arasında olmalı.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute doğru veya yanlış olabilir.',
+ 'confirmed' => ':attribute doğrulama uyuşmuyor.',
+ 'date' => ':attribute geçerli bir tarih değil.',
+ 'date_format' => ':attribute biçim geçersiz.',
+ 'different' => ':attribute ve :other farklı olmalı.',
+ 'digits' => ':attribute :digits numara olmalı.',
+ 'digits_between' => ':attribute :min ve :max numara.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute biçim geçersiz.',
+ 'exists' => ':attribute seçim geçersiz.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute bir görüntü olması gerekir.',
+ 'in' => ':attribute geçersiz.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute bir tamsayı olmalıdır.',
+ 'ip' => ':attribute geçerli bir IP adresi olması gerekir.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute :max dan büyük olmalı.',
+ 'file' => ':attribute :max Kb tan büyük olmalı.',
+ 'string' => ':attribute :max karakterden büyük olamaz.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute :values türleri olmalı.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute :min den küçük olmalı.',
+ 'file' => ':attribute :min Kb tan küçük olmalı.',
+ 'string' => ':attribute :min karakterden küçük olmalı.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => ':attribute geçersiz.',
+ 'numeric' => ':attribute sayı olmalıdır.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute formatı geçersiz.',
+ 'required' => ':attribute alanı zorunludur.',
+ 'required_if' => ':attribute :other :value geçersiz.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ':attribute :values geçersiz.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => ':attribute :values geçersiz.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute ve :other aynı olmalı.',
+ 'size' => [
+ 'numeric' => ':attribute :size olmalı.',
+ 'file' => ':attribute :size Kb olmalı.',
+ 'string' => ':attribute :size karakter olmalı.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute zaten alınmış.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute biçim geçersiz.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => ": attribute alanı izin verilmeyen bir karakter içeriyor.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/vi/admin/asset_maintenances/message.php b/resources/lang/vi/admin/asset_maintenances/message.php
index 28cd5cdbe7..855f19b998 100644
--- a/resources/lang/vi/admin/asset_maintenances/message.php
+++ b/resources/lang/vi/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => 'Tài sản đang bảo trì được tạo thành công.'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => 'Chưa hoàn thành',
'warranty' => 'Bảo hành',
diff --git a/resources/lang/vi/admin/hardware/general.php b/resources/lang/vi/admin/hardware/general.php
index cf8f324cf5..cf726908b1 100644
--- a/resources/lang/vi/admin/hardware/general.php
+++ b/resources/lang/vi/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => 'Tài sản',
'bulk_checkout' => 'Checkout Assets to User',
'checkin' => 'Checkin tài sản',
- 'checkout' => 'Checkout tài sản đến người dùng',
+ 'checkout' => 'Checkout Asset',
'clone' => 'Nhân đôi tài sản',
'deployable' => 'Cho phép cấp phát',
'deleted' => 'Tài sản này đã bị xóa. Nhấn vào đây để phục hồi.',
diff --git a/resources/lang/vi/admin/hardware/message.php b/resources/lang/vi/admin/hardware/message.php
index ae8c71023c..49907cfa8c 100644
--- a/resources/lang/vi/admin/hardware/message.php
+++ b/resources/lang/vi/admin/hardware/message.php
@@ -24,6 +24,12 @@ return array(
'success' => 'Tài sản được khôi phục thành công.'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => 'Tập tin đã không được xoá. Bạn hãy thử lại.',
'success' => 'Tập tin đã được xoá thành công.',
diff --git a/resources/lang/vi/admin/settings/general.php b/resources/lang/vi/admin/settings/general.php
index 7596674f3b..5547528ca3 100644
--- a/resources/lang/vi/admin/settings/general.php
+++ b/resources/lang/vi/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => 'Expiring Alerts Threshold (in days)',
'alert_inv_threshold' => 'Inventory Alert Threshold',
'asset_ids' => 'ID tài sản',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => 'Tạo ID tài sản tự động tăng',
'auto_increment_prefix' => 'Tiền tố (tùy chọn)',
'auto_incrementing_help' => 'Cho phép ID tài sản tự động tăng đầu tiên được đặt cho nó',
diff --git a/resources/lang/vi/admin/users/general.php b/resources/lang/vi/admin/users/general.php
index 883713789e..f4e8d126ca 100644
--- a/resources/lang/vi/admin/users/general.php
+++ b/resources/lang/vi/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => 'Cho phép loại tập tin are png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, and rar.',
'history_user' => 'Lịch sử cấp phát của :name',
'info' => 'Info',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => 'Lần đăng nhập trước',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'software_user' => 'Phần mềm đã được checkout đến :name',
diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php
index 921510f467..84ee1fa7df 100644
--- a/resources/lang/vi/general.php
+++ b/resources/lang/vi/general.php
@@ -18,11 +18,15 @@
'asset_report' => 'Báo cáo tài sản',
'asset_tag' => 'Thẻ tài sản',
'assets_available' => 'tài sản sẵn có',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => 'Tài sản',
'avatar_delete' => 'Xóa hình đại diện',
'avatar_upload' => 'Tải lên hình đại diện',
'back' => 'Quay lại',
'bad_data' => 'Không tìm thấy bất cứ gì. Có thể dữ liệu bị mất?',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => 'Bulk Checkout',
'cancel' => 'Hủy',
'categories' => 'Danh mục',
@@ -52,6 +56,8 @@
'current' => 'Hiện hành',
'custom_report' => 'Điều chỉnh báo cáo tài sản',
'dashboard' => 'Bảng điều khiển',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => 'Ngày',
'debug_warning' => 'Warning!',
'debug_warning_text' => 'This application is running in production mode with debugging enabled. This can expose sensitive data if your application is accessible to the outside world. Disable debug mode by setting the APP_DEBUG value in your .env file to false.',
@@ -117,6 +123,8 @@
'moreinfo' => 'Xem thêm thông tin',
'name' => 'Tên',
'next' => 'Tiếp',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => 'Không khấu hao',
'no_results' => 'Không có kết quả.',
diff --git a/resources/lang/vi/validation.php b/resources/lang/vi/validation.php
index 32c7d5f2f5..af72fcaa7a 100644
--- a/resources/lang/vi/validation.php
+++ b/resources/lang/vi/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute phải được chấp nhận.",
- "active_url" => ":attribute thì không phải URL hợp lệ.",
- "after" => ":attribute phải có ngày sau ngày :date.",
- "alpha" => ":attribute có thể chỉ chứa chữ.",
- "alpha_dash" => ":attribute có thể chỉ chứa chữ, số và dấu phẩy.",
- "alpha_num" => ":attribute có thể chỉ chứa chữ và số.",
- "before" => ":attribute phải có ngày trước ngày :date.",
- "between" => array(
- "numeric" => ":attribute phải nằm giữa :min - :max.",
- "file" => ":attribute phải nằm giữa :min - :max kilobytes.",
- "string" => ":attribute phải nằm :min - :max ký tự.",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => ":attribute xác nhận không đúng.",
- "date" => ":attribute có ngày không hợp lý.",
- "date_format" => ":attribute không phù hợp định dạng :format.",
- "different" => ":attribute và :other phải khác nhau.",
- "digits" => ":attribute phải có :digits số.",
- "digits_between" => ":attribute phải ở giữa :min và :max số.",
- "email" => "Định dạng :attribute thì không phù hợp.",
- "exists" => ":attribute đã chọn không phù hợp.",
- "email_array" => "Một hoặc nhiều địa chỉ email không hợp lệ.",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute phải là một hình.",
- "in" => ":attribute đã lựa chọn không hợp lý.",
- "integer" => ":attribute phải là một số nguyên.",
- "ip" => ":attribute phải là một địa chỉ IP.",
- "max" => array(
- "numeric" => ":attribute có thể không lớn hơn :max.",
- "file" => ":attribute có thể không lớn hơn :max kilobytes.",
- "string" => ":attribute có thể không lớn hơn :max ký tự.",
- ),
- "mimes" => ":attribute phải là một tập tin có phần mở rộng là: :values.",
- "min" => array(
- "numeric" => ":attribute phải có ít nhất :min.",
- "file" => ":attribute phải ít nhất :min kilobytes.",
- "string" => ":attribute phải ít nhất :min ký tự.",
- ),
- "not_in" => ":attribute đã chọn không hợp lý.",
- "numeric" => ":attribute phải là một số.",
- "regex" => "Định dạng :attribute thì không hợp lý.",
- "required" => "Trường :attribute thì bắt buộc.",
- "required_if" => "Trường :attribute thì bắt buộc khi :other là :value.",
- "required_with" => "Trường :attribute thì bắt buộc khi :values là hiện hành.",
- "required_without" => "Trường :attribute thì bắt buộc khi :values không hiện hành.",
- "same" => ":attribute và :other phải giống nhau.",
- "size" => array(
- "numeric" => ":attribute phải có cỡ :size.",
- "file" => ":attribute phải có cỡ :size kilobytes.",
- "string" => ":attribute phải có :size ký tự.",
- ),
- "unique" => ":attribute đã sẵn sàng.",
- "url" => "Định dạng :attribute thì không hợp lý.",
- "statuslabel_type" => "Bạn phải chọn một loại nhãn trạng thái hợp lệ",
- "unique_undeleted" => ":attribute phải là duy nhất.",
+ 'accepted' => ':attribute phải được chấp nhận.',
+ 'active_url' => ':attribute thì không phải URL hợp lệ.',
+ 'after' => ':attribute phải có ngày sau ngày :date.',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute có thể chỉ chứa chữ.',
+ 'alpha_dash' => ':attribute có thể chỉ chứa chữ, số và dấu phẩy.',
+ 'alpha_num' => ':attribute có thể chỉ chứa chữ và số.',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute phải có ngày trước ngày :date.',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute phải nằm giữa :min - :max.',
+ 'file' => ':attribute phải nằm giữa :min - :max kilobytes.',
+ 'string' => ':attribute phải nằm :min - :max ký tự.',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => ':attribute xác nhận không đúng.',
+ 'date' => ':attribute có ngày không hợp lý.',
+ 'date_format' => ':attribute không phù hợp định dạng :format.',
+ 'different' => ':attribute và :other phải khác nhau.',
+ 'digits' => ':attribute phải có :digits số.',
+ 'digits_between' => ':attribute phải ở giữa :min và :max số.',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => 'Định dạng :attribute thì không phù hợp.',
+ 'exists' => ':attribute đã chọn không phù hợp.',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute phải là một hình.',
+ 'in' => ':attribute đã lựa chọn không hợp lý.',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute phải là một số nguyên.',
+ 'ip' => ':attribute phải là một địa chỉ IP.',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute có thể không lớn hơn :max.',
+ 'file' => ':attribute có thể không lớn hơn :max kilobytes.',
+ 'string' => ':attribute có thể không lớn hơn :max ký tự.',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute phải là một tập tin có phần mở rộng là: :values.',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute phải có ít nhất :min.',
+ 'file' => ':attribute phải ít nhất :min kilobytes.',
+ 'string' => ':attribute phải ít nhất :min ký tự.',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => ':attribute đã chọn không hợp lý.',
+ 'numeric' => ':attribute phải là một số.',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => 'Định dạng :attribute thì không hợp lý.',
+ 'required' => 'Trường :attribute thì bắt buộc.',
+ 'required_if' => 'Trường :attribute thì bắt buộc khi :other là :value.',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => 'Trường :attribute thì bắt buộc khi :values là hiện hành.',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => 'Trường :attribute thì bắt buộc khi :values không hiện hành.',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute và :other phải giống nhau.',
+ 'size' => [
+ 'numeric' => ':attribute phải có cỡ :size.',
+ 'file' => ':attribute phải có cỡ :size kilobytes.',
+ 'string' => ':attribute phải có :size ký tự.',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute đã sẵn sàng.',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => 'Định dạng :attribute thì không hợp lý.',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => "Trường :attribute chứa đựng một ký tự không được phép.",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/zh-CN/admin/asset_maintenances/message.php b/resources/lang/zh-CN/admin/asset_maintenances/message.php
index 10604e6a34..b16d5325c7 100644
--- a/resources/lang/zh-CN/admin/asset_maintenances/message.php
+++ b/resources/lang/zh-CN/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => '资产维护信息已创建。'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => '尚未完成',
'warranty' => '有质保',
diff --git a/resources/lang/zh-CN/admin/hardware/general.php b/resources/lang/zh-CN/admin/hardware/general.php
index e0254dd5ad..83aa8aaaf8 100644
--- a/resources/lang/zh-CN/admin/hardware/general.php
+++ b/resources/lang/zh-CN/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => '资产',
'bulk_checkout' => '借出资产给某人',
'checkin' => '借入资产',
- 'checkout' => '借出资产给某人',
+ 'checkout' => 'Checkout Asset',
'clone' => '复制资产',
'deployable' => '可部署',
'deleted' => '该资产已删除。 点击此处恢复.',
diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php
index 39ee06356d..a20fb41ad9 100644
--- a/resources/lang/zh-CN/admin/hardware/message.php
+++ b/resources/lang/zh-CN/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => '资产恢复成功。'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => '文件删除失败，请重试',
'success' => '文件已成功删除。',
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index 77acc7056d..e472fd8060 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => '警报阈值(天)',
'alert_inv_threshold' => '库存警报阈值',
'asset_ids' => '资产ID',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => '生成自动递增资产ID',
'auto_increment_prefix' => '前缀（可选）',
'auto_incrementing_help' => '在启用自动递增的资产ID之前设置此处。',
diff --git a/resources/lang/zh-CN/admin/users/general.php b/resources/lang/zh-CN/admin/users/general.php
index a6045354ff..ad19b362ff 100644
--- a/resources/lang/zh-CN/admin/users/general.php
+++ b/resources/lang/zh-CN/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => '允许的文件类型有： png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar',
'history_user' => ':name的历史',
'info' => '信息',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => '上一次登陆',
'ldap_config_text' => 'LDAP配置在 管理 > 设置。所选位置将为导入的用户所用',
'software_user' => ':name 借走的软件',
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index 355c5b8afa..e1ca5f809e 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -18,11 +18,15 @@
'asset_report' => '资产报备',
'asset_tag' => '资产标签',
'assets_available' => '可用资产',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => '资产',
'avatar_delete' => '删除头像',
'avatar_upload' => '上传头像',
'back' => '后退',
'bad_data' => '未发现任何东西，是否数据错误？',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => '批量借出',
'cancel' => '取消',
'categories' => '目录',
@@ -52,6 +56,8 @@
'current' => '当前',
'custom_report' => '客户资产的报告',
'dashboard' => '控制面板',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => '日期',
'debug_warning' => '警告!',
'debug_warning_text' => '此应用程序运行在生产模式下的调试状态。如果您的应用程序可以被外部访问，这会使敏感数据暴露。通过将 .env 文件中的APP_DEBUG 值设置为 false来 禁用调试模式。',
@@ -117,6 +123,8 @@
'moreinfo' => '更多信息',
'name' => '名称',
'next' => '下一页',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => '新！',
'no_depreciation' => '永久',
'no_results' => '没有结果',
diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php
index 67bbcc146c..4708a28b06 100644
--- a/resources/lang/zh-CN/validation.php
+++ b/resources/lang/zh-CN/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => " :attribute 必须接受",
- "active_url" => ":attribute 不是正确的网址",
- "after" => " :attribute 必须在 :date 之后",
- "alpha" => ":attribute 只能包含字母",
- "alpha_dash" => ":attribute 只能包含字母，数字和'-'",
- "alpha_num" => ":attribute 只允许字母和数字",
- "before" => ":attribute 必须在 :date 之前",
- "between" => array(
- "numeric" => ":attribute 必须在 :min - :max 之间",
- "file" => ":attribute 必须在 :min - :max kb 之间",
- "string" => ":attribute 必须在 :min - :max 字符之间",
- ),
- "boolean" => "The :attribute must be true or false.",
- "confirmed" => ":attribute 属性不匹配",
- "date" => ":attribute 不是有效日期",
- "date_format" => ":attribute 不符合 :format 的格式",
- "different" => " :attribute 和 :other 不能相同",
- "digits" => ":attribute 必须是 :digits 数字",
- "digits_between" => ":attribute 必须在 :min 和 :max 数字之间",
- "email" => ":attribute 格式不对",
- "exists" => "选择的 :attribute 无效",
- "email_array" => "一个或多个邮件地址不正确",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute 必须是图片格式",
- "in" => "选择的 :attribute 无效",
- "integer" => ":attribute 必须是整数",
- "ip" => ":attribute 必须是有效IP",
- "max" => array(
- "numeric" => ":attribute 不大于 :max",
- "file" => ":attribute 不大于 :max kb",
- "string" => ":attribute 不大于 :max 字符",
- ),
- "mimes" => ":attribute 文件类型必须是 :values",
- "min" => array(
- "numeric" => ":attribute 最少 :min",
- "file" => ":attribute 最小 :min kb",
- "string" => ":attribute 最少 :min个字符",
- ),
- "not_in" => "选择的 :attribute 无效",
- "numeric" => ":attribute 必须是数字",
- "regex" => ":attribute 格式不对",
- "required" => ":attribute 字段必填",
- "required_if" => ":attribute 字段在 :other 是 :value 时是必须的",
- "required_with" => " 当:values 是现在 :attribute 是必需的",
- "required_without" => "当:values 是现在 :attribute 是必需的",
- "same" => ":attribute 和 :other 必需匹配",
- "size" => array(
- "numeric" => ":attribute 必需是 :size",
- "file" => ":attribute 必需是 :size kb",
- "string" => ":attribute 必需是 :size 个字符",
- ),
- "unique" => ":attribute 已经被采用",
- "url" => ":attribute 格式无效",
- "statuslabel_type" => "你必须选择一个有效的状态标签类型",
- "unique_undeleted" => " :attribute 必须唯一",
+ 'accepted' => ' :attribute 必须接受',
+ 'active_url' => ':attribute 不是正确的网址',
+ 'after' => ' :attribute 必须在 :date 之后',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute 只能包含字母',
+ 'alpha_dash' => ':attribute 只能包含字母，数字和\'-\'',
+ 'alpha_num' => ':attribute 只允许字母和数字',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute 必须在 :date 之前',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute 必须在 :min - :max 之间',
+ 'file' => ':attribute 必须在 :min - :max kb 之间',
+ 'string' => ':attribute 必须在 :min - :max 字符之间',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => 'The :attribute field must be true or false.',
+ 'confirmed' => ':attribute 属性不匹配',
+ 'date' => ':attribute 不是有效日期',
+ 'date_format' => ':attribute 不符合 :format 的格式',
+ 'different' => ' :attribute 和 :other 不能相同',
+ 'digits' => ':attribute 必须是 :digits 数字',
+ 'digits_between' => ':attribute 必须在 :min 和 :max 数字之间',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute 格式不对',
+ 'exists' => '选择的 :attribute 无效',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute 必须是图片格式',
+ 'in' => '选择的 :attribute 无效',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute 必须是整数',
+ 'ip' => ':attribute 必须是有效IP',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute 不大于 :max',
+ 'file' => ':attribute 不大于 :max kb',
+ 'string' => ':attribute 不大于 :max 字符',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute 文件类型必须是 :values',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute 最少 :min',
+ 'file' => ':attribute 最小 :min kb',
+ 'string' => ':attribute 最少 :min个字符',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => '选择的 :attribute 无效',
+ 'numeric' => ':attribute 必须是数字',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute 格式不对',
+ 'required' => ':attribute 字段必填',
+ 'required_if' => ':attribute 字段在 :other 是 :value 时是必须的',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => ' 当:values 是现在 :attribute 是必需的',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => '当:values 是现在 :attribute 是必需的',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute 和 :other 必需匹配',
+ 'size' => [
+ 'numeric' => ':attribute 必需是 :size',
+ 'file' => ':attribute 必需是 :size kb',
+ 'string' => ':attribute 必需是 :size 个字符',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute 已经被采用',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute 格式无效',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => ":attribute 含有无效字符",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);
diff --git a/resources/lang/zh-TW/admin/asset_maintenances/message.php b/resources/lang/zh-TW/admin/asset_maintenances/message.php
index e355504b89..d9bb336c55 100644
--- a/resources/lang/zh-TW/admin/asset_maintenances/message.php
+++ b/resources/lang/zh-TW/admin/asset_maintenances/message.php
@@ -12,8 +12,8 @@
'success' => '資產維護訊息已新增。'
],
'edit' => [
- 'error' => 'Asset Maintenance was not created, please try again.',
- 'success' => 'Asset Maintenance created successfully.'
+ 'error' => 'Asset Maintenance was not edited, please try again.',
+ 'success' => 'Asset Maintenance edited successfully.'
],
'asset_maintenance_incomplete' => '尚未完成',
'warranty' => '保固',
diff --git a/resources/lang/zh-TW/admin/hardware/general.php b/resources/lang/zh-TW/admin/hardware/general.php
index 2c8bbe0ba2..377f54d4e1 100644
--- a/resources/lang/zh-TW/admin/hardware/general.php
+++ b/resources/lang/zh-TW/admin/hardware/general.php
@@ -7,7 +7,7 @@ return array(
'asset' => '資產',
'bulk_checkout' => '借出資產給使用者',
'checkin' => '資產繳回',
- 'checkout' => '借出資產給使用者',
+ 'checkout' => 'Checkout Asset',
'clone' => '複製資產',
'deployable' => '可部署',
'deleted' => '此資產已刪除。點擊此處恢復.',
diff --git a/resources/lang/zh-TW/admin/hardware/message.php b/resources/lang/zh-TW/admin/hardware/message.php
index 177f56a766..1f8ef75f2f 100644
--- a/resources/lang/zh-TW/admin/hardware/message.php
+++ b/resources/lang/zh-TW/admin/hardware/message.php
@@ -23,6 +23,12 @@ return array(
'success' => '恢復資產成功。'
),
+ 'audit' => array(
+ 'error' => 'Asset audit was unsuccessful. Please try again.',
+ 'success' => 'Asset audit successfully logged.'
+ ),
+
+
'deletefile' => array(
'error' => '刪除檔案失敗，請重試。',
'success' => '刪除檔案成功。',
diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php
index fb2b4bbbf1..daf7ae3f2f 100644
--- a/resources/lang/zh-TW/admin/settings/general.php
+++ b/resources/lang/zh-TW/admin/settings/general.php
@@ -10,6 +10,10 @@ return array(
'alert_interval' => '警報閾值(天)',
'alert_inv_threshold' => '庫存警報閾值',
'asset_ids' => '資產ID',
+ 'audit_interval' => 'Audit Interval',
+ 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months.',
+ 'audit_warning_days' => 'Audit Warning Threshold',
+ 'audit_warning_days_help' => 'How many days in advance should we warn you when assets are due for auditing?',
'auto_increment_assets' => '產生自動遞增資產ID',
'auto_increment_prefix' => '前綴(可選)',
'auto_incrementing_help' => '在啟用自動遞增的資產ID之前設定此處。',
diff --git a/resources/lang/zh-TW/admin/users/general.php b/resources/lang/zh-TW/admin/users/general.php
index 4799b39635..1563dbd082 100644
--- a/resources/lang/zh-TW/admin/users/general.php
+++ b/resources/lang/zh-TW/admin/users/general.php
@@ -13,6 +13,7 @@ return array(
'filetype_info' => '允許檔案類型：png, gif, jpg, jpeg, doc, docx, pdf, txt, zip, rar。',
'history_user' => ':name 的歷史記錄',
'info' => '資訊',
+ 'restore_user' => 'Click here to restore them.',
'last_login' => '上次登入',
'ldap_config_text' => 'LDAP 設定在 管理 > 設定。所選位置將套用至匯入的使用者。',
'software_user' => ':name 借出的軟體',
diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php
index a8b86bbae5..095cc32810 100644
--- a/resources/lang/zh-TW/general.php
+++ b/resources/lang/zh-TW/general.php
@@ -18,11 +18,15 @@
'asset_report' => '資產報告',
'asset_tag' => '資產標籤',
'assets_available' => '可用資產',
+ 'audit' => 'Audit',
+ 'audit_report' => 'Audit Log',
'assets' => '資產',
'avatar_delete' => '刪除頭像',
'avatar_upload' => '上傳頭像',
'back' => '返回',
'bad_data' => '未發現任何東西，是否資料有誤？',
+ 'bulkaudit' => 'Bulk Audit',
+ 'bulkaudit_status' => 'Audit Status',
'bulk_checkout' => '批次借出',
'cancel' => '取消',
'categories' => '類別',
@@ -52,6 +56,8 @@
'current' => '目前',
'custom_report' => '自訂資產報告',
'dashboard' => '儀表板',
+ 'days' => 'days',
+ 'days_to_next_audit' => 'Days to Next Audit',
'date' => '日期',
'debug_warning' => '警告！',
'debug_warning_text' => '此應用程式已開啟除錯模式， 如果開放外部存取可能造成敏感資料外洩。您可透過修改.env檔案中的參數APP_DEBUG，將值改為false關閉除錯模式。',
@@ -117,6 +123,8 @@
'moreinfo' => '更多訊息',
'name' => '名稱',
'next' => '下一頁',
+ 'next_audit_date' => 'Next Audit Date',
+ 'last_audit' => 'Last Audit',
'new' => 'new!',
'no_depreciation' => '永久',
'no_results' => '沒有結果',
diff --git a/resources/lang/zh-TW/validation.php b/resources/lang/zh-TW/validation.php
index 0f0bf41d58..f0b034974c 100644
--- a/resources/lang/zh-TW/validation.php
+++ b/resources/lang/zh-TW/validation.php
@@ -13,62 +13,91 @@ return array(
|
*/
- "accepted" => ":attribute 必須接受",
- "active_url" => "屬性不是有效的URL",
- "after" => ":attribute 必須在 :date 之後",
- "alpha" => ":attribute 只能包含字母",
- "alpha_dash" => ":attribute 只能包含字母，數字和'-'",
- "alpha_num" => ":attribute 只允許字母和數字",
- "before" => ":attribute 必須在 :date 之前",
- "between" => array(
- "numeric" => ":attribute 必須在 :min - :max 之間",
- "file" => ":attribute 必須在 :min - :max KB 之間",
- "string" => ":attribute 必須在 :min - :max 字元之間",
- ),
- "boolean" => ":attribute 必須是 true 或 false",
- "confirmed" => ":attribute 屬性不相符",
- "date" => ":attribute 不是有效日期",
- "date_format" => ":attribute 不符合 :format 的格式",
- "different" => ":attribute 和 :other 不能相同",
- "digits" => ":attribute 必須是 :digits 數字",
- "digits_between" => ":attribute 必須在 :min 和 :max 之间",
- "email" => ":attribute 格式不正確",
- "exists" => "選擇的 :attribute 無效",
- "email_array" => "一個或多個郵件地址不正確",
- "hashed_pass" => "Your current password is incorrect",
- 'dumbpwd' => 'That password is too common.',
- "image" => ":attribute 必須是圖片格式",
- "in" => "選擇的 :attribute 無效",
- "integer" => ":attribute 必須是整數",
- "ip" => ":attribute 必須是有效 IP",
- "max" => array(
- "numeric" => ":attribute 不可大於 :max",
- "file" => ":attribute 不可大於 :max KB",
- "string" => ":attribute 不可大於 :max 個字元",
- ),
- "mimes" => ":attribute 檔案類型必須是 :values",
- "min" => array(
- "numeric" => ":attribute 最少 :min",
- "file" => ":attribute 最小 :min KB",
- "string" => ":attribute 最少要有 :min 個字元",
- ),
- "not_in" => "選擇的 :attribute 無效",
- "numeric" => ":attribute 必須是數字",
- "regex" => ":attribute 格式不正確",
- "required" => ":attribute 欄位必填",
- "required_if" => ":attribute 欄位在 :other 是 :value 時是必填的",
- "required_with" => "當設定 :value 時，:attribute 欄位必填",
- "required_without" => "當設定非 :value 時，:attribute 欄位必填",
- "same" => ":attribute 和 :other 必需相符",
- "size" => array(
- "numeric" => ":attribute 必須是 :size",
- "file" => ":attribute 必須是 :size KB",
- "string" => ":attribute 必須是 :size 個字元",
- ),
- "unique" => ":attribute 已被採用",
- "url" => ":attribute 格式不正確",
- "statuslabel_type" => "您必須選擇一個有效的狀態標籤",
- "unique_undeleted" => ":attribute 必須唯一",
+ 'accepted' => ':attribute 必須接受',
+ 'active_url' => '屬性不是有效的URL',
+ 'after' => ':attribute 必須在 :date 之後',
+ 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
+ 'alpha' => ':attribute 只能包含字母',
+ 'alpha_dash' => ':attribute 只能包含字母，數字和\'-\'',
+ 'alpha_num' => ':attribute 只允許字母和數字',
+ 'array' => 'The :attribute must be an array.',
+ 'before' => ':attribute 必須在 :date 之前',
+ 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
+ 'between' => [
+ 'numeric' => ':attribute 必須在 :min - :max 之間',
+ 'file' => ':attribute 必須在 :min - :max KB 之間',
+ 'string' => ':attribute 必須在 :min - :max 字元之間',
+ 'array' => 'The :attribute must have between :min and :max items.',
+ ],
+ 'boolean' => ':attribute 必須是 true 或 false',
+ 'confirmed' => ':attribute 屬性不相符',
+ 'date' => ':attribute 不是有效日期',
+ 'date_format' => ':attribute 不符合 :format 的格式',
+ 'different' => ':attribute 和 :other 不能相同',
+ 'digits' => ':attribute 必須是 :digits 數字',
+ 'digits_between' => ':attribute 必須在 :min 和 :max 之间',
+ 'dimensions' => 'The :attribute has invalid image dimensions.',
+ 'distinct' => 'The :attribute field has a duplicate value.',
+ 'email' => ':attribute 格式不正確',
+ 'exists' => '選擇的 :attribute 無效',
+ 'file' => 'The :attribute must be a file.',
+ 'filled' => 'The :attribute field must have a value.',
+ 'image' => ':attribute 必須是圖片格式',
+ 'in' => '選擇的 :attribute 無效',
+ 'in_array' => 'The :attribute field does not exist in :other.',
+ 'integer' => ':attribute 必須是整數',
+ 'ip' => ':attribute 必須是有效 IP',
+ 'ipv4' => 'The :attribute must be a valid IPv4 address.',
+ 'ipv6' => 'The :attribute must be a valid IPv6 address.',
+ 'json' => 'The :attribute must be a valid JSON string.',
+ 'max' => [
+ 'numeric' => ':attribute 不可大於 :max',
+ 'file' => ':attribute 不可大於 :max KB',
+ 'string' => ':attribute 不可大於 :max 個字元',
+ 'array' => 'The :attribute may not have more than :max items.',
+ ],
+ 'mimes' => ':attribute 檔案類型必須是 :values',
+ 'mimetypes' => 'The :attribute must be a file of type: :values.',
+ 'min' => [
+ 'numeric' => ':attribute 最少 :min',
+ 'file' => ':attribute 最小 :min KB',
+ 'string' => ':attribute 最少要有 :min 個字元',
+ 'array' => 'The :attribute must have at least :min items.',
+ ],
+ 'not_in' => '選擇的 :attribute 無效',
+ 'numeric' => ':attribute 必須是數字',
+ 'present' => 'The :attribute field must be present.',
+ 'regex' => ':attribute 格式不正確',
+ 'required' => ':attribute 欄位必填',
+ 'required_if' => ':attribute 欄位在 :other 是 :value 時是必填的',
+ 'required_unless' => 'The :attribute field is required unless :other is in :values.',
+ 'required_with' => '當設定 :value 時，:attribute 欄位必填',
+ 'required_with_all' => 'The :attribute field is required when :values is present.',
+ 'required_without' => '當設定非 :value 時，:attribute 欄位必填',
+ 'required_without_all' => 'The :attribute field is required when none of :values are present.',
+ 'same' => ':attribute 和 :other 必需相符',
+ 'size' => [
+ 'numeric' => ':attribute 必須是 :size',
+ 'file' => ':attribute 必須是 :size KB',
+ 'string' => ':attribute 必須是 :size 個字元',
+ 'array' => 'The :attribute must contain :size items.',
+ ],
+ 'string' => 'The :attribute must be a string.',
+ 'timezone' => 'The :attribute must be a valid zone.',
+ 'unique' => ':attribute 已被採用',
+ 'uploaded' => 'The :attribute failed to upload.',
+ 'url' => ':attribute 格式不正確',
+
+ /*
+ |--------------------------------------------------------------------------
+ | Custom Validation Language Lines
+ |--------------------------------------------------------------------------
+ |
+ | Here you may specify custom validation messages for attributes using the
+ | convention "attribute.rule" to name the lines. This makes it quick to
+ | specify a specific custom language line for a given attribute rule.
+ |
+ */
/*
@@ -82,8 +111,14 @@ return array(
|
*/
- 'custom' => array(),
- 'alpha_space' => ":attribute 含有無效字元",
+ 'custom' => [
+ 'alpha_space' => "The :attribute field contains a character that is not allowed.",
+ "email_array" => "One or more email addresses is invalid.",
+ "hashed_pass" => "Your current password is incorrect",
+ 'dumbpwd' => 'That password is too common.',
+ "statuslabel_type" => "You must select a valid status label type",
+ "unique_undeleted" => "The :attribute must be unique.",
+ ],
/*
|--------------------------------------------------------------------------
@@ -96,6 +131,6 @@ return array(
|
*/
- 'attributes' => array(),
+ 'attributes' => [],
);