Index: src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- src/org/openstreetmap/josm/actions/JoinAreasAction.java (Revision 2809) +++ src/org/openstreetmap/josm/actions/JoinAreasAction.java (Arbeitskopie) @@ -135,7 +135,7 @@ List allNodes = new ArrayList(); for (Way way: ways) { if(!way.isClosed()) { - JOptionPane.showMessageDialog(Main.parent, tr("\"{0}\" is not closed and therefore can't be joined.", way.getName())); + JOptionPane.showMessageDialog(Main.parent, tr("\"{0}\" is not closed and therefore can''t be joined.", way.getName())); return; } Index: src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java =================================================================== --- src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorisationUI.java (Arbeitskopie) @@ -471,7 +471,7 @@ FullyAutomaticAuthorisationUI.this, tr("" + "The automatic process for retrieving an OAuth Access Token
" - + "from the OSM server failed because JOSM wasn't able to build
" + + "from the OSM server failed because JOSM wasn''t able to build
" + "a valid login URL from the OAuth Authorise Endpoint URL ''{0}''.

" + "Please check your advanced setting and try again." +"", Index: src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java (Arbeitskopie) @@ -869,7 +869,7 @@ throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable")); if (! synchronizedAdjustables.contains(adjustable)) - throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can't set participation in synchronized adjustment.", adjustable)); + throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can''t set participation in synchronized adjustment.", adjustable)); enabledMap.put(adjustable, isParticipating); observable.notifyObservers(); Index: src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java =================================================================== --- src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java (Arbeitskopie) @@ -98,7 +98,7 @@ if (value == null) throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "value")); if (!tags.getValues().contains(value)) - throw new IllegalStateException(tr("Tag collection doesn't include the selected value ''{0}''.", value)); + throw new IllegalStateException(tr("Tag collection doesn''t include the selected value ''{0}''.", value)); this.value = value; this.type = MultiValueDecisionType.KEEP_ONE; } Index: src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java (Arbeitskopie) @@ -214,10 +214,10 @@ tr("Continue resolving")}; int ret = JOptionPane.showOptionDialog(Main.parent, tr("You didn''t finish to merge the differences in this conflict.
" - + "Conflict resolutions won't be applied unless all differences
" + + "Conflict resolutions won''t be applied unless all differences
" + "are resolved." + "Click {0} to close anyway.Already
" - + "resolved differences won't be applied.
" + + "resolved differences won''t be applied.
" + "Click {1} to return to resolving conflicts." , options[0].toString(), options[1].toString() ), Index: src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java =================================================================== --- src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java (Arbeitskopie) @@ -341,7 +341,7 @@ protected void warnBecauseOfDeletedRelation(Relation r) { String message = tr("The child relation
" + "{0}
" - + "is deleted on the server. It can't be loaded", + + "is deleted on the server. It can''t be loaded", r.getDisplayName(DefaultNameFormatter.getInstance()) ); Index: src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java =================================================================== --- src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java (Arbeitskopie) @@ -76,7 +76,7 @@ throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "adjustable")); if (! synchronizedAdjustables.contains(adjustable)) - throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can't set participation in synchronized adjustment.", adjustable)); + throw new IllegalStateException(tr("Adjustable {0} not registered yet. Can''t set participation in synchronized adjustment.", adjustable)); enabledMap.put(adjustable, isParticipating); observable.notifyObservers(); Index: src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java =================================================================== --- src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java (Arbeitskopie) @@ -58,7 +58,7 @@ HelpAwareOptionPane.showOptionDialog( parent, tr("" - + "''{0}'' isn't a valid OSM API URL.
" + + "''{0}'' isn''t a valid OSM API URL.
" + "Please check the spelling and validate again." +"", url Index: src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java =================================================================== --- src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java (Arbeitskopie) @@ -62,7 +62,7 @@ throw new IllegalStateException(tr("Failed to update primitive with id {0} because current edit layer is null", id)); OsmPrimitive p = layer.data.getPrimitiveById(id, type); if (p == null) - throw new IllegalStateException(tr("Failed to update primitive with id {0} because current edit layer doesn't include such a primitive", id)); + throw new IllegalStateException(tr("Failed to update primitive with id {0} because current edit layer doesn''t include such a primitive", id)); Main.worker.execute(new UpdatePrimitivesTask(layer, Collections.singleton(p))); } Index: src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java =================================================================== --- src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (Revision 2809) +++ src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java (Arbeitskopie) @@ -229,11 +229,11 @@ protected void warnLayersWithIllegalFilesAndSaveRequest(List infos) { String msg = trn("{0} layer needs saving but has an associated file
" - + "which can't be written.
" + + "which can''t be written.
" + "Either select another file for this layer or discard the changes.
" + "Layer with a non-writable file:", "{0} layers need saving but have associated files
" - + "which can't be written.
" + + "which can''t be written.
" + "Either select another file for each of them or discard the changes.
" + "Layers with non-writable files:", infos.size(), Index: src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (Revision 2809) +++ src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (Arbeitskopie) @@ -111,7 +111,7 @@ if (id <= 0) return; OsmPrimitive primitive = ds.getPrimitiveById(id, type); if (primitive == null) - throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Can't infer primitive type.", id)); + throw new NoSuchElementException(tr("No primitive with id {0} in local dataset. Can''t infer primitive type.", id)); remember(primitive.getPrimitiveId()); return; } Index: src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- src/org/openstreetmap/josm/data/Preferences.java (Revision 2809) +++ src/org/openstreetmap/josm/data/Preferences.java (Arbeitskopie) @@ -446,10 +446,10 @@ File prefDir = getPreferencesDirFile(); if (prefDir.exists()) { if(!prefDir.isDirectory()) { - System.err.println(tr("Warning: Failed to initialize preferences. Preference directory ''{0}'' isn't a directory.", prefDir.getAbsoluteFile())); + System.err.println(tr("Warning: Failed to initialize preferences. Preference directory ''{0}'' isn''t a directory.", prefDir.getAbsoluteFile())); JOptionPane.showMessageDialog( Main.parent, - tr("Failed to initialize preferences.
Preference directory ''{0}'' isn't a directory.", prefDir.getAbsoluteFile()), + tr("Failed to initialize preferences.
Preference directory ''{0}'' isn''t a directory.", prefDir.getAbsoluteFile()), tr("Error"), JOptionPane.ERROR_MESSAGE ); Index: src/org/openstreetmap/josm/data/osm/DataSet.java =================================================================== --- src/org/openstreetmap/josm/data/osm/DataSet.java (Revision 2809) +++ src/org/openstreetmap/josm/data/osm/DataSet.java (Arbeitskopie) @@ -204,7 +204,7 @@ public void addPrimitive(OsmPrimitive primitive) { if (getPrimitiveById(primitive) != null) throw new DataIntegrityProblemException( - tr("Unable to add primitive {0} to the dataset because it's already included", primitive.toString())); + tr("Unable to add primitive {0} to the dataset because it''s already included", primitive.toString())); if (primitive instanceof Node) { nodes.add((Node) primitive); @@ -646,7 +646,7 @@ private OsmPrimitive getPrimitiveByIdChecked(PrimitiveId primitiveId) { OsmPrimitive result = getPrimitiveById(primitiveId); if (result == null) { - System.out.println(tr("JOSM expected to find primitive [{0} {1}] in dataset but it's not there. Please report this " + System.out.println(tr("JOSM expected to find primitive [{0} {1}] in dataset but it''s not there. Please report this " + " at http://josm.openstreetmap.de . This is not a critical error, it should be safe to continue in your work.", primitiveId.getType(), Long.toString(primitiveId.getUniqueId()))); new Exception().printStackTrace(); Index: src/org/openstreetmap/josm/command/ConflictAddCommand.java =================================================================== --- src/org/openstreetmap/josm/command/ConflictAddCommand.java (Revision 2809) +++ src/org/openstreetmap/josm/command/ConflictAddCommand.java (Arbeitskopie) @@ -31,7 +31,7 @@ Main.parent, tr("Layer ''{0}'' already has a conflict for primitive
" + "''{1}''.
" - + "This conflict can't be added.", + + "This conflict can''t be added.", getLayer().getName(), conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()) ), @@ -51,7 +51,7 @@ @Override public void undoCommand() { if (! Main.map.mapView.hasLayer(getLayer())) { - System.out.println(tr("Warning: Layer ''{0}'' doesn't exist any more. Can't remove conflict for primitive ''{1}''.", + System.out.println(tr("Warning: Layer ''{0}'' doesn''t exist any more. Can''t remove conflict for primitive ''{1}''.", getLayer().getName(), conflict.getMy().getDisplayName(DefaultNameFormatter.getInstance()) ));