Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 2837)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 2839)
@@ -96,5 +96,5 @@
                 "\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
                 "\tjava -Xmx400m -jar josm.jar\n\n"+
-                tr("Parameters --download, --downloadgps and --selection are processed in this order.")+"\n"+
+                tr("Parameters --download, --downloadgps, and --selection are processed in this order.")+"\n"+
                 tr("Make sure you load some data if you use --selection.")+"\n"
         );
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 2837)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java	(revision 2839)
@@ -49,5 +49,5 @@
         if(i == null)
         {
-            System.out.println("Mappaint-Style \""+styleName+"\" icon \"" + name + "\" not found.");
+            System.out.println("Mappaint style \""+styleName+"\" icon \"" + name + "\" not found.");
             i = ImageProvider.getIfAvailable(dirs, "mappaint."+styleName, null, "misc/no_icon.png");
         }
@@ -89,8 +89,8 @@
                 xmlReader.parse(new InputSource(in));
             } catch(IOException e) {
-                System.err.println(tr("Warning: failed to load Mappaint-Styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
+                System.err.println(tr("Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
                 e.printStackTrace();
             } catch(SAXException e) {
-                System.err.println(tr("Warning: failed to parse Mappaint-Styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
+                System.err.println(tr("Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}", a[1], e.toString()));
                 e.printStackTrace();
             }