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 @@ return [
     '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 @@ return [
     '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 @@ return [
     '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 @@ return [
     '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 @@ return array(
     '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 @@ return array(
 
     '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 @@ return [
     '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 @@ return [
     '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,6 +8,7 @@ return array(
     '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.',
@@ -15,7 +16,7 @@ return array(
     '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 @@ return [
     '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 @@ return [
     '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 @@ return [
     '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 @@ return [
     ],
     '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

@@ -31,4 +31,5 @@ return [
 
     '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 @@ return [
     '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 @@ return [
     ],
     '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 @@ return [
     '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 @@ return [
     '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 @@ return [
     '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 @@ return [
     '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 @@ return array(
     '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 @@ return array(
 
     '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 @@ return [
     '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 @@ return [
     '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,6 +8,7 @@ return array(
     '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.',
@@ -15,7 +16,7 @@ return array(
     '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 @@ return [
     '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 @@ return [
     '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 @@ return [
     '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 @@ return [
     ],
     '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

@@ -31,4 +31,5 @@ return [
 
     '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 @@ return [
     '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 @@ return [
     ],
     '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(

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

@@ -34,7 +34,8 @@ return [
     'create_field'            => 'حقل جديد مخصص',
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'هذا الحقل مشفر في قاعدة البيانات. يمكن قرائته من قبل مدراء النظام فقط',
-    'show_in_email'     => 'هل تريد تضمين قيمة هذا الحقل في رسائل البريد الإلكتروني المرسلة إلى المستخدم؟ لا يمكن تضمين الحقول المشفرة في رسائل البريد الإلكتروني.',
+    '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 @@ return [
     '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/ar/admin/hardware/form.php

@@ -49,6 +49,7 @@ return [
     'asset_location' => 'تحديث موقع الأصل',
     'asset_location_update_default_current' => 'تحديث الموقع الافتراضي والموقع الفعلي',
     'asset_location_update_default' => 'تحديث الموقع الافتراضي فقط',
+    'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'حالة الأصول هذه غير قابلة للنشر. لا يمكن التحقق من هذه الأصول.',
     'asset_deployable' => 'حالة تلك الأصول قابلة للنشر. هذا الأصل يمكن إخراجه.',
     'processing_spinner' => 'معالجة... (قد يستغرق هذا بعض الوقت على ملفات كبيرة)',

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

@@ -10,6 +10,7 @@ return [
     'create' => [
         'error'   		=> 'لم يتم إنشاء الأصل، يرجى إعادة المحاولة. :(',
         'success' 		=> 'تم إنشاء الأصل بنجاح. :)',
+        '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/ar/admin/licenses/message.php

@@ -9,6 +9,7 @@ return array(
     'assoc_users'	 => 'هذا الترخيص حاليا مخرج لمستخدم ولا يمكن حذفه. يرجى التحقق من الترخيص في البداية، ثم محاولة الحذف مرة أخرى. ',
     'select_asset_or_person' => 'يجب تحديد أصل أو مستخدم، وليس كليهما.',
     'not_found' => 'لم يتم العثور على الترخيص',
+    'seats_available' => ':seat_count seats available',
 
 
     'create' => array(
@@ -41,7 +42,8 @@ return array(
 
     'checkout' => array(
         'error'   => 'حدثت مشكلة أثناء اخراج الترخيص. يرجى إعادة المحاولة.',
-        'success' => 'تم اخراج الترخيص بنجاح'
+        'success' => 'تم اخراج الترخيص بنجاح',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
     ),
 
     'checkin' => array(

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

@@ -15,6 +15,7 @@ return [
     'print_all_assigned'        => 'طباعة كل المعين',
     'name'                      => 'إسم الموقع',
     'address'                   => 'العنوان',
+    'address2'                   => 'Address Line 2',
     'zip'                       => 'الرمز البريدي',
     'locations'                 => 'المواقع',
     'parent'                    => 'الأبوين',

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

@@ -6,5 +6,12 @@ return [
     '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/ar/admin/users/message.php

@@ -8,6 +8,7 @@ return array(
     'user_exists'               => 'المستخدم موجود مسبقاً!',
     'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'حقل تسجيل الدخول اجباري',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'كلمة المرور اجبارية.',
     'insufficient_permissions'  => 'صلاحيات غير كافية.',
     'user_deleted_warning'      => 'تم حذف المستخدم. سيكون عليك استعادة هذا المستخدم اذا ارت التعديل عليه او تسليمه اجهزة جديدة.',
@@ -15,7 +16,7 @@ return array(
     'password_resets_sent'      => 'تم إرسال رابط إعادة تعيين كلمة المرور للمستخدمين المحددين الذين تم تفعيلهم ولديهم عناوين بريد إلكتروني صالحة.',
     'password_reset_sent'       => 'تم إرسال رابط إعادة تعيين كلمة المرور إلى البريد الإلكتروني!',
     '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/ar/general.php

@@ -72,6 +72,8 @@ return [
     'consumable'			=> 'مستهلكات',
     'consumables'			=> 'المواد الاستهلاكية',
     'country'  				=> 'الدولة',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
     'create'				=> 'إضافة',
     'created'               => 'تم إنشاء العنصر',
     'created_asset'			=> 'الأصول المضافة',
@@ -353,7 +355,8 @@ return [
     'synchronize'           => 'مزامنة',
     'sync_results'          => 'نتائج المزامنة',
     'license_serial'        => 'مفتاح السلسلة / المنتج',
-    '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'        => 'هذه هي لوحة التحكم الخاصة بك. هناك العديد من هذه اللوحة، ولكن هذه اللوحة لك.',
     '60_percent_warning'    => 'تم اكمال 60% (تحذير)',
     '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 @@ return [
     'consumables_count'     => 'عدد المواد المستهلكة',
     'components_count'      => 'عدد المكونات',
     'licenses_count'        => 'عدد التراخيص',
-    'notification_error'    => 'Error:',
+    'notification_error'    => 'Error',
     'notification_error_hint' => 'الرجاء التحقق من الاخطاء بالنموذج أدناه',
     'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
     'notification_success'  => 'Success',
@@ -485,7 +488,7 @@ return [
     ],
     '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/ar/help.php

@@ -31,4 +31,5 @@ return [
 
     'depreciations' => 'يمكنك إعداد استهلاك الأصول لاستهلاك الأصول بناء على الاستهلاك الثابت للقيمة.',
     
+    'empty_file'    => 'The importer detects that this file is empty.'
 ];

resources/lang/ar/passwords.php

@@ -5,4 +5,5 @@ return [
     '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/ar/validation.php

@@ -90,11 +90,14 @@ return [
     ],
     'string'               => 'يجب أن يكون :attribute عبارة عن سلسلة نصية.',
     'timezone'             => 'يجب أن يكون :attribute منطقة صالحة.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
     'unique'               => 'لقد تم أخذ :attribute مسبقا.',
     'uploaded'             => 'لقد فشل تحميل :attribute.',
     'url'                  => 'ان تنسيق :attribute غير صالح.',
     'unique_undeleted'     => ':attribute يجب ان تكون فريدة.',
     'non_circular'         => 'يجب ألا تنشئ السمة مرجعًا دائريًا.',
+    '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/bg/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(

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

@@ -34,7 +34,8 @@ return [
     'create_field'            => 'Ново персонализирано поле',
     'create_field_title' => 'Създай ново персонализирано поле',
     'value_encrypted'      	        => 'Стойността на това поле е криптирана в базата данни. Само администратор потребители ще бъде в състояние да видят дешифрираната стойност',
-    'show_in_email'     => 'Да се включи ли стойността на това поле в електронната поща, изпращана към потребителите? Криптираните полета не могат да бъдат включвани в изпращаните електронни пощи.',
+    '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_description' => 'Това е допълнителен текст, който ще се появява под формата с елементите докато редактирате актив описващ значението на полето.',
     'about_custom_fields_title' => 'Отностно Персонализирани Полета',
@@ -51,7 +52,10 @@ return [
     'display_in_user_view_table' => 'Видим за потребител',
     'auto_add_to_fieldsets' => 'Автоматично добави това към всеки нов набор от полета',
     'add_to_preexisting_fieldsets' => 'Добави към всички съществуващи набор от полета',
-    'show_in_listview' => 'Показвай по подразбиране, като списък. Потребителите, ще имат възможност да го скрият/покажа през избор на колона.',
+    '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_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/bg/admin/hardware/form.php

@@ -49,6 +49,7 @@ return [
     'asset_location' => 'Обновяване на местоположение',
     'asset_location_update_default_current' => 'Актуализиране на местоположение по подразбиране и текущото местоположение',
     'asset_location_update_default' => 'Актуализиране на местоположението по подразбиране',
+    'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'Актива не може да бъде предоставен. Този активк не може да бъде изписан.',
     'asset_deployable' => 'Актива може да бъде предоставен. Този активк може да бъде изписан.',
     'processing_spinner' => 'Обработка...(Това може да отнеме време при големи файлове)',

resources/lang/bg/admin/hardware/general.php

@@ -8,7 +8,7 @@ return [
     'bulk_checkout'             => 'Изписване на активи',
     'bulk_checkin'              => 'Връщане на актив',
     'checkin'  					=> 'Връщане на актив',
-    'checkout'  				=> 'Проверка на активите',
+    'checkout'  				=> 'Изписване на актив',
     'clone'  					=> 'Копиране на актив',
     'deployable'  				=> 'Може да бъде предоставен',
     'deleted'  					=> 'Този актив беше изтрит.',

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

@@ -10,6 +10,7 @@ return [
     'create' => [
         'error'   		=> 'Активът не беше създаден. Моля опитайте отново.',
         'success' 		=> 'Активът създаден успешно.',
+        '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/bg/admin/licenses/message.php

@@ -9,6 +9,7 @@ return array(
     'assoc_users'	 => 'Този лиценз понастоящем е изписан на потребител и не може да бъде изтрит. Моля, първо впишете лиценза и тогава опитайте отново да го изтриете. ',
     'select_asset_or_person' => 'Трябва да изберете актив или потребител, но не и двете.',
     'not_found' => 'Лиценът не е намерен',
+    'seats_available' => ':seat_count seats available',
 
 
     'create' => array(
@@ -41,7 +42,8 @@ return array(
 
     'checkout' => array(
         'error'   => 'Възникна проблем при изписването на лиценза. Моля, опитайте отново.',
-        'success' => 'Лицензът е изписан'
+        'success' => 'Лицензът е изписан',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
     ),
 
     'checkin' => array(

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

@@ -15,6 +15,7 @@ return [
     'print_all_assigned'        => 'Печат на всички отдадени',
     'name'                      => 'Местоположение',
     'address'                   => 'Aдрес',
+    'address2'                   => 'Address Line 2',
     'zip'                       => 'Пощенски код',
     'locations'                 => 'Местоположения',
     'parent'                    => 'Присъединено към',

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

@@ -6,5 +6,12 @@ return [
     'send_reminder' => 'Изпрати напомняне',
     'reminder_sent' => 'Напомнянето изпратено',
     'acceptance_deleted' => 'Заявката за приемане е изтрита',
-    '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/bg/admin/users/message.php

@@ -8,6 +8,7 @@ return array(
     'user_exists'               => 'Потребителят вече съществува!',
     'user_not_found'            => 'Потребителят не съществува.',
     'user_login_required'       => 'Полето за вход е задължително',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Паролата е задължителна.',
     'insufficient_permissions'  => 'Нямате необходимите права.',
     'user_deleted_warning'      => 'Този потребител е изтрит. За да редактирате данните за него или да му зададете актив, трябва първо да възстановите потребителя.',
@@ -15,7 +16,7 @@ return array(
     'password_resets_sent'      => 'Избраните потребители, които са активирани и имат валиден е-майл адрес им беше изпратен линк за смяна на парола.',
     'password_reset_sent'       => 'Изпратена е връзка за въстановяване на паролата до :email!',
     'user_has_no_email'         => 'Този потребител няма е-майл адрес в неговия профил.',
-    'user_has_no_assets_assigned'   => 'Този потребител няма никакви заведени активи',
+    'log_record_not_found'        => 'A matching log record for this user could not be found.',
 
 
     'success' => array(

resources/lang/bg/general.php

@@ -72,6 +72,8 @@ return [
     'consumable'			=> 'Консуматив',
     'consumables'			=> 'Консумативи',
     'country'  				=> 'Държава',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
     'create'				=> 'Създаване на нов',
     'created'               => 'Създадени артикули',
     'created_asset'			=> 'създадени активи',
@@ -353,7 +355,8 @@ return [
     'synchronize'           => 'Синхронизиране',
     'sync_results'          => 'Резултат от синхронизирането',
     'license_serial'        => 'Сериен/Продуктов ключ',
-    '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'        => 'Това е вашето табло.',
     '60_percent_warning'    => '60% завършен (внимание)',
     'dashboard_empty'       => 'Изглежда, че все още не сте добавили нищо, така че нямаме нищо за показване. Започнете, като добавите някои активи, аксесоари, консумативи или лицензи!',
@@ -368,7 +371,7 @@ return [
     'consumables_count'     => 'Брой Консумативи',
     'components_count'      => 'Брой Компоненти',
     'licenses_count'        => 'Брой Лицензи',
-    'notification_error'    => 'Грешка:',
+    'notification_error'    => 'Error',
     'notification_error_hint' => 'Моля проверете формата за грешки',
     'notification_bulk_error_hint' => 'Следните полета имат грешки и не са редактирани:',
     'notification_success'  => 'Успешно',
@@ -485,7 +488,7 @@ return [
     ],
     'percent_complete' => '% завърешен',
     'uploading' => 'Качване... ',
-    'upload_error' => 'Грешка при качване. Проверете да няма празни редове в края.',
+    '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/bg/help.php

@@ -31,4 +31,5 @@ return [
 
     'depreciations' => 'Може да нагласите амортизация базирана на линеен метод.',
     
+    'empty_file'    => 'The importer detects that this file is empty.'
 ];

resources/lang/bg/passwords.php

@@ -5,4 +5,5 @@ return [
     'user'			=> 'Ако има такъв потребител с валиден е-майл адрес в нашата система, ще получи е-майл за възстановяване на паролата.',
     'token'         => 'Заявката за ресет на парола е невалидна, изтекла или не съвпада за потребителското име.',
     'reset'         => 'Вашата парола беше ресетната!',
+    'password_change'  => 'Your password has been updated!',
 ];

resources/lang/bg/validation.php

@@ -90,11 +90,14 @@ return [
     ],
     'string'               => 'Атрибутът: трябва да е низ.',
     'timezone'             => 'Атрибутът: трябва да е валидна зона.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
     'unique'               => ':attribute вече е вписан.',
     'uploaded'             => 'Атрибутът: не успя да качи.',
     'url'                  => 'Форматът на :attribute е невалиден.',
     'unique_undeleted'     => ':attribute трябва да бъде уникален.',
     'non_circular'         => ':attribute не трябва да създава препрадка към себе си.',
+    'not_array'            => 'The :attribute field cannot be an array.',
+    'unique_serial'        => 'The :attribute must be unique.',
     'disallow_same_pwd_as_user_fields' => 'Паролата не може да бъде същата, като потребителското име.',
     'letters'              => 'Паролата трябва да съдържа поне една буква.',
     'numbers'              => 'Паролата трябва да съдържа поне една цифра.',

resources/lang/ca/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/ca/admin/custom_fields/general.php

@@ -34,7 +34,8 @@ return [
     '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 @@ return [
     '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/ca/admin/hardware/form.php

@@ -49,6 +49,7 @@ return [
     '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/ca/admin/hardware/message.php

@@ -11,6 +11,7 @@ return [
     '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/ca/admin/licenses/message.php

@@ -9,6 +9,7 @@ return array(
     '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 @@ return array(
 
     '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/ca/admin/locations/table.php

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

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

@@ -6,5 +6,12 @@ return [
     '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/ca/admin/users/message.php

@@ -8,6 +8,7 @@ return array(
     '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.',
@@ -15,7 +16,7 @@ return array(
     '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/ca/general.php

@@ -72,6 +72,8 @@ return [
     'consumable'			=> 'Consumible',
     'consumables'			=> 'Consumibles',
     'country'  				=> 'País',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
     'create'				=> 'Crea nou',
     'created'               => 'Item Created',
     'created_asset'			=> 'recurs creat',
@@ -353,7 +355,8 @@ return [
     '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 @@ return [
     '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 @@ return [
     ],
     '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/ca/help.php

@@ -31,4 +31,5 @@ return [
 
     '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/ca/passwords.php

@@ -5,4 +5,5 @@ return [
     '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/ca/validation.php

@@ -90,11 +90,14 @@ return [
     ],
     '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/cs/admin/accessories/general.php

@@ -17,7 +17,7 @@ return array(
     'use_default_eula'					=> 'Použít <a href="#" data-toggle="modal" data-target="#eulaModal">primární výchozí EULA</a>.',
     'use_default_eula_disabled'			=> '<del>Použít výchozí EULA.</del>
 Žádná výchozí EULA nenastavena. Zadejte novou v nastevení.',
-    'clone'                             => 'Clone Accessory',
+    'clone'                             => 'Klonovat příslušenství',
     'delete_disabled'                   => 'Toto příslušenství ještě nelze odstranit, protože některé jeho položky jsou stále vydány.',
 
 );

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

@@ -3,6 +3,7 @@
 return array(
 
     'does_not_exist' => 'Příslušenství [:id] neexistuje.',
+    'not_found' => 'That accessory was not found.',
     'assoc_users'	 => 'Tato kategorie má nyní :count položek k předání uživatelům. Zkontrolujte převzetí příslušenství a zkuste to znovu. ',
 
     'create' => array(
@@ -24,7 +25,7 @@ return array(
      'checkout' => array(
         'error'   		=> 'Příslušenství nebylo převzato, zkuste to znovu',
         'success' 		=> 'Příslušenství úspěšně předáno.',
-        'unavailable'   => 'Accessory is not available for checkout. Check quantity available',
+        'unavailable'   => 'Příslušenství nelze vydat. Zkontrolujte skladové zásoby.',
         'user_does_not_exist' => 'Neplatný uživatel. Zkuste to znovu.'
     ),
 

resources/lang/cs/admin/companies/message.php

@@ -2,7 +2,7 @@
 
 return [
     'does_not_exist' => 'Společnost nebyla založena.',
-    'deleted'        => 'Deleted company',
+    'deleted'        => 'Odstraněné společnosti',
     'assoc_users'    => 'Tato společnost je právě přiřazena alespoň k jednomu modelu majetku a nemůže tak být odstraněna. Odeberte její vazbu z patřičných modelů a akci opakujte. ',
     'create' => [
         'error'   => 'Společnost nebyla založena, zkuste to znovu.',

resources/lang/cs/admin/components/message.php

@@ -24,7 +24,7 @@ return array(
         'error'   		=> 'Díl se nepodařilo předat, zkuste to prosím znovu',
         'success' 		=> 'Díl byl v pořádku předán.',
         'user_does_not_exist' => 'Neplatný uživatel. Zkuste to prosím znovu.',
-        'unavailable'      => 'Not enough components remaining: :remaining remaining, :requested requested ',
+        'unavailable'      => 'Nedostatek součástí: :remaining zbývají, :requested vyžádaných.',
     ),
 
     'checkin' => array(

resources/lang/cs/admin/consumables/message.php

@@ -24,7 +24,7 @@ return array(
         'error'   		=> 'Spotřební materiál se nepodařilo přidělit, pokuste se o to znovu',
         'success' 		=> 'Spotřební materiál byl v pořádku přidělen.',
         'user_does_not_exist' => 'Tento uživatel není platný, zkuste to prosím jinak.',
-         'unavailable'      => 'There are not enough consumables for this checkout. Please check the quantity left. ',
+         'unavailable'      => 'Nedostatek spotřebního materiálu k výdeji. Zkontrolujte skladové zásoby.',
     ),
 
     'checkin' => array(

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

@@ -34,7 +34,8 @@ return [
     'create_field'            => 'Nové vlastní pole',
     'create_field_title' => 'Vytvořít vlastní fieldset',
     'value_encrypted'      	        => 'Hodnota tohoto pole je zašifrována v databázi. Pouze administrátoři budou moci zobrazit dešifrovanou hodnotu',
-    'show_in_email'     => 'Zahrnout hodnotu této kolonky do e-mailu o vyskladnění pro uživatele? Šifrované kolonky nemohou být součástí e-mailů.',
+    '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' => 'Text nápovědy',
     'help_text_description' => 'Toto je volitelný text, který se zobrazí pod formulářovými prvky při úpravách aktiva pro poskytnutí kontextu v poli.',
     'about_custom_fields_title' => 'O vlastních polích',
@@ -49,9 +50,12 @@ return [
     'unique' => 'Unikátní',
     'display_in_user_view' => 'Povolit uživateli vyhledat tyto hodnoty na stránce Zobrazit přiřazené položky',
     'display_in_user_view_table' => 'Viditelné pro uživatele',
-    'auto_add_to_fieldsets' => 'Automatically add this to every new fieldset',
+    'auto_add_to_fieldsets' => 'Automaticky přidat do každé nové sady polí',
-    'add_to_preexisting_fieldsets' => 'Add to any existing fieldsets',
+    'add_to_preexisting_fieldsets' => 'Přidat do všech stávajících sad polí',
-    '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_listview_short' => 'Zobrazovat v seznamech',
+    '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/cs/admin/hardware/form.php

@@ -49,6 +49,7 @@ return [
     'asset_location' => 'Upravit umístění',
     'asset_location_update_default_current' => 'Aktualizovat výchozí umístění A aktuální umístění',
     'asset_location_update_default' => 'Aktualizovat pouze výchozí umístění',
+    'asset_location_update_actual' => 'Update only actual location',
     'asset_not_deployable' => 'Tento majetek nelze vyskladnit.',
     'asset_deployable' => 'Tento majetek lze vyskladnit.',
     'processing_spinner' => 'Zpracovávání... (S velkými soubory to může chvíli trvat)',

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

@@ -11,6 +11,7 @@ return [
     'create' => [
         'error'   		=> 'Majetek se nepodařilo vytvořit, zkuste to prosím znovu.',
         'success' 		=> 'Majetek byl v pořádku vytvořen.',
+        '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/cs/admin/licenses/message.php

@@ -9,6 +9,7 @@ return array(
     'assoc_users'	 => 'Licence je předána svému uživateli a nelze ji odstranit. Před odstraněním ji nejprve převezměte. ',
     'select_asset_or_person' => 'Musíte vybrat aktivum nebo uživatele, ale ne obojí.',
     'not_found' => 'Licence nenalezena',
+    'seats_available' => ':seat_count seats available',
 
 
     'create' => array(
@@ -41,7 +42,8 @@ return array(
 
     'checkout' => array(
         'error'   => 'Vyskytl se problém při výdeji licence. Zkuste to znovu prosím.',
-        'success' => 'Licence byla úspěšně vydána'
+        'success' => 'Licence byla úspěšně vydána',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
     ),
 
     'checkin' => array(

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

@@ -15,6 +15,7 @@ return [
     'print_all_assigned'        => 'Vytisknout všechny přiřazené',
     'name'                      => 'Název umístění',
     'address'                   => 'Adresa',
+    'address2'                   => 'Address Line 2',
     'zip'                       => 'PSČ',
     'locations'                 => 'Umístění',
     'parent'                    => 'Nadřazené',

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

@@ -6,5 +6,12 @@ return [
     'send_reminder' => 'Poslat připomínku',
     'reminder_sent' => 'Připomínka odeslána',
     'acceptance_deleted' => 'Žádost o přijetí byla smazána',
-    'acceptance_request' => 'Žádost o přijetí'
+    'acceptance_request' => 'Žádost o přijetí',
+    'custom_export' => [
+        'user_address' => 'User Address',
+        'user_city' => 'User City',
+        'user_state' => 'User State',
+        'user_country' => 'User Country',
+        'user_zip' => 'User Zip'
+    ]
 ];

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

@@ -8,6 +8,7 @@ return array(
     'user_exists'               => 'Uživatel již existuje!',
     'user_not_found'            => 'Uživatel neexistuje.',
     'user_login_required'       => 'Přihlašovací pole je povinné',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Je vyžadováno heslo.',
     'insufficient_permissions'  => 'Nedostatečná oprávnění.',
     'user_deleted_warning'      => 'Tento uživatel byl smazán. Budete muset uživatele obnovit, aby jste ho mohli upravil nebo přidělil nové majetky.',
@@ -15,7 +16,7 @@ return array(
     'password_resets_sent'      => 'Vybraným uživatelům, kteří jsou aktivováni a mají platné e-mailové adresy, byl zaslán odkaz pro obnovení hesla.',
     'password_reset_sent'       => 'Odkaz pro obnovení hesla byl odeslán na :email!',
     'user_has_no_email'         => 'Tento uživatel nemá e-mailovou adresu ve svém profilu.',
-    'user_has_no_assets_assigned'   => 'Tento uživatel nemá přiřazené žádné položky',
+    'log_record_not_found'        => 'Pro tohoto uživatele se nepodařilo nalézt odpovídající záznam z logu.',
 
 
     'success' => array(

resources/lang/cs/general.php

@@ -72,6 +72,8 @@ return [
     'consumable'			=> 'Spotřební materiál',
     'consumables'			=> 'Spotřební materiál',
     'country'  				=> 'Země',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
     'create'				=> 'Vytvořit nové',
     'created'               => 'Položka vytvořena',
     'created_asset'			=> 'vytvořit majetek',
@@ -353,7 +355,8 @@ return [
     'synchronize'           => 'Synchronizovat',
     'sync_results'          => 'Výsledky synchronizace',
     'license_serial'        => 'Sériový/produktový klíč',
-    'invalid_category'      => 'Neplatná kategorie',
+    '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'        => 'Toto je vaše hlavní stránka.',
     '60_percent_warning'    => '60% Dokončeno (upozornění)',
     'dashboard_empty'       => 'Zdá se, že jste ještě nic nepřidali, takže nemáme nic úžasného co bychom vám ukázali. Začněte přidáním něčeho!',
@@ -368,7 +371,7 @@ return [
     'consumables_count'     => 'Počet spotřebních materiálů',
     'components_count'      => 'Počet komponentů',
     'licenses_count'        => 'Počet licencí',
-    'notification_error'    => 'Chyba:',
+    'notification_error'    => 'Error',
     'notification_error_hint' => 'Pro chyby zkontrolujte formulář níže',
     'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
     'notification_success'  => 'Success',
@@ -485,7 +488,7 @@ return [
     ],
     '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/cs/help.php

@@ -31,4 +31,5 @@ return [
 
     'depreciations' => 'Můžete nastavit amortizaci majetku pro jeho rovnoměrné odepisování.',
     
+    'empty_file'    => 'The importer detects that this file is empty.'
 ];

resources/lang/cs/passwords.php

@@ -5,4 +5,5 @@ return [
     'user'			=> 'Pokud v našem systému existuje uživatel s touto emailovou adresou, byl odeslán e-mail pro obnovení hesla.',
     'token'         => 'Tento token pro obnovení hesla je neplatný, vypršel, nebo se neshoduje s zadaným uživatelským jménem.',
     'reset'         => 'Heslo úspěšně změněno!',
+    'password_change'  => 'Your password has been updated!',
 ];

resources/lang/cs/validation.php

@@ -90,11 +90,14 @@ return [
     ],
     'string'               => 'Atribut: musí být řetězec.',
     'timezone'             => 'Atribut: musí být platnou zónou.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
     'unique'               => ':attribute byl již vybrán.',
     'uploaded'             => 'Atribut: se nepodařilo nahrát.',
     'url'                  => 'Formát :attribute je neplatný.',
     'unique_undeleted'     => 'Je třeba, aby se :attribute neopakoval.',
     'non_circular'         => ':attribute nesmí vytvořit kruhový odkaz.',
+    'not_array'            => 'The :attribute field cannot be an array.',
+    'unique_serial'        => 'The :attribute must be unique.',
     'disallow_same_pwd_as_user_fields' => 'Heslo nemůže být stejné jako uživatelské jméno.',
     'letters'              => 'Heslo musí obsahovat nejméně jedno písmeno.',
     'numbers'              => 'Heslo musí obsahovat alespoň jednu číslici.',

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

@@ -3,6 +3,7 @@
 return array(
 
     'does_not_exist' => 'Nid yw\'r ategolyn [:id] yn bodoli.',
+    'not_found' => 'That accessory was not found.',
     'assoc_users'	 => 'Mae\'r ategolyn yma hefo :count eitem wedi nodi allan i defnyddwyr. Nodwch yr ategolion yn ol i fewn ac yna ceisiwch eto. ',
 
     'create' => array(

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

@@ -34,7 +34,8 @@ return [
     'create_field'            => 'Maes Addasedig newydd',
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Mae gwerth y maes hwn wedi\'i amgryptio yn y gronfa ddata. Dim ond defnyddwyr gweinyddol fydd yn gallu gweld y gwerth wedi\'i ddadgryptio',
-    'show_in_email'     => 'Cynnwys gwerth y maes hwn mewn e-byst talu a anfonir at y defnyddiwr? Ni ellir cynnwys meysydd wedi\'u hamgryptio mewn e-byst.',
+    '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 @@ return [
     '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/cy/admin/hardware/form.php

@@ -49,6 +49,7 @@ return [
     '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/cy/admin/hardware/message.php

@@ -11,6 +11,7 @@ return [
     'create' => [
         'error'   		=> 'Ni crewyd yr ased, ceisiwch eto o. g. y. dd. :(',
         'success' 		=> 'Ased wedi creu yn llwyddiannus. :)',
+        '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/cy/admin/licenses/message.php

@@ -9,6 +9,7 @@ return array(
     'assoc_users'	 => 'Ar hyn o bryd mae\'r trwydded yma allan gan ddefnyddiwr ac ni ellir ei ddileu. Cofnodwch yr trwyddedyn ol i fewn yn gyntaf, ac yna ceisiwch ei ddileu eto. ',
     'select_asset_or_person' => 'Rhaid i chi ddewis ased neu defnyddiwr ond nid y ddau.',
     'not_found' => 'License not found',
+    'seats_available' => ':seat_count seats available',
 
 
     'create' => array(
@@ -41,7 +42,8 @@ return array(
 
     'checkout' => array(
         'error'   => 'Nid oedd yn bosib nodi\'r trwydded allan. Ceisiwch eto o. g. y. dd.',
-        'success' => 'Trwydded wedi nodi allan yn llwyddiannus'
+        'success' => 'Trwydded wedi nodi allan yn llwyddiannus',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
     ),
 
     'checkin' => array(

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

@@ -15,6 +15,7 @@ return [
     'print_all_assigned'        => 'Print All Assigned',
     'name'                      => 'Enw Lleoliad',
     'address'                   => 'Cyfeiriad',
+    'address2'                   => 'Address Line 2',
     'zip'                       => 'Côd Post',
     'locations'                 => 'Lleoliadau',
     'parent'                    => 'Rhiant',

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

@@ -6,5 +6,12 @@ return [
     '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/cy/admin/users/message.php

@@ -8,6 +8,7 @@ return array(
     'user_exists'               => 'Defnyddiwr yn bodoli yn barod!',
     'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Mae angen llenwi\'r maes login',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Rhaid gosod cyfrinair.',
     'insufficient_permissions'  => 'Diffyg Hawliau.',
     'user_deleted_warning'      => 'Defnyddiwr wedi\'i dileu. Rhaid adfer y defnyddiwr I newid eu manylion neu clustnodi ased iddynt.',
@@ -15,7 +16,7 @@ return array(
     '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/cy/general.php

@@ -72,6 +72,8 @@ return [
     'consumable'			=> 'Nwyddau traul',
     'consumables'			=> 'Nwyddau traul',
     'country'  				=> 'Gwlad',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
     'create'				=> 'Creu newydd',
     'created'               => 'Eitem wedi\'i Greu',
     'created_asset'			=> 'ased wedi creu',
@@ -353,7 +355,8 @@ return [
     '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 @@ return [
     '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 @@ return [
     ],
     '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/cy/help.php

@@ -31,4 +31,5 @@ return [
 
     '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/cy/passwords.php

@@ -5,4 +5,5 @@ return [
     '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'         => 'Mae eich cyfrinair wedi cael ei ailosod!',
+    'password_change'  => 'Your password has been updated!',
 ];

resources/lang/cy/validation.php

@@ -90,11 +90,14 @@ return [
     ],
     'string'               => 'Rhaid i\'r :attribute bod yn string.',
     'timezone'             => 'Rhaid i\'r :attribute bod yn barth dilys.',
+    'two_column_unique_undeleted' => 'The :attribute must be unique across :table1 and :table2. ',
     'unique'               => 'Mae\'r :attribute wedi cymeryd yn barod.',
     'uploaded'             => 'Mae\'r :attribute wedi fethu uwchlwytho.',
     'url'                  => 'Mae fformat :attribute yn annilys.',
     'unique_undeleted'     => 'Rhaid i\'r :attribute bod yn unigryw.',
     '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/da/admin/accessories/message.php

@@ -3,6 +3,7 @@
 return array(
 
     'does_not_exist' => 'Tilbehøret [:id] findes ikke.',
+    'not_found' => 'That accessory was not found.',
     'assoc_users'	 => 'Dette tilbehør har pt. :count emner tjekket ud til brugere. Tjek tilbehør ind og prøv igen.',
 
     'create' => array(

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

@@ -34,7 +34,8 @@ return [
     'create_field'            => 'Nyt Brugerdefinerede Felt',
     'create_field_title' => 'Create a new custom field',
     'value_encrypted'      	        => 'Værdien af dette felt er krypteret i databasen. Kun admins vil være i stand til at se den krypteret værdi',
-    'show_in_email'     => 'Inkludér værdien af ​​dette felt i tjekud-e-mail til brugeren? Krypterede felter kan ikke medtages i e-mails.',
+    '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 @@ return [
     '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/da/admin/hardware/form.php

@@ -49,6 +49,7 @@ return [
     '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/da/admin/hardware/message.php

@@ -10,6 +10,7 @@ return [
     'create' => [
         'error'   		=> 'Akten blev ikke oprettet, prøv igen. :(',
         'success' 		=> 'Aktivet blev oprettet med succes. :)',
+        '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/da/admin/licenses/message.php

@@ -9,6 +9,7 @@ return array(
     'assoc_users'	 => 'Denne licens er i øjeblikket tjekket ud til en bruger og kan ikke slettes. Kontroller venligst licensen først, og prøv derefter at slette igen.',
     'select_asset_or_person' => 'Du skal vælge et aktiv eller en bruger, men ikke begge.',
     'not_found' => 'Licens blev ikke fundet',
+    'seats_available' => ':seat_count seats available',
 
 
     'create' => array(
@@ -41,7 +42,8 @@ return array(
 
     'checkout' => array(
         'error'   => 'Der var et problem med at tjekke licensen. Prøv igen.',
-        'success' => 'Licensen blev tjekket ud med succes'
+        'success' => 'Licensen blev tjekket ud med succes',
+        'not_enough_seats' => 'Not enough license seats available for checkout',
     ),
 
     'checkin' => array(

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

@@ -15,6 +15,7 @@ return [
     'print_all_assigned'        => 'Udskriv alle tildelte',
     'name'                      => 'Navn på sted',
     'address'                   => 'Adresse',
+    'address2'                   => 'Address Line 2',
     'zip'                       => 'Postnummer',
     'locations'                 => 'Placeringer',
     'parent'                    => 'Forældre',

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

@@ -6,5 +6,12 @@ return [
     'send_reminder' => 'Send påmindelse',
     'reminder_sent' => 'Påmindelse sendt',
     'acceptance_deleted' => 'Accept-anmodning slettet',
-    'acceptance_request' => 'Anmodning om accept'
+    'acceptance_request' => 'Anmodning om accept',
+    'custom_export' => [
+        'user_address' => 'User Address',
+        'user_city' => 'User City',
+        'user_state' => 'User State',
+        'user_country' => 'User Country',
+        'user_zip' => 'User Zip'
+    ]
 ];

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

@@ -8,6 +8,7 @@ return array(
     'user_exists'               => 'Bruger eksistere allerede!',
     'user_not_found'            => 'User does not exist.',
     'user_login_required'       => 'Login-feltet er påkrævet',
+    'user_has_no_assets_assigned' => 'No assets currently assigned to user.',
     'user_password_required'    => 'Adgangskoden er påkrævet.',
     'insufficient_permissions'  => 'Utilstrækkelige tilladelser.',
     'user_deleted_warning'      => 'Denne bruger er blevet slettet. Du skal gendanne denne bruger for at redigere dem eller tildele dem nye aktiver.',
@@ -15,7 +16,7 @@ return array(
     'password_resets_sent'      => 'De valgte brugere, der er aktiveret og har en gyldig e-mail-adresser, har fået tilsendt et link til nulstilling af adgangskode.',
     'password_reset_sent'       => 'Et link til nulstilling af adgangskode er blevet sendt til :email!',
     'user_has_no_email'         => 'Denne bruger har ikke en email-adresse i deres profil.',
-    'user_has_no_assets_assigned'   => 'Denne bruger er ikke tildelt nogen aktiver',
+    'log_record_not_found'        => 'A matching log record for this user could not be found.',
 
 
     'success' => array(

resources/lang/da/general.php

@@ -72,6 +72,8 @@ return [
     'consumable'			=> 'forbrugsmateriale',
     'consumables'			=> 'Forbrugsstoffer',
     'country'  				=> 'Land',
+    'could_not_restore'     => 'Error restoring :item_type: :error',
+    'not_deleted'           => 'The :item_type is not deleted so it cannot be restored',
     'create'				=> 'Opret ny',
     'created'               => 'Elementet er oprettet',
     'created_asset'			=> 'skabte aktiver',
@@ -353,7 +355,8 @@ return [
     'synchronize'           => 'Synkronisér',
     'sync_results'          => 'Synkroniseringresultater',
     'license_serial'        => 'Serienummer/produktnøgle',
-    'invalid_category'      => 'Ugyldig kategori',
+    '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'        => 'Dette er din oversigt. Der er mange som den, men denne er din.',
     '60_percent_warning'    => '60% gennemført (advarsel)',
     'dashboard_empty'       => 'Det ser ud til, at du ikke har tilføjet noget endnu, så vi har ikke noget fedt at vise. Kom i gang ved at tilføje nogle aktiver, tilbehør, forbrugsvarer eller licenser nu!',
@@ -368,7 +371,7 @@ return [
     'consumables_count'     => 'Antal forbrugsvarer',
     'components_count'      => 'Antal komponenter',
     'licenses_count'        => 'Antal licenser',
-    'notification_error'    => 'Fejl:',
+    'notification_error'    => 'Error',
     'notification_error_hint' => 'Tjek venligst nedenstående formular for fejl',
     'notification_bulk_error_hint' => 'The following fields had validation errors and were not edited:',
     'notification_success'  => 'Success',
@@ -485,7 +488,7 @@ return [
     ],
     '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/da/help.php

@@ -31,4 +31,5 @@ return [
 
     'depreciations' => 'Du kan sætte aktivafskrivninger til at afskrive aktiver som lineære afskrivninger.',
     
+    'empty_file'    => 'The importer detects that this file is empty.'
 ];

resources/lang/da/passwords.php

@@ -5,4 +5,5 @@ return [
     'user'			=> 'Hvis brugeren findes med en gyldig email-adresse i vores system, er der blevet sendt en e-mail til gendannelse af adgangskoden.',
     'token'         => 'Denne nøgle til nulstilling af adgangskode er ugyldig, udløbet eller stemmer ikke overens med det angivne brugernavn.',
     'reset'         => 'Din adgangskode er blevet nulstillet!',
+    'password_change'  => 'Your password has been updated!',
 ];