Changeset 3277 in josm for trunk


Ignore:
Timestamp:
2010-05-24T19:28:47+02:00 (14 years ago)
Author:
mjulius
Message:

Message improvement

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

    r3206 r3277  
    44import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    55import static org.openstreetmap.josm.tools.I18n.tr;
     6import static org.openstreetmap.josm.tools.I18n.trn;
    67
    78import java.awt.EventQueue;
    … …  
    158159        };
    159160
    160         String message = tr("<html>" + "There are {0} primitives in your local dataset which<br>"
    161                 + "might be deleted on the server. If you later try to delete or<br>"
    162                 + "update them the server is likely to report a<br>" + "conflict.<br>" + "<br>"
    163                 + "Click <strong>{1}</strong> to check the state of these primitives<br>" + "on the server.<br>"
    164                 + "Click <strong>{2}</strong> to ignore.<br>" + "</html>",
    165                 potentiallyDeleted.size(),
    166                 options[0].text,
    167                 options[1].text
    168         );
     161        String message = "<html>"
     162            + trn("There is {0} object in your local dataset which "
     163                    + "might be deleted on the server. If you later try to delete or "
     164                    + "update this the server is likely to report a conflict.",
     165                    "There are {0} objects in your local dataset which "
     166                    + "might be deleted on the server. If you later try to delete or "
     167                    + "update them the server is likely to report a conflict.", potentiallyDeleted.size(), potentiallyDeleted.size())
     168                    + "<br>"
     169                    + trn("Click <strong>{0}</strong> to check the state of this object on the server.",
     170                            "Click <strong>{0}</strong> to check the state of these objects on the server.",
     171                            potentiallyDeleted.size(),
     172                            options[0].text) + "<br>"
     173                            + tr("Click <strong>{0}</strong> to ignore." + "</html>", options[1].text);
    169174
    170175        int ret = HelpAwareOptionPane.showOptionDialog(
    171176                Main.parent,
    172177                message,
    173                 tr("Deleted or moved primitives"),
     178                tr("Deleted or moved objects"),
    174179                JOptionPane.WARNING_MESSAGE,
    175180                null,
Note: See TracChangeset for help on using the changeset viewer.