Index: /applications/editors/josm/i18n/checkenglish.pl =================================================================== --- /applications/editors/josm/i18n/checkenglish.pl (revision 15959) +++ /applications/editors/josm/i18n/checkenglish.pl (revision 15960) @@ -41,7 +41,9 @@ $msgid =~ s/([^\w]+cent|met)(e)(r)/$1$3$2/ig; $msgid =~ s/^(cent|met)(e)(r)/$1$3$2/ig; - $msgid =~ s/(Orthogonali|synchroni|Initiali|customi)z/$1s/ig; + $msgid =~ s/(minimi|maximi|vectori|anonymi|Orthogonali|synchroni|Initiali|customi)z/$1s/ig; $msgid =~ s/(licen)s/$1c/ig; + $msgid =~ s/dialog/dialogue/ig; $msgid =~ s/(spel)led/$1t/ig; + $msgid =~ s/_/ /ig; return $msgid; } 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 15959) +++ /applications/editors/josm/plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java (revision 15960) @@ -559,8 +559,8 @@ new String[] { tr("Correlate"), tr("Auto-Guess"), tr("Cancel") }, new String[] { "ok.png", "dialogs/gpx2imgManual.png", "cancel.png" }).getValue(); - + if(answer != 1 && answer != 2) return; - + // Check the selected values Object item = cbGpx.getSelectedItem(); @@ -572,5 +572,5 @@ } selectedGpx = ((GpxDataWrapper) item); - + if (answer == 2) { autoGuess(selectedGpx.data); @@ -643,5 +643,5 @@ } - + // These variables all belong to "auto guess" but need to be accessible // from the slider change listener @@ -659,5 +659,5 @@ private long firstGPXDate = -1; private long firstExifDate = -1; - + /** * Tries to automatically match opened photos to a given GPX track. Changes are applied @@ -669,5 +669,5 @@ autoImgs = getSortedImgList(true, false); PrimaryDateParser dateParser = new PrimaryDateParser(); - + // no images found, exit if(autoImgs.size() <= 0) { @@ -677,20 +677,20 @@ return; } - + // Free the user's vision Main.pleaseWaitDlg.setVisible(false); AgpifojDialog dialog = AgpifojDialog.getInstance(); dialog.action.button.setSelected(true); - dialog.action.actionPerformed(null); + dialog.action.actionPerformed(null); // Will show first photo if none is selected yet if(!dialog.hasImage()) yLayer.showNextPhoto(); // FIXME: If the dialog is minimized it will not be maximized. ToggleDialog is - // in need of a complete re-write to allow this in a reasonable way. + // in need of a complete re-write to allow this in a reasonable way. // Init variables firstExifDate = autoImgs.get(0).time.getTime()/1000; - - + + // Finds first GPX point outer: for (GpxTrack trk : gpx.tracks) { @@ -699,5 +699,5 @@ String curDateWpStr = (String) curWp.attr.get("time"); if (curDateWpStr == null) continue; - + try { firstGPXDate = dateParser.parse(curDateWpStr).getTime()/1000; @@ -707,5 +707,5 @@ } } - + // No GPX timestamps found, exit if(firstGPXDate < 0) { @@ -715,12 +715,12 @@ return; } - + // seconds long diff = (yLayer.hasTimeoffset) ? yLayer.timeoffset - : firstExifDate - firstGPXDate; + : firstExifDate - firstGPXDate; yLayer.timeoffset = diff; yLayer.hasTimeoffset = true; - + double diffInH = (double)diff/(60*60); // hours @@ -728,5 +728,5 @@ dayOffset = (int)Math.round(diffInH / 24); // days double timezone = diff - dayOffset*24*60*60; // seconds - + // In hours, rounded to two decimal places timezone = (double)Math.round(timezone*100/(60*60)) / 100; @@ -736,5 +736,5 @@ double fixTimezone = (double)Math.round(timezone * 2)/2; // hours, rounded to one decimal place int offset = (int)Math.round(diff - fixTimezone*60*60) - dayOffset*24*60*60; // seconds - + /*System.out.println("phto " + firstExifDate); System.out.println("gpx " + firstGPXDate); @@ -745,5 +745,5 @@ System.out.println("fix " + fixTimezone); System.out.println("offt " + offset);*/ - + // This is called whenever one of the sliders is moved. // It updates the labels and also calls the "match photos" code @@ -756,11 +756,11 @@ : (int)Math.floor(tz/2) + ":30"; if(sldTimezone.getValue() < 0) zone = "-" + zone; - + lblTimezone.setText(tr("Timezone: {0}", zone)); lblMinutes.setText(tr("Minutes: {0}", sldMinutes.getValue())); lblSeconds.setText(tr("Seconds: {0}", sldSeconds.getValue())); - + float gpstimezone = parseTimezone(zone).floatValue(); - + // Reset previous position for(ImageEntry x : autoImgs) { @@ -768,10 +768,10 @@ x.pos = null; } - + long timediff = (long) (gpstimezone * 3600) + dayOffset*24*60*60 + sldMinutes.getValue()*60 + sldSeconds.getValue(); - + int matched = matchGpxTrack(autoImgs, autoGpx, timediff); @@ -783,5 +783,5 @@ ) ); - + int offset = (int)(firstGPXDate+timediff-firstExifDate); int o = Math.abs(offset); @@ -797,5 +797,5 @@ } } - + // Info Labels lblMatches = new JLabel(); @@ -807,5 +807,5 @@ lblTimezone = new JLabel(); sldTimezone = new JSlider(-24, 24, 0); - sldTimezone.setPaintLabels(true); + sldTimezone.setPaintLabels(true); Hashtable labelTable = new Hashtable(); labelTable.put(-24, new JLabel("-12:00")); @@ -815,17 +815,17 @@ labelTable.put( 24, new JLabel( "12:00")); sldTimezone.setLabelTable(labelTable); - + // Minutes Slider lblMinutes = new JLabel(); - sldMinutes = new JSlider(-15, 15, 0); - sldMinutes.setPaintLabels(true); - sldMinutes.setMajorTickSpacing(5); - + sldMinutes = new JSlider(-15, 15, 0); + sldMinutes.setPaintLabels(true); + sldMinutes.setMajorTickSpacing(5); + // Seconds slider lblSeconds = new JLabel(); - sldSeconds = new JSlider(-60, 60, 0); - sldSeconds.setPaintLabels(true); - sldSeconds.setMajorTickSpacing(30); - + sldSeconds = new JSlider(-60, 60, 0); + sldSeconds.setPaintLabels(true); + sldSeconds.setMajorTickSpacing(30); + // Put everything together JPanel p = new JPanel(new GridBagLayout()); @@ -839,5 +839,5 @@ p.add(lblSeconds, GBC.eol().fill()); p.add(sldSeconds, GBC.eol().fill()); - + // If there's an error in the calculation the found values // will be off range for the sliders. Catch this error @@ -849,10 +849,10 @@ } catch(Exception e) { JOptionPane.showMessageDialog(Main.parent, - tr("An error occured while trying to match the photos to the GPX track." + tr("An error occurred while trying to match the photos to the GPX track." +" You can adjust the sliders to manually match the photos."), tr("Matching photos to track failed"), JOptionPane.WARNING_MESSAGE); } - + // Call the sliderListener once manually so labels get adjusted new sliderListener().stateChanged(null); @@ -862,8 +862,8 @@ sldMinutes.addChangeListener(new sliderListener()); sldSeconds.addChangeListener(new sliderListener()); - + // There is no way to cancel this dialog, all changes get applied // immediately. Therefore "Close" is marked with an "OK" icon. - // Settings are only saved temporarily to the layer. + // Settings are only saved temporarily to the layer. int answer = new ExtendedDialog(Main.parent, tr("Adjust timezone and offset"), @@ -872,5 +872,5 @@ new String[] { "ok.png", "dialogs/refresh.png"} ).getValue(); - + // User wants default values; discard old result and re-open dialog if(answer == 2) { @@ -879,5 +879,5 @@ } } - + /** * Returns a list of images that fulfill the given criteria. @@ -913,5 +913,5 @@ } } - + Collections.sort(dateImgLst, new Comparator() { public int compare(ImageEntry arg0, ImageEntry arg1) { @@ -919,5 +919,5 @@ } }); - + return dateImgLst; } @@ -966,38 +966,38 @@ // Time between the track point and the previous one, 5 sec if first point, i.e. photos take // 5 sec before the first track point can be assumed to be take at the starting position - long interval = prevDateWp > 0 ? ((int)Math.abs(curDateWp - prevDateWp)) : 5; + long interval = prevDateWp > 0 ? ((int)Math.abs(curDateWp - prevDateWp)) : 5; int ret = 0; - - // i is the index of the timewise last photo that has the same or earlier EXIF time + + // i is the index of the timewise last photo that has the same or earlier EXIF time int i = getLastIndexOfListBefore(dateImgLst, curDateWp); // no photos match - if (i < 0) - return 0; - + if (i < 0) + return 0; + Double speed = null; Double prevElevation = null; Double curElevation = null; - + if (prevWp != null) { double distance = getDistance(prevWp, curWp); // This is in km/h, 3.6 * m/s if (curDateWp > prevDateWp) - speed = 3.6 * distance / (curDateWp - prevDateWp); + speed = 3.6 * distance / (curDateWp - prevDateWp); try { prevElevation = new Double((String) prevWp.attr.get("ele")); } catch(Exception e) {} } - + try { curElevation = new Double((String) curWp.attr.get("ele")); } catch (Exception e) {} - - // First trackpoint, then interval is set to five seconds, i.e. photos up to five seconds - // before the first point will be geotagged with the starting point + + // First trackpoint, then interval is set to five seconds, i.e. photos up to five seconds + // before the first point will be geotagged with the starting point if(prevDateWp == 0 || curDateWp <= prevDateWp) { while(i >= 0 && (dateImgLst.get(i).time.getTime()/1000) <= curDateWp && (dateImgLst.get(i).time.getTime()/1000) >= (curDateWp - interval)) { - if(dateImgLst.get(i).coor == null) { + if(dateImgLst.get(i).coor == null) { dateImgLst.get(i).pos = curWp.eastNorth; dateImgLst.get(i).coor = Main.proj.eastNorth2latlon(dateImgLst.get(i).pos); @@ -1025,8 +1025,8 @@ dateImgLst.get(i).coor = Main.proj.eastNorth2latlon(dateImgLst.get(i).pos); dateImgLst.get(i).speed = speed; - + if (curElevation != null && prevElevation != null) dateImgLst.get(i).elevation = interpolate(prevElevation, curElevation, timeDiff); - + ret++; } @@ -1046,8 +1046,8 @@ if(lstSize == 0 || searchedDate < dateImgLst.get(0).time.getTime()/1000) return -1; - + // The search period is later than the last photo if (searchedDate > dateImgLst.get(lstSize - 1).time.getTime() / 1000) - return lstSize-1; + return lstSize-1; // The searched index is somewhere in the middle, do a binary search from the beginning @@ -1055,5 +1055,5 @@ int startIndex= 0; int endIndex= lstSize-1; - while (endIndex - startIndex > 1) { + while (endIndex - startIndex > 1) { curIndex= (int) Math.round((double)(endIndex + startIndex)/2); if (searchedDate > dateImgLst.get(curIndex).time.getTime()/1000) @@ -1064,6 +1064,6 @@ if (searchedDate < dateImgLst.get(endIndex).time.getTime()/1000) return startIndex; - - // This final loop is to check if photos with the exact same EXIF time follows + + // This final loop is to check if photos with the exact same EXIF time follows while ((endIndex < (lstSize-1)) && (dateImgLst.get(endIndex).time.getTime() == dateImgLst.get(endIndex + 1).time.getTime())) Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java =================================================================== --- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (revision 15959) +++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java (revision 15960) @@ -496,5 +496,5 @@ if (this.lambertZone != currentLambertZone) { JOptionPane.showMessageDialog(Main.parent, tr("Lambert zone {0} in cache "+ - " incompatible with current Lambert zone {1}", + "incompatible with current Lambert zone {1}", this.lambertZone+1, currentLambertZone), tr("Cache Lambert Zone Error"), JOptionPane.ERROR_MESSAGE); return false; Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java =================================================================== --- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java (revision 15959) +++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java (revision 15960) @@ -94,5 +94,5 @@ public OsbDialog(final OsbPlugin plugin) { super(tr("Open OpenStreetBugs"), "icon_error22", - tr("Open the OpenStreetBugs window and activate the automatic download"), Shortcut.registerShortcut( + tr("Opens the OpenStreetBugs window and activates the automatic download"), Shortcut.registerShortcut( "view:openstreetbugs", tr("Toggle: {0}", tr("Open OpenStreetBugs")), KeyEvent.VK_O, Shortcut.GROUP_MENU, Shortcut.SHIFT_DEFAULT), 150); Index: /applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java =================================================================== --- /applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java (revision 15959) +++ /applications/editors/josm/plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java (revision 15960) @@ -193,5 +193,5 @@ DataSet.fireSelectionChanged(Main.ds.getSelected()); } else - JOptionPane.showMessageDialog(Main.parent, tr("No intersections found. Nothing was changed.")); + JOptionPane.showMessageDialog(Main.parent, tr("No intersection found. Nothing was changed.")); } Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java (revision 15959) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java (revision 15960) @@ -12,43 +12,42 @@ /** - * + * */ - + public Help_WMSmenuAction() { //super("Help / About"); super(tr("help"), "help", tr("Help / About"), null, false); - + } - + public void actionPerformed(ActionEvent e) { - //todo - put this into a txt file? - String helptext = + //todo - put this into a txt file? + String helptext = tr("You can add, edit and delete WMS entries in the WMSplugin Preference Tab - " + "these will then show up in the WMS menu.\n\n"+ - + "You can also do this manually in the Advanced Preferences, using the following schema:\n"+ "wmsplugin.url.1.name=Landsat\n"+ "wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"+ "wmsplugin.url.2.name=NPE Maps... etc\n\n"+ - + "Full WMS URL input format example (landsat)\n"+ "http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"+ - "layers=global_mosaic&styles=&srs=EPSG:4326&\n"+ - "format=image/jpeg \n\n"+ - + "layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n\n"+ + "For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you only need to input the relevant 'id'.\n" + - "To add a Metacarta Map Rectifier menu item, manually create the URL like in this example," + - "replacing 73 with your image id: \n" + + "To add a Metacarta Map Rectifier menu item, manually create the URL like in this example, " + + "replacing 73 with your image id:\n" + "http://labs.metacarta.com/rectifier/wms.cgi?id=73\n" + - "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n" + - " \n" + + "&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n\n" + + "Note: Make sure the image is suitable, copyright-wise, if in doubt, don't use."); - + JTextPane tp = new JTextPane(); JScrollPane js = new JScrollPane(JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS); - - + + js.getViewport().add(tp); JFrame jf = new JFrame(tr("WMS Plugin Help")); @@ -56,5 +55,5 @@ jf.pack(); jf.setSize(400,500); - jf.setVisible(true); + jf.setVisible(true); tp.setText(helptext); } Index: /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java =================================================================== --- /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java (revision 15959) +++ /applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java (revision 15960) @@ -1,3 +1,3 @@ -package wmsplugin; +package wmsplugin; import static org.openstreetmap.josm.tools.I18n.tr; @@ -25,6 +25,6 @@ public WMSAdjustAction(MapFrame mapFrame) { - super(tr("Adjust WMS"), "adjustwms", - tr("Adjust the position of the selected WMS layer"), mapFrame, + super(tr("Adjust WMS"), "adjustwms", + tr("Adjust the position of the selected WMS layer"), mapFrame, ImageProvider.getCursor("normal", "move")); } @@ -45,5 +45,5 @@ if (e.getButton() != MouseEvent.BUTTON1) return; - + Layer layer=Main.map.mapView.getActiveLayer(); if (layer.visible && layer instanceof WMSLayer) { @@ -63,5 +63,5 @@ Main.map.mapView.getEastNorth(e.getX(),e.getY()); selectedLayer.displace( - eastNorth.east()-prevEastNorth.east(), + eastNorth.east()-prevEastNorth.east(), eastNorth.north()-prevEastNorth.north() ); @@ -74,5 +74,5 @@ Main.map.mapView.repaint(); Main.map.mapView.setCursor(Cursor.getDefaultCursor()); - selectedImage = null; + selectedImage = null; prevEastNorth = null; selectedLayer = null; @@ -88,5 +88,5 @@ @Override public void mouseClicked(MouseEvent e) { } - + // This only makes the buttons look disabled, but since no keyboard shortcut is // provided there aren't any other means to activate this tool