Changeset 2163 in josm for trunk/src/org
- Timestamp:
- 2009-09-20T10:23:22+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java
r2017 r2163 68 68 public void export(Layer layer) { 69 69 if (layer == null) 70 throw new IllegalArgumentException(tr("parame nter ''{0}'' must not be null", "layer"));70 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 71 71 if (! (layer instanceof OsmDataLayer) && ! (layer instanceof GpxLayer)) 72 72 throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName())); -
trunk/src/org/openstreetmap/josm/actions/HelpAction.java
r2017 r2163 216 216 if(url.equals(langurl)) 217 217 { 218 txt = ("<HTML>"+tr("Help page missing. Create it in <A HREF=\"{0}\"> english</A>.",218 txt = ("<HTML>"+tr("Help page missing. Create it in <A HREF=\"{0}\">English</A>.", 219 219 url+"?action=edit")+"</HTML>"); 220 220 } 221 221 else 222 222 { 223 txt = ("<HTML>"+tr("Help page missing. Create it in <A HREF=\"{0}\"> english</A> or <A HREF=\"{1}\">your language</A>.",223 txt = ("<HTML>"+tr("Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF=\"{1}\">your language</A>.", 224 224 url+"?action=edit", langurl+"?action=edit")+"</HTML>"); 225 225 } -
trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java
r2017 r2163 52 52 @Override public void undoCommand() { 53 53 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 primitmive ''{1}''", 55 55 getLayer().getName(), 56 56 conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()) -
trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java
r1750 r2163 60 60 61 61 if (! Main.map.mapView.hasLayer(getLayer())) { 62 logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more",62 logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more", 63 63 this.toString(), 64 64 getLayer().toString() -
trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java
r2070 r2163 249 249 public void undoCommand() { 250 250 if (! Main.map.mapView.hasLayer(getLayer())) { 251 logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more",251 logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more", 252 252 this.toString(), 253 253 getLayer().toString() -
trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java
r2070 r2163 88 88 public void undoCommand() { 89 89 if (! Main.map.mapView.hasLayer(layer)) { 90 logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more",90 logger.warning(tr("Can't undo command ''{0}'' because layer ''{1}'' is not present any more", 91 91 this.toString(), 92 92 layer.toString() -
trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java
r2070 r2163 52 52 return new DefaultMutableTreeNode( 53 53 new JLabel( 54 tr("Resolve conflicts in node list of ofway {0}", conflict.getMy().getId()),54 tr("Resolve conflicts in node list of way {0}", conflict.getMy().getId()), 55 55 ImageProvider.get("data", "object"), 56 56 JLabel.HORIZONTAL -
trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
r2019 r2163 76 76 ArrayList<HistoryOsmPrimitive> versions = data.get(id); 77 77 if (versions == null) 78 throw new NoSuchElementException(tr("Didn't find an 78 throw new NoSuchElementException(tr("Didn't find an primitive with id {0} in this dataset", id)); 79 79 80 80 for (HistoryOsmPrimitive primitive: versions) { -
trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
r2156 r2163 583 583 tr("<html>There is at least one member in this relation referring<br>" 584 584 + "to the relation itself.<br>" 585 + "This creates circular dependencies and is di curaged.<br>"585 + "This creates circular dependencies and is discouraged.<br>" 586 586 + "How do you want to proceed with circular dependencies?</html>"), 587 587 tr("Warning"), -
trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
r2139 r2163 124 124 putValue(NAME, tr("Cancel")); 125 125 putValue(SMALL_ICON, ImageProvider.get("cancel")); 126 putValue(SHORT_DESCRIPTION, tr("Cancel clos eing of changesets"));126 putValue(SHORT_DESCRIPTION, tr("Cancel closing of changesets")); 127 127 } 128 128 -
trunk/src/org/openstreetmap/josm/io/GpxExporter.java
r2032 r2163 53 53 public void exportData(File file, Layer layer) throws IOException { 54 54 if (layer == null) 55 throw new IllegalArgumentException(tr("parame nter ''{0}'' must not be null", "layer"));55 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "layer")); 56 56 if (!(layer instanceof OsmDataLayer) && !(layer instanceof GpxLayer)) 57 57 throw new IllegalArgumentException(tr("expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer 58 58 .getClass().getName())); 59 59 if (file == null) 60 throw new IllegalArgumentException(tr("parame nter ''{0}'' must not be null", "file"));60 throw new IllegalArgumentException(tr("parameter ''{0}'' must not be null", "file")); 61 61 62 62 String fn = file.getPath(); -
trunk/src/org/openstreetmap/josm/io/NMEAImporter.java
r2017 r2163 54 54 JOptionPane.INFORMATION_MESSAGE); 55 55 } else { 56 JOptionPane.showMessageDialog(Main.parent, msg, tr("NMEA import fa liure!"), JOptionPane.ERROR_MESSAGE);56 JOptionPane.showMessageDialog(Main.parent, msg, tr("NMEA import failure!"), JOptionPane.ERROR_MESSAGE); 57 57 } 58 58 }
Note:
See TracChangeset
for help on using the changeset viewer.