Index: /trunk/.classpath
===================================================================
--- /trunk/.classpath	(revision 1058)
+++ /trunk/.classpath	(revision 1059)
@@ -8,4 +8,5 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/jfcunit.jar"/>
+        <classpathentry kind="lib" path="lib/josm-translation.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: /trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 1058)
+++ /trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 1059)
@@ -21,4 +21,5 @@
 import java.util.Locale;
 import java.util.Map;
+import java.util.MissingResourceException;
 
 import javax.swing.JFrame;
@@ -179,5 +180,9 @@
         }
         
-        i18n = I18nFactory.getI18n(MainApplication.class);
+        try {
+            i18n = I18nFactory.getI18n(MainApplication.class);
+        } catch (MissingResourceException ex) {
+            System.out.println("Unable to find translation for the locale: " + Locale.getDefault().getDisplayName() + " reverting to English.");
+        }
 		
 		SplashScreen splash = new SplashScreen(Main.pref.getBoolean("draw.splashscreen", true));
