Index: /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
===================================================================
--- /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java	(revision 26344)
+++ /applications/editors/josm/plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java	(revision 26345)
@@ -45,5 +45,5 @@
     private JCheckBox autoFirstLayer = new JCheckBox(tr("Select first WMS layer in list."));
 
-    private JCheckBox dontUseRelation = new JCheckBox(tr("Don't use relation for addresses (but \"addr:street\" on elements)."));
+    private JCheckBox dontUseRelation = new JCheckBox(tr("Don''t use relation for addresses (but \"addr:street\" on elements)."));
 
     private JRadioButton grabMultiplier1 = new JRadioButton("", true);
@@ -292,5 +292,5 @@
         // option to add the "Tableau d'assemblage" in list of sheets to grab
         enableTableauAssemblage.setSelected(Main.pref.getBoolean("cadastrewms.useTA", false));
-        enableTableauAssemblage.setToolTipText(tr("Add the \"Tableau(x) d'assemblage\" in the list of cadastre sheets to grab."));
+        enableTableauAssemblage.setToolTipText(tr("Add the \"Tableau(x) d''assemblage\" in the list of cadastre sheets to grab."));
         cadastrewms.add(enableTableauAssemblage, GBC.eop().insets(0, 0, 0, 0));
         // the crosspiece display
Index: /applications/editors/josm/plugins/colorscheme/build.xml
===================================================================
--- /applications/editors/josm/plugins/colorscheme/build.xml	(revision 26344)
+++ /applications/editors/josm/plugins/colorscheme/build.xml	(revision 26345)
@@ -57,5 +57,5 @@
                 <attribute name="Plugin-Class" value="at.dallermassl.josm.plugin.colorscheme.ColorSchemePlugin"/>
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but true :-)"/>
+                <attribute name="Plugin-Description" value="Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in preferences and ''Map Settings'' (strange but true :-)"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
Index: /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java
===================================================================
--- /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java	(revision 26344)
+++ /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/core/access/ImplicationXMLReader.java	(revision 26345)
@@ -93,5 +93,5 @@
                 if (name.equals("condition")) {
                     if (!currentConditionReader.isFinished()) {
-                        throw new SAXException(tr("Condition isn't finished at </condition> tag"));
+                        throw new SAXException(tr("Condition isn''t finished at </condition> tag"));
                     } else {
                         currentCondition = currentConditionReader.getCondition();
Index: /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java
===================================================================
--- /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java	(revision 26344)
+++ /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/GraphViewPlugin.java	(revision 26345)
@@ -208,5 +208,5 @@
                 rulesetInputStream = rulesetURL.openStream();
             } else {
-                throw new FileNotFoundException(tr("Couldn't find built-in ruleset {0}", ruleset));
+                throw new FileNotFoundException(tr("Couldn''t find built-in ruleset {0}", ruleset));
             }
 
Index: /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java
===================================================================
--- /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java	(revision 26344)
+++ /applications/editors/josm/plugins/graphview/src/org/openstreetmap/josm/plugins/graphview/plugin/preferences/VehiclePropertyStringParser.java	(revision 26345)
@@ -36,5 +36,5 @@
     public static final String ERROR_LENGTH =
         tr("Lengths must be given as positive decimal numbers with unit \"m\", \"km\", \"mi\"" +
-        " or without unit.\nAlternatively, the format FEET' INCHES\" can be used.");
+        " or without unit.\nAlternatively, the format FEET'' INCHES\" can be used.");
     public static final String ERROR_SPEED =
         tr("Speeds should be given as numbers without unit or "
@@ -45,5 +45,5 @@
         tr("Tracktype grades must be given as integers between 0 and 5.");
     public static final String ERROR_SURFACE =
-        tr("Surface values must not contain any of the following characters: '','', ''{'',  ''}'', ''='', ''|''");
+        tr("Surface values must not contain any of the following characters: '','', '''{''',  '''}''', ''='', ''|''");
 
     private static final List<Character> FORBIDDEN_SURFACE_CHARS =
Index: /applications/editors/josm/plugins/imagewaypoint/build.xml
===================================================================
--- /applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 26344)
+++ /applications/editors/josm/plugins/imagewaypoint/build.xml	(revision 26345)
@@ -60,5 +60,5 @@
                 <attribute name="Plugin-Class" value="org.insignificant.josm.plugins.imagewaypoint.ImageWayPointPlugin"/>
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
-                <attribute name="Plugin-Description" value="Another plugin to match images to the waypoints in a GPX file. A match is made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches the filename of an image."/>
+                <attribute name="Plugin-Description" value="Another plugin to match images to the waypoints in a GPX file. A match is made when the ''name'', ''cmt'' or ''desc'' attribute of a waypoint tag matches the filename of an image."/>
                 <attribute name="Plugin-Early" value="false"/>
                 <attribute name="Plugin-Mainversion" value="${plugin.main.version}"/>
Index: /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java
===================================================================
--- /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java	(revision 26344)
+++ /applications/editors/josm/plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/Lakewalker.java	(revision 26345)
@@ -67,5 +67,5 @@
             i =  7;
         } else {
-            throw new ArrayIndexOutOfBoundsException(tr("Direction index '{0}' not found",direction));
+            throw new ArrayIndexOutOfBoundsException(tr("Direction index ''{0}'' not found",direction));
         }
         return i;
