Ignore:
Timestamp:
2010-01-13T20:12:48+01:00 (14 years ago)
Author:
mjulius
Message:

fix messages for gui/dialogs

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

    r2578 r2847  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import static org.openstreetmap.josm.tools.I18n.trn;
    56
    67import java.awt.BorderLayout;
    … …  
    4344import org.openstreetmap.josm.io.OsmServerObjectReader;
    4445import org.openstreetmap.josm.io.OsmTransferException;
     46import org.openstreetmap.josm.tools.CheckParameterUtil;
    4547import org.openstreetmap.josm.tools.ImageProvider;
    4648import org.xml.sax.SAXException;
    … …  
    117119     */
    118120    public ChildRelationBrowser(OsmDataLayer layer) throws IllegalArgumentException {
    119         if (layer == null)
    120             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
     121        CheckParameterUtil.ensureParameterNotNull(layer, "layer");
    121122        this.layer = layer;
    122123        model = new RelationTreeModel();
    … …  
    326327                JOptionPane.showMessageDialog(
    327328                        Main.parent,
    328                         tr("There were {0} conflicts during import.", conflictsCount),
    329                         tr("Conflicts in data"),
     329                        trn("There was {0} conflict during import.",
     330                                "There were {0} conflicts during import.",
     331                                conflictsCount, conflictsCount),
     332                        trn("Conflict in data", "Conflicts in data", conflictsCount),
    330333                        JOptionPane.WARNING_MESSAGE
    331334                );
    … …  
    342345            String message = tr("<html>The child relation<br>"
    343346                    + "{0}<br>"
    344                     + "is deleted on the server. It can't be loaded",
     347                    + "is deleted on the server. It cannot be loaded",
    345348                    r.getDisplayName(DefaultNameFormatter.getInstance())
    346349            );
    … …  
    479482                JOptionPane.showMessageDialog(
    480483                        Main.parent,
    481                         tr("There were {0} conflicts during import.", conflictsCount),
    482                         tr("Conflicts in data"),
     484                        trn("There was {0} conflict during import.",
     485                                "There were {0} conflicts during import.",
     486                                conflictsCount, conflictsCount),
     487                        trn("Conflict in data", "Conflicts in data", conflictsCount),
    483488                        JOptionPane.WARNING_MESSAGE
    484489                );
Note: See TracChangeset for help on using the changeset viewer.