diff --git a/core/src/main/java/hudson/maven/MavenBuild.java b/core/src/main/java/hudson/maven/MavenBuild.java
index 961777fe81522fc237ab3fe184d68447d161e506..390f87520e43df01cd09de1690badcb0a04b6c61 100644
--- a/core/src/main/java/hudson/maven/MavenBuild.java
+++ b/core/src/main/java/hudson/maven/MavenBuild.java
@@ -307,7 +307,7 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
                 // failed before it didn't even get to this module.
                 run(new Runner() {
                     public Result run(BuildListener listener) {
-                        listener.getLogger().println("Build failed before it gets to this module");
+                        listener.getLogger().println(Messages.MavenBuild_FailedEarlier());
                         return Result.NOT_BUILT;
                     }
 
@@ -460,7 +460,7 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
             }
 
             if(trigger) {
-                listener.getLogger().println("Triggering a new build of "+down.getName());
+                listener.getLogger().println(Messages.MavenBuild_Triggering(down.getName()));
                 downstreams.add(down);
                 down.scheduleBuild();
             }
diff --git a/core/src/main/java/hudson/maven/MavenBuilder.java b/core/src/main/java/hudson/maven/MavenBuilder.java
index 13069cf3e69439f05088a45520338bc6d1873fb3..4d4b51f0116e643d8261767e522b5ae197af5d3e 100644
--- a/core/src/main/java/hudson/maven/MavenBuilder.java
+++ b/core/src/main/java/hudson/maven/MavenBuilder.java
@@ -135,17 +135,17 @@ public abstract class MavenBuilder implements DelegatingCallable<Result,IOExcept
                 try {
                     if(!f.isDone() && !messageReported) {
                         messageReported = true;
-                        listener.getLogger().println("Waiting for Hudson to finish collecting data");
+                        listener.getLogger().println(Messages.MavenBuilder_Waiting());
                     }
                     f.get();
                 } catch (InterruptedException e) {
                     // attempt to cancel all asynchronous tasks
                     for (Future<?> g : futures)
                         g.cancel(true);
-                    listener.getLogger().println("Aborted");
+                    listener.getLogger().println(Messages.MavenBuilder_Aborted());
                     return Result.ABORTED;
                 } catch (ExecutionException e) {
-                    e.printStackTrace(listener.error("Asynchronous execution failure"));
+                    e.printStackTrace(listener.error(Messages.MavenBuilder_AsyncFailed()));
                 }
             }
             a.overheadTime += System.nanoTime()-startTime;
@@ -163,7 +163,7 @@ public abstract class MavenBuilder implements DelegatingCallable<Result,IOExcept
             if(r==0)    return Result.SUCCESS;
 
             if(markAsSuccess) {
-                listener.getLogger().println("Maven failed with error.");
+                listener.getLogger().println(Messages.MavenBuilder_Failed());
                 return Result.SUCCESS;
             }
 
diff --git a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
index 6d8c2862c794ea2ec7ff8883b5a7b1ea1159683e..1bf57d30d31a23c100a47263e157426cb235eaac 100644
--- a/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/core/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -279,7 +279,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
                 // error should have been already reported.
                 return Result.FAILURE;
             } catch (IOException e) {
-                e.printStackTrace(listener.error("Failed to parse POMs"));
+                e.printStackTrace(listener.error(Messages.MavenModuleSetBuild_FailedToParsePom()));
                 return Result.FAILURE;
             } catch (InterruptedException e) {
                 listener.error("Aborted");
@@ -307,7 +307,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
                 throw e;
             } catch (MavenExecutionException e) {
                 // Maven failed to parse POM
-                e.getCause().printStackTrace(listener.error("Failed to parse POM"));
+                e.getCause().printStackTrace(listener.error(Messages.MavenModuleSetBuild_FailedToParsePom()));
                 throw new AbortException();
             }
 
@@ -329,7 +329,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
                         mm.reconfigure(pom);
                         modules.put(pom.name,mm);
                     } else {// this looks like a new module
-                        logger.println("Discovered a new module "+pom.name+" "+pom.displayName);
+                        logger.println(Messages.MavenModuleSetBuild_DiscoveredModule(pom.name,pom.displayName));
                         mm = new MavenModule(project,pom,getNumber());
                         modules.put(mm.getModuleName(),mm);
                     }
