Merge remote-tracking branch 'origin/develop'

resources/lang/af/admin/accessories/message.php

@@ -3,6 +3,7 @@
 return array(
 
     'does_not_exist' => 'The accessory [:id] does not exist.',
+    'not_found' => 'That accessory was not found.',
     'assoc_users'	 => 'Hierdie bykomstige het tans: tel items wat uitgekontroleer is aan gebruikers. Kontroleer asseblief die bykomstighede en en probeer weer.',
 
     'create' => array(

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

@@ -34,7 +34,8 @@
     'create_field'            => 'Nuwe aangepaste veld',
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Die waarde van hierdie veld is geïnkripteer in die databasis. Slegs admingebruikers sal die gedecodeerde waarde kan sien',
-    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
+    'show_in_email_short'     => 'Include in emails.',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -51,7 +52,10 @@
     'display_in_user_view_table' => 'Visible to User',
     'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
     'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
-    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector.',
+    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
     'show_in_listview_short' => 'Show in lists',
+    'show_in_requestable_list_short' => 'Show in requestable assets list',
+    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
+    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
 
 ];

resources/lang/af/admin/hardware/form.php

@@ -49,6 +49,7 @@
     'asset_location' => 'Update Asset Location',
     'asset_location_update_default_current' => 'Update default location AND actual location',
     'asset_location_update_default' => 'Update only default location',
+    'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',

resources/lang/af/admin/hardware/message.php

@@ -10,6 +10,7 @@
     'create' => [
         'error'   		=> 'Bate is nie geskep nie, probeer asseblief weer. :(',
         'success' 		=> 'Bate geskep suksesvol. :)',
+        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
     ],
 
     'update' => [

resources/lang/af/admin/licenses/message.php

@@ -9,6 +9,7 @@
     'assoc_users'	 => 'Hierdie lisensie word tans na \'n gebruiker nagegaan en kan nie uitgevee word nie. Gaan asseblief die lisensie eers in, en probeer dan weer uitvee.',
     'select_asset_or_person' => 'Jy moet \'n bate of \'n gebruiker kies, maar nie albei nie.',
     'not_found' => 'License not found',
+    'seats_available' => ':seat_count seats available',
 
 
     'create' => array(
@@ -41,7 +42,8 @@
 
     'checkout' => array(
         'error'   => 'Daar was \'n probleem om die lisensie te kontroleer. Probeer asseblief weer.',
-        'success' => 'Die lisensie is suksesvol nagegaan'
+        'success' => 'Die lisensie is suksesvol nagegaan',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
     ),
 
     'checkin' => array(

resources/lang/af/admin/locations/table.php

@@ -15,6 +15,7 @@
     'print_all_assigned'        => 'Print All Assigned',
     'name'                      => 'Pleknaam',
     'address'                   => 'adres',
+    'address2'                   => 'Address Line 2',
     'zip'                       => 'Poskode',
     'locations'                 => 'plekke',
     'parent'                    => 'Ouer',

resources/lang/af/admin/reports/general.php

@@ -6,5 +6,12 @@
     'send_reminder' => 'Send reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request'
+    'acceptance_request' => 'Acceptance request',
+    'custom_export' => [
+        'user_address' => 'User Address',
+        'user_city' => 'User City',
+        'user_state' => 'User State',
+        'user_country' => 'User Country',
+        'user_zip' => 'User Zip'
+    ]
 ];

resources/lang/af/admin/users/message.php

@@ -8,14 +8,15 @@
     'user_exists'               => 'Gebruiker bestaan ​​reeds!',
     'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Die aanmeldingsveld is nodig',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Die wagwoord is nodig.',
     'insufficient_permissions'  => 'Onvoldoende Toestemmings.',
     'user_deleted_warning'      => 'Hierdie gebruiker is verwyder. Jy sal hierdie gebruiker moet herstel om hulle te wysig of nuwe bates toe te ken.',
     'ldap_not_configured'        => 'LDAP-integrasie is nie vir hierdie installasie gekonfigureer nie.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
     'password_reset_sent'       => 'A password reset link has been sent to :email!',
     'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'log_record_not_found'        => 'A matching log record for this user could not be found.',
 
 
     'success' => array(

resources/lang/af/general.php

@@ -72,6 +72,8 @@
     'consumable'			=> 'verbruikbare',
     'consumables'			=> 'Consumables',
     'country'  				=> 'land',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
     'create'				=> 'Skep nuwe',
     'created'               => 'Item geskep',
     'created_asset'			=> 'geskep bate',
@@ -353,7 +355,8 @@
     'synchronize'           => 'Synchronize',
     'sync_results'          => 'Synchronization Results',
     'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid category',
+    'invalid_category'      => 'Invalid or missing category',
+    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
     'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
     '60_percent_warning'    => '60% Complete (warning)',
     'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
@@ -368,7 +371,7 @@
     'consumables_count'     => 'Consumables Count',
     'components_count'      => 'Components Count',
     'licenses_count'        => 'Licenses Count',
-    'notification_error'    => 'Error:',
+    'notification_error'    => 'Error',
     'notification_error_hint' => 'Please check the form below for errors',
     'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
     'notification_success'  => 'Success',
@@ -485,7 +488,7 @@
     ],
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.',
+    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
 

resources/lang/af/help.php

@@ -30,5 +30,6 @@
     'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
 
     'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
-
+
+    'empty_file'    => 'The importer detects that this file is empty.'
 ];

resources/lang/af/passwords.php

@@ -5,4 +5,5 @@
     'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
     'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
     'reset'         => 'Your password has been reset!',
+    'password_change'  => 'Your password has been updated!',
 ];

resources/lang/af/validation.php

@@ -90,11 +90,14 @@
     ],
     'string'               => 'Die: kenmerk moet \'n string wees.',
     'timezone'             => 'Die: Attribuut moet \'n geldige sone wees.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
     'unique'               => 'Die: Attribuut is reeds geneem.',
     'uploaded'             => 'Die: kenmerk kon nie opgelaai word nie.',
     'url'                  => 'Die: Attribuutformaat is ongeldig.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
