vagrantup 1.0.7 → 1.1.0

data/templates/config/validation_failed.erb

@@ -1,6 +1,6 @@
-<% errors.each do |key, container| -%>
-<%= key %>:
-<% container.errors.each do |error| -%>
+<% errors.each do |section, list| -%>
+<%= section %>:
+<% list.each do |error| -%>
 * <%= error %>
 <% end -%>
 

data/templates/guests/arch/network_dhcp.erb

@@ -1,7 +1,4 @@
-#VAGRANT-BEGIN
-# The contents below are automatically generated by Vagrant. Do not modify.
-interface=eth<%= options[:interface] %>
-address=
-netmask=
-gateway=
-#VAGRANT-END
+CONNECTION='ethernet'
+DESCRIPTION='A basic dhcp ethernet connection'
+INTERFACE='eth<%= options[:interface] %>'
+IP='dhcp'

data/templates/guests/arch/network_static.erb

@@ -1,7 +1,6 @@
-#VAGRANT-BEGIN
-# The contents below are automatically generated by Vagrant. Do not modify.
-interface=eth<%= options[:interface] %>
-address=<%= options[:ip]%>
-netmask=<%= options[:netmask] %>
-gateway=
-#VAGRANT-END
+CONNECTION='ethernet'
+DESCRIPTION='A basic static ethernet connection'
+INTERFACE='eth<%= options[:interface] %>'
+IP='static'
+ADDR='<%= options[:ip]%>'
+NETMASK='<%= options[:netmask] %>'

data/templates/guests/debian/network_dhcp.erb

@@ -2,5 +2,10 @@
 # The contents below are automatically generated by Vagrant. Do not modify.
 auto eth<%= options[:interface] %>
 iface eth<%= options[:interface] %> inet dhcp
+<% if !options[:use_dhcp_assigned_default_route] %>
     post-up route del default dev $IFACE
+<% else %>
+    # needed as some newer distribution do not properly load routes, ubuntu 12.04
+    post-up dhclient $IFACE
+<% end %>
 #VAGRANT-END

data/templates/locales/en.yml

@@ -1,6 +1,15 @@
 en:
   vagrant:
     general:
+      config_upgrade_messages: |-
+        There were warnings and/or errors while loading your Vagrantfile.
+        Your Vagrantfile was written for an earlier version of Vagrant,
+        and while Vagrant does the best it can to remain backwards
+        compatible, there are some cases where things have changed
+        significantly enough to warrant a message. These messages are
+        shown below.
+
+        %{output}
       moving_home_dir: "Moving old Vagrant home directory to new location: %{directory}"
       home_dir_migration_failed: |-
         Both an old and new Vagrant home directory exist. Only the new one will
@@ -9,13 +18,50 @@ en:
 
         Old: %{old}
         New: %{new}
+      not_in_installer: |-
+        You appear to be running Vagrant outside of the official installers.
+        Note that the installers are what ensure that Vagrant has all required
+        dependencies, and Vagrant assumes that these dependencies exist. By
+        running outside of the installer environment, Vagrant may not function
+        properly. To remove this warning, install Vagrant using one of the
+        official packages from vagrantup.com.
+      upgraded_v1_dotfile: |-
+        A Vagrant 1.0.x state file was found for this environment. Vagrant has
+        gone ahead and auto-upgraded this to the latest format. Everything
+        should continue working as normal. Beware, however, that older versions
+        of Vagrant may no longer be used with this environment.
+
+        However, in case anything went wrong, the old dotfile was backed up
+        to the location below. If everything is okay, it is safe to remove
+        this backup.
+
+        Backup: %{backup_path}
 
 #-------------------------------------------------------------------------------
 # Translations for exception classes
 #-------------------------------------------------------------------------------
     errors:
+      active_machine_with_different_provider: |-
+        An active machine was found with a different provider. Vagrant
+        currently allows each machine to be brought up with only a single
+        provider at a time. A future version will remove this limitation.
+        Until then, please destroy the existing machine to up with a new
+        provider.
+
+        Machine name: %{name}
+        Active provider: %{active_provider}
+        Requested provider: %{requested_provider}
       base_vm_not_found: The base VM with the name '%{name}' was not found.
       box_not_found: Box '%{name}' could not be found.
