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' => 'v8.1.15',
-  'full_app_version' => 'v8.1.15 - build 18405-ge4314cf42',
-  'build_version' => '18405',
+  'app_version' => 'v8.1.16',
+  'full_app_version' => 'v8.1.16 - build 18612-g0f92dee2c',
+  'build_version' => '18612',
   'prerelease_version' => '',
-  'hash_version' => 'ge4314cf42',
-  'full_hash' => 'v8.1.15-13-ge4314cf42',
+  'hash_version' => 'g0f92dee2c',
+  'full_hash' => 'v8.1.16-220-g0f92dee2c',
   'branch' => 'master',
 );

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

@@ -1,6 +1,7 @@
 <?php
 
     return [
+        'select_type'            => 'crwdns13392:0crwdne13392:0',
         'asset_maintenance_type' => 'crwdns11333:0crwdne11333:0',
         'title'                  => 'crwdns1354:0crwdne1354:0',
         'start_date'             => 'crwdns11335:0crwdne11335:0',

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

@@ -21,5 +21,9 @@
     'use_default_eula'					=> 'crwdns1247:0crwdne1247:0',
     'use_default_eula_disabled'			=> 'crwdns1248:0crwdne1248:0',
     'use_default_eula_column'			=> 'crwdns6083:0crwdne6083:0',
+    'import_require_acceptance'         => 'crwdns13270:0crwdne13270:0',
+    'import_checkin_email'              => 'crwdns13272:0crwdne13272:0',
+    'import_eula_text'                  => 'crwdns13274:0crwdne13274:0',
+    'import_category_type'              => 'crwdns13276:0crwdne13276:0',
 
 );

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

@@ -5,7 +5,7 @@
     'manage'                    => 'crwdns6501:0crwdne6501:0',
     'field'		                => 'crwdns1487:0crwdne1487:0',
     'about_fieldsets_title'		=> 'crwdns1488:0crwdne1488:0',
-    'about_fieldsets_text'		=> 'crwdns13242:0crwdne13242:0',
+    'about_fieldsets_text'		=> 'crwdns13248:0crwdne13248:0',
     'custom_format'             => 'crwdns6505:0crwdne6505:0',
     'encrypt_field'      	        => 'crwdns1792:0crwdne1792:0',
     'encrypt_field_help'      => 'crwdns1683:0crwdne1683:0',
@@ -60,5 +60,11 @@
     'display_checkin' => 'crwdns12929:0crwdne12929:0',
     'display_checkout' => 'crwdns12931:0crwdne12931:0',
     'display_audit' => 'crwdns13023:0crwdne13023:0',
-
+    'types' => [
+        'text' => 'crwdns13260:0crwdne13260:0',
+        'listbox' => 'crwdns13262:0crwdne13262:0',
+        'textarea' => 'crwdns13264:0crwdne13264:0',
+        'checkbox' => 'crwdns13266:0crwdne13266:0',
+        'radio' => 'crwdns13268:0crwdne13268:0',
+    ],
 ];

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

@@ -9,6 +9,7 @@
     'bulk_checkin'              => 'crwdns12904:0crwdne12904:0',
     'checkin'  					=> 'crwdns756:0crwdne756:0',
     'checkout'  				=> 'crwdns1905:0crwdne1905:0',
+    'clear'                     => 'crwdns13286:0crwdne13286:0',
     'clone'  					=> 'crwdns758:0crwdne758:0',
     'deployable'  				=> 'crwdns1169:0crwdne1169:0',
     'deleted'  					=> 'crwdns6079:0crwdne6079:0',

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

