Changeset 29433 in osm for applications
- Timestamp:
- 2013-03-29T20:57:36+01:00 (11 years ago)
- Location:
- applications/editors/josm/plugins/imagery_offset_db/src/iodb
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/imagery_offset_db/src/iodb/CalibrationLayer.java
r29430 r29433 100 100 public String getToolTipText() { 101 101 if( obj.isDeprecated() ) 102 return tr("A deprecated calibration {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor());102 return tr("A deprecated calibration of type {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor()); 103 103 else 104 return tr("A calibration {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor());104 return tr("A calibration of type {0} by {1}", OffsetInfoAction.getGeometryType(obj), obj.getAuthor()); 105 105 } 106 106 -
applications/editors/josm/plugins/imagery_offset_db/src/iodb/DeprecateOffsetAction.java
r29430 r29433 45 45 tr("Are you sure this calibration geometry is aligned badly?"); 46 46 if( JOptionPane.showConfirmDialog(Main.parent, 47 tr("Warning: deprecation is basically irreversible! ")+ "\n" + desc,47 tr("Warning: deprecation is basically irreversible!\n{0}", desc), 48 48 ImageryOffsetTools.DIALOG_TITLE, JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) != JOptionPane.YES_OPTION ) { 49 49 return; … … 78 78 } 79 79 80 String message = tr("Please enter the reason why you mark {0} as deprecated", 81 offset instanceof ImageryOffset ? tr("this imagery offset") : tr("this calibration geometry")) + ":"; 80 String message; 81 if(offset instanceof ImageryOffset) 82 message = tr("Please enter the reason why you mark this imagery offset as deprecated"); 83 else 84 message = tr("Please enter the reason why you mark this calibration geometry as deprecated"); 82 85 String reason = StoreImageryOffsetAction.queryDescription(message); 83 86 if( reason == null ) -
applications/editors/josm/plugins/imagery_offset_db/src/iodb/GetImageryOffsetAction.java
r29430 r29433 159 159 offsets = new IODBReader(inp).parse(); 160 160 } catch( Exception e ) { 161 throw new UploadException(tr("Error processing XML response ") + ": " + e.getMessage());161 throw new UploadException(tr("Error processing XML response: {0}", e.getMessage())); 162 162 } 163 163 } -
applications/editors/josm/plugins/imagery_offset_db/src/iodb/OffsetInfoAction.java
r29430 r29433 76 76 sb.append(tr("Imagery ID")).append(": ").append(((ImageryOffset)offset).getImagery()).append('\n'); 77 77 } else { 78 sb.append(tr("A calibration {0}", getGeometryType((CalibrationObject)offset))).append('\n');78 sb.append(tr("A calibration of type {0}", getGeometryType((CalibrationObject)offset))).append('\n'); 79 79 } 80 80 … … 108 108 public static String getGeometryType( CalibrationObject obj ) { 109 109 if( obj.getGeometry() == null ) 110 return "nothing"; // meant never to happen, so no translation110 return tr("nothing"); // meant never to happen 111 111 int n = obj.getGeometry().length; 112 112 if( n == 1 ) … … 117 117 return tr("polygon ({0} nodes)", n - 1); 118 118 else 119 return "geometry"; // meant never to happen, so no translation119 return tr("geometry"); // meant never to happen 120 120 } 121 121 }
Note:
See TracChangeset
for help on using the changeset viewer.