+      box_provider_doesnt_match: |-
+        The box you attempted to add doesn't match the provider you specified.
+
+        Provider expected: %{expected}
+        Provider of box: %{actual}
+      box_upgrade_required: |-
+        The box '%{name}' is still stored on disk in the Vagrant 1.0.x
+        format. This box must be upgraded in order to work properly with
+        this version of Vagrant.
       cli_invalid_options: |-
         An invalid option was specified. The help for this command
         is available below.
@@ -26,16 +72,22 @@ en:
         available below.
 
         %{help}
-      config_validation: |-
-        There was a problem with the configuration of Vagrant. The error message(s)
-        are printed below:
-
-        %{messages}
-      deprecation: |-
-        You are using a feature that has been removed in this version. Explanation:
-
-        %{message}
-        Note that this error message will not appear in the next version of Vagrant.
+      config_invalid: |-
+        There are errors in the configuration of this machine. Please fix
+        the following errors and try again:
+
+        %{errors}
+      config_upgrade_errors: |-
+        Because there were errors upgrading your Vagrantfiles, Vagrant
+        can no longer continue. Please fix the errors above and try again.
+      copy_private_key_failed: |-
+        Vagrant failed to copy the default insecure private key into your
+        home directory. This is usually caused by a permissions error.
+        Please make sure the permissions of the source is readable and
+        the destination is writable.
+
+        Source: %{source}
+        Destination: %{destination}
       destroy_requires_force: |-
         Destroy doesn't have a TTY to ask for confirmation. Please pass the
         `--force` flag to force a destroy, otherwise attach a TTY so that
@@ -46,21 +98,39 @@ en:
         this command in another directory. If you aren't in a home directory,
         then please rename ".vagrant" to something else, or configure Vagrant
         to use another filename by modifying `config.vagrant.dotfile_name`.
+      dotfile_upgrade_json_error: |-
+        A Vagrant 1.0.x local state file was found. Vagrant is able to upgrade
+        this to the latest format automatically, however various checks are
+        put in place to verify data isn't incorrectly deleted. In this case,
+        the old state file was not valid JSON. Vagrant 1.0.x would store state
+        as valid JSON, meaning that this file was probably tampered with or
+        manually edited. Vagrant's auto-upgrade process cannot continue in this
+        case.
+
+        In most cases, this can be resolve by simply removing the state file.
+        Note however though that if Vagrant was previously managing virtual
+        machines, they may be left in an "orphan" state. That is, if they are
+        running or exist, they'll have to manually be removed.
+
+        If you're unsure what to do, ask the Vagrant mailing list or contact
+        support.
+
+        State file path: %{state_file}
       environment_locked: |-
         An instance of Vagrant is already running. Only one instance of Vagrant
         may run at any given time to avoid problems with VirtualBox inconsistencies
         occurring. Please wait for the other instance of Vagrant to end and then
         try again.
       gem_command_in_bundler: |-
-        You cannot run the `vagrant gem` command while in a bundler environment.
-        Bundler messes around quite a bit with the RubyGem load paths and gems
-        installed via `vagrant gem` are excluded by Bundler.
-
-        Instead, please include your Vagrant plugins in your Gemfile itself.
+        You cannot run the `vagrant plugin` command while in a bundler environment.
+        This should generally never happen unless Vagrant is installed outside
+        of the official installers or another gem is wrongly attempting to
+        use Vagrant internals directly. Please properly install Vagrant to
+        fix this. If this error persists, please contact support.
       guest:
         invalid_class: |-
-          The specified guest class does not inherit from `Vagrant::Guest::Base`.
-          The specified guest class must inherit from this class.
+          The specified guest class does not inherit from a proper guest
+          component class. The guest class must inherit from this.
 
           The specified guest class was: %{guest}
         unknown_type: |-
