diff --git a/resources/lang/af/admin/custom_fields/general.php b/resources/lang/af/admin/custom_fields/general.php
index 8022ffdcb0..ae91eb9cda 100644
--- a/resources/lang/af/admin/custom_fields/general.php
+++ b/resources/lang/af/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/af/admin/custom_fields/message.php b/resources/lang/af/admin/custom_fields/message.php
index b52f9bb43f..3280b8ca6c 100644
--- a/resources/lang/af/admin/custom_fields/message.php
+++ b/resources/lang/af/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/af/admin/hardware/form.php b/resources/lang/af/admin/hardware/form.php
index 04e4df9e9f..f7fa6278cf 100644
--- a/resources/lang/af/admin/hardware/form.php
+++ b/resources/lang/af/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/af/admin/users/general.php b/resources/lang/af/admin/users/general.php
index 8dfea3a116..41079575d5 100644
--- a/resources/lang/af/admin/users/general.php
+++ b/resources/lang/af/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Laaste Aanmelding',
'ldap_config_text' => 'LDAP-konfigurasie-instellings kan Admin> Instellings gevind word. Die (opsionele) gekose ligging sal vir alle ingevoerde gebruikers gestel word.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Sagteware Uitgesoek na: naam',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Sien gebruiker: naam',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php
index 6811674021..f4627b2f74 100644
--- a/resources/lang/af/general.php
+++ b/resources/lang/af/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Skep nuwe',
'created' => 'Item geskep',
'created_asset' => 'geskep bate',
- 'created_at' => 'Geskep op',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Opgedateer op',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Dit word gebruik om e-posadresse te genereer wanneer u dit invoer',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Eerste Voorletter (jsmith@voorbeeld.com)',
'firstname_lastname_format' => 'Vir Naam Van (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-verbintenis',
'unknown_admin' => 'Onbekende Admin',
'username_format' => 'Gebruikernaam',
+ 'username' => 'Username',
'update' => 'Opdateer',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'opgelaai',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/af/passwords.php b/resources/lang/af/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/af/passwords.php
+++ b/resources/lang/af/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/af/reminders.php b/resources/lang/af/reminders.php
index c8c030ffa9..1e8ac77a51 100644
--- a/resources/lang/af/reminders.php
+++ b/resources/lang/af/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Wagwoorde moet ses karakters wees en ooreenstem met die bevestiging.",
-
"user" => "Gebruikersnaam of e-posadres is verkeerd",
-
- "token" => "Hierdie wagwoord-reset-token is ongeldig.",
-
- "sent" => "As 'n ooreenstemmende e-posadres gevind is, is 'n wagwoordherinnering gestuur!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/af/validation.php b/resources/lang/af/validation.php
index 6ee3e716e8..f2c3357a04 100644
--- a/resources/lang/af/validation.php
+++ b/resources/lang/af/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Die: Attribuutformaat is ongeldig.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/am/admin/custom_fields/general.php b/resources/lang/am/admin/custom_fields/general.php
index 4c7442b2d5..7434117830 100644
--- a/resources/lang/am/admin/custom_fields/general.php
+++ b/resources/lang/am/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/am/admin/custom_fields/message.php b/resources/lang/am/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/am/admin/custom_fields/message.php
+++ b/resources/lang/am/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/am/admin/hardware/form.php b/resources/lang/am/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/am/admin/hardware/form.php
+++ b/resources/lang/am/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/am/admin/users/general.php b/resources/lang/am/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/am/admin/users/general.php
+++ b/resources/lang/am/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/am/general.php b/resources/lang/am/general.php
index 5d67d5d673..c4d2798035 100644
--- a/resources/lang/am/general.php
+++ b/resources/lang/am/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Create New',
'created' => 'Item Created',
'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/am/passwords.php b/resources/lang/am/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/am/passwords.php
+++ b/resources/lang/am/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/am/reminders.php b/resources/lang/am/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/am/reminders.php
+++ b/resources/lang/am/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/am/validation.php b/resources/lang/am/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/am/validation.php
+++ b/resources/lang/am/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ar/admin/custom_fields/general.php b/resources/lang/ar/admin/custom_fields/general.php
index e4865630c4..156f78cab1 100644
--- a/resources/lang/ar/admin/custom_fields/general.php
+++ b/resources/lang/ar/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'يجب أن تكون هذه القيمة فريدة من نوعها عبر جميع الأصول',
'unique' => 'غير مكرر',
];
diff --git a/resources/lang/ar/admin/custom_fields/message.php b/resources/lang/ar/admin/custom_fields/message.php
index 44ff697900..60d970e4f7 100644
--- a/resources/lang/ar/admin/custom_fields/message.php
+++ b/resources/lang/ar/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ar/admin/hardware/form.php b/resources/lang/ar/admin/hardware/form.php
index 75748eb05e..122088cb95 100644
--- a/resources/lang/ar/admin/hardware/form.php
+++ b/resources/lang/ar/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ar/admin/users/general.php b/resources/lang/ar/admin/users/general.php
index 52fc3f6afe..1effea67dd 100644
--- a/resources/lang/ar/admin/users/general.php
+++ b/resources/lang/ar/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'آخر دخول للمستخدم',
'ldap_config_text' => 'يمكن العثور على إعدادات تهيئة لداب المشرف> الإعدادات. سيتم تعيين الموقع (اختياري) المحدد لجميع المستخدمين الذين تم استيرادهم.',
'print_assigned' => 'طباعة كل الممتلكات',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'البرامج المخرجة الى: :name',
'send_email_help' => 'يجب عليك توفير عنوان بريد إلكتروني لهذا المستخدم لإرسال بيانات اعتماده. لا يمكن إرسال بيانات الاعتماد البريدية إلا عند إنشاء المستخدم. يتم تخزين كلمات المرور في تجزئة ذات اتجاه واحد ولا يمكن استرجاعها بمجرد الحفظ.',
'view_user' => 'عرض المستخدم :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'تحذير:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php
index fca276735d..017c3a5f88 100644
--- a/resources/lang/ar/general.php
+++ b/resources/lang/ar/general.php
@@ -26,7 +26,7 @@ return [
'audit' => 'تدقيق',
'audit_report' => 'سجل التدقيق',
'assets' => 'الأصول',
- 'assigned_to' => 'Assigned to :name',
+ 'assigned_to' => 'مسنَدة إلى :name',
'avatar_delete' => 'حذف الصورة الرمزية',
'avatar_upload' => 'رفع صورة رمزية',
'back' => 'الرجوع للخلف',
@@ -65,7 +65,8 @@ return [
'create' => 'إضافة',
'created' => 'تم إنشاء العنصر',
'created_asset' => 'الأصول المضافة',
- 'created_at' => 'أنشئت في',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'إنشاء سجل',
'updated_at' => 'تم التحديث في',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'رقم الموظف',
'email_domain_help' => 'يتم استخدام هذا لتوليد عناوين البريد الإلكتروني عند الاستيراد',
'error' => 'خطأ',
+ 'example' => 'Example: ',
'filastname_format' => 'الاسم الأخير الأول (jsmith@example.com)',
'firstname_lastname_format' => 'الاسم الأول الاسم الأخير (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'الاسم الأول الاسم الأخير (jane_smith@example.com)',
@@ -115,7 +117,7 @@ return [
'files' => 'الملفات',
'file_name' => 'ملف',
'file_type' => 'نوع الملف',
- 'filesize' => 'File Size',
+ 'filesize' => 'حجم الملف',
'file_uploads' => 'تحميلات الملفات',
'file_upload' => 'رفع الملف',
'generate' => 'توفير',
@@ -130,7 +132,7 @@ return [
'image' => 'صورة',
'image_delete' => 'حذف الصورة',
'image_upload' => 'رفع صورة',
- 'filetypes_accepted_help' => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
+ 'filetypes_accepted_help' => 'نوع الملف المقبول هو :types. الحد الأقصى لحجم التحميل المسموح به هو :size.|أنواع الملف المقبول هي :types. الحد الأقصى لحجم التحميل المسموح به هو :size.',
'filetypes_size_help' => 'الحد الأقصى لحجم الرفع المسموح به هو :size.',
'image_filetypes_help' => 'أنواع الملفات المقبولة هي jpg، webpp، png، gif، svg. الحد الأقصى المسموح به للتحميل هو :size.',
'import' => 'استيراد',
@@ -167,7 +169,7 @@ return [
'manufacturers' => 'الشركات المصنعة',
'markdown' => 'يتيح هذا الحقل بتطبيق نمط الكتابة من Github.',
'min_amt' => 'دقيقة. الكمية',
- 'min_amt_help' => 'Minimum number of items that should be available before an alert gets triggered. Leave Min. QTY blank if you do not want to receive alerts for low inventory.',
+ 'min_amt_help' => 'الحد الأدنى لعدد العناصر التي ينبغي أن تكون متاحة قبل بدء تشغيل التنبيه. اترك حقل الحد الأدنى للكمية فارغا إذا كنت لا تريد تلقي تنبيهات للمخزون المنخفض.',
'model_no' => 'رقم الموديل',
'months' => 'أشهر',
'moreinfo' => 'المزيد من المعلومات',
@@ -231,22 +233,22 @@ return [
'show_current' => 'اظهار الحالي',
'sign_in' => 'تسجيل الدخول',
'signature' => 'التوقيع',
- 'signed_off_by' => 'Signed Off By',
+ 'signed_off_by' => 'تم توقيعه من قبل',
'skin' => 'المظهر',
- 'slack_msg_note' => 'A slack message will be sent',
+ 'slack_msg_note' => 'سيتم إرسال رسالة التراخي',
'slack_test_msg' => 'مرحباً! يبدو أن التكامل مع Slack مع Snipe-IT يعمل!',
'some_features_disabled' => 'التثبيت التجريبي (DEMO): يتم تعطيل بعض الميزات لهذا التثبيت.',
'site_name' => 'إسم الموقع',
'state' => 'المنطقة / الولاية',
'status_labels' => 'تسميات الحالة',
'status' => 'الحالة',
- 'accept_eula' => 'Acceptance Agreement',
+ 'accept_eula' => 'اتفاقية القبول',
'supplier' => 'المورد',
'suppliers' => 'الموردون',
'sure_to_delete' => 'هل تريد بالتأكيد حذفها',
'submit' => 'عرض',
'target' => 'استهداف',
- 'toggle_navigation' => 'Toogle Navigation',
+ 'toggle_navigation' => 'تبديل القائمة',
'time_and_date_display' => 'عرض الوقت والتاريخ',
'total_assets' => 'إجمالي الأصول',
'total_licenses' => 'مجموع التراخيص',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'غير قابلة للتوزيع',
'unknown_admin' => 'إداري غير معروف',
'username_format' => 'تنسيق اسم المستخدم',
+ 'username' => 'Username',
'update' => 'تحديث',
'upload_filetypes_help' => 'أنواع الملفات المسموح بها هي png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. الحد الأقصى المسموح به هو :size.',
'uploaded' => 'تم تحميلها',
@@ -266,7 +269,7 @@ return [
'users' => 'المستخدمين',
'viewall' => 'عرض الكل',
'viewassets' => 'عرض الأصول المخرجة',
- 'viewassetsfor' => 'View Assets for :name',
+ 'viewassetsfor' => 'عرض الأصول لـ :name',
'website' => 'الموقع',
'welcome' => 'مرحباً :name',
'years' => 'سنوات',
@@ -300,46 +303,46 @@ return [
'setup_create_admin' => 'إنشاء مستخدم مسؤول',
'setup_done' => 'إنتهى!',
'bulk_edit_about_to' => 'أنت على وشك تحرير ما يلي: ',
- 'checked_out' => 'Checked Out',
- 'checked_out_to' => 'Checked out to',
- 'fields' => 'Fields',
- 'last_checkout' => 'Last Checkout',
- 'due_to_checkin' => 'The following :count items are due to be checked in soon:',
- 'expected_checkin' => 'Expected Checkin',
- 'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
- 'changed' => 'Changed',
- 'to' => 'To',
+ 'checked_out' => 'استعارة',
+ 'checked_out_to' => 'مستعارة من قبل',
+ 'fields' => 'حقول',
+ 'last_checkout' => 'أخر اخراج',
+ 'due_to_checkin' => 'موعد ترجيع عدد :count التالي من العناصر في soon:',
+ 'expected_checkin' => 'موعد الترجيع المحتمل',
+ 'reminder_checked_out_items' => 'هذا تذكير بالعناصر التي تم إعارتها لك حاليا. إذا كنت تشعر بأن هذه القائمة غير دقيقة (شيء مفقود، أو شيء يظهر هنا تعتقد أنك لم تستلمه أبداً)، يرجى إرسال بريد إلكتروني إلى :reply_to_name على :reply_to_address.',
+ 'changed' => 'تغيرت',
+ 'to' => 'إلى',
'report_fields_info' => '
Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
If you would like to export only certain assets, use the options below to fine-tune your results.
', - 'range' => 'Range', + 'range' => 'نطاق', 'bom_remark' => 'Add a BOM (byte-order mark) to this CSV', - 'improvements' => 'Improvements', - 'information' => 'Information', - 'permissions' => 'Permissions', + 'improvements' => 'التحسينات', + 'information' => 'معلومات', + 'permissions' => 'الأذونات', 'managed_ldap' => '(Managed via LDAP)', - 'export' => 'Export', + 'export' => 'تصدير', 'ldap_sync' => 'LDAP Sync', 'ldap_user_sync' => 'LDAP User Sync', - 'synchronize' => 'Synchronize', - 'sync_results' => 'Synchronization Results', - 'license_serial' => 'Serial/Product Key', - 'invalid_category' => 'Invalid category', - 'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.', - '60_percent_warning' => '60% Complete (warning)', - 'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!', - 'new_asset' => 'New Asset', - 'new_license' => 'New License', - 'new_accessory' => 'New Accessory', - 'new_consumable' => 'New Consumable', - 'collapse' => 'Collapse', - 'assigned' => 'Assigned', - 'asset_count' => 'Asset Count', - 'accessories_count' => 'Accessories Count', - 'consumables_count' => 'Consumables Count', - 'components_count' => 'Components Count', - 'licenses_count' => 'Licenses Count', + 'synchronize' => 'مزامنة', + 'sync_results' => 'نتائج المزامنة', + 'license_serial' => 'مفتاح السلسلة / المنتج', + 'invalid_category' => 'فئة غير صالحة', + 'dashboard_info' => 'هذه هي لوحة التحكم الخاصة بك. هناك العديد من هذه اللوحة، ولكن هذه اللوحة لك.', + '60_percent_warning' => 'تم اكمال 60% (تحذير)', + 'dashboard_empty' => 'يبدو أنك لم تضف أي شيء حتى الآن، لذلك ليس لدينا أي شيء رائع لعرضه. ابدأ بإضافة بعض الأصول، الملحقات، المواد الاستهلاكية، أو التراخيص الآن!', + 'new_asset' => 'أصل جديد', + 'new_license' => 'ترخيص جديد', + 'new_accessory' => 'ملحق الجودة', + 'new_consumable' => 'مادة إستهلاكية جديدة', + 'collapse' => 'اخفاء', + 'assigned' => 'مسندة', + 'asset_count' => 'عدد الأصول', + 'accessories_count' => 'عدد الملحقات', + 'consumables_count' => 'عدد المواد المستهلكة', + 'components_count' => 'عدد المكونات', + 'licenses_count' => 'عدد التراخيص', 'notification_error' => 'Error:', - 'notification_error_hint' => 'Please check the form below for errors', + 'notification_error_hint' => 'الرجاء التحقق من الاخطاء بالنموذج أدناه', 'notification_success' => 'Success:', 'notification_warning' => 'Warning:', 'notification_info' => 'Info:', @@ -357,4 +360,8 @@ return [ 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', 'maintenance_mode_title' => 'System Temporarily Unavailable', 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/ar/passwords.php b/resources/lang/ar/passwords.php index 5ff18d4b23..25633b4581 100644 --- a/resources/lang/ar/passwords.php +++ b/resources/lang/ar/passwords.php @@ -1,6 +1,8 @@ 'تم بنجاح: إذا كان عنوان البريد الإلكتروني هذا موجودًا في نظامنا ، فقد تم إرسال بريد إلكتروني لاستعادة كلمة المرور.', - 'user' => 'لم يتم العثور على اسم مستخدم فعّال مرتبط بعنوان ذلك البريد الالكتروني.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'token' => 'This password reset token is invalid or expired, or does not match the username provided.', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/ar/reminders.php b/resources/lang/ar/reminders.php index 9f5848a50c..8f891dddce 100644 --- a/resources/lang/ar/reminders.php +++ b/resources/lang/ar/reminders.php @@ -14,11 +14,8 @@ return array( */ "password" => "كلمة المرور يجب أن تتكون من ستة خانات وتكون متطابقة مع خانة التأكيد.", - "user" => "إسم المستخدم أو كلمة المرور غير صحيحة", - - "token" => "رمز إعادة ضبط كلمة المرور غير مقبول.", - - "sent" => "إذا وجد بريد إلكتروني مطابق، تم إرسال التذكير بكلمة المرور!", + "token" => 'This password reset token is invalid or expired, or does not match the username provided.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', ); diff --git a/resources/lang/ar/validation.php b/resources/lang/ar/validation.php index 97945b1ebf..097fb8be06 100644 --- a/resources/lang/ar/validation.php +++ b/resources/lang/ar/validation.php @@ -91,6 +91,11 @@ return [ 'url' => 'ان تنسيق :attribute غير صالح.', 'unique_undeleted' => ':attribute يجب ان تكون فريدة.', 'non_circular' => 'يجب ألا تنشئ السمة مرجعًا دائريًا.', + 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', + 'letters' => 'Password must contain at least one letter.', + 'numbers' => 'Password must contain at least one number.', + 'case_diff' => 'Password must use mixed case.', + 'symbols' => 'Password must contain symbols.', 'gte' => [ 'numeric' => 'Value cannot be negative' ], diff --git a/resources/lang/bg/admin/custom_fields/general.php b/resources/lang/bg/admin/custom_fields/general.php index ffa01b6bd8..4c2c915ce5 100644 --- a/resources/lang/bg/admin/custom_fields/general.php +++ b/resources/lang/bg/admin/custom_fields/general.php @@ -41,7 +41,7 @@ return [ 'make_required' => 'Optional - click to make required', 'reorder' => 'Reorder', 'db_field' => 'DB Field', - 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/bg/admin/custom_fields/message.php b/resources/lang/bg/admin/custom_fields/message.php
index a578f4fd13..cb5497a5c2 100644
--- a/resources/lang/bg/admin/custom_fields/message.php
+++ b/resources/lang/bg/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/bg/admin/hardware/form.php b/resources/lang/bg/admin/hardware/form.php
index 27f931cea9..71fe4fac0e 100644
--- a/resources/lang/bg/admin/hardware/form.php
+++ b/resources/lang/bg/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/bg/admin/users/general.php b/resources/lang/bg/admin/users/general.php
index 1f98aec70d..6e2313bf26 100644
--- a/resources/lang/bg/admin/users/general.php
+++ b/resources/lang/bg/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Последен достъп до системата',
'ldap_config_text' => 'LDAP конфигурационните настройки могат да бъдат намерени в Admin > Settings. Избраното (по изобр) местоположение ще бъде настроено за всички въведени потребители.',
'print_assigned' => 'Печат на всички отдадени',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Софтуерни продукти, изписани на :name',
'send_email_help' => 'Трябва да предоставите е-майл адрес за този потребител за да му се изпратят името и паролата. Изпращането на име и парола може да стане при създаването на потребителя. Паролите се съхраняват криптирани и не могат да се възстановят.',
'view_user' => 'Преглед на потребител :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Премахни членовете на групата',
'warning_deletion' => 'ВНИМАНИЕ:',
'warning_deletion_information' => 'Ще изтриете всичките :count потребител(и) посочени в списъка. Супер админ имената са оцветени в червено.',
- 'update_user_asssets_status' => 'Обнови всички активи за посочените потребители към следния статус',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Впиши всички асоцирани настройки към тези потребители',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php
index 9bc2ac9c2d..adb007f451 100644
--- a/resources/lang/bg/general.php
+++ b/resources/lang/bg/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Създаване на нов',
'created' => 'Създадени артикули',
'created_asset' => 'създадени активи',
- 'created_at' => 'Създаден на',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Създаден на',
'updated_at' => 'Обновено на',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Използвайте това за да генерирате email адреси при въвеждане',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Инициал на името Фамилия (jsmith@example.com)',
'firstname_lastname_format' => 'Име Фамилия (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Име Фамилия (jane.smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Не може да бъде предоставян',
'unknown_admin' => 'Непознат администратор',
'username_format' => 'Формат на потребителско име',
+ 'username' => 'Username',
'update' => 'Обновяване',
'upload_filetypes_help' => 'Позволените файлови разширения са png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf и rar. Максималният размер на файла е :size.',
'uploaded' => 'Качен',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/bg/passwords.php b/resources/lang/bg/passwords.php
index f9d9d8956b..25633b4581 100644
--- a/resources/lang/bg/passwords.php
+++ b/resources/lang/bg/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Не са намерени активни потребители с този е-майл.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/bg/reminders.php b/resources/lang/bg/reminders.php
index ef8cbc6a4b..ccab6f814c 100644
--- a/resources/lang/bg/reminders.php
+++ b/resources/lang/bg/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Паролата трябва да бъде поне 6 символа и да съвпада с потвърждението.",
-
"user" => "Грешно потребителско име или имейл адрес",
-
- "token" => "Връзката за възстановяване на паролата е невалидна.",
-
- "sent" => "Ако е зададен email, на потребителя ще бъде изпратена връзка за възстановяване на паролата.",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/bg/validation.php b/resources/lang/bg/validation.php
index df08b144e1..b0cedcd011 100644
--- a/resources/lang/bg/validation.php
+++ b/resources/lang/bg/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Форматът на :attribute е невалиден.',
'unique_undeleted' => ':attribute трябва да бъде уникален.',
'non_circular' => ':attribute не трябва да създава препрадка към себе си.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ca/admin/custom_fields/general.php b/resources/lang/ca/admin/custom_fields/general.php
index 4c7442b2d5..7434117830 100644
--- a/resources/lang/ca/admin/custom_fields/general.php
+++ b/resources/lang/ca/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ca/admin/custom_fields/message.php b/resources/lang/ca/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/ca/admin/custom_fields/message.php
+++ b/resources/lang/ca/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ca/admin/hardware/form.php b/resources/lang/ca/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/ca/admin/hardware/form.php
+++ b/resources/lang/ca/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ca/admin/users/general.php b/resources/lang/ca/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/ca/admin/users/general.php
+++ b/resources/lang/ca/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ca/general.php b/resources/lang/ca/general.php
index e515858c95..69562c0010 100644
--- a/resources/lang/ca/general.php
+++ b/resources/lang/ca/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Crea nou',
'created' => 'Item Created',
'created_asset' => 'recurs creat',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ca/passwords.php b/resources/lang/ca/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/ca/passwords.php
+++ b/resources/lang/ca/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ca/reminders.php b/resources/lang/ca/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/ca/reminders.php
+++ b/resources/lang/ca/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ca/validation.php b/resources/lang/ca/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/ca/validation.php
+++ b/resources/lang/ca/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/cs/admin/custom_fields/general.php b/resources/lang/cs/admin/custom_fields/general.php
index dc5915e570..31a51c0e95 100644
--- a/resources/lang/cs/admin/custom_fields/general.php
+++ b/resources/lang/cs/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unikátní',
];
diff --git a/resources/lang/cs/admin/custom_fields/message.php b/resources/lang/cs/admin/custom_fields/message.php
index 72a065acb4..ac35d69c85 100644
--- a/resources/lang/cs/admin/custom_fields/message.php
+++ b/resources/lang/cs/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/cs/admin/hardware/form.php b/resources/lang/cs/admin/hardware/form.php
index 55144f56e2..35286b542e 100644
--- a/resources/lang/cs/admin/hardware/form.php
+++ b/resources/lang/cs/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Zpracovává se...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/cs/admin/users/general.php b/resources/lang/cs/admin/users/general.php
index 09ad0ea854..6bc30e7dca 100644
--- a/resources/lang/cs/admin/users/general.php
+++ b/resources/lang/cs/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Vypsat všechna přiřazení',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software vydaný pro :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Zobraz uživatele',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php
index 59d6bd5910..25d5e53993 100644
--- a/resources/lang/cs/general.php
+++ b/resources/lang/cs/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Vytvořit nové',
'created' => 'Položka vytvořena',
'created_asset' => 'vytvořit majetek',
- 'created_at' => 'Vytvořeno',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Záznam vytvořen',
'updated_at' => 'Aktualizováno',
'currency' => 'Kč', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Číslo zaměstnance',
'email_domain_help' => 'Toto je použito na generování e-mailových adres při importu',
'error' => 'Chyba',
+ 'example' => 'Example: ',
'filastname_format' => 'Iniciál Jména Příjmení (jsmith@example.com)',
'firstname_lastname_format' => 'Jméno Příjmení (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Jméno Příjmení (jan_novak@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Ne-přiřaditelné',
'unknown_admin' => 'Neznámy správce',
'username_format' => 'Formát uživatelského jména',
+ 'username' => 'Username',
'update' => 'Aktualizace',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Nahráno',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/cs/passwords.php b/resources/lang/cs/passwords.php
index 8e40bb3b2a..25633b4581 100644
--- a/resources/lang/cs/passwords.php
+++ b/resources/lang/cs/passwords.php
@@ -1,6 +1,8 @@
'Úspěch: Pokud tato e-mailová adresa existuje v našem systému, byl odeslán e-mail pro obnovení hesla.',
- 'user' => 'Nebyl nalezen žádný aktivní uživatel s takovým e-mailem.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/cs/reminders.php b/resources/lang/cs/reminders.php
index eb0594e2e4..98f935329e 100644
--- a/resources/lang/cs/reminders.php
+++ b/resources/lang/cs/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Heslo musí mít šest znaků a schodovat se s potvrzujícím heslem.",
-
"user" => "Uživatelské jméno nebo email je chybný",
-
- "token" => "Tento token pro reset hesla je neplatný.",
-
- "sent" => "Pokud byl email nalezen, tak bylo heslo zasláno!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/cs/validation.php b/resources/lang/cs/validation.php
index bfd4330208..fa9e0c0545 100644
--- a/resources/lang/cs/validation.php
+++ b/resources/lang/cs/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Formát :attribute je neplatný.',
'unique_undeleted' => 'Je třeba, aby se :attribute neopakoval.',
'non_circular' => ':attribute nesmí vytvořit kruhový odkaz.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/cy/admin/custom_fields/general.php b/resources/lang/cy/admin/custom_fields/general.php
index 42e87baa94..a2f07d9629 100644
--- a/resources/lang/cy/admin/custom_fields/general.php
+++ b/resources/lang/cy/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/cy/admin/custom_fields/message.php b/resources/lang/cy/admin/custom_fields/message.php
index b2f2ed6fb5..30d7297b21 100644
--- a/resources/lang/cy/admin/custom_fields/message.php
+++ b/resources/lang/cy/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/cy/admin/hardware/form.php b/resources/lang/cy/admin/hardware/form.php
index 4084e0e231..3ff44d92f1 100644
--- a/resources/lang/cy/admin/hardware/form.php
+++ b/resources/lang/cy/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/cy/admin/users/general.php b/resources/lang/cy/admin/users/general.php
index 5209ef6517..ead1b237ae 100644
--- a/resources/lang/cy/admin/users/general.php
+++ b/resources/lang/cy/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Mewngofnodi Diwethaf',
'ldap_config_text' => 'Gweler Gweinyddiaeth > Gosodiadau am gosodiadau LDAP. Mae\'r lleoliad (dewisol) yn cael ei osod am unrhyw defnyddwyr sydd yn cael ei mewnforio.',
'print_assigned' => 'Argraffu Asedau',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Meddalwedd allan i :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Gweld Defnyddiwr :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/cy/general.php b/resources/lang/cy/general.php
index 7fd95e0129..d0acf70ae5 100644
--- a/resources/lang/cy/general.php
+++ b/resources/lang/cy/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Creu newydd',
'created' => 'Eitem wedi\'i Greu',
'created_asset' => 'ased wedi creu',
- 'created_at' => 'Crëwyd',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Diweddarwyd ar',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Defnyddir hwn i gynhyrchu cyfeiriadau e-bost wrth fewnforio',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Llythyren Cyntaf Enw Cyntaf Cyfenw (jsmith@example.com)',
'firstname_lastname_format' => 'Enw Cyntaf Enw Olaf (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Enw Cyntaf Enw Olaf (jane.smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Ddim modd nodi allan',
'unknown_admin' => 'Gweinydd Anhysbys',
'username_format' => 'Fformat enw defnyddiwr',
+ 'username' => 'Username',
'update' => 'Diweddaru',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Wedi Uwchlwytho',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/cy/passwords.php b/resources/lang/cy/passwords.php
index f5aa0688ba..25633b4581 100644
--- a/resources/lang/cy/passwords.php
+++ b/resources/lang/cy/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Dim defnyddiwr wedi\'i ddarganfod hefo\'r cyfeiriad ebost yna.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/cy/reminders.php b/resources/lang/cy/reminders.php
index 2ee9ffcaf5..b878cb08b0 100644
--- a/resources/lang/cy/reminders.php
+++ b/resources/lang/cy/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Rhaid i cyfrineiriau fod yn chwe nod ac cyfateb i'r cadarnhad.",
-
"user" => "Enw defnyddiwr neu cyfrinair yn anghywir",
-
- "token" => "Nid yw'r tocyn ail-osod cyfrinair yma yn ddilys.",
-
- "sent" => "Os yw'r cyfeiriad ebost yn ddilys, cewch nodyn atgoffa!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/cy/validation.php b/resources/lang/cy/validation.php
index 9f8c9c9a19..e8c6a98627 100644
--- a/resources/lang/cy/validation.php
+++ b/resources/lang/cy/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Mae fformat :attribute yn annilys.',
'unique_undeleted' => 'Rhaid i\'r :attribute bod yn unigryw.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/da/admin/custom_fields/general.php b/resources/lang/da/admin/custom_fields/general.php
index 274d1f1f1b..1ea1a4a503 100644
--- a/resources/lang/da/admin/custom_fields/general.php
+++ b/resources/lang/da/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/da/admin/custom_fields/message.php b/resources/lang/da/admin/custom_fields/message.php
index 9022a2b891..f27c3985ec 100644
--- a/resources/lang/da/admin/custom_fields/message.php
+++ b/resources/lang/da/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/da/admin/hardware/form.php b/resources/lang/da/admin/hardware/form.php
index c51d9789ed..77b444f309 100644
--- a/resources/lang/da/admin/hardware/form.php
+++ b/resources/lang/da/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/da/admin/users/general.php b/resources/lang/da/admin/users/general.php
index e4a3aafdc3..6c22fd3cac 100644
--- a/resources/lang/da/admin/users/general.php
+++ b/resources/lang/da/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Sidste Login',
'ldap_config_text' => 'LDAP-konfigurationsindstillinger kan findes Admin> Indstillinger. Den (valgfrie) valgte placering vil blive indstillet for alle importerede brugere.',
'print_assigned' => 'Udskriv alle tildelte',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checket ud til: navn',
'send_email_help' => 'Du skal angive en e-mail-adresse for denne bruger for at sende dem legitimationsoplysninger. E-mailing af legitimationsoplysninger kan kun gøres ved brugeroprettelse. Adgangskoder gemmes i en envejs hash og kan ikke hentes når de er gemt.',
'view_user' => 'Se bruger :navn',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/da/general.php b/resources/lang/da/general.php
index 173543ce66..06cc1fd27f 100644
--- a/resources/lang/da/general.php
+++ b/resources/lang/da/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Opret ny',
'created' => 'Elementet er oprettet',
'created_asset' => 'skabte aktiver',
- 'created_at' => 'Skabt den',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record dannet',
'updated_at' => 'Opdateret kl',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Dette bruges til at generere email-adresser ved importering',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Fornavnskarakter Efternavn (jsmith@example.com)',
'firstname_lastname_format' => 'Fornavn Efternavn (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Fornavn Efternavn (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Ikke implementerbar',
'unknown_admin' => 'Ukendt Admin',
'username_format' => 'Brugernavn Format',
+ 'username' => 'Username',
'update' => 'Opdatering',
'upload_filetypes_help' => 'Tilladte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, og rar. Maksimalt tilladte uploadstørrelse er :size.',
'uploaded' => 'uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/da/passwords.php b/resources/lang/da/passwords.php
index 5a5143a62f..25633b4581 100644
--- a/resources/lang/da/passwords.php
+++ b/resources/lang/da/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Der er ikke fundet nogen aktiv bruger med denne email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/da/reminders.php b/resources/lang/da/reminders.php
index 0158281a88..4f16be94e2 100644
--- a/resources/lang/da/reminders.php
+++ b/resources/lang/da/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Adgangskoder skal være seks tegn og svare til bekræftelsen.",
-
"user" => "Brugernavn eller email adresse er forkert",
-
- "token" => "Denne adgangskode nulstillingstoken er ugyldig.",
-
- "sent" => "Hvis en tilsvarende email adresse blev fundet, er der afsendt en påmindelse om adgangskode!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/da/validation.php b/resources/lang/da/validation.php
index 42d5afa3fb..1865fdb6d2 100644
--- a/resources/lang/da/validation.php
+++ b/resources/lang/da/validation.php
@@ -91,6 +91,11 @@ return [
'url' => ':attribute formatet er ugyldigt.',
'unique_undeleted' => ':attribute skal være unik.',
'non_circular' => ':attribute må ikke oprette en cirkulær reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/de/account/general.php b/resources/lang/de/account/general.php
index 7fc060a849..9b289d1380 100644
--- a/resources/lang/de/account/general.php
+++ b/resources/lang/de/account/general.php
@@ -1,12 +1,12 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
- 'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'personal_api_keys' => 'Persönliche API-Schlüssel',
+ 'api_key_warning' => 'Wenn Sie ein API-Token generieren, stellen Sie sicher, dass Sie es sofort nach kopieren, da es
+ nicht mehr für Sie sichtbar sein wird.',
+ 'api_base_url' => 'Ihre API Basis-URL befindet sich unter:',
+ 'api_base_url_endpoint' => '/<Endpunkt>',
+ 'api_token_expiration_time' => 'API-Token sollen ablaufen in:',
+ 'api_reference' => 'Bitte lesen Sie die API Dokumentation um
+ Informationen über die verfügbaren API endpoints und ihre Verwendung zu erhalten.',
);
diff --git a/resources/lang/de/admin/custom_fields/general.php b/resources/lang/de/admin/custom_fields/general.php
index d6511d3d87..87bfb884f5 100644
--- a/resources/lang/de/admin/custom_fields/general.php
+++ b/resources/lang/de/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - Klicken, um erforderlich zu machen',
'reorder' => 'Sortieren',
'db_field' => 'Datenbankfeld',
- 'db_convert_warning' => 'WARNUNG. Dieses Feld befindet sich in der Tabelle mit benutzerdefinierten Feldern wie :db_column
aber sollte: sein.',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Dieser Wert muss für jedes Asset eindeutig sein',
'unique' => 'Einzigartig',
];
diff --git a/resources/lang/de/admin/custom_fields/message.php b/resources/lang/de/admin/custom_fields/message.php
index d85086d6e0..b92ded96ca 100644
--- a/resources/lang/de/admin/custom_fields/message.php
+++ b/resources/lang/de/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/de/admin/hardware/form.php b/resources/lang/de/admin/hardware/form.php
index d9e6630417..1202b8ec3a 100644
--- a/resources/lang/de/admin/hardware/form.php
+++ b/resources/lang/de/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'Dieses Asset ist nicht verfügbar und kann nicht herausgegeben werden.',
'asset_deployable' => 'Dieses Asset ist verfügbar und kann herausgegeben werden.',
'processing_spinner' => 'Wird verarbeitet...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/de/admin/hardware/message.php b/resources/lang/de/admin/hardware/message.php
index 8698c2618c..9ef604255b 100644
--- a/resources/lang/de/admin/hardware/message.php
+++ b/resources/lang/de/admin/hardware/message.php
@@ -17,7 +17,7 @@ return [
'error' => 'Asset wurde nicht aktualisiert. Bitte versuchen Sie es erneut',
'success' => 'Asset wurde erfolgreich aktualisiert.',
'nothing_updated' => 'Es wurden keine Felder ausgewählt, somit wurde auch nichts aktualisiert.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => 'Es wurden keine Assets ausgewählt, somit wurde auch nichts aktualisiert.',
],
'restore' => [
diff --git a/resources/lang/de/admin/settings/general.php b/resources/lang/de/admin/settings/general.php
index aa10e8f6a8..8b811b85b2 100644
--- a/resources/lang/de/admin/settings/general.php
+++ b/resources/lang/de/admin/settings/general.php
@@ -28,7 +28,7 @@ return [
'auto_increment_prefix' => 'Präfix (optional)',
'auto_incrementing_help' => 'Aktiviere zuerst fortlaufende Asset Tags um dies zu setzen',
'backups' => 'Sicherungen',
- 'backups_help' => 'Create, download, and restore backups ',
+ 'backups_help' => 'Backups erstellen, herunterladen und wiederherstellen ',
'backups_restoring' => 'Aus Backup wiederherstellen',
'backups_upload' => 'Backup hochladen',
'backups_path' => 'Sicherungen auf dem Server werden in :path
gespeichert',
diff --git a/resources/lang/de/admin/settings/table.php b/resources/lang/de/admin/settings/table.php
index 22db5c84ed..3e4a3218d7 100644
--- a/resources/lang/de/admin/settings/table.php
+++ b/resources/lang/de/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
- 'size' => 'Size',
+ 'created' => 'Erstellt',
+ 'size' => 'Größe',
);
diff --git a/resources/lang/de/admin/users/general.php b/resources/lang/de/admin/users/general.php
index 713faea18a..36d057ed99 100644
--- a/resources/lang/de/admin/users/general.php
+++ b/resources/lang/de/admin/users/general.php
@@ -17,15 +17,17 @@ return [
'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.',
'print_assigned' => 'Alles zugewiesene drucken',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software herausgegeben an :name',
'send_email_help' => 'Sie müssen eine E-Mail-Adresse angeben, um dem Benutzer Zugangsdaten zu zusenden. Das Versenden von Zugangsdaten ist nur bei der Erstellung eines Benutzers möglich. Passwörter werden in einem Einweg-Hash gespeichert und können danach nicht mehr ausgelesen werden.',
'view_user' => 'Benutzer :name ansehen',
'usercsv' => 'CSV Datei',
'two_factor_admin_optin_help' => 'Ihre aktuellen Administrator-Einstellungen erlauben die selektive Durchführung der zwei-Faktor-Authentifizierung. ',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
+ 'two_factor_enrolled' => '2FA-Gerät registriert ',
+ 'two_factor_active' => '2FA aktiv ',
+ 'user_deactivated' => 'Benutzer kann sich nicht anmelden',
+ 'user_activated' => 'Benutzer kann sich anmelden',
'activation_status_warning' => 'Aktivierungsstatus nicht ändern',
'group_memberships_helpblock' => 'Nur Superadministratoren können Gruppenmitgliedschaften bearbeiten.',
'superadmin_permission_warning' => 'Nur Superadmins dürfen einem Benutzer Superadmin Zugriff gewähren.',
@@ -33,10 +35,10 @@ return [
'remove_group_memberships' => 'Gruppenmitgliedschaften entfernen',
'warning_deletion' => 'WARNUNG:',
'warning_deletion_information' => 'Sie sind dabei, die :count unten aufgelisteten Benutzer zu löschen. Super-Admin-Namen sind rot markiert.',
- 'update_user_asssets_status' => 'Alle Assets für diese Benutzer auf diesen Status aktualisieren',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Alle diesen Benutzern zugeordneten Objekte zurücknehmen',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'remote_label' => 'Dies ist ein externer Benutzer',
+ 'remote' => 'Extern',
+ 'remote_help' => 'Dies kann nützlich sein, wenn Sie nach externen Benutzern filtern müssen, die niemals oder nur selten an Ihre physischen Standorte kommen.',
+ 'not_remote_label' => 'Dies ist kein externer Benutzer',
];
diff --git a/resources/lang/de/admin/users/table.php b/resources/lang/de/admin/users/table.php
index ba660798e2..ca430b00ce 100644
--- a/resources/lang/de/admin/users/table.php
+++ b/resources/lang/de/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => 'Email',
'employee_num' => 'Mitarbeiternr.',
'first_name' => 'Vorname',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => 'Wählen Sie eine Gruppe aus, die dem Benutzer zugewiesen werden soll. Denken Sie daran, dass ein Benutzer die Berechtigungen der zugewiesenen Gruppe erhält. Benutzen Sie Strg+Klick (oder cmd+Klick bei MacOS), um Gruppen aus der Auswahl zu entfernen.',
'id' => 'Id',
'inherit' => 'Vererben',
'job' => 'Berufsbezeichnung',
diff --git a/resources/lang/de/auth.php b/resources/lang/de/auth.php
index db310aa1bb..7643b8ded7 100644
--- a/resources/lang/de/auth.php
+++ b/resources/lang/de/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'Diese Anmeldeinformationen entsprechen nicht unseren Angaben.',
+ 'password' => 'Das angegebene Passwort ist ungültig.',
+ 'throttle' => 'Zu viele fehlgeschlagene Anmeldeversuche. Bitte versuchen Sie es erneut in :seconds Sekunden.',
);
diff --git a/resources/lang/de/general.php b/resources/lang/de/general.php
index cf101b49d7..05ce10537f 100644
--- a/resources/lang/de/general.php
+++ b/resources/lang/de/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Hinzufügen',
'created' => 'Eintrag erstellt',
'created_asset' => 'Asset angelegt',
- 'created_at' => 'Erstellt am',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Eintrag erstellt',
'updated_at' => 'Aktualisiert am',
'currency' => '€', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Mitarbeiternummer',
'email_domain_help' => 'Dies wird verwendet, um E-Mail-Adressen beim Importieren zu generieren',
'error' => 'Fehler',
+ 'example' => 'Example: ',
'filastname_format' => 'Initial des Vornamen + Nachname (jsmith@example.com)',
'firstname_lastname_format' => 'Vorname Nachname (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Vorname Nachname (max_mustermann@beispiel.com)',
@@ -115,7 +117,7 @@ return [
'files' => 'Dateien',
'file_name' => 'Datei',
'file_type' => 'Dateityp',
- 'filesize' => 'File Size',
+ 'filesize' => 'Dateigröße',
'file_uploads' => 'Datei-Uploads',
'file_upload' => 'Datei-Upload',
'generate' => 'Generieren',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Nicht herausgebbar',
'unknown_admin' => 'Unbekannter Administrator',
'username_format' => 'Format der Benutzernamen',
+ 'username' => 'Username',
'update' => 'Aktualisieren',
'upload_filetypes_help' => 'Erlaubte Dateitypen sind png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf und rar. Maximale Uploadgröße beträgt :size.',
'uploaded' => 'Hochgeladen',
@@ -354,7 +357,11 @@ return [
'checkout_tooltip' => 'Diesen Gegenstand zuweisen',
'checkin_tooltip' => 'Diesen Artikel zurücknehmen',
'checkout_user_tooltip' => 'Diesen Artikel an einen Benutzer herausgeben',
- 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
- 'maintenance_mode_title' => 'System Temporarily Unavailable',
- 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'maintenance_mode' => 'Der Dienst ist wegen Wartungsarbeiten vorübergehend nicht verfügbar. Bitte versuchen Sie es später noch einmal.',
+ 'maintenance_mode_title' => 'System vorübergehend nicht verfügbar',
+ 'ldap_import' => 'Benutzerkennwort sollte nicht von LDAP verwaltet werden. (Dies erlaubt es Ihnen, vergessene Passwortanfragen zu senden.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/de/passwords.php b/resources/lang/de/passwords.php
index 61f40ca630..25633b4581 100644
--- a/resources/lang/de/passwords.php
+++ b/resources/lang/de/passwords.php
@@ -1,6 +1,8 @@
'Erfolg: Wenn diese E-Mail-Adresse in unserem System existiert, wurde eine E-Mail zum Wiederherstellen des Passworts gesendet.',
- 'user' => 'Kein passender aktiver Nutzer mit dieser E-Mail gefunden.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/de/reminders.php b/resources/lang/de/reminders.php
index 42a628f958..42e8db78c7 100644
--- a/resources/lang/de/reminders.php
+++ b/resources/lang/de/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Das Passwort muss Sechs Zeichen haben und übereinstimmen.",
-
"user" => "Benutzername oder Email-Adresse sind falsch",
-
- "token" => "Das Token um das Passwort zurückzusetzen ist ungültig.",
-
- "sent" => "Wenn eine passende Email-Adresse gefunden wurde, wurde eine Passworterinnerung verschickt!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/de/validation.php b/resources/lang/de/validation.php
index e02e7b78e1..66506c8aac 100644
--- a/resources/lang/de/validation.php
+++ b/resources/lang/de/validation.php
@@ -91,8 +91,13 @@ return [
'url' => ':attribute Format ist ungültig.',
'unique_undeleted' => 'Die Variable :attribute muss eindeutig sein.',
'non_circular' => 'Das :attribute darf keinen Zirkelbezug ergeben.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
- 'numeric' => 'Value cannot be negative'
+ 'numeric' => 'Wert darf nicht negativ sein'
],
diff --git a/resources/lang/el/admin/custom_fields/general.php b/resources/lang/el/admin/custom_fields/general.php
index e689cfe647..a366037133 100644
--- a/resources/lang/el/admin/custom_fields/general.php
+++ b/resources/lang/el/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/el/admin/custom_fields/message.php b/resources/lang/el/admin/custom_fields/message.php
index cc0eea7899..3238d2b540 100644
--- a/resources/lang/el/admin/custom_fields/message.php
+++ b/resources/lang/el/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/el/admin/hardware/form.php b/resources/lang/el/admin/hardware/form.php
index e1182038db..26ea109e30 100644
--- a/resources/lang/el/admin/hardware/form.php
+++ b/resources/lang/el/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/el/admin/users/general.php b/resources/lang/el/admin/users/general.php
index 202e253f3b..2eb0f6187e 100644
--- a/resources/lang/el/admin/users/general.php
+++ b/resources/lang/el/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Τελευταία σύνδεση',
'ldap_config_text' => 'Οι ρυθμίσεις διαμόρφωσης LDAP μπορούν να βρεθούν στο στοιχείο Διαχειριστής> Ρυθμίσεις. Η (επιλεγμένη) επιλεγμένη τοποθεσία θα οριστεί για όλους τους εισαγόμενους χρήστες.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Λογισμικό Έγινε έλεγχος σε: όνομα',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Προβολή χρήστη :ονόματος',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/el/general.php b/resources/lang/el/general.php
index eade868a3b..a7b5a5ac12 100644
--- a/resources/lang/el/general.php
+++ b/resources/lang/el/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Δημιουργία νέου',
'created' => 'Το αντικείμενο δημιουργήθηκε',
'created_asset' => 'δημιουργία παγίου',
- 'created_at' => 'Δημιουργήθηκε στις',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Ενημερώθηκε στο',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Αυτό χρησιμοποιείται για τη δημιουργία διευθύνσεων ηλεκτρονικού ταχυδρομείου κατά την εισαγωγή',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Πρώτο αρχικό όνομα (jsmith@example.com)',
'firstname_lastname_format' => 'Όνομα Επώνυμο (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Όνομα και επίθετο (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Δεν μπορεί να αναπτυχθεί',
'unknown_admin' => 'Άγνωστο Admin',
'username_format' => 'Τύπος ονόματος',
+ 'username' => 'Username',
'update' => 'Ενημέρωση',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Ανέβηκε',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/el/passwords.php b/resources/lang/el/passwords.php
index 444dba118a..25633b4581 100644
--- a/resources/lang/el/passwords.php
+++ b/resources/lang/el/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Δεν βρέθηκε ενεργός χρήστης με αυτό το email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/el/reminders.php b/resources/lang/el/reminders.php
index 5d8811ffda..58133a7384 100644
--- a/resources/lang/el/reminders.php
+++ b/resources/lang/el/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Οι κωδικοί πρόσβασης πρέπει να είναι έξι χαρακτήρες και να ταιριάζουν με την επιβεβαίωση.",
-
"user" => "Το όνομα χρήστη ή η διεύθυνση ηλεκτρονικού ταχυδρομείου είναι εσφαλμένη",
-
- "token" => "Αυτό το διακριτικό επαναφοράς κωδικού πρόσβασης δεν είναι έγκυρο.",
-
- "sent" => "Εάν βρεθεί μια αντίστοιχη διεύθυνση ηλεκτρονικού ταχυδρομείου, μια υπενθύμιση κωδικού πρόσβασης έχει σταλεί!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/el/validation.php b/resources/lang/el/validation.php
index 33ddff4c3d..1840352754 100644
--- a/resources/lang/el/validation.php
+++ b/resources/lang/el/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Η μορφή του χαρακτηριστικού είναι μη έγκυρη.',
'unique_undeleted' => 'Το :χαρακτηριστικό πρέπει να είναι μοναδικό.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/en-GB/admin/custom_fields/general.php b/resources/lang/en-GB/admin/custom_fields/general.php
index d8965e96d1..b7cd50d315 100644
--- a/resources/lang/en-GB/admin/custom_fields/general.php
+++ b/resources/lang/en-GB/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/en-GB/admin/custom_fields/message.php b/resources/lang/en-GB/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/en-GB/admin/custom_fields/message.php
+++ b/resources/lang/en-GB/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/en-GB/admin/hardware/form.php b/resources/lang/en-GB/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/en-GB/admin/hardware/form.php
+++ b/resources/lang/en-GB/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/en-GB/admin/users/general.php b/resources/lang/en-GB/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/en-GB/admin/users/general.php
+++ b/resources/lang/en-GB/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/en-GB/general.php b/resources/lang/en-GB/general.php
index ae31380d4f..9554e1dbc1 100644
--- a/resources/lang/en-GB/general.php
+++ b/resources/lang/en-GB/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Create New',
'created' => 'Item Created',
'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '£', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/en-GB/passwords.php b/resources/lang/en-GB/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/en-GB/passwords.php
+++ b/resources/lang/en-GB/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/en-GB/reminders.php b/resources/lang/en-GB/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/en-GB/reminders.php
+++ b/resources/lang/en-GB/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/en-GB/validation.php b/resources/lang/en-GB/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/en-GB/validation.php
+++ b/resources/lang/en-GB/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/en-ID/admin/custom_fields/general.php b/resources/lang/en-ID/admin/custom_fields/general.php
index 5e50e0bb59..e4059edb06 100644
--- a/resources/lang/en-ID/admin/custom_fields/general.php
+++ b/resources/lang/en-ID/admin/custom_fields/general.php
@@ -42,7 +42,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/en-ID/admin/custom_fields/message.php b/resources/lang/en-ID/admin/custom_fields/message.php
index 60d5408e84..5b287a9c04 100644
--- a/resources/lang/en-ID/admin/custom_fields/message.php
+++ b/resources/lang/en-ID/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/en-ID/admin/hardware/form.php b/resources/lang/en-ID/admin/hardware/form.php
index c06b891de6..2f83dddd73 100644
--- a/resources/lang/en-ID/admin/hardware/form.php
+++ b/resources/lang/en-ID/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/en-ID/admin/users/general.php b/resources/lang/en-ID/admin/users/general.php
index 3feef8b1b3..fcc207fd18 100644
--- a/resources/lang/en-ID/admin/users/general.php
+++ b/resources/lang/en-ID/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Masuk terakhir',
'ldap_config_text' => 'Pengaturan konfigurasi LDAP dapat ditemukan di Admin > Pengaturan. Lokasi pilihan (opsional) akan di atur untuk semua pengguna yang diimpor.',
'print_assigned' => 'Cetak semua yang ditetapkan',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software diperiksa untuk :name',
'send_email_help' => 'Anda harus menyediakan sebuah alamat email untuk pengguna ini untuk dikirimkan kredesial pada mereka. Kredensial penyuratan/email hanya dapat dilakukan pada pembuatan pengguna. Kata sandi disimpan dalam sebuah hash satu-arah dan tidak dapat diterima lagi setelah disimpan.',
'view_user' => 'Lihat pengguna :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/en-ID/general.php b/resources/lang/en-ID/general.php
index ae7c16d48f..11c87e476e 100644
--- a/resources/lang/en-ID/general.php
+++ b/resources/lang/en-ID/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Buat baru',
'created' => 'Item telah dibuat',
'created_asset' => 'buat aset',
- 'created_at' => 'Dibuat di',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Diperbarui pada',
'currency' => 'IDR', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Ini digunakan untuk menghasilkan alamat surel ketika saat mengimpor',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Nama Depan Nama Belakang (jane.smith@example.com)',
'firstname_lastname_format' => 'Nama Depan Nama Belakang (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Nama Depan Nama Belakang (jane.smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Tidak dapat disebarkan',
'unknown_admin' => 'Admin tidak diketahui',
'username_format' => 'Format nama pengguna',
+ 'username' => 'Username',
'update' => 'Perbarui',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Unggah',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/en-ID/passwords.php b/resources/lang/en-ID/passwords.php
index 2794998fca..25633b4581 100644
--- a/resources/lang/en-ID/passwords.php
+++ b/resources/lang/en-ID/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Tidak ada satupun pengguna aktif yang menggunakan email ini.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/en-ID/reminders.php b/resources/lang/en-ID/reminders.php
index 99a3e4dda1..d436c21e58 100644
--- a/resources/lang/en-ID/reminders.php
+++ b/resources/lang/en-ID/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Kata sandi harus ada enam karakter dan sesuai dengan konfirmasi.",
-
"user" => "Nama pengguna atau alamat surel salah",
-
- "token" => "Token atur ulang kata sandi ini tidak valid.",
-
- "sent" => "Jika alamat surel yang sesuai ditemukan, pengingat kata sandi sudah dikirim!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/en-ID/validation.php b/resources/lang/en-ID/validation.php
index e7202be21c..4ff7dd6dab 100644
--- a/resources/lang/en-ID/validation.php
+++ b/resources/lang/en-ID/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Format :attribute tidaklah benar.',
'unique_undeleted' => ':attribute haruslah unik.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/es-CO/admin/custom_fields/general.php b/resources/lang/es-CO/admin/custom_fields/general.php
index 05eb31f1ff..cb3d9818f8 100644
--- a/resources/lang/es-CO/admin/custom_fields/general.php
+++ b/resources/lang/es-CO/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/es-CO/admin/custom_fields/message.php b/resources/lang/es-CO/admin/custom_fields/message.php
index b7a28ebfce..49bac21a9c 100644
--- a/resources/lang/es-CO/admin/custom_fields/message.php
+++ b/resources/lang/es-CO/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/es-CO/admin/hardware/form.php b/resources/lang/es-CO/admin/hardware/form.php
index 0001931883..2733b10412 100644
--- a/resources/lang/es-CO/admin/hardware/form.php
+++ b/resources/lang/es-CO/admin/hardware/form.php
@@ -40,10 +40,12 @@ return [
'warranty' => 'Garantía',
'warranty_expires' => 'Vencimiento de Garantía',
'years' => 'años',
- 'asset_location' => 'Update Asset Location',
- 'asset_location_update_default_current' => 'Update default location AND actual location',
- 'asset_location_update_default' => 'Update only default location',
- 'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
- 'asset_deployable' => 'That status is deployable. This asset can be checked out.',
- 'processing_spinner' => 'Processing...',
+ 'asset_location' => 'Actualizar ubicación del recurso',
+ 'asset_location_update_default_current' => 'Actualizar ubicación predeterminada y ubicación actual',
+ 'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
+ 'asset_not_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
+ 'asset_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
+ 'processing_spinner' => 'Procesando...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/es-CO/admin/hardware/general.php b/resources/lang/es-CO/admin/hardware/general.php
index cdbedae4ab..3333041087 100644
--- a/resources/lang/es-CO/admin/hardware/general.php
+++ b/resources/lang/es-CO/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
'archived' => 'Archivado',
'asset' => 'Equipo',
'bulk_checkout' => 'Asignar Equipos',
- 'bulk_checkin' => 'Checkin Assets',
+ 'bulk_checkin' => 'Quitar Equipo',
'checkin' => 'Devolver Equipo',
'checkout' => 'Asignar Equipo',
'clone' => 'Clonar Equipo',
diff --git a/resources/lang/es-CO/admin/hardware/message.php b/resources/lang/es-CO/admin/hardware/message.php
index 9d578b5916..c0fbd1ec32 100644
--- a/resources/lang/es-CO/admin/hardware/message.php
+++ b/resources/lang/es-CO/admin/hardware/message.php
@@ -5,7 +5,7 @@ return [
'undeployable' => 'Atención: Este equipo está marcado como no isntalabre.
Si no es correcto, actualiza su estado.',
'does_not_exist' => 'Equipo inexistente.',
- 'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.',
+ 'does_not_exist_or_not_requestable' => 'Buen intento. El activo no existe o no es solicitable.',
'assoc_users' => 'Equipo asignado a un usuario, no se puede eliminar.',
'create' => [
@@ -17,7 +17,7 @@ return [
'error' => 'Equipo no actualizado, intentalo de nuevo',
'success' => 'Equipo actualizado.',
'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => 'Ningún recurso fue seleccionado, por lo que no se actualizó nada.',
],
'restore' => [
diff --git a/resources/lang/es-CO/admin/hardware/table.php b/resources/lang/es-CO/admin/hardware/table.php
index b3a56f148d..029f7da5da 100644
--- a/resources/lang/es-CO/admin/hardware/table.php
+++ b/resources/lang/es-CO/admin/hardware/table.php
@@ -4,11 +4,11 @@ return [
'asset_tag' => 'Etiqueta de equipo',
'asset_model' => 'Modelo',
- 'book_value' => 'Current Value',
+ 'book_value' => 'Valor Actual',
'change' => 'Operación',
'checkout_date' => 'Fecha de devolución',
'checkoutto' => 'Asignado a',
- 'current_value' => 'Current Value',
+ 'current_value' => 'Valor Actual',
'diff' => 'Diferencia',
'dl_csv' => 'Descargar CSV',
'eol' => 'Vida útil',
@@ -22,9 +22,9 @@ return [
'image' => 'Imagen de dispositivo',
'days_without_acceptance' => 'Días Sin Aceptación',
'monthly_depreciation' => 'Depreciación mensual',
- 'assigned_to' => 'Assigned To',
- 'requesting_user' => 'Requesting User',
- 'requested_date' => 'Requested Date',
- 'changed' => 'Changed',
- 'icon' => 'Icon',
+ 'assigned_to' => 'Asignado a',
+ 'requesting_user' => 'Solicitando usuario',
+ 'requested_date' => 'Fecha solicitada',
+ 'changed' => 'Cambiado',
+ 'icon' => 'Ícono',
];
diff --git a/resources/lang/es-CO/admin/locations/table.php b/resources/lang/es-CO/admin/locations/table.php
index 64af96335e..c6175d019a 100644
--- a/resources/lang/es-CO/admin/locations/table.php
+++ b/resources/lang/es-CO/admin/locations/table.php
@@ -20,21 +20,21 @@ return [
'parent' => 'Ubicación Padre',
'currency' => 'Moneda de ubicación',
'ldap_ou' => 'OU de búsqueda LDAP',
- 'user_name' => 'User Name',
- 'department' => 'Department',
- 'location' => 'Location',
- 'asset_tag' => 'Assets Tag',
- 'asset_name' => 'Name',
- 'asset_category' => 'Category',
- 'asset_manufacturer' => 'Manufacturer',
- 'asset_model' => 'Model',
- 'asset_serial' => 'Serial',
- 'asset_location' => 'Location',
- 'asset_checked_out' => 'Checked Out',
- 'asset_expected_checkin' => 'Expected Checkin',
- 'date' => 'Date:',
- 'signed_by_asset_auditor' => 'Signed By (Asset Auditor):',
- 'signed_by_finance_auditor' => 'Signed By (Finance Auditor):',
- 'signed_by_location_manager' => 'Signed By (Location Manager):',
- 'signed_by' => 'Signed Off By:',
+ 'user_name' => 'Nombre de usuario',
+ 'department' => 'Departamento',
+ 'location' => 'Ubicación',
+ 'asset_tag' => 'Etiqueta de activo',
+ 'asset_name' => 'Nombre',
+ 'asset_category' => 'Categoría',
+ 'asset_manufacturer' => 'Fabricante',
+ 'asset_model' => 'Modelo',
+ 'asset_serial' => 'Número de serie',
+ 'asset_location' => 'Ubicación',
+ 'asset_checked_out' => 'Asignado',
+ 'asset_expected_checkin' => 'Fecha Esperada de Devolución',
+ 'date' => 'Fecha:',
+ 'signed_by_asset_auditor' => 'Firmado por (Juego de Acciones):',
+ 'signed_by_finance_auditor' => 'Firmado por (Juego de Acciones):',
+ 'signed_by_location_manager' => 'Firmado por (Administrador de ubicación):',
+ 'signed_by' => 'Firmado por:',
];
diff --git a/resources/lang/es-CO/admin/statuslabels/message.php b/resources/lang/es-CO/admin/statuslabels/message.php
index 133eb1ff83..303421e25e 100644
--- a/resources/lang/es-CO/admin/statuslabels/message.php
+++ b/resources/lang/es-CO/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ return [
'help' => [
'undeployable' => 'Estos equipos no pueden ser asignados.',
- 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.',
+ 'deployable' => 'Estos activos pueden ser retirados. Una vez asignados, asumirán un estado meta de Desplegado.',
'archived' => 'Estos equipos no pueden ser asignados, y solo se mostrarán en la vista de Archivados. Esto es útil para retener información sobre equipos por razones de presupuesto/revisión histórica, mientras están fuera de la lista de equipos del día a día.',
'pending' => 'Estos equipos no pueden ser asignados, suele usarse para ítems que están en reparación, o que se espera que regresen a circulación eventualmente.',
],
diff --git a/resources/lang/es-CO/admin/users/general.php b/resources/lang/es-CO/admin/users/general.php
index 6d28b8b11a..56f73a93f9 100644
--- a/resources/lang/es-CO/admin/users/general.php
+++ b/resources/lang/es-CO/admin/users/general.php
@@ -17,13 +17,15 @@ return [
'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.',
'print_assigned' => 'Imprimir todos los Asignados',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software asignado a :name',
'send_email_help' => 'Debe proporcionar una dirección de correo electrónico para este usuario para enviarle credenciales. Únicamente pueden enviarse credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.',
'view_user' => 'Ver Usuario :name',
'usercsv' => 'Archivo CSV',
'two_factor_admin_optin_help' => 'La actual configuración de administración permite cumplimiento selectivo de autenticación de dos factores. ',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
+ 'two_factor_enrolled' => 'Dispositivo 2FA inscrito ',
+ 'two_factor_active' => '2FA activo ',
'user_deactivated' => 'User cannot login',
'user_activated' => 'User can login',
'activation_status_warning' => 'Do not change activation status',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/es-CO/admin/users/table.php b/resources/lang/es-CO/admin/users/table.php
index 5943503141..5e6b0a00aa 100644
--- a/resources/lang/es-CO/admin/users/table.php
+++ b/resources/lang/es-CO/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => 'Email',
'employee_num' => 'Nro. Empleado',
'first_name' => 'Nombres',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => 'Seleccione un grupo para asignar al usuario, recuerde que un usuario asume los permisos del grupo al que se le asigna. Use ctrl+click (o cmd+click en MacOS) para anular la selección de grupos.',
'id' => 'Id',
'inherit' => 'Heredar',
'job' => 'Cargo',
diff --git a/resources/lang/es-CO/auth.php b/resources/lang/es-CO/auth.php
index db310aa1bb..387ea794b6 100644
--- a/resources/lang/es-CO/auth.php
+++ b/resources/lang/es-CO/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'Estas credenciales no coinciden con nuestros registros.',
+ 'password' => 'La contraseña proporcionada es incorrecta.',
+ 'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.',
);
diff --git a/resources/lang/es-CO/button.php b/resources/lang/es-CO/button.php
index b7bacd6531..01258607b9 100644
--- a/resources/lang/es-CO/button.php
+++ b/resources/lang/es-CO/button.php
@@ -8,7 +8,7 @@ return [
'delete' => 'Borrar',
'edit' => 'Editar',
'restore' => 'Restaurar',
- 'remove' => 'Remove',
+ 'remove' => 'Eliminar',
'request' => 'Solicitud',
'submit' => 'Enviar',
'upload' => 'Subir',
@@ -16,9 +16,9 @@ return [
'select_files' => 'Selecciona Archivos...',
'generate_labels' => '{1} Generar Etiqueta|[2,*] Generar Etiquetas',
'send_password_link' => 'Enviar enlace de restablecimiento de contraseña',
- 'go' => 'Go',
- 'bulk_actions' => 'Bulk Actions',
- 'add_maintenance' => 'Add Maintenance',
- 'append' => 'Append',
- 'new' => 'New',
+ 'go' => 'Ir',
+ 'bulk_actions' => 'Acciones en masa',
+ 'add_maintenance' => 'Añadir mantenimiento',
+ 'append' => 'Añadir',
+ 'new' => 'Nuevo',
];
diff --git a/resources/lang/es-CO/general.php b/resources/lang/es-CO/general.php
index b6cd8d5053..42838a3931 100644
--- a/resources/lang/es-CO/general.php
+++ b/resources/lang/es-CO/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Crear Localización',
'created' => 'Artículo creado',
'created_asset' => 'equipo creado',
- 'created_at' => 'Creado el',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Registro Creado',
'updated_at' => 'Actualizado en',
'currency' => '€', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Esto se utiliza para generar direcciones de correo electrónico cuando se importan',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Primera Inicial del Apellido (jsmith@ejemplo.com)',
'firstname_lastname_format' => 'Primer Nombre y Apellido (jane.smith@ejemplo.com)',
'firstname_lastname_underscore_format' => 'Primer Nombre y Apellido (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'No Instalable',
'unknown_admin' => 'Admin Desconocido',
'username_format' => 'Formato del nombre de usuario',
+ 'username' => 'Username',
'update' => 'Actualizar',
'upload_filetypes_help' => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf y rar. El tamaño máximo permitido es :size.',
'uploaded' => 'Subido',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/es-CO/passwords.php b/resources/lang/es-CO/passwords.php
index 6b817781bb..25633b4581 100644
--- a/resources/lang/es-CO/passwords.php
+++ b/resources/lang/es-CO/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No se ha encontrado ningún usuario activo con ese correo electrónico.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/es-CO/reminders.php b/resources/lang/es-CO/reminders.php
index 0f168fec4b..773a07176f 100644
--- a/resources/lang/es-CO/reminders.php
+++ b/resources/lang/es-CO/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Los passwords deben tener mínimo 6 caracteres y coincidir.",
-
"user" => "Usuario o E-Mail incorrectos",
-
- "token" => "El token para resetear el password no es válido.",
-
- "sent" => "Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/es-CO/validation.php b/resources/lang/es-CO/validation.php
index 53dd854260..b7ed73f34b 100644
--- a/resources/lang/es-CO/validation.php
+++ b/resources/lang/es-CO/validation.php
@@ -91,6 +91,11 @@ return [
'url' => ':attribute formato incorrecto.',
'unique_undeleted' => 'El :atrribute debe ser único.',
'non_circular' => ':attribute no debe crear una referencia circular.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/es-ES/admin/custom_fields/general.php b/resources/lang/es-ES/admin/custom_fields/general.php
index 23841aa2e2..fc7342cd13 100644
--- a/resources/lang/es-ES/admin/custom_fields/general.php
+++ b/resources/lang/es-ES/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/es-ES/admin/custom_fields/message.php b/resources/lang/es-ES/admin/custom_fields/message.php
index 26c077f490..ff376e9dff 100644
--- a/resources/lang/es-ES/admin/custom_fields/message.php
+++ b/resources/lang/es-ES/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/es-ES/admin/hardware/form.php b/resources/lang/es-ES/admin/hardware/form.php
index 314b031927..dc5b044c17 100644
--- a/resources/lang/es-ES/admin/hardware/form.php
+++ b/resources/lang/es-ES/admin/hardware/form.php
@@ -40,10 +40,12 @@ return [
'warranty' => 'Garantía',
'warranty_expires' => 'Vencimiento de la Garantía',
'years' => 'años',
- 'asset_location' => 'Update Asset Location',
- 'asset_location_update_default_current' => 'Update default location AND actual location',
- 'asset_location_update_default' => 'Update only default location',
- 'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
- 'asset_deployable' => 'That status is deployable. This asset can be checked out.',
- 'processing_spinner' => 'Processing...',
+ 'asset_location' => 'Actualizar ubicación del recurso',
+ 'asset_location_update_default_current' => 'Actualizar ubicación predeterminada y ubicación actual',
+ 'asset_location_update_default' => 'Actualizar sólo la ubicación predeterminada',
+ 'asset_not_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
+ 'asset_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
+ 'processing_spinner' => 'Procesando...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/es-ES/admin/hardware/general.php b/resources/lang/es-ES/admin/hardware/general.php
index 38afd99ada..93d97c90d3 100644
--- a/resources/lang/es-ES/admin/hardware/general.php
+++ b/resources/lang/es-ES/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
'archived' => 'Archivado',
'asset' => 'Equipo',
'bulk_checkout' => 'Activos Asignados',
- 'bulk_checkin' => 'Checkin Assets',
+ 'bulk_checkin' => 'Quitar Equipo',
'checkin' => 'Quitar Equipo',
'checkout' => 'Activo de pago',
'clone' => 'Clonar Equipo',
@@ -16,29 +16,29 @@ return [
'model_deleted' => 'Este Modelo de activo fue eliminado. Debes restaurar este modelo antes de poder restaurar el Activo.',
'requestable' => 'Requerible',
'requested' => 'Solicitado',
- 'not_requestable' => 'Not Requestable',
- 'requestable_status_warning' => 'Do not change requestable status',
+ 'not_requestable' => 'No solicitable',
+ 'requestable_status_warning' => 'No cambiar el estado solicitable',
'restore' => 'Restaurar equipo',
'pending' => 'Pendiente',
'undeployable' => 'No desplegable',
'view' => 'Ver Equipo',
- 'csv_error' => 'You have an error in your CSV file:',
+ 'csv_error' => 'Tiene un error en su archivo CSV:',
'import_text' => '
- Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. + Sube un CSV que contenga historial de activos. Los activos y los usuarios DEBEN existir en el sistema, o se omitirán. Los activos coincidentes para importar el historial ocurren contra la etiqueta de activos. Intentaremos encontrar un usuario que coincida con el nombre del usuario que proporciones, y los criterios que seleccionas a continuación. Si no selecciona ningún criterio a continuación, simplemente tratará de coincidir con el formato de nombre de usuario que configuraste en el Administrador > Configuración General.
-Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.
+Los campos incluidos en el CSV deben coincidir con los encabezados: Etiqueta de activos, Nombre, Fecha de salida, Fecha de comprobación. Cualquier campo adicional será ignorado.
-Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.
+Fecha de Checkin: las fechas de check-in en blanco o futuro comprobarán los elementos al usuario asociado. Excluyendo la columna Fecha de Checkin creará una fecha de check-in con la fecha de hoy.
', - 'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format', - 'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format', - 'csv_import_match_first' => 'Try to match users by first name (jane) format', - 'csv_import_match_email' => 'Try to match users by email as username', - 'csv_import_match_username' => 'Try to match users by username', - 'error_messages' => 'Error messages:', - 'success_messages' => 'Success messages:', - 'alert_details' => 'Please see below for details.', - 'custom_export' => 'Custom Export' + 'csv_import_match_f-l' => 'Intentar coincidir con los usuarios por el formato firstname.lastname (jane.smith)', + 'csv_import_match_initial_last' => 'Intentar coincidir los usuarios con el primer apellido inicial (jsmith) formato', + 'csv_import_match_first' => 'Intentar coincidir con los usuarios por nombre de usuario (jane) formato', + 'csv_import_match_email' => 'Intentar coincidir con los usuarios por correo electrónico como nombre de usuario', + 'csv_import_match_username' => 'Intentar coincidir con los usuarios por correo electrónico como nombre de usuario', + 'error_messages' => 'Mensajes de error:', + 'success_messages' => 'Mensajes de éxito:', + 'alert_details' => 'Por favor vea abajo para más detalles.', + 'custom_export' => 'Personalizar exportación' ]; diff --git a/resources/lang/es-ES/admin/hardware/message.php b/resources/lang/es-ES/admin/hardware/message.php index af9292a01b..fb8895c3bf 100644 --- a/resources/lang/es-ES/admin/hardware/message.php +++ b/resources/lang/es-ES/admin/hardware/message.php @@ -5,7 +5,7 @@ return [ 'undeployable' => 'Atención: Este equipo está marcado como no isntalabre. Si no es correcto, actualiza su estado.', 'does_not_exist' => 'Equipo inexistente.', - 'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.', + 'does_not_exist_or_not_requestable' => 'Buen intento. El activo no existe o no es solicitable.', 'assoc_users' => 'Equipo asignado a un usuario, no se puede eliminar.', 'create' => [ @@ -17,7 +17,7 @@ return [ 'error' => 'Equipo no actualizado, intentalo de nuevo', 'success' => 'Equipo actualizado.', 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.', - 'no_assets_selected' => 'No assets were selected, so nothing was updated.', + 'no_assets_selected' => 'Ningún recurso fue seleccionado, por lo que no se actualizó nada.', ], 'restore' => [ diff --git a/resources/lang/es-ES/admin/hardware/table.php b/resources/lang/es-ES/admin/hardware/table.php index fc811946c8..95e336ee5d 100644 --- a/resources/lang/es-ES/admin/hardware/table.php +++ b/resources/lang/es-ES/admin/hardware/table.php @@ -4,11 +4,11 @@ return [ 'asset_tag' => 'Etiqueta', 'asset_model' => 'Modelo', - 'book_value' => 'Current Value', + 'book_value' => 'Valor Actual', 'change' => 'Operación', 'checkout_date' => 'Fecha de asignación', 'checkoutto' => 'Asignado', - 'current_value' => 'Current Value', + 'current_value' => 'Valor Actual', 'diff' => 'Diferencia', 'dl_csv' => 'Descargar CSV', 'eol' => 'EOL', @@ -22,9 +22,9 @@ return [ 'image' => 'Imagen de dispositivo', 'days_without_acceptance' => 'Días Sin Aceptación', 'monthly_depreciation' => 'Depreciación mensual', - 'assigned_to' => 'Assigned To', - 'requesting_user' => 'Requesting User', - 'requested_date' => 'Requested Date', - 'changed' => 'Changed', - 'icon' => 'Icon', + 'assigned_to' => 'Asignado a', + 'requesting_user' => 'Solicitando usuario', + 'requested_date' => 'Fecha solicitada', + 'changed' => 'Cambiado', + 'icon' => 'Ícono', ]; diff --git a/resources/lang/es-ES/admin/locations/table.php b/resources/lang/es-ES/admin/locations/table.php index 5e2db4ac6d..f3d8fb5355 100644 --- a/resources/lang/es-ES/admin/locations/table.php +++ b/resources/lang/es-ES/admin/locations/table.php @@ -20,21 +20,21 @@ return [ 'parent' => 'Padre', 'currency' => 'Divisa de la Localización', 'ldap_ou' => 'Búsqueda LDAP OU', - 'user_name' => 'User Name', - 'department' => 'Department', - 'location' => 'Location', - 'asset_tag' => 'Assets Tag', - 'asset_name' => 'Name', - 'asset_category' => 'Category', - 'asset_manufacturer' => 'Manufacturer', - 'asset_model' => 'Model', - 'asset_serial' => 'Serial', - 'asset_location' => 'Location', - 'asset_checked_out' => 'Checked Out', - 'asset_expected_checkin' => 'Expected Checkin', - 'date' => 'Date:', - 'signed_by_asset_auditor' => 'Signed By (Asset Auditor):', - 'signed_by_finance_auditor' => 'Signed By (Finance Auditor):', - 'signed_by_location_manager' => 'Signed By (Location Manager):', - 'signed_by' => 'Signed Off By:', + 'user_name' => 'Nombre de usuario', + 'department' => 'Departamento', + 'location' => 'Ubicación', + 'asset_tag' => 'Etiqueta de activo', + 'asset_name' => 'Nombre', + 'asset_category' => 'Categoría', + 'asset_manufacturer' => 'Fabricante', + 'asset_model' => 'Modelo', + 'asset_serial' => 'Número de serie', + 'asset_location' => 'Ubicación', + 'asset_checked_out' => 'Asignado', + 'asset_expected_checkin' => 'Fecha Esperada de Devolución', + 'date' => 'Fecha:', + 'signed_by_asset_auditor' => 'Firmado por (Juego de Acciones):', + 'signed_by_finance_auditor' => 'Firmado por (Juego de Acciones):', + 'signed_by_location_manager' => 'Firmado por (Administrador de ubicación):', + 'signed_by' => 'Firmado por:', ]; diff --git a/resources/lang/es-ES/admin/statuslabels/message.php b/resources/lang/es-ES/admin/statuslabels/message.php index 67a3c3467a..6a7e257b4c 100644 --- a/resources/lang/es-ES/admin/statuslabels/message.php +++ b/resources/lang/es-ES/admin/statuslabels/message.php @@ -23,7 +23,7 @@ return [ 'help' => [ 'undeployable' => 'Estos activos no pueden asignarse a nadie.', - 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', + 'deployable' => 'Estos activos pueden ser retirados. Una vez asignados, asumirán un estado meta de Desplegado.', 'archived' => 'Estos activos no pueden desprotegerse y solo aparecerán en la vista Archivada. Esto es útil para retener información sobre activos para presupuestos / propósitos históricos, pero mantenerlos fuera de la lista de activos del día a día.', 'pending' => 'Estos activos aún no se pueden asignar a nadie, a menudo se utilizan para artículos que están pendientes de reparación, pero se espera que vuelvan a la circulación.', ], diff --git a/resources/lang/es-ES/admin/users/general.php b/resources/lang/es-ES/admin/users/general.php index 6d28b8b11a..56f73a93f9 100644 --- a/resources/lang/es-ES/admin/users/general.php +++ b/resources/lang/es-ES/admin/users/general.php @@ -17,13 +17,15 @@ return [ '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.', 'print_assigned' => 'Imprimir todos los Asignados', + 'email_assigned' => 'Email List of All Assigned', + 'user_notified' => 'User has been emailed a list of their currently assigned items.', 'software_user' => 'Software asignado a :name', 'send_email_help' => 'Debe proporcionar una dirección de correo electrónico para este usuario para enviarle credenciales. Únicamente pueden enviarse credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.', 'view_user' => 'Ver Usuario :name', 'usercsv' => 'Archivo CSV', 'two_factor_admin_optin_help' => 'La actual configuración de administración permite cumplimiento selectivo de autenticación de dos factores. ', - 'two_factor_enrolled' => '2FA Device Enrolled ', - 'two_factor_active' => '2FA Active ', + 'two_factor_enrolled' => 'Dispositivo 2FA inscrito ', + 'two_factor_active' => '2FA activo ', 'user_deactivated' => 'User cannot login', 'user_activated' => 'User can login', 'activation_status_warning' => 'Do not change activation status', @@ -33,7 +35,7 @@ return [ 'remove_group_memberships' => 'Remove Group Memberships', 'warning_deletion' => 'WARNING:', 'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.', - 'update_user_asssets_status' => 'Update all assets for these users to this status', + 'update_user_assets_status' => 'Update all assets for these users to this status', 'checkin_user_properties' => 'Check in all properties associated with these users', 'remote_label' => 'This is a remote user', 'remote' => 'Remote', diff --git a/resources/lang/es-ES/admin/users/table.php b/resources/lang/es-ES/admin/users/table.php index 1c1cc072c4..8850812a52 100644 --- a/resources/lang/es-ES/admin/users/table.php +++ b/resources/lang/es-ES/admin/users/table.php @@ -10,7 +10,7 @@ return array( 'email' => 'Email', 'employee_num' => 'No. Empleado', 'first_name' => 'Nombre', - 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.', + 'groupnotes' => 'Seleccione un grupo para asignar al usuario, recuerde que un usuario asume los permisos del grupo al que se le asigna. Use ctrl+click (o cmd+click en MacOS) para anular la selección de grupos.', 'id' => 'ID', 'inherit' => 'Hereda de', 'job' => 'Departamento', diff --git a/resources/lang/es-ES/auth.php b/resources/lang/es-ES/auth.php index db310aa1bb..387ea794b6 100644 --- a/resources/lang/es-ES/auth.php +++ b/resources/lang/es-ES/auth.php @@ -13,8 +13,8 @@ return array( | */ - 'failed' => 'These credentials do not match our records.', - 'password' => 'The provided password is incorrect.', - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + 'failed' => 'Estas credenciales no coinciden con nuestros registros.', + 'password' => 'La contraseña proporcionada es incorrecta.', + 'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.', ); diff --git a/resources/lang/es-ES/button.php b/resources/lang/es-ES/button.php index b7bacd6531..01258607b9 100644 --- a/resources/lang/es-ES/button.php +++ b/resources/lang/es-ES/button.php @@ -8,7 +8,7 @@ return [ 'delete' => 'Borrar', 'edit' => 'Editar', 'restore' => 'Restaurar', - 'remove' => 'Remove', + 'remove' => 'Eliminar', 'request' => 'Solicitud', 'submit' => 'Enviar', 'upload' => 'Subir', @@ -16,9 +16,9 @@ return [ 'select_files' => 'Selecciona Archivos...', 'generate_labels' => '{1} Generar Etiqueta|[2,*] Generar Etiquetas', 'send_password_link' => 'Enviar enlace de restablecimiento de contraseña', - 'go' => 'Go', - 'bulk_actions' => 'Bulk Actions', - 'add_maintenance' => 'Add Maintenance', - 'append' => 'Append', - 'new' => 'New', + 'go' => 'Ir', + 'bulk_actions' => 'Acciones en masa', + 'add_maintenance' => 'Añadir mantenimiento', + 'append' => 'Añadir', + 'new' => 'Nuevo', ]; diff --git a/resources/lang/es-ES/general.php b/resources/lang/es-ES/general.php index ce87abfd78..9fd56093c8 100644 --- a/resources/lang/es-ES/general.php +++ b/resources/lang/es-ES/general.php @@ -65,7 +65,8 @@ return [ 'create' => 'Crear Localización', 'created' => 'Artículo creado', 'created_asset' => 'equipo creado', - 'created_at' => 'Creado el', + 'created_at' => 'Created At', + 'created_by' => 'Created By', 'record_created' => 'Registro Creado', 'updated_at' => 'Actualizado en', 'currency' => '€', // this is deprecated @@ -100,6 +101,7 @@ return [ 'employee_number' => 'Employee Number', 'email_domain_help' => 'Esto se utiliza para generar direcciones de correo electrónico cuando se importan', 'error' => 'Error', + 'example' => 'Example: ', 'filastname_format' => 'Primera Inicial del Apellido (jsmith@ejemplo.com)', 'firstname_lastname_format' => 'Primer Nombre y Apellido (jane.smith@ejemplo.com)', 'firstname_lastname_underscore_format' => 'Primer Nombre y Apellido (jane_smith@example.com)', @@ -256,6 +258,7 @@ return [ 'undeployable' => 'No Instalable', 'unknown_admin' => 'Admin Desconocido', 'username_format' => 'Formato del nombre de usuario', + 'username' => 'Username', 'update' => 'Actualizar', 'upload_filetypes_help' => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf y rar. El tamaño máximo permitido es :size.', 'uploaded' => 'Subido', @@ -357,4 +360,8 @@ return [ 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', 'maintenance_mode_title' => 'System Temporarily Unavailable', 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/es-ES/passwords.php b/resources/lang/es-ES/passwords.php index 6b817781bb..25633b4581 100644 --- a/resources/lang/es-ES/passwords.php +++ b/resources/lang/es-ES/passwords.php @@ -1,6 +1,8 @@ 'Success: If that email address exists in our system, a password recovery email has been sent.', - 'user' => 'No se ha encontrado ningún usuario activo con ese correo electrónico.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'token' => 'This password reset token is invalid or expired, or does not match the username provided.', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/es-ES/reminders.php b/resources/lang/es-ES/reminders.php index 0f168fec4b..773a07176f 100644 --- a/resources/lang/es-ES/reminders.php +++ b/resources/lang/es-ES/reminders.php @@ -14,11 +14,8 @@ return array( */ "password" => "Los passwords deben tener mínimo 6 caracteres y coincidir.", - "user" => "Usuario o E-Mail incorrectos", - - "token" => "El token para resetear el password no es válido.", - - "sent" => "Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!", + "token" => 'This password reset token is invalid or expired, or does not match the username provided.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', ); diff --git a/resources/lang/es-ES/validation.php b/resources/lang/es-ES/validation.php index 74533b8ddf..fef5ee1c2a 100644 --- a/resources/lang/es-ES/validation.php +++ b/resources/lang/es-ES/validation.php @@ -91,6 +91,11 @@ return [ 'url' => ':attribute formato incorrecto.', 'unique_undeleted' => 'El :atrribute debe ser único.', 'non_circular' => ':attribute no debe crear una referencia circular.', + 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', + 'letters' => 'Password must contain at least one letter.', + 'numbers' => 'Password must contain at least one number.', + 'case_diff' => 'Password must use mixed case.', + 'symbols' => 'Password must contain symbols.', 'gte' => [ 'numeric' => 'Value cannot be negative' ], diff --git a/resources/lang/es-MX/admin/custom_fields/general.php b/resources/lang/es-MX/admin/custom_fields/general.php index a4e964ae08..39c7906572 100644 --- a/resources/lang/es-MX/admin/custom_fields/general.php +++ b/resources/lang/es-MX/admin/custom_fields/general.php @@ -41,7 +41,7 @@ return [ 'make_required' => 'Optional - click to make required', 'reorder' => 'Reorder', 'db_field' => 'DB Field', - 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/es-MX/admin/custom_fields/message.php b/resources/lang/es-MX/admin/custom_fields/message.php
index 26c077f490..ff376e9dff 100644
--- a/resources/lang/es-MX/admin/custom_fields/message.php
+++ b/resources/lang/es-MX/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/es-MX/admin/hardware/form.php b/resources/lang/es-MX/admin/hardware/form.php
index d61fe7d752..1101f345c5 100644
--- a/resources/lang/es-MX/admin/hardware/form.php
+++ b/resources/lang/es-MX/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'El activo no está listo para desplegar. Por lo que por el momento no puede ser asignado.',
'asset_deployable' => 'El activo no está listo para desplegar. Por lo que, por el momento, no puede ser asignado.',
'processing_spinner' => 'Procesando...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/es-MX/admin/hardware/general.php b/resources/lang/es-MX/admin/hardware/general.php
index 18957591f1..fea8987803 100644
--- a/resources/lang/es-MX/admin/hardware/general.php
+++ b/resources/lang/es-MX/admin/hardware/general.php
@@ -6,39 +6,39 @@ return [
'archived' => 'Archivado',
'asset' => 'Equipo',
'bulk_checkout' => 'Checkout Assets',
- 'bulk_checkin' => 'Checkin Assets',
+ 'bulk_checkin' => 'Regresar/ingresar equipo',
'checkin' => 'Quitar Equipo',
'checkout' => 'Activo de pago',
'clone' => 'Clonar Equipo',
'deployable' => 'Desplegable',
'deleted' => 'Este activo ha sido eliminado.',
'edit' => 'Editar Equipo',
- 'model_deleted' => 'Este Modelo de activo fue eliminado. Debes restaurar este modelo antes de poder restaurar el Activo.',
+ 'model_deleted' => 'Este modelo de equipo fue eliminado. Debes restaurar el moldelo antes de restaurar el activo.',
'requestable' => 'Requerible',
'requested' => 'Solicitado',
- 'not_requestable' => 'Not Requestable',
- 'requestable_status_warning' => 'Do not change requestable status',
+ 'not_requestable' => 'No solicitable',
+ 'requestable_status_warning' => 'No cambiar el estado solicitable',
'restore' => 'Restaurar equipo',
'pending' => 'Pendiente',
'undeployable' => 'No desplegable',
'view' => 'Ver Equipo',
- 'csv_error' => 'You have an error in your CSV file:',
+ 'csv_error' => 'Hay un error en su archivo CSV:',
'import_text' => '
- Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. + Sube un CSV que contenga historial de activos. Los activos y los usuarios DEBEN existir en el sistema, o se omitirán. Los activos coincidentes para importar el historial ocurren contra la etiqueta de activos. Intentaremos encontrar un usuario que coincida con el nombre del usuario que proporciones, y los criterios que seleccionas a continuación. Si no selecciona ningún criterio a continuación, simplemente tratará de coincidir con el formato de nombre de usuario que configuraste en el Administrador > Configuración General.
-Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.
+Los campos incluidos en el CSV deben coincidir con los encabezados: Etiqueta de activos, Nombre, Fecha de salida, Fecha de comprobación. Cualquier campo adicional será ignorado.
-Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.
+Fecha de Checkin: las fechas de check-in en blanco o futuro comprobarán los elementos al usuario asociado. Excluyendo la columna Fecha de Checkin creará una fecha de check-in con la fecha de hoy.
', - 'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format', - 'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format', - 'csv_import_match_first' => 'Try to match users by first name (jane) format', - 'csv_import_match_email' => 'Try to match users by email as username', - 'csv_import_match_username' => 'Try to match users by username', - 'error_messages' => 'Error messages:', - 'success_messages' => 'Success messages:', - 'alert_details' => 'Please see below for details.', - 'custom_export' => 'Custom Export' + 'csv_import_match_f-l' => 'Intentar coincidir con los usuarios por el formato firstname.lastname (jane.smith)', + 'csv_import_match_initial_last' => 'Intentar coincidir los usuarios con el primer apellido inicial (jsmith) formato', + 'csv_import_match_first' => 'Intentar coincidir con los usuarios por nombre de usuario (jane) formato', + 'csv_import_match_email' => 'Intentar coincidir con los usuarios por correo electrónico como nombre de usuario', + 'csv_import_match_username' => 'Intentar coincidir con los usuarios por correo electrónico como nombre de usuario', + 'error_messages' => 'Mensajes de error:', + 'success_messages' => 'Mensajes de éxito:', + 'alert_details' => 'Por favor, vea abajo para más detalles.', + 'custom_export' => 'Exportación personalizada' ]; diff --git a/resources/lang/es-MX/admin/hardware/message.php b/resources/lang/es-MX/admin/hardware/message.php index 8ba2d23c24..314d726ec3 100644 --- a/resources/lang/es-MX/admin/hardware/message.php +++ b/resources/lang/es-MX/admin/hardware/message.php @@ -17,7 +17,7 @@ return [ 'error' => 'Equipo no actualizado, intentalo de nuevo', 'success' => 'Equipo actualizado.', 'nothing_updated' => 'Ningún campo fue seleccionado, por lo que nada ha sido actualizado.', - 'no_assets_selected' => 'No assets were selected, so nothing was updated.', + 'no_assets_selected' => 'Ningún recurso fue seleccionado, por lo que no se actualizó nada.', ], 'restore' => [ diff --git a/resources/lang/es-MX/admin/users/general.php b/resources/lang/es-MX/admin/users/general.php index 54d4f648a2..bdaa56828e 100644 --- a/resources/lang/es-MX/admin/users/general.php +++ b/resources/lang/es-MX/admin/users/general.php @@ -17,26 +17,28 @@ return [ '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.', 'print_assigned' => 'Imprimir todos los Asignados', + 'email_assigned' => 'Email List of All Assigned', + 'user_notified' => 'User has been emailed a list of their currently assigned items.', 'software_user' => 'Software asignado a :name', 'send_email_help' => 'Debe proporcionar una dirección de correo electrónico para que este usuario para enviar las credenciales. Las credenciales de correo electrónico sólo se pueden hacer en la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.', 'view_user' => 'Ver Usuario :name', 'usercsv' => 'Archivo CSV', 'two_factor_admin_optin_help' => 'La actual configuración de administración permite cumplimiento selectivo de autenticación de dos factores. ', - 'two_factor_enrolled' => '2FA Device Enrolled ', - 'two_factor_active' => '2FA Active ', - 'user_deactivated' => 'User cannot login', - 'user_activated' => 'User can login', - 'activation_status_warning' => 'Do not change activation status', - 'group_memberships_helpblock' => 'Only superadmins may edit group memberships.', - 'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.', - 'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.', - 'remove_group_memberships' => 'Remove Group Memberships', - 'warning_deletion' => 'WARNING:', - 'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.', - 'update_user_asssets_status' => 'Update all assets for these users to this status', - 'checkin_user_properties' => 'Check in all properties associated with these users', - 'remote_label' => 'This is a remote user', - 'remote' => 'Remote', + 'two_factor_enrolled' => 'Dispositivo con 2FA inscrito ', + 'two_factor_active' => '2FA Activo ', + 'user_deactivated' => 'El usuario no puede iniciar sesión', + 'user_activated' => 'El usuario puede iniciar sesión', + 'activation_status_warning' => 'No cambiar el estado de activación', + 'group_memberships_helpblock' => 'Solo los superadministradores pueden ediar las membresías de grupo.', + 'superadmin_permission_warning' => 'Solo los superadmins pueden conceder acceso de superadmin a un usuario.', + 'admin_permission_warning' => 'Solo los usuarios con derechos administrativos o superiores pueden conceder acceso administrativo a un usuario.', + 'remove_group_memberships' => 'Remover membresías de grupo', + 'warning_deletion' => 'ADVERTENCIA:', + 'warning_deletion_information' => 'Estás a punto de eliminar los :count usuario(s) listados abajo. Los nombres de Super admins están resaltados en rojo.', + 'update_user_assets_status' => 'Update all assets for these users to this status', + 'checkin_user_properties' => 'Recibir todas las propiedades asociadas con estos usuarios', + 'remote_label' => 'Este es un usuario remoto', + 'remote' => 'Remoto', 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.', 'not_remote_label' => 'This is not a remote user', ]; diff --git a/resources/lang/es-MX/admin/users/table.php b/resources/lang/es-MX/admin/users/table.php index 1c1cc072c4..625d299b85 100644 --- a/resources/lang/es-MX/admin/users/table.php +++ b/resources/lang/es-MX/admin/users/table.php @@ -10,7 +10,7 @@ return array( 'email' => 'Email', 'employee_num' => 'No. Empleado', 'first_name' => 'Nombre', - 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.', + 'groupnotes' => 'Selecciona un grupo para asignar al usuario, recuerda que un usuario toma los permisos del grupo al que están asignados. Usa ctrl+clic (o cmd+clic en MacOS) para deseleccionar grupos.', 'id' => 'ID', 'inherit' => 'Hereda de', 'job' => 'Departamento', diff --git a/resources/lang/es-MX/auth.php b/resources/lang/es-MX/auth.php index db310aa1bb..6b155e9cb1 100644 --- a/resources/lang/es-MX/auth.php +++ b/resources/lang/es-MX/auth.php @@ -13,8 +13,8 @@ return array( | */ - 'failed' => 'These credentials do not match our records.', - 'password' => 'The provided password is incorrect.', - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + 'failed' => 'Estas credenciales no coinciden con nuestros registros.', + 'password' => 'El nombre de usuario o contraseña es incorrecta.', + 'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.', ); diff --git a/resources/lang/es-MX/button.php b/resources/lang/es-MX/button.php index aa737c9b14..6c1c682299 100644 --- a/resources/lang/es-MX/button.php +++ b/resources/lang/es-MX/button.php @@ -8,7 +8,7 @@ return [ 'delete' => 'Borrar', 'edit' => 'Editar', 'restore' => 'Restaurar', - 'remove' => 'Remove', + 'remove' => 'Eliminar', 'request' => 'Solicitud', 'submit' => 'Enviar', 'upload' => 'Subir', @@ -16,9 +16,9 @@ return [ 'select_files' => 'Select Files...', 'generate_labels' => '{1} Generar Etiqueta|[2,*] Generar Etiquetas', 'send_password_link' => 'Enviar enlace de restablecimiento de contraseña', - 'go' => 'Go', - 'bulk_actions' => 'Bulk Actions', - 'add_maintenance' => 'Add Maintenance', - 'append' => 'Append', - 'new' => 'New', + 'go' => 'Ir', + 'bulk_actions' => 'Acciones masivas', + 'add_maintenance' => 'Añadir mantenimiento', + 'append' => 'Añadir', + 'new' => 'Nuevo', ]; diff --git a/resources/lang/es-MX/general.php b/resources/lang/es-MX/general.php index f8a6703704..572a3addbd 100644 --- a/resources/lang/es-MX/general.php +++ b/resources/lang/es-MX/general.php @@ -65,7 +65,8 @@ return [ 'create' => 'Crear Localización', 'created' => 'Artículo creado', 'created_asset' => 'equipo creado', - 'created_at' => 'Creado el', + 'created_at' => 'Created At', + 'created_by' => 'Created By', 'record_created' => 'Registro Creado', 'updated_at' => 'Actualizado en', 'currency' => '€', // this is deprecated @@ -100,6 +101,7 @@ return [ 'employee_number' => 'Employee Number', 'email_domain_help' => 'Esto se utiliza para generar direcciones de correo electrónico cuando se importan', 'error' => 'Error', + 'example' => 'Example: ', 'filastname_format' => 'Primera Inicial del Apellido (jsmith@ejemplo.com)', 'firstname_lastname_format' => 'Primer Nombre y Apellido (jane.smith@ejemplo.com)', 'firstname_lastname_underscore_format' => 'Primer Nombre y Apellido (jane_smith@example.com)', @@ -256,6 +258,7 @@ return [ 'undeployable' => 'No Instalable', 'unknown_admin' => 'Admin Desconocido', 'username_format' => 'Formato del nombre de usuario', + 'username' => 'Username', 'update' => 'Actualizar', 'upload_filetypes_help' => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf y rar. El tamaño máximo permitido es :size.', 'uploaded' => 'Subido', @@ -357,4 +360,8 @@ return [ 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', 'maintenance_mode_title' => 'System Temporarily Unavailable', 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/es-MX/passwords.php b/resources/lang/es-MX/passwords.php index 6b817781bb..25633b4581 100644 --- a/resources/lang/es-MX/passwords.php +++ b/resources/lang/es-MX/passwords.php @@ -1,6 +1,8 @@ 'Success: If that email address exists in our system, a password recovery email has been sent.', - 'user' => 'No se ha encontrado ningún usuario activo con ese correo electrónico.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'token' => 'This password reset token is invalid or expired, or does not match the username provided.', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/es-MX/reminders.php b/resources/lang/es-MX/reminders.php index 0f168fec4b..773a07176f 100644 --- a/resources/lang/es-MX/reminders.php +++ b/resources/lang/es-MX/reminders.php @@ -14,11 +14,8 @@ return array( */ "password" => "Los passwords deben tener mínimo 6 caracteres y coincidir.", - "user" => "Usuario o E-Mail incorrectos", - - "token" => "El token para resetear el password no es válido.", - - "sent" => "Si existe cuenta con el e-mail introducido, se enviará mensaje para resetear el password!", + "token" => 'This password reset token is invalid or expired, or does not match the username provided.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', ); diff --git a/resources/lang/es-MX/validation.php b/resources/lang/es-MX/validation.php index 74533b8ddf..fef5ee1c2a 100644 --- a/resources/lang/es-MX/validation.php +++ b/resources/lang/es-MX/validation.php @@ -91,6 +91,11 @@ return [ 'url' => ':attribute formato incorrecto.', 'unique_undeleted' => 'El :atrribute debe ser único.', 'non_circular' => ':attribute no debe crear una referencia circular.', + 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', + 'letters' => 'Password must contain at least one letter.', + 'numbers' => 'Password must contain at least one number.', + 'case_diff' => 'Password must use mixed case.', + 'symbols' => 'Password must contain symbols.', 'gte' => [ 'numeric' => 'Value cannot be negative' ], diff --git a/resources/lang/es-VE/admin/custom_fields/general.php b/resources/lang/es-VE/admin/custom_fields/general.php index 3f908daa3c..d7fdf8a73d 100644 --- a/resources/lang/es-VE/admin/custom_fields/general.php +++ b/resources/lang/es-VE/admin/custom_fields/general.php @@ -41,7 +41,7 @@ return [ 'make_required' => 'Opcional - haga click para hacerlo opcional', 'reorder' => 'Reordenar', 'db_field' => 'Campo de DB', - 'db_convert_warning' => 'ADVERTENCIA. Este campo está en la tabla de campos personalizados como :db_column
pero debería ser :expected.',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Este valor debe ser unico en todos los activos',
'unique' => 'Único',
];
diff --git a/resources/lang/es-VE/admin/custom_fields/message.php b/resources/lang/es-VE/admin/custom_fields/message.php
index f3ffbeb6c1..66cfdd5654 100644
--- a/resources/lang/es-VE/admin/custom_fields/message.php
+++ b/resources/lang/es-VE/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/es-VE/admin/hardware/form.php b/resources/lang/es-VE/admin/hardware/form.php
index 04df91ce51..0e011da6a8 100644
--- a/resources/lang/es-VE/admin/hardware/form.php
+++ b/resources/lang/es-VE/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'Ese estado de activos no es desplegable. Este activo no puede ser verificado.',
'asset_deployable' => 'Ese estado es desplegable. Este activo puede ser revisado.',
'processing_spinner' => 'Procesando...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/es-VE/admin/hardware/general.php b/resources/lang/es-VE/admin/hardware/general.php
index 4632288206..074574c709 100644
--- a/resources/lang/es-VE/admin/hardware/general.php
+++ b/resources/lang/es-VE/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
'archived' => 'Archivado',
'asset' => 'Activo',
'bulk_checkout' => 'Activos Asignados',
- 'bulk_checkin' => 'Checkin Assets',
+ 'bulk_checkin' => 'Quitar Equipo',
'checkin' => 'Ingresar Activo',
'checkout' => 'Retirar Activo',
'clone' => 'Clonar Activo',
@@ -25,12 +25,12 @@ return [
'csv_error' => 'Tiene un error en su archivo CSV:',
'import_text' => '
- Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. + Sube un CSV que contenga historial de activos. Los activos y los usuarios DEBEN existir en el sistema, o se omitirán. Los activos coincidentes para importar el historial ocurren contra la etiqueta de activos. Intentaremos encontrar un usuario que coincida con el nombre del usuario que proporciones, y los criterios que seleccionas a continuación. Si no selecciona ningún criterio a continuación, simplemente tratará de coincidir con el formato de nombre de usuario que configuraste en el Administrador > Configuración General.
-Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.
+Los campos incluidos en el CSV deben coincidir con los encabezados: Etiqueta de activos, Nombre, Fecha de salida, Fecha de comprobación. Cualquier campo adicional será ignorado.
-Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.
+Fecha de Checkin: las fechas de check-in en blanco o futuro comprobarán los elementos al usuario asociado. Excluyendo la columna Fecha de Checkin creará una fecha de check-in con la fecha de hoy.
', 'csv_import_match_f-l' => 'Intentar coincidir con los usuarios por el formato firstname.lastname (jane.smith)', 'csv_import_match_initial_last' => 'Intentar coincidir los usuarios con la inicial del primer apellido (jsmith) formato', diff --git a/resources/lang/es-VE/admin/hardware/message.php b/resources/lang/es-VE/admin/hardware/message.php index 8408a1a83c..976d686d71 100644 --- a/resources/lang/es-VE/admin/hardware/message.php +++ b/resources/lang/es-VE/admin/hardware/message.php @@ -16,7 +16,7 @@ return [ 'error' => 'Activo no ha sido actualizado, por favor, inténtelo de nuevo', 'success' => 'Activo actualizado con éxito.', 'nothing_updated' => 'Ningún campo fue seleccionado, así que nada se actualizó.', - 'no_assets_selected' => 'No assets were selected, so nothing was updated.', + 'no_assets_selected' => 'Ningún recurso fue seleccionado, por lo que no se actualizó nada.', ], 'restore' => [ diff --git a/resources/lang/es-VE/admin/locations/table.php b/resources/lang/es-VE/admin/locations/table.php index bc2e57fde6..cbd3e7fb41 100644 --- a/resources/lang/es-VE/admin/locations/table.php +++ b/resources/lang/es-VE/admin/locations/table.php @@ -20,21 +20,21 @@ return [ 'parent' => 'Padre', 'currency' => 'Divisa de la Ubicación', 'ldap_ou' => 'Búsqueda LDAP OU', - 'user_name' => 'User Name', - 'department' => 'Department', - 'location' => 'Location', - 'asset_tag' => 'Assets Tag', - 'asset_name' => 'Name', - 'asset_category' => 'Category', - 'asset_manufacturer' => 'Manufacturer', - 'asset_model' => 'Model', - 'asset_serial' => 'Serial', - 'asset_location' => 'Location', - 'asset_checked_out' => 'Checked Out', - 'asset_expected_checkin' => 'Expected Checkin', - 'date' => 'Date:', - 'signed_by_asset_auditor' => 'Signed By (Asset Auditor):', - 'signed_by_finance_auditor' => 'Signed By (Finance Auditor):', - 'signed_by_location_manager' => 'Signed By (Location Manager):', - 'signed_by' => 'Signed Off By:', + 'user_name' => 'Nombre de usuario', + 'department' => 'Departamento', + 'location' => 'Ubicación', + 'asset_tag' => 'Etiqueta de activo', + 'asset_name' => 'Nombre', + 'asset_category' => 'Categoría', + 'asset_manufacturer' => 'Fabricante', + 'asset_model' => 'Modelo', + 'asset_serial' => 'Número de serie', + 'asset_location' => 'Ubicación', + 'asset_checked_out' => 'Asignado', + 'asset_expected_checkin' => 'Fecha Esperada de Devolución', + 'date' => 'Fecha:', + 'signed_by_asset_auditor' => 'Firmado por (Juego de Acciones):', + 'signed_by_finance_auditor' => 'Firmado por (Juego de Acciones):', + 'signed_by_location_manager' => 'Firmado por (Administrador de ubicación):', + 'signed_by' => 'Firmado por:', ]; diff --git a/resources/lang/es-VE/admin/statuslabels/message.php b/resources/lang/es-VE/admin/statuslabels/message.php index eebdf9abd3..1581c953dd 100644 --- a/resources/lang/es-VE/admin/statuslabels/message.php +++ b/resources/lang/es-VE/admin/statuslabels/message.php @@ -23,7 +23,7 @@ return [ 'help' => [ 'undeployable' => 'Estos activos no pueden asignarse a nadie.', - 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.', + 'deployable' => 'Estos activos pueden ser retirados. Una vez asignados, asumirán un estado meta de Desplegado.', 'archived' => 'Estos activos no pueden ser asignados, y sólo se mostrarán en la vista archivada. Esto es útil para retener información acerca de activos para propósitos históricos o de presupuesto, pero manteniéndolos fuera de la lista de activos del día a día.', 'pending' => 'Estos activos no pueden ser asignados a nadie aún, usados a menudo para artículos que son para reparar pero se espera que vuelvan a circulación.', ], diff --git a/resources/lang/es-VE/admin/users/general.php b/resources/lang/es-VE/admin/users/general.php index cb80bc53f4..a7f5905fe3 100644 --- a/resources/lang/es-VE/admin/users/general.php +++ b/resources/lang/es-VE/admin/users/general.php @@ -17,13 +17,15 @@ return [ 'last_login' => 'Último Inicio de Sesión', 'ldap_config_text' => 'Los parámetros de configuración LDAP pueden ser encontrados en Admin > Settings. La ubicación (opcional) seleccionada será establecida para todos los usuarios importados.', 'print_assigned' => 'Imprimir Todos los Asignados', + 'email_assigned' => 'Email List of All Assigned', + 'user_notified' => 'User has been emailed a list of their currently assigned items.', 'software_user' => 'Software Asignado a :name', 'send_email_help' => 'Debe proporcionar una dirección de correo electrónico para este usuario para enviarle credenciales. Únicamente pueden enviarse credenciales por correo eléctronico durante la creación del usuario. Las contraseñas se almacenan en un hash de un solo sentido y no se pueden recuperar una vez guardadas.', 'view_user' => 'Ver Usuario :name', 'usercsv' => 'Archivo CSV', 'two_factor_admin_optin_help' => 'Tus configuraciones de administrador actuales permiten cumplimiento selectivo de autenticación de dos factores. ', - 'two_factor_enrolled' => '2FA Device Enrolled ', - 'two_factor_active' => '2FA Active ', + 'two_factor_enrolled' => 'Dispositivo 2FA inscrito ', + 'two_factor_active' => '2FA activo ', 'user_deactivated' => 'User cannot login', 'user_activated' => 'User can login', 'activation_status_warning' => 'Do not change activation status', @@ -33,7 +35,7 @@ return [ 'remove_group_memberships' => 'Remove Group Memberships', 'warning_deletion' => 'WARNING:', 'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.', - 'update_user_asssets_status' => 'Update all assets for these users to this status', + 'update_user_assets_status' => 'Update all assets for these users to this status', 'checkin_user_properties' => 'Check in all properties associated with these users', 'remote_label' => 'This is a remote user', 'remote' => 'Remote', diff --git a/resources/lang/es-VE/admin/users/table.php b/resources/lang/es-VE/admin/users/table.php index 6e6086014a..a5d8ae1d0e 100644 --- a/resources/lang/es-VE/admin/users/table.php +++ b/resources/lang/es-VE/admin/users/table.php @@ -10,7 +10,7 @@ return array( 'email' => 'Correo electrónico', 'employee_num' => 'No. Empleado.', 'first_name' => 'Nombre', - 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.', + 'groupnotes' => 'Seleccione un grupo para asignar al usuario, recuerde que un usuario asume los permisos del grupo al que se le asigna. Use ctrl+click (o cmd+click en MacOS) para anular la selección de grupos.', 'id' => 'Id', 'inherit' => 'Hereda de', 'job' => 'Título profesional', diff --git a/resources/lang/es-VE/auth.php b/resources/lang/es-VE/auth.php index db310aa1bb..387ea794b6 100644 --- a/resources/lang/es-VE/auth.php +++ b/resources/lang/es-VE/auth.php @@ -13,8 +13,8 @@ return array( | */ - 'failed' => 'These credentials do not match our records.', - 'password' => 'The provided password is incorrect.', - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', + 'failed' => 'Estas credenciales no coinciden con nuestros registros.', + 'password' => 'La contraseña proporcionada es incorrecta.', + 'throttle' => 'Demasiados intentos de inicio de sesión. Por favor, inténtalo de nuevo en :seconds segundos.', ); diff --git a/resources/lang/es-VE/button.php b/resources/lang/es-VE/button.php index 4c17292bc6..f5e4518598 100644 --- a/resources/lang/es-VE/button.php +++ b/resources/lang/es-VE/button.php @@ -8,7 +8,7 @@ return [ 'delete' => 'Borrar', 'edit' => 'Editar', 'restore' => 'Restaurar', - 'remove' => 'Remove', + 'remove' => 'Eliminar', 'request' => 'Solicitar', 'submit' => 'Enviar', 'upload' => 'Cargar', @@ -16,9 +16,9 @@ return [ 'select_files' => 'Selecciona Archivos...', 'generate_labels' => '{1} Generar Etiqueta|[2,*] Generar Etiquetas', 'send_password_link' => 'Enviar enlace de restablecimiento de contraseña', - 'go' => 'Go', - 'bulk_actions' => 'Bulk Actions', - 'add_maintenance' => 'Add Maintenance', - 'append' => 'Append', - 'new' => 'New', + 'go' => 'Ir', + 'bulk_actions' => 'Acciones en masa', + 'add_maintenance' => 'Añadir mantenimiento', + 'append' => 'Añadir', + 'new' => 'Nuevo', ]; diff --git a/resources/lang/es-VE/general.php b/resources/lang/es-VE/general.php index 7cebef2ea1..88b19e105e 100644 --- a/resources/lang/es-VE/general.php +++ b/resources/lang/es-VE/general.php @@ -65,7 +65,8 @@ return [ 'create' => 'Crear Nuevo', 'created' => 'Elemento Creado', 'created_asset' => 'activo creado', - 'created_at' => 'Creado El', + 'created_at' => 'Created At', + 'created_by' => 'Created By', 'record_created' => 'Registro Creado', 'updated_at' => 'Actualizado El', 'currency' => '$', // this is deprecated @@ -100,6 +101,7 @@ return [ 'employee_number' => 'Employee Number', 'email_domain_help' => 'Este se utiliza para generar direcciones de correo al importar', 'error' => 'Error', + 'example' => 'Example: ', 'filastname_format' => 'Primera Inicial y Apellido (jsmith@example.com)', 'firstname_lastname_format' => 'Nombre y Apellido (jane.smith@example.com)', 'firstname_lastname_underscore_format' => 'Primer Nombre y Apellido (jane_smith@example.com)', @@ -256,6 +258,7 @@ return [ 'undeployable' => 'No desplegable', 'unknown_admin' => 'Administrador Desconocido', 'username_format' => 'Formato de Nombre de Usuario', + 'username' => 'Username', 'update' => 'Actualizar', 'upload_filetypes_help' => 'Los tipos de archivo permitidos son png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf y rar. El tamaño máximo permitido es :size.', 'uploaded' => 'Actualizado', @@ -357,4 +360,8 @@ return [ 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', 'maintenance_mode_title' => 'System Temporarily Unavailable', 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/es-VE/passwords.php b/resources/lang/es-VE/passwords.php index 3a6d5bfdc7..25633b4581 100644 --- a/resources/lang/es-VE/passwords.php +++ b/resources/lang/es-VE/passwords.php @@ -1,6 +1,8 @@ 'Success: If that email address exists in our system, a password recovery email has been sent.', - 'user' => 'No se encontró ningún usuario activo con este correo electrónico.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'token' => 'This password reset token is invalid or expired, or does not match the username provided.', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/es-VE/reminders.php b/resources/lang/es-VE/reminders.php index bd89801d78..fa4dbe996a 100644 --- a/resources/lang/es-VE/reminders.php +++ b/resources/lang/es-VE/reminders.php @@ -14,11 +14,8 @@ return array( */ "password" => "Las contraseñas deben ser de seis caracteres y coincidir con la confirmación.", - "user" => "El nombre de usuario o la dirección de correo son incorrectos", - - "token" => "Esta token para restablecer la contraseña es inválido.", - - "sent" => "Si se encontró un correo electrónico coincide, ¡un recordatorio de contraseña fue enviado!", + "token" => 'This password reset token is invalid or expired, or does not match the username provided.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', ); diff --git a/resources/lang/es-VE/validation.php b/resources/lang/es-VE/validation.php index bc3117b8aa..02aa8a36be 100644 --- a/resources/lang/es-VE/validation.php +++ b/resources/lang/es-VE/validation.php @@ -91,6 +91,11 @@ return [ 'url' => 'El formato :attribute es inválido.', 'unique_undeleted' => 'El :atrribute debe ser único.', 'non_circular' => ':attribute no debe crear una referencia circular.', + 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', + 'letters' => 'Password must contain at least one letter.', + 'numbers' => 'Password must contain at least one number.', + 'case_diff' => 'Password must use mixed case.', + 'symbols' => 'Password must contain symbols.', 'gte' => [ 'numeric' => 'Value cannot be negative' ], diff --git a/resources/lang/et/admin/custom_fields/general.php b/resources/lang/et/admin/custom_fields/general.php index 8df03da089..63efa48478 100644 --- a/resources/lang/et/admin/custom_fields/general.php +++ b/resources/lang/et/admin/custom_fields/general.php @@ -41,7 +41,7 @@ return [ 'make_required' => 'Optional - click to make required', 'reorder' => 'Reorder', 'db_field' => 'DB Field', - 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/et/admin/custom_fields/message.php b/resources/lang/et/admin/custom_fields/message.php
index 07ba549bf6..642610422b 100644
--- a/resources/lang/et/admin/custom_fields/message.php
+++ b/resources/lang/et/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/et/admin/hardware/form.php b/resources/lang/et/admin/hardware/form.php
index 3abfc5b666..369b5dadd7 100644
--- a/resources/lang/et/admin/hardware/form.php
+++ b/resources/lang/et/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/et/admin/users/general.php b/resources/lang/et/admin/users/general.php
index 8681a3de61..7b7676bae3 100644
--- a/resources/lang/et/admin/users/general.php
+++ b/resources/lang/et/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Viimane sisselogimine',
'ldap_config_text' => 'LDAP-i konfiguratsiooniseadeid saab leida Admin> Seaded. (Valikuline) valitud asukoht määratakse kõigi imporditud kasutajate jaoks.',
'print_assigned' => 'Prindi kõik varad',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Kasutaja :name valdusesse antud tarkvara',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Vaata kasutajat :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/et/general.php b/resources/lang/et/general.php
index c4bc579474..c706f236b1 100644
--- a/resources/lang/et/general.php
+++ b/resources/lang/et/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Loo uus',
'created' => 'Üksus on loodud',
'created_asset' => 'loodud vara',
- 'created_at' => 'Loodud',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Väärtus loodud',
'updated_at' => 'Viimati muudetud',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Seda kasutatakse importimisel e-posti aadresside loomiseks',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Esimene esmane perekonnanimi (jsmith@example.com)',
'firstname_lastname_format' => 'Eesnimi eesnimi (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Eesnimi Perenimi (eesnimi.perenimi@poleolemas.ee)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Unableployable',
'unknown_admin' => 'Tundmatu Admin',
'username_format' => 'Kasutajanime formaat',
+ 'username' => 'Username',
'update' => 'Uuenda',
'upload_filetypes_help' => 'Lubatud failileiendid on png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip ja rar. Suurim lubatud üleslaadimise maht on :size.',
'uploaded' => 'Üles laetud',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/et/passwords.php b/resources/lang/et/passwords.php
index 7f548c131f..25633b4581 100644
--- a/resources/lang/et/passwords.php
+++ b/resources/lang/et/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Sellise emailiga aktiivset kasutajat ei leitud.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/et/reminders.php b/resources/lang/et/reminders.php
index 0b5a4802c4..625aab6fe3 100644
--- a/resources/lang/et/reminders.php
+++ b/resources/lang/et/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Parool peab olema kuus tähemärki ja peab klappima kinnitusega.",
-
"user" => "Kasutajanimi või parool on vale",
-
- "token" => "See parooli taastamise kood on vale.",
-
- "sent" => "Kui me leidsime klappiva e-maili aadressi, siis saatsime sellele parooli meeldetuletuse!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/et/validation.php b/resources/lang/et/validation.php
index 71c2e4f37f..356fcefc20 100644
--- a/resources/lang/et/validation.php
+++ b/resources/lang/et/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Atribuudivorming on vale.',
'unique_undeleted' => ':attribute peab olema ainulaadne.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/fa/admin/custom_fields/general.php b/resources/lang/fa/admin/custom_fields/general.php
index 1cd8ffb6f8..f0ebd04a9d 100644
--- a/resources/lang/fa/admin/custom_fields/general.php
+++ b/resources/lang/fa/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/fa/admin/custom_fields/message.php b/resources/lang/fa/admin/custom_fields/message.php
index 043d4a4224..ba76d01e60 100644
--- a/resources/lang/fa/admin/custom_fields/message.php
+++ b/resources/lang/fa/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/fa/admin/hardware/form.php b/resources/lang/fa/admin/hardware/form.php
index 234f07f6a6..f2b0f02617 100644
--- a/resources/lang/fa/admin/hardware/form.php
+++ b/resources/lang/fa/admin/hardware/form.php
@@ -60,4 +60,6 @@ return [
'asset_not_deployable' => 'این وضعیت دارایی قابل استقرار نیست. این دارایی قابل پذیرش نیست.',
'asset_deployable' => 'این وضعیت دارایی قابل استقرار است. این دارایی قابل پذیرش است.',
'processing_spinner' => 'در حال پردازش...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/fa/admin/users/general.php b/resources/lang/fa/admin/users/general.php
index 0fc7562e0e..d062699833 100644
--- a/resources/lang/fa/admin/users/general.php
+++ b/resources/lang/fa/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'آخرین ورود',
'ldap_config_text' => 'تنظشیمات تاییدیه LDPA در فولدر app/config در فایلی به نام idap.php وجود دارد.مکان مشخص شده برای تمامی کاربران وارد شده تنظیم میشود.شما نیاز دارید که حداقل یه مکان را اضافه کرده باشید تا بتوانید از این ویژگی استفاده کنید.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'برنامه چک شد برای:',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'نمایش کاربر :',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/fa/general.php b/resources/lang/fa/general.php
index bd7d7af860..06f6b86135 100644
--- a/resources/lang/fa/general.php
+++ b/resources/lang/fa/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'ایجاد مورد جدید',
'created' => 'مورد ایجاد شده',
'created_asset' => 'دارایی ایجاد شده',
- 'created_at' => 'ایجاد شده در',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'رکورد ایجاد شد',
'updated_at' => 'به روز شده در',
'currency' => '$', // this is deprecated
@@ -102,6 +103,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'این برای تولید آدرس های ایمیل هنگام وارد کردن استفاده می شود',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'اولین نام خانوادگی (jsmith@example.com)',
'firstname_lastname_format' => 'نام خانوادگی (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'نام خانوادگی (jane.smith@example.com)',
@@ -259,6 +261,7 @@ return [
'undeployable' => 'غیر قابل استقرار',
'unknown_admin' => 'نامشخص مدیریت',
'username_format' => 'فرمت نام کاربری',
+ 'username' => 'Username',
'update' => 'بروزرسانی',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'بارگزاری شد',
@@ -360,4 +363,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/fa/passwords.php b/resources/lang/fa/passwords.php
index aecc0ff326..25633b4581 100644
--- a/resources/lang/fa/passwords.php
+++ b/resources/lang/fa/passwords.php
@@ -1,6 +1,8 @@
'با موفقیت: اگر ایمیل در سامانه موجود باشد، ایمیل بازیابی کلمه عبور ارسال شده است.',
- 'user' => 'هیچ کاربر فعالی با این آدرس ایمیل یافت نشد.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/fa/reminders.php b/resources/lang/fa/reminders.php
index 9c46ca8606..efc7b5b939 100644
--- a/resources/lang/fa/reminders.php
+++ b/resources/lang/fa/reminders.php
@@ -15,13 +15,8 @@ return array(
"password" => "کلمه عبور باید شش کاراکتر باشد و مطابقت با تایید آن.
",
-
"user" => "نام کاربری یا آدرس ایمیل اشتباه است",
-
- "token" => " تنظیم مجدد رمز عبور این نشانه نامعتبر است.
-",
-
- "sent" => "اگر یک آدرس ایمیل تطبیق پیدا شد، یک یادآوری رمز عبور ارسال شده است!
-",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/fa/validation.php b/resources/lang/fa/validation.php
index 48f40a6041..71f5b33fa4 100644
--- a/resources/lang/fa/validation.php
+++ b/resources/lang/fa/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'شکل ویژگی نامعتبر است.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/fi/admin/custom_fields/general.php b/resources/lang/fi/admin/custom_fields/general.php
index b961fce03d..66f4a2f2f1 100644
--- a/resources/lang/fi/admin/custom_fields/general.php
+++ b/resources/lang/fi/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/fi/admin/custom_fields/message.php b/resources/lang/fi/admin/custom_fields/message.php
index 9540976b77..fbfcea2f77 100644
--- a/resources/lang/fi/admin/custom_fields/message.php
+++ b/resources/lang/fi/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/fi/admin/hardware/form.php b/resources/lang/fi/admin/hardware/form.php
index c2729764ae..62ea8dedf7 100644
--- a/resources/lang/fi/admin/hardware/form.php
+++ b/resources/lang/fi/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/fi/admin/users/general.php b/resources/lang/fi/admin/users/general.php
index 7381544adf..b260548a77 100644
--- a/resources/lang/fi/admin/users/general.php
+++ b/resources/lang/fi/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Viimeisin kirjautuminen',
'ldap_config_text' => 'LDAP-asetukset löytyvät kohdasta Järjestelmänvalvoja> Asetukset. Valittu (valinnainen) sijainti määritetään kaikille tuodulle käyttäjälle.',
'print_assigned' => 'Tulosta kaikki luovutetut',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Käyttäjälle :name luovutetut ohjelmistot',
'send_email_help' => 'Käyttäjälle on määritettävä sähköpostiosoite lähettääksesi salasanan sähköpostitse. Salasanat voi lähettää sähköpostilla vain käyttäjän luonnin yhteydessä. Salasanat tallennetaan järjestelmään yksisuuntaisesti tiivistettyinä, eikä niitä voida lukea selväkielisenä tallennuksen jälkeen.',
'view_user' => 'Näytä käyttäjä :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/fi/general.php b/resources/lang/fi/general.php
index e003d0ab73..7731fc9412 100644
--- a/resources/lang/fi/general.php
+++ b/resources/lang/fi/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Luo uusi',
'created' => 'Nimike luotiin',
'created_asset' => 'laite luotu',
- 'created_at' => 'Luontiaika',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Tietue luotu',
'updated_at' => 'Päivitetty klo',
'currency' => '€', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Käytetään sähköpostiosoitteiden luontiin tietoja tuotaessa',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Ensimmäinen nimikirjain sukunimi (pvirtanen@example.com)',
'firstname_lastname_format' => 'Etunimi . Sukunimi (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Etunimi Sukunimi (paivi_virtanen@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Ei käyttöönotettavissa',
'unknown_admin' => 'Tuntematon ylläpitäjä',
'username_format' => 'Käyttäjätunnuksen muoto',
+ 'username' => 'Username',
'update' => 'Päivitä',
'upload_filetypes_help' => 'Sallitut tiedostotyypit ovat png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf ja rar. Suurin sallittu lähetyskoko on :size.',
'uploaded' => 'Lähetetty',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/fi/passwords.php b/resources/lang/fi/passwords.php
index c9a9e6cbaf..25633b4581 100644
--- a/resources/lang/fi/passwords.php
+++ b/resources/lang/fi/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Sähköpostille ei löytynyt käyttäjää.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/fi/reminders.php b/resources/lang/fi/reminders.php
index 1704e52668..4f38c91876 100644
--- a/resources/lang/fi/reminders.php
+++ b/resources/lang/fi/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Salasanan tulee olla 6 merkkiä pitkä ja sen tulee täsmätä vahvistukseen.",
-
"user" => "Käyttäjätunnus tai sähköpostiosoite on virheellinen",
-
- "token" => "Tämä salasanan nollauspoletti on virheellinen.",
-
- "sent" => "Jos sähköpostiosoite löytyi, salasanan muistutusviesti lähetettiin!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/fi/validation.php b/resources/lang/fi/validation.php
index 4018184dfe..cca0e3c411 100644
--- a/resources/lang/fi/validation.php
+++ b/resources/lang/fi/validation.php
@@ -91,6 +91,11 @@ return [
'url' => ':attribute muotoilu on virheellinen.',
'unique_undeleted' => ':attribute on oltava ainutlaatuinen.',
'non_circular' => ':attribute ei saa luoda kehäviittausta.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/fil/admin/custom_fields/general.php b/resources/lang/fil/admin/custom_fields/general.php
index 4b30f9fa14..cc54bb6c61 100644
--- a/resources/lang/fil/admin/custom_fields/general.php
+++ b/resources/lang/fil/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/fil/admin/custom_fields/message.php b/resources/lang/fil/admin/custom_fields/message.php
index 06c9834f6a..4acd606a5d 100644
--- a/resources/lang/fil/admin/custom_fields/message.php
+++ b/resources/lang/fil/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/fil/admin/hardware/form.php b/resources/lang/fil/admin/hardware/form.php
index b5d6d9a186..d920c3233a 100644
--- a/resources/lang/fil/admin/hardware/form.php
+++ b/resources/lang/fil/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/fil/admin/users/general.php b/resources/lang/fil/admin/users/general.php
index 6b95d08b44..c0bca64613 100644
--- a/resources/lang/fil/admin/users/general.php
+++ b/resources/lang/fil/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Ang Huling Pag-login',
'ldap_config_text' => 'Pwedeng makita ang configuration settings ng LDAP Admin > Settings. Ang (opsyonal) napiling lokasyon ay itatakda para sa lahat ng mga na-import na mga gumagamit o user.',
'print_assigned' => 'I-print ang Lahat ng Nakatalaga',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Ang Software ay Nai-check out sa :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Tingnan ang User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/fil/general.php b/resources/lang/fil/general.php
index 6426931ec7..f1dd43761e 100644
--- a/resources/lang/fil/general.php
+++ b/resources/lang/fil/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Magsagawa ng Bago',
'created' => 'Ang Naisagawang Aytem',
'created_asset' => 'ang naisagawang asset',
- 'created_at' => 'Naisagawa sa',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Na-update sa',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Ito ay ginagamit para makapagsagawa ng email address kapag mag-import',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Ang Unang Inisyal Huling Pangalan (jsmith@example.com)',
'firstname_lastname_format' => 'Unang Pangalan Huling Pangalan (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Unang Pangalan Huling Pangalan (jane.smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Hindi pwedeng i-depoy',
'unknown_admin' => 'Hindi matukoy na Admin',
'username_format' => 'Ang Pormat sa Pangalan ng Gumagamit',
+ 'username' => 'Username',
'update' => 'I-update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Nai-upload',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/fil/passwords.php b/resources/lang/fil/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/fil/passwords.php
+++ b/resources/lang/fil/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/fil/reminders.php b/resources/lang/fil/reminders.php
index 698f5ccb32..6f5009df60 100644
--- a/resources/lang/fil/reminders.php
+++ b/resources/lang/fil/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Dapat na may 6 na mga karakter ang password at tumugma sa kumpirmasyon.",
-
"user" => "Ang username o ang email address ay hindi tama",
-
- "token" => "Hindi balido ang password rest token na ito.",
-
- "sent" => "Kapag mayroong nakita na tumugmanang email address, ang paalala sa password ay nai-send na!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/fil/validation.php b/resources/lang/fil/validation.php
index a97d751aa1..f400141fce 100644
--- a/resources/lang/fil/validation.php
+++ b/resources/lang/fil/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Ang :pormat ng katangian ng pormat ay hindi balido.',
'unique_undeleted' => 'Ang :katangian ay dapat na natatangi.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/fr/account/general.php b/resources/lang/fr/account/general.php
index 7fc060a849..450408481c 100644
--- a/resources/lang/fr/account/general.php
+++ b/resources/lang/fr/account/general.php
@@ -1,12 +1,12 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
+ 'personal_api_keys' => 'Clés personnelles d\'API',
+ 'api_key_warning' => 'Lors de la génération d\'un jeton d\'API, assurez-vous d\'en prendre note immédiatement car il
+ vous sera impossible de le consulter à nouveau.',
+ 'api_base_url' => 'L\'URL de base de l\'API est situé à:',
'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'api_token_expiration_time' => 'Les jetons d\'API sont configurés pour expirer après:',
+ 'api_reference' => 'Veuillez consulter la documentation de référence des API pour
+ trouver des points de terminaison spécifiques et des informations supplémentaires.',
);
diff --git a/resources/lang/fr/admin/custom_fields/general.php b/resources/lang/fr/admin/custom_fields/general.php
index f06ab6e30c..0e2981cc42 100644
--- a/resources/lang/fr/admin/custom_fields/general.php
+++ b/resources/lang/fr/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Facultatif - cliquez pour rendre requis',
'reorder' => 'Réordonner',
'db_field' => 'Champ BDD',
- 'db_convert_warning' => 'ATTENTION. Ce champ est dans la table de champs personnalisés en tant que :db_column
mais devrait être :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Cette valeur doit être unique parmi tous les actifs',
'unique' => 'Unique',
];
diff --git a/resources/lang/fr/admin/custom_fields/message.php b/resources/lang/fr/admin/custom_fields/message.php
index 2496cbb682..c536dc41e2 100644
--- a/resources/lang/fr/admin/custom_fields/message.php
+++ b/resources/lang/fr/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/fr/admin/hardware/form.php b/resources/lang/fr/admin/hardware/form.php
index fa6b759bfe..ddd33da3f8 100644
--- a/resources/lang/fr/admin/hardware/form.php
+++ b/resources/lang/fr/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'L\'actif n\'est pas déployable. L\'actif ne peut pas être affecté.',
'asset_deployable' => 'L\'actif est déployable. L\'actif peut être affecté.',
'processing_spinner' => 'Traitement en cours...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/fr/admin/hardware/message.php b/resources/lang/fr/admin/hardware/message.php
index 114a54ba25..6469c52e4a 100644
--- a/resources/lang/fr/admin/hardware/message.php
+++ b/resources/lang/fr/admin/hardware/message.php
@@ -17,7 +17,7 @@ return [
'error' => 'Ce bien n\'a pas été actualisé, veuillez réessayer',
'success' => 'Bien actualisé correctement.',
'nothing_updated' => 'Aucun champ n\'a été sélectionné, rien n\'a été actualisé.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => 'Aucune ressource n\'a été sélectionnée, rien n\'a donc été mis à jour.',
],
'restore' => [
diff --git a/resources/lang/fr/admin/settings/general.php b/resources/lang/fr/admin/settings/general.php
index 59e12e1bf1..17926febf2 100644
--- a/resources/lang/fr/admin/settings/general.php
+++ b/resources/lang/fr/admin/settings/general.php
@@ -28,7 +28,7 @@ return [
'auto_increment_prefix' => 'Préfixe (optionnel)',
'auto_incrementing_help' => 'Activez l\'auto-incrémentation des numéros d\'inventaire avant de sélectionner cette option',
'backups' => 'Sauvegardes',
- 'backups_help' => 'Create, download, and restore backups ',
+ 'backups_help' => 'Créer, télécharger et restaurer des sauvegardes ',
'backups_restoring' => 'Restaurer à partir d\'une sauvegarde',
'backups_upload' => 'Téléverser la sauvegarde',
'backups_path' => 'Les sauvegardes sont stockées dans :path
sur le serveur',
@@ -67,7 +67,7 @@ return [
'footer_text_help' => 'Ce texte apparaîtra dans le pied de page de droitre. Les liens sont autorisés en utilisant Github flavored markdown. Les sauts de ligne, les en-têtes, les images, etc. peuvent entraîner des résultats imprévisibles.',
'general_settings' => 'Configuration générale',
'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, tos, dashboard, privacy',
- 'general_settings_help' => 'Default EULA and more',
+ 'general_settings_help' => 'CLUF par défaut et plus encore',
'generate_backup' => 'Générer une sauvegarde',
'header_color' => 'Couleur de l\'en-tête',
'info' => 'Ces paramètres vous permettent de personnaliser certains aspects de votre installation.',
@@ -85,7 +85,7 @@ return [
'ldap_client_tls_key' => 'Clé TLS du client LDAP',
'ldap_login_test_help' => 'Entrez un nom d\'utilisateur et mot de passe LDAP valide depuis la base DN que vous avez spécifié ci-dessus afin de tester si votre configuration LDAP est correcte. VOUS DEVEZ D\'ABORD ENREGISTRER VOS PARAMÈTRES LDAP MIS À JOUR.',
'ldap_login_sync_help' => 'Ceci vérifie uniquement que LDAP se synchronise correctement. Si votre requête d\'authentification LDAP est incorrecte, les utilisateurs peuvent ne pas pouvoir se connecter. VOUS DEVEZ D\'ABORD ENREGISTRER VOS PARAMÈTRES LDAP MIS À JOUR.',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'Gestionnaire LDAP',
'ldap_server' => 'Serveur LDAP',
'ldap_server_help' => 'Ca devrait commencer par ldap:// (non crypté ou TLS) ou ldaps:// (SSL)',
'ldap_server_cert' => 'Validation du certificat SSL LDAP',
@@ -273,7 +273,7 @@ return [
'unique_serial_help_text' => 'Cocher cette case forcera une contrainte d\'unicité sur les identifiants d\'actif',
'zerofill_count' => 'Longueur des étiquettes de bien, incluant le remplissage de zéros',
'username_format_help' => 'Ce paramètre ne sera utilisé par le processus d\'importation que si un nom d\'utilisateur n\'est pas fourni et que nous devons générer un nom d\'utilisateur pour vous.',
- 'oauth_title' => 'OAuth API Settings',
+ 'oauth_title' => 'Paramètres de l\'API OAuth',
'oauth' => 'OAuth',
'oauth_help' => 'Paramètres du point de terminaison Oauth',
'asset_tag_title' => 'Mettre à jour les paramètres de numéro d\'inventaire',
@@ -287,7 +287,7 @@ return [
'general_title' => 'Gérer les paramètres généraux',
'mail_test' => 'Envoyer un message de test',
'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
- 'filter_by_keyword' => 'Filter by setting keyword',
+ 'filter_by_keyword' => 'Filtrer par mot clé',
'security' => 'Sécurité',
'security_title' => 'Gérer les paramètres de sécurité',
'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
diff --git a/resources/lang/fr/admin/settings/table.php b/resources/lang/fr/admin/settings/table.php
index 22db5c84ed..64bafce03f 100644
--- a/resources/lang/fr/admin/settings/table.php
+++ b/resources/lang/fr/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
- 'size' => 'Size',
+ 'created' => 'Créé',
+ 'size' => 'Taille',
);
diff --git a/resources/lang/fr/admin/users/general.php b/resources/lang/fr/admin/users/general.php
index 88531e7f6c..b69bfd7f31 100644
--- a/resources/lang/fr/admin/users/general.php
+++ b/resources/lang/fr/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Imprimer tout ceux assignés',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Logiciels associés avec :name',
'send_email_help' => 'Vous devez fournir une adresse e-mail pour que cet utilisateur puisse recevoir ses identifiants. Les envois d\'identifiants par email ne peuvent être faits que lors de la création de l\'utilisateur. Les mots de passe sont stockés dans un hachage à sens unique et ne peuvent pas être récupérés une fois enregistrés.',
'view_user' => 'Voir l\'utilisateur :name',
@@ -24,8 +26,8 @@ return [
'two_factor_admin_optin_help' => 'Vos paramètres administratifs actuels permettent une application sélective de l\'authentification à deux facteurs. ',
'two_factor_enrolled' => '2FA Device Enrolled ',
'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
+ 'user_deactivated' => 'L\'utilisateur ne peut pas se connecter',
+ 'user_activated' => 'L\'utilisateur peut se connecter',
'activation_status_warning' => 'Ne pas modifier le statut d\'activation',
'group_memberships_helpblock' => 'Seuls les super-administrateurs peuvent modifier la liste de membres d\'un groupe.',
'superadmin_permission_warning' => 'Seuls les super-administrateurs peuvent accorder un accès de super-administrateur à un utilisateur.',
@@ -33,10 +35,10 @@ return [
'remove_group_memberships' => 'Supprimer les appartenances de groupe',
'warning_deletion' => 'AVERTISSEMENT :',
'warning_deletion_information' => 'Vous êtes sur le point de supprimer les :count utilisateur(s) listé(s) ci-dessous. Les super-administrateurs sont surlignés en rouge.',
- 'update_user_asssets_status' => 'Mettre à jour tous les actifs pour ces utilisateurs à ce statut',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Soumettre toutes les propriétés associées à ces utilisateurs',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
+ 'remote_label' => 'Il s\'agit d\'un utilisateur distant',
+ 'remote' => 'Distant',
'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'not_remote_label' => 'Il ne s\'agit pas d\'un utilisateur distant',
];
diff --git a/resources/lang/fr/auth.php b/resources/lang/fr/auth.php
index db310aa1bb..93c2eabca7 100644
--- a/resources/lang/fr/auth.php
+++ b/resources/lang/fr/auth.php
@@ -14,7 +14,7 @@ return array(
*/
'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'password' => 'Le mot de passe fourni est incorrect.',
+ 'throttle' => 'Trop de tentatives de connexion. Veuillez réessayer à nouveau dans :seconds secondes.',
);
diff --git a/resources/lang/fr/general.php b/resources/lang/fr/general.php
index 7ac5876fea..02d7eedd25 100644
--- a/resources/lang/fr/general.php
+++ b/resources/lang/fr/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Créer',
'created' => 'Élément créé',
'created_asset' => 'Actif créé',
- 'created_at' => 'Créé le',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Enregistrement créé',
'updated_at' => 'Mise à jour à',
'currency' => '€', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Numéro d’employé',
'email_domain_help' => 'C\'est utilisé pour générer des adresses e-mail lors de l\'importation',
'error' => 'Erreur',
+ 'example' => 'Example: ',
'filastname_format' => 'Première lettre du prénom Nom de famille (jsmith@example.com)',
'firstname_lastname_format' => 'Prénom Nom de famille (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Prénom Nom (jane_smith@example.com)',
@@ -115,7 +117,7 @@ return [
'files' => 'Fichiers',
'file_name' => 'Fichier',
'file_type' => 'Type de fichier',
- 'filesize' => 'File Size',
+ 'filesize' => 'Taille de fichier',
'file_uploads' => 'Uploads de fichiers',
'file_upload' => 'Dépôt de fichiers',
'generate' => 'Générer',
@@ -240,7 +242,7 @@ return [
'state' => 'État',
'status_labels' => 'Étiquette de statut',
'status' => 'Statut',
- 'accept_eula' => 'Acceptance Agreement',
+ 'accept_eula' => 'Contrat de licence',
'supplier' => 'Fournisseur',
'suppliers' => 'Fournisseurs',
'sure_to_delete' => 'Êtes-vous sûr de vouloir supprimer ?',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Non déployable',
'unknown_admin' => 'Admin inconnu',
'username_format' => 'Format du nom d\'utilisateur',
+ 'username' => 'Username',
'update' => 'Actualiser',
'upload_filetypes_help' => 'Les types de fichiers autorisés sont png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf et rar. La taille maximale autorisée est :size.',
'uploaded' => 'Téléversement réussi',
@@ -354,7 +357,11 @@ return [
'checkout_tooltip' => 'Affecter cet élément',
'checkin_tooltip' => 'Désaffecter cet élément',
'checkout_user_tooltip' => 'Affecter cet élément à un utilisateur',
- 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
- 'maintenance_mode_title' => 'System Temporarily Unavailable',
+ 'maintenance_mode' => 'Le service est temporairement indisponible en raison d\'une mise à jour du système. Veuillez revenir plus tard.',
+ 'maintenance_mode_title' => 'Le système est temporairement indisponible',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/fr/passwords.php b/resources/lang/fr/passwords.php
index 16c5c276c8..25633b4581 100644
--- a/resources/lang/fr/passwords.php
+++ b/resources/lang/fr/passwords.php
@@ -1,6 +1,8 @@
'Succès : Si cette adresse de courriel existe dans notre système, un courrier électronique de récupération de mot de passe a été envoyé.',
- 'user' => 'Aucun utilisateur actif correspondant trouvé avec ce courriel.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/fr/reminders.php b/resources/lang/fr/reminders.php
index 5ed7858d6c..23fb4ca33e 100644
--- a/resources/lang/fr/reminders.php
+++ b/resources/lang/fr/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Les mots de passe doivent contenir six caractères et correspondre à la confirmation.",
-
"user" => "Le nom d'utilisateur ou l'e-mail est incorrect",
-
- "token" => "Ce jeton de réinitialisation est invalide.",
-
- "sent" => "Si votre adresse e-mail est trouvée, un rappel de mot de passe a été envoyé !",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php
index 7fda257cc9..c6b4d1050c 100644
--- a/resources/lang/fr/validation.php
+++ b/resources/lang/fr/validation.php
@@ -91,8 +91,13 @@ return [
'url' => 'Le format de cet-te :attribute est invalide.',
'unique_undeleted' => ':attribute doit être unique.',
'non_circular' => 'Le champ :attribute ne doit pas créer de référence circulaire.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
- 'numeric' => 'Value cannot be negative'
+ 'numeric' => 'La valeur ne peut pas être négative'
],
diff --git a/resources/lang/ga-IE/admin/custom_fields/general.php b/resources/lang/ga-IE/admin/custom_fields/general.php
index ac002cb5b9..9543707d3f 100644
--- a/resources/lang/ga-IE/admin/custom_fields/general.php
+++ b/resources/lang/ga-IE/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ga-IE/admin/custom_fields/message.php b/resources/lang/ga-IE/admin/custom_fields/message.php
index 98eeebcc6e..850d664ee9 100644
--- a/resources/lang/ga-IE/admin/custom_fields/message.php
+++ b/resources/lang/ga-IE/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ga-IE/admin/hardware/form.php b/resources/lang/ga-IE/admin/hardware/form.php
index c8c04f510e..955e858cc2 100644
--- a/resources/lang/ga-IE/admin/hardware/form.php
+++ b/resources/lang/ga-IE/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ga-IE/admin/users/general.php b/resources/lang/ga-IE/admin/users/general.php
index d2f6da012e..9b2efd2cf5 100644
--- a/resources/lang/ga-IE/admin/users/general.php
+++ b/resources/lang/ga-IE/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Logáil isteach deireanach',
'ldap_config_text' => 'Is féidir suímh chumraíochta LDAP a fháil Admin> Settings. Socrófar an suíomh roghnaithe (roghnach) do gach úsáideoir a allmhairítear.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Bogearraí Seiceáil amach chuig: ainm',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Féach Úsáideoir: ainm',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ga-IE/general.php b/resources/lang/ga-IE/general.php
index fcba97e683..d6c8f5e8ca 100644
--- a/resources/lang/ga-IE/general.php
+++ b/resources/lang/ga-IE/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Cruthaigh Nua',
'created' => 'Mír Cruthaithe',
'created_asset' => 'cruthaíodh sócmhainn',
- 'created_at' => 'Cruthaithe ag',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Nuashonraithe ag',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Úsáidtear é seo chun seoltaí ríomhphoist a ghiniúint nuair a allmhairítear iad',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'An Chéad Ainm Deiridh Tosaigh (jsmith@example.com)',
'firstname_lastname_format' => 'Ainm Ainm Chéad Ainm (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Neamh-imscartha',
'unknown_admin' => 'Riarachán Anaithnid',
'username_format' => 'Ainm Úsáideora Formáid',
+ 'username' => 'Username',
'update' => 'Nuashonrú',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uasluchtaithe',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ga-IE/passwords.php b/resources/lang/ga-IE/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/ga-IE/passwords.php
+++ b/resources/lang/ga-IE/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ga-IE/reminders.php b/resources/lang/ga-IE/reminders.php
index 718229999d..9d0ff361d8 100644
--- a/resources/lang/ga-IE/reminders.php
+++ b/resources/lang/ga-IE/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Ní mór go mbeadh sé carachtair ar na focail agus an dearbhú a mheaitseáil.",
-
"user" => "Tá ainm úsáideora nó seoladh ríomhphoist mícheart",
-
- "token" => "Tá an tocsa athshocrú focal faire seo neamhbhailí.",
-
- "sent" => "Má aimsíodh seoladh ríomhphoist meaitseála, cuireadh meabhrúchán phasfhocal isteach!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ga-IE/validation.php b/resources/lang/ga-IE/validation.php
index cd700d807c..aa20448a57 100644
--- a/resources/lang/ga-IE/validation.php
+++ b/resources/lang/ga-IE/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Tá an fhormáid tréithbhail neamhbhailí.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/he/admin/custom_fields/general.php b/resources/lang/he/admin/custom_fields/general.php
index 184ebaceb0..10d7ee48e1 100644
--- a/resources/lang/he/admin/custom_fields/general.php
+++ b/resources/lang/he/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'אופציונלי - בחר כדי להפוך לחובה',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'ערך זה חייב להיות ייחודי בכל הנכסים',
'unique' => 'ייחודי',
];
diff --git a/resources/lang/he/admin/custom_fields/message.php b/resources/lang/he/admin/custom_fields/message.php
index 57276c107e..db747048eb 100644
--- a/resources/lang/he/admin/custom_fields/message.php
+++ b/resources/lang/he/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/he/admin/hardware/form.php b/resources/lang/he/admin/hardware/form.php
index 7f9dadbe06..8c9c79e852 100644
--- a/resources/lang/he/admin/hardware/form.php
+++ b/resources/lang/he/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'הנכס הזה לא זמין. לא ניתן לספק ללקוח.',
'asset_deployable' => 'הנכס זמין. ניתן לשייך למיקום.',
'processing_spinner' => 'מעבד...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/he/admin/users/general.php b/resources/lang/he/admin/users/general.php
index de6c7b7657..588b633052 100644
--- a/resources/lang/he/admin/users/general.php
+++ b/resources/lang/he/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'כניסה אחרונה',
'ldap_config_text' => 'הגדרות תצורה של LDAP נמצאות \'מנהל\'> \'הגדרות\'. המיקום הנבחר (אופציונלי) ייקבע עבור כל המשתמשים המיובאים.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'התוכנה נבדקה אל: שם',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'הצג משתמש: שם',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'אזהרה:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/he/general.php b/resources/lang/he/general.php
index a3e76851e0..c1ebc07c29 100644
--- a/resources/lang/he/general.php
+++ b/resources/lang/he/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'צור חדש',
'created' => 'פריט נוצר',
'created_asset' => 'הנכס שנוצר',
- 'created_at' => 'נוצר ב',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'רשומה נוצרה',
'updated_at' => 'עודכן ב',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'מספר עובד',
'email_domain_help' => 'זה משמש ליצירת כתובות דוא"ל בעת ייבוא',
'error' => 'שגיאה',
+ 'example' => 'Example: ',
'filastname_format' => 'שם משפחה ראשוני ראשון (jsmith@example.com)',
'firstname_lastname_format' => 'שם משפחה של שם פרטי (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'שם פרטי שם משפחה (jane_smith@example.com)',
@@ -115,7 +117,7 @@ return [
'files' => 'קבצים',
'file_name' => 'קוֹבֶץ',
'file_type' => 'סוג קובץ',
- 'filesize' => 'File Size',
+ 'filesize' => 'גודל קובץ',
'file_uploads' => 'העלאות קבצים',
'file_upload' => 'טעינת קובץ',
'generate' => 'לִיצוֹר',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'לא ניתן לפריסה',
'unknown_admin' => 'מנהל לא ידוע',
'username_format' => 'פורמט שם משתמש',
+ 'username' => 'Username',
'update' => 'עדכון',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'הועלה',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/he/passwords.php b/resources/lang/he/passwords.php
index ddd26da44b..25633b4581 100644
--- a/resources/lang/he/passwords.php
+++ b/resources/lang/he/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'לא נמצע משתמש פעיל עם דוא״ל הזה.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/he/reminders.php b/resources/lang/he/reminders.php
index 7c21931a18..1f95e0f219 100644
--- a/resources/lang/he/reminders.php
+++ b/resources/lang/he/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "סיסמאות חייבות להיות שש תווים ולהתאים את האישור.",
-
"user" => "שם המשתמש או כתובת האימייל שגויים",
-
- "token" => "אסימון איפוס הסיסמה אינו חוקי.",
-
- "sent" => "אם נמצאה כתובת דוא\"ל תואמת, נשלחה תזכורת סיסמא!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/he/validation.php b/resources/lang/he/validation.php
index 89dedddaf9..179deab17a 100644
--- a/resources/lang/he/validation.php
+++ b/resources/lang/he/validation.php
@@ -91,8 +91,13 @@ return [
'url' => 'תבנית התכונה: אינה חוקית.',
'unique_undeleted' => 'השדה חייב מזהה יחודי.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
- 'numeric' => 'Value cannot be negative'
+ 'numeric' => 'הערך לא יכול להיות שלילי'
],
diff --git a/resources/lang/hr/admin/custom_fields/general.php b/resources/lang/hr/admin/custom_fields/general.php
index bdba078115..405491649b 100644
--- a/resources/lang/hr/admin/custom_fields/general.php
+++ b/resources/lang/hr/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/hr/admin/custom_fields/message.php b/resources/lang/hr/admin/custom_fields/message.php
index 69f4a3777e..55560eac0f 100644
--- a/resources/lang/hr/admin/custom_fields/message.php
+++ b/resources/lang/hr/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/hr/admin/hardware/form.php b/resources/lang/hr/admin/hardware/form.php
index b580e7150d..6ac3f63322 100644
--- a/resources/lang/hr/admin/hardware/form.php
+++ b/resources/lang/hr/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/hr/admin/users/general.php b/resources/lang/hr/admin/users/general.php
index 3828e0b87a..28eaae66ca 100644
--- a/resources/lang/hr/admin/users/general.php
+++ b/resources/lang/hr/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Zadnja prijava',
'ldap_config_text' => 'Postavke LDAP konfiguracije mogu se pronaći u Administrator> Postavke. Odabrana lokacija (opcionalno) bit će postavljena za sve uvezene korisnike.',
'print_assigned' => 'Ispiši sve dodijeljeno',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Softver je provjeren na: ime',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Prikaži korisnika: ime',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/hr/general.php b/resources/lang/hr/general.php
index 7432e2b954..d1d51e1be9 100644
--- a/resources/lang/hr/general.php
+++ b/resources/lang/hr/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Izradi novu',
'created' => 'Stavka je stvorena',
'created_asset' => 'stvorio imovinu',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Ažurirano u',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Ovo se koristi za generiranje e-adresa prilikom uvoza',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Prvo početno prezime (jsmith@example.com)',
'firstname_lastname_format' => 'Prezime prezime (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-razmjestiti',
'unknown_admin' => 'Nepoznati administrator',
'username_format' => 'Format korisničkog imena',
+ 'username' => 'Username',
'update' => 'Ažuriraj',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/hr/passwords.php b/resources/lang/hr/passwords.php
index 1d169e9c8f..25633b4581 100644
--- a/resources/lang/hr/passwords.php
+++ b/resources/lang/hr/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Nije pronađen niti jedan aktivni korisnik sa tim e-mailom.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/hr/reminders.php b/resources/lang/hr/reminders.php
index d0c15f75ef..4f9118ce2f 100644
--- a/resources/lang/hr/reminders.php
+++ b/resources/lang/hr/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Zaporke moraju imati šest znakova i odgovarati potvrdi.",
-
"user" => "Korisničko ime ili e-adresa nisu točni",
-
- "token" => "Token za resetiranje lozinke nije valjan.",
-
- "sent" => "Ako je pronađena odgovarajuća adresa e-pošte, podsjetnik za lozinku je poslan!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/hr/validation.php b/resources/lang/hr/validation.php
index 248fd5b50b..9c097f7688 100644
--- a/resources/lang/hr/validation.php
+++ b/resources/lang/hr/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Format atributa nije važeći.',
'unique_undeleted' => ':attribute mora biti jedinstven.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/hu/account/general.php b/resources/lang/hu/account/general.php
index 7fc060a849..6401c97f4b 100644
--- a/resources/lang/hu/account/general.php
+++ b/resources/lang/hu/account/general.php
@@ -1,12 +1,10 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
+ 'personal_api_keys' => 'Személyes API kulcsok',
+ 'api_key_warning' => 'API token generálásakor ügyeljen arra, hogy azt azonnal lemásolja, mivel a nem lesz látható újra.',
+ 'api_base_url' => 'Az API alap url címe a következő:',
'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'api_token_expiration_time' => 'Az API tokenek lejárati ideje:',
+ 'api_reference' => 'Kérjük, ellenőrizze a API referenciákat ahol konkrét API végpontokat és további API dokumentációt talál.',
);
diff --git a/resources/lang/hu/admin/custom_fields/general.php b/resources/lang/hu/admin/custom_fields/general.php
index 2ee46573f7..3468e59a43 100644
--- a/resources/lang/hu/admin/custom_fields/general.php
+++ b/resources/lang/hu/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Választható - kattintással kötelezővé tehető',
'reorder' => 'Újrarendezés',
'db_field' => 'Adatbázis mező',
- 'db_convert_warning' => 'FIGYELMEZTETÉS. Ez a mező az egyéni mezők táblában :db_column
néven szerepel, de :expected -nek kellene lennie.',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Ennek az értéknek minden eszköz esetében egyedinek kell lennie',
'unique' => 'Egyedi',
];
diff --git a/resources/lang/hu/admin/custom_fields/message.php b/resources/lang/hu/admin/custom_fields/message.php
index c59ad4ed95..78b7827f61 100644
--- a/resources/lang/hu/admin/custom_fields/message.php
+++ b/resources/lang/hu/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/hu/admin/hardware/form.php b/resources/lang/hu/admin/hardware/form.php
index 6649d8e5de..2bd7951969 100644
--- a/resources/lang/hu/admin/hardware/form.php
+++ b/resources/lang/hu/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'Az eszköz még nem kiadásra kész, még nem kiadható.',
'asset_deployable' => 'Az eszköz kiadásra kész, kiadható.',
'processing_spinner' => 'Feldolgozás...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/hu/admin/hardware/message.php b/resources/lang/hu/admin/hardware/message.php
index 4f33a717bb..549d3ef5df 100644
--- a/resources/lang/hu/admin/hardware/message.php
+++ b/resources/lang/hu/admin/hardware/message.php
@@ -16,7 +16,7 @@ return [
'error' => 'Az eszköz nem frissült, próbálkozzon újra',
'success' => 'Az eszköz sikeresen frissült.',
'nothing_updated' => 'Nem választottak ki mezőket, így semmi sem frissült.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => 'Egyetlen eszköz sem volt kiválasztva, így semmi sem frissült.',
],
'restore' => [
diff --git a/resources/lang/hu/admin/settings/general.php b/resources/lang/hu/admin/settings/general.php
index c8cb5eb141..eb01c985ed 100644
--- a/resources/lang/hu/admin/settings/general.php
+++ b/resources/lang/hu/admin/settings/general.php
@@ -28,7 +28,7 @@ return [
'auto_increment_prefix' => 'Előtag (opcionális)',
'auto_incrementing_help' => 'Először engedélyezze az eszközazonosítók automatikus növelését, hogy ezt beállítsa',
'backups' => 'Biztonsági mentések',
- 'backups_help' => 'Create, download, and restore backups ',
+ 'backups_help' => 'Biztonsági mentések létrehozása, letöltése és visszaállítása ',
'backups_restoring' => 'Visszaállítás biztonsági másolatból',
'backups_upload' => 'Biztonsági másolat feltöltése',
'backups_path' => 'A tárolt biztonsági másolatok a szerveren elérhetőek a :path
',
@@ -85,7 +85,7 @@ return [
'ldap_client_tls_key' => 'LDAP ügyféloldali TLS kulcs',
'ldap_login_test_help' => 'Adjon meg egy érvényes LDAP felhasználónevet és jelszót a fenti alapszintű DN-ből, hogy ellenőrizze, hogy az LDAP-bejelentkezés megfelelően van-e beállítva. EL KELL MENTENIE A MÓDOSÍTOTT LDAP BEÁLLÍTÁSOKAT ELŐBB.',
'ldap_login_sync_help' => 'Ez csak azt teszteli, hogy az LDAP helyesen szinkronizálható. Ha az LDAP hitelesítési lekérdezése nem megfelelő, a felhasználók még mindig nem tudnak bejelentkezni. EL KELL MENTENIE A MÓDOSÍTOTT LDAP BEÁLLÍTÁSOKAT ELŐBB.',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'LDAP-kezelő',
'ldap_server' => 'LDAP szerver',
'ldap_server_help' => 'Ezt az ldap: // (titkosítatlan vagy TLS) vagy az ldaps:',
'ldap_server_cert' => 'LDAP SSL tanúsítvány érvényesítés',
diff --git a/resources/lang/hu/admin/settings/table.php b/resources/lang/hu/admin/settings/table.php
index 22db5c84ed..91b8a69d60 100644
--- a/resources/lang/hu/admin/settings/table.php
+++ b/resources/lang/hu/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
- 'size' => 'Size',
+ 'created' => 'Létrehozva',
+ 'size' => 'Méret',
);
diff --git a/resources/lang/hu/admin/users/general.php b/resources/lang/hu/admin/users/general.php
index 466c0dbd28..dfa1e06a8d 100644
--- a/resources/lang/hu/admin/users/general.php
+++ b/resources/lang/hu/admin/users/general.php
@@ -17,15 +17,17 @@ return [
'last_login' => 'Utolsó bejelentkezés',
'ldap_config_text' => 'Az LDAP konfigurációs beállításai megtalálhatók az Adminisztrálás> Beállítások menüben. Az (opcionális) kiválasztott hely minden importált felhasználó számára be lesz állítva.',
'print_assigned' => 'Az összes hozzárendelt nyomtatása',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Szoftver ellenőrzése: név',
'send_email_help' => 'Meg kell adnod egy email címet ehhez a felhasználóhoz, hogy a hitelesítő adatok elküldve legyenek számára. Hitelesítő adatok csak a felhasználó készítésekor kerülnek elküldésre. A jelszavak hashelve kerülnek mentésre így nem lehet őket megszerezni miután elmentödtek.',
'view_user' => 'Felhasználó megtekintése: név',
'usercsv' => 'CSV fájl',
'two_factor_admin_optin_help' => 'A jelenlegi adminisztrációs beállításai lehetővé teszik a kétütemű hitelesítés szelektív végrehajtását.',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
+ 'two_factor_enrolled' => '2FA eszköz bejegyezve ',
+ 'two_factor_active' => '2FA Aktív ',
+ 'user_deactivated' => 'A felhasználó nem tud bejelentkezni',
+ 'user_activated' => 'A felhasználó be tud jelentkezni',
'activation_status_warning' => 'Ne változtassa meg az aktiválási státuszt',
'group_memberships_helpblock' => 'Csak a szuperadminok szerkeszthetik a csoporttagságokat.',
'superadmin_permission_warning' => 'Csak a szuperadminok adhatnak egy felhasználónak szuperadmin hozzáférést.',
@@ -33,10 +35,10 @@ return [
'remove_group_memberships' => 'Csoporttagságok eltávolítása',
'warning_deletion' => 'FIGYELMEZTETÉS:',
'warning_deletion_information' => 'Az alább felsorolt :count felhasználó(k) törlésére készülsz. A szuperadminok nevei pirossal vannak kiemelve.',
- 'update_user_asssets_status' => 'Frissítse ezen felhasználók összes eszközét erre az állapotra',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Ellenőrizze a felhasználókhoz kapcsolódó összes tulajdonságot',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'remote_label' => 'Ez egy távoli felhasználó',
+ 'remote' => 'Távoli',
+ 'remote_help' => 'Ez akkor lehet hasznos, ha olyan távoli felhasználókra kell szűrnie, akik soha vagy ritkán járnak be a fizikai helyszínekre.',
+ 'not_remote_label' => 'Ez nem egy távoli felhasználó',
];
diff --git a/resources/lang/hu/admin/users/table.php b/resources/lang/hu/admin/users/table.php
index 346b44195a..1e44e2b5b3 100644
--- a/resources/lang/hu/admin/users/table.php
+++ b/resources/lang/hu/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => 'E-mail cím',
'employee_num' => 'Munkavállaló száma',
'first_name' => 'Keresztnév',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => 'Válassza ki a felhasználóhoz hozzárendelni kívánt csoportot, és ne feledje, hogy a felhasználó a hozzá rendelt csoport jogosultságait veszi át. A csoportok kijelölésének megszüntetéséhez használja a ctrl+kattintást (vagy MacOS esetén a cmd+kattintást).',
'id' => 'Id',
'inherit' => 'Örököl',
'job' => 'Munka megnevezése',
diff --git a/resources/lang/hu/auth.php b/resources/lang/hu/auth.php
index db310aa1bb..e62bea6fa5 100644
--- a/resources/lang/hu/auth.php
+++ b/resources/lang/hu/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'Ezek a hitelesítő adatok nem egyeznek a nyilvántartásunkkal.',
+ 'password' => 'A megadott jelszó helytelen.',
+ 'throttle' => 'Túl sok bejelentkezési kísérlet. Kérjük, próbálkozzon újra :seconds másodperc múlva.',
);
diff --git a/resources/lang/hu/general.php b/resources/lang/hu/general.php
index 97b1458879..9695f9f006 100644
--- a/resources/lang/hu/general.php
+++ b/resources/lang/hu/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Új létrehozása',
'created' => 'Elem létrehozva',
'created_asset' => 'létrehozott eszköz',
- 'created_at' => 'Létrehozva',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Rekord létrehozva',
'updated_at' => 'Frissítve:',
'currency' => 'HUF', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Alkalmazott száma',
'email_domain_help' => 'Ezt az e-mail címek létrehozásához használják az importálás során',
'error' => 'Hiba',
+ 'example' => 'Example: ',
'filastname_format' => 'Első kezdeti keresztnév (jsmith@example.com)',
'firstname_lastname_format' => 'Utónév (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Keresztnév Vezetéknév (jakab_gipsz@example.com)',
@@ -115,7 +117,7 @@ return [
'files' => 'Fájlok',
'file_name' => 'Fájl',
'file_type' => 'Fájl típus',
- 'filesize' => 'File Size',
+ 'filesize' => 'Fájl mérete',
'file_uploads' => 'Fájlfeltöltések',
'file_upload' => 'Fájl feltöltése',
'generate' => 'Létrehoz',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Nem kiadható',
'unknown_admin' => 'Ismeretlen Admin',
'username_format' => 'Felhasználónév formátum',
+ 'username' => 'Username',
'update' => 'Frissités',
'upload_filetypes_help' => 'Az engedélyezett fájltípusok: png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf és rar. A feltöltés maximum mérete :size.',
'uploaded' => 'Feltöltve',
@@ -354,7 +357,11 @@ return [
'checkout_tooltip' => 'Adja ki ezt a cikket',
'checkin_tooltip' => 'Vegye vissza ezt a cikket',
'checkout_user_tooltip' => 'Adja ki ezt a cikket egy felhasználónak',
- 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
- 'maintenance_mode_title' => 'System Temporarily Unavailable',
- 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'maintenance_mode' => 'A szolgáltatás átmenetileg nem érhető el a rendszerfrissítések miatt. Kérjük, nézzen vissza később.',
+ 'maintenance_mode_title' => 'A rendszer átmenetileg nem elérhető',
+ 'ldap_import' => 'A felhasználói jelszót nem az LDAP-nak kell kezelnie. (Ez lehetővé teszi, hogy elfelejtett jelszóra vonatkozó kéréseket küldjön.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/hu/passwords.php b/resources/lang/hu/passwords.php
index 635d8d08a8..25633b4581 100644
--- a/resources/lang/hu/passwords.php
+++ b/resources/lang/hu/passwords.php
@@ -1,6 +1,8 @@
'Sikeres: Ha az email cím létezik a rendszerünkben, akkor a jelszó visszaállító emailt elküldtük.',
- 'user' => 'Nem található aktív felhasználó a megadott email címmel.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/hu/reminders.php b/resources/lang/hu/reminders.php
index 2757eadae2..eec2dd1121 100644
--- a/resources/lang/hu/reminders.php
+++ b/resources/lang/hu/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "A jelszónak 6 karakteresnek kell lennie és egyeznie kell a megerősítésével.",
-
"user" => "A felhasználónév vagy az e-mail cím téves",
-
- "token" => "Ez a jelszó visszaállítási kérelem érvénytelen.",
-
- "sent" => "Ha megfelelő az email cím, egy jelszó emlékeztetőt küldünk!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/hu/validation.php b/resources/lang/hu/validation.php
index 3a920d952f..8d02a9b40c 100644
--- a/resources/lang/hu/validation.php
+++ b/resources/lang/hu/validation.php
@@ -91,8 +91,13 @@ return [
'url' => 'Az :attribute formátuma érvénytelen.',
'unique_undeleted' => 'A(z) :attribute egyedinek kell lennie.',
'non_circular' => 'A(z) :attribute nem hozhat létre körkörös hivatkozást.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
- 'numeric' => 'Value cannot be negative'
+ 'numeric' => 'Az érték nem lehet negatív'
],
diff --git a/resources/lang/id/admin/custom_fields/general.php b/resources/lang/id/admin/custom_fields/general.php
index 555e161b55..377efaed49 100644
--- a/resources/lang/id/admin/custom_fields/general.php
+++ b/resources/lang/id/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Opsional - klik untuk ubah menjadi Diperlukan',
'reorder' => 'Susun ulang',
'db_field' => 'Field Database',
- 'db_convert_warning' => 'PERINGATAN. Field ini berada dalam tabel field kustom sebagai :db_colume
namun seharusnya :expected.',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Nilai ini harus unik di semua aset',
'unique' => 'Unik',
];
diff --git a/resources/lang/id/admin/custom_fields/message.php b/resources/lang/id/admin/custom_fields/message.php
index 5ad9eb4334..5a01e08c57 100644
--- a/resources/lang/id/admin/custom_fields/message.php
+++ b/resources/lang/id/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/id/admin/hardware/form.php b/resources/lang/id/admin/hardware/form.php
index 3e2d1a15ce..0a431b199e 100644
--- a/resources/lang/id/admin/hardware/form.php
+++ b/resources/lang/id/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/id/admin/users/general.php b/resources/lang/id/admin/users/general.php
index 02c6a79680..f033295772 100644
--- a/resources/lang/id/admin/users/general.php
+++ b/resources/lang/id/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Terakhir masuk',
'ldap_config_text' => 'Konfigurasi LDAP terdapat di Admin > Pengaturan. Jika lokasi di pilih, maka akan di impor untuk semua pengguna.',
'print_assigned' => 'Cetak Semua Ditugaskan',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Perangkat lunak pada :name',
'send_email_help' => 'Anda harus memberikan alamat email pengguna ini untuk mengirimkan kredensial kepada mereka. Pengiriman email kredensial hanya dapat dilakukan pada pembuatan user. Kata sandi disimpan dalam hash satu arah dan tidak dapat diambil setelah disimpan.',
'view_user' => 'Lihat pengguna: name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/id/general.php b/resources/lang/id/general.php
index 507f53ee61..82ff933908 100644
--- a/resources/lang/id/general.php
+++ b/resources/lang/id/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Buat baru',
'created' => 'Item dibuat',
'created_asset' => 'Buat aset',
- 'created_at' => 'Dibuat di',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Rekam Dibuat',
'updated_at' => 'Diperbarui pada',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Ini digunakan untuk untuk membuat email ketika melakukan proses import',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Inisial pertama - Nama belakang (jsmith@example.com)',
'firstname_lastname_format' => 'Nama depan - Nama belakang (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Nama Depan Nama Belakang (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Belum siap digunakan',
'unknown_admin' => 'Admin tidak diketahui',
'username_format' => 'Format pengguna',
+ 'username' => 'Username',
'update' => 'Memperbarui',
'upload_filetypes_help' => 'Jenis file yang diizinkan adalah png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf, dan rar. Ukuran unggahan maksimum yang diizinkan adalah :size.',
'uploaded' => 'Terunggah',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/id/passwords.php b/resources/lang/id/passwords.php
index 2794998fca..25633b4581 100644
--- a/resources/lang/id/passwords.php
+++ b/resources/lang/id/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Tidak ada satupun pengguna aktif yang menggunakan email ini.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/id/reminders.php b/resources/lang/id/reminders.php
index ec797a949b..4f692f2267 100644
--- a/resources/lang/id/reminders.php
+++ b/resources/lang/id/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Kata sandi harus 6 karakter dan sama.",
-
"user" => "Nama pengguna atau alamat email salah",
-
- "token" => "Password reset token tidak valid.",
-
- "sent" => "Jika alamat email yang cocok ditemukan, pengingat password telah dikirim!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/id/validation.php b/resources/lang/id/validation.php
index ba39748be4..039163abb2 100644
--- a/resources/lang/id/validation.php
+++ b/resources/lang/id/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Format :attribute tidak benar.',
'unique_undeleted' => ':attribute harus unik.',
'non_circular' => ':attribute tidak boleh membuat referensi melingkar.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/is/admin/custom_fields/general.php b/resources/lang/is/admin/custom_fields/general.php
index a0dae66b24..3aa9b78243 100644
--- a/resources/lang/is/admin/custom_fields/general.php
+++ b/resources/lang/is/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/is/admin/custom_fields/message.php b/resources/lang/is/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/is/admin/custom_fields/message.php
+++ b/resources/lang/is/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/is/admin/hardware/form.php b/resources/lang/is/admin/hardware/form.php
index 68b5e651ba..2e7e6baaf3 100644
--- a/resources/lang/is/admin/hardware/form.php
+++ b/resources/lang/is/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/is/admin/users/general.php b/resources/lang/is/admin/users/general.php
index e31a579cd3..40ac77a6a3 100644
--- a/resources/lang/is/admin/users/general.php
+++ b/resources/lang/is/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/is/general.php b/resources/lang/is/general.php
index 0c199625a5..d573d0f2ee 100644
--- a/resources/lang/is/general.php
+++ b/resources/lang/is/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Stofna nýtt',
'created' => 'Item Created',
'created_asset' => 'skráði eign',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Ónothæfar',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/is/passwords.php b/resources/lang/is/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/is/passwords.php
+++ b/resources/lang/is/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/is/reminders.php b/resources/lang/is/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/is/reminders.php
+++ b/resources/lang/is/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/is/validation.php b/resources/lang/is/validation.php
index 9f06e3eae9..964050246a 100644
--- a/resources/lang/is/validation.php
+++ b/resources/lang/is/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/it/account/general.php b/resources/lang/it/account/general.php
index 7fc060a849..fc9d48577d 100644
--- a/resources/lang/it/account/general.php
+++ b/resources/lang/it/account/general.php
@@ -1,12 +1,12 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
+ 'personal_api_keys' => 'Chiavi API Personali',
+ 'api_key_warning' => 'Quando si genera un token API, assicurati di copiarlo immediatamente perché
+ non potrai più visualizzarlo.',
+ 'api_base_url' => 'Il tuo URL di base API è:',
'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'api_token_expiration_time' => 'I token API scadranno fra:',
+ 'api_reference' => 'Controlla il riferimento API per
+ trovare gli endpoint API specifici e documentazione aggiuntiva.',
);
diff --git a/resources/lang/it/admin/companies/general.php b/resources/lang/it/admin/companies/general.php
index 30d4046dde..01668fec1a 100644
--- a/resources/lang/it/admin/companies/general.php
+++ b/resources/lang/it/admin/companies/general.php
@@ -2,6 +2,6 @@
return [
'select_company' => 'Seleziona Azienda',
- 'about_companies' => 'About Companies',
- 'about_companies_description' => ' You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+ 'about_companies' => 'Informazioni sulle aziende',
+ 'about_companies_description' => ' È possibile utilizzare le aziende come un semplice campo informativo, oppure puoi utilizzarle per limitare la visibilità e la disponibilità degli asset agli utenti di una specifica azienda abilitando il Supporto Aziendale Completo nelle impostazioni di amministrazione.',
];
diff --git a/resources/lang/it/admin/custom_fields/general.php b/resources/lang/it/admin/custom_fields/general.php
index 228c1ffe2d..23e12cb22f 100644
--- a/resources/lang/it/admin/custom_fields/general.php
+++ b/resources/lang/it/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Questo valore deve essere univoco per tutti i beni',
'unique' => 'Univoco',
];
diff --git a/resources/lang/it/admin/custom_fields/message.php b/resources/lang/it/admin/custom_fields/message.php
index 84c8a03306..a59215cfe0 100644
--- a/resources/lang/it/admin/custom_fields/message.php
+++ b/resources/lang/it/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/it/admin/hardware/form.php b/resources/lang/it/admin/hardware/form.php
index c20f58f899..92f1b87f51 100644
--- a/resources/lang/it/admin/hardware/form.php
+++ b/resources/lang/it/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'Lo stato del bene è "Non Assegnabile". Non puoi fare il check-out di questo bene.',
'asset_deployable' => 'Lo stato del bene è "Assegnabile". Puoi fare il check-out di questo bene.',
'processing_spinner' => 'Elaborazione...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/it/admin/hardware/message.php b/resources/lang/it/admin/hardware/message.php
index bc9edfcd2b..1600d5ac90 100644
--- a/resources/lang/it/admin/hardware/message.php
+++ b/resources/lang/it/admin/hardware/message.php
@@ -17,7 +17,7 @@ return [
'error' => 'Il bene non è stato aggiornato, si prega di riprovare',
'success' => 'Bene aggiornato con successo.',
'nothing_updated' => 'Non è stato selezionato nessun campo, nulla è stato aggiornato.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => 'Nessun asset è stato selezionato, quindi niente è stato eliminato.',
],
'restore' => [
diff --git a/resources/lang/it/admin/licenses/form.php b/resources/lang/it/admin/licenses/form.php
index c25c85f6e4..945dba8ca2 100644
--- a/resources/lang/it/admin/licenses/form.php
+++ b/resources/lang/it/admin/licenses/form.php
@@ -3,7 +3,7 @@
return array(
'asset' => 'Bene',
- 'checkin' => 'Carica',
+ 'checkin' => 'Disassegnare',
'create' => 'Crea Licenza',
'expiration' => 'Data di scadenza',
'license_key' => 'Chiave licenza',
diff --git a/resources/lang/it/admin/settings/general.php b/resources/lang/it/admin/settings/general.php
index adefba018f..7e65102f78 100644
--- a/resources/lang/it/admin/settings/general.php
+++ b/resources/lang/it/admin/settings/general.php
@@ -28,7 +28,7 @@ return [
'auto_increment_prefix' => 'Prefisso (Opzionale)',
'auto_incrementing_help' => 'Attiva i tag beni ad incremento automatico per impostarlo',
'backups' => 'Backups',
- 'backups_help' => 'Create, download, and restore backups ',
+ 'backups_help' => 'Crea, scarica e ripristina i backup ',
'backups_restoring' => 'Ripristino da backup',
'backups_upload' => 'Carica Backup',
'backups_path' => 'I backup sul server sono memorizzati in :path
',
@@ -85,7 +85,7 @@ return [
'ldap_client_tls_key' => 'Chiave TLS client LDAP',
'ldap_login_test_help' => 'Immettere un nome utente e una password LDAP validi dal DN di base specificato in precedenza per verificare se il login LDAP è configurato correttamente. DEVI SALVARE LE IMPOSTAZIONI LDAP AGGIORNATE PRIMA.',
'ldap_login_sync_help' => 'Questo verifica solamente che LDAP possa sincronizzare correttamente. Se la tua query di autenticazione LDAP non è corretta, gli utenti potrebbero non essere ancora in grado di accedere. DEVI SALVARE LE IMPOSTAZIONI LDAP PRIMA DI EFFETTUARE QUESTO TEST.',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'Manager LDAP',
'ldap_server' => 'Server LDAP',
'ldap_server_help' => 'Questo dovrebbe iniziare con ldap: // (per unencrypted o TLS) o ldaps: // (per SSL)',
'ldap_server_cert' => 'Validazione certificato SSL di LDAP',
diff --git a/resources/lang/it/admin/settings/table.php b/resources/lang/it/admin/settings/table.php
index 22db5c84ed..4738557162 100644
--- a/resources/lang/it/admin/settings/table.php
+++ b/resources/lang/it/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
- 'size' => 'Size',
+ 'created' => 'Creato',
+ 'size' => 'Dimensione',
);
diff --git a/resources/lang/it/admin/users/general.php b/resources/lang/it/admin/users/general.php
index 0abf66e611..655f58b26d 100644
--- a/resources/lang/it/admin/users/general.php
+++ b/resources/lang/it/admin/users/general.php
@@ -17,15 +17,17 @@ return [
'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.',
'print_assigned' => 'Stampa tutti assegnati',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software estratto a :name',
'send_email_help' => 'Devi fornire un indirizzo email all\'utente per inviare loro le credenziali. L\'inoltro delle credenziali via email avviene solo durante la creazione dell\'utente. La password è memorizzata in un hash unidirezionale e non può essere recuperata, una volta salvata.',
'view_user' => 'Visualizza Utente :name',
'usercsv' => 'CSV file',
'two_factor_admin_optin_help' => 'Le impostazioni correnti di amministratore consentono l\'esecuzione selettiva dell\'autenticazione a due fattori.',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
+ 'two_factor_enrolled' => 'Dispositivo 2FA Iscritto ',
+ 'two_factor_active' => '2FA attivo ',
+ 'user_deactivated' => 'L\'utente non può loggarsi',
+ 'user_activated' => 'L\'utente può loggarsi',
'activation_status_warning' => 'Non cambiare lo stato di attivazione',
'group_memberships_helpblock' => 'Solo i superamministratori possono modificare i membri del gruppo.',
'superadmin_permission_warning' => 'Solo i superamministratori possono concedere il permesso di superamministratore a un altro utente.',
@@ -33,10 +35,10 @@ return [
'remove_group_memberships' => 'Rimuove Membri del Gruppo',
'warning_deletion' => 'ATTENZIONE:',
'warning_deletion_information' => 'Stai per eliminare :count utenti listati qui sotto. I superamministratori sono evidenziati in rosso.',
- 'update_user_asssets_status' => 'Aggiorna tutti i beni per questi utenti a questo stato',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Esegui il check-in di tutte le proprietà associate a questi utenti',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'remote_label' => 'Questo è un utente remoto',
+ 'remote' => 'Remoto',
+ 'remote_help' => 'Questo può esserti utile se devi filtrare gli utenti remoti che non entrano mai o solo raramente nelle tue posizioni fisiche.',
+ 'not_remote_label' => 'Questo non è un utente remoto',
];
diff --git a/resources/lang/it/admin/users/table.php b/resources/lang/it/admin/users/table.php
index 8dc9a324a8..c442b12df8 100644
--- a/resources/lang/it/admin/users/table.php
+++ b/resources/lang/it/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => 'Email',
'employee_num' => 'Num. Dipendenti',
'first_name' => 'Nome',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => 'Seleziona un gruppo da assegnare all\'utente, ricorda che un utente eredita i permessi del gruppo assegnatogli. Usa ctrl+click (o cmd+click su MacOS) per deselezionare i gruppi.',
'id' => 'ID',
'inherit' => 'Eredita',
'job' => 'Professione',
diff --git a/resources/lang/it/auth.php b/resources/lang/it/auth.php
index db310aa1bb..15bca5fe03 100644
--- a/resources/lang/it/auth.php
+++ b/resources/lang/it/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'Credenziali non corrispondenti ai dati registrati.',
+ 'password' => 'La password fornita non è corretta.',
+ 'throttle' => 'Troppi tentativi di accesso. Riprova tra :seconds secondi.',
);
diff --git a/resources/lang/it/general.php b/resources/lang/it/general.php
index a3a054310c..c2897af328 100644
--- a/resources/lang/it/general.php
+++ b/resources/lang/it/general.php
@@ -37,7 +37,7 @@ return [
'bulk_edit' => 'Modifica in blocco',
'bulk_delete' => 'Elimina quantità',
'bulk_actions' => 'Gruppo di azioni',
- 'bulk_checkin_delete' => 'Bulk Checkin & Delete',
+ 'bulk_checkin_delete' => 'Registrazione di massa & Elimina',
'bystatus' => 'in base allo stato',
'cancel' => 'annulla',
'categories' => 'Categorie',
@@ -47,7 +47,7 @@ return [
'changepassword' => 'Modifica password',
'checkin' => 'Carica',
'checkin_from' => 'Carica da',
- 'checkout' => 'Scarica',
+ 'checkout' => 'Assegna',
'checkouts_count' => 'Ritiri',
'checkins_count' => 'Consegne',
'user_requests_count' => 'Richieste',
@@ -65,7 +65,8 @@ return [
'create' => 'Crea',
'created' => 'Articolo creato',
'created_asset' => 'Asset creato',
- 'created_at' => 'Creato il',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record creato',
'updated_at' => 'Aggiornato a',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Numero Dipendente',
'email_domain_help' => 'Questo viene utilizzato per generare indirizzi e-mail durante l\'importazione',
'error' => 'Errore',
+ 'example' => 'Example: ',
'filastname_format' => 'Prima cognome iniziale (jsmith@example.com)',
'firstname_lastname_format' => 'Nome cognome (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Nome cognome (jane.smith@example.com)',
@@ -115,7 +117,7 @@ return [
'files' => 'Files',
'file_name' => 'File',
'file_type' => 'Tipo di file',
- 'filesize' => 'File Size',
+ 'filesize' => 'Dimensione File',
'file_uploads' => 'Carica i file',
'file_upload' => 'Caricamento file',
'generate' => 'Genera',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Non consegnabile',
'unknown_admin' => 'Amministratore sconosciuto',
'username_format' => 'Formato di nome utente',
+ 'username' => 'Username',
'update' => 'Aggiorna',
'upload_filetypes_help' => 'I tipi di file permessi sono png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip, e rar. La dimensione massima di upload è di :size.',
'uploaded' => 'Caricato',
@@ -319,13 +322,13 @@ return [
'managed_ldap' => '(Gestito tramite LDAP)',
'export' => 'Esportazione',
'ldap_sync' => 'Sincronizzazione LDAP',
- 'ldap_user_sync' => 'LDAP User Sync',
- 'synchronize' => 'Synchronize',
- 'sync_results' => 'Synchronization Results',
- 'license_serial' => 'Serial/Product Key',
- 'invalid_category' => 'Invalid category',
- 'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.',
- '60_percent_warning' => '60% Complete (warning)',
+ 'ldap_user_sync' => 'Sincronizzazione Utente LDAP',
+ 'synchronize' => 'Sincronizza',
+ 'sync_results' => 'Risultati Sincronizzazione',
+ 'license_serial' => 'Codice Seriale/Prodotto',
+ 'invalid_category' => 'Categoria non valida',
+ 'dashboard_info' => 'Questa è la tua dashboard. Ce ne sono tante, ma questa è solo tua.',
+ '60_percent_warning' => 'Completo al 60% (Avvertimento)',
'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
'new_asset' => 'New Asset',
'new_license' => 'New License',
@@ -354,7 +357,11 @@ return [
'checkout_tooltip' => 'Check this item out',
'checkin_tooltip' => 'Check this item in',
'checkout_user_tooltip' => 'Check this item out to a user',
- 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
- 'maintenance_mode_title' => 'System Temporarily Unavailable',
- 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'maintenance_mode' => 'Servizio temporaneamente non disponibile per aggiornamenti. Si prega di riprovare più tardi.',
+ 'maintenance_mode_title' => 'Sistema Temporaneamente Non Disponibile',
+ 'ldap_import' => 'La password dell\'utente non deve essere gestita da LDAP. (Consente di inviare le richieste di password dimenticate.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/it/passwords.php b/resources/lang/it/passwords.php
index 79c06eb092..25633b4581 100644
--- a/resources/lang/it/passwords.php
+++ b/resources/lang/it/passwords.php
@@ -1,6 +1,8 @@
'Successo: Se l\'indirizzo email esiste nel sistema, riceverà un\'email di recupero password.',
- 'user' => 'Non risulta nessun utente attivo con questa email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/it/reminders.php b/resources/lang/it/reminders.php
index d7d4c2ce97..b2c5cb9f65 100644
--- a/resources/lang/it/reminders.php
+++ b/resources/lang/it/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Le passwords devono essere almeno di 6 caratteri e uguali alla conferma.",
-
"user" => "Nome utente o indirizzo email non corretto",
-
- "token" => "Il token di reset password è invalido.",
-
- "sent" => "Se email è presente nel nostro database, la email di verifica sarà inviata!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/it/validation.php b/resources/lang/it/validation.php
index 2f4b1eccdd..afa468eae5 100644
--- a/resources/lang/it/validation.php
+++ b/resources/lang/it/validation.php
@@ -91,8 +91,13 @@ return [
'url' => 'Il formato dell\' :attribute è invalido.',
'unique_undeleted' => 'L\'attributo deve essere univoco.',
'non_circular' => ':attribute non deve creare un riferimento circolare.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
- 'numeric' => 'Value cannot be negative'
+ 'numeric' => 'Il valore non può essere negativo'
],
diff --git a/resources/lang/iu/admin/custom_fields/general.php b/resources/lang/iu/admin/custom_fields/general.php
index 4c7442b2d5..7434117830 100644
--- a/resources/lang/iu/admin/custom_fields/general.php
+++ b/resources/lang/iu/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/iu/admin/custom_fields/message.php b/resources/lang/iu/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/iu/admin/custom_fields/message.php
+++ b/resources/lang/iu/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/iu/admin/hardware/form.php b/resources/lang/iu/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/iu/admin/hardware/form.php
+++ b/resources/lang/iu/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/iu/admin/users/general.php b/resources/lang/iu/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/iu/admin/users/general.php
+++ b/resources/lang/iu/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/iu/general.php b/resources/lang/iu/general.php
index 5d67d5d673..c4d2798035 100644
--- a/resources/lang/iu/general.php
+++ b/resources/lang/iu/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Create New',
'created' => 'Item Created',
'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/iu/passwords.php b/resources/lang/iu/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/iu/passwords.php
+++ b/resources/lang/iu/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/iu/reminders.php b/resources/lang/iu/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/iu/reminders.php
+++ b/resources/lang/iu/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/iu/validation.php b/resources/lang/iu/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/iu/validation.php
+++ b/resources/lang/iu/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ja/account/general.php b/resources/lang/ja/account/general.php
index 7fc060a849..d991372f1c 100644
--- a/resources/lang/ja/account/general.php
+++ b/resources/lang/ja/account/general.php
@@ -1,12 +1,10 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
- 'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'personal_api_keys' => '個人用APIキー',
+ 'api_key_warning' => 'APIトークンを生成した場合、二度と表示されないので必ずすぐにコピーしてください。',
+ 'api_base_url' => 'APIベースURLは以下の場所です:',
+ 'api_base_url_endpoint' => '/<エンドポイント>',
+ 'api_token_expiration_time' => 'APIトークンの有効期限:',
+ 'api_reference' => 'API リファレンス を確認して、特定のAPI エンドポイントと追加のAPIドキュメントを見つけてください。',
);
diff --git a/resources/lang/ja/admin/companies/general.php b/resources/lang/ja/admin/companies/general.php
index 8d08a2af25..498d02c517 100644
--- a/resources/lang/ja/admin/companies/general.php
+++ b/resources/lang/ja/admin/companies/general.php
@@ -2,6 +2,6 @@
return [
'select_company' => '所属を選択',
- 'about_companies' => 'About Companies',
- 'about_companies_description' => ' You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+ 'about_companies' => '企業について',
+ 'about_companies_description' => ' 会社は、単純な情報提供フィールドとして使用することもできますが、管理者設定で "複数企業をサポート" を有効にすることで、資産の可視性と利用を特定の会社を持つユーザーに制限するために使用することができます。',
];
diff --git a/resources/lang/ja/admin/custom_fields/general.php b/resources/lang/ja/admin/custom_fields/general.php
index 17c7b82f34..33ab84b492 100644
--- a/resources/lang/ja/admin/custom_fields/general.php
+++ b/resources/lang/ja/admin/custom_fields/general.php
@@ -2,11 +2,11 @@
return [
'custom_fields' => 'カスタムフィールド',
- 'manage' => 'Manage',
+ 'manage' => '管理',
'field' => 'フィールド',
'about_fieldsets_title' => 'フィールドセットについて',
- 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
- 'custom_format' => 'Custom Regex format...',
+ 'about_fieldsets_text' => 'フィールドセットでは、特定の資産モデルタイプで頻繁に再利用されるカスタムフィールドのグループを作成することができます。',
+ 'custom_format' => 'カスタム正規表現形式…',
'encrypt_field' => 'このフィールドの値をデータベースにて暗号化する',
'encrypt_field_help' => '警告: 暗号化フィールドは検索することができなくなります。',
'encrypted' => '暗号化',
@@ -27,21 +27,21 @@ return [
'used_by_models' => '型番で使用',
'order' => '順番',
'create_fieldset' => '新しいフィールドセット',
- 'create_fieldset_title' => 'Create a new fieldset',
+ 'create_fieldset_title' => '新しいフィールドセットを作成',
'create_field' => '新しいユーザー設定フィールド',
- 'create_field_title' => 'Create a new custom field',
+ 'create_field_title' => '新しいカスタムフィールドを作成',
'value_encrypted' => 'このフィールドの値は、データベースで暗号化されます。管理者ユーザーのみが復号化された値を表示することができます。',
'show_in_email' => 'このフィールドの値を、ユーザーに送信されるチェックアウト メールに含めますか?(暗号化されたフィールドの値はメールに含めることはできません。)',
- 'help_text' => 'Help Text',
- 'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
- 'about_custom_fields_title' => 'About Custom Fields',
- 'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
- 'add_field_to_fieldset' => 'Add Field to Fieldset',
- 'make_optional' => 'Required - click to make optional',
- 'make_required' => 'Optional - click to make required',
- 'reorder' => 'Reorder',
- 'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
- 'is_unique' => 'This value must be unique across all assets',
- 'unique' => 'Unique',
+ 'help_text' => 'ヘルプ テキスト',
+ 'help_text_description' => 'このテキストは、資産の編集中にフォーム要素の下に表示されるオプションのテキストです。',
+ 'about_custom_fields_title' => 'カスタムフィールドについて',
+ 'about_custom_fields_text' => 'カスタムフィールドでは、任意の属性を資産に追加できます。',
+ 'add_field_to_fieldset' => 'フィールドセットにフィールドを追加',
+ 'make_optional' => '必須 - クリックでオプションに変更',
+ 'make_required' => 'オプション - クリックで必須にします',
+ 'reorder' => '並べ替え',
+ 'db_field' => 'DBフィールド',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
+ 'is_unique' => 'この値はすべての資産で一意である必要があります',
+ 'unique' => '一意',
];
diff --git a/resources/lang/ja/admin/custom_fields/message.php b/resources/lang/ja/admin/custom_fields/message.php
index 2a8d01bcd0..5d145cd836 100644
--- a/resources/lang/ja/admin/custom_fields/message.php
+++ b/resources/lang/ja/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ja/admin/depreciations/general.php b/resources/lang/ja/admin/depreciations/general.php
index db061b398f..97da95fac3 100644
--- a/resources/lang/ja/admin/depreciations/general.php
+++ b/resources/lang/ja/admin/depreciations/general.php
@@ -6,11 +6,11 @@ return [
'asset_depreciations' => '償却資産',
'create' => '減価償却の作成',
'depreciation_name' => '減価償却名',
- 'depreciation_min' => 'Floor Value of Depreciation',
+ 'depreciation_min' => '減価償却の残存簿価',
'number_of_months' => '月数',
'update' => '減価償却の更新',
'depreciation_min' => '残存簿価',
- 'no_depreciations_warning' => 'Warning:
- You do not currently have any depreciations set up.
- Please set up at least one depreciation to view the depreciation report.',
+ 'no_depreciations_warning' => '警告:
+ 現在、減価償却が設定されていません。
+ 減価償却レポートを表示するには、少なくとも1つの減価償却を設定してください。',
];
diff --git a/resources/lang/ja/admin/depreciations/table.php b/resources/lang/ja/admin/depreciations/table.php
index d1a84300ab..411bd44da5 100644
--- a/resources/lang/ja/admin/depreciations/table.php
+++ b/resources/lang/ja/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
'months' => '月',
'term' => '期間',
'title' => '名前 ',
- 'depreciation_min' => 'Floor Value',
+ 'depreciation_min' => '残存簿価',
];
diff --git a/resources/lang/ja/admin/groups/titles.php b/resources/lang/ja/admin/groups/titles.php
index f2dbb9087a..0761ccd78a 100644
--- a/resources/lang/ja/admin/groups/titles.php
+++ b/resources/lang/ja/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
'group_admin' => 'グループ管理',
'allow' => '許可',
'deny' => '拒否',
- 'permission' => 'Permission',
- 'grant' => 'Grant',
- 'no_permissions' => 'This group has no permissions.'
+ 'permission' => '権限',
+ 'grant' => '付与',
+ 'no_permissions' => 'このグループには権限がありません。'
];
diff --git a/resources/lang/ja/admin/hardware/form.php b/resources/lang/ja/admin/hardware/form.php
index e7c9597bef..33683051bf 100644
--- a/resources/lang/ja/admin/hardware/form.php
+++ b/resources/lang/ja/admin/hardware/form.php
@@ -40,10 +40,12 @@ return [
'warranty' => '保証',
'warranty_expires' => '保証期限',
'years' => '年',
- 'asset_location' => 'Update Asset Location',
- 'asset_location_update_default_current' => 'Update default location AND actual location',
- 'asset_location_update_default' => 'Update only default location',
- 'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
- 'asset_deployable' => 'That status is deployable. This asset can be checked out.',
- 'processing_spinner' => 'Processing...',
+ 'asset_location' => '資産の場所を更新',
+ 'asset_location_update_default_current' => '既定の場所と実際の場所を更新',
+ 'asset_location_update_default' => 'デフォルトの場所のみ更新',
+ 'asset_not_deployable' => 'その資産ステータスは配備可能ではありません。この資産はチェックアウトできません。',
+ 'asset_deployable' => 'その資産ステータスは配備可能です。この資産はチェックアウトできます。',
+ 'processing_spinner' => '処理中…',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ja/admin/hardware/general.php b/resources/lang/ja/admin/hardware/general.php
index 8d61aec286..c7137222af 100644
--- a/resources/lang/ja/admin/hardware/general.php
+++ b/resources/lang/ja/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
'archived' => 'アーカイブ',
'asset' => '資産',
'bulk_checkout' => '一括チェックアウト',
- 'bulk_checkin' => 'Checkin Assets',
+ 'bulk_checkin' => '資産をチェックイン',
'checkin' => '資産をチェックイン',
'checkout' => '資産をチェックアウト',
'clone' => '資産を複製',
@@ -16,29 +16,29 @@ return [
'model_deleted' => 'この資産モデルは削除されました。資産を復元する前に、モデルを復元する必要があります。',
'requestable' => '要求可能',
'requested' => '要求済',
- 'not_requestable' => 'Not Requestable',
- 'requestable_status_warning' => 'Do not change requestable status',
+ 'not_requestable' => '要求可能ではありません',
+ 'requestable_status_warning' => '要求可能な状態を変更しないでください',
'restore' => '資産を復元',
'pending' => 'ペンディング',
'undeployable' => '配備不可',
'view' => '資産を表示',
- 'csv_error' => 'You have an error in your CSV file:',
+ 'csv_error' => 'CSVファイルにエラーがあります:',
'import_text' => '
- - Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. +
+ 資産履歴を含むCSVをアップロードしてください。 資産とユーザーは必ずシステムに存在しなければなりません。 履歴インポートのための資産の照合は、資産タグに対して行われます。入力されたユーザー名と、以下で選択された条件に基づいて、一致するユーザーを見つけようとします。 以下の条件を選択しない場合は、管理者設定で設定したユーザー名のフォーマットで一致しようとします。
-Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.
+CSVに含まれるフィールドは、ヘッダーと一致する必要があります: Asset Tag, Name, Checkout Date, Checkin Date. その他の項目は無視されます。
-Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.
+チェックイン日: 空白または将来のチェックイン日は、関連するユーザーのアイテムをチェックアウトします。 チェックイン日の列を除外すると、今日の日付でチェックイン日が作成されます。
', - 'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format', - 'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format', - 'csv_import_match_first' => 'Try to match users by first name (jane) format', - 'csv_import_match_email' => 'Try to match users by email as username', - 'csv_import_match_username' => 'Try to match users by username', - 'error_messages' => 'Error messages:', - 'success_messages' => 'Success messages:', - 'alert_details' => 'Please see below for details.', - 'custom_export' => 'Custom Export' + 'csv_import_match_f-l' => 'firstname.lastname (jane.smith) 形式でユーザーを一致させてみてください', + 'csv_import_match_initial_last' => 'first initial last name (jsmith) 形式でユーザーを一致させてみてください', + 'csv_import_match_first' => 'first name (jane) 形式でユーザーを一致させてみてください', + 'csv_import_match_email' => 'ユーザー名をメールで一致させてみてください', + 'csv_import_match_username' => 'ユーザー名を一致させてみてください', + 'error_messages' => 'エラーメッセージ:', + 'success_messages' => '成功メッセージ:', + 'alert_details' => '詳細は以下を確認してください。', + 'custom_export' => 'カスタムエクスポート' ]; diff --git a/resources/lang/ja/admin/hardware/message.php b/resources/lang/ja/admin/hardware/message.php index 3bdd0d534b..2cb1e6ef27 100644 --- a/resources/lang/ja/admin/hardware/message.php +++ b/resources/lang/ja/admin/hardware/message.php @@ -5,7 +5,7 @@ return [ 'undeployable' => '警告:この資産は、現在 未配備としてマークされています。 この状態が変更された場合は、資産のステータスを更新してください。', 'does_not_exist' => '資産が存在しません。', - 'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.', + 'does_not_exist_or_not_requestable' => 'その資産は存在しないか要求可能ではありません。', 'assoc_users' => 'この資産は利用者にチェックされているため削除できません。資産をチェック後、もう一度、やり直して下さい。 ', 'create' => [ @@ -17,7 +17,7 @@ return [ 'error' => '資産は更新されませんでした。もう一度、やり直して下さい。', 'success' => '資産は正常に更新されました。', 'nothing_updated' => 'フィールドが選択されていないため、更新されませんでした。', - 'no_assets_selected' => 'No assets were selected, so nothing was updated.', + 'no_assets_selected' => '資産が選択されていないため、何も更新されませんでした。', ], 'restore' => [ diff --git a/resources/lang/ja/admin/hardware/table.php b/resources/lang/ja/admin/hardware/table.php index 6cd6592d6f..43e8636fdf 100644 --- a/resources/lang/ja/admin/hardware/table.php +++ b/resources/lang/ja/admin/hardware/table.php @@ -4,11 +4,11 @@ return [ 'asset_tag' => '資産タグ', 'asset_model' => 'モデル', - 'book_value' => 'Current Value', + 'book_value' => '現在の値', 'change' => 'In/Out', 'checkout_date' => '検査日', 'checkoutto' => '検査済', - 'current_value' => 'Current Value', + 'current_value' => '現在の値', 'diff' => '差分', 'dl_csv' => 'CSVダウンロード', 'eol' => 'EOL', @@ -22,9 +22,9 @@ return [ 'image' => '写真', 'days_without_acceptance' => '未受理期間', 'monthly_depreciation' => '毎月の減価償却費(減価償却費)', - 'assigned_to' => 'Assigned To', - 'requesting_user' => 'Requesting User', - 'requested_date' => 'Requested Date', - 'changed' => 'Changed', - 'icon' => 'Icon', + 'assigned_to' => '割り当て先', + 'requesting_user' => '要求ユーザー', + 'requested_date' => '要求日', + 'changed' => '変更済み', + 'icon' => 'アイコン', ]; diff --git a/resources/lang/ja/admin/kits/general.php b/resources/lang/ja/admin/kits/general.php index ff38ab7145..b9dc282b98 100644 --- a/resources/lang/ja/admin/kits/general.php +++ b/resources/lang/ja/admin/kits/general.php @@ -13,38 +13,38 @@ return [ 'none_licenses' => ':licenseをチェックアウトするのに十分なシートがありません。:qtyが必要です。 ', 'none_consumables' => ':consumableをチェックアウトするのに十分な数がありません。:qtyが必要です。 ', 'none_accessory' => ':accessoryをチェックアウトするのに十分な数がありません。:qtyが必要です。 ', - 'append_accessory' => 'Append Accessory', - 'update_appended_accessory' => 'Update appended Accessory', - 'append_consumable' => 'Append Consumable', - 'update_appended_consumable' => 'Update appended Consumable', - 'append_license' => 'Append license', - 'update_appended_license' => 'Update appended license', - 'append_model' => 'Append model', - 'update_appended_model' => 'Update appended model', - 'license_error' => 'License already attached to kit', - 'license_added_success' => 'License added successfully', - 'license_updated' => 'License was successfully updated', - 'license_none' => 'License does not exist', - 'license_detached' => 'License was successfully detached', - 'consumable_added_success' => 'Consumable added successfully', - 'consumable_updated' => 'Consumable was successfully updated', - 'consumable_error' => 'Consumable already attached to kit', - 'consumable_deleted' => 'Delete was successful', - 'consumable_none' => 'Consumable does not exist', - 'consumable_detached' => 'Consumable was successfully detached', - 'accessory_added_success' => 'Accessory added successfully', - 'accessory_updated' => 'Accessory was successfully updated', - 'accessory_detached' => 'Accessory was successfully detached', - 'accessory_error' => 'Accessory already attached to kit', - 'accessory_deleted' => 'Delete was successful', - 'accessory_none' => 'Accessory does not exist', - 'checkout_success' => 'Checkout was successful', - 'checkout_error' => 'Checkout error', - 'kit_none' => 'Kit does not exist', - 'kit_created' => 'Kit was successfully created', - 'kit_updated' => 'Kit was successfully updated', - 'kit_not_found' => 'Kit not found', - 'kit_deleted' => 'Kit was successfully deleted', - 'kit_model_updated' => 'Model was successfully updated', - 'kit_model_detached' => 'Model was successfully detached', + 'append_accessory' => '付属品を追加', + 'update_appended_accessory' => '追加された付属品を更新', + 'append_consumable' => '消耗品を追加', + 'update_appended_consumable' => '追加された消耗品の更新', + 'append_license' => 'ライセンスの追加', + 'update_appended_license' => '追加されたライセンスを更新', + 'append_model' => 'モデルを追加', + 'update_appended_model' => '追加されたモデルを更新', + 'license_error' => '製品セットにすでに添付されているライセンスです。', + 'license_added_success' => 'ライセンスが追加されました。', + 'license_updated' => 'ライセンスが正常に更新されました。', + 'license_none' => 'ライセンスが存在しません。', + 'license_detached' => 'ライセンスが正常に切り離されました。', + 'consumable_added_success' => '消耗品の追加に成功しました。', + 'consumable_updated' => '消耗品は正常に更新されました。', + 'consumable_error' => '製品セットにすでに追加されている消耗品です。', + 'consumable_deleted' => '削除に成功しました。', + 'consumable_none' => '消耗品は存在しません。', + 'consumable_detached' => '消耗品は正常に切り離されました。', + 'accessory_added_success' => '付属品の追加に成功しました。', + 'accessory_updated' => '付属品が正常に更新されました。', + 'accessory_detached' => '付属品は正常に取り外されました。', + 'accessory_error' => '付属品は既にキットに取り付けられています。', + 'accessory_deleted' => '削除に成功しました。', + 'accessory_none' => '付属品が存在しません。', + 'checkout_success' => 'チェックアウトに成功しました', + 'checkout_error' => 'チェックアウトエラー', + 'kit_none' => 'キットが存在しません', + 'kit_created' => '製品セットは正常に作成されました。', + 'kit_updated' => '製品セットは正常に更新されました。', + 'kit_not_found' => '製品セットが見つかりません。', + 'kit_deleted' => '製品セットは正常に削除されました。', + 'kit_model_updated' => 'モデルが正常に更新されました。', + 'kit_model_detached' => 'モデルは正常に切り離されました。', ]; diff --git a/resources/lang/ja/admin/locations/table.php b/resources/lang/ja/admin/locations/table.php index 642ab08626..8b9dfd394c 100644 --- a/resources/lang/ja/admin/locations/table.php +++ b/resources/lang/ja/admin/locations/table.php @@ -20,21 +20,21 @@ return [ 'parent' => '上位', 'currency' => '現地通貨', 'ldap_ou' => 'LDAP OU を検索', - 'user_name' => 'User Name', - 'department' => 'Department', - 'location' => 'Location', - 'asset_tag' => 'Assets Tag', - 'asset_name' => 'Name', - 'asset_category' => 'Category', - 'asset_manufacturer' => 'Manufacturer', - 'asset_model' => 'Model', - 'asset_serial' => 'Serial', - 'asset_location' => 'Location', - 'asset_checked_out' => 'Checked Out', - 'asset_expected_checkin' => 'Expected Checkin', - 'date' => 'Date:', - 'signed_by_asset_auditor' => 'Signed By (Asset Auditor):', - 'signed_by_finance_auditor' => 'Signed By (Finance Auditor):', - 'signed_by_location_manager' => 'Signed By (Location Manager):', - 'signed_by' => 'Signed Off By:', + 'user_name' => 'ユーザー名', + 'department' => '部署', + 'location' => '設置場所', + 'asset_tag' => '資産タグ', + 'asset_name' => '名前', + 'asset_category' => 'カテゴリー', + 'asset_manufacturer' => '製造元', + 'asset_model' => 'モデル', + 'asset_serial' => 'シリアル', + 'asset_location' => '設置場所', + 'asset_checked_out' => 'チェックアウト', + 'asset_expected_checkin' => 'チェックイン予定', + 'date' => '日付:', + 'signed_by_asset_auditor' => '署名済み(資産監査役):', + 'signed_by_finance_auditor' => '署名済み(会計監査人):', + 'signed_by_location_manager' => '署名済み (ロケーションマネージャー):', + 'signed_by' => '署名:', ]; diff --git a/resources/lang/ja/admin/reports/general.php b/resources/lang/ja/admin/reports/general.php index c079ba518b..3841de4431 100644 --- a/resources/lang/ja/admin/reports/general.php +++ b/resources/lang/ja/admin/reports/general.php @@ -2,9 +2,9 @@ return [ 'info' => '資産報告書のオプションを選択してください。', - 'deleted_user' => 'Deleted user', - 'send_reminder' => 'Send reminder', - 'reminder_sent' => 'Reminder sent', - 'acceptance_deleted' => 'Acceptance request deleted', - 'acceptance_request' => 'Acceptance request' + 'deleted_user' => '削除されたユーザー', + 'send_reminder' => 'リマインダーを送信', + 'reminder_sent' => 'リマインダーを送信しました', + 'acceptance_deleted' => '承認リクエストが削除されました', + 'acceptance_request' => 'リクエストを承認' ]; \ No newline at end of file diff --git a/resources/lang/ja/admin/settings/general.php b/resources/lang/ja/admin/settings/general.php index 9f0fa3126b..6248310ac9 100644 --- a/resources/lang/ja/admin/settings/general.php +++ b/resources/lang/ja/admin/settings/general.php @@ -10,31 +10,33 @@ return [ 'admin_cc_email' => 'CC(カーボンコピー)メール 送信先', 'admin_cc_email_help' => 'ユーザーに送信されたチェックイン/チェックアウト メールのコピーを追加の電子メールアカウントに送信する場合は、ここにメールアドレスを入力します。必要が無ければ、このフィールドを空白にします', 'is_ad' => 'Active Directory サーバー', - 'alerts' => 'Alerts', - 'alert_title' => 'Update Alert Settings', + 'alerts' => 'アラート', + 'alert_title' => 'アラート設定を更新', 'alert_email' => 'アラートの送信先', - 'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated', + 'alert_email_help' => 'アラートの送信先となるメールアドレス(カンマ区切り)。', 'alerts_enabled' => 'アラートを有効化', 'alert_interval' => 'アラートを無視する期間', 'alert_inv_threshold' => 'インベントリのアラート間隔', 'allow_user_skin' => 'ユーザースキン許可', - 'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.', + 'allow_user_skin_help_text' => 'このチェックボックスをオンにすると、ユーザーはUIスキンを別のものに上書きすることができます。', 'asset_ids' => '資産ID', 'audit_interval' => '監査の間隔', - 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.', + 'audit_interval_help' => '定期的に資産を物理的に監査する必要がある場合、使用する間隔を月単位で入力します。この値を更新すると、監査日が迫っている資産の「次回監査日」がすべて更新されます。', 'audit_warning_days' => '監査警告しきい値', 'audit_warning_days_help' => '資産の監査期限は何日前に警告する必要がありますか?', - 'auto_increment_assets' => 'Generate auto-incrementing asset tags', + 'auto_increment_assets' => '資産タグを自動採番で生成', 'auto_increment_prefix' => 'プレフィクス (オプション)', - 'auto_incrementing_help' => 'Enable auto-incrementing asset tags first to set this', + 'auto_incrementing_help' => 'この初期値を使って資産タグの自動採番を有効化', 'backups' => 'バックアップ', - 'backups_help' => 'Create, download, and restore backups ', - 'backups_restoring' => 'Restoring from Backup', - 'backups_upload' => 'Upload Backup', - 'backups_path' => 'Backups on the server are stored in:path
',
- 'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.:path
に保存されています',
+ 'backups_restore_warning' => '以前のバックアップから復元する場合は、復元ボタン を使用します。(S3ファイルストレージやDockerでは、現在動作しません。)
+
+:app_name データベース全体とアップロードされたファイルは、バックアップファイルの内容と完全に置き換わります。 ',
+ 'backups_logged_out' => 'あなたを含むすべての既存のユーザーは、復元が完了するとログアウトされます。',
+ 'backups_large' => '非常に大きなバックアップは、復元時にタイムアウトする可能性があり、コマンドラインを介して実行する必要があります。 ',
'barcode_settings' => 'バーコード設定',
'confirm_purge' => 'パージを確定',
'confirm_purge_help' => '削除したレコードを削除するには、下のボックスに「DELETE」というテキストを入力します。 この操作は元に戻すことができず、ソフトで削除されたすべてのアイテムとユーザーは完全に削除されます。(安全のために最初にバックアップを行う必要があります。)',
@@ -57,7 +59,7 @@ return [
'barcode_type' => '2次元バーコードタイプ',
'alt_barcode_type' => 'バーコードタイプ',
'email_logo_size' => '電子メールでは正方形のロゴが見栄えよく見えます。 ',
- 'enabled' => 'Enabled',
+ 'enabled' => '有効',
'eula_settings' => 'EULA設定',
'eula_markdown' => 'この EULA は、Github flavored markdownで、利用可能です。',
'favicon' => 'ファビコン',
@@ -66,8 +68,8 @@ return [
'footer_text' => '追加のフッターテキスト ',
'footer_text_help' => 'このテキストは右側のフッターに表示されます。 Github flavored markdownを使用してリンクが作成できます。改行、ヘッダー、画像などは、予期しない表示結果になる可能性があります。',
'general_settings' => '全般設定',
- 'general_settings_keywords' => 'company support, signature, acceptance, email format, username format, images, per page, thumbnail, eula, tos, dashboard, privacy',
- 'general_settings_help' => 'Default EULA and more',
+ 'general_settings_keywords' => '会社のサポート, 署名, 受諾, 電子メール形式, ユーザー名形式, ページあたりの画像, サムネイル, EULA, 利用規約, ダッシュボード, プライバシー',
+ 'general_settings_help' => 'デフォルトのEULAなど',
'generate_backup' => 'バックアップを作成',
'header_color' => 'ヘッダーカラー',
'info' => 'これらの設定は、あなたの設備の特性に合わせてカスタマイズできます。',
@@ -76,16 +78,16 @@ return [
'laravel' => 'Laravelバージョン',
'ldap' => 'LDAP',
'ldap_help' => 'LDAP/Active Directory',
- 'ldap_client_tls_key' => 'LDAP Client TLS Key',
+ 'ldap_client_tls_key' => 'LDAPクライアントTLSキー',
'ldap_client_tls_cert' => 'LDAPクライアントサイドTLS証明書',
'ldap_enabled' => 'LDAP 対応',
'ldap_integration' => 'LDAP 統合',
'ldap_settings' => 'LDAP 設定',
- 'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
- 'ldap_client_tls_key' => 'LDAP Client-Side TLS key',
+ 'ldap_client_tls_cert_help' => 'クライアント側のTLS証明書とLDAP接続用のキーは、通常 "Secure LDAP" を搭載したGoogle Workspaceでのみ有効です。',
+ 'ldap_client_tls_key' => 'LDAPクライアントTLSキー',
'ldap_login_test_help' => 'LDAPログインが正しく構成されているかどうかをテストするために、上で指定したベースDNから有効なLDAPユーザー名とパスワードを入力して下さい。その前に必ず更新後のLDAP設定を保存しておいてください。',
'ldap_login_sync_help' => 'これは、LDAPが正しく同期できることをテストするだけです。 LDAP認証クエリが正しくない場合、ユーザーはまだログインできない場合があります。その前に必ず更新後のLDAP設定を保存しておいてください。',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'LDAPマネージャー',
'ldap_server' => 'LDAP サーバ',
'ldap_server_help' => 'LDAP を使用開始 ldap:// (for unencrypted or TLS) or ldaps:// (for SSL)',
'ldap_server_cert' => 'LDAP SSL 認証',
@@ -97,7 +99,7 @@ return [
'ldap_dept' => 'LDAP 部署',
'ldap_phone' => 'LDAP 電話番号',
'ldap_jobtitle' => 'LDAP 職位',
- 'ldap_country' => 'LDAP Country',
+ 'ldap_country' => 'LDAP 国',
'ldap_pword' => 'LDAP バインド パスワード',
'ldap_basedn' => 'LDAP 検索ベース DN',
'ldap_filter' => 'LDAP フィルター',
@@ -112,17 +114,17 @@ return [
'ldap_activated_flag_help' => 'このフラグは、ユーザが Snipe-IT にログインできるかどうかを判断するために使用され、項目をチェックする機能には影響しません。',
'ldap_emp_num' => 'LDAP 社員番号',
'ldap_email' => 'LDAP メール',
- 'ldap_test' => 'Test LDAP',
- 'ldap_test_sync' => 'Test LDAP Synchronization',
+ 'ldap_test' => 'LDAPをテスト',
+ 'ldap_test_sync' => 'LDAP同期のテスト',
'license' => 'ソフトウェアライセンス',
'load_remote_text' => 'リモートスクリプト',
'load_remote_help_text' => 'Snipe-ITのインストールは、外部からスクリプトを読み込むことが可能です。',
- 'login' => 'Login Attempts',
- 'login_attempt' => 'Login Attempt',
- 'login_ip' => 'IP Address',
- 'login_success' => 'Success?',
+ 'login' => 'ログイン試行',
+ 'login_attempt' => 'ログイン試行',
+ 'login_ip' => 'IPアドレス',
+ 'login_success' => '成功可否',
'login_user_agent' => 'User Agent',
- 'login_help' => 'List of attempted logins',
+ 'login_help' => 'ログイン試行の一覧',
'login_note' => 'ログインメッセージ',
'login_note_help' => 'オプションで、紛失または盗難されたデバイスを見つけた人を支援するなど、ログイン画面に文章を表示することができます。このフィールドはGithub flavored markdownが使用できます。',
'login_remote_user_text' => 'リモートユーザのログインオプション',
@@ -144,19 +146,19 @@ return [
'optional' => 'オプション',
'per_page' => 'ページ毎の結果',
'php' => 'PHPバージョン',
- 'php_info' => 'PHP Info',
+ 'php_info' => 'PHPの情報',
'php_overview' => 'PHP',
'php_overview_keywords' => 'phpinfo, system, info',
- 'php_overview_help' => 'PHP System info',
+ 'php_overview_help' => 'PHPシステム情報',
'php_gd_info' => 'QRコードを表示するためにphp-gdをインストールする必要があります。インストールインストラクションを参照して下さい。',
'php_gd_warning' => 'PHP Image Processing および GD plugin が、インストールされていません。',
'pwd_secure_complexity' => 'パスワードの複雑さ',
'pwd_secure_complexity_help' => 'どのパスワード複雑性ルールを適用するかを選択します。',
- 'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'Password cannot be the same as first name, last name, email, or username',
- 'pwd_secure_complexity_letters' => 'Require at least one letter',
- 'pwd_secure_complexity_numbers' => 'Require at least one number',
- 'pwd_secure_complexity_symbols' => 'Require at least one symbol',
- 'pwd_secure_complexity_case_diff' => 'Require at least one uppercase and one lowercase',
+ 'pwd_secure_complexity_disallow_same_pwd_as_user_fields' => 'パスワードは名、姓、メールアドレス、またはユーザー名と同じにすることはできません',
+ 'pwd_secure_complexity_letters' => '少なくとも1文字以上が必要です',
+ 'pwd_secure_complexity_numbers' => '少なくとも1つの数字が必要です',
+ 'pwd_secure_complexity_symbols' => '少なくとも1つの記号が必要です',
+ 'pwd_secure_complexity_case_diff' => '少なくとも1つの大文字と小文字が必要です',
'pwd_secure_min' => 'パスワードの最低文字数',
'pwd_secure_min_help' => '最小値は8です',
'pwd_secure_uncommon' => '共通パスワードを防ぐ',
@@ -164,46 +166,46 @@ return [
'qr_help' => 'QRコードを有効化',
'qr_text' => 'QRコードテキスト',
'saml' => 'SAML',
- 'saml_title' => 'Update SAML settings',
- 'saml_help' => 'SAML settings',
+ 'saml_title' => 'SAML設定を更新',
+ 'saml_help' => 'SAML設定',
'saml_enabled' => 'SAMLを有効にする',
'saml_integration' => 'SAML 統合',
'saml_sp_entityid' => 'Entity ID',
'saml_sp_acs_url' => 'Assertion Consumer Service (ACS) URL',
'saml_sp_sls_url' => 'Single Logout Service (SLS) URL',
- 'saml_sp_x509cert' => 'Public Certificate',
- 'saml_sp_metadata_url' => 'Metadata URL',
- 'saml_idp_metadata' => 'SAML IdP Metadata',
+ 'saml_sp_x509cert' => '公開証明書',
+ 'saml_sp_metadata_url' => 'メタデータURL',
+ 'saml_idp_metadata' => 'SAML IdPメタデータ',
'saml_idp_metadata_help' => 'URL または XML ファイルを使用して IdP メタデータを指定できます。',
- 'saml_attr_mapping_username' => 'Attribute Mapping - Username',
- 'saml_attr_mapping_username_help' => 'NameID will be used if attribute mapping is unspecified or invalid.',
- 'saml_forcelogin_label' => 'SAML Default Login',
- 'saml_forcelogin' => 'Make SAML the primary login',
- 'saml_forcelogin_help' => 'You can use \'/login?nosaml\' to get to the normal login page.',
- 'saml_slo_label' => 'SAML Single Log Out',
- 'saml_slo' => 'Send a LogoutRequest to IdP on Logout',
- 'saml_slo_help' => 'This will cause the user to be first redirected to the IdP on logout. Leave unchecked if the IdP doesn\'t correctly support SP-initiated SAML SLO.',
- 'saml_custom_settings' => 'SAML Custom Settings',
- 'saml_custom_settings_help' => 'You can specify additional settings to the onelogin/php-saml library. Use at your own risk.',
- 'saml_download' => 'Download Metadata',
+ 'saml_attr_mapping_username' => '属性マッピング - ユーザー名',
+ 'saml_attr_mapping_username_help' => '属性マッピングが指定されていない、または無効な場合 NameID が使用されます。',
+ 'saml_forcelogin_label' => 'SAML デフォルトのログイン',
+ 'saml_forcelogin' => 'SAMLをプライマリログインにする',
+ 'saml_forcelogin_help' => '通常のログインページに移動するには、\'/login?nosaml\' を使用できます。',
+ 'saml_slo_label' => 'SAML シングルログアウト',
+ 'saml_slo' => 'ログアウト時にLogoutRequestをIdPに送信する',
+ 'saml_slo_help' => 'これにより、ユーザーは最初にログアウト時にIdPにリダイレクトされます。IdPがSP-initiated SAML SLOを正しくサポートしていない場合は、チェックを外してください。',
+ 'saml_custom_settings' => 'SAML カスタム設定',
+ 'saml_custom_settings_help' => 'onelogin/php-saml ライブラリの追加の設定を指定できます。自己責任で使用してください。',
+ 'saml_download' => 'メタデータをダウンロード',
'setting' => '設定',
'settings' => '設定',
'show_alerts_in_menu' => 'トップ メニューでアラートを表示します。',
'show_archived_in_list' => 'アーカイブ資産',
'show_archived_in_list_text' => 'アーカイブされた資産を「すべての資産」リストに表示する',
- 'show_assigned_assets' => 'Show assets assigned to assets',
- 'show_assigned_assets_help' => 'Display assets which were assigned to the other assets in View User -> Assets, View User -> Info -> Print All Assigned and in Account -> View Assigned Assets.',
+ 'show_assigned_assets' => 'アセットに割り当てられたアセットを表示',
+ 'show_assigned_assets_help' => '他のアセットに割り当てたアセットを表示するには、 ユーザーの表示 → 資産, ユーザーの表示 → 情報 → アカウントに割り当て済み → 割り当て済みの資産',
'show_images_in_email' => 'メールで画像を表示する',
'show_images_in_email_help' => 'Snipe-ITが閉鎖されたネットワーク内にある場合や、アクセスするためにVPNの利用が必要な場合はこのボックスのチェックを外してください。ネットワーク外のユーザは、配信されたメールにある画像を読み込むことはできません。',
'site_name' => 'サイト名',
'slack' => 'Slack',
- 'slack_title' => 'Update Slack Settings',
- 'slack_help' => 'Slack settings',
+ 'slack_title' => 'Slackの設定を更新',
+ 'slack_help' => 'Slackの設定',
'slack_botname' => 'Slack Botname',
'slack_channel' => 'Slack Channel',
'slack_endpoint' => 'Slack Endpoint',
'slack_integration' => 'Slack Settings',
- 'slack_integration_help' => 'Slack integration is optional, however the endpoint and channel are required if you wish to use it. To configure Slack integration, you must first create an incoming webhook on your Slack account. Click on the Test Slack Integration button to confirm your settings are correct before saving. ',
+ 'slack_integration_help' => 'Slackとの連携は任意ですが、利用する場合はエンドポイントとチャンネルが必要です。Slackとの連携を設定するには、まず、SlackにIncoming Webhookを作成する必要があります。Slack統合テスト ボタンをクリックし、設定が正しいことを確認してから保存してください。 ',
'slack_integration_help_button' => 'Slack設定を保存すると、テストボタンが表示されます。',
'slack_test_help' => 'Slackが正しく設定されているかどうかをテストします。先にSlackの設定を最初に保存しなければなりません。',
'snipe_version' => 'Snipe-IT バージョン',
@@ -216,8 +218,8 @@ return [
'value' => '価値',
'brand' => 'ブランディング',
'brand_keywords' => 'footer, logo, print, theme, skin, header, colors, color, css',
- 'brand_help' => 'Logo, Site Name',
- 'web_brand' => 'Web Branding Type',
+ 'brand_help' => 'ロゴ, サイト名',
+ 'web_brand' => 'Webブランディングタイプ',
'about_settings_title' => '設定について',
'about_settings_text' => 'これらの設定は、あなたのインストレーションの特性に合わせてカスタマイズできます。',
'labels_per_page' => 'ページあたりのラベル数',
@@ -228,7 +230,7 @@ return [
'privacy_policy' => 'プライバシーポリシー',
'privacy_policy_link_help' => 'ここにURLが含まれている場合、プライバシーポリシーへのリンクは、GDPRに準拠して、各ページのフッターとシステムが送信する電子メールに含まれます。 ',
'purge' => 'データレコードを消去',
- 'purge_deleted' => 'Purge Deleted ',
+ 'purge_deleted' => '削除の消去 ',
'labels_display_bgutter' => 'ラベル 下余白',
'labels_display_sgutter' => 'ラベル横余白',
'labels_fontsize' => 'ラベルフォントサイズ',
@@ -273,52 +275,52 @@ return [
'unique_serial' => '一意のシリアル番号',
'unique_serial_help_text' => 'このチェックボックスをオンにすると、資産のシリアル番号に一意性制約が適用されます',
'zerofill_count' => '資産タグの長さ (ゼロ埋め含む)',
- 'username_format_help' => 'This setting will only be used by the import process if a username is not provided and we have to generate a username for you.',
- 'oauth_title' => 'OAuth API Settings',
+ 'username_format_help' => 'この設定は、ユーザー名が指定されておらず、ユーザー名を生成する必要がある場合にのみインポートプロセスで使用されます。',
+ 'oauth_title' => 'OAuth API 設定',
'oauth' => 'OAuth',
- 'oauth_help' => 'Oauth Endpoint Settings',
- 'asset_tag_title' => 'Update Asset Tag Settings',
- 'barcode_title' => 'Update Barcode Settings',
- 'barcodes' => 'Barcodes',
- 'barcodes_help_overview' => 'Barcode & QR settings',
- 'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
- 'barcodes_spinner' => 'Attempting to delete files...',
- 'barcode_delete_cache' => 'Delete Barcode Cache',
- 'branding_title' => 'Update Branding Settings',
- 'general_title' => 'Update General Settings',
- 'mail_test' => 'Send Test',
- 'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
- 'filter_by_keyword' => 'Filter by setting keyword',
- 'security' => 'Security',
- 'security_title' => 'Update Security Settings',
+ 'oauth_help' => 'OAuth エンドポイント設定',
+ 'asset_tag_title' => '資産タグ設定を更新',
+ 'barcode_title' => 'バーコード設定を更新',
+ 'barcodes' => 'バーコード',
+ 'barcodes_help_overview' => 'バーコード & QRの設定',
+ 'barcodes_help' => 'キャッシュされたバーコードを削除しようとします。 これは通常、バーコード設定が変更された場合や、Snipe-ITのURLが変更された場合にのみ使用されます。 バーコードは次にアクセスしたときに再生成されます。',
+ 'barcodes_spinner' => 'ファイルを削除しようとしています...',
+ 'barcode_delete_cache' => 'バーコードキャッシュを削除',
+ 'branding_title' => 'ブランディング設定を更新',
+ 'general_title' => '一般設定を更新',
+ 'mail_test' => '送信テスト',
+ 'mail_test_help' => 'テストメールを :replyto に送信しようとします。',
+ 'filter_by_keyword' => 'キーワードを設定してフィルター',
+ 'security' => 'セキュリティ',
+ 'security_title' => 'セキュリティ設定を更新',
'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
- 'security_help' => 'Two-factor, Password Restrictions',
+ 'security_help' => '二段階認証, パスワードの制限',
'groups_keywords' => 'permissions, permission groups, authorization',
- 'groups_help' => 'Account permission groups',
- 'localization' => 'Localization',
- 'localization_title' => 'Update Localization Settings',
+ 'groups_help' => 'アカウント権限グループ',
+ 'localization' => 'ローカライズ',
+ 'localization_title' => 'ローカライズ設定を更新',
'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
- 'localization_help' => 'Language, date display',
- 'notifications' => 'Notifications',
- 'notifications_help' => 'Email alerts, audit settings',
- 'asset_tags_help' => 'Incrementing and prefixes',
- 'labels' => 'Labels',
- 'labels_title' => 'Update Label Settings',
- 'labels_help' => 'Label sizes & settings',
- 'purge' => 'Purge',
- 'purge_keywords' => 'permanently delete',
- 'purge_help' => 'Purge Deleted Records',
- 'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+ 'localization_help' => '言語, 日付表示',
+ 'notifications' => '通知',
+ 'notifications_help' => 'メールアラート, 監査設定',
+ 'asset_tags_help' => '増分とプレフィクス',
+ 'labels' => 'ラベル',
+ 'labels_title' => 'ラベル設定を更新',
+ 'labels_help' => 'ラベルサイズ & 設定',
+ 'purge' => '消去',
+ 'purge_keywords' => '恒久的に削除',
+ 'purge_help' => '削除したレコードを消去',
+ 'ldap_extension_warning' => 'このサーバーでは、LDAP 拡張モジュールがインストールされていないか、または有効になっていないようです。設定を保存することはできますが、LDAPの同期やログインを機能させるために、PHPのLDAP拡張モジュールを有効にする必要があります。',
'ldap_ad' => 'LDAP/AD',
- 'employee_number' => 'Employee Number',
- 'create_admin_user' => 'Create a User ::',
- 'create_admin_success' => 'Success! Your admin user has been added!',
- 'create_admin_redirect' => 'Click here to go to your app login!',
- 'setup_migrations' => 'Database Migrations ::',
- 'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
- 'setup_successful_migrations' => 'Your database tables have been created',
- 'setup_migration_output' => 'Migration output:',
- 'setup_migration_create_user' => 'Next: Create User',
- 'ldap_settings_link' => 'LDAP Settings Page',
- 'slack_test' => 'Test Integration',
+ 'employee_number' => '従業員番号',
+ 'create_admin_user' => 'ユーザーを作成 ::',
+ 'create_admin_success' => '成功!管理者ユーザーが追加されました!',
+ 'create_admin_redirect' => 'アプリのログインに行くにはここをクリック!',
+ 'setup_migrations' => 'データベースマイグレーション ::',
+ 'setup_no_migrations' => 'マイグレーションするものがありませんでした。データベーステーブルは既に設定されています!',
+ 'setup_successful_migrations' => 'データベーステーブルが作成されました',
+ 'setup_migration_output' => 'マイグレーション出力:',
+ 'setup_migration_create_user' => '次へ: ユーザーの作成',
+ 'ldap_settings_link' => 'LDAP設定ページ',
+ 'slack_test' => ' 統合テスト',
];
diff --git a/resources/lang/ja/admin/settings/message.php b/resources/lang/ja/admin/settings/message.php
index 6abad7793c..0a6be5f81c 100644
--- a/resources/lang/ja/admin/settings/message.php
+++ b/resources/lang/ja/admin/settings/message.php
@@ -11,8 +11,8 @@ return [
'file_deleted' => 'バックアップファイルの削除に成功しました。 ',
'generated' => '新しいバックアップファイルが作成されました。',
'file_not_found' => 'そのバックアップファイルをサーバー上に見つけることが出来ませんでした。',
- 'restore_warning' => 'Yes, restore it. I acknowledge that this will overwrite any existing data currently in the database. This will also log out all of your existing users (including you).',
- 'restore_confirm' => 'Are you sure you wish to restore your database from :filename?'
+ 'restore_warning' => '復元を行います。現在データベースにある既存のデータを上書きします。 これにより、既存のすべてのユーザー(あなたを含む) もログアウトします。',
+ 'restore_confirm' => ':filename からデータベースを復元してもよろしいですか?'
],
'purge' => [
'error' => 'パージ中にエラーが発生しました。 ',
@@ -20,24 +20,24 @@ return [
'success' => 'パージによりレコードは削除されました',
],
'mail' => [
- 'sending' => 'Sending Test Email...',
- 'success' => 'Mail sent!',
- 'error' => 'Mail could not be sent.',
- 'additional' => 'No additional error message provided. Check your mail settings and your app log.'
+ 'sending' => 'テストメールを送信しています...',
+ 'success' => 'メール送信完了',
+ 'error' => 'メールが送信できません',
+ 'additional' => '追加のエラーメッセージはありません。メール設定とアプリのログを確認してください。'
],
'ldap' => [
- 'testing' => 'Testing LDAP Connection, Binding & Query ...',
- '500' => '500 Server Error. Please check your server logs for more information.',
- 'error' => 'Something went wrong :(',
- 'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:',
- 'testing_authentication' => 'Testing LDAP Authentication...',
- 'authentication_success' => 'User authenticated against LDAP successfully!'
+ 'testing' => 'LDAP接続のテスト中…バインディングとクエリを行っています…',
+ '500' => '500 Server Error. 詳しくは、サーバーのログをご確認ください。',
+ 'error' => '問題が発生しました。',
+ 'sync_success' => '設定に基づいてLDAPサーバーから返された10人のユーザーのサンプル:',
+ 'testing_authentication' => 'LDAP認証のテスト中...',
+ 'authentication_success' => 'LDAPによるユーザー認証に成功しました!'
],
'slack' => [
- 'sending' => 'Sending Slack test message...',
- 'success_pt1' => 'Success! Check the ',
- 'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
+ 'sending' => 'Slackのテストメッセージを送信しています...',
+ 'success_pt1' => 'チェックに成功 ',
+ 'success_pt2' => ' テストメッセージのチャンネルで、設定を保存するには以下の「保存」をクリックしてください。',
'500' => '500 Server Error.',
- 'error' => 'Something went wrong.',
+ 'error' => '問題が発生しました。',
]
];
diff --git a/resources/lang/ja/admin/settings/table.php b/resources/lang/ja/admin/settings/table.php
index 22db5c84ed..c732585906 100644
--- a/resources/lang/ja/admin/settings/table.php
+++ b/resources/lang/ja/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
- 'size' => 'Size',
+ 'created' => '作成済み',
+ 'size' => 'サイズ',
);
diff --git a/resources/lang/ja/admin/statuslabels/message.php b/resources/lang/ja/admin/statuslabels/message.php
index 3642da1cef..1294229f10 100644
--- a/resources/lang/ja/admin/statuslabels/message.php
+++ b/resources/lang/ja/admin/statuslabels/message.php
@@ -23,7 +23,7 @@ return [
'help' => [
'undeployable' => 'これらのアセットを誰にも割り当てることはできません。',
- 'deployable' => 'These assets can be checked out. Once they are assigned, they will assume a meta status of Deployed.',
+ 'deployable' => 'これらの資産はチェックアウトすることができます。割り当てられたら、 配備済みというメタステータスになります。',
'archived' => 'これらのアセットはチェックアウトできず、アーカイブビューにのみ表示されます。これは、予算/歴史的な目的のために資産に関する情報を保持するが、それらを日々の資産リストから外すことに役立つ。',
'pending' => 'これらの資産は、誰にも割り当てられません。修理の対象外ではあるが、流通に戻ることが予想されるアイテムによく使用されます。',
],
diff --git a/resources/lang/ja/admin/users/general.php b/resources/lang/ja/admin/users/general.php
index 7c3780ca4b..b026749647 100644
--- a/resources/lang/ja/admin/users/general.php
+++ b/resources/lang/ja/admin/users/general.php
@@ -17,26 +17,28 @@ return [
'last_login' => '最終ログイン',
'ldap_config_text' => 'LDAP 構成設定 管理者 > 設定。 選択した場所は、インポートされたすべてのユーザーに対して設定されます。',
'print_assigned' => '割り当て先をすべて印刷',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'ソフトウェアは :name にチェックアウトしました。',
'send_email_help' => '資格情報を送信するには、このユーザーのメールアドレスを入力する必要があります。メール送信資格情報は、ユーザー作成時にのみ行うことができます。 パスワードは一方向のハッシュに保存され、保存されると取得できません。',
'view_user' => '利用者 :name を表示',
'usercsv' => 'CSVファイル',
'two_factor_admin_optin_help' => '現在の管理者設定では、2段階認証は任意です。 ',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
- 'activation_status_warning' => 'Do not change activation status',
- 'group_memberships_helpblock' => 'Only superadmins may edit group memberships.',
- 'superadmin_permission_warning' => 'Only superadmins may grant a user superadmin access.',
- 'admin_permission_warning' => 'Only users with admins rights or greater may grant a user admin access.',
- 'remove_group_memberships' => 'Remove Group Memberships',
- 'warning_deletion' => 'WARNING:',
- 'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
- 'checkin_user_properties' => 'Check in all properties associated with these users',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'two_factor_enrolled' => '2要素認証デバイスが登録されました ',
+ 'two_factor_active' => '2要素認証有効 ',
+ 'user_deactivated' => 'ユーザーはログインできません',
+ 'user_activated' => 'ユーザーはログインできます',
+ 'activation_status_warning' => 'アクティベーション状態を変更しない',
+ 'group_memberships_helpblock' => 'スーパー管理者のみがグループメンバーシップを編集できます。',
+ 'superadmin_permission_warning' => 'スーパー管理者のみがユーザーにスーパー管理者権限を付与できます。',
+ 'admin_permission_warning' => '管理者権限以上のユーザーのみがユーザーの管理者権限を付与できます。',
+ 'remove_group_memberships' => 'グループメンバーシップを削除',
+ 'warning_deletion' => '警告:',
+ 'warning_deletion_information' => '以下の :count ユーザーを削除しようとしています。スーパー管理者名は赤でハイライトされています。',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
+ 'checkin_user_properties' => 'これらのユーザーに関連付けられているすべてのプロパティをチェック',
+ 'remote_label' => 'これはリモートのユーザーです',
+ 'remote' => 'リモート',
+ 'remote_help' => 'これは、物理的な場所に来たことがない、またはほとんど来なかったリモートユーザーによってフィルタリングする必要がある場合に便利です。',
+ 'not_remote_label' => 'これはリモートユーザーではありません',
];
diff --git a/resources/lang/ja/admin/users/table.php b/resources/lang/ja/admin/users/table.php
index be277c3106..bd1b3509bf 100644
--- a/resources/lang/ja/admin/users/table.php
+++ b/resources/lang/ja/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => 'E-Mail',
'employee_num' => '従業員 No.',
'first_name' => '名',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => 'ユーザに割り当てるグループを選択します。割り当てられたグループの権限を取得することに留意してください。 グループの選択を解除するには、Ctrl+クリック(またはmacOSではCmd+クリック)を使用します。',
'id' => 'ID',
'inherit' => '継承',
'job' => '役職',
diff --git a/resources/lang/ja/auth.php b/resources/lang/ja/auth.php
index db310aa1bb..66c1dd8eb8 100644
--- a/resources/lang/ja/auth.php
+++ b/resources/lang/ja/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'これらの資格情報は記録と一致しません。',
+ 'password' => '入力されたパスワードが正しくありません。',
+ 'throttle' => 'ログイン試行回数が多すぎます。:seconds 秒後にもう一度お試しください。',
);
diff --git a/resources/lang/ja/button.php b/resources/lang/ja/button.php
index 21b6bc6f03..75c69835a5 100644
--- a/resources/lang/ja/button.php
+++ b/resources/lang/ja/button.php
@@ -8,7 +8,7 @@ return [
'delete' => '削除',
'edit' => '編集',
'restore' => '復元',
- 'remove' => 'Remove',
+ 'remove' => '削除',
'request' => 'リクエスト',
'submit' => '送信',
'upload' => 'アップロード',
@@ -16,9 +16,9 @@ return [
'select_files' => 'ファイルを選択...',
'generate_labels' => '{1} ラベル生成|[2,*] 複数ラベル生成',
'send_password_link' => 'パスワードリセットのメールを送信',
- 'go' => 'Go',
- 'bulk_actions' => 'Bulk Actions',
- 'add_maintenance' => 'Add Maintenance',
- 'append' => 'Append',
- 'new' => 'New',
+ 'go' => '移動',
+ 'bulk_actions' => '一括操作',
+ 'add_maintenance' => 'メンテナンスを追加',
+ 'append' => '追加',
+ 'new' => '新規',
];
diff --git a/resources/lang/ja/general.php b/resources/lang/ja/general.php
index 52e857d2c7..e7796c05c3 100644
--- a/resources/lang/ja/general.php
+++ b/resources/lang/ja/general.php
@@ -19,14 +19,14 @@ return [
'asset' => '資産',
'asset_report' => '資産レポート',
'asset_tag' => '資産タグ',
- 'asset_tags' => 'Asset Tags',
- 'assets_available' => 'Assets available',
- 'accept_assets' => 'Accept Assets :name',
- 'accept_assets_menu' => 'Accept Assets',
+ 'asset_tags' => '資産タグ',
+ 'assets_available' => '利用可能な資産',
+ 'accept_assets' => ':name の資産を承認 ',
+ 'accept_assets_menu' => '資産を承認',
'audit' => '監査',
'audit_report' => '監査ログ',
'assets' => '資産数',
- 'assigned_to' => 'Assigned to :name',
+ 'assigned_to' => ':name に割り当て',
'avatar_delete' => 'アバターを削除',
'avatar_upload' => 'アバターをアップロード',
'back' => '戻る',
@@ -34,10 +34,10 @@ return [
'bulkaudit' => '一括監査',
'bulkaudit_status' => '監査ステータス',
'bulk_checkout' => '一括チェックアウト',
- 'bulk_edit' => 'Bulk Edit',
- 'bulk_delete' => 'Bulk Delete',
- 'bulk_actions' => 'Bulk Actions',
- 'bulk_checkin_delete' => 'Bulk Checkin & Delete',
+ 'bulk_edit' => '一括編集',
+ 'bulk_delete' => '一括削除',
+ 'bulk_actions' => '一括操作',
+ 'bulk_checkin_delete' => '一括チェックイン & 削除',
'bystatus' => 'ステータス別',
'cancel' => 'キャンセル',
'categories' => 'カテゴリー',
@@ -65,13 +65,14 @@ return [
'create' => '新規作成',
'created' => 'アイテムを作成しました',
'created_asset' => '資産を作成',
- 'created_at' => '作成者',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'レコードが作成されました',
'updated_at' => '更新日',
'currency' => '¥', // this is deprecated
'current' => '現在の状況',
- 'current_password' => 'Current Password',
- 'customize_report' => 'Customize Report',
+ 'current_password' => '現在のパスワード',
+ 'customize_report' => 'レポートのカスタマイズ',
'custom_report' => '資産レポートをカスタム',
'dashboard' => 'ダッシュボード',
'days' => '日間',
@@ -83,12 +84,12 @@ return [
'delete_confirm' => ':item を削除してもよろしいですか?',
'deleted' => '削除しました。',
'delete_seats' => 'ライセンスを削除',
- 'deletion_failed' => 'Deletion failed',
+ 'deletion_failed' => '削除に失敗しました',
'departments' => '部署',
'department' => '部署',
'deployed' => '配備済',
'depreciation' => '減価償却',
- 'depreciations' => 'Depreciations',
+ 'depreciations' => '減価償却',
'depreciation_report' => '減価償却レポート',
'details' => '詳細',
'download' => 'ダウンロード',
@@ -97,9 +98,10 @@ return [
'eol' => 'EOL',
'email_domain' => 'Eメール ドメイン',
'email_format' => 'Eメールフォーマット',
- 'employee_number' => 'Employee Number',
+ 'employee_number' => '従業員番号',
'email_domain_help' => 'インポート時に作成するe-mail アドレス',
- 'error' => 'Error',
+ 'error' => 'エラー',
+ 'example' => 'Example: ',
'filastname_format' => '名 イニシャル 姓 (jsmith@example.com)',
'firstname_lastname_format' => '名 姓 (jane.smith@example.com)',
'firstname_lastname_underscore_format' => '名 姓 (jane_smith@example.com)',
@@ -115,23 +117,23 @@ return [
'files' => 'ファイル',
'file_name' => 'ファイル',
'file_type' => 'ファイル形式',
- 'filesize' => 'File Size',
+ 'filesize' => 'ファイルサイズ',
'file_uploads' => 'ファイルアップロード',
- 'file_upload' => 'File Upload',
+ 'file_upload' => 'ファイルアップロード',
'generate' => '作成',
- 'generate_labels' => 'Generate Labels',
+ 'generate_labels' => 'ラベルを生成',
'github_markdown' => 'このフィールドでは Github flavored markdownが利用可能です',
'groups' => 'グループ',
'gravatar_email' => 'Gravatar のメールアドレス',
- 'gravatar_url' => 'Change your avatar at Gravatar.com.',
+ 'gravatar_url' => 'Gravatar.com でアバターを変更',
'history' => '履歴',
'history_for' => '履歴',
'id' => 'ID',
'image' => '画像',
'image_delete' => '画像を削除',
'image_upload' => '画像をアップロード',
- 'filetypes_accepted_help' => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
- 'filetypes_size_help' => 'Max upload size allowed is :size.',
+ 'filetypes_accepted_help' => 'アップロード可能なファイル形式は :types です。アップロード可能な最大サイズは :size です。|アップロード可能なファイル形式は :types です。アップロード可能な最大サイズは :size です。',
+ 'filetypes_size_help' => '許可されている最大アップロードサイズは :size です。',
'image_filetypes_help' => '使用できるファイルはjpg、png、gif、svgです。許可される最大ファイルサイズは:size です。',
'import' => 'インポート',
'importing' => 'インポートしています',
@@ -141,7 +143,7 @@ return [
'asset_maintenance_report' => '資産管理レポート',
'asset_maintenances' => '資産管理',
'item' => 'アイテム',
- 'item_name' => 'Item Name',
+ 'item_name' => 'アイテム名',
'insufficient_permissions' => '権限が不足しています。',
'kits' => '製品セット',
'language' => '言語',
@@ -153,7 +155,7 @@ return [
'licenses_available' => '利用可能なライセンス',
'licenses' => 'ライセンス数',
'list_all' => '全ての一覧',
- 'loading' => 'Loading... please wait....',
+ 'loading' => '読み込み中… お待ちください…',
'lock_passwords' => 'このフィールド値はデモインストールでは保存されません。',
'feature_disabled' => 'この機能は、デモインストールでは無効化されています。',
'location' => '設置場所',
@@ -162,17 +164,17 @@ return [
'logout' => 'ログアウト',
'lookup_by_tag' => '資産タグで参照',
'maintenances' => 'メンテナンス',
- 'manage_api_keys' => 'Manage API Keys',
+ 'manage_api_keys' => 'APIキーの管理',
'manufacturer' => '製造元',
'manufacturers' => '製造元の数',
'markdown' => 'このフィールドでは Github flavored markdown. が利用可能です',
'min_amt' => '最小数量',
- 'min_amt_help' => 'Minimum number of items that should be available before an alert gets triggered. Leave Min. QTY blank if you do not want to receive alerts for low inventory.',
+ 'min_amt_help' => 'アラートがトリガーされる前に利用可能な項目の最小数。 在庫が少ないアラートを受信したくない場合は、最小数量を空白のままにしてください。',
'model_no' => 'モデル No.',
'months' => '月',
'moreinfo' => '詳細',
'name' => '名前',
- 'new_password' => 'New Password',
+ 'new_password' => '新しいパスワード',
'next' => '次へ',
'next_audit_date' => '次の監査日',
'last_audit' => '前回の監査日',
@@ -194,25 +196,25 @@ return [
'purchase_date' => '購入日',
'qty' => '数量',
'quantity' => '数量',
- 'quantity_minimum' => 'You have :count items below or almost below minimum quantity levels',
- 'quickscan_checkin' => 'Quick Scan Checkin',
- 'quickscan_checkin_status' => 'Checkin Status',
+ 'quantity_minimum' => '最低数量を下回る、または下回りそうなアイテムが :count 個あります。',
+ 'quickscan_checkin' => 'クイックスキャン チェックイン',
+ 'quickscan_checkin_status' => 'チェックイン状況',
'ready_to_deploy' => '配備可能',
'recent_activity' => '最近のアクティビティ',
- 'remaining' => 'Remaining',
+ 'remaining' => '残り',
'remove_company' => '会社の団体を取り除く',
'reports' => 'レポート',
'restored' => '復元',
'restore' => '復元',
- 'requestable_models' => 'Requestable Models',
+ 'requestable_models' => '要求可能なモデル',
'requested' => '要求済',
- 'requested_date' => 'Requested Date',
- 'requested_assets' => 'Requested Assets',
- 'requested_assets_menu' => 'Requested Assets',
+ 'requested_date' => 'リクエスト日',
+ 'requested_assets' => '要求された資産',
+ 'requested_assets_menu' => '要求された資産',
'request_canceled' => 'リクエストキャンセル',
'save' => '保存',
'select' => '選択',
- 'select_all' => 'Select All',
+ 'select_all' => 'すべて選択',
'search' => '検索',
'select_category' => 'カテゴリを選択',
'select_department' => '部署を選択',
@@ -231,22 +233,22 @@ return [
'show_current' => '最新を表示',
'sign_in' => 'サインイン',
'signature' => '署名',
- 'signed_off_by' => 'Signed Off By',
+ 'signed_off_by' => '署名された',
'skin' => 'スキン',
- 'slack_msg_note' => 'A slack message will be sent',
+ 'slack_msg_note' => 'Slackメッセージが送信されます',
'slack_test_msg' => 'こんにちは!SlackとSnipe-ITの連携がうまくいっているようです!',
'some_features_disabled' => 'デモモード : いくつかの機能はこのインストールでは無効化されます',
'site_name' => 'サイト名',
'state' => '都道府県',
'status_labels' => 'ステータスラベル',
'status' => 'ステータス',
- 'accept_eula' => 'Acceptance Agreement',
+ 'accept_eula' => '受け入れ同意',
'supplier' => '仕入先',
'suppliers' => '仕入先',
'sure_to_delete' => '削除してもよろしいですか?',
'submit' => '送信',
'target' => '対象',
- 'toggle_navigation' => 'Toogle Navigation',
+ 'toggle_navigation' => 'トグルナビゲーション',
'time_and_date_display' => '時間と日付を表示',
'total_assets' => '資産の合計',
'total_licenses' => 'ライセンスの合計',
@@ -256,6 +258,7 @@ return [
'undeployable' => '配備不可',
'unknown_admin' => '不明な管理者',
'username_format' => 'ユーザー名の書式',
+ 'username' => 'Username',
'update' => '更新',
'upload_filetypes_help' => '使用できるファイルは、png、gif、jpg、jpeg、doc、docx、pdf、xls、txt、lic、zip、およびrarです。許可される最大ファイルサイズは:sizeです。',
'uploaded' => 'アップロード完了',
@@ -266,7 +269,7 @@ return [
'users' => '利用者',
'viewall' => 'すべて表示',
'viewassets' => '割当済み資産を表示',
- 'viewassetsfor' => 'View Assets for :name',
+ 'viewassetsfor' => ':name の資産を表示',
'website' => 'ウェブサイト',
'welcome' => 'ようこそ、 :name さん',
'years' => '年',
@@ -280,81 +283,85 @@ return [
'accept' => ':assetを承認',
'i_accept' => '承認',
'i_decline' => '却下',
- 'accept_decline' => 'Accept/Decline',
+ 'accept_decline' => '承認/拒否',
'sign_tos' => '利用規約に同意された方は、ご署名ください。',
'clear_signature' => '署名をクリア',
'show_help' => 'ヘルプを表示',
'hide_help' => 'ヘルプを非表示',
- 'view_all' => 'view all',
- 'hide_deleted' => 'Hide Deleted',
- 'email' => 'Email',
- 'do_not_change' => 'Do Not Change',
- 'bug_report' => 'Report a Bug',
- 'user_manual' => 'User\'s Manual',
- 'setup_step_1' => 'Step 1',
- 'setup_step_2' => 'Step 2',
- 'setup_step_3' => 'Step 3',
- 'setup_step_4' => 'Step 4',
- 'setup_config_check' => 'Configuration Check',
- 'setup_create_database' => 'Create Database Tables',
- 'setup_create_admin' => 'Create Admin User',
- 'setup_done' => 'Finished!',
- 'bulk_edit_about_to' => 'You are about to edit the following: ',
- 'checked_out' => 'Checked Out',
- 'checked_out_to' => 'Checked out to',
- 'fields' => 'Fields',
- 'last_checkout' => 'Last Checkout',
- 'due_to_checkin' => 'The following :count items are due to be checked in soon:',
- 'expected_checkin' => 'Expected Checkin',
- 'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
- 'changed' => 'Changed',
- 'to' => 'To',
- 'report_fields_info' => 'Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
-If you would like to export only certain assets, use the options below to fine-tune your results.
', - 'range' => 'Range', - 'bom_remark' => 'Add a BOM (byte-order mark) to this CSV', - 'improvements' => 'Improvements', - 'information' => 'Information', - 'permissions' => 'Permissions', - 'managed_ldap' => '(Managed via LDAP)', - 'export' => 'Export', - 'ldap_sync' => 'LDAP Sync', - 'ldap_user_sync' => 'LDAP User Sync', - 'synchronize' => 'Synchronize', - 'sync_results' => 'Synchronization Results', - 'license_serial' => 'Serial/Product Key', - 'invalid_category' => 'Invalid category', - 'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.', - '60_percent_warning' => '60% Complete (warning)', - 'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!', - 'new_asset' => 'New Asset', - 'new_license' => 'New License', - 'new_accessory' => 'New Accessory', - 'new_consumable' => 'New Consumable', - 'collapse' => 'Collapse', - 'assigned' => 'Assigned', - 'asset_count' => 'Asset Count', - 'accessories_count' => 'Accessories Count', - 'consumables_count' => 'Consumables Count', - 'components_count' => 'Components Count', - 'licenses_count' => 'Licenses Count', - 'notification_error' => 'Error:', - 'notification_error_hint' => 'Please check the form below for errors', - 'notification_success' => 'Success:', - 'notification_warning' => 'Warning:', - 'notification_info' => 'Info:', - 'asset_information' => 'Asset Information', - 'model_name' => 'Model Name:', - 'asset_name' => 'Asset Name:', - 'consumable_information' => 'Consumable Information:', - 'consumable_name' => 'Consumable Name:', - 'accessory_information' => 'Accessory Information:', - 'accessory_name' => 'Accessory Name:', - 'clone_item' => 'Clone Item', - 'checkout_tooltip' => 'Check this item out', - 'checkin_tooltip' => 'Check this item in', - 'checkout_user_tooltip' => 'Check this item out to a user', - 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', - 'maintenance_mode_title' => 'System Temporarily Unavailable', - 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'view_all' => 'すべて表示', + 'hide_deleted' => '削除されたものを隠す', + 'email' => 'メール', + 'do_not_change' => '変更しない', + 'bug_report' => 'バグを報告', + 'user_manual' => 'ユーザーマニュアル', + 'setup_step_1' => 'ステップ 1', + 'setup_step_2' => 'ステップ 2', + 'setup_step_3' => 'ステップ 3', + 'setup_step_4' => 'ステップ 4', + 'setup_config_check' => '設定チェック', + 'setup_create_database' => 'データベーステーブルの作成', + 'setup_create_admin' => '管理者ユーザーを作成', + 'setup_done' => '完了しました!', + 'bulk_edit_about_to' => '次を編集しようとしています: ', + 'checked_out' => 'チェックアウト', + 'checked_out_to' => 'チェックアウト先', + 'fields' => '項目', + 'last_checkout' => '最終チェックアウト', + 'due_to_checkin' => '次の:count項目はすぐにチェックされる予定です:', + 'expected_checkin' => 'チェックイン予定', + 'reminder_checked_out_items' => 'これは、現在あなたに貸し出されているアイテムのリマインダーです。このリストが正確でないと思われる場合(何かが足りない、あるいは受け取っていないと思われるものがここに表示されている)、 :reply_to_name (:reply_to_address)にメールを送ってください。', + 'changed' => '変更済み', + 'to' => '対象:', + 'report_fields_info' => 'カスタムレポートに含めたいフィールドを選択し、「生成」をクリックします。ファイル(custom-asset-report-YYYYY-mm-dd.csv)が自動的にダウンロードされ、エクセルで開くことができます。
+特定の資産だけをエクスポートしたい場合は、以下のオプションを使用して結果を調整してください。
', + 'range' => '範囲', + 'bom_remark' => 'このCSVにBOM(バイトオーダーマーク)を追加', + 'improvements' => '改善', + 'information' => '情報', + 'permissions' => '権限', + 'managed_ldap' => '(LDAP経由で管理されています)', + 'export' => 'エクスポート', + 'ldap_sync' => 'LDAP同期', + 'ldap_user_sync' => 'LDAPユーザー同期', + 'synchronize' => '同期', + 'sync_results' => '同期結果', + 'license_serial' => 'シリアル/プロダクトキー', + 'invalid_category' => '無効なカテゴリ', + 'dashboard_info' => 'これはダッシュボードです。似たようなものがたくさんありますが、これはあなた専用です。', + '60_percent_warning' => '60%完了 (警告)', + 'dashboard_empty' => 'まだ何も追加していないようなので、表示できる素晴らしいものはありません。 今すぐいくつかの資産、付属品、消耗品、またはライセンスを追加して始めましょう!', + 'new_asset' => '新しい資産', + 'new_license' => '新しいライセンス', + 'new_accessory' => '新しい付属品', + 'new_consumable' => '新しい消耗品', + 'collapse' => '折りたたむ', + 'assigned' => '割り当て済み', + 'asset_count' => '資産数', + 'accessories_count' => 'アクセサリ数', + 'consumables_count' => '消耗品数', + 'components_count' => '構成部品数', + 'licenses_count' => 'ライセンス数', + 'notification_error' => 'エラー:', + 'notification_error_hint' => '以下のフォームにエラーがないか確認してください', + 'notification_success' => '成功:', + 'notification_warning' => '警告:', + 'notification_info' => '情報:', + 'asset_information' => '資産情報', + 'model_name' => 'モデル名:', + 'asset_name' => '資産名:', + 'consumable_information' => '消耗品情報:', + 'consumable_name' => '消耗品名:', + 'accessory_information' => '付属品情報:', + 'accessory_name' => '付属品名:', + 'clone_item' => 'アイテムを複製', + 'checkout_tooltip' => 'このアイテムをチェックアウト', + 'checkin_tooltip' => 'このアイテムをチェックイン', + 'checkout_user_tooltip' => 'このアイテムをユーザーにチェックアウトする', + 'maintenance_mode' => 'このサービスはシステムアップデートで一時的に利用できません。後でもう一度確認してください。', + 'maintenance_mode_title' => 'システムが一時的に利用できません', + 'ldap_import' => 'ユーザーのパスワードはLDAPで管理しない。(パスワードリセット機能が利用出来るようになります)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/ja/help.php b/resources/lang/ja/help.php index e3c2b435b9..ad2ed6e323 100644 --- a/resources/lang/ja/help.php +++ b/resources/lang/ja/help.php @@ -15,13 +15,13 @@ return [ 'more_info_title' => '詳細', - 'audit_help' => 'Checking this box will edit the asset record to reflect this new location. Leaving it unchecked will simply note the location in the audit log. :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ko/admin/custom_fields/message.php b/resources/lang/ko/admin/custom_fields/message.php
index 60683c4f7d..11ee554203 100644
--- a/resources/lang/ko/admin/custom_fields/message.php
+++ b/resources/lang/ko/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ko/admin/hardware/form.php b/resources/lang/ko/admin/hardware/form.php
index 8f1bebb6ee..926ba77f66 100644
--- a/resources/lang/ko/admin/hardware/form.php
+++ b/resources/lang/ko/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ko/admin/users/general.php b/resources/lang/ko/admin/users/general.php
index 25d9d439df..902e9f7059 100644
--- a/resources/lang/ko/admin/users/general.php
+++ b/resources/lang/ko/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => '마지막 로그인',
'ldap_config_text' => 'LDAP 구성 설정들은 Admin > Settings 에서 찾을 수 있습니다. (부가적으로) 선택된 장소는 불러온 모든 사용자들에게 설정됩니다.',
'print_assigned' => 'Assigned 자산 모두 인쇄',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => '소프트웨어 반출 목록 :name',
'send_email_help' => '이 사용자에게 자격 증명을 보내려면 이메일 주소를 입력해야 합니다. 자격 증명을 이메일로 보내는 것은 사용자 생성 시에만 수행할 수 있습니다. 암호는 단방향 해시에 저장되며 한 번 저장하면 재열람 할 수 없습니다.',
'view_user' => '사용자 보기 :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ko/general.php b/resources/lang/ko/general.php
index 3b96e3fc12..2bb9404e9c 100644
--- a/resources/lang/ko/general.php
+++ b/resources/lang/ko/general.php
@@ -65,7 +65,8 @@ return [
'create' => '새로 생성',
'created' => '품목 생성됨',
'created_asset' => '생성된 자산',
- 'created_at' => '생성 위치',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => '레코드 생성',
'updated_at' => '업데이트',
'currency' => '원', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => '읽어오기시 전자 우편 주소를 생성하는데 사용됩니다.',
'error' => '오류',
+ 'example' => 'Example: ',
'filastname_format' => '초기 성명 (jsmith@example.com)',
'firstname_lastname_format' => '이름 성 (jane.smith@example.com)',
'firstname_lastname_underscore_format' => '이름 성 (jane.smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => '사용불가',
'unknown_admin' => '알수없는 관리자',
'username_format' => '사용자명 형식',
+ 'username' => 'Username',
'update' => '갱신',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => '업로드됨',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ko/passwords.php b/resources/lang/ko/passwords.php
index 76583b3730..25633b4581 100644
--- a/resources/lang/ko/passwords.php
+++ b/resources/lang/ko/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => '해당 이메일을 사용하는 활성 사용자를 찾을 수 없습니다.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ko/reminders.php b/resources/lang/ko/reminders.php
index a941f5ac6f..314870b484 100644
--- a/resources/lang/ko/reminders.php
+++ b/resources/lang/ko/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "비밀번호는 6글자가 되야 하고 비밀번호 확인과 일치해야 합니다.",
-
"user" => "사용자명이나 메일 주소가 정확하지 않습니다.",
-
- "token" => "이 비밀번호 재설정 힌트가 잘못되었습니다.",
-
- "sent" => "일치하는 메일 주소가 있다면, 비밀번호 힌트가 전송됩니다!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ko/validation.php b/resources/lang/ko/validation.php
index 866fb4e026..479d757419 100644
--- a/resources/lang/ko/validation.php
+++ b/resources/lang/ko/validation.php
@@ -91,6 +91,11 @@ return [
'url' => ':attribute 형식이 부정확 합니다.',
'unique_undeleted' => ':attribute 는 고유의 값만 가져야 합니다.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/lt/admin/custom_fields/general.php b/resources/lang/lt/admin/custom_fields/general.php
index 47dc3b3971..58ed3bb450 100644
--- a/resources/lang/lt/admin/custom_fields/general.php
+++ b/resources/lang/lt/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/lt/admin/custom_fields/message.php b/resources/lang/lt/admin/custom_fields/message.php
index dd4b7439bb..c572cb051d 100644
--- a/resources/lang/lt/admin/custom_fields/message.php
+++ b/resources/lang/lt/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/lt/admin/hardware/form.php b/resources/lang/lt/admin/hardware/form.php
index cd91e6dd3d..3082dff17b 100644
--- a/resources/lang/lt/admin/hardware/form.php
+++ b/resources/lang/lt/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/lt/admin/users/general.php b/resources/lang/lt/admin/users/general.php
index 46cfa203ea..8e0120ae2b 100644
--- a/resources/lang/lt/admin/users/general.php
+++ b/resources/lang/lt/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Paskutinis prisijungimas',
'ldap_config_text' => 'LDAP konfigūracijos parametrus galite rasti Administratorius> Nustatymai. Pasirinkta vieta (pasirinktinai) bus nustatyta visiems importuojamiems vartotojams.',
'print_assigned' => 'Spausdinti visą turtą',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => ':name išduota įranga',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Peržiūrėti :name vartotoją',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/lt/general.php b/resources/lang/lt/general.php
index 0e3ebdfaf5..98a9a63790 100644
--- a/resources/lang/lt/general.php
+++ b/resources/lang/lt/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Sukurti naują',
'created' => 'Sukurtas elementas',
'created_asset' => 'sukurta įranga',
- 'created_at' => 'Sukurta',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Atnaujinta',
'currency' => '€', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Tai naudojama importuojant importuojamus el. Pašto adresus',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'V. Pavardė (vpavarde@example.com)',
'firstname_lastname_format' => 'Vardas Pavardė (vpavarde@example.com)',
'firstname_lastname_underscore_format' => 'Vardas Pavardė (vpavarde@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Nepanaudojamas',
'unknown_admin' => 'Nežinomas administratorius',
'username_format' => 'Vartotojo vardas Formatas',
+ 'username' => 'Username',
'update' => 'Atnaujinti',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Įkeltas',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/lt/passwords.php b/resources/lang/lt/passwords.php
index 587253251a..25633b4581 100644
--- a/resources/lang/lt/passwords.php
+++ b/resources/lang/lt/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Neaptikta vartotojo su šiuo elektroninio pašto adresu.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/lt/reminders.php b/resources/lang/lt/reminders.php
index cb7acd48e4..47237e165b 100644
--- a/resources/lang/lt/reminders.php
+++ b/resources/lang/lt/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Slaptažodžiai turi sutapti ir būti iš 6 simbolių.",
-
"user" => "Neteisingas naudotojas arba el. paštas",
-
- "token" => "Šis slaptažodžio atnaujinimas negaliojantis.",
-
- "sent" => "Jūsų slaptažodžio priminimas bus išsiųstas jei nurodytas el. pašto adresas yra sistemoje!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/lt/validation.php b/resources/lang/lt/validation.php
index ad961f7302..98bca770c0 100644
--- a/resources/lang/lt/validation.php
+++ b/resources/lang/lt/validation.php
@@ -91,6 +91,11 @@ return [
'url' => ':attribute formatas neteisingas.',
'unique_undeleted' => ':attribute turi būti unikalus.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/lv/admin/custom_fields/general.php b/resources/lang/lv/admin/custom_fields/general.php
index 180054e38a..cd34a6f3d5 100644
--- a/resources/lang/lv/admin/custom_fields/general.php
+++ b/resources/lang/lv/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/lv/admin/custom_fields/message.php b/resources/lang/lv/admin/custom_fields/message.php
index a1df5007f2..eb4fa36034 100644
--- a/resources/lang/lv/admin/custom_fields/message.php
+++ b/resources/lang/lv/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/lv/admin/hardware/form.php b/resources/lang/lv/admin/hardware/form.php
index 3d20d45909..c036459556 100644
--- a/resources/lang/lv/admin/hardware/form.php
+++ b/resources/lang/lv/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/lv/admin/users/general.php b/resources/lang/lv/admin/users/general.php
index c1aea91077..9db42e7818 100644
--- a/resources/lang/lv/admin/users/general.php
+++ b/resources/lang/lv/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Pēdējais pieteikšanās',
'ldap_config_text' => 'LDAP konfigurācijas iestatījumus var atrast Admin> Settings. Atlasītā atrašanās vieta (izvēles) tiks iestatīta visiem importētajiem lietotājiem.',
'print_assigned' => 'Drukāt izsniegto',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Programmatūra Pārbaudīta: nosaukums',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Apskatīt Lietotāju: vārds',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/lv/general.php b/resources/lang/lv/general.php
index 71e877f192..7e2eca80de 100644
--- a/resources/lang/lv/general.php
+++ b/resources/lang/lv/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Izveidot jaunu',
'created' => 'Izveidots vienums',
'created_asset' => 'izveidots aktīvu',
- 'created_at' => 'Izveidots pie',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Ieraksts izceidots',
'updated_at' => 'Atjaunināts vietnē',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Darbinieka numurs',
'email_domain_help' => 'To izmanto, lai importētu e-pasta adreses',
'error' => 'Kļūda',
+ 'example' => 'Example: ',
'filastname_format' => 'Pirmais sākotnējais uzvārds (jsmith@example.com)',
'firstname_lastname_format' => 'Vārds un uzvārds (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Vārds Uzvārds (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Nezināms administrators',
'username_format' => 'Lietotājvārds formāts',
+ 'username' => 'Username',
'update' => 'Atjaunināt',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Augšupielādēts',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/lv/passwords.php b/resources/lang/lv/passwords.php
index 27aa7d2992..25633b4581 100644
--- a/resources/lang/lv/passwords.php
+++ b/resources/lang/lv/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Lietotājs ar tādu e-pasta adresi netika atrasts.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/lv/reminders.php b/resources/lang/lv/reminders.php
index 7141770dfc..14e725417e 100644
--- a/resources/lang/lv/reminders.php
+++ b/resources/lang/lv/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Parolēm jābūt sešām rakstzīmēm un jāatbilst apstiprinājumam.",
-
"user" => "Lietotājvārds vai e-pasta adrese ir nepareiza",
-
- "token" => "Šis paroles atiestatīšanas marķieris nav derīgs.",
-
- "sent" => "Ja tika atrasta atbilstoša e-pasta adrese, tika nosūtīts paroles atgādinājums!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/lv/validation.php b/resources/lang/lv/validation.php
index fbe8a25aa1..094db79057 100644
--- a/resources/lang/lv/validation.php
+++ b/resources/lang/lv/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Atribūta formāts nav derīgs.',
'unique_undeleted' => ':attribute jābūt unikālam.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/mi/admin/custom_fields/general.php b/resources/lang/mi/admin/custom_fields/general.php
index 1891d6bd1e..4b30654296 100644
--- a/resources/lang/mi/admin/custom_fields/general.php
+++ b/resources/lang/mi/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/mi/admin/custom_fields/message.php b/resources/lang/mi/admin/custom_fields/message.php
index f5039637da..14381a5bb2 100644
--- a/resources/lang/mi/admin/custom_fields/message.php
+++ b/resources/lang/mi/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/mi/admin/hardware/form.php b/resources/lang/mi/admin/hardware/form.php
index e944f0dbc2..741d469db2 100644
--- a/resources/lang/mi/admin/hardware/form.php
+++ b/resources/lang/mi/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/mi/admin/users/general.php b/resources/lang/mi/admin/users/general.php
index 24b2f8df30..b23a71923e 100644
--- a/resources/lang/mi/admin/users/general.php
+++ b/resources/lang/mi/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Whakauru Whakamutunga',
'ldap_config_text' => 'Ka taea te kitea nga tautuhinga whirihora LDAP Kaiwhakahaere> Tautuhinga. Ko te (tahua) kua tohua te tauwāhi kua tohua mo nga kaiwhakamahi katoa kua kawemai.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Pūmanawa Kua tirotirohia ki: ingoa',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Tirohia te Kaiwhakamahi: ingoa',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/mi/general.php b/resources/lang/mi/general.php
index 20ac7d73c3..223e1641e8 100644
--- a/resources/lang/mi/general.php
+++ b/resources/lang/mi/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Waihanga Hou',
'created' => 'Kua waihangatia te Mea',
'created_asset' => 'waihanga i te taonga',
- 'created_at' => 'I hangaia i',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Whakahoutia i',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Ka whakamahia tenei ki te whakaputa i nga wahitau īmēra ina kawemai',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Tuatahi Ingoa Tuatahi (jsmith@example.com)',
'firstname_lastname_format' => 'Ingoa Tuatahi Ingoa Mutu (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Kaore e taea te whakaputa',
'unknown_admin' => 'Kaiwhakahaere unknown',
'username_format' => 'Ingoa Kaiwhakamahi Hōputu',
+ 'username' => 'Username',
'update' => 'Whakahou',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Kua tukuna',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/mi/passwords.php b/resources/lang/mi/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/mi/passwords.php
+++ b/resources/lang/mi/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/mi/reminders.php b/resources/lang/mi/reminders.php
index 5163d59947..34adf83f4a 100644
--- a/resources/lang/mi/reminders.php
+++ b/resources/lang/mi/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Ko nga kupuhipa he ono nga kupuhipa me te whakarite i te haamau.",
-
"user" => "He hē te ingoa kaiwhakamahi me te wāhitau īmēra",
-
- "token" => "He muhu tenei kupuhipa tautuhinga tautuhi.",
-
- "sent" => "Mena kua kitea he wahitau īmēra rite, kua tukuna he whakamahara kupuhipa!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/mi/validation.php b/resources/lang/mi/validation.php
index 11bf1e0622..bd38a751aa 100644
--- a/resources/lang/mi/validation.php
+++ b/resources/lang/mi/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Ko te: ko te hōputu huanga he muhu.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/mk/admin/custom_fields/general.php b/resources/lang/mk/admin/custom_fields/general.php
index 751171150e..b91bad1cda 100644
--- a/resources/lang/mk/admin/custom_fields/general.php
+++ b/resources/lang/mk/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/mk/admin/custom_fields/message.php b/resources/lang/mk/admin/custom_fields/message.php
index 040152b955..2429045f3d 100644
--- a/resources/lang/mk/admin/custom_fields/message.php
+++ b/resources/lang/mk/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/mk/admin/hardware/form.php b/resources/lang/mk/admin/hardware/form.php
index 57b1eb9720..74e0282604 100644
--- a/resources/lang/mk/admin/hardware/form.php
+++ b/resources/lang/mk/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/mk/admin/users/general.php b/resources/lang/mk/admin/users/general.php
index 2f47120fc2..634d81ca65 100644
--- a/resources/lang/mk/admin/users/general.php
+++ b/resources/lang/mk/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Последна најава',
'ldap_config_text' => 'LDAP конфигурациските поставки може да се најдат во Admin > Settings. Избраната локација (опционално) ќе биде поставена за сите увезени корисници.',
'print_assigned' => 'Печати задолжение',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Софтвер задолжен на :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Погледнете го/ја :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/mk/general.php b/resources/lang/mk/general.php
index 5f83ab6a46..bc9ef24e8f 100644
--- a/resources/lang/mk/general.php
+++ b/resources/lang/mk/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Креирај Нов {0}',
'created' => 'Креирана ставка',
'created_asset' => 'креирано основно средство',
- 'created_at' => 'Креиран во',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Ажурирано во',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Ова се користи за генерирање на адреси на е-пошта при увоз',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Почетна буква од име, Презиме (jjankov@example.com)',
'firstname_lastname_format' => 'Име, точка, Презиме (janko.jankov@example.com)',
'firstname_lastname_underscore_format' => 'Име, _, Презиме (janko_jankov@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Не може да се распореди',
'unknown_admin' => 'Непознат Администратор',
'username_format' => 'Формат на корисничко име',
+ 'username' => 'Username',
'update' => 'Ажурирање',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Прикачено',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/mk/passwords.php b/resources/lang/mk/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/mk/passwords.php
+++ b/resources/lang/mk/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/mk/reminders.php b/resources/lang/mk/reminders.php
index 0f15730e82..f71a37e041 100644
--- a/resources/lang/mk/reminders.php
+++ b/resources/lang/mk/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Лозинките мора да содржат најмалку шест знаци и да одговараат на потврдата.",
-
"user" => "Корисничкото име или адресата за е-пошта е неточна",
-
- "token" => "Токенот за ресетирање на лозинката е невалиден.",
-
- "sent" => "Ако е пронајдена соодветна адреса за е-пошта, потсетникот за лозинка е испратен!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/mk/validation.php b/resources/lang/mk/validation.php
index 0fd1d5345a..0a306482ea 100644
--- a/resources/lang/mk/validation.php
+++ b/resources/lang/mk/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Форматот на :attribute не е валиден.',
'unique_undeleted' => ':attribute мора да биде уникатен.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ml-IN/admin/custom_fields/general.php b/resources/lang/ml-IN/admin/custom_fields/general.php
index 4c7442b2d5..7434117830 100644
--- a/resources/lang/ml-IN/admin/custom_fields/general.php
+++ b/resources/lang/ml-IN/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ml-IN/admin/custom_fields/message.php b/resources/lang/ml-IN/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/ml-IN/admin/custom_fields/message.php
+++ b/resources/lang/ml-IN/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ml-IN/admin/hardware/form.php b/resources/lang/ml-IN/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/ml-IN/admin/hardware/form.php
+++ b/resources/lang/ml-IN/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ml-IN/admin/users/general.php b/resources/lang/ml-IN/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/ml-IN/admin/users/general.php
+++ b/resources/lang/ml-IN/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ml-IN/general.php b/resources/lang/ml-IN/general.php
index 5d67d5d673..c4d2798035 100644
--- a/resources/lang/ml-IN/general.php
+++ b/resources/lang/ml-IN/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Create New',
'created' => 'Item Created',
'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ml-IN/passwords.php b/resources/lang/ml-IN/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/ml-IN/passwords.php
+++ b/resources/lang/ml-IN/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ml-IN/reminders.php b/resources/lang/ml-IN/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/ml-IN/reminders.php
+++ b/resources/lang/ml-IN/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ml-IN/validation.php b/resources/lang/ml-IN/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/ml-IN/validation.php
+++ b/resources/lang/ml-IN/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/mn/admin/custom_fields/general.php b/resources/lang/mn/admin/custom_fields/general.php
index 4d4b1063bb..4c0056b74e 100644
--- a/resources/lang/mn/admin/custom_fields/general.php
+++ b/resources/lang/mn/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/mn/admin/custom_fields/message.php b/resources/lang/mn/admin/custom_fields/message.php
index 41df018663..3be14c1bd2 100644
--- a/resources/lang/mn/admin/custom_fields/message.php
+++ b/resources/lang/mn/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/mn/admin/hardware/form.php b/resources/lang/mn/admin/hardware/form.php
index 1d50cf08aa..b608e4b125 100644
--- a/resources/lang/mn/admin/hardware/form.php
+++ b/resources/lang/mn/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/mn/admin/users/general.php b/resources/lang/mn/admin/users/general.php
index 93a11ab517..cc22d764f7 100644
--- a/resources/lang/mn/admin/users/general.php
+++ b/resources/lang/mn/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Сүүлчийн Нэвтрэх',
'ldap_config_text' => 'LDAP тохиргооны тохиргоог Админ> Тохиргоо гэж олж болно. (Заавал биш) сонгосон байршлыг бүх импортлогчдын хувьд тохируулах болно.',
'print_assigned' => 'Бүх хуваарилагдсан хөрөнгийг хэвлэх',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Програм хангамж: нэр',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Хэрэглэгч: нэрийг харах',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/mn/general.php b/resources/lang/mn/general.php
index b2ae958ad0..9d8a853ab2 100644
--- a/resources/lang/mn/general.php
+++ b/resources/lang/mn/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Шинэ болгох',
'created' => 'Үүссэн зүйл',
'created_asset' => 'актив үүсгэсэн',
- 'created_at' => 'Үүсгэгдсэн',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Дээр шинэчилсэн',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Энэ нь импортлох үед имэйл хаяг үүсгэхэд ашиглагддаг',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Эхний анхны нэр (jsmith@example.com)',
'firstname_lastname_format' => 'Эхний нэрний нэр (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Oвог нэр (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Дахин ашиглах боломжгүй байна',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Хэрэглэгчийн нэр Формат',
+ 'username' => 'Username',
'update' => 'Шинэчлэх',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Байршуулсан байна',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/mn/passwords.php b/resources/lang/mn/passwords.php
index 602040a520..25633b4581 100644
--- a/resources/lang/mn/passwords.php
+++ b/resources/lang/mn/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Уг имэйл дээр бүртгэлтэй хэрэглэгч байхгүй байна.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/mn/reminders.php b/resources/lang/mn/reminders.php
index a389afe393..ce67acc77b 100644
--- a/resources/lang/mn/reminders.php
+++ b/resources/lang/mn/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Нууц үг дор хаяж 6 тэмдэгт урттай бөгөөд давхар баталгаажуулж оруулсантайгаа таарч байх ёстой.",
-
"user" => "Хэрэглэгчийн нэр эсвэл имэйл хаяг буруу байна",
-
- "token" => "Нууц үг сэргээх токен буруу байна.",
-
- "sent" => "Хэрэв имэйл хаяг бүртгэгдсэн байвал нууц үг сануулах имэйлийг илгээх болно!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/mn/validation.php b/resources/lang/mn/validation.php
index bd55ab8bbd..d2f3a9a4d8 100644
--- a/resources/lang/mn/validation.php
+++ b/resources/lang/mn/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Агуулга формат буруу байна.',
'unique_undeleted' => ':attribute дахин давтагдашгүй байх ёстой.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ms/admin/custom_fields/general.php b/resources/lang/ms/admin/custom_fields/general.php
index 14549f163a..f2cb542dc7 100644
--- a/resources/lang/ms/admin/custom_fields/general.php
+++ b/resources/lang/ms/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ms/admin/custom_fields/message.php b/resources/lang/ms/admin/custom_fields/message.php
index ad0be7bf1a..1e6d79f7ea 100644
--- a/resources/lang/ms/admin/custom_fields/message.php
+++ b/resources/lang/ms/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ms/admin/hardware/form.php b/resources/lang/ms/admin/hardware/form.php
index ad926b5119..16e8e9542f 100644
--- a/resources/lang/ms/admin/hardware/form.php
+++ b/resources/lang/ms/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ms/admin/users/general.php b/resources/lang/ms/admin/users/general.php
index 2fb7511600..65023da2b3 100644
--- a/resources/lang/ms/admin/users/general.php
+++ b/resources/lang/ms/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Log masuk terakhir',
'ldap_config_text' => 'Tetapan konfigurasi LDAP boleh didapati Admin> Tetapan. Lokasi (pilihan) yang dipilih akan ditetapkan untuk semua pengguna yang diimport.',
'print_assigned' => 'Cetak Semua yang Diperuntukkan',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Perisian diagihkan kepada :nama',
'send_email_help' => 'Anda mesti memberikan alamat e-mel untuk pengguna ini menghantar bukti kelayakan kepada mereka. Bukti kelayakan e-mel hanya boleh dilakukan pada penciptaan pengguna. Kata laluan disimpan dalam cincang sehala dan tidak boleh diambil semula setelah disimpan.',
'view_user' => 'Papar Pengguna :nama',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ms/general.php b/resources/lang/ms/general.php
index 2742fd8a0e..5319ad8a9e 100644
--- a/resources/lang/ms/general.php
+++ b/resources/lang/ms/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Cipta Baru',
'created' => 'Perkara yang Dibuat',
'created_asset' => 'cipta harta',
- 'created_at' => 'Cipta Pada',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Dikemaskini di',
'currency' => 'RM', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Ini digunakan untuk menjana alamat e-mel semasa mengimport',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Nama Akhir Permulaan Pertama (jsmith@example.com)',
'firstname_lastname_format' => 'Nama Akhir Nama Pertama (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Nama Pertama Nama Akhir (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Tidak Boleh Agih',
'unknown_admin' => 'Pentadbir Tidak Dikenali',
'username_format' => 'Format Nama Pengguna',
+ 'username' => 'Username',
'update' => 'Kemas kini',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Dimuat naik',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ms/passwords.php b/resources/lang/ms/passwords.php
index edc27178ac..25633b4581 100644
--- a/resources/lang/ms/passwords.php
+++ b/resources/lang/ms/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Tiada pengguna aktif yang menggunakan email ini.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ms/reminders.php b/resources/lang/ms/reminders.php
index b1dd77aeb4..46b8b3b20b 100644
--- a/resources/lang/ms/reminders.php
+++ b/resources/lang/ms/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Kata Kunci mesti terdiri dari 6 huruf dan sama dengan pengesahan.",
-
"user" => "Kata Laluan atau alamat e-mel tidak betul. ",
-
- "token" => "Token Kata kunci tidak sah.",
-
- "sent" => "Jika alamat email yang sesuai ditemui, peringatan kata kunci telha dihantar!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ms/validation.php b/resources/lang/ms/validation.php
index 5a5021f500..da0ac2607e 100644
--- a/resources/lang/ms/validation.php
+++ b/resources/lang/ms/validation.php
@@ -91,6 +91,11 @@ return [
'url' => ':attribute format tidak sah.',
'unique_undeleted' => ':attribute mesti unik.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/nl/account/general.php b/resources/lang/nl/account/general.php
index 7fc060a849..417063ebc1 100644
--- a/resources/lang/nl/account/general.php
+++ b/resources/lang/nl/account/general.php
@@ -1,12 +1,12 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
+ 'personal_api_keys' => 'Persoonlijke API-sleutels',
+ 'api_key_warning' => 'Bij het genereren van een API-token, zorg ervoor dat je deze direct kopieert, omdat deze
+ niet zichtbaar voor je is.',
+ 'api_base_url' => 'Je API-basis-url bevindt zich op:',
'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'api_token_expiration_time' => 'API tokens zijn ingesteld om te verlopen in:',
+ 'api_reference' => 'Raadpleeg de API-referentie
+ om specifieke API-eindpunten en aanvullende API-documentatie te vinden.',
);
diff --git a/resources/lang/nl/admin/custom_fields/general.php b/resources/lang/nl/admin/custom_fields/general.php
index 43329f9994..a8bd84c60f 100644
--- a/resources/lang/nl/admin/custom_fields/general.php
+++ b/resources/lang/nl/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optioneel - klik om vereist te maken',
'reorder' => 'Herordenen',
'db_field' => 'DB veld',
- 'db_convert_warning' => 'WAARSCHUWING. Dit veld staat in de tabel met aangepaste velden als :db_column
maar moet :expected zijn.',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Deze waarde moet uniek zijn voor alle assets',
'unique' => 'Uniek',
];
diff --git a/resources/lang/nl/admin/custom_fields/message.php b/resources/lang/nl/admin/custom_fields/message.php
index a645712726..c05e051215 100644
--- a/resources/lang/nl/admin/custom_fields/message.php
+++ b/resources/lang/nl/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/nl/admin/hardware/form.php b/resources/lang/nl/admin/hardware/form.php
index 4ed8693cd4..6a229e035c 100644
--- a/resources/lang/nl/admin/hardware/form.php
+++ b/resources/lang/nl/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'Deze Asset status is niet uitgeefbaar. Dit Asset kan niet uitgegeven worden.',
'asset_deployable' => 'Deze status is uitgeefbaar. Dit Asset kan uitgegeven worden.',
'processing_spinner' => 'Verwerken...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/nl/admin/hardware/message.php b/resources/lang/nl/admin/hardware/message.php
index 031004e843..27b19e78da 100644
--- a/resources/lang/nl/admin/hardware/message.php
+++ b/resources/lang/nl/admin/hardware/message.php
@@ -17,7 +17,7 @@ return [
'error' => 'Asset is niet gewijzigd, probeer het opnieuw',
'success' => 'Asset is succesvol bijgewerkt.',
'nothing_updated' => 'Geen veld is geselecteerd, er is dus niks gewijzigd.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => 'Er zijn geen assets geselecteerd, er is dus niets bijgewerkt.',
],
'restore' => [
diff --git a/resources/lang/nl/admin/settings/general.php b/resources/lang/nl/admin/settings/general.php
index 58d4158b58..1088cfe9ff 100644
--- a/resources/lang/nl/admin/settings/general.php
+++ b/resources/lang/nl/admin/settings/general.php
@@ -28,7 +28,7 @@ return [
'auto_increment_prefix' => 'Voorvoegsel (niet verplicht)',
'auto_incrementing_help' => 'Schakel eerst automatisch verhogen van asset Id\'s in om dit in te stellen',
'backups' => 'Back-ups',
- 'backups_help' => 'Create, download, and restore backups ',
+ 'backups_help' => 'Maken, downloaden en herstellen van back-ups ',
'backups_restoring' => 'Herstellen vanuit back-up',
'backups_upload' => 'Backup uploaden',
'backups_path' => 'Back-ups op de server worden opgeslagen in :path
',
@@ -85,7 +85,7 @@ return [
'ldap_client_tls_key' => 'LDAP Client-Side TLS-sleutel',
'ldap_login_test_help' => 'Voer een geldig LDAP gebruikersnaam en paswoord in van de base DN die u hierboven heeft bepaald. Dit om te testen of uw LDAP login correct is geconfigureerd. U MOET EERST UW BIJGEWERKTE LDAP INSTELLINGEN OPSLAAN.',
'ldap_login_sync_help' => 'Dit test enkel of LDAP correct kan synchroniseren. Als uw LDAP authenticatie vraag niet correct is, dan is het mogelijk dat gebruikers niet kunnen inloggen. U MOET EERST UW BIJGEWERKTE LDAP INSTELLINGEN OPSLAAN.',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'LDAP manager',
'ldap_server' => 'LDAP server',
'ldap_server_help' => 'Dit moet beginnen met ldap:// (voor onversleuteld of TLS) of ldaps:// (voor SSL)',
'ldap_server_cert' => 'LDAP SSL certificaat validatie',
diff --git a/resources/lang/nl/admin/settings/table.php b/resources/lang/nl/admin/settings/table.php
index 22db5c84ed..15aea01c39 100644
--- a/resources/lang/nl/admin/settings/table.php
+++ b/resources/lang/nl/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
- 'size' => 'Size',
+ 'created' => 'Aangemaakt',
+ 'size' => 'Grootte',
);
diff --git a/resources/lang/nl/admin/users/general.php b/resources/lang/nl/admin/users/general.php
index 401fb10b0e..1d7f5a69d7 100644
--- a/resources/lang/nl/admin/users/general.php
+++ b/resources/lang/nl/admin/users/general.php
@@ -17,15 +17,17 @@ return [
'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.',
'print_assigned' => 'Print alles wat toegewezen is',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software is uitgecheckt aan :name',
'send_email_help' => 'U moet een e-mailadres opgeven voor deze gebruiker om hen inloggegevens te sturen. E-mailen van inloggegevens kan alleen worden gedaan bij het maken van gebruikers. Wachtwoorden worden in eenrichtingshash opgeslagen en kunnen niet worden opgehaald zodra ze zijn opgeslagen.',
'view_user' => 'Bekijk gebruiker :name',
'usercsv' => 'CSV bestand',
'two_factor_admin_optin_help' => 'De huidige beheer instellingen staan selectief gebruik van twee factor authenticatie toe. ',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
+ 'two_factor_enrolled' => '2FA apparaat ingeschreven ',
+ 'two_factor_active' => '2FA actief ',
+ 'user_deactivated' => 'Gebruiker kan niet inloggen',
+ 'user_activated' => 'Gebruiker kan inloggen',
'activation_status_warning' => 'Activatiestatus niet wijzigen',
'group_memberships_helpblock' => 'Alleen superadmins kunnen leden van groepen bewerken.',
'superadmin_permission_warning' => 'Alleen superbeheerders mogen superadmin toegang verlenen aan een gebruiker.',
@@ -33,10 +35,10 @@ return [
'remove_group_memberships' => 'Groep lidmaatschappen verwijderen',
'warning_deletion' => 'WAARSCHUWING:',
'warning_deletion_information' => 'U staat op het punt om de :count gebruiker(s) hieronder te verwijderen. Superadmin namen worden rood gemarkeerd.',
- 'update_user_asssets_status' => 'Alle assets voor deze gebruikers naar deze status updaten',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check-in alle eigendommen gekoppeld aan deze gebruikers',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'remote_label' => 'Dit is een externe gebruiker',
+ 'remote' => 'Extern',
+ 'remote_help' => 'Dit kan handig zijn als je moet filteren op externe gebruikers die nooit of zelden op je fysieke locatie komen.',
+ 'not_remote_label' => 'Dit is geen externe gebruiker',
];
diff --git a/resources/lang/nl/admin/users/table.php b/resources/lang/nl/admin/users/table.php
index 83ee44d46c..7f0dfbd46a 100644
--- a/resources/lang/nl/admin/users/table.php
+++ b/resources/lang/nl/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => 'E-mail',
'employee_num' => 'Werknemersnummer',
'first_name' => 'Voornaam',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => 'Selecteer een groep om toe te wijzen aan de gebruiker, onthoud dat een gebruiker de rechten aanneemt van de groep waaraan hij is toegewezen. Gebruik ctrl+click (of cmd+klik op MacOS) om groepen te deselecteren.',
'id' => 'Id',
'inherit' => 'Overnemen',
'job' => 'Functie omschrijving',
diff --git a/resources/lang/nl/auth.php b/resources/lang/nl/auth.php
index db310aa1bb..64dcb5b7de 100644
--- a/resources/lang/nl/auth.php
+++ b/resources/lang/nl/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'Deze gegevens komen niet overeen met onze administratie.',
+ 'password' => 'Het opgegeven wachtwoord is onjuist.',
+ 'throttle' => 'Te veel inlogpogingen. Probeer het over :seconds seconden opnieuw.',
);
diff --git a/resources/lang/nl/general.php b/resources/lang/nl/general.php
index 74149523c1..78a7ab779c 100644
--- a/resources/lang/nl/general.php
+++ b/resources/lang/nl/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Nieuwe aanmaken',
'created' => 'Item aangemaakt',
'created_asset' => 'aangemaakt asset',
- 'created_at' => 'Aangemaakt op',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record gemaakt',
'updated_at' => 'Bijgewerkt op',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Personeelsnummer',
'email_domain_help' => 'Dit wordt gebruikt voor het genereren van e-mailadressen bij het importeren',
'error' => 'Foutmelding',
+ 'example' => 'Example: ',
'filastname_format' => 'Eerste Initiaal Achternaam (jsmith@example.com)',
'firstname_lastname_format' => 'Voornaam Achternaam (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Voornaam Achternaam (nomen.nescio@voorbeeld.nl)',
@@ -115,7 +117,7 @@ return [
'files' => 'Bestanden',
'file_name' => 'Bestand',
'file_type' => 'Bestandstype',
- 'filesize' => 'File Size',
+ 'filesize' => 'Bestands grootte',
'file_uploads' => 'Bestand uploaden',
'file_upload' => 'Bestand uploaden',
'generate' => 'Genereer',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Niet-uitgeefbaar',
'unknown_admin' => 'Onbekende Beheerder',
'username_format' => 'Gebruikersnaam indeling',
+ 'username' => 'Username',
'update' => 'Bijwerken',
'upload_filetypes_help' => 'Toegestane bestandstypen zijn png, gif, jpg, jpeg, doc, docx, pdf, xlsx, txt, lic, xml, zip, rtf en rar. Maximale toegestane uploadgrootte is :size.',
'uploaded' => 'Geupload',
@@ -354,7 +357,11 @@ return [
'checkout_tooltip' => 'Check dit item uit',
'checkin_tooltip' => 'Check dit item in',
'checkout_user_tooltip' => 'Check dit item uit aan een gebruiker',
- 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
- 'maintenance_mode_title' => 'System Temporarily Unavailable',
- 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'maintenance_mode' => 'De service is tijdelijk niet beschikbaar voor systeemupdates. Probeer het later nog eens.',
+ 'maintenance_mode_title' => 'Dienst tijdelijk niet beschikbaar',
+ 'ldap_import' => 'Het gebruikerswachtwoord mag niet worden beheerd door LDAP. (Hiermee kun je vergeten wachtwoord aanvragen verzenden.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/nl/passwords.php b/resources/lang/nl/passwords.php
index 2685c1bc1c..25633b4581 100644
--- a/resources/lang/nl/passwords.php
+++ b/resources/lang/nl/passwords.php
@@ -1,6 +1,8 @@
'Succes: Als dit e-mailadres bestaat in ons systeem, is er een wachtwoord herstel e-mail verzonden.',
- 'user' => 'Geen overeenkomende actieve gebruiker gevonden met dit e-mailadres.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/nl/reminders.php b/resources/lang/nl/reminders.php
index ba4c294dfe..ae11fdaa14 100644
--- a/resources/lang/nl/reminders.php
+++ b/resources/lang/nl/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Paswoorden moeten 6 karakters lang zijn en gelijk zijn in beide paswoordvelden.",
-
"user" => "Gebruikersnaam of e-mailadres is niet correct",
-
- "token" => "De token voor paswoordherstel is niet correct.",
-
- "sent" => "Indien het e-mailadres bestaat, werd een paswoordhint verstuurd",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/nl/validation.php b/resources/lang/nl/validation.php
index a7806a5939..d25797fb0a 100644
--- a/resources/lang/nl/validation.php
+++ b/resources/lang/nl/validation.php
@@ -91,8 +91,13 @@ return [
'url' => 'Het formaat van :attribute is ongeldig.',
'unique_undeleted' => 'De :attribute moet uniek zijn. ',
'non_circular' => ':attribute mag geen circulaire referentie aanmaken.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
- 'numeric' => 'Value cannot be negative'
+ 'numeric' => 'Waarde mag niet negatief zijn'
],
diff --git a/resources/lang/no/admin/custom_fields/general.php b/resources/lang/no/admin/custom_fields/general.php
index 42d82d4b79..389a2cbbf2 100644
--- a/resources/lang/no/admin/custom_fields/general.php
+++ b/resources/lang/no/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Valgfritt - klikk for å gjøre påkrevd',
'reorder' => 'Endre rekkefølge',
'db_field' => 'DB-felt',
- 'db_convert_warning' => 'ADVARSEL: Dette feltet er i tabellen for egendefinerte felt som :db_column
, men burde være :expected
.',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/no/admin/custom_fields/message.php b/resources/lang/no/admin/custom_fields/message.php
index 61b19d9b4f..014aa91457 100644
--- a/resources/lang/no/admin/custom_fields/message.php
+++ b/resources/lang/no/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/no/admin/hardware/form.php b/resources/lang/no/admin/hardware/form.php
index 53e2de8cbe..7fd3acc87c 100644
--- a/resources/lang/no/admin/hardware/form.php
+++ b/resources/lang/no/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'Den eiendelstatusen gjør at denne eiendelen ikke kan sjekkes ut.',
'asset_deployable' => 'Den statusen gjør det mulig å sjekke ut denne eiendelen.',
'processing_spinner' => 'Behandler...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/no/admin/users/general.php b/resources/lang/no/admin/users/general.php
index 9fafe4555a..a7824e4478 100644
--- a/resources/lang/no/admin/users/general.php
+++ b/resources/lang/no/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Siste innlogging',
'ldap_config_text' => 'LDAP-konfigurasjonsinnstillingene kan finnes på Admin > innstillinger. Den (Valgfrie) valgte plasseringen angis for alle importerte brukere.',
'print_assigned' => 'Skriv ut alt tilordnet',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Programvare utsjekket til :name',
'send_email_help' => 'Du må legge inn brukerens e-postadresse for å kunne sende dem innloggingsinformasjon. Sending av innloggingsinformasjon kan kun gjøres når brukeren blir opprettet. Passordet lagres på en sikker måte, slik at det ikke kan hentes opp når det er lagret.',
'view_user' => 'Vis bruker :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Fjern gruppemedlemskap',
'warning_deletion' => 'ADVARSEL:',
'warning_deletion_information' => 'Du er i ferd med å slette :count brukere listet nedenfor. Superadmin-brukere er uthevet med rødt.',
- 'update_user_asssets_status' => 'Oppdater alle eiendelens til disse brukerne til denne statusen',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Sjekk inn alt tilbehør koblet til disse brukerne',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/no/general.php b/resources/lang/no/general.php
index d36c969ed3..06069e0fae 100644
--- a/resources/lang/no/general.php
+++ b/resources/lang/no/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Opprett ny',
'created' => 'Enhet opprettet',
'created_asset' => 'eiendel opprettet',
- 'created_at' => 'Opprettet',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Post opprettet',
'updated_at' => 'Oppdatert',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Brukes til å generere e-postadresser ved import',
'error' => 'Feil',
+ 'example' => 'Example: ',
'filastname_format' => 'Fornavn (kun initial) Etternavn (oladunk@example.com)',
'firstname_lastname_format' => 'Fornavn Etternavn (oladunk@example.com)',
'firstname_lastname_underscore_format' => 'Fornavn Etternavn (oladunk@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Ikke utleverbar',
'unknown_admin' => 'Ukjent admin',
'username_format' => 'Format brukernavn',
+ 'username' => 'Username',
'update' => 'Oppdater',
'upload_filetypes_help' => 'Tillatte filtyper er png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf og rar. Maks. filstørrelse er :size.',
'uploaded' => 'Lastet opp',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/no/passwords.php b/resources/lang/no/passwords.php
index e821aa182d..25633b4581 100644
--- a/resources/lang/no/passwords.php
+++ b/resources/lang/no/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Ingen aktiv bruker med den epostadressen funnet.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/no/reminders.php b/resources/lang/no/reminders.php
index 63956d429f..6c3180abcd 100644
--- a/resources/lang/no/reminders.php
+++ b/resources/lang/no/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passord må bestå av minst 6 tegn og stemme med bekreftelse.",
-
"user" => "Brukernavn eller epostadresse er ugyldig",
-
- "token" => "Denne passordresetten er ugyldig.",
-
- "sent" => "En passordpåminnelse er sendt hvis en gyldig e-postadresse ble funnet.",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/no/validation.php b/resources/lang/no/validation.php
index 2a2f66f447..c2343f3c81 100644
--- a/resources/lang/no/validation.php
+++ b/resources/lang/no/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Attributt-formatet :attribute er ugyldig.',
'unique_undeleted' => ':attribute må være unikt.',
'non_circular' => 'Attributtet :attribute kan ikke opprette en sirkulær referanse.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/pl/account/general.php b/resources/lang/pl/account/general.php
index 7fc060a849..de67cc02cb 100644
--- a/resources/lang/pl/account/general.php
+++ b/resources/lang/pl/account/general.php
@@ -1,12 +1,12 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
+ 'personal_api_keys' => 'Osobiste klucze API',
+ 'api_key_warning' => 'Po wygenerowaniu tokena API upewnij się, że skopiujesz go natychmiast, ponieważ
+ nie będzie potem widoczny.',
'api_base_url' => 'Your API base url is located at:',
'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'api_token_expiration_time' => 'Tokeny API tracą ważność za:',
+ 'api_reference' => 'Sprawdź API reference, aby
+ znaleźć konkretne enpoint-y API i dodatkową dokumentację API.',
);
diff --git a/resources/lang/pl/admin/custom_fields/general.php b/resources/lang/pl/admin/custom_fields/general.php
index f325fc4794..c776e46d27 100644
--- a/resources/lang/pl/admin/custom_fields/general.php
+++ b/resources/lang/pl/admin/custom_fields/general.php
@@ -33,7 +33,7 @@ return [
'value_encrypted' => 'Wartość tego pola jest zaszyfrowana w bazie danych. Tylko admini będą mogli wyświetlić rozszyfrowaną wartość',
'show_in_email' => 'Czy podać wartość tego pola w e-mailach z przypisaniem, wysłanych do użytkownika? Zaszyfrowane pola nie mogą być zawarte w wiadomościach e-mail.',
'help_text' => 'Tekst pomocniczy',
- 'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
+ 'help_text_description' => 'Jest to tekst opcjonalny, który pojawi się pod elementami formularza podczas edycji zasobu w celu zapewnienia kontekstu.',
'about_custom_fields_title' => 'O polach niestandardowych',
'about_custom_fields_text' => 'Pola niestandardowe pozwalają na dodawanie dowolnych atrybutów do środków trwałych.',
'add_field_to_fieldset' => 'Dodaj pole do listy pól',
@@ -41,7 +41,7 @@ return [
'make_required' => 'Opcjonalnie - kliknij, aby ustawić jako wymagane',
'reorder' => 'Zmień kolejność',
'db_field' => 'Pole bazy danych',
- 'db_convert_warning' => 'UWAGA. To pole znajduje się w tabeli pól niestandardowych jako :db_column
ale powinno być :expected .',
- 'is_unique' => 'This value must be unique across all assets',
- 'unique' => 'Unique',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
+ 'is_unique' => 'Ta wartość musi być unikalna dla wszystkich aktywów',
+ 'unique' => 'Unikalny',
];
diff --git a/resources/lang/pl/admin/custom_fields/message.php b/resources/lang/pl/admin/custom_fields/message.php
index 9fc2f5b0b4..a907254b58 100644
--- a/resources/lang/pl/admin/custom_fields/message.php
+++ b/resources/lang/pl/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/pl/admin/hardware/form.php b/resources/lang/pl/admin/hardware/form.php
index 307e8a1fb3..8a75a90521 100644
--- a/resources/lang/pl/admin/hardware/form.php
+++ b/resources/lang/pl/admin/hardware/form.php
@@ -43,7 +43,9 @@ return [
'asset_location' => 'Zaktualizuj lokalizację aktywa',
'asset_location_update_default_current' => 'Zaktualizuj domyślną i aktualną lokalizację',
'asset_location_update_default' => 'Zaktualizuj tylko domyślną lokalizację',
- 'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
- 'asset_deployable' => 'That status is deployable. This asset can be checked out.',
+ 'asset_not_deployable' => 'Ten status oznacza brak możliwości wdrożenia. Ten zasób nie może zostać przypisany.',
+ 'asset_deployable' => 'Ten status oznacza możliwość wdrożenia. Ten zasób może zostać przypisany.',
'processing_spinner' => 'Przetwarzanie...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/pl/admin/hardware/message.php b/resources/lang/pl/admin/hardware/message.php
index 0be380fc3f..a05e329b9d 100644
--- a/resources/lang/pl/admin/hardware/message.php
+++ b/resources/lang/pl/admin/hardware/message.php
@@ -17,7 +17,7 @@ return [
'error' => 'Nie zaktualizowano nabytku/zasobu, proszę spróbować ponownie',
'success' => 'Aktualizacja poprawna.',
'nothing_updated' => 'Żadne pole nie zostało wybrane, więc nic nie zostało zmienione.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => 'Żadne aktywa nie zostały wybrane, więc nic nie zostało zmienione.',
],
'restore' => [
diff --git a/resources/lang/pl/admin/kits/general.php b/resources/lang/pl/admin/kits/general.php
index 4e378c8d98..a8dc2d4efd 100644
--- a/resources/lang/pl/admin/kits/general.php
+++ b/resources/lang/pl/admin/kits/general.php
@@ -19,7 +19,7 @@ return [
'update_appended_consumable' => 'Update appended Consumable',
'append_license' => 'Dołącz licencję',
'update_appended_license' => 'Zaktualizuj załączone licencje',
- 'append_model' => 'Append model',
+ 'append_model' => 'Dołącz model',
'update_appended_model' => 'Update appended model',
'license_error' => 'Licencja została już dołączona do zestawu',
'license_added_success' => 'Licencja została pomyślnie dodana',
@@ -36,15 +36,15 @@ return [
'accessory_updated' => 'Accessory was successfully updated',
'accessory_detached' => 'Accessory was successfully detached',
'accessory_error' => 'Accessory already attached to kit',
- 'accessory_deleted' => 'Delete was successful',
+ 'accessory_deleted' => 'Usuwanie zakończone powodzeniem',
'accessory_none' => 'Akcesorium nie istnieje',
'checkout_success' => 'Checkout was successful',
'checkout_error' => 'Checkout error',
- 'kit_none' => 'Kit does not exist',
- 'kit_created' => 'Kit was successfully created',
- 'kit_updated' => 'Kit was successfully updated',
- 'kit_not_found' => 'Kit not found',
- 'kit_deleted' => 'Kit was successfully deleted',
- 'kit_model_updated' => 'Model was successfully updated',
- 'kit_model_detached' => 'Model was successfully detached',
+ 'kit_none' => 'Zestaw nie istnieje',
+ 'kit_created' => 'Zestaw został pomyślnie utworzony',
+ 'kit_updated' => 'Zestaw został pomyślnie zaktualizowany',
+ 'kit_not_found' => 'Zestaw nie został znaleziony',
+ 'kit_deleted' => 'Zestaw został pomyślnie usunięty',
+ 'kit_model_updated' => 'Model został pomyślnie zaktualizowany',
+ 'kit_model_detached' => 'Model został pomyślnie odłączony',
];
diff --git a/resources/lang/pl/admin/settings/general.php b/resources/lang/pl/admin/settings/general.php
index 2d54da3cf8..e440f08442 100644
--- a/resources/lang/pl/admin/settings/general.php
+++ b/resources/lang/pl/admin/settings/general.php
@@ -28,7 +28,7 @@ return [
'auto_increment_prefix' => 'Prefix (opcjonalnie)',
'auto_incrementing_help' => 'Enable auto-incrementing asset tags first to set this',
'backups' => 'Kopie zapasowe',
- 'backups_help' => 'Create, download, and restore backups ',
+ 'backups_help' => 'Utwórz, pobieraj i przywracaj kopie zapasowe ',
'backups_restoring' => 'Przywróć z kopii zapasowej',
'backups_upload' => 'Prześlij kopię zapasową',
'backups_path' => 'Kopie zapasowe na serwerze są przechowywane w :path
',
@@ -85,7 +85,7 @@ return [
'ldap_client_tls_key' => 'LDAP Client-Side TLS key',
'ldap_login_test_help' => 'Wprowadź poprawną nazwę użytkownika i hasło w podstawowej domenie, którą wprowadziłeś wyżej. W ten sposób przetestujesz czy logowanie LDAP jest poprawnie skonfigurowane. KONIECZNIE ZAPISZ WCZEŚNIEJ SWOJE USTAWIENIA LDAP.',
'ldap_login_sync_help' => 'To tylko sprawdza, czy LDAP może poprawnie się synchronizować. Jeśli zapytanie o autoryzację LDAP nie jest poprawne, użytkownicy nadal mogą nie być w stanie się zalogować. NAJPIERW MUSISZ ZAPISAĆ TWOJE WCZEŚNIEJSZE AKTUALIZACJE USTAWIEŃ LDAP.',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'Menedżer LDAP',
'ldap_server' => 'Serwery LDAP',
'ldap_server_help' => 'To powinno się rozpocząć od ldap: / / (dla nieszyfrowanych połączeń) lub ldaps: / / (dla szyfrowanych połączeń)',
'ldap_server_cert' => 'Walidacja certyfikatu SSL dla LDAP',
@@ -163,8 +163,8 @@ return [
'qr_help' => 'Aby użyć tej opcji odblokuj Kody QR',
'qr_text' => 'Tekst kodu QR',
'saml' => 'SAML',
- 'saml_title' => 'Update SAML settings',
- 'saml_help' => 'SAML settings',
+ 'saml_title' => 'Zaktualizuj ustawienia SAML',
+ 'saml_help' => 'Ustawienia SAML',
'saml_enabled' => 'SAML włączone',
'saml_integration' => 'Integracja z SAML',
'saml_sp_entityid' => 'ID jednostki',
@@ -278,18 +278,18 @@ return [
'oauth_help' => 'Ustawienia punktu końcowego Oauth',
'asset_tag_title' => 'Update Asset Tag Settings',
'barcode_title' => 'Update Barcode Settings',
- 'barcodes' => 'Barcodes',
- 'barcodes_help_overview' => 'Barcode & QR settings',
+ 'barcodes' => 'Kody kreskowe',
+ 'barcodes_help_overview' => 'Kod kreskowy & Ustawienia QR',
'barcodes_help' => 'This will attempt to delete cached barcodes. This would typically only be used if your barcode settings have changed, or if your Snipe-IT URL has changed. Barcodes will be re-generated when accessed next.',
'barcodes_spinner' => 'Attempting to delete files...',
- 'barcode_delete_cache' => 'Delete Barcode Cache',
+ 'barcode_delete_cache' => 'Usuń pamięć podręczną kodu kreskowego',
'branding_title' => 'Update Branding Settings',
'general_title' => 'Update General Settings',
'mail_test' => 'Wyślij wiadomość testową',
'mail_test_help' => 'This will attempt to send a test mail to :replyto.',
'filter_by_keyword' => 'Filter by setting keyword',
- 'security' => 'Security',
- 'security_title' => 'Update Security Settings',
+ 'security' => 'Bezpieczeństwo',
+ 'security_title' => 'Aktualizuj ustawienia zabezpieczeń',
'security_keywords' => 'password, passwords, requirements, two factor, two-factor, common passwords, remote login, logout, authentication',
'security_help' => 'Two-factor, Password Restrictions',
'groups_keywords' => 'permissions, permission groups, authorization',
@@ -297,26 +297,26 @@ return [
'localization' => 'Lokalizacja',
'localization_title' => 'Aktualizuj ustawienia lokalizacji',
'localization_keywords' => 'localization, currency, local, locale, time zone, timezone, international, internatinalization, language, languages, translation',
- 'localization_help' => 'Language, date display',
+ 'localization_help' => 'Język, wyświetlanie daty',
'notifications' => 'Powiadomienia',
'notifications_help' => 'Email alerts, audit settings',
'asset_tags_help' => 'Incrementing and prefixes',
'labels' => 'Etykiety',
- 'labels_title' => 'Update Label Settings',
+ 'labels_title' => 'Aktualizuj ustawienia etykiety',
'labels_help' => 'Rozmiary etykiet i ustawienia',
'purge' => 'Purge',
- 'purge_keywords' => 'permanently delete',
- 'purge_help' => 'Purge Deleted Records',
- 'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.',
+ 'purge_keywords' => 'trwałe usunięcie',
+ 'purge_help' => 'Wyczyść usunięte rekordy',
+ 'ldap_extension_warning' => 'Nie wygląda na to, że rozszerzenie LDAP jest zainstalowane lub włączone na tym serwerze. Nadal możesz zapisać swoje ustawienia, ale musisz włączyć rozszerzenie LDAP dla PHP, zanim synchronizacja lub logowanie LDAP zadziała.',
'ldap_ad' => 'LDAP/AD',
- 'employee_number' => 'Employee Number',
+ 'employee_number' => 'Numer pracownika',
'create_admin_user' => 'Create a User ::',
'create_admin_success' => 'Sukces! Twój użytkownik administratracyjny został dodany!',
'create_admin_redirect' => 'Click here to go to your app login!',
'setup_migrations' => 'Migracje bazy danych ::',
'setup_no_migrations' => 'There was nothing to migrate. Your database tables were already set up!',
- 'setup_successful_migrations' => 'Your database tables have been created',
- 'setup_migration_output' => 'Migration output:',
+ 'setup_successful_migrations' => 'Twoje tabele bazy danych zostały utworzone',
+ 'setup_migration_output' => 'Wyniki migracji:',
'setup_migration_create_user' => 'Następnie: Stwórz użytkownika',
'ldap_settings_link' => 'Ustawienia LDAP',
'slack_test' => 'Test Integration',
diff --git a/resources/lang/pl/admin/settings/table.php b/resources/lang/pl/admin/settings/table.php
index 22db5c84ed..96450d62d2 100644
--- a/resources/lang/pl/admin/settings/table.php
+++ b/resources/lang/pl/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
- 'size' => 'Size',
+ 'created' => 'Utworzono',
+ 'size' => 'Rozmiar',
);
diff --git a/resources/lang/pl/admin/users/general.php b/resources/lang/pl/admin/users/general.php
index c8972d9696..ffb9e3db31 100644
--- a/resources/lang/pl/admin/users/general.php
+++ b/resources/lang/pl/admin/users/general.php
@@ -17,15 +17,17 @@ return [
'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.',
'print_assigned' => 'Drukuj wszystko przypisane',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Oprogramowanie przypisane do :name',
'send_email_help' => 'Musisz podać adres e-mail dla tego użytkownika, aby wysłać mu poświadczenia. Wysłanie danych logowania jest możliwe tylko w czasie tworzenia użytkownika. Hasła są zaszyfrowane i nie można ich odzyskać po zapisaniu.',
'view_user' => 'Zobacz Użytkownika :name',
'usercsv' => 'plik CSV',
'two_factor_admin_optin_help' => 'Bieżące ustawienia administracyjne pozwalają na wybiórcze rejestrowanie uwierzytelniania dwuskładnikowego. ',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
+ 'two_factor_enrolled' => 'Zarejestrowane urządzenie 2FA ',
+ 'two_factor_active' => 'Aktywne 2FA ',
+ 'user_deactivated' => 'Użytkownik nie może zalogować się',
+ 'user_activated' => 'Użytkownik może zalogować się',
'activation_status_warning' => 'Nie zmieniaj statusu aktywacji',
'group_memberships_helpblock' => 'Tylko administratorzy mogą edytować członkostwo w grupie.',
'superadmin_permission_warning' => 'Tylko superadministratorzy mogą udzielić użytkownikowi dostęp do superadmina.',
@@ -33,10 +35,10 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'OSTRZEŻENIE:',
'warning_deletion_information' => 'Zamierzasz usunąć :count użytkowników wymienionych poniżej. Superadministratorzy zaznaczeni są na czerwono.',
- 'update_user_asssets_status' => 'Zaktualizuj wszystkie zasoby dla tych użytkowników do tego statusu',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'remote_label' => 'To jest zdalny użytkownik',
+ 'remote' => 'Zdalny',
+ 'remote_help' => 'Może być przydatne, jeśli chciałbyś filtrować po użytkownikach zdalnych, którzy nigdy lub rzadko są fizycznie w twojej lokalizacji.',
+ 'not_remote_label' => 'To nie jest zdalny użytkownik',
];
diff --git a/resources/lang/pl/admin/users/table.php b/resources/lang/pl/admin/users/table.php
index efd86bf5ec..2dab79d286 100644
--- a/resources/lang/pl/admin/users/table.php
+++ b/resources/lang/pl/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => 'E-mail',
'employee_num' => 'Numer pracownika',
'first_name' => 'Imię',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => 'Wybierz grupę do przypisania użytkownikowi, pamiętaj, że użytkownik korzysta z uprawnień grupy, do której jest przypisany. Użyj ctrl+click (lub cmd+click na MacOS), aby odznaczyć grupy.',
'id' => 'ID',
'inherit' => 'Dziedziczy',
'job' => 'Stanowisko',
diff --git a/resources/lang/pl/auth.php b/resources/lang/pl/auth.php
index db310aa1bb..d3f903635d 100644
--- a/resources/lang/pl/auth.php
+++ b/resources/lang/pl/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'Te dane logowania nie pasują do naszych wpisów.',
+ 'password' => 'Podane hasło jest nieprawidłowe.',
+ 'throttle' => 'Zbyt wiele nieudanych prób logowania. Spróbuj ponownie za :seconds sekund.',
);
diff --git a/resources/lang/pl/general.php b/resources/lang/pl/general.php
index 5a9d26d1e6..bfcc6e3393 100644
--- a/resources/lang/pl/general.php
+++ b/resources/lang/pl/general.php
@@ -19,8 +19,8 @@ return [
'asset' => 'Aktywa',
'asset_report' => 'Raporty Aktywów',
'asset_tag' => 'Krótka nazwa',
- 'asset_tags' => 'Asset Tags',
- 'assets_available' => 'Assets available',
+ 'asset_tags' => 'Tagi zasobu',
+ 'assets_available' => 'Dostępne zasoby',
'accept_assets' => 'Accept Assets :name',
'accept_assets_menu' => 'Zaakceptuj zasoby',
'audit' => 'Audyt',
@@ -65,7 +65,8 @@ return [
'create' => 'Utwórz nowe',
'created' => 'Utworzony element',
'created_asset' => 'Utworzone aktywa',
- 'created_at' => 'Utworzone',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Rekord utworzony',
'updated_at' => 'Zaktualizowano',
'currency' => 'PLN', // this is deprecated
@@ -88,7 +89,7 @@ return [
'department' => 'Lokalizacja',
'deployed' => 'Rozmieszczone',
'depreciation' => 'Amortyzacja',
- 'depreciations' => 'Depreciations',
+ 'depreciations' => 'Amortyzacje',
'depreciation_report' => 'Raport Amortyzacji',
'details' => 'Szczegóły',
'download' => 'Pobieranie',
@@ -97,9 +98,10 @@ return [
'eol' => 'EOL',
'email_domain' => 'Domena poczty e-mail',
'email_format' => 'Format e-mail',
- 'employee_number' => 'Employee Number',
+ 'employee_number' => 'Numer pracownika',
'email_domain_help' => 'To jest używane do generowania e-maili podczas importowania',
'error' => 'Błąd',
+ 'example' => 'Example: ',
'filastname_format' => 'Pierwsza litera imienia i nazwisko (jsmith@example.com)',
'firstname_lastname_format' => 'Imię nazwisko (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Imię Nazwisko (pawel@example.com)',
@@ -115,15 +117,15 @@ return [
'files' => 'Pliki',
'file_name' => 'Plik',
'file_type' => 'Rodzaj pliku',
- 'filesize' => 'File Size',
+ 'filesize' => 'Rozmiar pliku',
'file_uploads' => 'Dodaj plik',
'file_upload' => 'Dodaj plik',
'generate' => 'Generuj',
- 'generate_labels' => 'Generate Labels',
+ 'generate_labels' => 'Generuj etykiety',
'github_markdown' => 'To pole akceptuje markdown z Github\'a.',
'groups' => 'Grupy',
'gravatar_email' => 'adres Email Gravatara',
- 'gravatar_url' => 'Change your avatar at Gravatar.com.',
+ 'gravatar_url' => 'Zmień swój awatar na Gravatar.com.',
'history' => 'Historia',
'history_for' => 'Historia dla',
'id' => 'ID',
@@ -141,7 +143,7 @@ return [
'asset_maintenance_report' => 'Raport utrzymywania aktywów',
'asset_maintenances' => 'Utrzymanie aktywów',
'item' => 'Przedmiot',
- 'item_name' => 'Item Name',
+ 'item_name' => 'Nazwa elementu',
'insufficient_permissions' => 'Brak uprawnień!',
'kits' => 'Predefiniowane zestawy',
'language' => 'Język',
@@ -162,7 +164,7 @@ return [
'logout' => 'Wyloguj się',
'lookup_by_tag' => 'Wyszukaj poprzez znacznik aktywa',
'maintenances' => 'Utrzymanie',
- 'manage_api_keys' => 'Manage API Keys',
+ 'manage_api_keys' => 'Zarządzaj kluczami API',
'manufacturer' => 'Producent',
'manufacturers' => 'Producenci',
'markdown' => 'To pole pozwala na użycie GFM (Github flavored markdown).',
@@ -212,7 +214,7 @@ return [
'request_canceled' => 'Żądanie anulowane',
'save' => 'Zapisz',
'select' => 'Wybierz',
- 'select_all' => 'Select All',
+ 'select_all' => 'Zaznacz wszystko',
'search' => 'Wyszukaj',
'select_category' => 'Wybierz kategorię',
'select_department' => 'Wybierz departament',
@@ -240,7 +242,7 @@ return [
'state' => 'Województwo',
'status_labels' => 'Etykiety Statusu',
'status' => 'Status',
- 'accept_eula' => 'Acceptance Agreement',
+ 'accept_eula' => 'Umowa akceptacyjna',
'supplier' => 'Dostawca',
'suppliers' => 'Dostawcy',
'sure_to_delete' => 'Czy na pewno chcesz usunąć',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Nie przypisane',
'unknown_admin' => 'Nieznany Administrator',
'username_format' => 'Format nazwy użytkownika',
+ 'username' => 'Username',
'update' => 'Zaktualizuj',
'upload_filetypes_help' => 'Dozwolone typy plików to png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip i rar. Maksymalny dozwolony rozmiar przesyłania to :rozmiar.',
'uploaded' => 'Przesłano',
@@ -286,16 +289,16 @@ return [
'show_help' => 'Pokaż pomoc',
'hide_help' => 'Ukryj pomoc',
'view_all' => 'view all',
- 'hide_deleted' => 'Hide Deleted',
+ 'hide_deleted' => 'Ukryj usunięte',
'email' => 'Adres e-mail',
- 'do_not_change' => 'Do Not Change',
- 'bug_report' => 'Report a Bug',
+ 'do_not_change' => 'Nie zmieniaj',
+ 'bug_report' => 'Zgłoś błąd',
'user_manual' => 'User\'s Manual',
'setup_step_1' => 'Krok 1',
'setup_step_2' => 'Krok 2',
'setup_step_3' => 'Krok 3',
'setup_step_4' => 'Krok 4',
- 'setup_config_check' => 'Configuration Check',
+ 'setup_config_check' => 'Sprawdzanie konfiguracji',
'setup_create_database' => 'Create Database Tables',
'setup_create_admin' => 'Utwórz konto administratora',
'setup_done' => 'Finished!',
@@ -306,7 +309,7 @@ return [
'last_checkout' => 'Last Checkout',
'due_to_checkin' => 'The following :count items are due to be checked in soon:',
'expected_checkin' => 'Expected Checkin',
- 'reminder_checked_out_items' => 'This is a reminder of the items currently checked out to you. If you feel this list is inaccurate (something is missing, or something appears here that you believe you never received), please email :reply_to_name at :reply_to_address.',
+ 'reminder_checked_out_items' => 'To jest przypomnienie o aktualnie wydanych Tobie przedmiotach. Jeśli uważasz, że ta lista jest niedokładna (brakuje czegoś lub pojawia się tutaj coś, czego nigdy nie otrzymałeś), prosimy o e-mail :reply_to_name pod adresem: :reply_to_addresse.',
'changed' => 'Changed',
'to' => 'To',
'report_fields_info' => 'Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
@@ -316,13 +319,13 @@ return [ 'improvements' => 'Improvements', 'information' => 'Information', 'permissions' => 'Uprawnienia', - 'managed_ldap' => '(Managed via LDAP)', + 'managed_ldap' => '(Zarządzane przez LDAP)', 'export' => 'Export', - 'ldap_sync' => 'LDAP Sync', - 'ldap_user_sync' => 'LDAP User Sync', + 'ldap_sync' => 'Synchronizacja LDAP', + 'ldap_user_sync' => 'Synchronizacja użytkownika LDAP', 'synchronize' => 'Synchronizuj', 'sync_results' => 'Synchronization Results', - 'license_serial' => 'Serial/Product Key', + 'license_serial' => 'Klucz seryjny/produktu', 'invalid_category' => 'Błędna kategoria', 'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.', '60_percent_warning' => '60% Complete (warning)', @@ -354,7 +357,11 @@ return [ 'checkout_tooltip' => 'Check this item out', 'checkin_tooltip' => 'Check this item in', 'checkout_user_tooltip' => 'Check this item out to a user', - 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', - 'maintenance_mode_title' => 'System Temporarily Unavailable', - 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'maintenance_mode' => 'Usługa jest tymczasowo niedostępna z powodu aktualizacji systemu. Sprawdź ponownie później.', + 'maintenance_mode_title' => 'System tymczasowo niedostępny', + 'ldap_import' => 'Hasło użytkownika nie powinno być zarządzane przez LDAP. (Pozwala to wysyłać prośbę o zresetowanie zapomnianego hasła)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/pl/passwords.php b/resources/lang/pl/passwords.php index 63dd3d1ca3..25633b4581 100644 --- a/resources/lang/pl/passwords.php +++ b/resources/lang/pl/passwords.php @@ -1,6 +1,8 @@ 'Sukces: Jeśli ten adres e-mail istnieje w naszym systemie, e-mail odzyskiwania hasła został wysłany.', - 'user' => 'E-mail nie jest przypisany do żadnego aktywnego konta.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'token' => 'This password reset token is invalid or expired, or does not match the username provided.', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/pl/reminders.php b/resources/lang/pl/reminders.php index 95b6344fe8..b755b1695c 100644 --- a/resources/lang/pl/reminders.php +++ b/resources/lang/pl/reminders.php @@ -14,11 +14,8 @@ return array( */ "password" => "Hasło musi mieć minimum 6 znaków i musi być potwierdzone.", - "user" => "Login lub e-mail jest niepoprawny", - - "token" => "Token resetu hasła jest niepoprawny.", - - "sent" => "Jeśli adres e-mail jest poprawny , przypomnienie hasła zostanie wysłane!", + "token" => 'This password reset token is invalid or expired, or does not match the username provided.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', ); diff --git a/resources/lang/pl/validation.php b/resources/lang/pl/validation.php index 7c747fbf57..9345c9547e 100644 --- a/resources/lang/pl/validation.php +++ b/resources/lang/pl/validation.php @@ -91,8 +91,13 @@ return [ 'url' => 'Format pola :attribute jest niewłaściwy.', 'unique_undeleted' => 'Wartość :attribute musi być unikalna.', 'non_circular' => ':attribute nie może tworzyć odwołań cyklicznych.', + 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', + 'letters' => 'Password must contain at least one letter.', + 'numbers' => 'Password must contain at least one number.', + 'case_diff' => 'Password must use mixed case.', + 'symbols' => 'Password must contain symbols.', 'gte' => [ - 'numeric' => 'Value cannot be negative' + 'numeric' => 'Wartość nie może być ujemna' ], diff --git a/resources/lang/pt-BR/account/general.php b/resources/lang/pt-BR/account/general.php index 7fc060a849..1b060de9b1 100644 --- a/resources/lang/pt-BR/account/general.php +++ b/resources/lang/pt-BR/account/general.php @@ -1,12 +1,12 @@ 'Personal API Keys', - 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they - will not be visible to you again.', - 'api_base_url' => 'Your API base url is located at:', + 'personal_api_keys' => 'Chaves de API pessoal', + 'api_key_warning' => 'Ao gerar um token de API, certifique-se de copiá-lo imediatamente porque + eles não serão visíveis para você novamente.', + 'api_base_url' => 'A sua URL base da API está localizada em:', 'api_base_url_endpoint' => '/<endpoint>', - 'api_token_expiration_time' => 'API tokens are set to expire in:', - 'api_reference' => 'Please check the API reference to - find specific API endpoints and additional API documentation.', + 'api_token_expiration_time' => 'Tokens de API estão definidos para expirar em:', + 'api_reference' => 'Confira a referência da API para + encontrar pontos de API específicos e documentação adicional da API.', ); diff --git a/resources/lang/pt-BR/admin/categories/general.php b/resources/lang/pt-BR/admin/categories/general.php index b9cf699302..b7e890e951 100644 --- a/resources/lang/pt-BR/admin/categories/general.php +++ b/resources/lang/pt-BR/admin/categories/general.php @@ -18,6 +18,6 @@ return array( 'update' => 'Atualizar Categoria', 'use_default_eula' => 'Em vez disso, use o EULA padrão primário.', 'use_default_eula_disabled' => ' :db_column
but should be :expected .',
- 'is_unique' => 'This value must be unique across all assets',
- 'unique' => 'Unique',
+ 'help_text' => 'Texto de ajuda',
+ 'help_text_description' => 'Este é um texto opcional que irá aparecer abaixo dos elementos de formulário ao editar um ativo para fornecer o contexto no campo.',
+ 'about_custom_fields_title' => 'Sobre os campos personalizados',
+ 'about_custom_fields_text' => 'Campos personalizados permitem que você adicione atributos arbitrários a ativos.',
+ 'add_field_to_fieldset' => 'Adicionar campo ao Fieldset',
+ 'make_optional' => 'Obrigatório - clique para tornar opcional',
+ 'make_required' => 'Opcional - clique para tornar obrigatório',
+ 'reorder' => 'Reordenar',
+ 'db_field' => 'Campo DB',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
+ 'is_unique' => 'Este valor deve ser único em todos os arquivos',
+ 'unique' => 'Único',
];
diff --git a/resources/lang/pt-BR/admin/custom_fields/message.php b/resources/lang/pt-BR/admin/custom_fields/message.php
index 6eb3f3fcb4..bafa84e8e6 100644
--- a/resources/lang/pt-BR/admin/custom_fields/message.php
+++ b/resources/lang/pt-BR/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/pt-BR/admin/depreciations/general.php b/resources/lang/pt-BR/admin/depreciations/general.php
index 5ca3191f8b..9dbec37790 100644
--- a/resources/lang/pt-BR/admin/depreciations/general.php
+++ b/resources/lang/pt-BR/admin/depreciations/general.php
@@ -6,11 +6,11 @@ return [
'asset_depreciations' => 'Depreciações de Ativos',
'create' => 'Criar Depreciação',
'depreciation_name' => 'Nome da Depreciação',
- 'depreciation_min' => 'Floor Value of Depreciation',
+ 'depreciation_min' => 'Valor mínimo de depreciação',
'number_of_months' => 'Número de Meses',
'update' => 'Atualizar Depreciação',
'depreciation_min' => 'Valor Mínimo após Depreciação',
- 'no_depreciations_warning' => 'Warning:
- You do not currently have any depreciations set up.
- Please set up at least one depreciation to view the depreciation report.',
+ 'no_depreciations_warning' => 'Aviso:
+ Você não tem atualmente nenhuma depreciação configurada.
+ Por favor, defina pelo menos uma depreciação para visualizar o relatório de depreciação.',
];
diff --git a/resources/lang/pt-BR/admin/depreciations/table.php b/resources/lang/pt-BR/admin/depreciations/table.php
index d371120667..e4c63d5005 100644
--- a/resources/lang/pt-BR/admin/depreciations/table.php
+++ b/resources/lang/pt-BR/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
'months' => 'Meses',
'term' => 'Termo',
'title' => 'Nome ',
- 'depreciation_min' => 'Floor Value',
+ 'depreciation_min' => 'Valor mínimo',
];
diff --git a/resources/lang/pt-BR/admin/groups/titles.php b/resources/lang/pt-BR/admin/groups/titles.php
index a6a560c0a6..acecfdb27b 100644
--- a/resources/lang/pt-BR/admin/groups/titles.php
+++ b/resources/lang/pt-BR/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
'group_admin' => 'Administrador do Grupo',
'allow' => 'Permitir',
'deny' => 'Negar',
- 'permission' => 'Permission',
- 'grant' => 'Grant',
- 'no_permissions' => 'This group has no permissions.'
+ 'permission' => 'Permissões',
+ 'grant' => 'Conceder',
+ 'no_permissions' => 'Este grupo não tem permissões.'
];
diff --git a/resources/lang/pt-BR/admin/hardware/form.php b/resources/lang/pt-BR/admin/hardware/form.php
index b5ec1459a9..72ca52279b 100644
--- a/resources/lang/pt-BR/admin/hardware/form.php
+++ b/resources/lang/pt-BR/admin/hardware/form.php
@@ -40,10 +40,12 @@ return [
'warranty' => 'Garantia',
'warranty_expires' => 'A garantia expira',
'years' => 'anos',
- 'asset_location' => 'Update Asset Location',
- 'asset_location_update_default_current' => 'Update default location AND actual location',
- 'asset_location_update_default' => 'Update only default location',
- 'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
- 'asset_deployable' => 'That status is deployable. This asset can be checked out.',
- 'processing_spinner' => 'Processing...',
+ 'asset_location' => 'Atualizar Local do Ativo',
+ 'asset_location_update_default_current' => 'Atualizar a localização padrão e local real',
+ 'asset_location_update_default' => 'Atualizar somente local padrão',
+ 'asset_not_deployable' => 'Este status de ativo não é implantado. Este ativo não pode ser verificado.',
+ 'asset_deployable' => 'Este status pode ser implementado. Este ativo pode ser verificado.',
+ 'processing_spinner' => 'Processando...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/pt-BR/admin/hardware/general.php b/resources/lang/pt-BR/admin/hardware/general.php
index 43e418976f..0cbb10477a 100644
--- a/resources/lang/pt-BR/admin/hardware/general.php
+++ b/resources/lang/pt-BR/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
'archived' => 'Arquivado',
'asset' => 'Ativo',
'bulk_checkout' => 'Alocação de Ativos',
- 'bulk_checkin' => 'Checkin Assets',
+ 'bulk_checkin' => 'Check-in de Ativo',
'checkin' => 'Retornar Ativo',
'checkout' => 'Checkout de Ativo',
'clone' => 'Clonar Ativo',
@@ -16,29 +16,29 @@ return [
'model_deleted' => 'Este modelo de Ativos foi excluído. Você deve restaurar o modelo antes de restaurar o Ativo.',
'requestable' => 'Solicitável',
'requested' => 'Solicitado',
- 'not_requestable' => 'Not Requestable',
- 'requestable_status_warning' => 'Do not change requestable status',
+ 'not_requestable' => 'Não solicitável',
+ 'requestable_status_warning' => 'Não altere o status solicitável',
'restore' => 'Restaurar Ativo',
'pending' => 'Pendente',
'undeployable' => 'Não implementável',
'view' => 'Ver Ativo',
- 'csv_error' => 'You have an error in your CSV file:',
+ 'csv_error' => 'Você tem um erro no seu arquivo CSV:',
'import_text' => '
- Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. + Envie um CSV que contém o histórico de ativos. Os ativos e usuários DEVEM já existir no sistema, ou eles serão ignorados. Correspondendo mídias para a importação de histórico acontece com a tag de conteúdo. Tentaremos encontrar um usuário correspondente com base no nome de usuário que você fornece, e nos critérios que você selecionar abaixo. Se você não selecionar nenhum critério abaixo, ele vai simplesmente tentar combinar com o formato de nome de usuário configurado nas configurações de Administrador > Geral.
-Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.
+Campos incluídos no CSV devem corresponder os cabeçalhos: Marcador de Ativo, Nome, data de check-out, data. check-in. Quaisquer campos adicionais serão ignorados.
-Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.
+Data de Checkin: em branco ou em datas futuras de check-in fará check-in dos itens para o usuário associado. Excluindo a coluna Data de check-in criará uma data de check-in com a data de hoje.
', - 'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format', - 'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format', - 'csv_import_match_first' => 'Try to match users by first name (jane) format', - 'csv_import_match_email' => 'Try to match users by email as username', - 'csv_import_match_username' => 'Try to match users by username', - 'error_messages' => 'Error messages:', - 'success_messages' => 'Success messages:', - 'alert_details' => 'Please see below for details.', - 'custom_export' => 'Custom Export' + 'csv_import_match_f-l' => 'Tente corresponder aos usuários pelo formato firstname.lastname (jane.smith)', + 'csv_import_match_initial_last' => 'Tente combinar os usuários pelo primeiro formato de sobrenome (jsmith)', + 'csv_import_match_first' => 'Tente combinar os usuários pelo formato do primeiro nome (jane)', + 'csv_import_match_email' => 'Tentar corresponder aos usuários por e-mail como nome de usuário', + 'csv_import_match_username' => 'Tente corresponder aos usuários pelo nome de usuário', + 'error_messages' => 'Mensagens de erro:', + 'success_messages' => 'Mensagens de sucesso:', + 'alert_details' => 'Por favor, veja abaixo para detalhes.', + 'custom_export' => 'Exportação Personalizada' ]; diff --git a/resources/lang/pt-BR/admin/hardware/message.php b/resources/lang/pt-BR/admin/hardware/message.php index 640257b650..28cc28adc3 100644 --- a/resources/lang/pt-BR/admin/hardware/message.php +++ b/resources/lang/pt-BR/admin/hardware/message.php @@ -4,7 +4,7 @@ return [ 'undeployable' => 'Aviso: Este ativo foi marcado como atualmente não implementável. Se este status mudou, atualize o status do ativo.', 'does_not_exist' => 'O ativo não existe.', - 'does_not_exist_or_not_requestable' => 'That asset does not exist or is not requestable.', + 'does_not_exist_or_not_requestable' => 'Esse ativo não existe ou não pode ser solicitado.', 'assoc_users' => 'Este bem está no momento associado com pelo menos um usuário e não pode ser deletado. Por favor, atualize seu bem para que não referencie mais este usuário e tente novamente. ', 'create' => [ @@ -16,7 +16,7 @@ return [ 'error' => 'O ativo não foi atualizado, tente novamente', 'success' => 'Ativo atualizado com sucesso.', 'nothing_updated' => 'Nenhum campo foi selecionado, então nada foi atualizado.', - 'no_assets_selected' => 'No assets were selected, so nothing was updated.', + 'no_assets_selected' => 'Nenhum ativo foi selecionado, portanto, nada foi atualizado.', ], 'restore' => [ diff --git a/resources/lang/pt-BR/admin/hardware/table.php b/resources/lang/pt-BR/admin/hardware/table.php index 151b700d13..cdb52fa1d9 100644 --- a/resources/lang/pt-BR/admin/hardware/table.php +++ b/resources/lang/pt-BR/admin/hardware/table.php @@ -4,11 +4,11 @@ return [ 'asset_tag' => 'Marcação do Ativo', 'asset_model' => 'Modelo', - 'book_value' => 'Current Value', + 'book_value' => 'Valor Atual', 'change' => 'Entrada/Saída', 'checkout_date' => 'Data de saída', 'checkoutto' => 'check-out', - 'current_value' => 'Current Value', + 'current_value' => 'Valor Atual', 'diff' => 'Diferença', 'dl_csv' => 'Baixar CSV', 'eol' => 'EOL', @@ -22,9 +22,9 @@ return [ 'image' => 'Imagem do equipamento', 'days_without_acceptance' => 'Dias sem que fosse aceito', 'monthly_depreciation' => 'Depreciação Mensal', - 'assigned_to' => 'Assigned To', - 'requesting_user' => 'Requesting User', - 'requested_date' => 'Requested Date', - 'changed' => 'Changed', - 'icon' => 'Icon', + 'assigned_to' => 'Atribuído a', + 'requesting_user' => 'Usuário solicitante', + 'requested_date' => 'Data de Solicitação', + 'changed' => 'Alterado', + 'icon' => 'Ícone', ]; diff --git a/resources/lang/pt-BR/admin/kits/general.php b/resources/lang/pt-BR/admin/kits/general.php index fc23c37252..7db86b01da 100644 --- a/resources/lang/pt-BR/admin/kits/general.php +++ b/resources/lang/pt-BR/admin/kits/general.php @@ -13,38 +13,38 @@ return [ 'none_licenses' => 'Não há licenças suficientes para :model fazer atribuição. :qty são necessários. ', 'none_consumables' => 'Não há quantidade de consumíveis suficientes para :model fazer atribuição. :qty são necessários. ', 'none_accessory' => 'Não há unidades disponíveis de :accessory para check-out. :qty são necessários. ', - 'append_accessory' => 'Append Accessory', - 'update_appended_accessory' => 'Update appended Accessory', - 'append_consumable' => 'Append Consumable', - 'update_appended_consumable' => 'Update appended Consumable', - 'append_license' => 'Append license', - 'update_appended_license' => 'Update appended license', - 'append_model' => 'Append model', - 'update_appended_model' => 'Update appended model', - 'license_error' => 'License already attached to kit', - 'license_added_success' => 'License added successfully', - 'license_updated' => 'License was successfully updated', - 'license_none' => 'License does not exist', - 'license_detached' => 'License was successfully detached', - 'consumable_added_success' => 'Consumable added successfully', - 'consumable_updated' => 'Consumable was successfully updated', - 'consumable_error' => 'Consumable already attached to kit', - 'consumable_deleted' => 'Delete was successful', - 'consumable_none' => 'Consumable does not exist', - 'consumable_detached' => 'Consumable was successfully detached', - 'accessory_added_success' => 'Accessory added successfully', - 'accessory_updated' => 'Accessory was successfully updated', - 'accessory_detached' => 'Accessory was successfully detached', - 'accessory_error' => 'Accessory already attached to kit', - 'accessory_deleted' => 'Delete was successful', - 'accessory_none' => 'Accessory does not exist', - 'checkout_success' => 'Checkout was successful', - 'checkout_error' => 'Checkout error', - 'kit_none' => 'Kit does not exist', - 'kit_created' => 'Kit was successfully created', - 'kit_updated' => 'Kit was successfully updated', - 'kit_not_found' => 'Kit not found', - 'kit_deleted' => 'Kit was successfully deleted', - 'kit_model_updated' => 'Model was successfully updated', - 'kit_model_detached' => 'Model was successfully detached', + 'append_accessory' => 'Anexar acessório', + 'update_appended_accessory' => 'Atualização de acessório anexado', + 'append_consumable' => 'Anexar consumível', + 'update_appended_consumable' => 'Atualização de Consumível anexado', + 'append_license' => 'Acrescentar licença', + 'update_appended_license' => 'Atualizar licença anexada', + 'append_model' => 'Acrescentar modelo', + 'update_appended_model' => 'Atualização do modelo anexado', + 'license_error' => 'Licença já anexada ao kit', + 'license_added_success' => 'Licença adicionada com sucesso', + 'license_updated' => 'Licença atualizada com sucesso', + 'license_none' => 'Licença não existe', + 'license_detached' => 'Licença desanexada com sucesso', + 'consumable_added_success' => 'Consumível adicionado com sucesso', + 'consumable_updated' => 'Consumível foi atualizado com sucesso', + 'consumable_error' => 'Consumível já anexado ao kit', + 'consumable_deleted' => 'Excluído com sucesso', + 'consumable_none' => 'O consumível não existe', + 'consumable_detached' => 'O consumível desanexado com sucesso', + 'accessory_added_success' => 'Acessório adicionado com sucesso', + 'accessory_updated' => 'Acessório atualizado com sucesso', + 'accessory_detached' => 'Acessório desanexado com sucesso', + 'accessory_error' => 'Acessório já anexado ao kit', + 'accessory_deleted' => 'Excluído com sucesso', + 'accessory_none' => 'Este acessório não existe', + 'checkout_success' => 'Checkout feito com sucesso', + 'checkout_error' => 'Erro no check-out', + 'kit_none' => 'Kit não existe', + 'kit_created' => 'Kit foi criado com sucesso', + 'kit_updated' => 'Kit foi atualizado com sucesso', + 'kit_not_found' => 'Kit não encontrado', + 'kit_deleted' => 'Kit foi excluído com sucesso', + 'kit_model_updated' => 'Modelo foi atualizado com sucesso', + 'kit_model_detached' => 'Modelo foi desanexado com sucesso', ]; diff --git a/resources/lang/pt-BR/admin/locations/table.php b/resources/lang/pt-BR/admin/locations/table.php index 73a23ffd73..3b9ead8fb1 100644 --- a/resources/lang/pt-BR/admin/locations/table.php +++ b/resources/lang/pt-BR/admin/locations/table.php @@ -20,21 +20,21 @@ return [ 'parent' => 'Principal', 'currency' => 'Moeda local', 'ldap_ou' => 'Pesquisa LDAP UO', - 'user_name' => 'User Name', - 'department' => 'Department', - 'location' => 'Location', - 'asset_tag' => 'Assets Tag', - 'asset_name' => 'Name', - 'asset_category' => 'Category', - 'asset_manufacturer' => 'Manufacturer', - 'asset_model' => 'Model', - 'asset_serial' => 'Serial', - 'asset_location' => 'Location', - 'asset_checked_out' => 'Checked Out', - 'asset_expected_checkin' => 'Expected Checkin', - 'date' => 'Date:', - 'signed_by_asset_auditor' => 'Signed By (Asset Auditor):', - 'signed_by_finance_auditor' => 'Signed By (Finance Auditor):', - 'signed_by_location_manager' => 'Signed By (Location Manager):', - 'signed_by' => 'Signed Off By:', + 'user_name' => 'Nome do Usuário', + 'department' => 'Departamento', + 'location' => 'Localização', + 'asset_tag' => 'Tag de Ativos', + 'asset_name' => 'Nome', + 'asset_category' => 'Categoria', + 'asset_manufacturer' => 'Fabricante', + 'asset_model' => 'Modelo', + 'asset_serial' => 'Nº de Série', + 'asset_location' => 'Local', + 'asset_checked_out' => 'Alocado', + 'asset_expected_checkin' => 'Check-in Esperado', + 'date' => 'Data:', + 'signed_by_asset_auditor' => 'Assinado por (Contador de Ativo):', + 'signed_by_finance_auditor' => 'Assinado por (Auditoria Financeira):', + 'signed_by_location_manager' => 'Assinado por (Gerente Local):', + 'signed_by' => 'Assinado por:', ]; diff --git a/resources/lang/pt-BR/admin/reports/general.php b/resources/lang/pt-BR/admin/reports/general.php index b1c36dd26e..a837d218cc 100644 --- a/resources/lang/pt-BR/admin/reports/general.php +++ b/resources/lang/pt-BR/admin/reports/general.php @@ -2,9 +2,9 @@ return [ 'info' => 'Selecione as opções que você quer para o seu relatório de ativos.', - 'deleted_user' => 'Deleted user', - 'send_reminder' => 'Send reminder', - 'reminder_sent' => 'Reminder sent', - 'acceptance_deleted' => 'Acceptance request deleted', - 'acceptance_request' => 'Acceptance request' + 'deleted_user' => 'Usuário excluído', + 'send_reminder' => 'Enviar lembrete', + 'reminder_sent' => 'Lembrete enviado', + 'acceptance_deleted' => 'Pedido de aceitação excluído', + 'acceptance_request' => 'Solicitação de aceitação' ]; \ No newline at end of file diff --git a/resources/lang/pt-BR/admin/settings/general.php b/resources/lang/pt-BR/admin/settings/general.php index cf8f05f134..77d4bc9b43 100644 --- a/resources/lang/pt-BR/admin/settings/general.php +++ b/resources/lang/pt-BR/admin/settings/general.php @@ -10,10 +10,10 @@ return [ 'admin_cc_email' => 'E-mail em CC', 'admin_cc_email_help' => 'Se você quiser enviar uma cópia dos e-mails de check-in / check-out que são enviados aos usuários para uma conta de e-mail adicional, insira-a aqui. Caso contrário, deixe este campo em branco.', 'is_ad' => 'Este é um servidor de Diretório Ativo', - 'alerts' => 'Alerts', - 'alert_title' => 'Update Alert Settings', + 'alerts' => 'Alertas', + 'alert_title' => 'Atualizar configurações de alerta', 'alert_email' => 'Enviar alertas a', - 'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated', + 'alert_email_help' => 'Endereços de e-mail ou listas de distribuição que você deseja que os alertas sejam enviados, separados por vírgula', 'alerts_enabled' => 'Alertas ativados', 'alert_interval' => 'Limite de Expiração dos Alertas (em dias)', 'alert_inv_threshold' => 'Limite de Alerta de Inventário', @@ -21,20 +21,20 @@ return [ 'allow_user_skin_help_text' => 'Marcando essa caixa, permitirá que usuário substitua a interface por outra diferente.', 'asset_ids' => 'ID do ativo', 'audit_interval' => 'Intervalo de auditoria', - 'audit_interval_help' => 'If you are required to regularly physically audit your assets, enter the interval in months that you use. If you update this value, all of the "next audit dates" for assets with an upcoming audit date.', + 'audit_interval_help' => 'Se você for obrigado a fiscalizar fisicamente seus ativos, insira o intervalo em meses que você usa. Se você atualizar este valor, todas as "próximas datas de auditoria" dos ativos com uma data de auditoria futura.', 'audit_warning_days' => 'Limiar de aviso de auditoria', 'audit_warning_days_help' => 'Com quantos dias de antecedência deseja ser avisado sobre a verificação de seus ativos?', - 'auto_increment_assets' => 'Generate auto-incrementing asset tags', + 'auto_increment_assets' => 'Gerar auto insercao de etiquetas de ativos', 'auto_increment_prefix' => 'Prefixo (opcional)', - 'auto_incrementing_help' => 'Enable auto-incrementing asset tags first to set this', + 'auto_incrementing_help' => 'Permitir auto insercao dessa tag de ativo antes de configurar isto', 'backups' => 'Backups', - 'backups_help' => 'Create, download, and restore backups ', - 'backups_restoring' => 'Restoring from Backup', - 'backups_upload' => 'Upload Backup', - 'backups_path' => 'Backups on the server are stored in:path
',
- 'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker.:path
',
+ 'backups_restore_warning' => 'Use o botão de restauração para restaurar de um backup anterior. (Isso atualmente não funciona com o armazenamento de arquivos S3 ou o Docker.Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
-If you would like to export only certain assets, use the options below to fine-tune your results.
', - 'range' => 'Range', - 'bom_remark' => 'Add a BOM (byte-order mark) to this CSV', - 'improvements' => 'Improvements', - 'information' => 'Information', - 'permissions' => 'Permissions', - 'managed_ldap' => '(Managed via LDAP)', - 'export' => 'Export', - 'ldap_sync' => 'LDAP Sync', - 'ldap_user_sync' => 'LDAP User Sync', - 'synchronize' => 'Synchronize', - 'sync_results' => 'Synchronization Results', - 'license_serial' => 'Serial/Product Key', - 'invalid_category' => 'Invalid category', - 'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.', - '60_percent_warning' => '60% Complete (warning)', - 'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!', - 'new_asset' => 'New Asset', - 'new_license' => 'New License', - 'new_accessory' => 'New Accessory', - 'new_consumable' => 'New Consumable', - 'collapse' => 'Collapse', - 'assigned' => 'Assigned', - 'asset_count' => 'Asset Count', - 'accessories_count' => 'Accessories Count', - 'consumables_count' => 'Consumables Count', - 'components_count' => 'Components Count', - 'licenses_count' => 'Licenses Count', - 'notification_error' => 'Error:', - 'notification_error_hint' => 'Please check the form below for errors', - 'notification_success' => 'Success:', - 'notification_warning' => 'Warning:', + 'fields' => 'Campos', + 'last_checkout' => 'Último Registo de saída', + 'due_to_checkin' => 'Os seguintes itens :count devem ser verificados em breve:', + 'expected_checkin' => 'Check-in esperado', + 'reminder_checked_out_items' => 'Este é um lembrete dos itens atualmente verificados para você. Se você achar que esta lista está incorreta (algo está faltando ou aparece algo aqui que você acredita que nunca recebeu), envie um e-mail para :reply_to_name em :reply_to_address.', + 'changed' => 'Alterado', + 'to' => 'Para', + 'report_fields_info' => 'Selecione os campos que deseja incluir em seu relatório personalizado e clique em Gerar. O arquivo (custom-asset-report-YYYY-mm-dd.csv) será baixado automaticamente e você poderá abri-lo no Excel.
+Se você quiser exportar apenas alguns recursos, use as opções abaixo para ajustar seus resultados.
', + 'range' => 'Intervalo', + 'bom_remark' => 'Adicione um BOM (marca de ordem de byte) a este CSV', + 'improvements' => 'Melhorias', + 'information' => 'Informação', + 'permissions' => 'Permissões', + 'managed_ldap' => '(Gerenciado via LDAP)', + 'export' => 'Exportar', + 'ldap_sync' => 'Sincronização LDAP', + 'ldap_user_sync' => 'Sincronização de usuário LDAP', + 'synchronize' => 'Sincronizar', + 'sync_results' => ' +Resultados da Sincronização', + 'license_serial' => 'Chave Serial/Produto', + 'invalid_category' => 'Categoria inválida', + 'dashboard_info' => 'Este é o seu painel. Há muitos itens como este, mas este é o seu.', + '60_percent_warning' => '60% Completo (aviso)', + 'dashboard_empty' => 'Parece que você ainda não adicionou nada, por isso não temos nada incrível para exibir. Comece adicionando alguns ativos, acessórios, consumíveis ou licenças agora!', + 'new_asset' => 'Novo Ativo', + 'new_license' => 'Nova Licença', + 'new_accessory' => 'Novo acessório', + 'new_consumable' => 'Novo consumível', + 'collapse' => 'Colapso', + 'assigned' => 'Atribuído', + 'asset_count' => 'Contagem de Ativos', + 'accessories_count' => 'Contagem de Acessórios', + 'consumables_count' => 'Contagem de Consumíveis', + 'components_count' => 'Contagem de componentes', + 'licenses_count' => 'Contagem de licenças', + 'notification_error' => 'Erro:', + 'notification_error_hint' => 'Por favor verifique o formulário abaixo para erros', + 'notification_success' => 'Sucesso:', + 'notification_warning' => 'Aviso:', 'notification_info' => 'Info:', - 'asset_information' => 'Asset Information', - 'model_name' => 'Model Name:', - 'asset_name' => 'Asset Name:', - 'consumable_information' => 'Consumable Information:', - 'consumable_name' => 'Consumable Name:', + 'asset_information' => 'Informação do Ativo', + 'model_name' => 'Nome do Modelo:', + 'asset_name' => 'Nome do Ativo:', + 'consumable_information' => 'Informações de Consumível:', + 'consumable_name' => 'Nome do Consumível:', 'accessory_information' => 'Informações do acessório:', 'accessory_name' => 'Nome do Acessório:', 'clone_item' => 'Clonar Item', 'checkout_tooltip' => 'Fazer check-out do item', 'checkin_tooltip' => 'Fazer check-in do item', 'checkout_user_tooltip' => 'Fazer check-out deste item para um usuário', - 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', - 'maintenance_mode_title' => 'System Temporarily Unavailable', - 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'maintenance_mode' => 'O serviço está temporariamente indisponível para atualizações do sistema. Por favor, volte mais tarde.', + 'maintenance_mode_title' => 'Sistema Temporariamente Indisponível', + 'ldap_import' => 'A senha do usuário não deve ser gerenciada pelo LDAP. (Isso permite que você envie solicitações de senha esquecidas.)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/pt-BR/mail.php b/resources/lang/pt-BR/mail.php index c490005842..14cce2c412 100644 --- a/resources/lang/pt-BR/mail.php +++ b/resources/lang/pt-BR/mail.php @@ -59,7 +59,7 @@ return [ 'test_mail_text' => 'Isto é um e-mail de teste do Snipe-IT Asset Management System. Se você recebeu essa mensagem, quer dizer que o e-mail está funcionando :)', 'the_following_item' => 'O Item a seguir foi devolvido: ', 'low_inventory_alert' => 'Há um :count que está abaixo do estoque mínimo ou em breve estará abaixo. | Existem :count items que estão abaixo do estoque mínimo ou em breve estarão baixos.', - 'assets_warrantee_alert' => 'There is :count asset with a warranty expiring in the next :threshold days.|There are :count assets with warranties expiring in the next :threshold days.', + 'assets_warrantee_alert' => 'Há um :count ativo com a garantia expirando nos próximos :threshold dias. Existem :count ativos com a garantia expirando nos próximos :threshold dias.', 'license_expiring_alert' => 'Há uma :count licença expirando nos próximos :threshold dias. | Existem :count licenças expirand nos próximos :threshold dias.', 'to_reset' => 'Para fazer reset da senha do :web, preencha este formulário:', 'type' => 'Tipo', diff --git a/resources/lang/pt-BR/passwords.php b/resources/lang/pt-BR/passwords.php index 1f7c9a871e..25633b4581 100644 --- a/resources/lang/pt-BR/passwords.php +++ b/resources/lang/pt-BR/passwords.php @@ -1,6 +1,8 @@ 'Success: If that email address exists in our system, a password recovery email has been sent.', - 'user' => 'Nenhum usuário ativo encontrado com este e-mail.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'token' => 'This password reset token is invalid or expired, or does not match the username provided.', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/pt-BR/reminders.php b/resources/lang/pt-BR/reminders.php index 583a3996e9..945dc070bc 100644 --- a/resources/lang/pt-BR/reminders.php +++ b/resources/lang/pt-BR/reminders.php @@ -14,11 +14,8 @@ return array( */ "password" => "As senhas devem ter seis caracteres e corresponderem à confirmação.", - "user" => "O nome de usuário ou endereço de e-mail está incorreto", - - "token" => "Este token de redefinição da senha é inválido.", - - "sent" => "Se um endereço de e-mail correspondente foi encontrado, um lembrete de senha foi enviado!", + "token" => 'This password reset token is invalid or expired, or does not match the username provided.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', ); diff --git a/resources/lang/pt-BR/validation.php b/resources/lang/pt-BR/validation.php index 70cf456bf1..91b7d4edf4 100644 --- a/resources/lang/pt-BR/validation.php +++ b/resources/lang/pt-BR/validation.php @@ -91,8 +91,13 @@ return [ 'url' => 'O formato de :attribute é inválido.', 'unique_undeleted' => 'O :attribute deve ser único.', 'non_circular' => 'O :attribute não pode criar uma referência circular.', + 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', + 'letters' => 'Password must contain at least one letter.', + 'numbers' => 'Password must contain at least one number.', + 'case_diff' => 'Password must use mixed case.', + 'symbols' => 'Password must contain symbols.', 'gte' => [ - 'numeric' => 'Value cannot be negative' + 'numeric' => 'Valor não pode ser negativo' ], diff --git a/resources/lang/pt-PT/admin/custom_fields/general.php b/resources/lang/pt-PT/admin/custom_fields/general.php index fd5d9dccfd..12c4daf8f4 100644 --- a/resources/lang/pt-PT/admin/custom_fields/general.php +++ b/resources/lang/pt-PT/admin/custom_fields/general.php @@ -42,7 +42,7 @@ return [ 'make_required' => 'Opcional - clique para tornar obrigatório', 'reorder' => 'Reordenar', 'db_field' => 'Campo DB', - 'db_convert_warning' => 'AVISO. Este campo está na tabela de campos personalizados como :db_column
mas deve ser :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/pt-PT/admin/custom_fields/message.php b/resources/lang/pt-PT/admin/custom_fields/message.php
index b908c3e9da..6acdeb7a4c 100644
--- a/resources/lang/pt-PT/admin/custom_fields/message.php
+++ b/resources/lang/pt-PT/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/pt-PT/admin/hardware/form.php b/resources/lang/pt-PT/admin/hardware/form.php
index 3430de1ccf..461a647a07 100644
--- a/resources/lang/pt-PT/admin/hardware/form.php
+++ b/resources/lang/pt-PT/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'A processar...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/pt-PT/admin/users/general.php b/resources/lang/pt-PT/admin/users/general.php
index 1067244b2d..2b9ed993f4 100644
--- a/resources/lang/pt-PT/admin/users/general.php
+++ b/resources/lang/pt-PT/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Imprimir todos atribuídos',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software alocado a :name',
'send_email_help' => 'Você deve fornecer um endereço de e-mail para este usuário para enviar-lhe credenciais. Credenciais via e-mail só podem ser feitas na criação do usuário. As senhas são armazenadas em hash e não podem ser recuperadas depois de salvas.',
'view_user' => 'Ver Utilizador :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/pt-PT/general.php b/resources/lang/pt-PT/general.php
index 72fece75d3..e5ed852938 100644
--- a/resources/lang/pt-PT/general.php
+++ b/resources/lang/pt-PT/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Criar Novo',
'created' => 'Item criado',
'created_asset' => 'artigo criado',
- 'created_at' => 'Criado em',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Registro criado',
'updated_at' => 'Atualizado em',
'currency' => '€', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Isto é usado para criar endereços de email ao importar',
'error' => 'Erro',
+ 'example' => 'Example: ',
'filastname_format' => 'Primeira Inicial Último Nome(jsmith@example.com)',
'firstname_lastname_format' => 'Primeiro Nome Último Nome (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Nome próprio e Sobrenome (jane_smith@exemplo.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Não implementável',
'unknown_admin' => 'Administrador desconhecido',
'username_format' => 'Formato username',
+ 'username' => 'Username',
'update' => 'Atualizar',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Carregado',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/pt-PT/passwords.php b/resources/lang/pt-PT/passwords.php
index 76b29ad483..25633b4581 100644
--- a/resources/lang/pt-PT/passwords.php
+++ b/resources/lang/pt-PT/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Nenhum Utilizador activo encontrado com esse e-mail.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/pt-PT/reminders.php b/resources/lang/pt-PT/reminders.php
index ee8d849c17..7ec779ff9c 100644
--- a/resources/lang/pt-PT/reminders.php
+++ b/resources/lang/pt-PT/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "A Password deve conter no mínimo 6 caracteres and corresponder à confirmação.",
-
"user" => "Nome de utilizador ou email incorreto",
-
- "token" => "O token de restauro desta password é inválido.",
-
- "sent" => "Se foi encontrado um email correspondente, o alerta de password foi enviado!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/pt-PT/validation.php b/resources/lang/pt-PT/validation.php
index 9ad45899a6..b46dbde0fc 100644
--- a/resources/lang/pt-PT/validation.php
+++ b/resources/lang/pt-PT/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'O formato do :attribute é inválido.',
'unique_undeleted' => 'O :atribute deve ser único.',
'non_circular' => 'O :attribute não deve criar uma referência circular.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ro/admin/custom_fields/general.php b/resources/lang/ro/admin/custom_fields/general.php
index 9e630df03d..c83af5bc74 100644
--- a/resources/lang/ro/admin/custom_fields/general.php
+++ b/resources/lang/ro/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Opțional - faceți clic pentru a deveni obligatoriu',
'reorder' => 'Reordonare',
'db_field' => 'Câmp în baza de date',
- 'db_convert_warning' => 'AVERTISMENT. Acest câmp este în tabelul câmpurilor personalizate ca :db_column
dar ar trebui să fie :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ro/admin/custom_fields/message.php b/resources/lang/ro/admin/custom_fields/message.php
index 4f16c15a18..ff5d5d00e2 100644
--- a/resources/lang/ro/admin/custom_fields/message.php
+++ b/resources/lang/ro/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ro/admin/hardware/form.php b/resources/lang/ro/admin/hardware/form.php
index 0e4fee502a..06532a938e 100644
--- a/resources/lang/ro/admin/hardware/form.php
+++ b/resources/lang/ro/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'Activul este indisponibil și nu poate fi eliberat.',
'asset_deployable' => 'Activul e disponibil și poate fi eliberat.',
'processing_spinner' => 'În curs de procesare...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ro/admin/users/general.php b/resources/lang/ro/admin/users/general.php
index d8ed267729..80d6dedac5 100644
--- a/resources/lang/ro/admin/users/general.php
+++ b/resources/lang/ro/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Ultima logare',
'ldap_config_text' => 'Setările de configurare LDAP pot fi găsite pe Administrator> Setări. Locația selectată (opțional) va fi setată pentru toți utilizatorii importați.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software predat catre :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Vezi utilizator :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ro/general.php b/resources/lang/ro/general.php
index 5daceb5fa0..a8aaff9f07 100644
--- a/resources/lang/ro/general.php
+++ b/resources/lang/ro/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Creeaza',
'created' => 'Articol creat',
'created_asset' => 'Activ creat',
- 'created_at' => 'Creat la',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Actualizat la',
'currency' => 'LEI', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Acesta este folosit pentru a genera adrese de e-mail atunci când importați',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Primul nume inițial (jsmith@example.com)',
'firstname_lastname_format' => 'Nume Prenume Nume (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Nelansabil',
'unknown_admin' => 'Admin necunoscut',
'username_format' => 'Nume de utilizator Format',
+ 'username' => 'Username',
'update' => 'Actualizează',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Încărcat',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ro/passwords.php b/resources/lang/ro/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/ro/passwords.php
+++ b/resources/lang/ro/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ro/reminders.php b/resources/lang/ro/reminders.php
index 12758b84f5..5fbbc676f2 100644
--- a/resources/lang/ro/reminders.php
+++ b/resources/lang/ro/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Parolele trebuie sa fie de cel putin 6 caractere si sa fie la fel ca si confirmarea.",
-
"user" => "Utilizator sau e-mail gresit",
-
- "token" => "Acest token este invalid.",
-
- "sent" => "Daca s-a gasit adresa de e-mail, atunci veti primi un reminder la parola!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ro/validation.php b/resources/lang/ro/validation.php
index e63755b31f..b071a03732 100644
--- a/resources/lang/ro/validation.php
+++ b/resources/lang/ro/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Formatul :attribute nu este valid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ru/admin/custom_fields/general.php b/resources/lang/ru/admin/custom_fields/general.php
index fe92f5f168..c19554f4d5 100644
--- a/resources/lang/ru/admin/custom_fields/general.php
+++ b/resources/lang/ru/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Необязательное - нажмите чтобы сделать обязательным',
'reorder' => 'Изменить порядок',
'db_field' => 'Поле БД',
- 'db_convert_warning' => 'ВНИМАНИЕ. Это поле находится в пользовательской таблице как :db_column
но должно быть :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ru/admin/custom_fields/message.php b/resources/lang/ru/admin/custom_fields/message.php
index 0d074fc69c..0304852841 100644
--- a/resources/lang/ru/admin/custom_fields/message.php
+++ b/resources/lang/ru/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ru/admin/hardware/form.php b/resources/lang/ru/admin/hardware/form.php
index 6d27a663f9..b78683d684 100644
--- a/resources/lang/ru/admin/hardware/form.php
+++ b/resources/lang/ru/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ru/admin/users/general.php b/resources/lang/ru/admin/users/general.php
index dcebf1e1d4..c730d3cab8 100644
--- a/resources/lang/ru/admin/users/general.php
+++ b/resources/lang/ru/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Последний вход',
'ldap_config_text' => 'Параметры конфигурации LDAP можно найти Администратор > Параметры. Выбранное местоположение будет установлено для всех импортируемых пользователей. (Необязательно).',
'print_assigned' => 'Печать всех назначенных',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Программное обеспечение привязано к :name',
'send_email_help' => 'Вы должны указать адрес электронной почты для этого пользователя, чтобы отправить им учетные данные. Электронная почта может быть выполнена только при создании пользователя. Пароли хранятся в одностороннем хэше и не могут быть восстановлены после сохранения.',
'view_user' => 'Показать пользователя :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ru/general.php b/resources/lang/ru/general.php
index 554e2c2ccd..ecbbfed47b 100644
--- a/resources/lang/ru/general.php
+++ b/resources/lang/ru/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Создать нового',
'created' => 'Элемент создан',
'created_asset' => 'Создать актив',
- 'created_at' => 'Создано',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Запись Создана',
'updated_at' => 'Обновлено',
'currency' => 'Руб.', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Он используется для генерации адреса при импорте',
'error' => 'Ошибка',
+ 'example' => 'Example: ',
'filastname_format' => 'Первая буква имени и фамилия (jsmith@example.com)',
'firstname_lastname_format' => 'Имя и фамилия через точку (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Имя и фамилия (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Не развертываемый',
'unknown_admin' => 'Неизвестный администратор',
'username_format' => 'Формат имени пользователя',
+ 'username' => 'Username',
'update' => 'Обновить',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Загружено',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ru/passwords.php b/resources/lang/ru/passwords.php
index e5dfa1f10a..25633b4581 100644
--- a/resources/lang/ru/passwords.php
+++ b/resources/lang/ru/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Активных пользователей с указанным email-ом не найдено.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ru/reminders.php b/resources/lang/ru/reminders.php
index 329051d4dc..b51fef2d32 100644
--- a/resources/lang/ru/reminders.php
+++ b/resources/lang/ru/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Пароли должны совпадать и содержать минимум 6 символов.",
-
"user" => "Имя пользователя или адрес почты не верен",
-
- "token" => "Этот токен сброса пароля просрочен или неверен.",
-
- "sent" => "Если такой адрес почты будет найден, напоминание пароля будет отправлено!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ru/validation.php b/resources/lang/ru/validation.php
index 81fec940ce..aa34c84538 100644
--- a/resources/lang/ru/validation.php
+++ b/resources/lang/ru/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Неправильный формат :attribute.',
'unique_undeleted' => 'Свойство :attribute должно быть уникальным.',
'non_circular' => ':attribute не должен создавать циклическую ссылку.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/si-LK/admin/custom_fields/general.php b/resources/lang/si-LK/admin/custom_fields/general.php
index 4c7442b2d5..7434117830 100644
--- a/resources/lang/si-LK/admin/custom_fields/general.php
+++ b/resources/lang/si-LK/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/si-LK/admin/custom_fields/message.php b/resources/lang/si-LK/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/si-LK/admin/custom_fields/message.php
+++ b/resources/lang/si-LK/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/si-LK/admin/hardware/form.php b/resources/lang/si-LK/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/si-LK/admin/hardware/form.php
+++ b/resources/lang/si-LK/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/si-LK/admin/users/general.php b/resources/lang/si-LK/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/si-LK/admin/users/general.php
+++ b/resources/lang/si-LK/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/si-LK/general.php b/resources/lang/si-LK/general.php
index 5d67d5d673..c4d2798035 100644
--- a/resources/lang/si-LK/general.php
+++ b/resources/lang/si-LK/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Create New',
'created' => 'Item Created',
'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/si-LK/passwords.php b/resources/lang/si-LK/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/si-LK/passwords.php
+++ b/resources/lang/si-LK/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/si-LK/reminders.php b/resources/lang/si-LK/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/si-LK/reminders.php
+++ b/resources/lang/si-LK/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/si-LK/validation.php b/resources/lang/si-LK/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/si-LK/validation.php
+++ b/resources/lang/si-LK/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/sk/account/general.php b/resources/lang/sk/account/general.php
index 7fc060a849..0b2b240d2a 100644
--- a/resources/lang/sk/account/general.php
+++ b/resources/lang/sk/account/general.php
@@ -1,7 +1,7 @@
'Personal API Keys',
+ 'personal_api_keys' => 'Osobné API kľúče',
'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
will not be visible to you again.',
'api_base_url' => 'Your API base url is located at:',
diff --git a/resources/lang/sk/admin/accessories/general.php b/resources/lang/sk/admin/accessories/general.php
index e9a2e69ff6..cf45da0bc6 100644
--- a/resources/lang/sk/admin/accessories/general.php
+++ b/resources/lang/sk/admin/accessories/general.php
@@ -1,20 +1,20 @@
'Accessory Category',
- 'accessory_name' => 'Accessory Name',
- 'checkout' => 'Checkout Accessory',
- 'checkin' => 'Checkin Accessory',
- 'create' => 'Create Accessory',
- 'edit' => 'Edit Accessory',
- 'eula_text' => 'Category EULA',
- 'eula_text_help' => 'This field allows you to customize your EULAs for specific types of assets. If you only have one EULA for all of your assets, you can check the box below to use the primary default.',
- 'require_acceptance' => 'Require users to confirm acceptance of assets in this category.',
- 'no_default_eula' => 'No primary default EULA found. Add one in Settings.',
- 'total' => 'Total',
- 'remaining' => 'Avail',
- 'update' => 'Update Accessory',
- 'use_default_eula' => 'Use the primary default EULA instead.',
- 'use_default_eula_disabled' => ' :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/sk/admin/custom_fields/message.php b/resources/lang/sk/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/sk/admin/custom_fields/message.php
+++ b/resources/lang/sk/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/sk/admin/hardware/form.php b/resources/lang/sk/admin/hardware/form.php
index 9a45ec5073..2917329678 100644
--- a/resources/lang/sk/admin/hardware/form.php
+++ b/resources/lang/sk/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/sk/admin/hardware/table.php b/resources/lang/sk/admin/hardware/table.php
index c2e478372b..50cc08ca63 100644
--- a/resources/lang/sk/admin/hardware/table.php
+++ b/resources/lang/sk/admin/hardware/table.php
@@ -26,5 +26,5 @@ return [
'requesting_user' => 'Requesting User',
'requested_date' => 'Requested Date',
'changed' => 'Changed',
- 'icon' => 'Icon',
+ 'icon' => 'Ikona',
];
diff --git a/resources/lang/sk/admin/settings/general.php b/resources/lang/sk/admin/settings/general.php
index 4c883b1b3d..54fbb9548b 100644
--- a/resources/lang/sk/admin/settings/general.php
+++ b/resources/lang/sk/admin/settings/general.php
@@ -29,7 +29,7 @@ return [
'auto_incrementing_help' => 'Enable auto-incrementing asset tags first to set this',
'backups' => 'Zálohy',
'backups_help' => 'Create, download, and restore backups ',
- 'backups_restoring' => 'Restoring from Backup',
+ 'backups_restoring' => 'Obnovenie zo zálohy',
'backups_upload' => 'Upload Backup',
'backups_path' => 'Backups on the server are stored in :path
',
'backups_restore_warning' => 'Use the restore button to restore from a previous backup. (This does not currently work with S3 file storage or Docker. :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/sl/admin/custom_fields/message.php b/resources/lang/sl/admin/custom_fields/message.php
index cf5859733f..637dbfb554 100644
--- a/resources/lang/sl/admin/custom_fields/message.php
+++ b/resources/lang/sl/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/sl/admin/hardware/form.php b/resources/lang/sl/admin/hardware/form.php
index 77c9c56f71..78321fa7fb 100644
--- a/resources/lang/sl/admin/hardware/form.php
+++ b/resources/lang/sl/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/sl/admin/users/general.php b/resources/lang/sl/admin/users/general.php
index 27ff09d432..f6129ec06b 100644
--- a/resources/lang/sl/admin/users/general.php
+++ b/resources/lang/sl/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Zadnja prijava',
'ldap_config_text' => 'Nastavitve konfiguracije LDAP-a lahko najdete v zavihku Admin> Nastavitve. Izbrana lokacija bo nastavljena za vse uvožene uporabnike.',
'print_assigned' => 'Natisni vse dodeljene',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Programska oprema izdana osebi :name',
'send_email_help' => 'Obvezno je potrebno navesti e-poštni račun za tega uporabnika kamor bo prejel poverilnice. Pošiljanje poverilnic je mogoče le ob ustvarjanju uporabnika. Gesla so shranjena eno-smerno šifrirano in jih je nemogoče pridobiti po shranjenju.',
'view_user' => 'Ogled uporabnika :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/sl/general.php b/resources/lang/sl/general.php
index 75aa864247..51a5dd8c3a 100644
--- a/resources/lang/sl/general.php
+++ b/resources/lang/sl/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Ustvari novo',
'created' => 'Ustvarjeno',
'created_asset' => 'ustvarjeno sredstvo',
- 'created_at' => 'Ustvarjen ob',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Zapis ustvarjen',
'updated_at' => 'Posodobljeno ob',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'To se uporablja za ustvarjanje e-poštnih naslovov pri uvozu',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'Prva črka imena priimek (jsmith@example.com)',
'firstname_lastname_format' => 'Ime priimek (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Ime priimek (jane.smith@example.com)',
@@ -257,6 +259,7 @@ return [
'undeployable' => 'Nerazporejeno',
'unknown_admin' => 'Neznan skrbnik',
'username_format' => 'Format za uporabniško ime',
+ 'username' => 'Username',
'update' => 'Posodobi',
'upload_filetypes_help' => 'Dovoljeni tipi datotek so png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf in rar. Dovoljena je največja velikost nalaganja :size.',
'uploaded' => 'Naloženo',
@@ -358,4 +361,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/sl/passwords.php b/resources/lang/sl/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/sl/passwords.php
+++ b/resources/lang/sl/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/sl/reminders.php b/resources/lang/sl/reminders.php
index 6275ec3b04..12fbe2f430 100644
--- a/resources/lang/sl/reminders.php
+++ b/resources/lang/sl/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Gesla morajo biti dolga vsaj šest znakov in ustrezati potrditvi.",
-
"user" => "Uporabniško ime ali e-poštni naslov je napačno",
-
- "token" => "Token za ponastavitev gesla je neveljaven.",
-
- "sent" => "Če je bil najden ujemajoč e-poštni naslov, je bil poslan opomnik za geslo!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/sl/validation.php b/resources/lang/sl/validation.php
index b9da08dc69..f1adb96a42 100644
--- a/resources/lang/sl/validation.php
+++ b/resources/lang/sl/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Oblika atributa je neveljavna.',
'unique_undeleted' => 'Atribut mora biti edinstven.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/sr-CS/admin/custom_fields/general.php b/resources/lang/sr-CS/admin/custom_fields/general.php
index f04d3b6ba4..b9ffed01e7 100644
--- a/resources/lang/sr-CS/admin/custom_fields/general.php
+++ b/resources/lang/sr-CS/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/sr-CS/admin/custom_fields/message.php b/resources/lang/sr-CS/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/sr-CS/admin/custom_fields/message.php
+++ b/resources/lang/sr-CS/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/sr-CS/admin/hardware/form.php b/resources/lang/sr-CS/admin/hardware/form.php
index 80fa560424..cde6c148b5 100644
--- a/resources/lang/sr-CS/admin/hardware/form.php
+++ b/resources/lang/sr-CS/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/sr-CS/admin/settings/message.php b/resources/lang/sr-CS/admin/settings/message.php
index 17731e954c..44c866015c 100644
--- a/resources/lang/sr-CS/admin/settings/message.php
+++ b/resources/lang/sr-CS/admin/settings/message.php
@@ -38,6 +38,6 @@ return [
'success_pt1' => 'Success! Check the ',
'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.',
'500' => '500 Server Error.',
- 'error' => 'Something went wrong.',
+ 'error' => 'Nešto nije u redu.',
]
];
diff --git a/resources/lang/sr-CS/admin/users/general.php b/resources/lang/sr-CS/admin/users/general.php
index e0b3f13672..160a64af85 100644
--- a/resources/lang/sr-CS/admin/users/general.php
+++ b/resources/lang/sr-CS/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Poslednja prijava',
'ldap_config_text' => 'Postavke LDAP konfiguracije mogu se pronaći u Administrator> Postavke. Odabrana lokacija (opcionalno) će biti podešena za sve importovane korisnike.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'Prikaži korisnika :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/sr-CS/auth/message.php b/resources/lang/sr-CS/auth/message.php
index b8056bb3d6..9598625002 100644
--- a/resources/lang/sr-CS/auth/message.php
+++ b/resources/lang/sr-CS/auth/message.php
@@ -7,11 +7,11 @@ return array(
'account_not_activated' => 'Ovaj korisnički nalog nije aktiviran.',
'account_suspended' => 'Ovaj je korisnički nalog je blokiran.',
'account_banned' => 'Ovaj je korisnički nalog je zabranjen.',
- 'throttle' => 'Too many failed login attempts. Please try again in :minutes minutes.',
+ 'throttle' => 'Previše neuspelih pokušaja. Pokušajte ponovo za :seconds sekundi.',
'two_factor' => array(
'already_enrolled' => 'Your device is already enrolled.',
- 'success' => 'You have successfully logged in.',
+ 'success' => 'Uspešno ste se prijavili.',
'code_required' => 'Two-factor code is required.',
'invalid_code' => 'Two-factor code is invalid.',
),
@@ -22,7 +22,7 @@ return array(
),
'logout' => array(
- 'error' => 'There was a problem while trying to log you out, please try again.',
+ 'error' => 'Došlo je do problema prilikom pokušaja prijavljivanja, pokušajte ponovo.',
'success' => 'You have successfully logged out.',
),
@@ -33,7 +33,7 @@ return array(
'forgot-password' => array(
'error' => 'Pojavio se problem prilikom pokušaja ponovnog unosa lozinke, pokušajte ponovo.',
- 'success' => 'If that email address exists in our system, a password recovery email has been sent.',
+ 'success' => 'Uspešno: Ako ta adresa e-pošte već postoji u našem sistemu, e-poruka za povraćaj lozinke je poslata.',
),
'forgot-password-confirm' => array(
diff --git a/resources/lang/sr-CS/button.php b/resources/lang/sr-CS/button.php
index 8b01db6f62..93b2b9d13c 100644
--- a/resources/lang/sr-CS/button.php
+++ b/resources/lang/sr-CS/button.php
@@ -10,7 +10,7 @@ return [
'restore' => 'Vratiti',
'remove' => 'Ukloni',
'request' => 'Zahtev',
- 'submit' => 'Submit',
+ 'submit' => 'Pošalji',
'upload' => 'Upload',
'select_file' => 'Odaberite datoteku...',
'select_files' => 'Odaberite datoteke...',
diff --git a/resources/lang/sr-CS/general.php b/resources/lang/sr-CS/general.php
index e743310700..8d1b604387 100644
--- a/resources/lang/sr-CS/general.php
+++ b/resources/lang/sr-CS/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Napravi novi unos',
'created' => 'Stavka kreirana',
'created_asset' => 'kreirana imovina',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Zapis kreiran',
'updated_at' => 'Ažurirano',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Broj zaposlenog',
'email_domain_help' => 'Ovo se koristi za generisanje e-mail adrese prilikom uvoza',
'error' => 'Greška',
+ 'example' => 'Example: ',
'filastname_format' => 'Prvo slovo imena Prezime (jsmith@example.com)',
'firstname_lastname_format' => 'Ime Prezime (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Ime Prezime (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Nepoznati administrator',
'username_format' => 'Format korisničkog imena',
+ 'username' => 'Username',
'update' => 'Ažuriraj',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/sr-CS/mail.php b/resources/lang/sr-CS/mail.php
index 8373567ccc..8c95d3b054 100644
--- a/resources/lang/sr-CS/mail.php
+++ b/resources/lang/sr-CS/mail.php
@@ -37,7 +37,7 @@ return [
'item' => 'Artikal:',
'Item_Request_Canceled' => 'Zahtev za stavku je otkazan',
'Item_Requested' => 'Zahtevana stavka',
- 'link_to_update_password' => 'Kliknite na sljedeći link kako biste potvrdili svoj :web nalog:',
+ 'link_to_update_password' => 'Kliknite na sledeću vezu kako biste potvrdili svoj :web nalog:',
'login_first_admin' => 'Login to your new Snipe-IT installation using the credentials below:',
'login' => 'Login:',
'Low_Inventory_Report' => 'Izveštaj o niskim zalihama',
@@ -53,9 +53,9 @@ return [
'requested' => 'Traženi:',
'reset_link' => 'Link za resetovanje lozinke',
'reset_password' => 'Kliknite ovde da biste poništili lozinku:',
- 'serial' => 'Serial',
+ 'serial' => 'Serijski broj',
'supplier' => 'Dobavljač',
- 'tag' => 'Tag',
+ 'tag' => 'Oznaka',
'test_email' => 'Isprobajte e-poštu od Snipe-IT',
'test_mail_text' => 'This is a test from the Snipe-IT Asset Management System. If you got this, mail is working :)',
'the_following_item' => 'The following item has been checked in: ',
diff --git a/resources/lang/sr-CS/passwords.php b/resources/lang/sr-CS/passwords.php
index bc9e241797..25633b4581 100644
--- a/resources/lang/sr-CS/passwords.php
+++ b/resources/lang/sr-CS/passwords.php
@@ -1,6 +1,8 @@
'Uspešno: Ako ta adresa e-pošte već postoji u našem sistemu, e-poruka za povraćaj lozinke je poslata.',
- 'user' => 'Nije pronađen aktivni korisnik sa tom adresom e-pošte.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/sr-CS/reminders.php b/resources/lang/sr-CS/reminders.php
index 1ecd7c0c5b..e9022ba42b 100644
--- a/resources/lang/sr-CS/reminders.php
+++ b/resources/lang/sr-CS/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Lozinke moraju imati šest znakova i odgovarati potvrdi.",
-
"user" => "Korisničko ime ili e-adresa nisu ispravni",
-
- "token" => "Token za reset lozinke nije ispravan.",
-
- "sent" => "Ako je pronađena odgovarajuća adresa e-pošte, podsetnik za lozinku je poslat!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/sr-CS/validation.php b/resources/lang/sr-CS/validation.php
index 22f584db3e..c932cf885c 100644
--- a/resources/lang/sr-CS/validation.php
+++ b/resources/lang/sr-CS/validation.php
@@ -91,6 +91,11 @@ return [
'url' => ':attribute format je neispravan.',
'unique_undeleted' => ':attribute mora biti jedinstven.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/sv-SE/admin/custom_fields/general.php b/resources/lang/sv-SE/admin/custom_fields/general.php
index b47177d693..ef7b1fdb6f 100644
--- a/resources/lang/sv-SE/admin/custom_fields/general.php
+++ b/resources/lang/sv-SE/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Valfritt - klicka för att begära',
'reorder' => 'Ändra ordning',
'db_field' => 'DB Fält',
- 'db_convert_warning' => 'VARNING. Detta fält finns i tabellen för anpassade fält som :db_column
men bör vara :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Detta värde måste vara unikt för alla tillgångar',
'unique' => 'Unik',
];
diff --git a/resources/lang/sv-SE/admin/custom_fields/message.php b/resources/lang/sv-SE/admin/custom_fields/message.php
index fef4e94dda..f501d0b3a2 100644
--- a/resources/lang/sv-SE/admin/custom_fields/message.php
+++ b/resources/lang/sv-SE/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/sv-SE/admin/hardware/form.php b/resources/lang/sv-SE/admin/hardware/form.php
index 4e94112187..1597715610 100644
--- a/resources/lang/sv-SE/admin/hardware/form.php
+++ b/resources/lang/sv-SE/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'Denna tillgångs status kan inte distribueras. Denna tillgång kan inte checkas ut.',
'asset_deployable' => 'Denna status är distribuerbar. Denna tillgång kan checkas ut.',
'processing_spinner' => 'Bearbetar...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/sv-SE/admin/users/general.php b/resources/lang/sv-SE/admin/users/general.php
index 98753949b5..8564d91eae 100644
--- a/resources/lang/sv-SE/admin/users/general.php
+++ b/resources/lang/sv-SE/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Senaste inloggning',
'ldap_config_text' => 'LDAP-konfigurationsinställningar finns Admin> Inställningar. Den (valfria) valda platsen kommer att ställas in för alla importerade användare.',
'print_assigned' => 'Skriv ut alla tilldelade',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Programvara Kontrollerad till: namn',
'send_email_help' => 'Du måste ange en e-postadress till användaren för att kunna skicka inloggningsuppgifterna. Utskick av inloggningsuppgifter kan endast göras när användaren skapas. Lösenorden lagras i en one-way hash och kan inte hämtas när de väl sparats.',
'view_user' => 'Visa användare: namn',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Ta bort gruppmedlemskap',
'warning_deletion' => 'VARNING:',
'warning_deletion_information' => 'Du håller på att ta bort :count användare som anges nedan. Super admin namn markeras med rött.',
- 'update_user_asssets_status' => 'Uppdatera alla tillgångar för dessa användare till denna status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Kolla in alla egenskaper som är associerade med dessa användare',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/sv-SE/general.php b/resources/lang/sv-SE/general.php
index 9bec3e66ef..370306e98e 100644
--- a/resources/lang/sv-SE/general.php
+++ b/resources/lang/sv-SE/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Skapa Ny',
'created' => 'Artikel skapad',
'created_asset' => 'skapa tillgång',
- 'created_at' => 'Skapad',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Poster skapade',
'updated_at' => 'Uppdaterad på',
'currency' => 'SEK', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Anställningsnummer',
'email_domain_help' => 'Detta används för att generera e-postadresser vid import',
'error' => 'Fel',
+ 'example' => 'Example: ',
'filastname_format' => 'Första Initiala Efternamn (jsmith@example.com)',
'firstname_lastname_format' => 'Förnamn Efternamn (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Förnamn Efternamn (jane.smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Ej tillgängliga',
'unknown_admin' => 'Okänd Admin',
'username_format' => 'Användarnamn Format',
+ 'username' => 'Username',
'update' => 'Uppdatering',
'upload_filetypes_help' => 'Tillåtna filtyper är png, gif, jpg, jpeg, doc, docx, pdf, xls, txt, lic, zip och rar. Max tillåten uppladdningsstorlek är: storlek.',
'uploaded' => 'Uppladdad',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/sv-SE/passwords.php b/resources/lang/sv-SE/passwords.php
index efb505c7a7..25633b4581 100644
--- a/resources/lang/sv-SE/passwords.php
+++ b/resources/lang/sv-SE/passwords.php
@@ -1,6 +1,8 @@
'Klart: Om den e-postadressen finns i vårt system, har ett lösenordsåterställningsmejl skickats.',
- 'user' => 'Ingen aktiv användare med denna e-postadress hittades.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/sv-SE/reminders.php b/resources/lang/sv-SE/reminders.php
index 5eceef1eed..01c160c990 100644
--- a/resources/lang/sv-SE/reminders.php
+++ b/resources/lang/sv-SE/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Lösenord måste vara sex tecken och matcha lösenordsbekräftelsen.",
-
"user" => "Användarnamnet eller e-postadressen är felaktigt",
-
- "token" => "Denna token för lösenordsåterställning är ogiltig.",
-
- "sent" => "Om en matchande e-postadress hittades, har en lösenordspåminnelse skickats!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/sv-SE/validation.php b/resources/lang/sv-SE/validation.php
index 4431182fcd..9014e0fa45 100644
--- a/resources/lang/sv-SE/validation.php
+++ b/resources/lang/sv-SE/validation.php
@@ -91,6 +91,11 @@ return [
'url' => ':attribute Formatet är ogiltigt.',
'unique_undeleted' => ':attribute måste vara unikt.',
'non_circular' => ':attribute får inte skapa en cirkulär referens.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ta/admin/custom_fields/general.php b/resources/lang/ta/admin/custom_fields/general.php
index e054e15685..31b2f3eef2 100644
--- a/resources/lang/ta/admin/custom_fields/general.php
+++ b/resources/lang/ta/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ta/admin/custom_fields/message.php b/resources/lang/ta/admin/custom_fields/message.php
index 940a31778b..93366a986d 100644
--- a/resources/lang/ta/admin/custom_fields/message.php
+++ b/resources/lang/ta/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ta/admin/hardware/form.php b/resources/lang/ta/admin/hardware/form.php
index 57ed15d113..e4e2e0bacc 100644
--- a/resources/lang/ta/admin/hardware/form.php
+++ b/resources/lang/ta/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ta/admin/users/general.php b/resources/lang/ta/admin/users/general.php
index d03b32c8d6..28bcadc65a 100644
--- a/resources/lang/ta/admin/users/general.php
+++ b/resources/lang/ta/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'கடைசி தேதி',
'ldap_config_text' => 'LDAP உள்ளமைவு அமைப்புகள் நிர்வாகம்> அமைப்புகள். இறக்குமதி செய்யப்பட்ட அனைத்து பயனர்களுக்கும் (விரும்பினால்) தேர்ந்தெடுக்கப்பட்ட இடம் அமைக்கப்படும்.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'மென்பொருள் சரிபார்க்கப்பட்டது: பெயர்',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'பயனர் காண்க: பெயர்',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ta/general.php b/resources/lang/ta/general.php
index e81f790fc3..c0fdd9ef0f 100644
--- a/resources/lang/ta/general.php
+++ b/resources/lang/ta/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'புதிதாக உருவாக்கு',
'created' => 'உருப்படி உருவாக்கப்பட்டது',
'created_asset' => 'சொத்து உருவாக்கப்பட்டது',
- 'created_at' => 'இல் உருவாக்கப்பட்டது',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'புதுப்பிக்கப்பட்டது',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'இறக்குமதி செய்யும் போது மின்னஞ்சல் முகவரிகள் உருவாக்க இது பயன்படுகிறது',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'முதல் தொடக்க கடைசி பெயர் (jsmith@example.com)',
'firstname_lastname_format' => 'முதல் பெயர் கடைசி பெயர் (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'முதல் பெயர் கடைசி பெயர் (jane.smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'அன்-அணியப்படுத்தக்',
'unknown_admin' => 'அறியப்படாத நிர்வாகம்',
'username_format' => 'பயனர்பெயர் வடிவமைப்பு',
+ 'username' => 'Username',
'update' => 'புதுப்பிக்கப்பட்டது',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ta/passwords.php b/resources/lang/ta/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/ta/passwords.php
+++ b/resources/lang/ta/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ta/reminders.php b/resources/lang/ta/reminders.php
index 381fc13cf2..9dc0923ed6 100644
--- a/resources/lang/ta/reminders.php
+++ b/resources/lang/ta/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "கடவுச்சொற்கள் ஆறு எழுத்துகள் இருக்க வேண்டும் மற்றும் உறுதிப்படுத்தல் பொருத்த வேண்டும்.",
-
"user" => "பயனர்பெயர் அல்லது மின்னஞ்சல் முகவரி தவறானது",
-
- "token" => "இந்த கடவுச்சொல் மீட்டமை டோக்கன் தவறானது.",
-
- "sent" => "பொருத்தமான மின்னஞ்சல் முகவரி இருந்தால், கடவுச்சொல் நினைவூட்டல் அனுப்பப்பட்டது!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ta/validation.php b/resources/lang/ta/validation.php
index aaf53b5dc8..ee5c8641a7 100644
--- a/resources/lang/ta/validation.php
+++ b/resources/lang/ta/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'பண்புக்கூறு வடிவமைப்பு தவறானது.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/th/admin/custom_fields/general.php b/resources/lang/th/admin/custom_fields/general.php
index c06ae3b0ee..62e054119f 100644
--- a/resources/lang/th/admin/custom_fields/general.php
+++ b/resources/lang/th/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/th/admin/custom_fields/message.php b/resources/lang/th/admin/custom_fields/message.php
index f7a576f98a..7da352e33e 100644
--- a/resources/lang/th/admin/custom_fields/message.php
+++ b/resources/lang/th/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/th/admin/hardware/form.php b/resources/lang/th/admin/hardware/form.php
index b009b245b2..52b569b8cd 100644
--- a/resources/lang/th/admin/hardware/form.php
+++ b/resources/lang/th/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/th/admin/users/general.php b/resources/lang/th/admin/users/general.php
index ea7f17df4a..9a5e487d07 100644
--- a/resources/lang/th/admin/users/general.php
+++ b/resources/lang/th/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'เข้าสู่ระบบล่าสุด',
'ldap_config_text' => 'คุณสามารถตั้งค่าการกำหนดค่า LDAP ได้ Admin> การตั้งค่า สถานที่ที่เลือก (เลือกได้) จะถูกตั้งค่าสำหรับผู้ใช้ที่นำเข้าทั้งหมด',
'print_assigned' => 'พิมพ์รายการทั้งหมดที่ได้รับมอบหมาย',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'ซอฟต์แวร์ที่กำหนดให้ :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'ดูผู้ใช้ :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/th/auth.php b/resources/lang/th/auth.php
index db310aa1bb..5f94046f18 100644
--- a/resources/lang/th/auth.php
+++ b/resources/lang/th/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'ข้อมูลที่ใช้ในการยืนยันตัวตนไม่ถูกต้อง',
+ 'password' => 'รหัสผ่านนี้ไม่ถูกต้อง',
+ 'throttle' => 'คุณได้พยายามเข้าระบบหลายครั้งเกินไป กรุณาลองใหม่ใน :seconds วินาทีข้างหน้า.',
);
diff --git a/resources/lang/th/button.php b/resources/lang/th/button.php
index 802a8132d1..1ce3c8c6b8 100644
--- a/resources/lang/th/button.php
+++ b/resources/lang/th/button.php
@@ -8,7 +8,7 @@ return [
'delete' => 'ลบ',
'edit' => 'แก้ไข',
'restore' => 'นำกลับ',
- 'remove' => 'Remove',
+ 'remove' => 'ลบออก',
'request' => 'ร้องขอ',
'submit' => 'ตกลง',
'upload' => 'อัพโหลด',
@@ -16,9 +16,9 @@ return [
'select_files' => 'เลือกไฟล์...',
'generate_labels' => '{1} Generate Label|[2,*] Generate Labels',
'send_password_link' => 'ส่งลิงก์รีเซ็ตรหัสผ่าน',
- 'go' => 'Go',
+ 'go' => 'ไป',
'bulk_actions' => 'Bulk Actions',
- 'add_maintenance' => 'Add Maintenance',
- 'append' => 'Append',
- 'new' => 'New',
+ 'add_maintenance' => 'เพิ่มรายการซ่อมบำรุง',
+ 'append' => 'เพิ่ม',
+ 'new' => 'สร้างใหม่',
];
diff --git a/resources/lang/th/general.php b/resources/lang/th/general.php
index 6c23da0b6a..909b64add9 100644
--- a/resources/lang/th/general.php
+++ b/resources/lang/th/general.php
@@ -19,14 +19,14 @@ return [
'asset' => 'ทรัพย์สิน',
'asset_report' => 'รายงานทรัพย์สิน',
'asset_tag' => 'รหัสทรัพย์สิน',
- 'asset_tags' => 'Asset Tags',
- 'assets_available' => 'Assets available',
+ 'asset_tags' => 'รหัสทรัพย์สิน',
+ 'assets_available' => 'ทรัพย์สินพร้อมใช้งาน',
'accept_assets' => 'Accept Assets :name',
'accept_assets_menu' => 'Accept Assets',
'audit' => 'การตรวจสอบบัญชี',
'audit_report' => 'บันทึกการตรวจสอบ',
'assets' => 'ทรัพย์สิน',
- 'assigned_to' => 'Assigned to :name',
+ 'assigned_to' => 'มอบหมายให้:',
'avatar_delete' => 'ลบรูปภาพประจำตัว',
'avatar_upload' => 'อัพโหลดภาพประจำตัว',
'back' => 'ย้อนกลับ',
@@ -34,10 +34,10 @@ return [
'bulkaudit' => 'การตรวจสอบเป็นกลุ่ม',
'bulkaudit_status' => 'สถานะการตรวจสอบ',
'bulk_checkout' => 'Checkout เป็นกลุ่ม',
- 'bulk_edit' => 'Bulk Edit',
- 'bulk_delete' => 'Bulk Delete',
- 'bulk_actions' => 'Bulk Actions',
- 'bulk_checkin_delete' => 'Bulk Checkin & Delete',
+ 'bulk_edit' => 'แก้ไขจำนวนมาก',
+ 'bulk_delete' => 'ลบเป็นกลุ่ม',
+ 'bulk_actions' => 'ดำเนินการกับข้อมูลเป็นชุด',
+ 'bulk_checkin_delete' => 'เช็คอิน & ลบ ข้อมูลเป็นชุด',
'bystatus' => 'ตามสถานะ',
'cancel' => 'ยกเลิก',
'categories' => 'ประเภท',
@@ -65,13 +65,14 @@ return [
'create' => 'สร้างใหม่',
'created' => 'สร้างรายการแล้ว',
'created_asset' => 'ทรัพย์สินที่ถูกสร้าง',
- 'created_at' => 'สร้างที่',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'สร้างบันทึกแล้ว',
'updated_at' => 'อัปเดตเมื่อวันที่',
'currency' => '฿', // this is deprecated
'current' => 'ปัจจุบัน',
- 'current_password' => 'Current Password',
- 'customize_report' => 'Customize Report',
+ 'current_password' => 'รหัสผ่านปัจจุบัน',
+ 'customize_report' => 'รายงานทรัพย์สินแบบกำหนดเอง',
'custom_report' => 'รายงานทรัพย์สินแบบกำหนดเอง',
'dashboard' => 'หน้าหลัก',
'days' => 'วัน',
@@ -83,65 +84,66 @@ return [
'delete_confirm' => 'คุณแน่ใจหรือไม่ว่าต้องการลบ?',
'deleted' => 'ลบแล้ว',
'delete_seats' => 'ลบที่นั่งแล้ว',
- 'deletion_failed' => 'Deletion failed',
+ 'deletion_failed' => 'การลบล้มเหลว',
'departments' => 'หน่วยงาน',
'department' => 'แผนก',
'deployed' => 'กำลังใช้งาน',
'depreciation' => 'การเสื่อมราคา',
- 'depreciations' => 'Depreciations',
+ 'depreciations' => 'การเสื่อมราคา',
'depreciation_report' => 'รายงานการเสื่อมราคา',
'details' => 'รายละเอียด',
'download' => 'ดาวน์โหลด',
- 'download_all' => 'Download All',
+ 'download_all' => 'ดาวน์โหลดทั้งหมด',
'editprofile' => 'แก้ไขโปรไฟล์ของคุณ',
'eol' => 'อายุการใช้งาน',
'email_domain' => 'โดเมนอีเมล',
'email_format' => 'รูปแบบอีเมล',
- 'employee_number' => 'Employee Number',
+ 'employee_number' => 'หมายเลขพนักงาน',
'email_domain_help' => 'ใช้เพื่อสร้างที่อยู่อีเมลเมื่อนำเข้า',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'ชื่อย่อครั้งแรก (jsmith@example.com)',
'firstname_lastname_format' => 'ชื่อนามสกุล (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'ชื่อนามสกุล (jane.smith@example.com)',
'lastnamefirstinitial_format' => 'นามสกุล ชื่อ Initial (smithj@example.com)',
- 'firstintial_dot_lastname_format' => 'First Initial Last Name (j.smith@example.com)',
+ 'firstintial_dot_lastname_format' => 'อักษรต้นชื่อ.นามสกุล (j.smith@example.com)',
'first' => 'เริ่ม',
- 'firstnamelastname' => 'First Name Last Name (janesmith@example.com)',
- 'lastname_firstinitial' => 'Last Name First Initial (smith_j@example.com)',
- 'firstinitial.lastname' => 'First Initial Last Name (j.smith@example.com)',
- 'firstnamelastinitial' => 'First Name Last Initial (janes@example.com)',
+ 'firstnamelastname' => 'ชื่อ นามสกุล (janesmith@example.com)',
+ 'lastname_firstinitial' => 'นามสกุล อักษรต้นชื่อ (smith_j@example.com)',
+ 'firstinitial.lastname' => 'อักษรต้นชื่อ นามสกุล (j.smith@example.com)',
+ 'firstnamelastinitial' => 'ชื่อ อักษรต้นนามสกุล (janes@example.com)',
'first_name' => 'ชื่อจริง',
'first_name_format' => 'ชื่อ (jane@example.com)',
'files' => 'ไฟล์',
'file_name' => 'ไฟล์',
- 'file_type' => 'File Type',
- 'filesize' => 'File Size',
+ 'file_type' => 'ชนิดไฟล์',
+ 'filesize' => 'ขนาดไฟล์',
'file_uploads' => 'อัปโหลดไฟล์',
- 'file_upload' => 'File Upload',
+ 'file_upload' => 'อัปโหลดไฟล์',
'generate' => 'สร้าง',
'generate_labels' => 'Generate Labels',
'github_markdown' => 'ฟิลด์นี้ช่วยให้ Github markdown markdown',
'groups' => 'กลุ่ม',
'gravatar_email' => 'อีเมลแอดเดรส Gravatar',
- 'gravatar_url' => 'Change your avatar at Gravatar.com.',
+ 'gravatar_url' => 'ใช้รูปอวตาลของคุณจาก Gravatar.com.',
'history' => 'ประวัติศาสตร์',
'history_for' => 'ประวัติของ',
'id' => 'ID',
'image' => 'รูป',
'image_delete' => 'ลบรูปภาพประจำตัว',
'image_upload' => 'อัพโหลดภาพ',
- 'filetypes_accepted_help' => 'Accepted filetype is :types. Max upload size allowed is :size.|Accepted filetypes are :types. Max upload size allowed is :size.',
- 'filetypes_size_help' => 'Max upload size allowed is :size.',
- 'image_filetypes_help' => 'Accepted filetypes are jpg, webp, png, gif, and svg. Max upload size allowed is :size.',
+ 'filetypes_accepted_help' => 'ชนิดไฟล๋ที่ยอมรับ :types ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size |ชนิดไฟล๋ที่ยอมรับ :types ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size',
+ 'filetypes_size_help' => 'ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size',
+ 'image_filetypes_help' => 'ชนิดไฟล์ที่รองรับคือ jpg, webp, png, gif, และ svg. ขนาดไฟล์ใหญ่สุดที่ให้อัพโหลดได้ :size',
'import' => 'นำเข้า',
- 'importing' => 'Importing',
+ 'importing' => 'กำลังนำเข้า…',
'importing_help' => 'You can import assets, accessories, licenses, components, consumables, and users via CSV file. Select the fields you would like to include in your custom report, and click Generate. The file (custom-asset-report-YYYY-mm-dd.csv) will download automatically, and you can open it in Excel.
If you would like to export only certain assets, use the options below to fine-tune your results.
', - 'range' => 'Range', - 'bom_remark' => 'Add a BOM (byte-order mark) to this CSV', - 'improvements' => 'Improvements', - 'information' => 'Information', - 'permissions' => 'Permissions', + 'range' => 'ช่วง', + 'bom_remark' => 'เพิ่มข้อมูล BOM (byte-order mark) ลงใน CSV นี้', + 'improvements' => 'การปรับปรุง', + 'information' => 'ข้อมูลรายละเอียด', + 'permissions' => 'สิทธิ', 'managed_ldap' => '(Managed via LDAP)', - 'export' => 'Export', + 'export' => 'ส่งออก', 'ldap_sync' => 'LDAP Sync', 'ldap_user_sync' => 'LDAP User Sync', - 'synchronize' => 'Synchronize', - 'sync_results' => 'Synchronization Results', - 'license_serial' => 'Serial/Product Key', - 'invalid_category' => 'Invalid category', - 'dashboard_info' => 'This is your dashboard. There are many like it, but this one is yours.', - '60_percent_warning' => '60% Complete (warning)', - 'dashboard_empty' => 'It looks like you haven not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!', - 'new_asset' => 'New Asset', - 'new_license' => 'New License', - 'new_accessory' => 'New Accessory', - 'new_consumable' => 'New Consumable', - 'collapse' => 'Collapse', - 'assigned' => 'Assigned', - 'asset_count' => 'Asset Count', - 'accessories_count' => 'Accessories Count', - 'consumables_count' => 'Consumables Count', - 'components_count' => 'Components Count', - 'licenses_count' => 'Licenses Count', - 'notification_error' => 'Error:', - 'notification_error_hint' => 'Please check the form below for errors', - 'notification_success' => 'Success:', - 'notification_warning' => 'Warning:', - 'notification_info' => 'Info:', - 'asset_information' => 'Asset Information', - 'model_name' => 'Model Name:', - 'asset_name' => 'Asset Name:', - 'consumable_information' => 'Consumable Information:', - 'consumable_name' => 'Consumable Name:', - 'accessory_information' => 'Accessory Information:', - 'accessory_name' => 'Accessory Name:', - 'clone_item' => 'Clone Item', - 'checkout_tooltip' => 'Check this item out', - 'checkin_tooltip' => 'Check this item in', - 'checkout_user_tooltip' => 'Check this item out to a user', - 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', - 'maintenance_mode_title' => 'System Temporarily Unavailable', + 'synchronize' => 'ซิงค์', + 'sync_results' => 'ผลการซิงค์', + 'license_serial' => 'ซีเรียลฯ/หมายเลขสินค้า', + 'invalid_category' => 'ข้อมูลหมวดหมู่ไม่ถูกต้อง', + 'dashboard_info' => 'นี่คือแดสบอร์ดของคุณ (dashboard). มีหลายอันที่คล้ายนี่ แต่อันนี้คืออันของคุณ', + '60_percent_warning' => 'สมบูรณ์แล้ว 60% (แจ้งเตือน)', + 'dashboard_empty' => 'เหมือนจะยังไม่มีการกรอกข้อมูลใดๆ ลงไป ระบบจึงยังไม่มีอะไรที่ดูเจ๋งๆ แสดงให้ดู ลองเริ่มต้นด้วยการกรอก ทรัพย์สิน, อุปกรณ์, วัสดุสิ้นเปลือง, หรือข้อมูลลิขสิทธิ์ เดี๋ยวนี้เลยสิ!', + 'new_asset' => 'สร้างข้อมูลทรัพย์สิน', + 'new_license' => 'สร้างข้อมูลลิขสิทธิ์', + 'new_accessory' => 'สร้างข้อมูลอุปกรณ์', + 'new_consumable' => 'สร้างข้อมูลวัสดุสิ้นเปลือง', + 'collapse' => 'ยุบ', + 'assigned' => 'ได้มอบหมายให้', + 'asset_count' => 'นับทรัพย์สิน', + 'accessories_count' => 'นับอุปกรณ์', + 'consumables_count' => 'นับวัสดุสิ้นเปลือง', + 'components_count' => 'นับส่วนประกอบ (Components)', + 'licenses_count' => 'นับลิขสิทธิ์', + 'notification_error' => 'ข้อผิดพลาด:', + 'notification_error_hint' => 'โปรดระบุข้อมูลในฟอร์มนี้เกี่ยวกับข้อผิดพลาดที่ปรากฏ', + 'notification_success' => 'สำเร็จ:', + 'notification_warning' => 'คำเตือน:', + 'notification_info' => 'ข้อมูล:', + 'asset_information' => 'รายละเอียดของทรัพย์สิน', + 'model_name' => 'ชื่อรุ่น:', + 'asset_name' => 'ชื่อของทรัพย์สิน:', + 'consumable_information' => 'รายละเอียดของวัสดุสิ้นเปลือง:', + 'consumable_name' => 'ชื่อของวัสดุสิ้นเปลือง:', + 'accessory_information' => 'รายละเอียดของอุปกรณ์:', + 'accessory_name' => 'ชื่อของอุปกรณ์:', + 'clone_item' => 'สร้างสำเนา', + 'checkout_tooltip' => 'ส่งมอบรายการนี้', + 'checkin_tooltip' => 'รับมอบรายการนี้', + 'checkout_user_tooltip' => 'ส่งมอบรายการนี้แก่บุคคล', + 'maintenance_mode' => 'ระบบงานนี้งดบริการชั่วคราวเนื่องจากกำลังอัพเดทระบบ โปรดกลับมาอีกครั้งภายหลัง', + 'maintenance_mode_title' => 'ระบบงดการบริการชั่วคราว', 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/th/passwords.php b/resources/lang/th/passwords.php index 1f50b66779..25633b4581 100644 --- a/resources/lang/th/passwords.php +++ b/resources/lang/th/passwords.php @@ -1,6 +1,8 @@ 'Success: If that email address exists in our system, a password recovery email has been sent.', - 'user' => 'ไม่พบผู้ใช้งานดังกล่าวกับอีเมล์นี้', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'token' => 'This password reset token is invalid or expired, or does not match the username provided.', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/th/reminders.php b/resources/lang/th/reminders.php index 8ae96bc63b..fe8baa603b 100644 --- a/resources/lang/th/reminders.php +++ b/resources/lang/th/reminders.php @@ -14,11 +14,8 @@ return array( */ "password" => "รหัสผ่านต้องมีอย่างน้อย 6 ตัวอักษร และตรงตามรูปแบบที่กำหนด", - "user" => "ชื่อผู้ใช้หรืออีเมลแอดเดรสไม่ถูกต้อง", - - "token" => "Token รีเซ็ตรหัสผ่านไม่ถูกต้อง", - - "sent" => "ถ้าหากอีเมลที่คุณกรอกเป็นอีเมลที่ถูกต้อง ระบบได้ทำการส่งรหัสผ่านใหม่ให้ท่านแล้ว!", + "token" => 'This password reset token is invalid or expired, or does not match the username provided.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', ); diff --git a/resources/lang/th/validation.php b/resources/lang/th/validation.php index 75226faa3d..f7c7843f73 100644 --- a/resources/lang/th/validation.php +++ b/resources/lang/th/validation.php @@ -91,6 +91,11 @@ return [ 'url' => 'รูปแบบของ :attribute ไม่ถูกต้อง', 'unique_undeleted' => 'แอตทริบิวต์ต้องไม่ซ้ำกัน', 'non_circular' => 'The :attribute must not create a circular reference.', + 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.', + 'letters' => 'Password must contain at least one letter.', + 'numbers' => 'Password must contain at least one number.', + 'case_diff' => 'Password must use mixed case.', + 'symbols' => 'Password must contain symbols.', 'gte' => [ 'numeric' => 'Value cannot be negative' ], diff --git a/resources/lang/tl/admin/custom_fields/general.php b/resources/lang/tl/admin/custom_fields/general.php index 4c7442b2d5..7434117830 100644 --- a/resources/lang/tl/admin/custom_fields/general.php +++ b/resources/lang/tl/admin/custom_fields/general.php @@ -41,7 +41,7 @@ return [ 'make_required' => 'Optional - click to make required', 'reorder' => 'Reorder', 'db_field' => 'DB Field', - 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/tl/admin/custom_fields/message.php b/resources/lang/tl/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/tl/admin/custom_fields/message.php
+++ b/resources/lang/tl/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/tl/admin/hardware/form.php b/resources/lang/tl/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/tl/admin/hardware/form.php
+++ b/resources/lang/tl/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/tl/admin/users/general.php b/resources/lang/tl/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/tl/admin/users/general.php
+++ b/resources/lang/tl/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/tl/general.php b/resources/lang/tl/general.php
index 5d67d5d673..c4d2798035 100644
--- a/resources/lang/tl/general.php
+++ b/resources/lang/tl/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Create New',
'created' => 'Item Created',
'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/tl/passwords.php b/resources/lang/tl/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/tl/passwords.php
+++ b/resources/lang/tl/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/tl/reminders.php b/resources/lang/tl/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/tl/reminders.php
+++ b/resources/lang/tl/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/tl/validation.php b/resources/lang/tl/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/tl/validation.php
+++ b/resources/lang/tl/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/tr/account/general.php b/resources/lang/tr/account/general.php
index 7fc060a849..1acb508779 100644
--- a/resources/lang/tr/account/general.php
+++ b/resources/lang/tr/account/general.php
@@ -1,12 +1,11 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
- 'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'personal_api_keys' => 'Kişisel API Anahtarları',
+ 'api_key_warning' => 'Bir API jetonu oluştururken, onu hemen kopyaladığınızdan emin olun.
+ bir daha size görünmeyecek.',
+ 'api_base_url' => 'API\'nizin temel URL\'si şurada bulunur:',
+ 'api_base_url_endpoint' => '/<uçnokta>',
+ 'api_token_expiration_time' => 'API jetonlarınız şu süre içinde sona erecek şekilde ayarlanmıştır:',
+ 'api_reference' => 'Lütfen API referansını kontrol edin belirli API uç noktalarını ve ek API belgelerini bulun.',
);
diff --git a/resources/lang/tr/admin/custom_fields/general.php b/resources/lang/tr/admin/custom_fields/general.php
index e62a2e56ae..da2efc9d23 100644
--- a/resources/lang/tr/admin/custom_fields/general.php
+++ b/resources/lang/tr/admin/custom_fields/general.php
@@ -32,16 +32,16 @@ return [
'create_field_title' => 'Create a new custom field',
'value_encrypted' => 'Bu alanın değeri veritabanında şifrelidir. Yalnızca yönetici kullanıcıları şifresi çözülen değeri görüntüleyebilir',
'show_in_email' => 'Bu alandaki değer kullanıcıya gönderilen ödeme e-postalara dahil edilsin mi? Şifreli alanlar e-postalarda yer alamaz.',
- 'help_text' => 'Help Text',
+ 'help_text' => 'Yardım Metni',
'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
- 'about_custom_fields_title' => 'About Custom Fields',
+ 'about_custom_fields_title' => 'Özel Alanlar Hakkında',
'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
'add_field_to_fieldset' => 'Add Field to Fieldset',
'make_optional' => 'Required - click to make optional',
'make_required' => 'Optional - click to make required',
'reorder' => 'Yeniden Sırala',
'db_field' => 'Veri Tabanı Sütunları',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'Bu değer tüm varlıklarda benzersiz olmalıdır',
'unique' => 'Benzersiz',
];
diff --git a/resources/lang/tr/admin/custom_fields/message.php b/resources/lang/tr/admin/custom_fields/message.php
index 356bbd0316..cd416e4be3 100644
--- a/resources/lang/tr/admin/custom_fields/message.php
+++ b/resources/lang/tr/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/tr/admin/depreciations/general.php b/resources/lang/tr/admin/depreciations/general.php
index a15e7eefe8..2f89d086c6 100644
--- a/resources/lang/tr/admin/depreciations/general.php
+++ b/resources/lang/tr/admin/depreciations/general.php
@@ -6,11 +6,11 @@ return [
'asset_depreciations' => 'Demirbaş Amortismanları',
'create' => 'Değer Kaybı Oluştur',
'depreciation_name' => 'Amortisman Adı',
- 'depreciation_min' => 'Floor Value of Depreciation',
+ 'depreciation_min' => 'Amortisman Taban Değeri',
'number_of_months' => 'Ay Sayısı',
'update' => 'Değer Kaybını Güncelle',
'depreciation_min' => 'Değişiklik sonrası minumum değer',
- 'no_depreciations_warning' => 'Warning:
- You do not currently have any depreciations set up.
- Please set up at least one depreciation to view the depreciation report.',
+ 'no_depreciations_warning' => 'Uyarı:
+ Şu anda ayarlanmış herhangi bir amortismanınız yok.
+ Amortisman raporunu görüntülemek için lütfen en az bir amortisman ayarlayın.',
];
diff --git a/resources/lang/tr/admin/depreciations/table.php b/resources/lang/tr/admin/depreciations/table.php
index e15526d9e2..33ecc1fcf2 100644
--- a/resources/lang/tr/admin/depreciations/table.php
+++ b/resources/lang/tr/admin/depreciations/table.php
@@ -6,6 +6,6 @@ return [
'months' => 'Ay',
'term' => 'Süre',
'title' => 'İsim',
- 'depreciation_min' => 'Floor Value',
+ 'depreciation_min' => 'Taban Değeri',
];
diff --git a/resources/lang/tr/admin/groups/titles.php b/resources/lang/tr/admin/groups/titles.php
index 598e124c15..52f5dff867 100644
--- a/resources/lang/tr/admin/groups/titles.php
+++ b/resources/lang/tr/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
'group_admin' => 'Grup Yöneticisi',
'allow' => 'Kabul Et',
'deny' => 'Reddet',
- 'permission' => 'Permission',
+ 'permission' => 'İzin',
'grant' => 'Grant',
'no_permissions' => 'This group has no permissions.'
];
diff --git a/resources/lang/tr/admin/hardware/form.php b/resources/lang/tr/admin/hardware/form.php
index 44c5c85973..1be7973e11 100644
--- a/resources/lang/tr/admin/hardware/form.php
+++ b/resources/lang/tr/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/tr/admin/hardware/message.php b/resources/lang/tr/admin/hardware/message.php
index 86fadf0958..f61befcb5b 100644
--- a/resources/lang/tr/admin/hardware/message.php
+++ b/resources/lang/tr/admin/hardware/message.php
@@ -17,7 +17,7 @@ return [
'error' => 'Demirbaş güncellenemedi, lütfen tekrar deneyin',
'success' => 'Demirbaş güncellendi.',
'nothing_updated' => 'Hiçbir alan seçilmedi, dolayısıyla hiç bir alan güncellenmedi.',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => 'Hiçbir varlık seçilmedi, bu nedenle hiçbir şey güncellenmedi.',
],
'restore' => [
diff --git a/resources/lang/tr/admin/hardware/table.php b/resources/lang/tr/admin/hardware/table.php
index 9364824d0a..5501206d2e 100644
--- a/resources/lang/tr/admin/hardware/table.php
+++ b/resources/lang/tr/admin/hardware/table.php
@@ -8,7 +8,7 @@ return [
'change' => 'Giriş/Çıkış',
'checkout_date' => 'Çıkış Tarihi',
'checkoutto' => 'Çıkış Yapıldı',
- 'current_value' => 'Current Value',
+ 'current_value' => 'Mevcut Değer',
'diff' => 'Fark',
'dl_csv' => 'CSV Dosyasını İndir',
'eol' => 'Ömür Süresi',
@@ -26,5 +26,5 @@ return [
'requesting_user' => 'Talep Sahibi',
'requested_date' => 'Talep Edilen Tarih',
'changed' => 'Değişti',
- 'icon' => 'Icon',
+ 'icon' => 'Simge',
];
diff --git a/resources/lang/tr/admin/kits/general.php b/resources/lang/tr/admin/kits/general.php
index db1ec2690f..74af52c7e9 100644
--- a/resources/lang/tr/admin/kits/general.php
+++ b/resources/lang/tr/admin/kits/general.php
@@ -13,38 +13,38 @@ return [
'none_licenses' => 'Çıkış yapılabilecek sayıda :license lisansı bulunmamaktadır. :qty adet gereklidir. ',
'none_consumables' => 'Yeterli sayıda :consumable olmadığından çıkış yapılamıyor. :qty adet gereklidir. ',
'none_accessory' => 'Çıkış yapılabilecek sayıda :accessory bulunmamaktadır. :qty adet gereklidir. ',
- 'append_accessory' => 'Append Accessory',
- 'update_appended_accessory' => 'Update appended Accessory',
- 'append_consumable' => 'Append Consumable',
+ 'append_accessory' => 'Ek Aksesuar',
+ 'update_appended_accessory' => 'Eklenen Aksesuarı güncelle',
+ 'append_consumable' => 'Sarf Malzemesi Ekle',
'update_appended_consumable' => 'Eklenmiş sarf malzemeyi güncelle',
'append_license' => 'Lisans ekle',
'update_appended_license' => 'Eklenmiş lisansı güncelle',
'append_model' => 'Model ekle',
- 'update_appended_model' => 'Update appended model',
- 'license_error' => 'License already attached to kit',
+ 'update_appended_model' => 'Eklenen modeli güncelle',
+ 'license_error' => 'Lisans zaten eklenmiş',
'license_added_success' => 'Lisans sorunsuz eklendi',
- 'license_updated' => 'License was successfully updated',
+ 'license_updated' => 'Lisans başarıyla güncellendi',
'license_none' => 'Lisans mevcut değil',
- 'license_detached' => 'License was successfully detached',
- 'consumable_added_success' => 'Consumable added successfully',
- 'consumable_updated' => 'Consumable was successfully updated',
- 'consumable_error' => 'Consumable already attached to kit',
+ 'license_detached' => 'Lisans başarıyla kaldırıldı',
+ 'consumable_added_success' => 'Sarf malzemesi başarıyla eklendi',
+ 'consumable_updated' => 'Sarf malzemesi başarıyla güncellendi',
+ 'consumable_error' => 'Sarf malzemesi zaten kite takılı',
'consumable_deleted' => 'Silme işlemi sorunsuz tamamlandı',
'consumable_none' => 'Sarf malzeme mevcut değil',
- 'consumable_detached' => 'Consumable was successfully detached',
- 'accessory_added_success' => 'Accessory added successfully',
- 'accessory_updated' => 'Accessory was successfully updated',
- 'accessory_detached' => 'Accessory was successfully detached',
- 'accessory_error' => 'Accessory already attached to kit',
- 'accessory_deleted' => 'Delete was successful',
- 'accessory_none' => 'Accessory does not exist',
- 'checkout_success' => 'Checkout was successful',
- 'checkout_error' => 'Checkout error',
- 'kit_none' => 'Kit does not exist',
- 'kit_created' => 'Kit was successfully created',
- 'kit_updated' => 'Kit was successfully updated',
- 'kit_not_found' => 'Kit not found',
- 'kit_deleted' => 'Kit was successfully deleted',
- 'kit_model_updated' => 'Model was successfully updated',
- 'kit_model_detached' => 'Model was successfully detached',
+ 'consumable_detached' => 'Sarf malzemesi başarıyla çıkarıldı',
+ 'accessory_added_success' => 'Aksesuar başarıyla eklendi',
+ 'accessory_updated' => 'Aksesuar başarıyla güncellendi',
+ 'accessory_detached' => 'Aksesuar başarıyla çıkarıldı',
+ 'accessory_error' => 'Aksesuar zaten kite takılı',
+ 'accessory_deleted' => 'Silme başarılı oldu',
+ 'accessory_none' => 'Aksesuar mevcut değil',
+ 'checkout_success' => 'Teslim işlemi başarılı oldu',
+ 'checkout_error' => 'Teslim hatası',
+ 'kit_none' => 'Kit mevcut değil',
+ 'kit_created' => 'Kit başarıyla oluşturuldu',
+ 'kit_updated' => 'Kit başarıyla güncellendi',
+ 'kit_not_found' => 'Kit bulunamadı',
+ 'kit_deleted' => 'Kit başarıyla silindi',
+ 'kit_model_updated' => 'Model başarıyla güncellendi',
+ 'kit_model_detached' => 'Model başarıyla ayrıldı',
];
diff --git a/resources/lang/tr/admin/settings/general.php b/resources/lang/tr/admin/settings/general.php
index 6ccd80800f..daf8fa4fac 100644
--- a/resources/lang/tr/admin/settings/general.php
+++ b/resources/lang/tr/admin/settings/general.php
@@ -28,7 +28,7 @@ return [
'auto_increment_prefix' => 'Ünvan (opsiyonel)',
'auto_incrementing_help' => 'Bunu ayarlamak için önce otomatik artan varlık etiketlerini etkinleştirin',
'backups' => 'Yedekler',
- 'backups_help' => 'Create, download, and restore backups ',
+ 'backups_help' => 'Yedekler oluşturun, indirin ve geri yükleyin ',
'backups_restoring' => 'Yedekten geri dön',
'backups_upload' => 'Yedeği yükle',
'backups_path' => 'Yedeklerin sunucuda saklanacağı yer :path
',
@@ -85,7 +85,7 @@ return [
'ldap_client_tls_key' => 'LDAP İstemci tarafı TLS anahtarı',
'ldap_login_test_help' => 'LDAP ayarlarınızı doğru yapılandırıp yapılandırmadığınızı test etmek yukarıda belirttiğiniz DN için geçerli bir LDAP kullanıcı adı ve parolası giriniz. ÖNCE GÜNCEL LDAP AYARLARINI KAYDETMELİSİN.',
'ldap_login_sync_help' => 'Bu sadece LDAP\'ın doğru şekilde senkron edilebildiğini test eder. Eğer LDAP Kimlik Doğrulama sorgunuz doğru değilse, kullanıcılar giriş yapamayabilirler. ÖNCE GÜNCEL LDAP AYARLARINI KAYDETMELİSİN.',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'LDAP Yöneticisi',
'ldap_server' => 'LDAP Sunucu',
'ldap_server_help' => 'ldap:// (şifrelenmemiş veya TLS) veya ldaps:// (SSL için) ile başlamalıdır',
'ldap_server_cert' => 'LDAP SSL sertifikası doğrulama',
diff --git a/resources/lang/tr/admin/settings/table.php b/resources/lang/tr/admin/settings/table.php
index 22db5c84ed..31b99a4fb9 100644
--- a/resources/lang/tr/admin/settings/table.php
+++ b/resources/lang/tr/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
- 'size' => 'Size',
+ 'created' => 'Oluşturuldu',
+ 'size' => 'Boyut',
);
diff --git a/resources/lang/tr/admin/users/general.php b/resources/lang/tr/admin/users/general.php
index 3cc9c70eda..74a62db0b5 100644
--- a/resources/lang/tr/admin/users/general.php
+++ b/resources/lang/tr/admin/users/general.php
@@ -17,14 +17,16 @@ return [
'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.',
'print_assigned' => 'Atananların Tümünü Yazdır',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Yazılıma :name için çıkış yapılmış',
'send_email_help' => 'Bu kullanıcıya kimlik bilgilerini gönderebilmesi için bir e-posta adresi sağlamalısınız. E-posta kimlik bilgileri yalnızca kullanıcı oluşturulurken yapılabilir. Parolalar tek yönlü bir karmada saklanır ve bir kez kaydedildikten sonra geri alınamaz.',
'view_user' => 'Kullanıcıyı Görüntüle :name',
'usercsv' => 'CSV Dosyası',
'two_factor_admin_optin_help' => 'Mevcut yönetici ayarlarınız, iki aşamalı kimlik doğrulamasının seçici olarak uygulanmasına izin verir. ',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
+ 'two_factor_enrolled' => 'Kayıtlı 2FA Cihazı ',
+ 'two_factor_active' => '2FA Etkin ',
+ 'user_deactivated' => 'Kullanıcı oturum açamıyor',
'user_activated' => 'User can login',
'activation_status_warning' => 'Aktivasyon durumunu değiştirme',
'group_memberships_helpblock' => 'Yalnızca süper yöneticiler grup üyeliklerini düzenleyebilir.',
@@ -33,10 +35,10 @@ return [
'remove_group_memberships' => 'Grup Üyeliklerini Kaldır',
'warning_deletion' => 'UYARILAR:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Bu kullanıcılar için tüm varlıkları bu duruma güncelleyin',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Bu kullanıcılarla ilişkili tüm mülkleri kontrol edin',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'remote_label' => 'Bu uzak bir kullanıcı',
+ 'remote' => 'Uzaktan Kumanda',
+ 'remote_help' => 'Bu, fiziksel konumlarınıza hiç gelmeyen veya nadiren gelen uzak kullanıcılara göre filtrelemeniz gerektiğinde yararlı olabilir.',
+ 'not_remote_label' => 'Bu uzak bir kullanıcı değil',
];
diff --git a/resources/lang/tr/admin/users/table.php b/resources/lang/tr/admin/users/table.php
index 3d8e8812ca..b1231c488e 100644
--- a/resources/lang/tr/admin/users/table.php
+++ b/resources/lang/tr/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => 'E-Posta',
'employee_num' => 'Çalışan No.',
'first_name' => 'Ad',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => 'Kullanıcıya atanacak bir grup seçin, kullanıcının atandığı grubun izinlerini aldığını unutmayın. Grupların seçimini kaldırmak için ctrl+tıklama (veya MacOS\'ta cmd+tıklama) tuşlarını kullanın.',
'id' => 'ID',
'inherit' => 'Devral',
'job' => 'İş Ünvanı',
diff --git a/resources/lang/tr/auth.php b/resources/lang/tr/auth.php
index db310aa1bb..72d1e0c99a 100644
--- a/resources/lang/tr/auth.php
+++ b/resources/lang/tr/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => 'Bu kimlik bilgileri kayıtlarımızla eşleşmiyor.',
+ 'password' => 'Sağlanan parola yanlış.',
+ 'throttle' => 'Çok fazla giriş denemesi. Lütfen :second saniye içinde tekrar deneyin.',
);
diff --git a/resources/lang/tr/general.php b/resources/lang/tr/general.php
index 173d80fe79..f8a93d2ee9 100644
--- a/resources/lang/tr/general.php
+++ b/resources/lang/tr/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Yeni Oluştur',
'created' => 'Öğe oluşturuldu',
'created_asset' => 'Oluşturulmuş Demirbaş',
- 'created_at' => 'Şurada oluşturuldu',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Kayıt Tarihi',
'updated_at' => 'Güncellendiği tarih',
'currency' => '$', // this is deprecated
@@ -100,9 +101,10 @@ Context | Request Context
'eol' => 'Kullanım Ömrü',
'email_domain' => 'E-posta etki alanı',
'email_format' => 'E-posta biçimi',
- 'employee_number' => 'Employee Number',
+ 'employee_number' => 'Çalışan Numarası',
'email_domain_help' => 'İçe aktarırken e-posta adresleri oluşturmak için kullanılır',
'error' => 'Hata',
+ 'example' => 'Example: ',
'filastname_format' => 'Ad başharfi Soyad (jsmith@example.com)',
'firstname_lastname_format' => 'Adı Soyadı (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Adı Soyadı (jane.smith@example.com)',
@@ -118,7 +120,7 @@ Context | Request Context
'files' => 'Dosyalar',
'file_name' => 'Dosya',
'file_type' => 'Dosya Türü',
- 'filesize' => 'File Size',
+ 'filesize' => 'Dosya Boyutu',
'file_uploads' => 'Dosya Yüklemeleri',
'file_upload' => 'Dosya Yükleme',
'generate' => 'Oluştur',
@@ -198,8 +200,8 @@ Context | Request Context
'qty' => 'Miktar',
'quantity' => 'Miktar',
'quantity_minimum' => 'Asgari :count adet miktarın altındasınız yada neredeyse asgari miktar seviyesinin altındasınız',
- 'quickscan_checkin' => 'Quick Scan Checkin',
- 'quickscan_checkin_status' => 'Checkin Status',
+ 'quickscan_checkin' => 'Hızlı Tarama ile Giriş',
+ 'quickscan_checkin_status' => 'Giriş Durumu',
'ready_to_deploy' => 'Atamaya Hazır',
'recent_activity' => 'Son Etkinlik',
'remaining' => 'Kalan',
@@ -234,7 +236,7 @@ Context | Request Context
'show_current' => 'Mevcutu Göster',
'sign_in' => 'Oturum Aç',
'signature' => 'İmza',
- 'signed_off_by' => 'Signed Off By',
+ 'signed_off_by' => 'İmzalayan',
'skin' => 'Tema',
'slack_msg_note' => 'Bir slack mesajı gönderilecek',
'slack_test_msg' => 'Oo merhaba! Görünüşe göre Snipe-IT ile Slack entegrasyonunuz çalışıyor!',
@@ -243,7 +245,7 @@ Context | Request Context
'state' => 'İlçe',
'status_labels' => 'Durum Etiketleri',
'status' => 'Durum',
- 'accept_eula' => 'Acceptance Agreement',
+ 'accept_eula' => 'Lisans Sözleşmesi',
'supplier' => 'Tedarikçi',
'suppliers' => 'Tedarikçiler',
'sure_to_delete' => 'Silmek istediğinize emin misiniz',
@@ -259,6 +261,7 @@ Context | Request Context
'undeployable' => 'Atanamaz',
'unknown_admin' => 'Bilinmeyen Yönetici',
'username_format' => 'Kullanıcı Adı Biçimi',
+ 'username' => 'Username',
'update' => 'Güncelle',
'upload_filetypes_help' => 'İzin verilen dosya türleri png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf ve rar\'dır. İzin verilen maksimum yükleme boyutu :size.',
'uploaded' => 'Yüklendi',
@@ -357,7 +360,11 @@ Context | Request Context
'checkout_tooltip' => 'Öğenin çıkışını yapın',
'checkin_tooltip' => 'Öğenin girişini yapın',
'checkout_user_tooltip' => 'Öğenin kullanıcıya çıkışını yapın',
- 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
- 'maintenance_mode_title' => 'System Temporarily Unavailable',
- 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'maintenance_mode' => 'Sistem güncellemeleri için servis geçici olarak kullanılamıyor. Lütfen daha sonra tekrar kontrol edin.',
+ 'maintenance_mode_title' => 'Hizmet geçici olarak kullanılamıyor',
+ 'ldap_import' => 'Kullanıcı parolası LDAP ile yönetilmemelidir. (Bu unutulan parola istekleri göndermenizi sağlar.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/tr/passwords.php b/resources/lang/tr/passwords.php
index d891f4a842..25633b4581 100644
--- a/resources/lang/tr/passwords.php
+++ b/resources/lang/tr/passwords.php
@@ -1,6 +1,8 @@
'Başarılı:Mail adresiniz sistemimizde mevcut ise şifre kurtarma maili gönderilmiştir.',
- 'user' => 'Bu e-posta ile eşleşen hiçbir etkin kullanıcı bulunamadı.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/tr/reminders.php b/resources/lang/tr/reminders.php
index 5e84b4eac6..dae2917c2c 100644
--- a/resources/lang/tr/reminders.php
+++ b/resources/lang/tr/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Şifre en az 6 karakter olmalı ve birbiriyle eşleşmeli.",
-
"user" => "Kullanıcı adı veya e-mail adresi hatalı",
-
- "token" => "Şifre sıfırlama anahtarı geçersiz.",
-
- "sent" => "Eşleşen email bulunsaydı, şifre gönderilirdi!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/tr/validation.php b/resources/lang/tr/validation.php
index 4155adf3f8..fa63247e18 100644
--- a/resources/lang/tr/validation.php
+++ b/resources/lang/tr/validation.php
@@ -91,8 +91,13 @@ return [
'url' => ':attribute biçim geçersiz.',
'unique_undeleted' => ':attribute benzersiz olmalıdır.',
'non_circular' => ':attribute döngüsel bir başvuru oluşturmamalıdır.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
- 'numeric' => 'Value cannot be negative'
+ 'numeric' => 'Değer negatif olamaz'
],
diff --git a/resources/lang/uk/admin/custom_fields/general.php b/resources/lang/uk/admin/custom_fields/general.php
index 2970247f5d..fa0ed0a0a3 100644
--- a/resources/lang/uk/admin/custom_fields/general.php
+++ b/resources/lang/uk/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/uk/admin/custom_fields/message.php b/resources/lang/uk/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/uk/admin/custom_fields/message.php
+++ b/resources/lang/uk/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/uk/admin/hardware/form.php b/resources/lang/uk/admin/hardware/form.php
index 9f01e9dd2f..80711246e0 100644
--- a/resources/lang/uk/admin/hardware/form.php
+++ b/resources/lang/uk/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/uk/admin/users/general.php b/resources/lang/uk/admin/users/general.php
index f77fb5f050..6ea671fe07 100644
--- a/resources/lang/uk/admin/users/general.php
+++ b/resources/lang/uk/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Останній вхід',
'ldap_config_text' => 'LDAP configuration settings can be found Admin > Settings. The (optional) selected location will be set for all imported users.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/uk/general.php b/resources/lang/uk/general.php
index 8eb40c17ca..485b2d9fc0 100644
--- a/resources/lang/uk/general.php
+++ b/resources/lang/uk/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Створити новий',
'created' => 'Елемент створено',
'created_asset' => 'створений актив',
- 'created_at' => 'Створено',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Оновлено',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Це використовується для генерації адрес електронної пошти під час імпортування',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Не доступний для встановлення',
'unknown_admin' => 'Невідомий адміністратор',
'username_format' => 'Формат імені користувача',
+ 'username' => 'Username',
'update' => 'Оновлення',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Завантажено',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/uk/passwords.php b/resources/lang/uk/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/uk/passwords.php
+++ b/resources/lang/uk/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/uk/reminders.php b/resources/lang/uk/reminders.php
index 3cf504949d..6a62bd1a6b 100644
--- a/resources/lang/uk/reminders.php
+++ b/resources/lang/uk/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Паролі повинні складатися з шести символів і відповідати вимогам безпеки.",
-
"user" => "Ім'я користувача або електронна адреса невірна",
-
- "token" => "Токен для скидання паролю невірний.",
-
- "sent" => "Якщо електронна адреса вірна, нагадування пароля буде відправлено!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/uk/validation.php b/resources/lang/uk/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/uk/validation.php
+++ b/resources/lang/uk/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/ur-PK/admin/custom_fields/general.php b/resources/lang/ur-PK/admin/custom_fields/general.php
index 4c7442b2d5..7434117830 100644
--- a/resources/lang/ur-PK/admin/custom_fields/general.php
+++ b/resources/lang/ur-PK/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/ur-PK/admin/custom_fields/message.php b/resources/lang/ur-PK/admin/custom_fields/message.php
index ed66a6ba16..43ba821821 100644
--- a/resources/lang/ur-PK/admin/custom_fields/message.php
+++ b/resources/lang/ur-PK/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/ur-PK/admin/hardware/form.php b/resources/lang/ur-PK/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/ur-PK/admin/hardware/form.php
+++ b/resources/lang/ur-PK/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/ur-PK/admin/users/general.php b/resources/lang/ur-PK/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/ur-PK/admin/users/general.php
+++ b/resources/lang/ur-PK/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/ur-PK/general.php b/resources/lang/ur-PK/general.php
index 5d67d5d673..c4d2798035 100644
--- a/resources/lang/ur-PK/general.php
+++ b/resources/lang/ur-PK/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Create New',
'created' => 'Item Created',
'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/ur-PK/passwords.php b/resources/lang/ur-PK/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/ur-PK/passwords.php
+++ b/resources/lang/ur-PK/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/ur-PK/reminders.php b/resources/lang/ur-PK/reminders.php
index e7a476e3a2..8a197467df 100644
--- a/resources/lang/ur-PK/reminders.php
+++ b/resources/lang/ur-PK/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Passwords must be six characters and match the confirmation.",
-
"user" => "Username or email address is incorrect",
-
- "token" => "This password reset token is invalid.",
-
- "sent" => "If a matching email address was found, a password reminder has been sent!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/ur-PK/validation.php b/resources/lang/ur-PK/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/ur-PK/validation.php
+++ b/resources/lang/ur-PK/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/vi/admin/custom_fields/general.php b/resources/lang/vi/admin/custom_fields/general.php
index 0aa0607582..0a821e6ce1 100644
--- a/resources/lang/vi/admin/custom_fields/general.php
+++ b/resources/lang/vi/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/vi/admin/custom_fields/message.php b/resources/lang/vi/admin/custom_fields/message.php
index 8706b2cfba..283cf1f754 100644
--- a/resources/lang/vi/admin/custom_fields/message.php
+++ b/resources/lang/vi/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/vi/admin/hardware/form.php b/resources/lang/vi/admin/hardware/form.php
index 167a96ef81..5304ab5e1b 100644
--- a/resources/lang/vi/admin/hardware/form.php
+++ b/resources/lang/vi/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/vi/admin/users/general.php b/resources/lang/vi/admin/users/general.php
index eada36189d..23ddb44077 100644
--- a/resources/lang/vi/admin/users/general.php
+++ b/resources/lang/vi/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'last_login' => 'Lần đăng nhập trước',
'ldap_config_text' => 'Bạn có thể tìm thấy cài đặt cấu hình LDAP Quản trị> Cài đặt. Địa điểm đã chọn (tùy chọn) sẽ được đặt cho tất cả người dùng được nhập.',
'print_assigned' => 'In tất cả tài sản đã cấp phát',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Phần mềm đã được checkout đến :name',
'send_email_help' => 'Bạn phải cung cấp địa chỉ email của người dùng để gửi chứng thực. Gửi mail chứng thực chỉ có hiệu lực đối với người dùng tạo ra. Mật khẩu được mã hóa một chiều và không thể lấy lại một khi đã lưu.',
'view_user' => 'Xem người dùng :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/vi/general.php b/resources/lang/vi/general.php
index 6aac97f4d0..12db498a12 100644
--- a/resources/lang/vi/general.php
+++ b/resources/lang/vi/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Tạo mới',
'created' => 'Mục đã tạo',
'created_asset' => 'tài sản đã tạo',
- 'created_at' => 'Đã tạo lúc',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Đã tạo',
'updated_at' => 'Cập nhật tại',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'Địa chỉ này được sử dụng để tạo địa chỉ email khi nhập',
'error' => 'Lỗi',
+ 'example' => 'Example: ',
'filastname_format' => 'Tên Họ Tên Đầu tiên (jsmith@example.com)',
'firstname_lastname_format' => 'Họ Tên Họ (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'Tên họ (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Không cho phép cấp phát',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Định dạng Tên người dùng',
+ 'username' => 'Username',
'update' => 'Cập nhật',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Đã tải lên',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/vi/passwords.php b/resources/lang/vi/passwords.php
index f19ab852d5..25633b4581 100644
--- a/resources/lang/vi/passwords.php
+++ b/resources/lang/vi/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'Không tìn thấy người dùng được kích hoạt với email này.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/vi/reminders.php b/resources/lang/vi/reminders.php
index 408f245f24..a7637f5cc6 100644
--- a/resources/lang/vi/reminders.php
+++ b/resources/lang/vi/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "Mật khẩu phải có tối thiểu 6 ký tự và trùng với thông tin xác nhận.",
-
"user" => "Tên đăng nhập và địa chỉ email không đúng",
-
- "token" => "Token khởi tạo mật khẩu này không hợp lệ.",
-
- "sent" => "Nếu tìm thấy một địa chỉ email phù hợp, một thông báo mật khẩu đã được gửi đi!",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/vi/validation.php b/resources/lang/vi/validation.php
index 12faeea789..3f5503ce71 100644
--- a/resources/lang/vi/validation.php
+++ b/resources/lang/vi/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'Định dạng :attribute thì không hợp lý.',
'unique_undeleted' => 'Thuộc tính: phải là duy nhất.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/zh-CN/account/general.php b/resources/lang/zh-CN/account/general.php
index 7fc060a849..7d12430ab1 100644
--- a/resources/lang/zh-CN/account/general.php
+++ b/resources/lang/zh-CN/account/general.php
@@ -1,12 +1,12 @@
'Personal API Keys',
- 'api_key_warning' => 'When generating an API token, be sure to copy it down immediately as they
- will not be visible to you again.',
- 'api_base_url' => 'Your API base url is located at:',
+ 'personal_api_keys' => '个人API密钥',
+ 'api_key_warning' => '当 API 令牌生成后,请务必立即复制保存,因为他们
+ 将不会再次对您显示。',
+ 'api_base_url' => '您的 API 基础url 位于:',
'api_base_url_endpoint' => '/<endpoint>',
- 'api_token_expiration_time' => 'API tokens are set to expire in:',
- 'api_reference' => 'Please check the API reference to
- find specific API endpoints and additional API documentation.',
+ 'api_token_expiration_time' => '设定 API 令牌过期时间为:',
+ 'api_reference' => '请查询 API 引用 到
+ 找到特定的 API 端点以及额外的 API 文档。',
);
diff --git a/resources/lang/zh-CN/admin/custom_fields/general.php b/resources/lang/zh-CN/admin/custom_fields/general.php
index e220978655..8c630fd95b 100644
--- a/resources/lang/zh-CN/admin/custom_fields/general.php
+++ b/resources/lang/zh-CN/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => '可选 - 点击转为必填项',
'reorder' => '重新排序',
'db_field' => '数据库字段',
- 'db_convert_warning' => '警告。该字段在自定义字段表中为 :db_column
但应该是 :expected ',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => '此值在所有资产中必须是唯一的',
'unique' => '唯一的',
];
diff --git a/resources/lang/zh-CN/admin/custom_fields/message.php b/resources/lang/zh-CN/admin/custom_fields/message.php
index 0def52baa9..e5cf64fae1 100644
--- a/resources/lang/zh-CN/admin/custom_fields/message.php
+++ b/resources/lang/zh-CN/admin/custom_fields/message.php
@@ -49,6 +49,12 @@ return array(
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/zh-CN/admin/hardware/form.php b/resources/lang/zh-CN/admin/hardware/form.php
index 6d76b871bd..428899fabb 100644
--- a/resources/lang/zh-CN/admin/hardware/form.php
+++ b/resources/lang/zh-CN/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => '该资产状态为不可部署。无法签出此资产。',
'asset_deployable' => '该状态为可部署。可以签出此资产。',
'processing_spinner' => '处理中……',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/zh-CN/admin/hardware/message.php b/resources/lang/zh-CN/admin/hardware/message.php
index 9019b39c19..d33ae9729c 100644
--- a/resources/lang/zh-CN/admin/hardware/message.php
+++ b/resources/lang/zh-CN/admin/hardware/message.php
@@ -16,7 +16,7 @@ return [
'error' => '资产更新失败,请重试。',
'success' => '资产更新成功。',
'nothing_updated' => '一个也没有选,所以什么也不会更新。',
- 'no_assets_selected' => 'No assets were selected, so nothing was updated.',
+ 'no_assets_selected' => '没有选择任何资产,因此没有更新任何内容。',
],
'restore' => [
diff --git a/resources/lang/zh-CN/admin/settings/general.php b/resources/lang/zh-CN/admin/settings/general.php
index deb021d99e..50f41829fc 100644
--- a/resources/lang/zh-CN/admin/settings/general.php
+++ b/resources/lang/zh-CN/admin/settings/general.php
@@ -28,7 +28,7 @@ return [
'auto_increment_prefix' => '前缀(可选)',
'auto_incrementing_help' => '先启用自动递增资产标签来设置这个',
'backups' => '备份',
- 'backups_help' => 'Create, download, and restore backups ',
+ 'backups_help' => '创建、下载、恢复备份 ',
'backups_restoring' => '从备份中还原',
'backups_upload' => '上传备份',
'backups_path' => '服务器上的备份存储在 :path
',
@@ -85,7 +85,7 @@ return [
'ldap_client_tls_key' => 'LDAP 客户端TLS 密钥',
'ldap_login_test_help' => '根据你指定的base DN,输入有效的LDAP用户名和密码,以测试您的LDAP登录是否配置正确。当然您必须先保存您更改的LDAP设置。',
'ldap_login_sync_help' => '这只证明了LDAP同步正确。如果您的LDAP身份验证查询设置不正确,用户可能仍然无法登录。当然您必须先保存您的LDAP设置。',
- 'ldap_manager' => 'LDAP Manager',
+ 'ldap_manager' => 'LDAP 管理器',
'ldap_server' => 'LDAP 服务器',
'ldap_server_help' => '这应以ldap:// (for unencrypted or TLS)或 ldaps:// (for SSL)开头',
'ldap_server_cert' => '检验LDAP的SSL证书',
diff --git a/resources/lang/zh-CN/admin/settings/table.php b/resources/lang/zh-CN/admin/settings/table.php
index 22db5c84ed..299acb741a 100644
--- a/resources/lang/zh-CN/admin/settings/table.php
+++ b/resources/lang/zh-CN/admin/settings/table.php
@@ -1,6 +1,6 @@
'Created',
+ 'created' => '已创建',
'size' => 'Size',
);
diff --git a/resources/lang/zh-CN/admin/users/general.php b/resources/lang/zh-CN/admin/users/general.php
index ba6ecb97bf..cdd6e9da13 100644
--- a/resources/lang/zh-CN/admin/users/general.php
+++ b/resources/lang/zh-CN/admin/users/general.php
@@ -17,15 +17,17 @@ return [
'last_login' => '上一次登陆',
'ldap_config_text' => 'LDAP配置在 管理 > 设置。所选位置将为导入的用户所用',
'print_assigned' => '打印所有已分配资产',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => ':name 借走的软件',
'send_email_help' => '您必须为此用户提供电子邮件地址才能发送他们的凭据。电子邮件凭据只能在用户创建时完成。 密码存储在单向散列中,保存后无法检索。',
'view_user' => '查看用户: :name',
'usercsv' => 'CSV 档案',
'two_factor_admin_optin_help' => '您当前的管理员设置允许使用双重认证。 ',
- 'two_factor_enrolled' => '2FA Device Enrolled ',
- 'two_factor_active' => '2FA Active ',
- 'user_deactivated' => 'User cannot login',
- 'user_activated' => 'User can login',
+ 'two_factor_enrolled' => '双重认证设备已录入 ',
+ 'two_factor_active' => '双重认证激活 ',
+ 'user_deactivated' => '用户无法登录',
+ 'user_activated' => '用户可以登录',
'activation_status_warning' => '不要改变激活状态',
'group_memberships_helpblock' => '只有超级管理员可以编辑群组成员。',
'superadmin_permission_warning' => '只有超级管理员可以授予用户超级管理员访问权限。',
@@ -33,10 +35,10 @@ return [
'remove_group_memberships' => '删除群组成员',
'warning_deletion' => '警告:',
'warning_deletion_information' => '您将要删除下列 :count 用户。超级管理员名称高亮为红色。',
- 'update_user_asssets_status' => '将这些用户的所有资源更新到此状态',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => '归还与这些用户相关的所有资产',
- 'remote_label' => 'This is a remote user',
- 'remote' => 'Remote',
- 'remote_help' => 'This can be useful if you need to filter by remote users who never or rarely come into your physical locations.',
- 'not_remote_label' => 'This is not a remote user',
+ 'remote_label' => '这是一个远程用户',
+ 'remote' => '远程',
+ 'remote_help' => '如果您需要对从不进入或很少进入您的实体地点的远程用户进行筛选,这将非常有用。',
+ 'not_remote_label' => '这不是一个远程用户',
];
diff --git a/resources/lang/zh-CN/admin/users/table.php b/resources/lang/zh-CN/admin/users/table.php
index d196900b02..4a3ec3fc31 100644
--- a/resources/lang/zh-CN/admin/users/table.php
+++ b/resources/lang/zh-CN/admin/users/table.php
@@ -10,7 +10,7 @@ return array(
'email' => '邮箱',
'employee_num' => '员工号',
'first_name' => '名',
- 'groupnotes' => 'Select a group to assign to the user, remember that a user takes on the permissions of the group they are assigned. Use ctrl+click (or cmd+click on MacOS) to deselect groups.',
+ 'groupnotes' => '选择要分配给用户的组。请注意,用户将拥有分配给他们的组的权限。使用ctrl+单击(MacOS为cmd+单击) 取消选择组。',
'id' => '编号',
'inherit' => '继承',
'job' => '职位名称',
diff --git a/resources/lang/zh-CN/auth.php b/resources/lang/zh-CN/auth.php
index db310aa1bb..6096102312 100644
--- a/resources/lang/zh-CN/auth.php
+++ b/resources/lang/zh-CN/auth.php
@@ -13,8 +13,8 @@ return array(
|
*/
- 'failed' => 'These credentials do not match our records.',
- 'password' => 'The provided password is incorrect.',
- 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
+ 'failed' => '这些凭据与我们的记录不匹配。',
+ 'password' => '提供的密码不正确。',
+ 'throttle' => '登录次数过多。请在 :seconds 秒后重试。',
);
diff --git a/resources/lang/zh-CN/general.php b/resources/lang/zh-CN/general.php
index 6f15549c89..8591025d38 100644
--- a/resources/lang/zh-CN/general.php
+++ b/resources/lang/zh-CN/general.php
@@ -65,7 +65,8 @@ return [
'create' => '新增',
'created' => '项目已创建',
'created_asset' => '新建资产',
- 'created_at' => '创建于',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => '记录已创建',
'updated_at' => '更新日期',
'currency' => 'RMB', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => '员工号码',
'email_domain_help' => '这在导入时用以生成电子邮件地址',
'error' => '错误',
+ 'example' => 'Example: ',
'filastname_format' => '缩写名 姓,例如(jsmith@example.com)',
'firstname_lastname_format' => '名 姓,例如 (jane.smith@example.com)',
'firstname_lastname_underscore_format' => '名 姓,例如(jane_smith@example.com)',
@@ -115,7 +117,7 @@ return [
'files' => '文件',
'file_name' => '文件',
'file_type' => '文件类型',
- 'filesize' => 'File Size',
+ 'filesize' => '文件大小',
'file_uploads' => '文件上传',
'file_upload' => '文件上传',
'generate' => '生成',
@@ -240,7 +242,7 @@ return [
'state' => '省份',
'status_labels' => '状态标签',
'status' => '状态',
- 'accept_eula' => 'Acceptance Agreement',
+ 'accept_eula' => '接受协议',
'supplier' => '供应商',
'suppliers' => '供应商',
'sure_to_delete' => '是否确认要删除',
@@ -256,6 +258,7 @@ return [
'undeployable' => '无法被分配',
'unknown_admin' => '未知管理员',
'username_format' => '用户名格式',
+ 'username' => 'Username',
'update' => '更新',
'upload_filetypes_help' => '允许的文件类型是 png, gif, jpg, jpeg, doc, doc, pdf, xls, xlsx, txt, lic, xml, zip, rtf 和 rar. 允许的最大上传大小是 :size.',
'uploaded' => '已上传',
@@ -354,7 +357,11 @@ return [
'checkout_tooltip' => '借出此物品',
'checkin_tooltip' => '归还此物品',
'checkout_user_tooltip' => '借出此物品给一个用户',
- 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
- 'maintenance_mode_title' => 'System Temporarily Unavailable',
- 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'maintenance_mode' => '该服务暂时无法用于系统更新。请稍后再试。',
+ 'maintenance_mode_title' => '系统暂时不可用',
+ 'ldap_import' => '用户密码不应由LDAP管理。(这允许您发送忘记密码的请求。)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/zh-CN/passwords.php b/resources/lang/zh-CN/passwords.php
index a3beadf427..25633b4581 100644
--- a/resources/lang/zh-CN/passwords.php
+++ b/resources/lang/zh-CN/passwords.php
@@ -1,6 +1,8 @@
'成功: 如果我们的系统中存在该电子邮件地址, 那么重置密码的电子邮件已发送。',
- 'user' => '未找到与该电子邮件匹配的活动用户。',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/zh-CN/reminders.php b/resources/lang/zh-CN/reminders.php
index 08cab20d4a..73536ea904 100644
--- a/resources/lang/zh-CN/reminders.php
+++ b/resources/lang/zh-CN/reminders.php
@@ -14,11 +14,8 @@ return array(
*/
"password" => "密码必须是按照规定格式的六个字符",
-
"user" => "用户名或电子邮件地址不正确",
-
- "token" => "这个密码重置秘钥无效。",
-
- "sent" => "如果邮箱地址匹配,则密码已经发送。",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/zh-CN/validation.php b/resources/lang/zh-CN/validation.php
index 8646d74490..a71c7c040e 100644
--- a/resources/lang/zh-CN/validation.php
+++ b/resources/lang/zh-CN/validation.php
@@ -91,8 +91,13 @@ return [
'url' => ':attribute 格式无效',
'unique_undeleted' => ':attribute 属性必须唯一。',
'non_circular' => ':attribute 不能创建循环引用。',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
- 'numeric' => 'Value cannot be negative'
+ 'numeric' => '数值不能为负数'
],
diff --git a/resources/lang/zh-HK/admin/custom_fields/general.php b/resources/lang/zh-HK/admin/custom_fields/general.php
index 4c7442b2d5..7434117830 100644
--- a/resources/lang/zh-HK/admin/custom_fields/general.php
+++ b/resources/lang/zh-HK/admin/custom_fields/general.php
@@ -41,7 +41,7 @@ return [
'make_required' => 'Optional - click to make required',
'reorder' => 'Reorder',
'db_field' => 'DB Field',
- 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
+ 'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected
.',
'is_unique' => 'This value must be unique across all assets',
'unique' => 'Unique',
];
diff --git a/resources/lang/zh-HK/admin/custom_fields/message.php b/resources/lang/zh-HK/admin/custom_fields/message.php
index 3346a091c6..43ba821821 100644
--- a/resources/lang/zh-HK/admin/custom_fields/message.php
+++ b/resources/lang/zh-HK/admin/custom_fields/message.php
@@ -3,52 +3,58 @@
return array(
'field' => array(
- 'invalid' => '欄位不存在。',
- 'already_added' => '已新增欄位。',
+ 'invalid' => 'That field does not exist.',
+ 'already_added' => 'Field already added',
'create' => array(
- 'error' => '新增欄位失敗,請重試。',
- 'success' => '新增欄位成功。',
- 'assoc_success' => '新增欄位到欄位集成功'
+ 'error' => 'Field was not created, please try again.',
+ 'success' => 'Field created successfully.',
+ 'assoc_success' => 'Field successfully added to fieldset.'
),
'update' => array(
- 'error' => '更新欄位失敗,請重試。',
- 'success' => '更新欄位成功。'
+ 'error' => 'Field was not updated, please try again',
+ 'success' => 'Field updated successfully.'
),
'delete' => array(
- 'confirm' => '您確定要刪除此欄位?',
- 'error' => '刪除欄位時發生問題。請再試一次。',
- 'success' => '刪除欄位成功。',
- 'in_use' => '欄位還在使用中',
+ 'confirm' => 'Are you sure you wish to delete this field?',
+ 'error' => 'There was an issue deleting the field. Please try again.',
+ 'success' => 'The field was deleted successfully.',
+ 'in_use' => 'Field is still in use.',
)
),
'fieldset' => array(
- 'does_not_exist' => '欄位集不存在',
+ 'does_not_exist' => 'Fieldset does not exist',
'create' => array(
- 'error' => '新增欄位集失敗,請重試。',
- 'success' => '新增欄位集成功。'
+ 'error' => 'Fieldset was not created, please try again.',
+ 'success' => 'Fieldset created successfully.'
),
'update' => array(
- 'error' => '更新欄位集失敗,請重試。',
- 'success' => '更新欄位集成功。'
+ 'error' => 'Fieldset was not updated, please try again',
+ 'success' => 'Fieldset updated successfully.'
),
'delete' => array(
- 'confirm' => '您確定要刪除此欄位集?',
- 'error' => '刪除欄位集時發生問題。請再試一次。',
- 'success' => '刪除欄位集成功。',
- 'in_use' => '欄位集還在使用中',
+ 'confirm' => 'Are you sure you wish to delete this fieldset?',
+ 'error' => 'There was an issue deleting the fieldset. Please try again.',
+ 'success' => 'The fieldset was deleted successfully.',
+ 'in_use' => 'Fieldset is still in use.',
)
),
+ 'fieldset_default_value' => array(
+
+ 'error' => 'Error validating default fieldset values.',
+
+ ),
+
diff --git a/resources/lang/zh-HK/admin/hardware/form.php b/resources/lang/zh-HK/admin/hardware/form.php
index 0c1a3167be..b2d7bab0fc 100644
--- a/resources/lang/zh-HK/admin/hardware/form.php
+++ b/resources/lang/zh-HK/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/zh-HK/admin/users/general.php b/resources/lang/zh-HK/admin/users/general.php
index 03897b7eb5..c77ff8f8c7 100644
--- a/resources/lang/zh-HK/admin/users/general.php
+++ b/resources/lang/zh-HK/admin/users/general.php
@@ -17,6 +17,8 @@ return [
'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.',
'print_assigned' => 'Print All Assigned',
+ 'email_assigned' => 'Email List of All Assigned',
+ 'user_notified' => 'User has been emailed a list of their currently assigned items.',
'software_user' => 'Software Checked out to :name',
'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.',
'view_user' => 'View User :name',
@@ -33,7 +35,7 @@ return [
'remove_group_memberships' => 'Remove Group Memberships',
'warning_deletion' => 'WARNING:',
'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
- 'update_user_asssets_status' => 'Update all assets for these users to this status',
+ 'update_user_assets_status' => 'Update all assets for these users to this status',
'checkin_user_properties' => 'Check in all properties associated with these users',
'remote_label' => 'This is a remote user',
'remote' => 'Remote',
diff --git a/resources/lang/zh-HK/general.php b/resources/lang/zh-HK/general.php
index 5d67d5d673..c4d2798035 100644
--- a/resources/lang/zh-HK/general.php
+++ b/resources/lang/zh-HK/general.php
@@ -65,7 +65,8 @@ return [
'create' => 'Create New',
'created' => 'Item Created',
'created_asset' => 'created asset',
- 'created_at' => 'Created at',
+ 'created_at' => 'Created At',
+ 'created_by' => 'Created By',
'record_created' => 'Record Created',
'updated_at' => 'Updated at',
'currency' => '$', // this is deprecated
@@ -100,6 +101,7 @@ return [
'employee_number' => 'Employee Number',
'email_domain_help' => 'This is used to generate email addresses when importing',
'error' => 'Error',
+ 'example' => 'Example: ',
'filastname_format' => 'First Initial Last Name (jsmith@example.com)',
'firstname_lastname_format' => 'First Name Last Name (jane.smith@example.com)',
'firstname_lastname_underscore_format' => 'First Name Last Name (jane_smith@example.com)',
@@ -256,6 +258,7 @@ return [
'undeployable' => 'Un-deployable',
'unknown_admin' => 'Unknown Admin',
'username_format' => 'Username Format',
+ 'username' => 'Username',
'update' => 'Update',
'upload_filetypes_help' => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
'uploaded' => 'Uploaded',
@@ -357,4 +360,8 @@ return [
'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.',
'maintenance_mode_title' => 'System Temporarily Unavailable',
'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)',
+ 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.',
+ 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.',
+ 'additional_files' => 'Additional Files',
+
];
\ No newline at end of file
diff --git a/resources/lang/zh-HK/passwords.php b/resources/lang/zh-HK/passwords.php
index 4772940015..25633b4581 100644
--- a/resources/lang/zh-HK/passwords.php
+++ b/resources/lang/zh-HK/passwords.php
@@ -1,6 +1,8 @@
'Success: If that email address exists in our system, a password recovery email has been sent.',
- 'user' => 'No matching active user found with that email.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
+ 'token' => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'reset' => 'Your password has been reset!',
];
diff --git a/resources/lang/zh-HK/reminders.php b/resources/lang/zh-HK/reminders.php
index 7b9710c324..8a197467df 100644
--- a/resources/lang/zh-HK/reminders.php
+++ b/resources/lang/zh-HK/reminders.php
@@ -13,12 +13,9 @@ return array(
|
*/
- "password" => "密碼至少需要六個字符,並且與確認欄位相符",
-
- "user" => "使用者名稱或電子郵件地址不正確",
-
- "token" => "這個密碼重置密鑰無效。",
-
- "sent" => "如果郵件地址相符,則密碼已經發送。",
+ "password" => "Passwords must be six characters and match the confirmation.",
+ "user" => "Username or email address is incorrect",
+ "token" => 'This password reset token is invalid or expired, or does not match the username provided.',
+ 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
);
diff --git a/resources/lang/zh-HK/validation.php b/resources/lang/zh-HK/validation.php
index 5f097b717c..e7a87aed07 100644
--- a/resources/lang/zh-HK/validation.php
+++ b/resources/lang/zh-HK/validation.php
@@ -91,6 +91,11 @@ return [
'url' => 'The :attribute format is invalid.',
'unique_undeleted' => 'The :attribute must be unique.',
'non_circular' => 'The :attribute must not create a circular reference.',
+ 'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
+ 'letters' => 'Password must contain at least one letter.',
+ 'numbers' => 'Password must contain at least one number.',
+ 'case_diff' => 'Password must use mixed case.',
+ 'symbols' => 'Password must contain symbols.',
'gte' => [
'numeric' => 'Value cannot be negative'
],
diff --git a/resources/lang/zh-TW/admin/companies/general.php b/resources/lang/zh-TW/admin/companies/general.php
index 7a6251cd1f..0558f5bcb0 100644
--- a/resources/lang/zh-TW/admin/companies/general.php
+++ b/resources/lang/zh-TW/admin/companies/general.php
@@ -2,6 +2,6 @@
return [
'select_company' => '選擇公司',
- 'about_companies' => 'About Companies',
- 'about_companies_description' => ' You can use companies as a simple informative field, or you can use them to restrict asset visibility and availability to users with a specific company by enabling Full Company Support in your Admin Settings.',
+ 'about_companies' => '關於公司',
+ 'about_companies_description' => ' 你可以將公司當做一個簡單資訊欄位, 也可以通過在管理設置中啟用全面公司支持來使用它們來限制特定公司的用戶的資產可見性和可用性.',
];
diff --git a/resources/lang/zh-TW/admin/custom_fields/general.php b/resources/lang/zh-TW/admin/custom_fields/general.php
index 896a849a21..b9df96ab5c 100644
--- a/resources/lang/zh-TW/admin/custom_fields/general.php
+++ b/resources/lang/zh-TW/admin/custom_fields/general.php
@@ -2,10 +2,10 @@
return [
'custom_fields' => '自訂欄位',
- 'manage' => 'Manage',
+ 'manage' => '管理',
'field' => '欄位',
'about_fieldsets_title' => '關於欄位集',
- 'about_fieldsets_text' => 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+ 'about_fieldsets_text' => '欄位集允許您為常用的資產模型定義一組可重複使用的欄位。',
'custom_format' => 'Custom Regex format...',
'encrypt_field' => '加密資料庫中此欄位的值',
'encrypt_field_help' => '警告:對欄位加密將導致此欄無法用於搜索',
@@ -27,21 +27,21 @@ return [
'used_by_models' => '引用型號',
'order' => '排序',
'create_fieldset' => '新增欄位集',
- 'create_fieldset_title' => 'Create a new fieldset',
+ 'create_fieldset_title' => '建立新的欄位集',
'create_field' => '新增欄位',
- 'create_field_title' => 'Create a new custom field',
+ 'create_field_title' => '建立新的客製化欄位',
'value_encrypted' => '此欄位的值已被加密。只有管理員能夠查看原始資料。',
'show_in_email' => '在發送給用戶的借出通知信中包含此欄位的值?加密的欄位不能包含在電子郵件中。',
- 'help_text' => 'Help Text',
+ 'help_text' => '幫助內文',
'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
- 'about_custom_fields_title' => 'About Custom Fields',
- 'about_custom_fields_text' => 'Custom fields allow you to add arbitrary attributes to assets.',
- 'add_field_to_fieldset' => 'Add Field to Fieldset',
- 'make_optional' => 'Required - click to make optional',
- 'make_required' => 'Optional - click to make required',
- 'reorder' => 'Reorder',
- 'db_field' => 'DB Field',
+ 'about_custom_fields_title' => '關於客製化欄位',
+ 'about_custom_fields_text' => '客製化欄位允許你向資產增加任意屬性',
+ 'add_field_to_fieldset' => '增加欄位到欄位集',
+ 'make_optional' => '必選的 - 點擊切換成可選的',
+ 'make_required' => '可選的 - 點擊切換成必選的',
+ 'reorder' => '重新排序',
+ 'db_field' => '資料庫欄位',
'db_convert_warning' => 'WARNING. This field is in the custom fields table as :db_column
but should be :expected .',
- 'is_unique' => 'This value must be unique across all assets',
+ 'is_unique' => '此值在所有資產之中必須是唯一的',
'unique' => 'Unique',
];
diff --git a/resources/lang/zh-TW/admin/groups/titles.php b/resources/lang/zh-TW/admin/groups/titles.php
index efcc9cbf25..a4710a0c9b 100644
--- a/resources/lang/zh-TW/admin/groups/titles.php
+++ b/resources/lang/zh-TW/admin/groups/titles.php
@@ -10,7 +10,7 @@ return [
'group_admin' => '群組管理員',
'allow' => '允許',
'deny' => '拒絕',
- 'permission' => 'Permission',
- 'grant' => 'Grant',
- 'no_permissions' => 'This group has no permissions.'
+ 'permission' => '權限',
+ 'grant' => '授權',
+ 'no_permissions' => '此群組沒有權限'
];
diff --git a/resources/lang/zh-TW/admin/hardware/form.php b/resources/lang/zh-TW/admin/hardware/form.php
index 8659a4d73c..02c8aa9d67 100644
--- a/resources/lang/zh-TW/admin/hardware/form.php
+++ b/resources/lang/zh-TW/admin/hardware/form.php
@@ -46,4 +46,6 @@ return [
'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
'asset_deployable' => 'That status is deployable. This asset can be checked out.',
'processing_spinner' => 'Processing...',
+ 'optional_infos' => 'Optional Information',
+ 'order_details' => 'Order Related Information'
];
diff --git a/resources/lang/zh-TW/admin/hardware/general.php b/resources/lang/zh-TW/admin/hardware/general.php
index 95434cc509..fd49c25ac4 100644
--- a/resources/lang/zh-TW/admin/hardware/general.php
+++ b/resources/lang/zh-TW/admin/hardware/general.php
@@ -6,7 +6,7 @@ return [
'archived' => '已封存',
'asset' => '資產',
'bulk_checkout' => '借出資產',
- 'bulk_checkin' => 'Checkin Assets',
+ 'bulk_checkin' => '資產繳回',
'checkin' => '資產繳回',
'checkout' => '借出資產',
'clone' => '複製資產',
@@ -16,13 +16,13 @@ return [
'model_deleted' => '此資產模板已被刪除. 你必須先還原資產模板才可還原資產.',
'requestable' => '可申領',
'requested' => '已申領',
- 'not_requestable' => 'Not Requestable',
+ 'not_requestable' => '不可申請',
'requestable_status_warning' => 'Do not change requestable status',
'restore' => '還原資產',
'pending' => '待處理',
'undeployable' => '不可部署',
'view' => '檢視資產',
- 'csv_error' => 'You have an error in your CSV file:',
+ 'csv_error' => '你的 CSV 檔案有錯誤',
'import_text' => '
Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. @@ -37,8 +37,8 @@ return [ 'csv_import_match_first' => 'Try to match users by first name (jane) format', 'csv_import_match_email' => 'Try to match users by email as username', 'csv_import_match_username' => 'Try to match users by username', - 'error_messages' => 'Error messages:', - 'success_messages' => 'Success messages:', - 'alert_details' => 'Please see below for details.', - 'custom_export' => 'Custom Export' + 'error_messages' => '錯誤訊息:', + 'success_messages' => '成功訊息:', + 'alert_details' => '請看下面的詳細資料.', + 'custom_export' => '自定義匯出' ]; diff --git a/resources/lang/zh-TW/admin/locations/table.php b/resources/lang/zh-TW/admin/locations/table.php index e77a6462da..d501d52b9d 100644 --- a/resources/lang/zh-TW/admin/locations/table.php +++ b/resources/lang/zh-TW/admin/locations/table.php @@ -11,8 +11,8 @@ return [ 'country' => '國家', 'create' => '新增位置', 'update' => '更新位置', - 'print_assigned' => 'Print Assigned', - 'print_all_assigned' => 'Print All Assigned', + 'print_assigned' => '列印已分配的', + 'print_all_assigned' => '列印所有已分配的', 'name' => '位置名稱', 'address' => '地址', 'zip' => '郵遞區號', @@ -20,19 +20,19 @@ return [ 'parent' => '父項目', 'currency' => '當地貨幣單位', 'ldap_ou' => 'LDAP 搜尋 OU', - 'user_name' => 'User Name', - 'department' => 'Department', - 'location' => 'Location', - 'asset_tag' => 'Assets Tag', - 'asset_name' => 'Name', - 'asset_category' => 'Category', - 'asset_manufacturer' => 'Manufacturer', - 'asset_model' => 'Model', - 'asset_serial' => 'Serial', - 'asset_location' => 'Location', + 'user_name' => '使用者名稱', + 'department' => '部門', + 'location' => '位置', + 'asset_tag' => '資產標籤', + 'asset_name' => '名稱', + 'asset_category' => '類別', + 'asset_manufacturer' => '製造商', + 'asset_model' => '型號', + 'asset_serial' => '序號', + 'asset_location' => '位置', 'asset_checked_out' => 'Checked Out', - 'asset_expected_checkin' => 'Expected Checkin', - 'date' => 'Date:', + 'asset_expected_checkin' => '預計歸還', + 'date' => '日期:', 'signed_by_asset_auditor' => 'Signed By (Asset Auditor):', 'signed_by_finance_auditor' => 'Signed By (Finance Auditor):', 'signed_by_location_manager' => 'Signed By (Location Manager):', diff --git a/resources/lang/zh-TW/admin/models/general.php b/resources/lang/zh-TW/admin/models/general.php index e33f19afd9..c48babe704 100644 --- a/resources/lang/zh-TW/admin/models/general.php +++ b/resources/lang/zh-TW/admin/models/general.php @@ -3,7 +3,7 @@ return array( 'about_models_title' => '關於資產型號', 'about_models_text' => '資產型號是將相同資產分組的一種方式,例如:"MBP 2013"、"iPhone 6s"... 等。', - 'deleted' => 'This model has been deleted.', + 'deleted' => '此型號已被刪除.', 'bulk_delete' => '批次刪除資產型號', 'bulk_delete_help' => '使用下面的核取方塊確認刪除選定的資產型號。不能刪除具有資產與之關聯的資產模型。', 'bulk_delete_warn' => '您即將刪除資產型號 :model_count。', diff --git a/resources/lang/zh-TW/admin/reports/general.php b/resources/lang/zh-TW/admin/reports/general.php index b22d276e4c..46320e9638 100644 --- a/resources/lang/zh-TW/admin/reports/general.php +++ b/resources/lang/zh-TW/admin/reports/general.php @@ -2,7 +2,7 @@ return [ 'info' => '請選擇資產報表選項。', - 'deleted_user' => 'Deleted user', + 'deleted_user' => '删除的用户', 'send_reminder' => 'Send reminder', 'reminder_sent' => 'Reminder sent', 'acceptance_deleted' => 'Acceptance request deleted', diff --git a/resources/lang/zh-TW/admin/settings/general.php b/resources/lang/zh-TW/admin/settings/general.php index 9c4edc6ded..734df761b6 100644 --- a/resources/lang/zh-TW/admin/settings/general.php +++ b/resources/lang/zh-TW/admin/settings/general.php @@ -97,7 +97,7 @@ return [ 'ldap_dept' => 'LDAP Department', 'ldap_phone' => 'LDAP Telephone Number', 'ldap_jobtitle' => 'LDAP Job Title', - 'ldap_country' => 'LDAP Country', + 'ldap_country' => 'LDAP 國家', 'ldap_pword' => 'LDAP密碼', 'ldap_basedn' => 'Base Bind DN', 'ldap_filter' => 'LDAP篩選', @@ -113,8 +113,8 @@ return [ 'ldap_activated_flag_help' => 'This flag is used to determine whether a user can login to Snipe-IT and does not affect the ability to check items in or out to them.', 'ldap_emp_num' => 'LDAP 員工編號', 'ldap_email' => 'LDAP Email', - 'ldap_test' => 'Test LDAP', - 'ldap_test_sync' => 'Test LDAP Synchronization', + 'ldap_test' => '測試 LDAP', + 'ldap_test_sync' => '測試 LDAP 同步', 'license' => '軟體授權', 'load_remote_text' => '外部腳本', 'load_remote_help_text' => '允許 Snipe-IT 安裝外部腳本', diff --git a/resources/lang/zh-TW/admin/settings/message.php b/resources/lang/zh-TW/admin/settings/message.php index d2979e7d93..47107f245f 100644 --- a/resources/lang/zh-TW/admin/settings/message.php +++ b/resources/lang/zh-TW/admin/settings/message.php @@ -20,9 +20,9 @@ return [ 'success' => '已成功清除刪除記錄。', ], 'mail' => [ - 'sending' => 'Sending Test Email...', + 'sending' => '正在發送測試郵件...', 'success' => 'Mail sent!', - 'error' => 'Mail could not be sent.', + 'error' => '郵件無法發送', 'additional' => 'No additional error message provided. Check your mail settings and your app log.' ], 'ldap' => [ @@ -30,11 +30,11 @@ return [ '500' => '500 Server Error. Please check your server logs for more information.', 'error' => 'Something went wrong :(', 'sync_success' => 'A sample of 10 users returned from the LDAP server based on your settings:', - 'testing_authentication' => 'Testing LDAP Authentication...', - 'authentication_success' => 'User authenticated against LDAP successfully!' + 'testing_authentication' => 'LDAP 授權測試中...', + 'authentication_success' => '用戶成功透過 LDAP 驗證' ], 'slack' => [ - 'sending' => 'Sending Slack test message...', + 'sending' => 'Slack 測試訊息送出中...', 'success_pt1' => 'Success! Check the ', 'success_pt2' => ' channel for your test message, and be sure to click SAVE below to store your settings.', '500' => '500 Server Error.', diff --git a/resources/lang/zh-TW/admin/settings/table.php b/resources/lang/zh-TW/admin/settings/table.php index 22db5c84ed..4fc9052ad5 100644 --- a/resources/lang/zh-TW/admin/settings/table.php +++ b/resources/lang/zh-TW/admin/settings/table.php @@ -2,5 +2,5 @@ return array( 'created' => 'Created', - 'size' => 'Size', + 'size' => '尺寸', ); diff --git a/resources/lang/zh-TW/admin/users/general.php b/resources/lang/zh-TW/admin/users/general.php index 029f6ea254..f6275d00e6 100644 --- a/resources/lang/zh-TW/admin/users/general.php +++ b/resources/lang/zh-TW/admin/users/general.php @@ -17,6 +17,8 @@ return [ 'last_login' => '上次登入', 'ldap_config_text' => 'LDAP 設定在 管理 > 設定。所選位置將套用至匯入的使用者。', 'print_assigned' => '列印所有分配的', + 'email_assigned' => 'Email List of All Assigned', + 'user_notified' => 'User has been emailed a list of their currently assigned items.', 'software_user' => ':name 借出的軟體', 'send_email_help' => 'You must provide an email address for this user to send them credentials. Emailing credentials can only be done on user creation. Passwords are stored in a one-way hash and cannot be retrieved once saved.', 'view_user' => '檢視使用者: :name', @@ -33,7 +35,7 @@ return [ 'remove_group_memberships' => 'Remove Group Memberships', 'warning_deletion' => 'WARNING:', 'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.', - 'update_user_asssets_status' => 'Update all assets for these users to this status', + 'update_user_assets_status' => 'Update all assets for these users to this status', 'checkin_user_properties' => 'Check in all properties associated with these users', 'remote_label' => 'This is a remote user', 'remote' => 'Remote', diff --git a/resources/lang/zh-TW/button.php b/resources/lang/zh-TW/button.php index 9cd17e1ef5..250c22f9a2 100644 --- a/resources/lang/zh-TW/button.php +++ b/resources/lang/zh-TW/button.php @@ -8,7 +8,7 @@ return [ 'delete' => '刪除', 'edit' => '編輯', 'restore' => '還原', - 'remove' => 'Remove', + 'remove' => '移除', 'request' => '申請', 'submit' => '送出', 'upload' => '上傳', @@ -17,8 +17,8 @@ return [ 'generate_labels' => '{1} 產製標籤|[2,*] 產製標籤', 'send_password_link' => '發送密碼重設連結', 'go' => 'Go', - 'bulk_actions' => 'Bulk Actions', + 'bulk_actions' => '批量操作', 'add_maintenance' => 'Add Maintenance', 'append' => 'Append', - 'new' => 'New', + 'new' => '新增', ]; diff --git a/resources/lang/zh-TW/general.php b/resources/lang/zh-TW/general.php index c93bb71171..476c5a6d8c 100644 --- a/resources/lang/zh-TW/general.php +++ b/resources/lang/zh-TW/general.php @@ -65,7 +65,8 @@ return [ 'create' => '新增', 'created' => '項目已新增', 'created_asset' => '新增資產', - 'created_at' => '新增於', + 'created_at' => 'Created At', + 'created_by' => 'Created By', 'record_created' => '記錄已建立', 'updated_at' => '更新日', 'currency' => '$', // this is deprecated @@ -100,6 +101,7 @@ return [ 'employee_number' => 'Employee Number', 'email_domain_help' => '這用在匯入時產生電子郵件地址', 'error' => 'Error', + 'example' => 'Example: ', 'filastname_format' => '縮寫名 姓,例如 (jsmith@example.com)', 'firstname_lastname_format' => '名 姓,例如 (jane.smith@example.com)', 'firstname_lastname_underscore_format' => '名字姓氏,例如(jane_smith@example.com)', @@ -256,6 +258,7 @@ return [ 'undeployable' => '不可佈署', 'unknown_admin' => '未知管理員', 'username_format' => '使用者名稱格式', + 'username' => 'Username', 'update' => '更新', 'upload_filetypes_help' => '允許的檔案類別為 png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf 與 rar. 最大允許上傳的大小是 :size.', 'uploaded' => '已上傳', @@ -357,4 +360,8 @@ return [ 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', 'maintenance_mode_title' => 'System Temporarily Unavailable', 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', + 'purge_not_allowed' => 'Purging deleted data has been disabled in the .env file. Contact support or your systems administrator.', + 'backup_delete_not_allowed' => 'Deleting backups has been disabled in the .env file. Contact support or your systems administrator.', + 'additional_files' => 'Additional Files', + ]; \ No newline at end of file diff --git a/resources/lang/zh-TW/passwords.php b/resources/lang/zh-TW/passwords.php index 372b27461e..25633b4581 100644 --- a/resources/lang/zh-TW/passwords.php +++ b/resources/lang/zh-TW/passwords.php @@ -1,6 +1,8 @@ 'Success: If that email address exists in our system, a password recovery email has been sent.', - 'user' => '未找到使用該電子郵件的使用者。', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'user' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', + 'token' => 'This password reset token is invalid or expired, or does not match the username provided.', + 'reset' => 'Your password has been reset!', ]; diff --git a/resources/lang/zh-TW/reminders.php b/resources/lang/zh-TW/reminders.php index 7b9710c324..f0719dabd5 100644 --- a/resources/lang/zh-TW/reminders.php +++ b/resources/lang/zh-TW/reminders.php @@ -14,11 +14,8 @@ return array( */ "password" => "密碼至少需要六個字符,並且與確認欄位相符", - "user" => "使用者名稱或電子郵件地址不正確", - - "token" => "這個密碼重置密鑰無效。", - - "sent" => "如果郵件地址相符,則密碼已經發送。", + "token" => 'This password reset token is invalid or expired, or does not match the username provided.', + 'sent' => 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.', );