Index: /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 2732) +++ /trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java (revision 2733) @@ -579,5 +579,5 @@ new String[] {tr("Cancel"), tr("Delete")}) .setButtonIcons(new String[] {"cancel.png", "dialogs/delete.png"}) - .setContent(new JLabel(tr("

Delete the file {0} from disk?

The image file will be permanently lost!" + .setContent(new JLabel(tr("

Delete the file {0} from disk?

The image file will be permanently lost!

" ,toDelete.file.getName()), ImageProvider.get("dialogs/geoimage/deletefromdisk"),SwingConstants.LEFT)) .toggleEnable("geoimage.deleteimagefromdisk") Index: /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java =================================================================== --- /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 2732) +++ /trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java (revision 2733) @@ -81,10 +81,12 @@ try { port = Integer.parseInt(value); - } catch(NumberFormatException e){ - System.err.println(tr("Unexpected format for port number in in preference ''{0}''. Got ''{1}''. Proxy won't be used.", property, value)); + } catch (NumberFormatException e) { + System.err.println(tr("Unexpected format for port number in in preference ''{0}''. Got ''{1}''.", property, value)); + System.err.println(tr("The proxy will not be used.")); return 0; } if (port <= 0 || port > 65535) { - System.err.println(tr("Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used.", property, port)); + System.err.println(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port)); + System.err.println(tr("The proxy will not be used.")); return 0; } @@ -99,5 +101,6 @@ String value = Main.pref.get(ProxyPreferences.PROXY_POLICY); if (value.length() == 0) { - System.err.println(tr("Warning: no preference ''{0}'' found. Will use no proxy.", ProxyPreferences.PROXY_POLICY)); + System.err.println(tr("Warning: no preference ''{0}'' found.", ProxyPreferences.PROXY_POLICY)); + System.err.println(tr("The proxy will not be used.")); proxyPolicy = ProxyPolicy.NO_PROXY; } else { @@ -115,5 +118,6 @@ httpProxySocketAddress = null; if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) { - System.err.println(tr("Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''. Proxy won't be used", host, port)); + System.err.println(tr("Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''.", host, port)); + System.err.println(tr("The proxy will not be used.")); } } @@ -126,5 +130,6 @@ socksProxySocketAddress = null; if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) { - System.err.println(tr("Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''. Proxy won't be used", host, port)); + System.err.println(tr("Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''.", host, port)); + System.err.println(tr("The proxy will not be used.")); } }