Index: applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java
===================================================================
--- applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java (revision 10333)
+++ applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java (revision 10334)
@@ -181,5 +181,5 @@
}
- /** This action listener is called when the user has a photo of the time of his GPS receptor. It
+ /** This action listener is called when the user has a photo of the time of his GPS receiver. It
* displays the list of photos of the layer, and upon selection displays the selected photo.
* From that photo, the user can key in the time of the GPS.
@@ -201,5 +201,5 @@
panel = new JPanel();
panel.setLayout(new BorderLayout());
- panel.add(new JLabel(tr("Take a photo of your GPS receptor while it displays the time.
"
+ panel.add(new JLabel(tr("Take a photo of your GPS receiver while it displays the time.
"
+ "Display that photo here.
"
+ "And then, simply capture the time you read on the photo and select a timezone
")),
@@ -219,5 +219,5 @@
gc.fill = GridBagConstraints.NONE;
gc.anchor = GridBagConstraints.WEST;
- panelTf.add(new JLabel(tr("Photo time (from exif) :")), gc);
+ panelTf.add(new JLabel(tr("Photo time (from exif):")), gc);
lbExifTime = new JLabel();
@@ -234,5 +234,5 @@
gc.fill = GridBagConstraints.NONE;
gc.anchor = GridBagConstraints.WEST;
- panelTf.add(new JLabel(tr("Gps time (read from the above photo) : ")), gc);
+ panelTf.add(new JLabel(tr("Gps time (read from the above photo): ")), gc);
tfGpsTime = new JTextField();
@@ -254,5 +254,5 @@
gc.fill = GridBagConstraints.NONE;
gc.anchor = GridBagConstraints.WEST;
- panelTf.add(new JLabel(tr("I'm in the timezone of : ")), gc);
+ panelTf.add(new JLabel(tr("I'm in the timezone of: ")), gc);
Vector vtTimezones = new Vector();
@@ -374,5 +374,5 @@
boolean isOk = false;
while (! isOk) {
- int answer = JOptionPane.showConfirmDialog(Main.parent, panel, tr("Synchronize time from a photo of the GPS receptor"), JOptionPane.OK_CANCEL_OPTION);
+ int answer = JOptionPane.showConfirmDialog(Main.parent, panel, tr("Synchronize time from a photo of the GPS receiver"), JOptionPane.OK_CANCEL_OPTION);
if (answer == JOptionPane.CANCEL_OPTION) {
return;
@@ -436,5 +436,5 @@
panelCb.setLayout(new FlowLayout());
- panelCb.add(new JLabel(tr("GPX track : ")));
+ panelCb.add(new JLabel(tr("GPX track: ")));
cbGpx = new JComboBox(gpxLst);
@@ -457,5 +457,5 @@
gc.fill = GridBagConstraints.NONE;
gc.weightx = gc.weighty = 0.0;
- panelTf.add(new JLabel(tr("Timezone : ")), gc);
+ panelTf.add(new JLabel(tr("Timezone: ")), gc);
float gpstimezone = Float.parseFloat(Main.pref.get("tagimages.doublegpstimezone", "0.0"));
@@ -479,5 +479,5 @@
gc.fill = GridBagConstraints.NONE;
gc.weightx = gc.weighty = 0.0;
- panelTf.add(new JLabel(tr("Offset :")), gc);
+ panelTf.add(new JLabel(tr("Offset:")), gc);
long delta = Long.parseLong(Main.pref.get("tagimages.delta", "0")) / 1000;
@@ -491,6 +491,6 @@
panelTf.add(tfOffset, gc);
- JButton buttonViewGpsPhoto = new JButton(tr("I can take a picture of my GPS receptor.
"
- + "Can this help ? "));
+ JButton buttonViewGpsPhoto = new JButton(tr("I can take a picture of my GPS receiver.
"
+ + "Can this help?"));
buttonViewGpsPhoto.addActionListener(new SetOffsetActionListener());
gc.gridx = 2;
@@ -508,5 +508,5 @@
gc.fill = GridBagConstraints.NONE;
gc.weightx = gc.weighty = 0.0;
- panelTf.add(new JLabel(tr("Update position for : ")), gc);
+ panelTf.add(new JLabel(tr("Update position for: ")), gc);
gc.gridx = 1;
@@ -572,5 +572,5 @@
Float timezoneValue = parseTimezone(tfTimezone.getText().trim());
if (timezoneValue == null) {
- JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing timezone.\nExpected format : {0}", "+H:MM"),
+ JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing timezone.\nExpected format: {0}", "+H:MM"),
tr("Invalid timezone"), JOptionPane.ERROR_MESSAGE);
continue;
@@ -581,5 +581,5 @@
delta = Long.parseLong(tfOffset.getText());
} catch(NumberFormatException nfe) {
- JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing offset.\nExpected format : {0}", "number"),
+ JOptionPane.showMessageDialog(Main.parent, tr("Error while parsing offset.\nExpected format: {0}", "number"),
tr("Invalid offset"), JOptionPane.ERROR_MESSAGE);
continue;
@@ -643,5 +643,5 @@
Main.main.map.repaint();
- JOptionPane.showMessageDialog(Main.parent, tr("Found {0} matchs of {1} in GPX track {2}", matched, dateImgLst.size(), selectedGpx.name),
+ JOptionPane.showMessageDialog(Main.parent, tr("Found {0} matchs of {1} in GPX track {2}", matched, dateImgLst.size(), selectedGpx.name),
tr("GPX Track loaded"),
((dateImgLst.size() > 0 && matched == 0) ? JOptionPane.WARNING_MESSAGE