Changeset 2096 in josm
- Timestamp:
- 2009-09-12T06:38:11+02:00 (15 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/UploadAction.java
r2083 r2096 132 132 Main.parent, 133 133 tr("<html>There are unresolved conflicts in layer ''{0}''.<br>" 134 + "You have to resolve them first.< html>", layer.getName()),134 + "You have to resolve them first.</html>", layer.getName()), 135 135 tr("Warning"), 136 136 JOptionPane.WARNING_MESSAGE -
trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
r2044 r2096 48 48 String url = AbstractInfoAction.getBaseBrowseUrl() + "/changeset/" + primitive.getChangesetId(); 49 49 String text = tr( 50 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by <strong>{2}</strong> in changeset <strong>{3}</strong> ",50 "<html>Version <strong>{0}</strong> created on <strong>{1}</strong> by <strong>{2}</strong> in changeset <strong>{3}</strong></html>", 51 51 Long.toString(primitive.getVersion()), 52 52 new SimpleDateFormat().format(primitive.getTimestamp()), -
trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
r2081 r2096 204 204 Main.parent, 205 205 new LayerListWarningMessagePanel(msg, infos), 206 tr("Unsa fed data and conflicts"),206 tr("Unsaved data and conflicts"), 207 207 JOptionPane.DEFAULT_OPTION, 208 208 JOptionPane.WARNING_MESSAGE … … 222 222 Main.parent, 223 223 new LayerListWarningMessagePanel(msg, infos), 224 tr("Unsa fed data and missing associated file"),224 tr("Unsaved data and missing associated file"), 225 225 JOptionPane.DEFAULT_OPTION, 226 226 JOptionPane.WARNING_MESSAGE … … 242 242 Main.parent, 243 243 new LayerListWarningMessagePanel(msg, infos), 244 tr("Unsa fed data non-writable files"),244 tr("Unsaved data non-writable files"), 245 245 JOptionPane.DEFAULT_OPTION, 246 246 JOptionPane.WARNING_MESSAGE -
trunk/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
r2017 r2096 61 61 public void actionPerformed(ActionEvent e) { 62 62 JPanel msg = new JPanel(new GridBagLayout()); 63 msg.add(new JLabel(tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here: ")), GBC.eol());63 msg.add(new JLabel(tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")), GBC.eol()); 64 64 msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop()); 65 65 if (!ConditionalOptionPaneUtil.showConfirmationDialog(
Note:
See TracChangeset
for help on using the changeset viewer.