@@ -74,33 +144,91 @@ en:
         directory that Vagrant uses must be both readable and writable.
 
         You specified: %{home_path}
-      incompatible_with_future_version: |-
-        It appears that you've ran a newer version of Vagrant on this
-        computer. Unfortunately, newer versions of Vagrant change internal
-        directory layouts that cause older versions to break. This version
-        of Vagrant cannot properly run.
-
-        If you'd like to start from a clean state, please remove the
-        Vagrant state directory: %{path}
-
-        Warning that this will remove all your boxes and potentially corrupt
-        existing Vagrant environments that were running based on the future
-        version.
       interrupted: |-
         Vagrant exited after cleanup due to external interrupt.
+      local_data_dir_not_accessible: |-
+        The directory Vagrant will use to store local environment-specific
+        state is not accessible. The directory specified as the local data
+        directory must be both readable and writable for the user that is
+        running Vagrant.
+
+        Local data directory: %{local_data_path}
+      machine_guest_not_ready: |-
+        Guest-specific operations were attempted on a machine that is not
+        ready for guest communication. This should not happen and a bug
+        should be reported.
+      machine_not_found: |-
+        The machine with the name '%{name}' was not found configured for
+        this Vagrant environment.
+      machine_state_invalid: |-
+        An internal error has occurred! The provider of the machine you're
+        trying to work with reported an invalid state. This is a bug with
+        the provider you're using, and not with Vagrant itself or with
+        any configuration you may have done. Please report this bug to
+        the proper location.
       multi_vm_required: |-
         A multi-vm environment is required for name specification to this command.
       multi_vm_target_required: |-
         This command requires a specific VM name to target in a multi-VM environment.
+      nfs_no_guest_ip: |-
+        No guest IP was given to the Vagrant core NFS helper. This is an
+        internal error that should be reported as a bug.
+      nfs_no_host_ip: |-
+        No host IP was given to the Vagrant core NFS helper. This is
+        an internal error that should be reported as a bug.
       no_env: |-
         A Vagrant environment is required to run this command. Run `vagrant init`
-        to set one up.
+        to set one up in this directory, or change to a directory with a
+        Vagrantfile and try again.
+      plugin_gem_error: |-
+        An error occurred within RubyGems, the underlying system used to
+        manage Vagrant plugins. The output of the errors are shown below:
+
+        %{output}
+      plugin_install_bad_entry_point: |-
+        Attempting to load the plugin '%{name}' failed, because
+        the entry point doesn't exist. The entry point attempted was
+        '%{entry_point}'. If this is not correct, please manually
+        specify an `--entry-point` when installing the plugin.
+      plugin_install_license_not_found: |-
+        The license file to install could not be found. Please verify
+        the path you gave is correct. The path to the license file given
+        was: '%{path}'
+      plugin_install_not_found: |-
+        The plugin '%{name}' could not be found in local or remote
+        repositories. Please check the name of the plugin and try again.
+      plugin_load_error: |-
+        The plugin "%{plugin}" could not be found. Please make sure that it is
+        properly installed via `vagrant plugin`. Note that plugins made for
+        Vagrant 1.0.x are not compatible with 1.1+ and this error will likely
+        continue to show when you use `plugin install` with a 1.0.x plugin.
+      plugin_load_failed: |-
+        Failed to load the "%{plugin}" plugin. View logs for more details.
+      plugin_load_failed_with_output: |-
+        Failed to load the "%{plugin}" plugin. The output from loading
+        the plugin is shown below. View the logs for complete details.
+
+        stdout: %{stdout}
+
+        stderr: %{stderr}
+      plugin_not_found: |-
+        The plugin '%{name}' could not be found. Please install this plugin
+        prior to attempting to do anything with it.
       port_collision_resume: |-
