Ticket #4458: josm-typos.diff
File josm-typos.diff, 17.6 KB (added by , 14 years ago) |
---|
-
src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
216 216 tr("<html>You did not finish to merge the differences in this conflict.<br>" 217 217 + "Conflict resolutions will not be applied unless all differences<br>" 218 218 + "are resolved.<br>" 219 + "Click <strong>{0}</strong> to close anyway. <strong>Already<br>"219 + "Click <strong>{0}</strong> to close anyway. <strong>Already<br>" 220 220 + "resolved differences will not be applied.</strong><br>" 221 221 + "Click <strong>{1}</strong> to return to resolving conflicts.</html>" 222 222 , options[0].toString(), options[1].toString() -
src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentDownloadTask.java
115 115 * Replies true if the local {@see ChangesetCache} already includes the changeset with 116 116 * id <code>changesetId</code>. 117 117 * 118 * @param chang setId the changeset id118 * @param changesetId the changeset id 119 119 * @return true if the local {@see ChangesetCache} already includes the changeset with 120 120 * id <code>changesetId</code> 121 121 */ 122 protected boolean isAvailableLocally(int chang setId) {123 return ChangesetCache.getInstance().get(chang setId) != null;122 protected boolean isAvailableLocally(int changesetId) { 123 return ChangesetCache.getInstance().get(changesetId) != null; 124 124 } 125 125 126 126 /** -
src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java
29 29 */ 30 30 public class SingleChangesetDownloadPanel extends JPanel { 31 31 32 private JTextField tfChang setId;32 private JTextField tfChangesetId; 33 33 private DownloadAction actDownload; 34 34 private ChangesetIdValidator valChangesetId; 35 35 … … 43 43 ); 44 44 45 45 add(new JLabel(tr("Changeset ID: "))); 46 add(tfChang setId = new JTextField(10));47 tfChang setId.setToolTipText(tr("Enter a changset id"));48 valChangesetId =ChangesetIdValidator.decorate(tfChang setId);49 SelectAllOnFocusGainedDecorator.decorate(tfChang setId);46 add(tfChangesetId = new JTextField(10)); 47 tfChangesetId.setToolTipText(tr("Enter a changeset id")); 48 valChangesetId =ChangesetIdValidator.decorate(tfChangesetId); 49 SelectAllOnFocusGainedDecorator.decorate(tfChangesetId); 50 50 51 51 actDownload = new DownloadAction(); 52 52 SideButton btn = new SideButton(actDownload); 53 tfChang setId.addActionListener(actDownload);54 tfChang setId.getDocument().addDocumentListener(actDownload);53 tfChangesetId.addActionListener(actDownload); 54 tfChangesetId.getDocument().addDocumentListener(actDownload); 55 55 add(btn); 56 56 } 57 57 … … 65 65 * 66 66 * @return the changeset id entered in this panel 67 67 */ 68 public int getChang setId() {68 public int getChangesetId() { 69 69 return valChangesetId.getChangesetId(); 70 70 } 71 71 … … 83 83 public void actionPerformed(ActionEvent arg0) { 84 84 if (!isEnabled()) 85 85 return; 86 int id = getChang setId();86 int id = getChangesetId(); 87 87 if (id == 0) return; 88 88 ChangesetContentDownloadTask task = new ChangesetContentDownloadTask( 89 89 SingleChangesetDownloadPanel.this, … … 93 93 } 94 94 95 95 protected void updateEnabledState() { 96 String v = tfChang setId.getText();96 String v = tfChangesetId.getText(); 97 97 if (v == null || v.trim().length() == 0) { 98 98 setEnabled(false); 99 99 return; -
src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java
106 106 gc.fill = GridBagConstraints.HORIZONTAL; 107 107 gc.weightx = 1.0; 108 108 pnl.add(cbMyChangesetsOnly = new JCheckBox(tr("Download my changesets only")), gc); 109 cbMyChangesetsOnly.setToolTipText(tr("<html>Select to restrict the query to your chang sets only.<br>Unselect to include all changesets in the query.</html>"));109 cbMyChangesetsOnly.setToolTipText(tr("<html>Select to restrict the query to your changesets only.<br>Unselect to include all changesets in the query.</html>")); 110 110 111 111 // grab remaining space 112 112 gc.gridx = 0; -
src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryTask.java
37 37 private ChangesetQuery query; 38 38 /** true if the task was canceled */ 39 39 private boolean canceled; 40 /** the set of downloaded chang sets */40 /** the set of downloaded changesets */ 41 41 private Set<Changeset> downloadedChangesets; 42 42 /** the last exception remembered, if any */ 43 43 private Exception lastException; -
src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
1079 1079 new ButtonSpec( 1080 1080 tr("No, continue editing"), 1081 1081 ImageProvider.get("cancel"), 1082 tr("Click to toreturn to the relation editor and to resume relation editing") ,1082 tr("Click to return to the relation editor and to resume relation editing") , 1083 1083 null /* no specific help topic */ 1084 1084 ) 1085 1085 }; -
src/org/openstreetmap/josm/gui/help/HelpBrowser.java
225 225 String message = tr("<html><p class=\"warning-header\">Help content for help topic missing</p>" 226 226 + "<p class=\"warning-body\">Help content for the help topic <strong>{0}</strong> is " 227 227 + "not available yet. It is missing both in your local language ({1}) and in english.<br><br>" 228 + "Please help to improve the JOSM help system and fill in the missing information. "228 + "Please help to improve the JOSM help system and fill in the missing information. " 229 229 + "You can both edit the <a href=\"{2}\">help topic in your local language ({1})</a> and " 230 230 + "the <a href=\"{3}\">help topic in english</a>." 231 231 + "</p></html>", … … 347 347 Main.parent, 348 348 tr( 349 349 "<html>Failed to open help page for url {0}.<br>" 350 + "This is most likely due to a network problem, please check your<br>"350 + "This is most likely due to a network problem, please check<br>" 351 351 + "your internet connection</html>", 352 352 url.toString() 353 353 ), -
src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
118 118 if (im.isFullyIdentified()) { 119 119 im.setPartiallyIdentified(im.getUserName()); 120 120 } 121 System.err.println(tr("Warning: Failed to retrieve user infos for the current JOSM user. Exception swas: {0}", e.toString()));121 System.err.println(tr("Warning: Failed to retrieve user infos for the current JOSM user. Exception was: {0}", e.toString())); 122 122 } 123 123 } 124 124 -
src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java
96 96 ) 97 97 }; 98 98 int numObjectsToUploadLeft = toUpload.getSize() - processedPrimitives.size(); 99 String msg1 = tr("The server reported that the current chang set was closed.<br>"99 String msg1 = tr("The server reported that the current changeset was closed.<br>" 100 100 + "This is most likely because the changesets size exceeded the max. size<br>" 101 101 + "of {0} objects on the server ''{1}''.", 102 OsmApi.getOsmApi().getCapabilities().getMaxChang setSize(),102 OsmApi.getOsmApi().getCapabilities().getMaxChangesetSize(), 103 103 OsmApi.getOsmApi().getBaseUrl() 104 104 ); 105 105 String msg2 = trn( … … 109 109 numObjectsToUploadLeft 110 110 ); 111 111 String msg3 = tr( 112 "Click ''<strong>{0}</strong>'' to continue uploading to additional new chang sets.<br>"112 "Click ''<strong>{0}</strong>'' to continue uploading to additional new changesets.<br>" 113 113 + "Click ''<strong>{1}</strong>'' to return to the upload dialog.<br>" 114 114 + "Click ''<strong>{2}</strong>'' to abort uploading and return to map editing.<br>", 115 115 specs[0].text, … … 125 125 null, /* no special icon */ 126 126 specs, 127 127 specs[0], 128 ht("/Action/UploadAction#Chang setFull")128 ht("/Action/UploadAction#ChangesetFull") 129 129 ); 130 130 switch(ret) { 131 131 case 0: return MaxChangesetSizeExceededPolicy.AUTOMATICALLY_OPEN_NEW_CHANGESETS; … … 137 137 return null; 138 138 } 139 139 140 protected void openNewChang set() {140 protected void openNewChangeset() { 141 141 // make sure the current changeset is removed from the upload dialog. 142 142 // 143 143 ChangesetCache.getInstance().update(changeset); … … 146 146 this.changeset = newChangeSet; 147 147 } 148 148 149 protected boolean recoverFromChang setFullException() {149 protected boolean recoverFromChangesetFullException() { 150 150 if (toUpload.getSize() - processedPrimitives.size() == 0) { 151 151 strategy.setPolicy(MaxChangesetSizeExceededPolicy.ABORT); 152 152 return false; … … 167 167 case AUTOMATICALLY_OPEN_NEW_CHANGESETS: 168 168 // prepare the state of the task for a next iteration in uploading. 169 169 // 170 openNewChang set();170 openNewChangeset(); 171 171 toUpload.removeProcessed(processedPrimitives); 172 172 return true; 173 173 } … … 263 263 case UPLOAD_DATA: 264 264 // Most likely the changeset is full. Try to recover and continue 265 265 // with a new changeset, but let the user decide first (see 266 // recoverFromChang setFullException)266 // recoverFromChangesetFullException) 267 267 // 268 if (recoverFromChang setFullException()) {268 if (recoverFromChangesetFullException()) { 269 269 continue; 270 270 } 271 271 lastException = e; -
src/org/openstreetmap/josm/gui/io/CredentialDialog.java
235 235 protected void build() { 236 236 super.build(); 237 237 tfUserName.setToolTipText(tr("Please enter the user name of your OSM account")); 238 tfPassword.setToolTipText(tr("Please enter the password nameof your OSM account"));238 tfPassword.setToolTipText(tr("Please enter the password of your OSM account")); 239 239 lblHeading.setText( 240 240 "<html>" + tr("Authenticating at the OSM API ''{0}'' failed. Please enter a valid username and a valid password.", 241 241 OsmApi.getOsmApi().getBaseUrl()) + "</html>"); -
src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java
190 190 * know what {@see OsmPrimitive} actually caused the conflict (for whatever reason) 191 191 * 192 192 */ 193 protected void handleUploadConflictForClosedChangeset(long chang setId, Date d) {193 protected void handleUploadConflictForClosedChangeset(long changesetId, Date d) { 194 194 String msg = tr("<html>Uploading <strong>failed</strong> because you have been using<br>" 195 195 + "changeset {0} which was already closed at {1}.<br>" 196 196 + "Please upload again with a new or an existing open changeset.</html>", 197 chang setId, new SimpleDateFormat().format(d)197 changesetId, new SimpleDateFormat().format(d) 198 198 ); 199 199 JOptionPane.showMessageDialog( 200 200 Main.parent, -
src/org/openstreetmap/josm/io/Capabilities.java
79 79 * 80 80 * @return the max number of objects in a changeset 81 81 */ 82 public int getMaxChang setSize() {82 public int getMaxChangesetSize() { 83 83 String v = get("changesets", "maximum_elements"); 84 84 if (v == null) return -1; 85 85 try { -
src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
163 163 /** 164 164 * Downloads the content of a changeset 165 165 * 166 * @param id the chang set id. >0 required.166 * @param id the changeset id. >0 required. 167 167 * @param monitor the progress monitor. {@see NullProgressMonitor#INSTANCE} assumed if null. 168 * @return the chang set content168 * @return the changeset content 169 169 * @throws IllegalArgumentException thrown if id <= 0 170 170 * @throws OsmTransferException thrown if something went wrong 171 171 */ -
src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
155 155 } 156 156 157 157 /** 158 * appends a {@see Way}s id and the list of ids of nodes the way refers to t o the list of ids which will be fetched from the server.158 * appends a {@see Way}s id and the list of ids of nodes the way refers to the list of ids which will be fetched from the server. 159 159 * 160 160 * @param way the way (ignored, if null) 161 161 * @return this -
src/org/openstreetmap/josm/data/APIDataSet.java
276 276 } 277 277 278 278 /** 279 * Utility class to sort a collection of ofnew relations with their dependencies279 * Utility class to sort a collection of new relations with their dependencies 280 280 * topologically. 281 281 * 282 282 */ -
src/org/openstreetmap/josm/data/conflict/ConflictCollection.java
82 82 /** 83 83 * Adds a conflict to the collection of conflicts. 84 84 * 85 * @param conflict the conflict to toadd. Must not be null.85 * @param conflict the conflict to add. Must not be null. 86 86 * @throws IllegalArgumentException thrown, if conflict is null 87 87 * @throws IllegalStateException thrown if this collection already includes a conflict for conflict.getMy() 88 88 *