Merge remote-tracking branch 'origin/develop'

Author: snipe

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

@@ -59,5 +59,6 @@
     'encrypted_options' => 'crwdns11864:0crwdne11864:0',
     'display_checkin' => 'crwdns12929:0crwdne12929:0',
     'display_checkout' => 'crwdns12931:0crwdne12931:0',
+    'display_audit' => 'crwdns13023:0crwdne13023:0',
 
 ];

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

@@ -11,4 +11,8 @@
     'update'  					            => 'crwdns1800:0crwdne1800:0',
     'depreciation_min'                      => 'crwdns6071:0crwdne6071:0',
     'no_depreciations_warning'               => 'crwdns6533:0crwdne6533:0',
+    'depreciation_method'                   => 'crwdns12955:0crwdne12955:0',
+    'linear_depreciation'                   => 'crwdns12957:0crwdne12957:0',
+    'half_1'                                => 'crwdns12959:0crwdne12959:0',
+    'half_2'                                => 'crwdns12961:0crwdne12961:0',
 ];

resources/lang/aa-ER/admin/hardware/form.php

@@ -56,7 +56,7 @@
     'asset_location_update_actual' => 'crwdns11852:0crwdne11852:0',
     'asset_not_deployable' => 'crwdns6549:0crwdne6549:0',
     'asset_not_deployable_checkin' => 'crwdns12752:0crwdne12752:0',
-    'asset_deployable' => 'crwdns6551:0crwdne6551:0',
+    'asset_deployable' => 'crwdns12945:0crwdne12945:0',
     'processing_spinner' => 'crwdns11515:0crwdne11515:0',
     'optional_infos'  => 'crwdns10490:0crwdne10490:0',
     'order_details'   => 'crwdns10492:0crwdne10492:0',

resources/lang/aa-ER/admin/hardware/message.php

@@ -66,6 +66,7 @@
         'file_already_deleted' => 'crwdns12694:0crwdne12694:0',
         'header_row_has_malformed_characters' => 'crwdns11229:0crwdne11229:0',
         'content_row_has_malformed_characters' => 'crwdns11231:0crwdne11231:0',
+        'transliterate_failure' => 'crwdns12949:0crwdne12949:0'
     ],
 
 
@@ -99,9 +100,10 @@
     ],
 
     'requests' => [
-        'error'   		=> 'crwdns1484:0crwdne1484:0',
-        'success' 		=> 'crwdns1485:0crwdne1485:0',
-        'canceled'      => 'crwdns1700:0crwdne1700:0',
+        'error'   		=> 'crwdns13013:0crwdne13013:0',
+        'success' 		=> 'crwdns13021:0crwdne13021:0',
+        'canceled'      => 'crwdns13017:0crwdne13017:0',
+        'cancel'        => 'crwdns13019:0crwdne13019:0',
     ],
 
 ];

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

@@ -4,6 +4,7 @@
     'info'   => 'crwdns1136:0crwdne1136:0',
     'deleted_user' => 'crwdns6699:0crwdne6699:0',
     'send_reminder' => 'crwdns6701:0crwdne6701:0',
+    'cannot_send_reminder' => 'crwdns12947:0crwdne12947:0',
     'reminder_sent' => 'crwdns6703:0crwdne6703:0',
     'acceptance_deleted' => 'crwdns6705:0crwdne6705:0',
     'acceptance_request' => 'crwdns6707:0crwdne6707:0',

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

@@ -42,6 +42,7 @@
     'confirm_purge'			    => 'crwdns1611:0crwdne1611:0',
     'confirm_purge_help'		=> 'crwdns5852:0crwdne5852:0',
     'custom_css'				=> 'crwdns1419:0crwdne1419:0',
+    'custom_css_placeholder'	=> 'crwdns12963:0crwdne12963:0',
     'custom_css_help'			=> 'crwdns1420:0crwdne1420:0',
     'custom_forgot_pass_url'	=> 'crwdns1966:0crwdne1966:0',
     'custom_forgot_pass_url_help'	=> 'crwdns1967:0crwdne1967:0',
@@ -57,10 +58,8 @@
     'display_eol'               => 'crwdns1118:0crwdne1118:0',
     'display_qr'                => 'crwdns12798:0crwdne12798:0',
     'display_alt_barcode'		=> 'crwdns1664:0crwdne1664:0',