-        This VM cannot be resumed, because the forwarded ports would collide with
-        another running virtual machine. Normally, Vagrant will attempt to fix this
-        for you but VirtualBox only allows forwarded ports to change if the VM is
-        powered off. Therefore, please reload your VM or halt the other running
-        VMs to continue.
+        This VM cannot be resumed, because the forwarded ports would collide
+        with a running program (it could be another virtual machine). Normally,
+        Vagrant will attempt to fix this for you but VirtualBox only allows
+        forwarded ports to change if the VM is powered off. Therefore, please
+        reload your VM or stop the other program to continue.
+      provider_not_found: |-
+        The provider '%{provider}' could not be found, but was requested to
+        back the machine '%{machine}'. Please use a provider that exists.
+      scp_permission_denied: |-
+        Failed to upload a file to the guest VM via SCP due to a permissions
+        error. This is normally because the user running Vagrant doesn't have
+        read permission on the file. Please set proper permissions on the file:
+
+        %{path}
       scp_unavailable: |-
         SSH server on the guest doesn't support SCP. Please install the necessary
         software to enable SCP on your guest operating system.
@@ -129,6 +257,27 @@ en:
         If that doesn't work, destroy your VM and recreate it with a `vagrant destroy`
         followed by a `vagrant up`. If that doesn't work, contact a Vagrant
         maintainer (support channels listed on the website) for more assistance.
+      ssh_connection_reset: |-
+        SSH connection was reset! This usually happens when the machine is
+        taking too long to reboot. First, try reloading your machine with
+        `vagrant reload`, since a simple restart sometimes fixes things.
+        If that doesn't work, destroy your machine and recreate it with
+        a `vagrant destroy` followed by a `1vagrant up`. If that doesn't work,
+        contact support.
+      ssh_connection_timeout: |-
+        Vagrant timed out while attempting to connect via SSH. This usually
+        means that the VM booted, but there are issues with the SSH configuration
+        or network connectivity issues. Please try to `vagrant reload` or
+        `vagrant up` again.
+      ssh_disconnected: |-
+        The SSH connection was unexpectedly closed by the remote end. This
+        usually indicates that SSH within the guest machine was unable to
+        properly start up. Please boot the VM in GUI mode to check whether
+        it is booting properly.
+      ssh_host_down: |-
+        While attempting to connect with SSH, a "host is down" (EHOSTDOWN)
+        error was received. Please verify your SSH settings are correct
+        and try again.
       ssh_key_bad_permissions: |-
         The private key to connect to this box via SSH has invalid permissions
         set on it. The permissions of the private key should be set to 0600, otherwise SSH will
@@ -139,7 +288,18 @@ en:
       ssh_key_type_not_supported: |-
         The private key you're attempting to use with this Vagrant box uses
         an unsupported encryption type. The SSH library Vagrant uses does not support
-        this key type. Please use `ssh-rsa` or `ssh-dss` instead.
+        this key type. Please use `ssh-rsa` or `ssh-dss` instead. Note that
+        sometimes keys in your ssh-agent can interfere with this as well,
+        so verify the keys are valid there in addition to standard
+        file paths.
+      ssh_not_ready: |-
+        The provider for this Vagrant-managed machine is reporting that it
+        is not yet ready for SSH. Depending on your provider this can carry
+        different meanings. Make sure your machine is created and running and
+        try again. Additionally, check the output of `vagrant status` to verify
+        that the machine is in the state that you expect. If you continue to
+        get this error message, please view the documentation for the provider
+        you're using.
       ssh_port_not_detected: |-
         Vagrant couldn't determine the SSH port for your VM! Vagrant attempts to
         automatically find a forwarded port that matches your `config.ssh.guest_port`
@@ -153,9 +313,10 @@ en:
         guest port value, or specify an explicit SSH port with `config.ssh.port`.
       ssh_unavailable: "`ssh` binary could not be found. Is an SSH client installed?"
       ssh_unavailable_windows: |-
-        `vagrant ssh` isn't available on the Windows platform. You are still able
-        to SSH into the virtual machine if you get a Windows SSH client (such as
-        PuTTY). The authentication information is shown below:
+        `ssh` executable not found in any directories in the %PATH% variable. Is an
+        SSH client installed? Try installing Cygwin, MinGW or Git, all of which
+        contain an SSH client. Or use the PuTTY SSH client with the following
+        authentication information shown below:
 
         Host: %{host}
         Port: %{port}