Index: /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java
===================================================================
--- /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java	(revision 26344)
+++ /applications/editors/josm/plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/api/NewAction.java	(revision 26345)
@@ -74,5 +74,5 @@
             id = m.group(1);
         } else {
-            throw new RuntimeException(tr("Couldn't create new bug. Result: {0}", result));
+            throw new RuntimeException(tr("Couldn''t create new bug. Result: {0}", result));
         }
 
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterDialog.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterDialog.java	(revision 26344)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/GTFSImporterDialog.java	(revision 26345)
@@ -452,5 +452,5 @@
     {
       JOptionPane.showMessageDialog
-      (null, tr("Can't parse a time from this string."), tr("Invalid value"),
+      (null, tr("Can''t parse a time from this string."), tr("Invalid value"),
        JOptionPane.ERROR_MESSAGE);
       return false;
@@ -477,5 +477,5 @@
     {
       JOptionPane.showMessageDialog
-      (null, tr("Can't parse a time from this string."), tr("Invalid value"),
+      (null, tr("Can''t parse a time from this string."), tr("Invalid value"),
        JOptionPane.ERROR_MESSAGE);
       return false;
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterDialog.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterDialog.java	(revision 26344)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/StopImporterDialog.java	(revision 26345)
@@ -614,5 +614,5 @@
     {
       JOptionPane.showMessageDialog
-      (null, tr("Can't parse a time from this string."), tr("Invalid value"),
+      (null, tr("Can''t parse a time from this string."), tr("Invalid value"),
        JOptionPane.ERROR_MESSAGE);
       return false;
@@ -639,5 +639,5 @@
     {
       JOptionPane.showMessageDialog
-      (null, tr("Can't parse a time from this string."), tr("Invalid value"),
+      (null, tr("Can''t parse a time from this string."), tr("Invalid value"),
        JOptionPane.ERROR_MESSAGE);
       return false;
Index: /applications/editors/josm/plugins/public_transport/src/public_transport/TrackReference.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/public_transport/TrackReference.java	(revision 26344)
+++ /applications/editors/josm/plugins/public_transport/src/public_transport/TrackReference.java	(revision 26345)
@@ -56,5 +56,5 @@
       {
     JOptionPane.showMessageDialog
-        (null, tr("The GPX file doesn't contain valid trackpoints. "
+        (null, tr("The GPX file doesn''t contain valid trackpoints. "
         + "Please use a GPX file that has trackpoints."), tr("GPX File Trouble"),
      JOptionPane.ERROR_MESSAGE);
@@ -110,5 +110,5 @@
         (stoplistTM.timeAt(e.getFirstRow()), e.getFirstRow(), 0);
     JOptionPane.showMessageDialog
-        (null, tr("Can't parse a time from this string."), tr("Invalid value"),
+        (null, tr("Can''t parse a time from this string."), tr("Invalid value"),
          JOptionPane.ERROR_MESSAGE);
     return;
Index: /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java
===================================================================
--- /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 26344)
+++ /applications/editors/josm/plugins/surveyor/src/at/dallermassl/josm/plugin/surveyor/SurveyorComponent.java	(revision 26345)
@@ -105,5 +105,5 @@
     public void addButton(ButtonDescription description) {
         if(description.getHotkey() != "" &&  hotKeys.contains(description.getHotkey())) {
-            JOptionPane.showMessageDialog(Main.parent, tr("Duplicate hotkey for button '{0}' - button will be ignored!",description.getLabel()));
+            JOptionPane.showMessageDialog(Main.parent, tr("Duplicate hotkey for button ''{0}'' - button will be ignored!",description.getLabel()));
         } else {
             if(rows == 0 && columns == 0) {
Index: /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java
===================================================================
--- /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java	(revision 26344)
+++ /applications/editors/josm/plugins/trustosm/src/org/openstreetmap/josm/plugins/trustosm/util/TrustGPG.java	(revision 26345)
@@ -188,5 +188,5 @@
 		p.add(keyBox);
 
-		JCheckBox keepkeyBox = new JCheckBox(tr("Don't ask again for the key"));
+		JCheckBox keepkeyBox = new JCheckBox(tr("Don''t ask again for the key"));
 		keepkeyBox.setAlignmentX(Component.LEFT_ALIGNMENT);
 		p.add(keepkeyBox);
Index: /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java
===================================================================
--- /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java	(revision 26344)
+++ /applications/editors/josm/plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java	(revision 26345)
@@ -263,5 +263,5 @@
         public PasteAction(){
             putValue(NAME, tr("Paste"));
-            putValue(SHORT_DESCRIPTION, tr("Insert 'via' objects from the clipboard"));
+            putValue(SHORT_DESCRIPTION, tr("Insert ''via'' objects from the clipboard"));
             putValue(SMALL_ICON, ImageProvider.get("paste"));
             putValue(ACCELERATOR_KEY, Shortcut.getPasteKeyStroke());