-    'email_logo'                => 'crwdns5854:0crwdne5854:0',
     'barcode_type'				=> 'crwdns1665:0crwdne1665:0',
     'alt_barcode_type'			=> 'crwdns1666:0crwdne1666:0',
-    'email_logo_size'       => 'crwdns5856:0crwdne5856:0',
     'enabled'                   => 'crwdns6337:0crwdne6337:0',
     'eula_settings'				=> 'crwdns1296:0crwdne1296:0',
     'eula_markdown'				=> 'crwdns1261:0crwdne1261:0',
@@ -69,13 +68,13 @@
     'favicon_size'          => 'crwdns5862:0crwdne5862:0',
     'footer_text'               => 'crwdns1987:0crwdne1987:0',
     'footer_text_help'          => 'crwdns1988:0crwdne1988:0',
+    'footer_text_placeholder'   => 'crwdns12965:0crwdne12965:0',
     'general_settings'			=> 'crwdns1297:0crwdne1297:0',
     'general_settings_help'     => 'crwdns6341:0crwdne6341:0',
     'generate_backup'			=> 'crwdns1427:0crwdne1427:0',
     'google_workspaces'         => 'crwdns12080:0crwdne12080:0',
     'header_color'              => 'crwdns1196:0crwdne1196:0',
     'info'                      => 'crwdns831:0crwdne831:0',
-    'label_logo'                => 'crwdns5864:0crwdne5864:0',
     'label_logo_size'           => 'crwdns5866:0crwdne5866:0',
     'laravel'                   => 'crwdns1119:0crwdne1119:0',
     'ldap'                      => 'crwdns6343:0crwdne6343:0',
@@ -118,6 +117,8 @@
     'ldap_version'              => 'crwdns1460:0crwdne1460:0',
     'ldap_active_flag'          => 'crwdns1461:0crwdne1461:0',
     'ldap_activated_flag_help'  => 'crwdns11176:0crwdne11176:0',
+    'ldap_invert_active_flag'   => 'crwdns12951:0crwdne12951:0',
+    'ldap_invert_active_flag_help'     => 'crwdns12953:0crwdne12953:0',
     'ldap_emp_num'              => 'crwdns1462:0crwdne1462:0',
     'ldap_email'                => 'crwdns1463:0crwdne1463:0',
     'ldap_test'                 => 'crwdns6349:0crwdne6349:0',
@@ -132,6 +133,7 @@
     'login_user_agent'          => 'crwdns6361:0crwdne6361:0',
     'login_help'                => 'crwdns6363:0crwdne6363:0',
     'login_note'                => 'crwdns1890:0crwdne1890:0',
+    'login_note_placeholder'            => "crwdns12967:0crwdne12967:0",
     'login_note_help'           => 'crwdns1891:0crwdne1891:0',
     'login_remote_user_text'    => 'crwdns2003:0crwdne2003:0',
     'login_remote_user_enabled_text' => 'crwdns2004:0crwdne2004:0',
@@ -147,6 +149,8 @@
     'logo_print_assets_help'    => 'crwdns2053:0crwdne2053:0',
     'full_multiple_companies_support_help_text' => 'crwdns1464:0crwdne1464:0',
     'full_multiple_companies_support_text' => 'crwdns1465:0crwdne1465:0',
+    'scope_locations_fmcs_support_text'  => 'crwdns13049:0crwdne13049:0',
+    'scope_locations_fmcs_support_help_text'  => 'crwdns13142:0crwdne13142:0',
     'show_in_model_list'   => 'crwdns1990:0crwdne1990:0',
     'optional'					=> 'crwdns1298:0crwdne1298:0',
     'per_page'                  => 'crwdns832:0crwdne832:0',
@@ -345,6 +349,8 @@
     'setup_migration_create_user' => 'crwdns6491:0crwdne6491:0',
     'ldap_settings_link' => 'crwdns6493:0crwdne6493:0',
     'slack_test' => 'crwdns6495:0crwdne6495:0',
+    'status_label_name' => 'crwdns12969:0crwdne12969:0',
+    'super_admin_only'  => 'crwdns12971:0crwdne12971:0',
     'label2_enable'           => 'crwdns11723:0crwdne11723:0',
     'label2_enable_help'      => 'crwdns11725:0crwdne11725:0',
     'label2_template'         => 'crwdns11727:0crwdne11727:0',
@@ -362,6 +368,7 @@
     'label2_2d_target_help'   => 'crwdns12832:0crwdne12832:0',
     'label2_fields'           => 'crwdns11753:0crwdne11753:0',
     'label2_fields_help'      => 'crwdns11755:0crwdne11755:0',
