Ticket #3555: more_typos.diff

File more_typos.diff, 2.5 KB (added by Claudius, 16 years ago)

  • org/openstreetmap/josm/actions/UploadAction.java

     
    301301    protected void handleUploadConflictForClosedChangeset(long changsetId, Date d) {
    302302        String msg =  tr("<html>Uploading <strong>failed</strong> because you've been using<br>"
    303303                + "changeset {0} which was already closed at {1}.<br>"
    304                 + "Please upload again with a new or an existing open changeset.",
     304                + "Please upload again with a new or an existing open changeset.</html>",
    305305                changsetId, new SimpleDateFormat().format(d)
    306306        );
    307307        JOptionPane.showMessageDialog(

  • org/openstreetmap/josm/command/ConflictAddCommand.java

     
    5151
    5252    @Override public void undoCommand() {
    5353        if (! Main.map.mapView.hasLayer(getLayer())) {
    54             System.out.println(tr("Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for primitmive ''{1}''",
     54            System.out.println(tr("Warning: layer ''{0}'' doesn't exist any more. Can't remove conflict for primitive ''{1}''",
    5555                    getLayer().getName(),
    5656                    conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance())
    5757            ));

  • org/openstreetmap/josm/io/OsmApi.java

     
    593593     */
    594594    protected void ensureValidChangeset() throws OsmTransferException {
    595595        if (changeset == null)
    596             throw new OsmTransferException(tr("current changeset is null. Can't upload data."));
     596            throw new OsmTransferException(tr("Current changeset is null. Can't upload data."));
    597597        if (changeset.getId() <= 0)
    598             throw new OsmTransferException(tr("id of current changeset > required. Current id is {0}", changeset.getId()));
     598            throw new OsmTransferException(tr("id of current changeset > 0 required. Current id is {0}", changeset.getId()));
    599599    }
    600600    /**
    601601     * Replies the changeset data uploads are currently directed to