From e1dbc7f9b1cf7df2964c4c6f9c97af02e68e1cef Mon Sep 17 00:00:00 2001
From: Mitchell Hashimoto <mitchell.hashimoto@gmail.com>
Date: Fri, 27 Jan 2012 10:52:27 -0800
Subject: [PATCH] Fix some puppet translation

---
 lib/vagrant/provisioners/puppet.rb        | 2 +-
 lib/vagrant/provisioners/puppet_server.rb | 2 +-
 templates/locales/en.yml                  | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/vagrant/provisioners/puppet.rb b/lib/vagrant/provisioners/puppet.rb
index 1a9ef587d..ba2ab2854 100644
--- a/lib/vagrant/provisioners/puppet.rb
+++ b/lib/vagrant/provisioners/puppet.rb
@@ -130,7 +130,7 @@ module Vagrant
       def verify_binary(binary)
         env[:vm].channel.sudo("which #{binary}",
                               :error_class => PuppetError,
-                              :error_key => :puppet_not_detected,
+                              :error_key => :not_detected,
                               :binary => binary)
       end
 
diff --git a/lib/vagrant/provisioners/puppet_server.rb b/lib/vagrant/provisioners/puppet_server.rb
index 1f21d3589..d495338bf 100644
--- a/lib/vagrant/provisioners/puppet_server.rb
+++ b/lib/vagrant/provisioners/puppet_server.rb
@@ -29,7 +29,7 @@ module Vagrant
       def verify_binary(binary)
         env[:vm].channel.sudo("which #{binary}",
                               :error_class => PuppetServerError,
-                              :error_key => :puppetd_not_detected,
+                              :error_key => :not_detected,
                               :binary => binary)
       end
 
diff --git a/templates/locales/en.yml b/templates/locales/en.yml
index 847276ba7..b85036dff 100644
--- a/templates/locales/en.yml
+++ b/templates/locales/en.yml
@@ -16,12 +16,6 @@ en:
     errors:
       base_vm_not_found: The base VM with the name '%{name}' was not found.
       box_not_found: Box '%{name}' could not be found.
-      puppet_not_detected: |-
-        The `puppet` binary was not found on the VM and is required for Puppet provisioning.
-        Please verify that Puppet is installed and that the binary is available on the PATH.
-      puppetd_not_detected: |-
-        The `puppetd` binary was not found on the VM is required for Puppet Server provisioning.
-        Please verify that Puppet is installed and that the binary is available on the PATH.
       cli_invalid_options: |-
         An invalid option was specified. The help for this command
         is available below.