@@ -166,9 +327,21 @@ en:
         a TTY. Most actions in Vagrant that require a TTY have configuration
         switches to disable this requirement. Please do that or run Vagrant
         with TTY.
+      unimplemented_provider_action: |-
+        Vagrant attempted to call the action '%{action}' on the provider
+        '%{provider}', but this provider doesn't support this action. This
+        is probably a bug in either the provider or the plugin calling this
+        action, and should be reported.
       vagrantfile_exists: |-
         `Vagrantfile` already exists in this directory. Remove it before
         running `vagrant init`.
+      vagrantfile_load_error: |-
+        There was an error loading a Vagrantfile. The file being loaded
+        and the error message are shown below. This is usually caused by
+        a syntax error.
+
+        Path: %{path}
+        Message: %{message}
       vagrantfile_syntax_error: |-
         There is a syntax error in the following Vagrantfile. The syntax error
         message is reproduced below for convenience:
@@ -179,8 +352,8 @@ en:
 
         %{command}
 
-        For more information on the failure, enable detailed logging with
-        VAGRANT_LOG.
+        For more information on the failure, enable detailed logging by setting
+        the environment variable VAGRANT_LOG to DEBUG.
       virtualbox_invalid_version: |-
         Vagrant has detected that you have a version of VirtualBox installed
         that is not supported. Please install one of the supported versions
@@ -191,6 +364,17 @@ en:
         VirtualBox is complaining that the kernel module is not loaded. Please
         run `VBoxManage --version` to see the error message which should contain
         instructions on how to fix this error.
+      virtualbox_install_incomplete: |-
+        VirtualBox is complaining that the installation is incomplete. Please
+        run `VBoxManage --version` to see the error message which should contain
+        instructions on how to fix this error.
+      virtualbox_no_room_for_high_level_network: |-
+        There is no available slots on the VirtualBox VM for the configured
+        high-level network interfaces. "private_network" and "public_network"
+        network configurations consume a single network adapter slot on the
+        VirtualBox VM. VirtualBox limits the number of slots to 8, and it
+        appears that every slot is in use. Please lower the number of used
+        network adapters.
       virtualbox_not_detected: |-
         Vagrant could not detect VirtualBox! Make sure VirtualBox is properly installed.
         Vagrant uses the `VBoxManage` binary that ships with VirtualBox, and requires
@@ -203,6 +387,10 @@ en:
         with VirtualBox that Vagrant can not cleanly recover from. Please open VirtualBox
         and clear out your inaccessible virtual machines or find a way to fix
         them.
+      vm_name_exists: |-
+        A VirtualBox machine with the name '%{name}' already exists.
+        Please use another name or delete the machine with the existing
+        name, and try again.
       vm_no_match: |-
         No virtual machines matched the regular expression given.
       vm_not_found: |-
@@ -216,21 +404,30 @@ en:
 #-------------------------------------------------------------------------------
     config:
       common:
-        error_empty: "`%{field}` must be filled in."
+        error_empty: "`%{field}` must be not be empty."
       chef:
         cookbooks_path_empty: "Must specify a cookbooks path for chef solo."
+        cookbooks_path_missing: |-
+          Cookbook path doesn't exist: %{path}
         run_list_empty: "Run list must not be empty."
         server_url_empty: "Chef server URL must be populated."
-        vagrant_as_json_key: |-
-          `vagrant` cannot be a JSON key, because it is used by Vagrant already.
         validation_key_path: "Validation key path must be valid path to your chef server validation key."
+      loader:
+        bad_v1_key: |-
+          Unknown configuration section '%{key}'. If this section was part of
+          a Vagrant 1.0.x plugin, note that 1.0.x plugins are incompatible with 1.1+.
+      root:
+        bad_key: |-
+          Unknown configuration section '%{key}'.
       ssh:
         private_key_missing: "`private_key_path` file must exist: %{path}"
       vm:
         base_mac_invalid: "Base MAC address for eth0/NAT must be set. Contact box maintainer for more information."
