Index: trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java	(revision 4163)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java	(revision 4164)
@@ -108,5 +108,5 @@
                 try {
                     setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR));
-                    attemptGetCapabilities(serviceUrlText.getText());
+                    attemptGetCapabilities(sanitize(serviceUrlText.getText()));
                 } finally {
                     setCursor(beforeCursor);
@@ -224,7 +224,11 @@
     }
 
+    private String sanitize(String s) {
+        return s.replaceAll("[\r\n]+","").trim();
+    }
+
     private String buildTMSUrl() {
         StringBuilder a = new StringBuilder("tms:");
-        a.append(tmsURL.getText());
+        a.append(sanitize(tmsURL.getText()));
         return a.toString();
     }
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java	(revision 4163)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java	(revision 4164)
@@ -444,5 +444,5 @@
             public NewEntryAction() {
                 putValue(NAME, tr("New"));
-                putValue(SHORT_DESCRIPTION, tr("add a new wms/tms entry by entering the url"));
+                putValue(SHORT_DESCRIPTION, tr("Add a new WMS/TMS entry by entering the URL"));
                 putValue(SMALL_ICON, ImageProvider.get("dialogs", "add"));
             }
@@ -464,5 +464,5 @@
             public RemoveEntryAction() {
                 putValue(NAME, tr("Remove"));
-                putValue(SHORT_DESCRIPTION, tr("remove entry"));
+                putValue(SHORT_DESCRIPTION, tr("Remove entry"));
                 putValue(SMALL_ICON, ImageProvider.get("dialogs", "delete"));
                 updateEnabledState();