Merge remote-tracking branch 'origin/develop'

Author: snipe

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

@@ -13,6 +13,7 @@
     'no_default_eula' => 'crwdns1213:0crwdne1213:0',
     'total' => 'crwdns1215:0crwdne1215:0',
     'remaining' => 'crwdns1216:0crwdne1216:0',
+    'requestable' => 'crwdns15151:0crwdne15151:0',
     'update' => 'crwdns1386:0crwdne1386:0',
     'use_default_eula' => 'crwdns1218:0crwdne1218:0',
     'use_default_eula_disabled' => 'crwdns1219:0crwdne1219:0',

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

@@ -20,6 +20,8 @@
         'confirm' => 'crwdns1607:0crwdne1607:0',
         'error' => 'crwdns1608:0crwdne1608:0',
         'success' => 'crwdns1609:0crwdne1609:0',
+        'bulk_success' => 'crwdns15063:0crwdne15063:0',
+        'partial_success' => 'crwdns15065:0crwdne15065:0',
     ],
 
     'checkout' => [

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

@@ -19,6 +19,8 @@
     'required_acceptance' => 'crwdns1244:0crwdne1244:0',
     'global_signature_required_notice' => 'crwdns14708:0crwdne14708:0',
     'required_eula' => 'crwdns1245:0crwdne1245:0',
+    'required_acceptance_component' => 'crwdns15573:0crwdne15573:0',
+    'required_eula_component' => 'crwdns15575:0crwdne15575:0',
     'required_signature' => 'crwdns14815:0crwdne14815:0',
     'no_default_eula' => 'crwdns1246:0crwdne1246:0',
     'update' => 'crwdns639:0crwdne639:0',

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

@@ -21,7 +21,7 @@
         'confirm' => 'crwdns631:0crwdne631:0',
         'error' => 'crwdns632:0crwdne632:0',
         'success' => 'crwdns13884:0crwdne13884:0',
-        'bulk_success' => 'crwdns13886:0crwdne13886:0',
+        'bulk_success' => 'crwdns15041:0crwdne15041:0',
         'partial_success' => 'crwdns13888:0crwdne13888:0',
     ],
 

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

@@ -16,5 +16,7 @@
         'confirm' => 'crwdns1531:0crwdne1531:0',
         'error' => 'crwdns1532:0crwdne1532:0',
         'success' => 'crwdns1533:0crwdne1533:0',
+        'bulk_success' => 'crwdns15037:0crwdne15037:0',
+        'partial_success' => 'crwdns15009:0crwdne15009:0',
     ],
 ];

resources/lang/aa-ER/admin/companies/table.php

@@ -9,4 +9,9 @@
     'update' => 'crwdns1537:0crwdne1537:0',
     'name' => 'crwdns1538:0crwdne1538:0',
     'id' => 'crwdns1539:0crwdne1539:0',
+    'parent' => 'crwdns15013:0crwdne15013:0',
+    'parent_help' => 'crwdns15015:0crwdne15015:0',
+    'children' => 'crwdns15017:0crwdne15017:0',
+    'inherited' => 'crwdns15019:0crwdne15019:0',
+    'inherited_help' => 'crwdns15021:0crwdne15021:0',
 ];

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

@@ -13,4 +13,7 @@
     'total' => 'crwdns1553:0crwdne1553:0',
     'update' => 'crwdns1554:0crwdne1554:0',
     'checkin_limit' => 'crwdns11217:0crwdne11217:0',
+    'exclude_deleted' => 'crwdns14981:0crwdne14981:0',
+    'include_deleted' => 'crwdns14983:0crwdne14983:0',
+    'only_deleted' => 'crwdns14985:0crwdne14985: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' => 'crwdns14909:0crwdne14909:0',
+    'about_fieldsets_text' => 'crwdns14933:0crwdne14933:0',
     'custom_format' => 'crwdns6505:0crwdne6505:0',
     'encrypt_field' => 'crwdns1792:0crwdne1792:0',
     'encrypt_field_help' => 'crwdns1683:0crwdne1683:0',