-        boot_mode_invalid: "Boot mode must be one of: headless or gui"
         box_missing: "A box must be specified."
         box_not_found: "The box '%{name}' could not be found."
+        hostname_invalid_characters: |-
+          The hostname set for the VM should only contain letters, numbers,
+          and hyphens.
         network_invalid: |-
           The network type '%{type}' is not valid. Please use
           'hostonly' or 'bridged'.
@@ -241,11 +438,26 @@ en:
         network_ip_ends_one: |-
           The host only network IP '%{ip}' must not end in a 1, as this
           is reserved for the host machine.
-        shared_folder_hostpath_missing: "Shared folder host path for '%{name}' doesn't exist: %{path}"
+        nfs_not_supported: |-
+          It appears your machine doesn't support NFS, or there is not an
+          adapter to enable NFS on this machine for Vagrant. Please verify
+          that `nfsd` is installed on your machine, and try again. If you're
+          on Windows, NFS isn't supported. If the problem persists, please
+          contact Vagrant support.
+        nfs_requires_host: |-
+          Using NFS shared folders requires a host to be specified
+          using `config.vagrant.host`.
+        network_fp_requires_ports: |-
+          Forwarded port definitions require a "host" and "guest" value
+        shared_folder_hostpath_missing: |-
+          The host path of the shared folder is missing: %{path}
         shared_folder_nfs_owner_group: |-
-          Shared folder '%{name}': NFS does not support the owner/group settings.
+          Shared folder that have NFS enabled do no support owner/group
+          attributes. Host path: %{path}
         provisioner_not_found: "The provisioner '%{shortcut}' doesn't exist."
-        provisioner_invalid_class: "The provisioner '%{shortcut}' must inherit from `Vagrant::Provisioners::Base`."
+        provisioner_invalid_class: |-
+          The provisioner '%{shortcut}' must inherit from
+          `Vagrant::Plugin::V1::Provisioner`."
 
 #-------------------------------------------------------------------------------
 # Translations for commands. e.g. `vagrant x`
@@ -256,24 +468,32 @@ en:
         vm_not_running: "VM is not currently running. Please bring it up to run this command."
       box:
         no_installed_boxes: "There are no installed boxes! Use `vagrant box add` to add some."
+        removing: |-
+          Removing box '%{name}' with provider '%{provider}'...
       destroy:
-        confirmation: "Are you sure you want to destroy the '%{name}' VM? [Y/N] "
+        confirmation: "Are you sure you want to destroy the '%{name}' VM? [y/N] "
         will_not_destroy: |-
           The VM '%{name}' will not be destroyed, since the confirmation
           was declined.
-      gem:
-        help_preamble: |-
-          `vagrant gem` is used to install Vagrant plugins via the RubyGems
-          system. In fact, `vagrant gem` is just a frontend to the actual `gem`
-          interface, with the difference being that Vagrant sets up a custom
-          directory where gems are installed so that they are isolated from your
-          system gems.
       init:
         success: |-
           A `Vagrantfile` has been placed in this directory. You are now
           ready to `vagrant up` your first virtual environment! Please read
           the comments in the Vagrantfile as well as documentation on
           `vagrantup.com` for more information on using Vagrant.
+      plugin:
+        installed_license: |-
+          The license for '%{name}' was successfully installed!
+        installing_license: |-
+          Installing license for '%{name}'...
+        no_plugins: |-
+          No plugins installed.
+        installed: |-
+          Installed the plugin '%{name} (%{version})'!
+        installing: |-
+          Installing the '%{name}' plugin. This can take a few minutes...
+        uninstalling: |-
+          Uninstalling the '%{name}' plugin...
       status:
         aborted: |-
           The VM is in an aborted state. This means that it was abruptly
@@ -291,14 +511,16 @@ en:
           VirtualBox, moving to a new computer, etc. Please consult VirtualBox
           for how to handle this issue.
         output: |-
-          Current VM states:
+          Current machine states:
 
           %{states}
 
           %{message}
         not_created: |-
           The environment has not yet been created. Run `vagrant up` to