@@ -2,7 +2,7 @@
 
 return [
 
-    'undeployable' 		 => 'crwdns12562:0crwdne12562:0',
+    'undeployable' 		 => 'crwdns13406:0crwdne13406:0',
     'does_not_exist' 	 => 'crwdns740:0crwdne740:0',
     'does_not_exist_var' => 'crwdns12188:0crwdne12188:0',
     'no_tag' 	         => 'crwdns12190:0crwdne12190:0',
@@ -19,6 +19,11 @@
         'success_linked' => 'crwdns11882:0crwdne11882:0',
         'multi_success_linked' => 'crwdns12776:0crwdne12776:0',
         'partial_failure' => 'crwdns12778:0crwdne12778:0',
+        'target_not_found' => [
+            'user' => 'crwdns13292:0crwdne13292:0',
+            'asset' => 'crwdns13294:0crwdne13294:0',
+            'location' => 'crwdns13296:0crwdne13296:0',
+        ],
     ],
 
     'update' => [

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

@@ -9,6 +9,8 @@
     'ad_append_domain_help'     => 'crwdns5850:0crwdne5850:0',
     'admin_cc_email'            => 'crwdns2026:0crwdne2026:0',
     'admin_cc_email_help'       => 'crwdns13158:0crwdne13158:0',
+    'admin_cc_always' => 'crwdns13288:0crwdne13288:0',
+    'admin_cc_when_acceptance_required' => 'crwdns13290:0crwdne13290:0',
     'admin_settings'            => 'crwdns11908:0crwdne11908:0',
     'is_ad'				        => 'crwdns1674:0crwdne1674:0',
     'alerts'                	=> 'crwdns6315:0crwdne6315:0',
@@ -410,7 +412,7 @@
         'filastname_format'			=> 'crwdns13098:0crwdne13098:0',
         'lastnamefirstinitial_format' =>  'crwdns13100:0crwdne13100:0',
         'firstname_lastname_underscore_format' => 'crwdns13102:0crwdne13102:0',
-        'firstinitial.lastname' => 'crwdns13104:0crwdne13104:0',
+        'firstinitial_lastname' => 'crwdns13250:0crwdne13250:0',
         'lastname_firstinitial' => 'crwdns13106:0crwdne13106:0',
         'lastname_dot_firstinitial_format' => 'crwdns13108:0crwdne13108:0',
         'firstnamelastname'     => 'crwdns13110:0crwdne13110:0',
@@ -426,7 +428,7 @@
         'filastname_format'			=> 'crwdns13124:0crwdne13124:0',
         'lastnamefirstinitial_format' =>  'crwdns13126:0crwdne13126:0',
         'firstname_lastname_underscore_format' => 'crwdns13128:0crwdne13128:0',
-        'firstinitial.lastname' => 'crwdns13130:0crwdne13130:0',
+        'firstinitial_lastname' => 'crwdns13252:0crwdne13252:0',
         'lastname_firstinitial' => 'crwdns13132:0crwdne13132:0',
         'lastname_dot_firstinitial_format' => 'crwdns13134:0crwdne13134:0',
         'firstnamelastname'     => 'crwdns13136:0crwdne13136:0',
@@ -484,6 +486,7 @@
         'php_overview'      => 'crwdns12852:0crwdne12852:0',
         'purge'             => 'crwdns12854:0crwdne12854:0',
         'security'          => 'crwdns12856:0crwdne12856:0',
+        'notifications'     => 'crwdns13284:0crwdne13284:0',
     ],
 
 ];

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

@@ -53,4 +53,5 @@
     'next_save_user' => 'crwdns11361:0crwdne11361:0',
     'all_assigned_list_generation' => 'crwdns11415:0crwdne11415:0',
     'email_user_creds_on_create' => 'crwdns11517:0crwdne11517:0',
+    'department_manager' => 'crwdns13408:0crwdne13408:0',
 ];

resources/lang/aa-ER/datepicker.php

@@ -0,0 +1,78 @@
+<?php
+
+return array(
+
+    /*
+    |--------------------------------------------------------------------------
+    | Authentication Language Lines
+    |--------------------------------------------------------------------------
+    |
+    | The following language lines are used during authentication for various
+    | messages that we need to display to the user. You are free to modify
+    | these language lines according to your application's requirements.
+    |
+    */
+
+    'today' => 'crwdns13298:0crwdne13298:0',
+    'clear' => 'crwdns13300:0crwdne13300:0',
+    'days' => [
+        'sunday' => 'crwdns13302:0crwdne13302:0',
+        'monday' => 'crwdns13304:0crwdne13304:0',
+        'tuesday' => 'crwdns13306:0crwdne13306:0',
+        'wednesday' =>  'crwdns13308:0crwdne13308:0',
+        'thursday' =>  'crwdns13310:0crwdne13310:0',
+        'friday' =>  'crwdns13312:0crwdne13312:0',
+        'saturday' =>  'crwdns13314:0crwdne13314:0',
+        ],
+
+    'short_days' => [
+        'sunday' => 'crwdns13316:0crwdne13316:0',
+        'monday' => 'crwdns13318:0crwdne13318:0',
+        'tuesday' => 'crwdns13320:0crwdne13320:0',
+        'wednesday' =>  'crwdns13322:0crwdne13322:0',
+        'thursday' =>  'crwdns13324:0crwdne13324:0',
+        'friday' =>  'crwdns13326:0crwdne13326:0',
+        'saturday' =>  'crwdns13328:0crwdne13328:0',
+    ],
+
+    'min_days' => [
+        'sunday' => 'crwdns13330:0crwdne13330:0',
+        'monday' => 'crwdns13332:0crwdne13332:0',
+        'tuesday' => 'crwdns13334:0crwdne13334:0',
+        'wednesday' =>  'crwdns13336:0crwdne13336:0',
+        'thursday' =>  'crwdns13338:0crwdne13338:0',
+        'friday' =>  'crwdns13340:0crwdne13340:0',
+        'saturday' =>  'crwdns13342:0crwdne13342:0',
+    ],
+
+    'months' => [
+        'january' => 'crwdns13344:0crwdne13344:0',
+        'february' => 'crwdns13346:0crwdne13346:0',
+        'march' => 'crwdns13348:0crwdne13348:0',
+        'april' => 'crwdns13350:0crwdne13350:0',
+        'may' => 'crwdns13352:0crwdne13352:0',
+        'june' => 'crwdns13354:0crwdne13354:0',
+        'july' => 'crwdns13356:0crwdne13356:0',
+        'august' => 'crwdns13358:0crwdne13358:0',
+        'september' => 'crwdns13360:0crwdne13360:0',
+        'october' => 'crwdns13362:0crwdne13362:0',
+        'november' => 'crwdns13364:0crwdne13364:0',
+        'december' => 'crwdns13366:0crwdne13366:0',
+    ],
+
+    'months_short' => [
+        'january' => 'crwdns13368:0crwdne13368:0',
+        'february' => 'crwdns13370:0crwdne13370:0',
+        'march' => 'crwdns13372:0crwdne13372:0',
+        'april' => 'crwdns13374:0crwdne13374:0',
+        'may' => 'crwdns13376:0crwdne13376:0',
+        'june' => 'crwdns13378:0crwdne13378:0',
+        'july' => 'crwdns13380:0crwdne13380:0',
+        'august' => 'crwdns13382:0crwdne13382:0',
+        'september' => 'crwdns13384:0crwdne13384:0',
+        'october' => 'crwdns13386:0crwdne13386:0',
+        'november' => 'crwdns13388:0crwdne13388:0',
+        'december' => 'crwdns13390:0crwdne13390:0',
+    ],
+
+);

