+ Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user\'s name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. +
+ +Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.
+ +Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.
+ ', + 'csv_import_match_f-l' => 'Try to match users by firstname.lastname (jane.smith) format', + 'csv_import_match_initial_last' => 'Try to match users by first initial last name (jsmith) format', + 'csv_import_match_first' => 'Try to match users by first name (jane) format', + 'csv_import_match_email' => 'Try to match users by email as username', + 'csv_import_match_username' => 'Try to match users by username', + 'error_messages' => 'Error messages:', + 'success_messages' => 'Success messages:', + 'alert_details' => 'Please see below for details.', + 'custom_export' => 'Custom Export' ]; diff --git a/resources/lang/en/admin/hardware/table.php b/resources/lang/en/admin/hardware/table.php index 828990b6e4..6166ba8045 100644 --- a/resources/lang/en/admin/hardware/table.php +++ b/resources/lang/en/admin/hardware/table.php @@ -19,8 +19,12 @@ return [ 'serial' => 'Serial', 'status' => 'Status', 'title' => 'Asset ', - 'image' => 'Device Image', + 'image' => 'Device Image', 'days_without_acceptance' => 'Days Without Acceptance', 'monthly_depreciation' => 'Monthly Depreciation', - + 'assigned_to' => 'Assigned To', + 'requesting_user' => 'Requesting User', + 'requested_date' => 'Requested Date', + 'changed' => 'Changed', + 'icon' => 'Icon', ]; diff --git a/resources/lang/en/button.php b/resources/lang/en/button.php index 1be2a483a3..b39d0c0545 100644 --- a/resources/lang/en/button.php +++ b/resources/lang/en/button.php @@ -17,4 +17,6 @@ return [ 'generate_labels' => '{1} Generate Label|[2,*] Generate Labels', 'send_password_link' => 'Send Password Reset Link', 'go' => 'Go', + 'bulk_actions' => 'Bulk Actions', + 'add_maintenance' => 'Add Maintenance', ]; diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index d3aff38869..d5d24afafa 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -88,6 +88,7 @@ 'details' => 'Details', 'download' => 'Download', 'download_all' => 'Download All', + 'edit' => 'Edit', 'editprofile' => 'Edit Your Profile', 'eol' => 'EOL', 'email_domain' => 'Email Domain', @@ -110,6 +111,7 @@ 'file_type' => 'File Type', 'file_uploads' => 'File Uploads', 'generate' => 'Generate', + 'generate_labels' => 'Generate Labels', 'github_markdown' => 'This field accepts Github flavored markdown.', 'groups' => 'Groups', 'gravatar_email' => 'Gravatar Email Address', @@ -213,6 +215,7 @@ 'sign_in' => 'Sign in', 'signature' => 'Signature', 'skin' => 'Skin', + 'slack_msg_note' => 'A slack message will be sent', 'slack_test_msg' => 'Oh hai! Looks like your Slack integration with Snipe-IT is working!', 'some_features_disabled' => 'DEMO MODE: Some features are disabled for this installation.', 'site_name' => 'Site Name', @@ -265,4 +268,5 @@ 'view_all' => 'view all', 'hide_deleted' => 'Hide Deleted', 'email' => 'Email', + 'do_not_change' => 'Do Not Change', ]; diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php index ed395ec128..3ab2fbfc96 100644 --- a/resources/views/hardware/audit.blade.php +++ b/resources/views/hardware/audit.blade.php @@ -57,7 +57,7 @@
- You have an error in your CSV file:
+ {{ trans('admin/hardware/general.csv_error') }}
{{ Session::get('message') }}
- Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user's name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings. -
- -Fields included in the CSV must match the headers: Asset Tag, Name, Checkout Date, Checkin Date. Any additional fields will be ignored.
- -Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.
+ {!! trans('admin/hardware/general.import_text') !!}