-          create the environment.
+          create the environment. If a machine is not created, only the
+          default provider will be shown. So if a provider is not listed,
+          then the machine is not created for that environment.
         paused: |-
           The VM is paused. This VM may have been paused via the VirtualBox
           GUI or the VBoxManage command line interface. To unpause, please
@@ -327,7 +549,8 @@ en:
           above with their current state. For more information about a specific
           VM, run `vagrant status NAME`.
       up:
-        vm_created: "VM already created. Booting if it's not already running..."
+        upping: |-
+          Bringing machine '%{name}' up with '%{provider}' provider...
       version:
         output: "Vagrant version %{version}"
 
@@ -365,7 +588,12 @@ en:
             Specific bridge '%{bridge}' not found. You may be asked to specify
             which network to bridge to.
         check_box:
-          not_found: Box %{name} was not found. Fetching box from specified URL...
+          not_found: |-
+            Box '%{name}' was not found. Fetching box from specified URL for
+            the provider '%{provider}'. Note that if the URL does not have
+            a box for this provider, you should interrupt Vagrant now and add
+            the box yourself. Otherwise Vagrant will attempt to download the
+            full box prior to discovering this error.
           not_specified: |-
             No base box was specified! A base box is required as a staring point
             for every vagrant virtual machine. Please specify one in your Vagrantfile
@@ -385,11 +613,11 @@ en:
             This is not an error message; everything may continue to work properly,
             in which case you may ignore this message.
           version_mismatch: |-
-            The guest additions on this VM do not match the install version of
-            VirtualBox! This may cause things such as forwarded ports, shared
-            folders, and more to not work properly. If any of those things fail on
-            this machine, please update the guest additions and repackage the
-            box.
+            The guest additions on this VM do not match the installed version of
+            VirtualBox! In most cases this is fine, but in rare cases it can
+            cause things such as shared folders to not work properly. If you see
+            shared folder errors, please update the guest additions within the
+            virtual machine and reload your VM.
 
             Guest Additions Version: %{guest_version}
             VirtualBox Version: %{virtualbox_version}
@@ -433,15 +661,18 @@ en:
             Forwarded port: %{guest_port} => %{host_port}
           collision_error: |-
             Vagrant cannot forward the specified ports on this VM, since they
-            would collide with another VirtualBox virtual machine's forwarded
-            ports! The forwarded port to %{host_port} is already in use on the host
-            machine.
+            would collide with some other application that is already listening
+            on these ports. The forwarded port to %{host_port} is already in use
+            on the host machine.
 
             To fix this, modify your current projects Vagrantfile to use another
             port. Example, where '1234' would be replaced by a unique host port:
 
-              config.vm.forward_port %{guest_port}, 1234
+              config.vm.network :forwarded_port, guest: %{guest_port}, host: 1234
 
+            Sometimes, Vagrant will attempt to auto-correct this for you. In this
+            case, Vagrant was unable to. This is usually because the guest machine
+            is in a state which doesn't allow modifying port forwarding.
           fixed_collision: |-
             Fixed port collision for %{guest_port} => %{host_port}. Now on port %{new_port}.
           forwarding: Forwarding ports...
@@ -461,8 +692,8 @@ en:
             Forcing shutdown of VM...
           graceful: |-
             Attempting graceful shutdown of VM...
-        host_name:
-          setting: "Setting host name..."
+        hostname:
+          setting: "Setting hostname..."
         import:
           importing: Importing base box '%{name}'...
           failure: |-
@@ -512,18 +743,6 @@ en:
             specified network manually.
           preparing: "Preparing host only network..."
         nfs:
-          host_required: |-
-            A host class is required for NFS shared folders. By default, these
-            are auto-detected, but can be overridden with `config.vagrant.host`.
-            There is currently no host class loaded.
-          no_host_network: |-
-            NFS shared folders requires that host only networking is enabled
-            with a static IP. Please enable host only network and assign a
-            static IP via `config.vm.network`.
-          not_supported: |-
-            The host class is reporting that NFS is not supported by this host,
-            or `nfsd` may not be installed. Please verify that `nfsd` is installed
-            on your machine, and retry.
           exporting: Exporting NFS shared folders...
           mounting: Mounting NFS shared folders...
         persist:
