Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]> # Conflicts: # config/version.php
snipe · Oct 2, 2023 · 4e67644 · 4e67644
2 parents c45ede2 + c7b8880
commit 4e67644
Show file tree

Hide file tree

Showing 328 changed files with 1,008 additions and 252 deletions.
diff --git a/config/version.php b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
- 'app_version' => 'v6.2.0',
- 'full_app_version' => 'v6.2.0 - build 11566-g5a5b07f5a',
- 'build_version' => '11566',
+ 'app_version' => 'v6.2.1',
+ 'full_app_version' => 'v6.2.1 - build 11625-gc45ede2d1',
+ 'build_version' => '11625',
  'prerelease_version' => '',
- 'hash_version' => 'g5a5b07f5a',
- 'full_hash' => 'v6.2.0-626-g5a5b07f5a',
+ 'hash_version' => 'gc45ede2d1',
+ 'full_hash' => 'v6.2.1-47-gc45ede2d1',
  'branch' => 'master',
 );
diff --git a/resources/lang/af/admin/hardware/message.php b/resources/lang/af/admin/hardware/message.php
@@ -50,6 +50,7 @@
  'success' => 'Jou lêer is ingevoer',
  'file_delete_success' => 'Jou lêer is suksesvol verwyder',
  'file_delete_error' => 'Die lêer kon nie uitgevee word nie',
+ 'file_missing' => 'The file selected is missing',
  'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
  'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
  ],

diff --git a/resources/lang/af/admin/settings/general.php b/resources/lang/af/admin/settings/general.php
@@ -356,4 +356,10 @@
  'google_login' => 'Google Workspace Login Settings',
  'enable_google_login' => 'Enable users to login with Google Workspace',
  'enable_google_login_help' => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+ 'mail_reply_to' => 'Mail Reply-To Address',
+ 'mail_from' => 'Mail From Address',
+ 'database_driver' => 'Database Driver',
+ 'bs_table_storage' => 'Table Storage',
+ 'timezone' => 'Timezone',
+
 ];
diff --git a/resources/lang/af/admin/settings/message.php b/resources/lang/af/admin/settings/message.php
@@ -35,10 +35,12 @@
  ],
  'webhook' => [
  'sending' => 'Sending :app test message...',
+ 'success' => 'Your :webhook_name Integration works!',
  '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. :app responded with: :error_message',
+ 'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
  'error_misc' => 'Something went wrong. :( ',
  ]
 ];
diff --git a/resources/lang/af/general.php b/resources/lang/af/general.php
@@ -459,7 +459,7 @@
  'serial_number' => 'Serial Number',
  'item_notes' => ':item Notes',
  'item_name_var' => ':item Name',
- 'error_user_company' => 'User and Asset companies missmatch',
+ 'error_user_company' => 'Checkout target company and asset company do not match',
  'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
  'importer' => [
  'checked_out_to_fullname' => 'Checked Out to: Full Name',
@@ -485,6 +485,8 @@
  ],
  'percent_complete' => '% complete',
  'uploading' => 'Uploading... ',
- 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.'
+ 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.',
+ 'copy_to_clipboard' => 'Copy to Clipboard',
+ 'copied' => 'Copied!',
 
 ];
diff --git a/resources/lang/af/localizations.php b/resources/lang/af/localizations.php
@@ -30,6 +30,7 @@
  'ga-IE'=> 'Irish',
  'it'=> 'Italian',
  'ja'=> 'Japanese',
+ 'km' => 'Khmer',
  'ko'=> 'Korean',
  'lv'=>'Latvian',
  'lt'=> 'Lithuanian',

diff --git a/resources/lang/am/admin/hardware/message.php b/resources/lang/am/admin/hardware/message.php
@@ -51,6 +51,7 @@
  'success' => 'Your file has been imported',
  'file_delete_success' => 'Your file has been been successfully deleted',
  'file_delete_error' => 'The file was unable to be deleted',