+    'purge_barcodes' => 'crwdns12985:0crwdne12985:0',
     'help_asterisk_bold'    => 'crwdns11757:0crwdne11757:0',
     'help_blank_to_use'     => 'crwdns11759:0crwdne11759:0',
     'help_default_will_use' => 'crwdns12834:0crwdne12834:0',
@@ -378,15 +385,70 @@
     'database_driver' => 'crwdns11827:0crwdne11827:0',
     'bs_table_storage' => 'crwdns11829:0crwdne11829:0',
     'timezone' => 'crwdns11831:0crwdne11831:0',
+    'test_mail' => 'crwdns12973:0crwdne12973:0',
     'profile_edit'          => 'crwdns12280:0crwdne12280:0',
     'profile_edit_help'          => 'crwdns12282:0crwdne12282:0',
-    'default_avatar' => 'crwdns12588:0crwdne12588:0',
+    'default_avatar' => 'crwdns12987:0crwdne12987:0',
     'default_avatar_help' => 'crwdns12590:0crwdne12590:0',
     'restore_default_avatar' => 'crwdns12592:0crwdne12592:0',
     'restore_default_avatar_help' => 'crwdns12594:0crwdne12594:0',
     'due_checkin_days' => 'crwdns12680:0crwdne12680:0',
     'due_checkin_days_help' => 'crwdns12682:0crwdne12682:0',
     'no_groups' => 'crwdns12760:0crwdne12760:0',
+    'text' => 'crwdns12975:0crwdne12975:0',
+
+    'username_formats' => [
+        'username_format'		=> 'crwdns13090:0crwdne13090:0',
+        'firstname_lastname_format'	=> 'crwdns13092:0crwdne13092:0',
+        'first_name_format'	        => 'crwdns13094:0crwdne13094:0',
+        'last_name_format'		=> 'crwdns13096:0crwdne13096:0',
+        'filastname_format'			=> 'crwdns13098:0crwdne13098:0',
+        'lastnamefirstinitial_format' =>  'crwdns13100:0crwdne13100:0',
+        'firstname_lastname_underscore_format' => 'crwdns13102:0crwdne13102:0',
+        'firstinitial.lastname' => 'crwdns13104:0crwdne13104:0',
+        'lastname_firstinitial' => 'crwdns13106:0crwdne13106:0',
+        'lastname_dot_firstinitial_format' => 'crwdns13108:0crwdne13108:0',
+        'firstnamelastname'     => 'crwdns13110:0crwdne13110:0',
+        'firstnamelastinitial'  => 'crwdns13112:0crwdne13112:0',
+        'lastnamefirstname'      => 'crwdns13114:0crwdne13114:0',
+    ],
+
+    'email_formats' => [
+        'email_format'			=> 'crwdns13116:0crwdne13116:0',
+        'firstname_lastname_format'	=> 'crwdns13118:0crwdne13118:0',
+        'first_name_format'		=> 'crwdns13120:0crwdne13120:0',
+        'last_name_format'		=> 'crwdns13122:0crwdne13122:0',
+        'filastname_format'			=> 'crwdns13124:0crwdne13124:0',
+        'lastnamefirstinitial_format' =>  'crwdns13126:0crwdne13126:0',
+        'firstname_lastname_underscore_format' => 'crwdns13128:0crwdne13128:0',
+        'firstinitial.lastname' => 'crwdns13130:0crwdne13130:0',
+        'lastname_firstinitial' => 'crwdns13132:0crwdne13132:0',
+        'lastname_dot_firstinitial_format' => 'crwdns13134:0crwdne13134:0',
+        'firstnamelastname'     => 'crwdns13136:0crwdne13136:0',
+        'firstnamelastinitial'  => 'crwdns13138:0crwdne13138:0',
+        'lastnamefirstname'      => 'crwdns13140:0crwdne13140:0',
+    ],
+
+
+
+    'logo_labels' => [
+        'acceptance_pdf_logo'       => 'crwdns12989:0crwdne12989:0',
+        'email_logo'                => 'crwdns12991:0crwdne12991:0',
+        'label_logo'                => 'crwdns12993:0crwdne12993:0',
+        'logo'                      => 'crwdns12995:0crwdne12995:0',
+        'favicon'                   => 'crwdns12997:0crwdne12997:0',
+    ],
+
+    'logo_help' => [
+        'email_logo_size'       => 'crwdns12999:0crwdne12999:0',
+    ],
+
+    'logo_option_types' => [
+        'text' => 'crwdns12977:0crwdne12977:0',
+        'logo' => 'crwdns12979:0crwdne12979:0',
+        'logo_and_text' => 'crwdns12981:0crwdne12981:0',
+    ],
+
 
 
     /* Keywords for settings overview help */

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

@@ -50,5 +50,11 @@
         'error_misc' => 'crwdns11383:0crwdne11383:0',
         'webhook_fail' => 'crwdns12830:0crwdne12830:0',
         'webhook_channel_not_found' => 'crwdns12876:0crwdne12876:0'
-    ]
+    ],
+
+    'location_scoping' => [
+        'not_saved' => 'crwdns13053:0crwdne13053:0',
+        'mismatch' => 'crwdns13055:0crwdne13055:0',
+    ],
+
 ];

resources/lang/aa-ER/auth.php

@@ -15,6 +15,6 @@
 
     'failed' => 'crwdns6844:0crwdne6844:0',
     'password' => 'crwdns6846:0crwdne6846:0',
-    'throttle' => 'crwdns6848:0crwdne6848:0',
+    'throttle' => 'crwdns13001:0crwdne13001:0',
 
 );

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

@@ -6,8 +6,6 @@
     'account_not_found'      => 'crwdns1392:0crwdne1392:0',
     'account_not_activated'  => 'crwdns1104:0crwdne1104:0',
     'account_suspended'      => 'crwdns1105:0crwdne1105:0',
-    'account_banned'         => 'crwdns1106:0crwdne1106:0',
-    'throttle'               => 'crwdns5926:0crwdne5926:0',
 
     'two_factor' => array(
         'already_enrolled'      => 'crwdns5928:0crwdne5928:0',

resources/lang/aa-ER/general.php

@@ -31,6 +31,7 @@
     'accept_assets_menu'    => 'crwdns6103:0crwdne6103:0',
     'accept_item'           => 'crwdns12908:0crwdne12908:0',
     'audit'				    => 'crwdns1913:0crwdne1913:0',
+    'audits'				=> 'crwdns13025:0crwdne13025:0',
     'audit_report'			=> 'crwdns1914:0crwdne1914:0',
     'assets'				=> 'crwdns1027:0crwdne1027:0',
     'assets_audited'        => 'crwdns11297:0crwdne11297:0',
@@ -62,6 +63,8 @@
     'changepassword'  		=> 'crwdns1035:0crwdne1035:0',
     'checkin'  				=> 'crwdns1036:0crwdne1036:0',
     'checkin_from'  		=> 'crwdns1272:0crwdne1272:0',
+    'checkin_note'  		=> 'crwdns13003:0crwdne13003:0',
+    'checkout_note'  		=> 'crwdns13005:0crwdne13005:0',
     'checkout'  			=> 'crwdns1037:0crwdne1037:0',
     'checkouts_count'       => 'crwdns2017:0crwdne2017:0',
     'checkins_count'        => 'crwdns2018:0crwdne2018:0',
@@ -118,30 +121,13 @@
     'editprofile'  			=> 'crwdns1051:0crwdne1051:0',
     'eol'					=> 'crwdns1052:0crwdne1052:0',
     'email_domain'			=> 'crwdns1642:0crwdne1642:0',
-    'email_format'			=> 'crwdns1643:0crwdne1643:0',
     'employee_number'       => 'crwdns6776:0crwdne6776:0',
     'email_domain_help'		=> 'crwdns1644:0crwdne1644:0',
     'error'				    => 'crwdns6121:0crwdne6121:0',
     'exclude_archived'      => 'crwdns10514:0crwdne10514:0',
     'exclude_deleted'       => 'crwdns10516:0crwdne10516:0',
     'example'				=> 'crwdns10462:0crwdne10462:0',
-    'filastname_format'			=> 'crwdns1645:0crwdne1645:0',
-    'firstname_lastname_format'	=> 'crwdns1646:0crwdne1646:0',
-    'firstname_lastname_underscore_format' => 'crwdns1995:0crwdne1995:0',
-    'lastnamefirstinitial_format' =>  'crwdns1999:0crwdne1999:0',
-    'firstintial_dot_lastname_format' => 'crwdns5948:0crwdne5948:0',
-    'lastname_dot_firstinitial_format' => 'crwdns12880:0crwdne12880:0',
-    'firstname_lastname_display'	=> 'crwdns11779:0crwdne11779:0',
-    'lastname_firstname_display'	=> 'crwdns11781:0crwdne11781:0',
-    'name_display_format'	=> 'crwdns11783:0crwdne11783:0',
-    'first'					=> 'crwdns1273:0crwdne1273:0',
-    'firstnamelastname'     => 'crwdns5950:0crwdne5950:0',
-    'lastname_firstinitial' => 'crwdns5952:0crwdne5952:0',
-    'firstinitial.lastname' => 'crwdns5954:0crwdne5954:0',
-    'firstnamelastinitial'  => 'crwdns5956:0crwdne5956:0',
-    'lastnamefirstname'      => 'crwdns12620:0crwdne12620:0',
-    'first_name'			=> 'crwdns1053:0crwdne1053:0',
-    'first_name_format'		=> 'crwdns1647:0crwdne1647:0',
+
     'files'                 => 'crwdns1996:0crwdne1996:0',
     'file_name'				=> 'crwdns1153:0crwdne1153:0',
     'file_type'             => 'crwdns5970:0crwdne5970:0',
@@ -183,6 +169,11 @@
     'last'					=> 'crwdns1274:0crwdne1274:0',
     'last_login'            => 'crwdns1857:0crwdne1857:0',
     'last_name'             => 'crwdns1059:0crwdne1059:0',
+    'firstname_lastname_display'	=> 'crwdns11779:0crwdne11779:0',
+    'lastname_firstname_display'	=> 'crwdns11781:0crwdne11781:0',
+    'name_display_format'	=> 'crwdns11783:0crwdne11783:0',
+    'first'					=> 'crwdns1273:0crwdne1273:0',
+    'first_name'			=> 'crwdns1053:0crwdne1053:0',
     'license'				=> 'crwdns1060:0crwdne1060:0',
     'license_report'        => 'crwdns1141:0crwdne1141:0',
     'licenses_available'	=> 'crwdns12172:0crwdne12172:0',
@@ -311,7 +302,6 @@
     'type'  				=> 'crwdns1203:0crwdne1203:0',
     'undeployable'			=> 'crwdns1093:0crwdne1093:0',
     'unknown_admin'			=> 'crwdns1094:0crwdne1094:0',
-    'username_format'		=> 'crwdns1649:0crwdne1649:0',
     'username'              => 'crwdns10464:0crwdne10464:0',
     'update'                => 'crwdns1341:0crwdne1341:0',
     'updating_item' => 'crwdns12804:0crwdne12804:0',
@@ -594,9 +584,31 @@
         'checkin_item' => 'crwdns12918:0crwdne12918:0',
     ],
 