@@ -544,31 +763,43 @@ en:
           beginning: "Running provisioner: %{provisioner}..."
         resume:
           resuming: Resuming suspended VM...
+          unpausing: |-
+            Unpausing the VM...
         share_folders:
           creating: Creating shared folders metadata...
           mounting: Mounting shared folders...
-          mounting_entry: "-- %{name}: %{guest_path}"
-          nomount_entry: "-- %{name}: Automounting disabled."
+          mounting_entry: "-- %{guest_path}"
+          nomount_entry: "-- Automounting disabled: %{host_path}"
+        set_name:
+          setting_name: |-
+            Setting the name of the VM...
         suspend:
           suspending: Saving VM state and suspending execution...
 
       box:
+        unpackage:
+          untar_failure: |-
+            The box failed to unpackage properly. Please verify that the box
+            file you're trying to add is not corrupted and try again. The
+            output from attempting to unpackage (if any):
+
+            %{output}
+          already_exists: |-
+            The box you're attempting to add already exits:
+
+            Name: %{name}
+            Provider: %{provider}
+        add:
+          adding: |-
+            Extracting box...
+          added: |-
+            Successfully added box '%{name}' with provider '%{provider}'!
         destroy:
           destroying: "Deleting box '%{name}'..."
         download:
           with: "Downloading with %{class}..."
           cleaning: "Cleaning up downloaded box..."
           unknown_type: "Unknown or unsupported URI type given for box download."
-        unpackage:
-          extracting: "Extracting box..."
-          already_exists: |-
-            A box already exists under the name of '%{name}'. This may or may
-            not be the same box you are trying to add. Please use another name
-            or remove the previous box then try to add it again.
-          untar_failure: |-
-            Failed to untar the box file. This is usually because you're
-            attempting to add a box that isn't a valid box file. Please
-            double check that the box file is properly packaged.
         verify:
           verifying: "Verifying box..."
           failed: |-
@@ -598,6 +829,14 @@ en:
         download: "Copying box to temporary location..."
         file_missing: "The specified path to a file doesn't exist."
       http:
+        connection_reset: |-
+          The remote server unexpectedly closed the connection. Vagrant was
+          unable to finish downloading the box. Please try again. If this
+          problem persists, please try downloading the box manually outside
+          of Vagrant, then adding the box from the filesystem.
+        connection_timeout: |-
+          Vagrant timed out while attempting to connect to the HTTP host.
+          Please check your internet and proxy settings and try again.
         download: "Downloading box: %{url}"
         socket_error: |-
           An error occurred while trying to download the specified box. This most
@@ -642,14 +881,11 @@ en:
         running_client_again: "Running chef-client again (failed to converge)..."
         running_solo: "Running chef-solo..."
         running_solo_again: "Running chef-solo again (failed to converge)..."
-        invalid_provisioner: |-
-          Vagrant::Provisioners::Chef is not a valid provisioner! Use
-          ChefSolo or ChefClient instead.
         missing_shared_folders: |-
           Shared folders that Chef requires are missing on the virtual machine.
           This is usually due to configuration changing after already booting the
           machine. The fix is to run a `vagrant reload` so that the proper shared
-          folders will prepared and mounted on the VM.
+          folders will be prepared and mounted on the VM.
         no_convergence: |-
           Chef never successfully completed! Any errors should be visible in the
           output above. Please fix your recipes so that they properly complete.
@@ -687,7 +923,7 @@ en:
           Shared folders that Puppet requires are missing on the virtual machine.
           This is usually due to configuration changing after already booting the
           machine. The fix is to run a `vagrant reload` so that the proper shared
-          folders will prepared and mounted on the VM.
+          folders will be prepared and mounted on the VM.
         module_path_missing: "The configured module path doesn't exist: %{path}"
 
       puppet_server: