Merge remote-tracking branch 'origin/develop'

Signed-off-by: snipe <[email protected]>

# Conflicts:
#	config/version.php

Author: snipe

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',
 );

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',
     ],

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',
+
 ];

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. :( ',
     ]
 ];

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!',
 
 ];

resources/lang/af/localizations.php

@@ -30,6 +30,7 @@
         'ga-IE'=> 'Irish',
         'it'=> 'Italian',
         'ja'=> 'Japanese',
+        'km' => 'Khmer',
         'ko'=> 'Korean',
         'lv'=>'Latvian',
         'lt'=> 'Lithuanian',

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',
     ],

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',
+
 ];

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. :( ',
     ]
 ];

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!',
 
 ];