+    'skins' => [
+        'site_default' => 'crwdns13057:0crwdne13057:0',
+        'default_blue' => 'crwdns13059:0crwdne13059:0',
+        'blue_dark' => 'crwdns13061:0crwdne13061:0',
+        'green' => 'crwdns13063:0crwdne13063:0',
+        'green_dark' => 'crwdns13065:0crwdne13065:0',
+        'red' => 'crwdns13067:0crwdne13067:0',
+        'red_dark' => 'crwdns13069:0crwdne13069:0',
+        'orange' => 'crwdns13071:0crwdne13071:0',
+        'orange_dark' => 'crwdns13073:0crwdne13073:0',
+        'black' => 'crwdns13075:0crwdne13075:0',
+        'black_dark' => 'crwdns13077:0crwdne13077:0',
+        'purple' => 'crwdns13079:0crwdne13079:0',
+        'purple_dark' => 'crwdns13081:0crwdne13081:0',
+        'yellow' => 'crwdns13083:0crwdne13083:0',
+        'yellow_dark' => 'crwdns13085:0crwdne13085:0',
+        'high_contrast' => 'crwdns13087:0crwdne13087:0',
+
+    ],
+
     'select_all_none' => 'crwdns12927:0crwdne12927:0',
     'generic_model_not_found' => 'crwdns12920:0crwdne12920:0',
     'deleted_models' => 'crwdns12939:0crwdne12939:0',
     'deleted_users' => 'crwdns12941:0crwdne12941:0',
+    'cost_each' => 'crwdns12983:0crwdne12983:0',
+    'remove_current_image' => 'crwdns13089:0crwdne13089:0',
 
 ];