Merge remote-tracking branch 'origin/develop'

Author: snipe

resources/lang/aa-ER/admin/settings/general.php

@@ -327,7 +327,6 @@
     'labels' => 'crwdns6459:0crwdne6459:0',
     'labels_title' => 'crwdns6461:0crwdne6461:0',
     'labels_help' => 'crwdns6463:0crwdne6463:0',
-    'purge' => 'crwdns6465:0crwdne6465:0',
     'purge_keywords' => 'crwdns6467:0crwdne6467:0',
     'purge_help' => 'crwdns6469:0crwdne6469:0',
     'ldap_extension_warning' => 'crwdns6471:0crwdne6471:0',
@@ -374,5 +373,7 @@
     'database_driver' => 'crwdns11827:0crwdne11827:0',
     'bs_table_storage' => 'crwdns11829:0crwdne11829:0',
     'timezone' => 'crwdns11831:0crwdne11831:0',
+    'profile_edit'          => 'crwdns12280:0crwdne12280:0',
+    'profile_edit_help'          => 'crwdns12282:0crwdne12282:0',
 
 ];

resources/lang/aa-ER/auth/general.php

@@ -14,6 +14,5 @@
     'username_help_bottom'          => 'crwdns6046:0crwdne6046:0',
     'google_login'                  => 'crwdns12026:0crwdne12026:0',
     'google_login_failed'           => 'crwdns11603:0crwdne11603:0',
-
 ];
 

resources/lang/aa-ER/auth/message.php

@@ -14,6 +14,8 @@
         'success'               => 'crwdns5930:0crwdne5930:0',
         'code_required'         => 'crwdns5932:0crwdne5932:0',
         'invalid_code'          => 'crwdns5934:0crwdne5934:0',
+        'enter_two_factor_code' => 'crwdns12274:0crwdne12274:0',
+        'please_enroll'         => 'crwdns12276:0crwdne12276:0',
     ),
 
     'signin' => array(

resources/lang/aa-ER/general.php

@@ -158,7 +158,7 @@
     'image_upload'         	=> 'crwdns1058:0crwdne1058:0',
     'filetypes_accepted_help'    => 'crwdns6129:0crwdne6129:0',
     'filetypes_size_help'   => 'crwdns6131:0crwdne6131:0',
-    'image_filetypes_help'  => 'crwdns6038:0crwdne6038:0',
+    'image_filetypes_help'  => 'crwdns12284:0crwdne12284:0',
     'unaccepted_image_type'  => 'crwdns11365:0crwdne11365:0',
     'import'         	    => 'crwdns1411:0crwdne1411:0',
     'import_this_file'      => 'crwdns11922:0crwdne11922:0',
@@ -240,6 +240,7 @@
     'restored'				=> 'crwdns1979:0crwdne1979:0',
     'restore'				=> 'crwdns6075:0crwdne6075:0',
     'requestable_models'    => 'crwdns6147:0crwdne6147:0',
+    'requestable_items'     => 'crwdns12278:0crwdne12278:0',
     'requested'				=> 'crwdns1408:0crwdne1408:0',
     'requested_date'        => 'crwdns6149:0crwdne6149:0',
     'requested_assets'      => 'crwdns6151:0crwdne6151:0',
@@ -526,6 +527,7 @@
     'permission_denied_superuser_demo' => 'crwdns12158:0crwdne12158:0',
     'pwd_reset_not_sent' => 'crwdns12160:0crwdne12160:0',
     'error_sending_email' => 'crwdns12162:0crwdne12162:0',
+    'sad_panda' => 'crwdns12286:0crwdne12286:0',
     'bulk' => [
             'delete' =>
                 [

resources/lang/af-ZA/admin/settings/general.php

@@ -327,7 +327,6 @@
     'labels' => 'Labels',
     'labels_title' => 'Update Label Settings',
     'labels_help' => 'Label sizes & settings',
-    'purge' => 'Purge',
     'purge_keywords' => 'permanently delete',
     'purge_help' => 'Verwyder verwyderde rekords',
     '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.',
@@ -374,5 +373,7 @@
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'profile_edit'          => 'Edit Profile',
+    'profile_edit_help'          => 'Allow users to edit their own profiles.',
 
 ];

resources/lang/af-ZA/auth/general.php

@@ -14,6 +14,5 @@
     'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
     'google_login'                  => 'Login with Google Workspace',
     'google_login_failed'           => 'Google Login failed, please try again.',
-
 ];
 

resources/lang/af-ZA/auth/message.php

@@ -14,6 +14,8 @@
         'success'               => 'Jy is suksesvol aangemeld.',
         'code_required'         => 'Two-factor code is required.',
         'invalid_code'          => 'Two-factor code is invalid.',
+        'enter_two_factor_code' => 'Please enter your two-factor authentication code.',
+        'please_enroll'         => 'Please enroll a device in two-factor authentication.',
     ),
 
     'signin' => array(

resources/lang/af-ZA/general.php

@@ -158,7 +158,7 @@
     'image_upload'         	=> 'Laai prent op',
     '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.',
+    'image_filetypes_help'  => 'Accepted filetypes are jpg, webp, png, gif, svg, and avif. Max upload size allowed is :size.',
     'unaccepted_image_type'  => 'This image file was not readable. Accepted filetypes are jpg, webp, png, gif, and svg. The mimetype of this file is: :mimetype.',
     'import'         	    => 'invoer',
     'import_this_file'      => 'Map fields and process this file',
@@ -240,6 +240,7 @@
     'restored'				=> 'restored',
     'restore'				=> 'herstel',
     'requestable_models'    => 'Requestable Models',
+    'requestable_items'     => 'Requestable Items',
     'requested'				=> 'versoek',
     'requested_date'        => 'Requested Date',
     'requested_assets'      => 'Requested Assets',
@@ -527,6 +528,7 @@
     'permission_denied_superuser_demo' => 'Permission denied. You cannot update user information for superadmins on the demo.',
     'pwd_reset_not_sent' => 'User is not activated, is LDAP synced, or does not have an email address',
     'error_sending_email' => 'Error sending email',
+    'sad_panda' => 'Sad panda. You are not authorized to do the thing. Maybe <a href=":link">return to the dashboard</a>, or contact your administrator.',
     'bulk' => [
             'delete' =>
                 [

resources/lang/am-ET/admin/settings/general.php

@@ -327,7 +327,6 @@
     '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.',
@@ -374,5 +373,7 @@
     'database_driver' => 'Database Driver',
     'bs_table_storage' => 'Table Storage',
     'timezone' => 'Timezone',
+    'profile_edit'          => 'Edit Profile',
+    'profile_edit_help'          => 'Allow users to edit their own profiles.',
 
 ];

resources/lang/am-ET/auth/general.php

@@ -14,6 +14,5 @@
     'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',
     'google_login'                  => 'Login with Google Workspace',
     'google_login_failed'           => 'Google Login failed, please try again.',
-
 ];