Changeset 2733 in josm for trunk


Ignore:
Timestamp:
2010-01-03T13:29:59+01:00 (10 years ago)
Author:
framm
Message:

message fixes

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

    r2720 r2733  
    579579                    new String[] {tr("Cancel"), tr("Delete")})
    580580                .setButtonIcons(new String[] {"cancel.png", "dialogs/delete.png"})
    581                 .setContent(new JLabel(tr("<html><h3>Delete the file {0}  from disk?<p>The image file will be permanently lost!"
     581                .setContent(new JLabel(tr("<html><h3>Delete the file {0} from disk?<p>The image file will be permanently lost!</h3></html>"
    582582                    ,toDelete.file.getName()), ImageProvider.get("dialogs/geoimage/deletefromdisk"),SwingConstants.LEFT))
    583583                .toggleEnable("geoimage.deleteimagefromdisk")
  • trunk/src/org/openstreetmap/josm/io/DefaultProxySelector.java

    r2711 r2733  
    8181        try {
    8282            port = Integer.parseInt(value);
    83         } catch(NumberFormatException e){
    84             System.err.println(tr("Unexpected format for port number in in preference ''{0}''. Got ''{1}''. Proxy won't be used.", property, value));
     83        } catch (NumberFormatException e) {
     84            System.err.println(tr("Unexpected format for port number in in preference ''{0}''. Got ''{1}''.", property, value));
     85            System.err.println(tr("The proxy will not be used."));
    8586            return 0;
    8687        }
    8788        if (port <= 0 || port >  65535) {
    88             System.err.println(tr("Illegal port number in preference ''{0}''. Got {1}. Proxy won't be used.", property, port));
     89            System.err.println(tr("Illegal port number in preference ''{0}''. Got {1}.", property, port));
     90            System.err.println(tr("The proxy will not be used."));
    8991            return 0;
    9092        }
     
    99101        String value = Main.pref.get(ProxyPreferences.PROXY_POLICY);
    100102        if (value.length() == 0) {
    101             System.err.println(tr("Warning: no preference ''{0}'' found. Will use no proxy.", ProxyPreferences.PROXY_POLICY));
     103            System.err.println(tr("Warning: no preference ''{0}'' found.", ProxyPreferences.PROXY_POLICY));
     104            System.err.println(tr("The proxy will not be used."));
    102105            proxyPolicy = ProxyPolicy.NO_PROXY;
    103106        } else {
     
    115118            httpProxySocketAddress = null;
    116119            if (proxyPolicy.equals(ProxyPolicy.USE_HTTP_PROXY)) {
    117                 System.err.println(tr("Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''. Proxy won't be used", host, port));
     120                System.err.println(tr("Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''.", host, port));
     121                System.err.println(tr("The proxy will not be used."));
    118122            }
    119123        }
     
    126130            socksProxySocketAddress = null;
    127131            if (proxyPolicy.equals(ProxyPolicy.USE_SOCKS_PROXY)) {
    128                 System.err.println(tr("Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''. Proxy won't be used", host, port));
     132                System.err.println(tr("Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''.", host, port));
     133                System.err.println(tr("The proxy will not be used."));
    129134            }
    130135        }
Note: See TracChangeset for help on using the changeset viewer.