resources/lang/aa-ER/general.php

@@ -8,9 +8,11 @@
     'accessory'				=> 'crwdns1201:0crwdne1201:0',
     'accessory_report'		=> 'crwdns1410:0crwdne1410:0',
     'action'                => 'crwdns1304:0crwdne1304:0',
+    'action_date'			=> 'crwdns13398:0crwdne13398:0',
     'activity_report'		=> 'crwdns1291:0crwdne1291:0',
     'address'				=> 'crwdns1019:0crwdne1019:0',
     'admin'					=> 'crwdns12906:0crwdne12906:0',
+    'admin_user'			=> 'crwdns13400:0crwdne13400:0',
     'admin_tooltip'			=> 'crwdns12216:0crwdne12216:0',
     'superuser'				=> 'crwdns12218:0crwdne12218:0',
     'superuser_tooltip'		=> 'crwdns12220:0crwdne12220:0',
@@ -287,6 +289,8 @@
     'status_label'			=> 'crwdns12662:0crwdne12662:0',
     'status'    			=> 'crwdns1089:0crwdne1089:0',
     'accept_eula'           => 'crwdns6786:0crwdne6786:0',
+    'eula'                  => 'crwdns13394:0crwdne13394:0',
+    'eula_long'             => 'crwdns13396:0crwdne13396:0',
     'show_or_hide_eulas' => 'crwdns12756:0crwdne12756:0',
     'supplier'              => 'crwdns1833:0crwdne1833:0',
     'suppliers'  			=> 'crwdns1090:0crwdne1090:0',
@@ -303,6 +307,7 @@
     'type'  				=> 'crwdns1203:0crwdne1203:0',
     'undeployable'			=> 'crwdns1093:0crwdne1093:0',
     'unknown_admin'			=> 'crwdns1094:0crwdne1094:0',
+    'unknown_user'          => 'crwdns13404:0crwdne13404:0',
     'username'              => 'crwdns10464:0crwdne10464:0',
     'update'                => 'crwdns1341:0crwdne1341:0',
     'updating_item' => 'crwdns12804:0crwdne12804:0',
@@ -533,6 +538,9 @@
     'action_source' => 'crwdns11924:0crwdne11924:0',
     'or' => 'crwdns12024:0crwdne12024:0',
     'url'                   => 'crwdns12054:0crwdne12054:0',
+    'phone'                   => 'crwdns13254:0crwdne13254:0',
+    'fax'                   => 'crwdns13256:0crwdne13256:0',
+    'contact'                   => 'crwdns13258:0crwdne13258:0',
     'edit_fieldset' => 'crwdns12092:0crwdne12092:0',
     'permission_denied_superuser_demo' => 'crwdns12158:0crwdne12158:0',
     'pwd_reset_not_sent' => 'crwdns12160:0crwdne12160:0',
@@ -577,6 +585,9 @@
     'user_managed_passwords_allow' => 'crwdns12874:0crwdne12874:0',
     'from' => 'crwdns13170:0crwdne13170:0',
     'by' => 'crwdns13172:0crwdne13172:0',
+    'version' => 'crwdns13278:0crwdne13278:0',
+    'build' => 'crwdns13280:0crwdne13280:0',
+    'footer_credit' => 'crwdns13282:0crwdne13282:0',
 
 // Add form placeholders here
     'placeholders' => [