@@ -566,8 +566,7 @@ public final class MavenModuleSetBuild extends AbstractBuild<MavenModuleSet,Mave
             PrintStream logger = listener.getLogger();
 
             if(!pom.exists()) {
-                logger.println("No such file "+pom);
-                logger.println("Perhaps you need to specify the correct POM file path in the project configuration?");
+                logger.println(Messages.MavenModuleSetBuild_NoSuchFile(pom));
                 throw new AbortException();
             }
 
diff --git a/core/src/main/java/hudson/maven/ProcessCache.java b/core/src/main/java/hudson/maven/ProcessCache.java
index 7965d5b7c081cf9bca9dd44e90b625a9276e8735..c0106bc8f9b039f3f011f4b05b331fce6860da35 100644
--- a/core/src/main/java/hudson/maven/ProcessCache.java
+++ b/core/src/main/java/hudson/maven/ProcessCache.java
@@ -157,7 +157,7 @@ public final class ProcessCache {
                         continue;
                     }
 
-                    listener.getLogger().println("Reusing existing maven process");
+                    listener.getLogger().println(Messages.ProcessCache_Reusing());
                     itr.remove();
                     p.age++;
                     p.output.set(listener.getLogger());
diff --git a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java b/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java
index ea11af7f7557dfb76889b48139ccd0f900add5e9..8615449d3732898fecf8fd0131defec434bca1fa 100644
--- a/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java
+++ b/core/src/main/java/hudson/maven/reporters/BuildInfoRecorder.java
@@ -74,7 +74,7 @@ public class BuildInfoRecorder extends MavenReporter {
         }
 
         public String getDisplayName() {
-            return "Record build information";
+            return Messages.BuildInfoRecorder_DisplayName();
         }
 
 
diff --git a/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java b/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java
index 99448c9697c5d7a6bdc54b6a335fd4db6ea2d442..5dd3ce586c4d49b49bd5e788edd79df6201905da 100644
--- a/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java
+++ b/core/src/main/java/hudson/maven/reporters/MavenArtifactArchiver.java
@@ -99,13 +99,13 @@ public class MavenArtifactArchiver extends MavenReporter {
                                 }
                                 embedder.stop();
                             } catch (MavenEmbedderException e) {
-                                e.printStackTrace(listener.error("Failed to install artifact to the master"));
+                                e.printStackTrace(listener.error(Messages.MavenArtifactArchiver_FailedToInstallToMaster()));
                                 build.setResult(Result.FAILURE);
                             } catch (ComponentLookupException e) {
-                                e.printStackTrace(listener.error("Failed to install artifact to the master"));
+                                e.printStackTrace(listener.error(Messages.MavenArtifactArchiver_FailedToInstallToMaster()));
                                 build.setResult(Result.FAILURE);
                             } catch (ArtifactInstallationException e) {
-                                e.printStackTrace(listener.error("Failed to install artifact to the master"));
+                                e.printStackTrace(listener.error(Messages.MavenArtifactArchiver_FailedToInstallToMaster()));
                                 build.setResult(Result.FAILURE);
                             }
                         }