+    'not_array'            => 'The :attribute field cannot be an array.',
+    'unique_serial'        => 'The :attribute must be unique.',
     'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
     'letters'              => 'Password must contain at least one letter.',
     'numbers'              => 'Password must contain at least one number.',

resources/lang/am/admin/accessories/message.php

@@ -3,6 +3,7 @@
 return array(
 
     'does_not_exist' => 'The accessory [:id] does not exist.',
+    'not_found' => 'That accessory was not found.',
     'assoc_users'	 => 'This accessory currently has :count items checked out to users. Please check in the accessories and and try again. ',
 
     'create' => array(

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

@@ -34,7 +34,8 @@
     'create_field'            => 'New Custom Field',
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'The value of this field is encrypted in the database. Only admin users will be able to view the decrypted value',
-    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails.',
+    'show_in_email'     => 'Include the value of this field in checkout emails sent to the user? Encrypted fields cannot be included in emails',
+    'show_in_email_short'     => 'Include in emails.',
     'help_text' => 'Help Text',
     'help_text_description' => 'This is optional text that will appear below the form elements while editing an asset to provide context on the field.',
     'about_custom_fields_title' => 'About Custom Fields',
@@ -51,7 +52,10 @@
     'display_in_user_view_table' => 'Visible to User',
     'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
     'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
-    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector.',
+    'show_in_listview' => 'Show in list views by default. Authorized users will still be able to show/hide via the column selector',
     'show_in_listview_short' => 'Show in lists',
+    'show_in_requestable_list_short' => 'Show in requestable assets list',
+    'show_in_requestable_list' => 'Show value in requestable assets list. Encrypted fields will not be shown',
+    'encrypted_options' => 'This field is encrypted, so some display options will not be available.',
 
 ];

resources/lang/am/admin/hardware/form.php

@@ -49,6 +49,7 @@
     'asset_location' => 'Update Asset Location',
     'asset_location_update_default_current' => 'Update default location AND actual location',
     'asset_location_update_default' => 'Update only default location',
+    'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'That asset status is not deployable. This asset cannot be checked out.',
     'asset_deployable' => 'That status is deployable. This asset can be checked out.',
     'processing_spinner' => 'Processing... (This might take a bit of time on large files)',

resources/lang/am/admin/hardware/message.php

@@ -11,6 +11,7 @@
     'create' => [
         'error'   		=> 'Asset was not created, please try again. :(',
         'success' 		=> 'Asset created successfully. :)',
+        'success_linked' => 'Asset with tag :tag was created successfully. <strong><a href=":link" style="color: white;">Click here to view</a></strong>.',
     ],
 
     'update' => [

resources/lang/am/admin/licenses/message.php

@@ -9,6 +9,7 @@
     'assoc_users'	 => 'This license is currently checked out to a user and cannot be deleted. Please check the license in first, and then try deleting again. ',
     'select_asset_or_person' => 'You must select an asset or a user, but not both.',
     'not_found' => 'License not found',
+    'seats_available' => ':seat_count seats available',
 
 
     'create' => array(
@@ -41,7 +42,8 @@
 
     'checkout' => array(
         'error'   => 'There was an issue checking out the license. Please try again.',
-        'success' => 'The license was checked out successfully'
+        'success' => 'The license was checked out successfully',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
     ),
 
     'checkin' => array(

resources/lang/am/admin/locations/table.php

@@ -15,6 +15,7 @@
     'print_all_assigned'        => 'Print All Assigned',
     'name'                      => 'Location Name',
     'address'                   => 'Address',
+    'address2'                   => 'Address Line 2',
     'zip'                       => 'Postal Code',
     'locations'                 => 'Locations',
     'parent'                    => 'Parent',

resources/lang/am/admin/reports/general.php

@@ -6,5 +6,12 @@
     'send_reminder' => 'Send reminder',
     'reminder_sent' => 'Reminder sent',
     'acceptance_deleted' => 'Acceptance request deleted',
-    'acceptance_request' => 'Acceptance request'
+    'acceptance_request' => 'Acceptance request',
+    'custom_export' => [
+        'user_address' => 'User Address',
+        'user_city' => 'User City',
+        'user_state' => 'User State',
+        'user_country' => 'User Country',
+        'user_zip' => 'User Zip'
+    ]
 ];

resources/lang/am/admin/users/message.php

@@ -8,14 +8,15 @@
     'user_exists'               => 'User already exists!',
     'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'The login field is required',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'The password is required.',
     'insufficient_permissions'  => 'Insufficient Permissions.',
     'user_deleted_warning'      => 'This user has been deleted. You will have to restore this user to edit them or assign them new assets.',
     'ldap_not_configured'        => 'LDAP integration has not been configured for this installation.',
     'password_resets_sent'      => 'The selected users who are activated and have a valid email addresses have been sent a password reset link.',
     'password_reset_sent'       => 'A password reset link has been sent to :email!',
     'user_has_no_email'         => 'This user does not have an email address in their profile.',
-    'user_has_no_assets_assigned'   => 'This user does not have any assets assigned',
+    'log_record_not_found'        => 'A matching log record for this user could not be found.',
 
 
     'success' => array(

resources/lang/am/general.php

@@ -72,6 +72,8 @@
     'consumable'			=> 'Consumable',
     'consumables'			=> 'Consumables',
     'country'  				=> 'Country',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
     'create'				=> 'Create New',
     'created'               => 'Item Created',
     'created_asset'			=> 'created asset',
@@ -353,7 +355,8 @@
     'synchronize'           => 'Synchronize',
     'sync_results'          => 'Synchronization Results',
     'license_serial'        => 'Serial/Product Key',
-    'invalid_category'      => 'Invalid category',
+    'invalid_category'      => 'Invalid or missing category',
+    'invalid_item_category_single' => 'Invalid or missing :type category. Please update the category of this :type to include a valid category before checking out.',
     'dashboard_info'        => 'This is your dashboard. There are many like it, but this one is yours.',
     '60_percent_warning'    => '60% Complete (warning)',
     'dashboard_empty'       => 'It looks like you have not added anything yet, so we do not have anything awesome to display. Get started by adding some assets, accessories, consumables, or licenses now!',
@@ -368,7 +371,7 @@
     'consumables_count'     => 'Consumables Count',
     'components_count'      => 'Components Count',
     'licenses_count'        => 'Licenses Count',
-    'notification_error'    => 'Error:',
+    'notification_error'    => 'Error',
     'notification_error_hint' => 'Please check the form below for errors',
     'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
     'notification_success'  => 'Success',
@@ -485,7 +488,7 @@
     ],
     'percent_complete' => '% complete',
     'uploading' => 'Uploading... ',
-    'upload_error' => 'Error uploading file. Please check that there are no empty trailing rows.',
+    'upload_error' => 'Error uploading file. Please check that there are no empty rows and that no column names are duplicated.',
     'copy_to_clipboard' => 'Copy to Clipboard',
     'copied' => 'Copied!',
 

resources/lang/am/help.php

@@ -30,5 +30,6 @@
     'consumables'   => 'Consumables are anything purchased that will be used up over time. For example, printer ink or copier paper.',
 
     'depreciations' => 'You can set up asset depreciations to depreciate assets based on straight-line depreciation.',
-
+
+    'empty_file'    => 'The importer detects that this file is empty.'
 ];

resources/lang/am/passwords.php

@@ -5,4 +5,5 @@
     'user'			=> 'If a matching user with a valid email address exists in our system, a password recovery email has been sent.',
     'token'         => 'This password reset token is invalid or expired, or does not match the username provided.',
     'reset'         => 'Your password has been reset!',
+    'password_change'  => 'Your password has been updated!',
 ];

resources/lang/am/validation.php

@@ -90,11 +90,14 @@
     ],
     'string'               => 'The :attribute must be a string.',
     'timezone'             => 'The :attribute must be a valid zone.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
     'unique'               => 'The :attribute has already been taken.',
     'uploaded'             => 'The :attribute failed to upload.',
     'url'                  => 'The :attribute format is invalid.',
     'unique_undeleted'     => 'The :attribute must be unique.',
     'non_circular'         => 'The :attribute must not create a circular reference.',
+    'not_array'            => 'The :attribute field cannot be an array.',
+    'unique_serial'        => 'The :attribute must be unique.',
     'disallow_same_pwd_as_user_fields' => 'Password cannot be the same as the username.',
     'letters'              => 'Password must contain at least one letter.',
     'numbers'              => 'Password must contain at least one number.',

resources/lang/ar/admin/accessories/message.php

@@ -3,6 +3,7 @@
 return array(
 
     'does_not_exist' => 'الملحق [:id] غير موجود.',
+    'not_found' => 'That accessory was not found.',
     'assoc_users'	 => 'تم إخراج :count عنصر من هذا الملحق للمستخدمين، الرجاء ادخال بعض الملحقات ثم حاول مرة أخرى. ',
 
     'create' => array(