Index: /applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationLayer.java
===================================================================
--- /applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationLayer.java	(revision 29432)
+++ /applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationLayer.java	(revision 29433)
@@ -100,7 +100,7 @@
     public String getToolTipText() {
         if( obj.isDeprecated() )
-            return tr("A deprecated calibration {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor());
+            return tr("A deprecated calibration of type {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor());
         else
-            return tr("A calibration {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor());
+            return tr("A calibration of type {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor());
     }
 
Index: /applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java	(revision 29432)
+++ /applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java	(revision 29433)
@@ -45,5 +45,5 @@
                 tr("Are you sure this calibration geometry is aligned badly?");
         if( JOptionPane.showConfirmDialog(Main.parent,
-                tr("Warning: deprecation is basically irreversible!")+ "\n" + desc,
+                tr("Warning: deprecation is basically irreversible!\n{0}", desc),
                 ImageryOffsetTools.DIALOG_TITLE, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.YES_OPTION ) {
             return;
@@ -78,6 +78,9 @@
         }
 
-        String message = tr("Please enter the reason why you mark {0} as deprecated",
-                offset instanceof ImageryOffset ? tr("this imagery offset") : tr("this calibration geometry")) + ":";
+        String message;
+        if(offset instanceof ImageryOffset)
+            message = tr("Please enter the reason why you mark this imagery offset as deprecated");
+        else
+            message = tr("Please enter the reason why you mark this calibration geometry as deprecated");
         String reason = StoreImageryOffsetAction.queryDescription(message);
         if( reason == null )
Index: /applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java	(revision 29432)
+++ /applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java	(revision 29433)
@@ -159,5 +159,5 @@
                 offsets = new IODBReader(inp).parse();
             } catch( Exception e ) {
-                throw new UploadException(tr("Error processing XML response") + ": " + e.getMessage());
+                throw new UploadException(tr("Error processing XML response: {0}", e.getMessage()));
             }
         }
Index: /applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetInfoAction.java
===================================================================
--- /applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetInfoAction.java	(revision 29432)
+++ /applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetInfoAction.java	(revision 29433)
@@ -76,5 +76,5 @@
             sb.append(tr("Imagery ID")).append(": ").append(((ImageryOffset)offset).getImagery()).append('\n');
         } else {
-            sb.append(tr("A calibration {0}", getGeometryType((CalibrationObject)offset))).append('\n');
+            sb.append(tr("A calibration of type {0}", getGeometryType((CalibrationObject)offset))).append('\n');
         }
         
@@ -108,5 +108,5 @@
     public static String getGeometryType( CalibrationObject obj ) {
         if( obj.getGeometry() == null )
-            return "nothing"; // meant never to happen, so no translation
+            return tr("nothing"); // meant never to happen
         int n = obj.getGeometry().length;
         if( n == 1 )
@@ -117,5 +117,5 @@
             return tr("polygon ({0} nodes)", n - 1);
         else
-            return "geometry"; // meant never to happen, so no translation
+            return tr("geometry"); // meant never to happen
     }
 }