@@ -184,7 +184,7 @@ public class MavenArtifactArchiver extends MavenReporter {
         }
 
         public String getDisplayName() {
-            return "Archive the artifacts";
+            return Messages.MavenArtifactArchiver_DisplayName();
         }
 
         public MavenReporter newAutoInstance(MavenModule module) {
diff --git a/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java b/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java
index 3774ef442ceac4643f82d28ad067aa87be9df6a8..a026ccda2b9481cd91ab7d15a168e1df311db63a 100644
--- a/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java
+++ b/core/src/main/java/hudson/maven/reporters/MavenFingerprinter.java
@@ -127,7 +127,7 @@ public class MavenFingerprinter extends MavenReporter {
         }
 
         public String getDisplayName() {
-            return "Record fingerprints";
+            return Messages.MavenFingerprinter_DisplayName();
         }
 
         public MavenReporter newAutoInstance(MavenModule module) {
diff --git a/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java b/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java
index ab3b531152f4bd672934d3ba6ea14233a76eb175..f383d9dadd3574c04cea4e28dcc4dcf908994174 100644
--- a/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java
+++ b/core/src/main/java/hudson/maven/reporters/MavenJavadocArchiver.java
@@ -37,7 +37,7 @@ public class MavenJavadocArchiver extends MavenReporter {
             if(destDir==null)
                 destDir = mojo.getConfigurationValue("outputDirectory", File.class);
         } catch (ComponentConfigurationException e) {
-            e.printStackTrace(listener.fatalError("Unable to obtain the destDir from javadoc mojo"));
+            e.printStackTrace(listener.fatalError(Messages.MavenJavadocArchiver_NoDestDir()));
             build.setResult(Result.FAILURE);
             return true;
         }
@@ -51,7 +51,7 @@ public class MavenJavadocArchiver extends MavenReporter {
                 new FilePath(destDir).copyRecursiveTo("**/*",target);
             } catch (IOException e) {
                 Util.displayIOException(e,listener);
-                e.printStackTrace(listener.fatalError("Unable to copy Javadoc from "+destDir+" to "+target));
+                e.printStackTrace(listener.fatalError(Messages.MavenJavadocArchiver_FailedToCopy(destDir,target)));
                 build.setResult(Result.FAILURE);
             }
 
@@ -78,7 +78,7 @@ public class MavenJavadocArchiver extends MavenReporter {
         }
 
         public String getDisplayName() {
-            return "Publish javadoc";
+            return Messages.MavenJavadocArchiver_DisplayName();
         }
 
         public MavenJavadocArchiver newAutoInstance(MavenModule module) {
diff --git a/core/src/main/java/hudson/maven/reporters/MavenMailer.java b/core/src/main/java/hudson/maven/reporters/MavenMailer.java
index 8c19d10b587ea3de62933302e8417c44a59e352a..1019457f885643b32429eef2c44df59e6d86cf9e 100644
--- a/core/src/main/java/hudson/maven/reporters/MavenMailer.java
+++ b/core/src/main/java/hudson/maven/reporters/MavenMailer.java
@@ -43,7 +43,7 @@ public class MavenMailer extends MavenReporter {
         }
 
         public String getDisplayName() {
-            return "E-mail Notification";
+            return Messages.MavenMailer_DisplayName();
         }
 
         public String getHelpFile() {
diff --git a/core/src/main/java/hudson/maven/reporters/ReportAction.java b/core/src/main/java/hudson/maven/reporters/ReportAction.java
index 9c6bd8745c75e829e4ebdb73431370765bbe5952..b60c063cd9c1b3c256df4ce0680b44fe0c5eb85b 100644
--- a/core/src/main/java/hudson/maven/reporters/ReportAction.java
+++ b/core/src/main/java/hudson/maven/reporters/ReportAction.java
@@ -40,7 +40,7 @@ public final class ReportAction implements Action {
     }
 
     public String getDisplayName() {
-        return "Maven reports";
+        return Messages.ReportAction_DisplayName();
     }
 
     public String getUrlName() {
diff --git a/core/src/main/java/hudson/maven/reporters/ReportCollector.java b/core/src/main/java/hudson/maven/reporters/ReportCollector.java
index 665aec18c9fe94f11812e773ba8d1cd1aaddcb04..1c7e4eeb743979609814f55d1a76d96f50bf2657 100644
--- a/core/src/main/java/hudson/maven/reporters/ReportCollector.java
+++ b/core/src/main/java/hudson/maven/reporters/ReportCollector.java
@@ -32,7 +32,7 @@ public class ReportCollector extends MavenReporter {
         String projectReportPath = pom.getReporting().getOutputDirectory();
         if(!reportPath.startsWith(projectReportPath)) {
             // report is placed outside site. Can't record it.
-            listener.getLogger().println("Maven report output goes to "+reportPath+", which is outside project reporting path"+projectReportPath);
+            listener.getLogger().println(Messages.ReportCollector_OutsideSite(reportPath,projectReportPath));
             return true;
         }
 
@@ -85,7 +85,7 @@ public class ReportCollector extends MavenReporter {
         }
 
         public String getDisplayName() {
-            return "Record Maven reports";
+            return Messages.ReportCollector_DisplayName();
         }
 
         public ReportCollector newAutoInstance(MavenModule module) {
diff --git a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java b/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java
index a5c67a122297f363e9f3fd4b632c8c2c9434bb42..69f2cfafb05ee8c0d48119602711539e8ed9ca38 100644
--- a/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java
+++ b/core/src/main/java/hudson/maven/reporters/SurefireArchiver.java
@@ -46,13 +46,13 @@ public class SurefireArchiver extends MavenReporter {
     public boolean postExecute(MavenBuildProxy build, MavenProject pom, MojoInfo mojo, final BuildListener listener, Throwable error) throws InterruptedException, IOException {
         if (!isSurefireTest(mojo)) return true;
 
-        listener.getLogger().println("[HUDSON] Recording test results");
+        listener.getLogger().println(Messages.SurefireArchiver_Recording());
 
         File reportsDir;
         try {
             reportsDir = mojo.getConfigurationValue("reportsDirectory", File.class);
         } catch (ComponentConfigurationException e) {
-            e.printStackTrace(listener.fatalError("Unable to obtain the reportsDirectory from surefire:test mojo"));
+            e.printStackTrace(listener.fatalError(Messages.SurefireArchiver_NoReportsDir()));
             build.setResult(Result.FAILURE);
             return true;
         }
@@ -117,7 +117,7 @@ public class SurefireArchiver extends MavenReporter {
         }
 
         public String getDisplayName() {
-            return "Publish surefire reports";
+            return Messages.SurefireArchiver_DisplayName();
         }
 
         public SurefireArchiver newAutoInstance(MavenModule module) {
diff --git a/core/src/main/resources/hudson/maven/Messages.properties b/core/src/main/resources/hudson/maven/Messages.properties
index 8fb1ae40e69bd9d8b8b7591a7555f6679b09c615..dd6c0af696690cbe36ff712469c1a3f4b0a19ec9 100644
--- a/core/src/main/resources/hudson/maven/Messages.properties
+++ b/core/src/main/resources/hudson/maven/Messages.properties
@@ -1,7 +1,20 @@
-MavenModuleSet.DiplayName=Build a maven2 project (beta)
+MavenBuild.FailedEarlier=Build failed before it gets to this module
+MavenBuild.Triggering=Triggering a new build of {0}
+MavenBuilder.Aborted=Aborted
+MavenBuilder.AsyncFailed=Asynchronous execution failure
+MavenBuilder.Failed=Maven failed with error.
+MavenBuilder.Waiting=Waiting for Hudson to finish collecting data
 
 MavenModule.Pronoun=Module
 
+MavenModuleSet.DiplayName=Build a maven2 project (beta)
+
+MavenModuleSetBuild.DiscoveredModule=Discovered a new module {0} {1}
+MavenModuleSetBuild.FailedToParsePom=Failed to parse POMs
+MavenModuleSetBuild.NoSuchFile=No such file {0}\nPerhaps you need to specify the correct POM file path in the project configuration?
+
 MavenProbeAction.DisplayName=Monitor Maven Process
 
-ReleaseAction.DisplayName=Release New Version
\ No newline at end of file
+ProcessCache.Reusing=Reusing existing maven process
+
+ReleaseAction.DisplayName=Release New Version
diff --git a/core/src/main/resources/hudson/maven/reporters/Messages.properties b/core/src/main/resources/hudson/maven/reporters/Messages.properties
new file mode 100644
index 0000000000000000000000000000000000000000..1f865ec9ff91ff3032160115b6d68d9b32bd9480
--- /dev/null
+++ b/core/src/main/resources/hudson/maven/reporters/Messages.properties
@@ -0,0 +1,14 @@
+BuildInfoRecorder.DisplayName=Record build information
+MavenArtifactArchiver.DisplayName=Archive the artifacts
+MavenArtifactArchiver.FailedToInstallToMaster=Failed to install artifact to the master
+MavenFingerprinter.DisplayName=Record fingerprints
+MavenJavadocArchiver.DisplayName=Publish javadoc
+MavenJavadocArchiver.FailedToCopy=Unable to copy Javadoc from {0} to {1}
+MavenJavadocArchiver.NoDestDir=Unable to obtain the destDir from javadoc mojo
+MavenMailer.DisplayName=E-mail Notification
+ReportAction.DisplayName=Maven reports
+ReportCollector.DisplayName=Record Maven reports
+ReportCollector.OutsideSite=Maven report output goes to {0}, which is outside project reporting path{1}
+SurefireArchiver.DisplayName=Publish surefire reports
+SurefireArchiver.NoReportsDir=Unable to obtain the reportsDirectory from surefire:test mojo
+SurefireArchiver.Recording=[HUDSON] Recording test results
\ No newline at end of file