+ 'file_missing' => 'The file selected is missing',
  'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
  'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
  ],

diff --git a/resources/lang/am/admin/settings/general.php b/resources/lang/am/admin/settings/general.php
@@ -356,4 +356,10 @@
  'google_login' => 'Google Workspace Login Settings',
  'enable_google_login' => 'Enable users to login with Google Workspace',
  'enable_google_login_help' => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+ 'mail_reply_to' => 'Mail Reply-To Address',
+ 'mail_from' => 'Mail From Address',
+ 'database_driver' => 'Database Driver',
+ 'bs_table_storage' => 'Table Storage',
+ 'timezone' => 'Timezone',
+
 ];
diff --git a/resources/lang/am/admin/settings/message.php b/resources/lang/am/admin/settings/message.php
@@ -35,10 +35,12 @@
  ],
  'webhook' => [
  'sending' => 'Sending :app test message...',
+ 'success' => 'Your :webhook_name Integration works!',
  '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. :app responded with: :error_message',
+ 'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
  'error_misc' => 'Something went wrong. :( ',
  ]
 ];
diff --git a/resources/lang/am/general.php b/resources/lang/am/general.php
@@ -459,7 +459,7 @@
  'serial_number' => 'Serial Number',
  'item_notes' => ':item Notes',
  'item_name_var' => ':item Name',
- 'error_user_company' => 'User and Asset companies missmatch',
+ 'error_user_company' => 'Checkout target company and asset company do not match',
  'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
  'importer' => [
  'checked_out_to_fullname' => 'Checked Out to: Full Name',
@@ -485,6 +485,8 @@
  ],
  'percent_complete' => '% complete',
  'uploading' => 'Uploading... ',
- 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.'
+ 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.',
+ 'copy_to_clipboard' => 'Copy to Clipboard',
+ 'copied' => 'Copied!',
 
 ];
diff --git a/resources/lang/am/localizations.php b/resources/lang/am/localizations.php
@@ -30,6 +30,7 @@
  'ga-IE'=> 'Irish',
  'it'=> 'Italian',
  'ja'=> 'Japanese',
+ 'km' => 'Khmer',
  'ko'=> 'Korean',
  'lv'=>'Latvian',
  'lt'=> 'Lithuanian',

diff --git a/resources/lang/ar/admin/hardware/message.php b/resources/lang/ar/admin/hardware/message.php
@@ -50,6 +50,7 @@
  'success' => 'تم استيراد الملف الخاص بك',
  'file_delete_success' => 'تم حذف ملفك بنجاح',
  'file_delete_error' => 'تعذر حذف الملف',
+ 'file_missing' => 'The file selected is missing',
  'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
  'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
  ],

diff --git a/resources/lang/ar/admin/settings/general.php b/resources/lang/ar/admin/settings/general.php
@@ -356,4 +356,10 @@
  'google_login' => 'Google Workspace Login Settings',
  'enable_google_login' => 'Enable users to login with Google Workspace',
  'enable_google_login_help' => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+ 'mail_reply_to' => 'Mail Reply-To Address',
+ 'mail_from' => 'Mail From Address',
+ 'database_driver' => 'Database Driver',
+ 'bs_table_storage' => 'Table Storage',
+ 'timezone' => 'Timezone',
+
 ];
diff --git a/resources/lang/ar/admin/settings/message.php b/resources/lang/ar/admin/settings/message.php
@@ -35,10 +35,12 @@
  ],
  'webhook' => [
  'sending' => 'Sending :app test message...',
+ 'success' => 'Your :webhook_name Integration works!',
  '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. :app responded with: :error_message',
+ 'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
  'error_misc' => 'Something went wrong. :( ',
  ]
 ];
diff --git a/resources/lang/ar/general.php b/resources/lang/ar/general.php
@@ -459,7 +459,7 @@
  'serial_number' => 'Serial Number',
  'item_notes' => ':item Notes',
  'item_name_var' => ':item Name',
- 'error_user_company' => 'User and Asset companies missmatch',
+ 'error_user_company' => 'Checkout target company and asset company do not match',
  'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
  'importer' => [
  'checked_out_to_fullname' => 'Checked Out to: Full Name',
@@ -485,6 +485,8 @@
  ],
  'percent_complete' => '% complete',
  'uploading' => 'Uploading... ',
- 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.'
+ 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.',
+ 'copy_to_clipboard' => 'Copy to Clipboard',
+ 'copied' => 'Copied!',
 
 ];
diff --git a/resources/lang/ar/localizations.php b/resources/lang/ar/localizations.php
@@ -30,6 +30,7 @@
  'ga-IE'=> 'Irish',
  'it'=> 'Italian',
  'ja'=> 'Japanese',
+ 'km' => 'Khmer',
  'ko'=> 'Korean',
  'lv'=>'Latvian',
  'lt'=> 'Lithuanian',

diff --git a/resources/lang/bg/admin/hardware/message.php b/resources/lang/bg/admin/hardware/message.php
@@ -50,6 +50,7 @@
  'success' => 'Вашият файл беше въведен.',
  'file_delete_success' => 'Вашият файл беше изтрит успешно.',
  'file_delete_error' => 'Файлът не е в състояние да бъде изтрит',
+ 'file_missing' => 'The file selected is missing',
  'header_row_has_malformed_characters' => 'Един или повече атрибути на заглавния ред съдържат неправилни UTF-8 символи',
  'content_row_has_malformed_characters' => 'Един или повече атрибути на заглавния ред съдържат неправилни UTF-8 символи',
  ],

diff --git a/resources/lang/bg/admin/settings/general.php b/resources/lang/bg/admin/settings/general.php
@@ -356,4 +356,10 @@
  'google_login' => 'Google Workspace Login Settings',
  'enable_google_login' => 'Enable users to login with Google Workspace',
  'enable_google_login_help' => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+ 'mail_reply_to' => 'Mail Reply-To Address',
+ 'mail_from' => 'Mail From Address',
+ 'database_driver' => 'Database Driver',
+ 'bs_table_storage' => 'Table Storage',
+ 'timezone' => 'Timezone',
+
 ];
diff --git a/resources/lang/bg/admin/settings/message.php b/resources/lang/bg/admin/settings/message.php
@@ -35,10 +35,12 @@
  ],
  'webhook' => [
  'sending' => 'Изпращане :app тест съобщение...',
+ 'success' => 'Your :webhook_name Integration works!',
  'success_pt1' => 'Успешно! Проверете ',
  'success_pt2' => ' канал за вашето тестово съобщение и натиснете бутона SAVE за да запазите вашите настройки.',
  '500' => 'Грешка 500.',
  'error' => 'Възникна грешка. :app върна грешка: :error_message',
+ 'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
  'error_misc' => 'Възникна грешка. :( ',
  ]
 ];
diff --git a/resources/lang/bg/general.php b/resources/lang/bg/general.php
@@ -459,7 +459,7 @@
  'serial_number' => 'Сериен номер',
  'item_notes' => ':item бележки',
  'item_name_var' => ':item Име',
- 'error_user_company' => 'Несъответсвие между фирмата на потребителя и актива',
+ 'error_user_company' => 'Checkout target company and asset company do not match',
  'error_user_company_accept_view' => 'Актива заведен на вас пренадлежи към друга фирма, затова не можете да го приемете или откажете. Свържете се с вашият администратор',
  'importer' => [
  'checked_out_to_fullname' => 'Изписан на: Full Name',
@@ -485,6 +485,8 @@
  ],
  'percent_complete' => '% завърешен',
  'uploading' => 'Качване... ',
- 'upload_error' => 'Грешка при качване. Проверете да няма празни редове в края.'
+ 'upload_error' => 'Грешка при качване. Проверете да няма празни редове в края.',
+ 'copy_to_clipboard' => 'Copy to Clipboard',
+ 'copied' => 'Copied!',
 
 ];
diff --git a/resources/lang/bg/localizations.php b/resources/lang/bg/localizations.php
@@ -30,6 +30,7 @@
  'ga-IE'=> 'Irish',
  'it'=> 'Italian',
  'ja'=> 'Japanese',
+ 'km' => 'Khmer',
  'ko'=> 'Korean',
  'lv'=>'Latvian',
  'lt'=> 'Lithuanian',

diff --git a/resources/lang/ca/admin/hardware/message.php b/resources/lang/ca/admin/hardware/message.php
@@ -51,6 +51,7 @@
  'success' => 'Your file has been imported',
  'file_delete_success' => 'Your file has been been successfully deleted',
  'file_delete_error' => 'The file was unable to be deleted',
+ 'file_missing' => 'The file selected is missing',
  'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
  'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
  ],

diff --git a/resources/lang/ca/admin/settings/general.php b/resources/lang/ca/admin/settings/general.php
@@ -356,4 +356,10 @@
  'google_login' => 'Google Workspace Login Settings',
  'enable_google_login' => 'Enable users to login with Google Workspace',
  'enable_google_login_help' => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+ 'mail_reply_to' => 'Mail Reply-To Address',
+ 'mail_from' => 'Mail From Address',
+ 'database_driver' => 'Database Driver',
+ 'bs_table_storage' => 'Table Storage',
+ 'timezone' => 'Timezone',
+
 ];
diff --git a/resources/lang/ca/admin/settings/message.php b/resources/lang/ca/admin/settings/message.php
@@ -35,10 +35,12 @@
  ],
  'webhook' => [
  'sending' => 'Sending :app test message...',
+ 'success' => 'Your :webhook_name Integration works!',
  '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. :app responded with: :error_message',
+ 'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
  'error_misc' => 'Something went wrong. :( ',
  ]
 ];
diff --git a/resources/lang/ca/general.php b/resources/lang/ca/general.php
@@ -459,7 +459,7 @@
  'serial_number' => 'Serial Number',
  'item_notes' => ':item Notes',
  'item_name_var' => ':item Name',
- 'error_user_company' => 'User and Asset companies missmatch',
+ 'error_user_company' => 'Checkout target company and asset company do not match',
  'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
  'importer' => [
  'checked_out_to_fullname' => 'Checked Out to: Full Name',
@@ -485,6 +485,8 @@
  ],
  'percent_complete' => '% complete',
  'uploading' => 'Uploading... ',
- 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.'
+ 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.',
+ 'copy_to_clipboard' => 'Copy to Clipboard',
+ 'copied' => 'Copied!',
 
 ];
diff --git a/resources/lang/ca/localizations.php b/resources/lang/ca/localizations.php
@@ -30,6 +30,7 @@
  'ga-IE'=> 'Irish',
  'it'=> 'Italian',
  'ja'=> 'Japanese',
+ 'km' => 'Khmer',
  'ko'=> 'Korean',
  'lv'=>'Latvian',
  'lt'=> 'Lithuanian',

diff --git a/resources/lang/cs/admin/hardware/message.php b/resources/lang/cs/admin/hardware/message.php
@@ -51,6 +51,7 @@
  'success' => 'Váš soubor byl importován',
  'file_delete_success' => 'Váš soubor byl úspěšně odstraněn',
  'file_delete_error' => 'Soubor nelze odstranit',
+ 'file_missing' => 'The file selected is missing',
  'header_row_has_malformed_characters' => 'Jeden nebo více sloupců obsahuje v záhlaví poškozené UTF-8 znaky',
  'content_row_has_malformed_characters' => 'Jedna nebo více hodnot v prvním řádku obsahu obsahuje poškozené UTF-8 znaky',
  ],