@@ -20,6 +20,15 @@
     'field_element' => 'crwdns1495:0crwdne1495:0',
     'field_element_short' => 'crwdns1496:0crwdne1496:0',
     'field_format' => 'crwdns1497:0crwdne1497:0',
+    'field_format_help' => 'crwdns15155:0crwdne15155:0',
+    'field_element_help' => 'crwdns15157:0crwdne15157:0',
+    'format_any_with_date_picker_help' => 'crwdns15159:0crwdne15159:0',
+    'encrypt_disabled_for_date_format' => 'crwdns15161:0crwdne15161:0',
+    'format_locked_for_native_column' => 'crwdns15163:0crwdne15163:0',
+    'date_formats_disabled_for_edit' => 'crwdns15165:0crwdne15165:0',
+    'format_change_warning' => 'crwdns15167:0crwdne15167:0',
+    'date_picker_widget' => 'crwdns15169:0crwdne15169:0',
+    'datetime_picker_widget' => 'crwdns15171:0crwdne15171:0',
     'field_custom_format' => 'crwdns1498:0crwdne1498:0',
     'field_custom_format_help' => 'crwdns1971:0{15}crwdne1971:0',
     'required' => 'crwdns1499:0crwdne1499:0',
@@ -60,14 +69,25 @@
     'display_checkin' => 'crwdns12929:0crwdne12929:0',
     'display_checkout' => 'crwdns12931:0crwdne12931:0',
     'display_audit' => 'crwdns13023:0crwdne13023:0',
+    'section_security' => 'crwdns15173:0crwdne15173:0',
+    'section_behavior' => 'crwdns15175:0crwdne15175:0',
+    'section_visibility' => 'crwdns15177:0crwdne15177:0',
+    'section_display_on_forms' => 'crwdns15179:0crwdne15179:0',
+    'validation' => [
+        'element_not_valid_for_format' => 'crwdns15181:0crwdne15181:0',
+        'field_values_required' => 'crwdns15183:0crwdne15183:0',
+        'cannot_encrypt_format' => 'crwdns15185:0crwdne15185:0',
+        'cannot_encrypt_element' => 'crwdns15187:0crwdne15187:0',
+    ],
     'types' => [
         'text' => 'crwdns13260:0crwdne13260:0',
         'listbox' => 'crwdns13262:0crwdne13262:0',
         'textarea' => 'crwdns13264:0crwdne13264:0',
         'markdown-textarea' => 'crwdns14919:0crwdne14919:0',
         'checkbox' => 'crwdns13266:0crwdne13266:0',
         'radio' => 'crwdns13268:0crwdne13268:0',
+        'date_picker' => 'crwdns15189:0crwdne15189:0',
+        'datetime_picker' => 'crwdns15191:0crwdne15191:0',
     ],
-    'markdown_supported' => 'crwdns14921:0crwdne14921:0',
     'general_help_text' => 'crwdns13902:0crwdne13902:0',
 ];

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

@@ -17,6 +17,8 @@
         'confirm' => 'crwdns1867:0crwdne1867:0',
         'error' => 'crwdns1868:0crwdne1868:0',
         'success' => 'crwdns1869:0crwdne1869:0',
+        'bulk_success' => 'crwdns15045:0crwdne15045:0',
+        'partial_success' => 'crwdns15047:0crwdne15047:0',
     ],
 
 ];

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

@@ -19,6 +19,8 @@
         'confirm' => 'crwdns816:0crwdne816:0',
         'error' => 'crwdns817:0crwdne817:0',
         'success' => 'crwdns818:0crwdne818:0',
+        'bulk_success' => 'crwdns15051:0crwdne15051:0',
+        'partial_success' => 'crwdns15053:0crwdne15053:0',
     ],
 
 ];