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.18-pre',
-  'full_app_version' => 'v8.1.18-pre - build 18872-g2e8ae3376',
-  'build_version' => '18872',
+  'app_version' => 'v8.1.18',
+  'full_app_version' => 'v8.1.18 - build 18876-g4c6249eb9',
+  'build_version' => '18876',
   'prerelease_version' => '',
-  'hash_version' => 'g2e8ae3376',
-  'full_hash' => 'v8.1.18-pre-73-g2e8ae3376',
+  'hash_version' => 'g4c6249eb9',
+  'full_hash' => 'v8.1.18-77-g4c6249eb9',
   'branch' => 'master',
 );

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'		=> 'crwdns13410:0crwdne13410:0',
+    'about_fieldsets_text'		=> 'crwdns13464:0crwdne13464:0',
     'custom_format'             => 'crwdns6505:0crwdne6505:0',
     'encrypt_field'      	        => 'crwdns1792:0crwdne1792:0',
     'encrypt_field_help'      => 'crwdns1683:0crwdne1683:0',

resources/lang/aa-ER/general.php

@@ -225,11 +225,13 @@
     'order_number'          => 'crwdns1829:0crwdne1829:0',
     'only_deleted'          => 'crwdns10520:0crwdne10520:0',
     'page_menu'				=> 'crwdns1276:0crwdne1276:0',
+    'page_error'            => 'crwdns13474:0crwdne13474:0',
     'pagination_info'		=> 'crwdns1277:0crwdne1277:0',
     'pending'				=> 'crwdns1077:0crwdne1077:0',
     'people'				=> 'crwdns1078:0crwdne1078:0',
     'per_page'				=> 'crwdns1079:0crwdne1079:0',
     'previous'				=> 'crwdns1278:0crwdne1278:0',
+    'previous_page'			=> 'crwdns13476:0crwdne13476:0',
     'processing'			=> 'crwdns1279:0crwdne1279:0',
     'profile'				=> 'crwdns1080:0crwdne1080:0',
     'purchase_cost'                              => 'crwdns1830:0crwdne1830:0',
@@ -311,7 +313,7 @@
     'username'              => 'crwdns10464:0crwdne10464:0',
     'update'                => 'crwdns1341:0crwdne1341:0',
     'updating_item' => 'crwdns12804:0crwdne12804:0',
-    'upload_filetypes_help'      => 'crwdns5980:0crwdne5980:0',
+    'upload_filetypes_help' => 'crwdns13472:0crwdne13472:0',
     'uploaded'              => 'crwdns1289:0crwdne1289:0',
     'user'					=> 'crwdns1095:0crwdne1095:0',
     'accepted'			    => 'crwdns1342:0crwdne1342:0',
@@ -658,5 +660,12 @@
         'confirm_delete' => 'crwdns13462:0crwdne13462:0',
     ],
 
+    'depreciation_options' => [
+        'amount' => 'crwdns13466:0crwdne13466:0',
+        'percent' => 'crwdns13468:0crwdne13468:0',
+    ],
+
+    'months_plural' => 'crwdns13470:0crwdne13470:0',
+
 
 ];

resources/lang/aa-ER/mail.php

@@ -27,8 +27,10 @@
     'Low_Inventory_Report' => 'crwdns1745:0crwdne1745:0',
     'a_user_canceled' => 'crwdns1704:0crwdne1704:0',
     'a_user_requested' => 'crwdns1705:0crwdne1705:0',
+    'acceptance_asset_accepted_to_user' => 'crwdns13478:0crwdne13478:0',
     'acceptance_asset_accepted' => 'crwdns10552:0crwdne10552:0',
     'acceptance_asset_declined' => 'crwdns10554:0crwdne10554:0',
+    'send_pdf_copy' => 'crwdns13480:0crwdne13480:0',
     'accessory_name' => 'crwdns12732:0crwdne12732:0',
     'additional_notes' => 'crwdns12734:0crwdne12734:0',
     'admin_has_created' => 'crwdns1708:0crwdne1708:0',

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

@@ -5,7 +5,7 @@
     'manage'                    => 'Manage',
     'field'		                => 'veld',
     'about_fieldsets_title'		=> 'Oor Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Veldstelle stel jou in staat om groepe van persoonlike velde te skep wat gereeld hergebruik word vir spesifieke tipe bates.',
     'custom_format'             => 'Custom Regex format...',
     'encrypt_field'      	        => 'Enkripteer die waarde van hierdie veld in die databasis',
     'encrypt_field_help'      => 'WAARSKUWING: Om \'n veld te enkripteer, maak dit onondersoekbaar.',

resources/lang/af-ZA/general.php

@@ -225,11 +225,13 @@
     'order_number'          => 'Bestellingnommer',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Wys _MENU_ items',
+    'page_error'            => 'Could not determine previous page. Redirected to homepage.',
     'pagination_info'		=> 'Wys _START_ tot _END_ van _TOTAL_ items',
     'pending'				=> 'hangende',
     'people'				=> 'mense',
     'per_page'				=> 'Resultate per bladsy',
     'previous'				=> 'vorige',
+    'previous_page'			=> 'Previous Page',
     'processing'			=> 'verwerking',
     'profile'				=> 'Jou profiel',
     'purchase_cost'                              => 'Aankoopskoste',
@@ -311,7 +313,7 @@
     'username'              => 'Gebruikersnaam',
     'update'                => 'Opdateer',
     'updating_item' => 'Updating :item',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help' => 'Allowed filetypes are: :allowed_filetypes. Max upload size allowed is :size.',
     'uploaded'              => 'opgelaai',
     'user'					=> 'gebruiker',
     'accepted'			    => 'aanvaarde',
@@ -659,5 +661,12 @@
         'confirm_delete' => 'Are you sure you want to delete this file?',
     ],
 
+    'depreciation_options' => [
+        'amount' => 'Amount',
+        'percent' => 'Percentage',
+    ],
+
+    'months_plural' => '1 month|:count months',
+
 
 ];

resources/lang/af-ZA/mail.php

@@ -27,8 +27,10 @@
     'Low_Inventory_Report' => 'Lae voorraadverslag',
     'a_user_canceled' => '\'N Gebruiker het \'n itemversoek op die webwerf gekanselleer',
     'a_user_requested' => '\'N Gebruiker het \'n item op die webwerf versoek',
+    'acceptance_asset_accepted_to_user' => 'You have accepted an item assigned to you by :site_name',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
+    'send_pdf_copy' => 'Send a copy of this acceptance to my email address',
     'accessory_name' => 'Toebehore Naam',
     'additional_notes' => 'Bykomende aantekeninge',
     'admin_has_created' => '\'N Administrateur het \'n rekening vir jou op die webtuiste gemaak.',

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

@@ -5,7 +5,7 @@
     'manage'                    => 'Manage',
     'field'		                => 'Field',
     'about_fieldsets_title'		=> 'About Fieldsets',
-    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used for specific asset model types.',
+    'about_fieldsets_text'		=> 'Fieldsets allow you to create groups of custom fields that are frequently re-used used for specific asset model types.',
     'custom_format'             => 'Custom Regex format...',
     'encrypt_field'      	        => 'Encrypt the value of this field in the database',
     'encrypt_field_help'      => 'WARNING: Encrypting a field makes it unsearchable.',

resources/lang/am-ET/general.php

@@ -225,11 +225,13 @@
     'order_number'          => 'Order Number',
     'only_deleted'          => 'Only Deleted Assets',
     'page_menu'				=> 'Showing _MENU_ items',
+    'page_error'            => 'Could not determine previous page. Redirected to homepage.',
     'pagination_info'		=> 'Showing _START_ to _END_ of _TOTAL_ items',
     'pending'				=> 'Pending',
     'people'				=> 'People',
     'per_page'				=> 'Results Per Page',
     'previous'				=> 'Previous',
+    'previous_page'			=> 'Previous Page',
     'processing'			=> 'Processing',
     'profile'				=> 'Your profile',
     'purchase_cost'                              => 'Purchase Cost',
@@ -311,7 +313,7 @@
     'username'              => 'Username',
     'update'                => 'Update',
     'updating_item' => 'Updating :item',
-    'upload_filetypes_help'      => 'Allowed filetypes are png, gif, jpg, jpeg, doc, docx, pdf, xls, xlsx, txt, lic, xml, zip, rtf and rar. Max upload size allowed is :size.',
+    'upload_filetypes_help' => 'Allowed filetypes are: :allowed_filetypes. Max upload size allowed is :size.',
     'uploaded'              => 'Uploaded',
     'user'					=> 'User',
     'accepted'			    => 'accepted',
@@ -659,5 +661,12 @@
         'confirm_delete' => 'Are you sure you want to delete this file?',
     ],
 
+    'depreciation_options' => [
+        'amount' => 'Amount',
+        'percent' => 'Percentage',
+    ],
+
+    'months_plural' => '1 month|:count months',
+
 
 ];

resources/lang/am-ET/mail.php

@@ -27,8 +27,10 @@
     'Low_Inventory_Report' => 'Low Inventory Report',
     'a_user_canceled' => 'A user has canceled an item request on the website',
     'a_user_requested' => 'A user has requested an item on the website',
+    'acceptance_asset_accepted_to_user' => 'You have accepted an item assigned to you by :site_name',
     'acceptance_asset_accepted' => 'A user has accepted an item',
     'acceptance_asset_declined' => 'A user has declined an item',
+    'send_pdf_copy' => 'Send a copy of this acceptance to my email address',
     'accessory_name' => 'Accessory Name',
     'additional_notes' => 'Additional Notes',
     'admin_has_created' => 'An administrator has created an account for you on the :web website.',