Changeset 26509 in osm for applications/editors/josm/plugins/piclayer

Timestamp:

2011-08-11T00:45:56+02:00 (13 years ago)

Author:

stoecker

Message:

i18n fixes

Location:

applications/editors/josm/plugins/piclayer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java (modified) (3 diffs)

applications/editors/josm/plugins/piclayer/build.xml

@@ -23 +23 @@
 <project name="PicLayer" default="dist" basedir=".">
     <property name="commit.message" value="applied #J5852 (patch by Petschge) - new shear option"/>
-    <property name="plugin.main.version" value="3835"/>
+    <property name="plugin.main.version" value="4126"/>
     <!--
       ************************************************

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java

@@ -359 +359 @@
         if ( m_image == null )
             return;
-        String projcode = Main.proj.toCode();
+        String projcode = Main.getProjection().toCode();
 
         // TODO: bounding box only supported when coordinates are in meters

applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerFromFile.java

@@ -232 +232 @@
         boolean loadcal = false;
 
-        String msg = tr("A calibration file associated to the picture file was found:")+"\n"+fileName;
+        String msg = tr("A calibration file associated to the picture file was found: {0}\n", fileName);
         if ( policy.equals("yes") ) {
             loadcal = true;
@@ -240 +240 @@
         }
         else if ( policy.equals("ask") ) {
-            msg += "\n" + tr("(set  \"{0}\"  to yes/no/ask in the preferences\n"+
-                            "to control the autoloading of calibration files)", prefkey);
+            msg += "\n" + tr("Set \"{0}\" to yes/no/ask in the preferences\n"+
+                            "to control the autoloading of calibration files.", prefkey);
             msg += "\n" + tr("Do you want to apply it ?");
             int answer = JOptionPane.showConfirmDialog(Main.parent, msg, tr("Load calibration file ?"), JOptionPane.YES_NO_OPTION);
@@ -250 +250 @@
         else {
             msg += "\n" + tr("It will be applied automatically.");
-            msg += "\n" + tr("Also, frow now on, cal files will always be loaded automatically.");
-            msg += "\n" + tr("Set  \"{0}\"  to yes/no/ask in the preferences\n"+
+            msg += "\n" + tr("Also, from now on, calibration files will always be loaded automatically.");
+            msg += "\n" + tr("Set \"{0}\" to yes/no/ask in the preferences\n"+
                             "to control the autoloading of calibration files.", prefkey);
             // TODO: there should be here a yes/no dialog with a checkbox "do not ask again"