diff --git a/resources/lang/cs/admin/settings/general.php b/resources/lang/cs/admin/settings/general.php
@@ -356,4 +356,10 @@
  'google_login' => 'Google Workspace Login Settings',
  'enable_google_login' => 'Enable users to login with Google Workspace',
  'enable_google_login_help' => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+ 'mail_reply_to' => 'Mail Reply-To Address',
+ 'mail_from' => 'Mail From Address',
+ 'database_driver' => 'Database Driver',
+ 'bs_table_storage' => 'Table Storage',
+ 'timezone' => 'Timezone',
+
 ];
diff --git a/resources/lang/cs/admin/settings/message.php b/resources/lang/cs/admin/settings/message.php
@@ -35,10 +35,12 @@
  ],
  'webhook' => [
  'sending' => 'Sending :app test message...',
+ 'success' => 'Your :webhook_name Integration works!',
  '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. :app responded with: :error_message',
+ 'error_redirect' => 'ERROR: 301/302 :endpoint returns a redirect. For security reasons, we don’t follow redirects. Please use the actual endpoint.',
  'error_misc' => 'Something went wrong. :( ',
  ]
 ];
diff --git a/resources/lang/cs/general.php b/resources/lang/cs/general.php
@@ -459,7 +459,7 @@
  'serial_number' => 'Serial Number',
  'item_notes' => ':item Notes',
  'item_name_var' => ':item Name',
- 'error_user_company' => 'User and Asset companies missmatch',
+ 'error_user_company' => 'Checkout target company and asset company do not match',
  'error_user_company_accept_view' => 'An Asset assigned to you belongs to a different company so you can\'t accept nor deny it, please check with your manager',
  'importer' => [
  'checked_out_to_fullname' => 'Checked Out to: Full Name',
@@ -485,6 +485,8 @@
  ],
  'percent_complete' => '% complete',
  'uploading' => 'Uploading... ',
- 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.'
+ 'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.',
+ 'copy_to_clipboard' => 'Copy to Clipboard',
+ 'copied' => 'Copied!',
 
 ];
diff --git a/resources/lang/cs/localizations.php b/resources/lang/cs/localizations.php
@@ -30,6 +30,7 @@
  'ga-IE'=> 'Irština',
  'it'=> 'Italština',
  'ja'=> 'Japonština',
+ 'km' => 'Khmer',
  'ko'=> 'Korejština',
  'lv'=>'Lotyšština',
  'lt'=> 'Litevština',

diff --git a/resources/lang/cy/admin/hardware/message.php b/resources/lang/cy/admin/hardware/message.php
@@ -51,6 +51,7 @@
  'success' => 'Mae\'ch ffeil wedi\'i mewnforio',
  'file_delete_success' => 'Mae eich ffeil wedi\'i dileu yn llwyddiannus',
  'file_delete_error' => 'Nid oedd yn bosib dileu\'r ffeil',
+ 'file_missing' => 'The file selected is missing',
  'header_row_has_malformed_characters' => 'One or more attributes in the header row contain malformed UTF-8 characters',
  'content_row_has_malformed_characters' => 'One or more attributes in the first row of content contain malformed UTF-8 characters',
  ],

diff --git a/resources/lang/cy/admin/settings/general.php b/resources/lang/cy/admin/settings/general.php
@@ -356,4 +356,10 @@
  'google_login' => 'Google Workspace Login Settings',
  'enable_google_login' => 'Enable users to login with Google Workspace',
  'enable_google_login_help' => 'Users will not be automatically provisioned. They must have an existing account here AND in Google Workspace, and their username here must match their Google Workspace email address. ',
+ 'mail_reply_to' => 'Mail Reply-To Address',
+ 'mail_from' => 'Mail From Address',
+ 'database_driver' => 'Database Driver',
+ 'bs_table_storage' => 'Table Storage',
+ 'timezone' => 'Timezone',
+
 ];