REVISION

 <?xml version="1.0" encoding="UTF-8"?>
 <info>
 <entry
-   path="trunk"
-   revision="14163"
-   kind="dir">
+   revision="14178"
+   kind="dir"
+   path="trunk">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="14163">
+   revision="14178">
 <author>Don-vip</author>
-<date>2018-08-18T14:16:51.824092Z</date>
+<date>2018-08-22T17:44:25.261472Z</date>
 </commit>
 </entry>
 </info>

appveyor.yml

 version: '{build}'
-branches:
-  only:
-    - mirror
 image: Visual Studio 2017
 install:
   - cinst ant
   - refreshenv
 build_script:
-  - ant compile javadoc dist distmac checkstyle pmd spotbugs
+  - ant compile dist distmac checkstyle pmd spotbugs
 test_script:
-  - ant test
-after_test:
+  - ant test-unit-hardfail
+on_finish:
   - ps: |
         $wc = New-Object 'System.Net.WebClient'
         Get-ChildItem . -Name -Recurse 'TEST-*.xml'  |

build.xml

@@ -53,26 +53,20 @@
         <condition property="clevel" value="${clevel}" else="9">
             <isset property="clevel"/>
         </condition>
-        <!-- For Java9-specific stuff -->
-        <condition property="isJava9">
-            <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
-        </condition>
-        <!-- For Java10-specific stuff -->
-        <condition property="isJava10">
-            <matches string="${ant.java.version}" pattern="1[0-9]" />
-        </condition>
-        <!-- For Java11-specific stuff -->
-        <condition property="isJava11">
-            <matches string="${ant.java.version}" pattern="1[1-9]" />
-        </condition>
+        <!-- For Java specific stuff by version -->
+        <condition property="isJava9"><matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" /></condition>
+        <condition property="isJava10"><matches string="${ant.java.version}" pattern="1[0-9]" /></condition>
+        <condition property="isJava11"><matches string="${ant.java.version}" pattern="1[1-9]" /></condition>
+        <condition property="isJava12"><matches string="${ant.java.version}" pattern="1[2-9]" /></condition>
+        <condition property="isJava13"><matches string="${ant.java.version}" pattern="1[3-9]" /></condition>
         <!-- error_prone works differently on Java 10+, see https://github.com/google/error-prone/issues/860 -->
         <condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
             <isset property="isJava10"/>
         </condition>
-        <!-- Disable jacoco on Java 11+, see https://github.com/jacoco/jacoco/issues/629 -->
+        <!-- Disable jacoco on Java 13+, see https://github.com/jacoco/jacoco/pull/738 -->
         <condition property="coverageByDefault">
             <not>
-                <isset property="isJava11"/>
+                <isset property="isJava13"/>
             </not>
         </condition>
         <path id="groovy.classpath">
@@ -771,6 +765,7 @@ Build-Date: ${build.tstamp}
             <ignore classname="groovy.*"/>
             <ignore classname="io.*"/>
             <ignore classname="it.*"/>
+            <ignore classname="java.lang.invoke.MethodHandle"/>
             <ignore classname="javax.*"/>
             <ignore classname="jogamp.*"/>
             <ignore classname="junit.*"/>
@@ -787,6 +782,7 @@ Build-Date: ${build.tstamp}
             <ignore classname="org.dom4j.*"/>
             <ignore classname="org.eclipse.*"/>
             <ignore classname="org.ejml.*"/>
+            <ignore classname="org.fusesource.*"/>
             <ignore classname="org.gdal.*"/>
             <ignore classname="org.hibernate.*"/>
             <ignore classname="org.hsqldb.*"/>
@@ -795,11 +791,13 @@ Build-Date: ${build.tstamp}
             <ignore classname="org.jaitools.*"/>
             <ignore classname="org.jaxen.*"/>
             <ignore classname="org.jboss.*"/>
+            <ignore classname="org.jctools.*"/>
             <ignore classname="org.jdom.*"/>
             <ignore classname="org.jdom2.*"/>
             <ignore classname="org.jfree.*"/>
             <ignore classname="org.jgraph.*"/>
             <ignore classname="org.joda.*"/>
+            <ignore classname="org.json.*"/>
             <ignore classname="org.junit.*"/>
             <ignore classname="org.jvnet.*"/>
             <ignore classname="org.kxml2.*"/>

debian/changelog

+josm (0.0.svn14178+dfsg-1) unstable; urgency=medium
+
+  * New hotfix tested snapshot.
+    See: #900912
+  * Refresh patches.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 22 Aug 2018 20:56:22 +0200
+
 josm (0.0.svn14163+dfsg-1) unstable; urgency=medium
 
   * New tested snapshot.

debian/patches/00-build.patch

@@ -17,7 +17,7 @@ Forwarded: not-needed
          <property name="error_prone_ant.jar" location="${tools.dir}/error_prone_ant.jar"/>
          <property name="dist.jar" location="${dist.dir}/josm-custom.jar"/>
          <property name="dist-optimized.jar" location="${dist.dir}/josm-custom-optimized.jar"/>
-@@ -76,10 +77,23 @@
+@@ -70,10 +71,23 @@
              </not>
          </condition>
          <path id="groovy.classpath">
@@ -43,7 +43,7 @@ Forwarded: not-needed
          <path id="test.classpath">
              <fileset dir="${test.dir}/lib">
                  <include name="**/*.jar"/>
-@@ -142,10 +156,9 @@
+@@ -136,10 +150,9 @@
      <!--
        ** Creates the REVISION file to be included in the distribution
      -->
@@ -56,7 +56,7 @@ Forwarded: not-needed
          <tstamp>
              <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
          </tstamp>
-@@ -156,8 +169,10 @@
+@@ -150,8 +163,10 @@
          <echo file="${revision.dir}/REVISION">
  # automatically generated by JOSM build.xml - do not edit
  Revision: ${version.entry.commit.revision}
@@ -68,7 +68,7 @@ Forwarded: not-needed
  </echo>
      </target>
      <!--
-@@ -177,7 +192,7 @@ Build-Date: ${build.tstamp}
+@@ -171,7 +186,7 @@ Build-Date: ${build.tstamp}
          <copy file="README" todir="${build.dir}"/>
          <copy file="LICENSE" todir="${build.dir}"/>
          <!-- create josm-custom.jar -->
@@ -77,7 +77,7 @@ Forwarded: not-needed
          <jar destfile="${dist.jar}" basedir="${build.dir}" level="${clevel}">
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
              <manifest>
-@@ -187,6 +202,8 @@ Build-Date: ${build.tstamp}
+@@ -181,6 +196,8 @@ Build-Date: ${build.tstamp}
                  <attribute name="Permissions" value="all-permissions"/>
                  <attribute name="Codebase" value="josm.openstreetmap.de"/>
                  <attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
@@ -86,7 +86,7 @@ Forwarded: not-needed
                  <!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
                  <attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
                  <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
-@@ -261,43 +278,21 @@ Build-Date: ${build.tstamp}
+@@ -255,43 +272,21 @@ Build-Date: ${build.tstamp}
      </target>
      <target name="javacc" depends="init" unless="javacc.notRequired">
          <mkdir dir="${mapcss.dir}/parsergen"/>
@@ -133,7 +133,7 @@ Forwarded: not-needed
              <exclude name="org/apache/commons/jcs/JCS.java"/>
              <exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
              <exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
-@@ -318,23 +313,15 @@ Build-Date: ${build.tstamp}
+@@ -312,23 +307,15 @@ Build-Date: ${build.tstamp}
              <exclude name="org/apache/commons/jcs/utils/net/**"/>
              <exclude name="org/apache/commons/jcs/utils/props/**"/>
              <exclude name="org/apache/commons/jcs/utils/servlet/**"/>
@@ -160,7 +160,7 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -348,23 +335,14 @@ Build-Date: ${build.tstamp}
+@@ -342,23 +329,14 @@ Build-Date: ${build.tstamp}
              <compilerarg value="-Xlint:unchecked"/>
              <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
              <compilerarg value="-XDignore.symbol.file"/>
@@ -185,7 +185,7 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -378,14 +356,6 @@ Build-Date: ${build.tstamp}
+@@ -372,14 +350,6 @@ Build-Date: ${build.tstamp}
              <compilerarg value="-Xlint:unchecked"/>
              <!-- Undocumented argument to ignore "Sun internal proprietary API" warning, see http://stackoverflow.com/a/13862308/2257172 -->
              <compilerarg value="-XDignore.symbol.file"/>
@@ -200,7 +200,7 @@ Forwarded: not-needed
              <compilerarg line="-Xmaxwarns 1000"/>
              <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
          </javac>
-@@ -400,6 +370,7 @@ Build-Date: ${build.tstamp}
+@@ -394,6 +364,7 @@ Build-Date: ${build.tstamp}
          </uptodate>
          <mkdir dir="${build.dir}"/>
          <mkdir dir="${dist.dir}"/>
@@ -208,7 +208,7 @@ Forwarded: not-needed
      </target>
      <target name="javadoc" depends="init-properties">
          <javadoc destdir="javadoc"
-@@ -435,6 +406,7 @@ Build-Date: ${build.tstamp}
+@@ -429,6 +400,7 @@ Build-Date: ${build.tstamp}
          <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
          <delete file="${epsg.output}"/>
          <delete file="${pmd.dir}/cache"/>
@@ -216,7 +216,7 @@ Forwarded: not-needed
      </target>
      <macrodef name="init-test-preferences">
          <attribute name="testfamily"/>
-@@ -984,6 +956,7 @@ Build-Date: ${build.tstamp}
+@@ -982,6 +954,7 @@ Build-Date: ${build.tstamp}
                  <pathelement path="${base.dir}"/>
                  <pathelement path="${proj-classpath}"/>
                  <pathelement path="${proj-build.dir}"/>

debian/patches/01-bts.patch

@@ -77,16 +77,7 @@ Forwarded: not-needed
      }
 --- a/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java
 +++ b/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java
-@@ -73,7 +73,7 @@ public class BugReportDialog extends JDi
-                 errorPanel.add(new JMultilineLabel(
-                         tr("Opening the bug report failed. Please report manually using this website:")),
-                         GBC.eol().fill(GridBagConstraints.HORIZONTAL));
--                errorPanel.add(new UrlLabel(Config.getUrls().getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
-+                errorPanel.add(new UrlLabel("https://bugs.debian.org/", 2), GBC.eop().insets(8, 0, 0, 0));
-                 errorPanel.add(new DebugTextDisplay(statusText));
- 
-                 JOptionPane.showMessageDialog(MainApplication.getMainFrame(), errorPanel, tr("You have encountered a bug in JOSM"),
-@@ -123,7 +123,8 @@ public class BugReportDialog extends JDi
+@@ -93,7 +93,8 @@ public class BugReportDialog extends JDi
      private void addMessageSection() {
          String message = tr(
                  "An unexpected exception occurred.\n" + "This is always a coding error. If you are running the latest "
@@ -96,7 +87,7 @@ Forwarded: not-needed
          Icon icon = UIManager.getIcon("OptionPane.errorIcon");
  
          JPanel panel = new JPanel(new GridBagLayout());
-@@ -141,7 +142,7 @@ public class BugReportDialog extends JDi
+@@ -111,7 +112,7 @@ public class BugReportDialog extends JDi
          panel.add(textPanel, GBC.eop().fill());
  
          panel.add(new JLabel(tr("Manually report at:")+' '), GBC.std());
@@ -105,7 +96,7 @@ Forwarded: not-needed
          JButton copy = new JButton("Copy to clipboard");
          copy.addActionListener(e -> textPanel.copyToClipboard());
          panel.add(copy, GBC.eol().anchor(GBC.EAST));
-@@ -161,8 +162,7 @@ public class BugReportDialog extends JDi
+@@ -131,8 +132,7 @@ public class BugReportDialog extends JDi
          JMultilineLabel helpText = new JMultilineLabel(
                  tr("If you are running the latest version of JOSM and the plugins, "
                          + "please file a bug report in our bugtracker.\n"
@@ -115,7 +106,7 @@ Forwarded: not-needed
                          + "the error and try to supply as much detail as possible."));
          helpText.setMaxWidth(MAX_MESSAGE_SIZE);
          panel.add(helpText, GBC.eop().fill(GridBagConstraints.HORIZONTAL));
-@@ -174,9 +174,6 @@ public class BugReportDialog extends JDi
+@@ -144,9 +144,6 @@ public class BugReportDialog extends JDi
          }
          panel.add(settings);
  
@@ -156,3 +147,14 @@ Forwarded: not-needed
      }
  
      private static String retrieveDebugToken(Document document) throws XPathExpressionException, BugReportSenderException {
+--- a/src/org/openstreetmap/josm/gui/bugreport/DefaultBugReportSendingHandler.java
++++ b/src/org/openstreetmap/josm/gui/bugreport/DefaultBugReportSendingHandler.java
+@@ -37,7 +37,7 @@ public class DefaultBugReportSendingHand
+             errorPanel.add(new JMultilineLabel(
+                     tr("Opening the bug report failed. Please report manually using this website:")),
+                     GBC.eol().fill(GridBagConstraints.HORIZONTAL));
+-            errorPanel.add(new UrlLabel(Config.getUrls().getJOSMWebsite() + "/newticket", 2), GBC.eop().insets(8, 0, 0, 0));
++            errorPanel.add(new UrlLabel("https://bugs.debian.org/", 2), GBC.eop().insets(8, 0, 0, 0));
+             errorPanel.add(new DebugTextDisplay(statusText));
+ 
+             JOptionPane.showMessageDialog(MainApplication.getMainFrame(), errorPanel, tr("You have encountered a bug in JOSM"),

debian/patches/03-default_look_and_feel.patch

@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
 +++ b/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java
-@@ -91,7 +91,7 @@ public class PlatformHookUnixoid impleme
+@@ -99,7 +99,7 @@ public class PlatformHookUnixoid impleme
  
      @Override
      public String getDefaultStyle() {

debian/patches/04-use_system_jmapviewer.patch

@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -212,7 +212,6 @@ Debian-Release: ${debian.version}
+@@ -206,7 +206,6 @@ Debian-Release: ${debian.version}
              <zipfileset dir="images" prefix="images"/>
              <zipfileset dir="data" prefix="data"/>
              <zipfileset dir="styles" prefix="styles"/>

debian/patches/05-fix_version.patch

@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -197,7 +197,7 @@ Debian-Release: ${debian.version}
+@@ -191,7 +191,7 @@ Debian-Release: ${debian.version}
              <!-- add attribute excludes="**/*BZip2*,**/*Bzip2*" to create a non-bzip2 supporting jar -->
              <manifest>
                  <attribute name="Main-class" value="org.openstreetmap.josm.gui.MainApplication"/>

debian/patches/06-move_data_out_of_jar.patch

@@ -6,7 +6,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -209,9 +209,6 @@ Debian-Release: ${debian.version}
+@@ -203,9 +203,6 @@ Debian-Release: ${debian.version}
                  <attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
              </manifest>
              <service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />

i18n/po/af.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-18 03:39+0200\n"
+"POT-Creation-Date: 2018-08-22 03:43+0200\n"
 "PO-Revision-Date: 2018-05-18 08:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2018-08-18 04:31+0000\n"
+"X-Launchpad-Export-Date: 2018-08-22 04:30+0000\n"
 "X-Generator: Launchpad (build 18752)\n"
 "Language: af\n"
@@ -5484,10 +5484,6 @@ msgstr ""
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
-msgid ""
-"Opening the bug report failed. Please report manually using this website:"
-msgstr ""
-
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -5535,6 +5531,10 @@ msgstr ""
 msgid "Include all stack traces."
 msgstr ""
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
 msgid "Your current version of JOSM is {0}"
 msgstr ""
@@ -28207,9 +28207,6 @@ msgstr ""
 msgid "(No elevation data)"
 msgstr ""
-msgid "Can not save preferences"
-msgstr ""
-
 msgid "Epsilon multiplier"
 msgstr ""

i18n/po/ak.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2018-08-18 03:39+0200\n"
+"POT-Creation-Date: 2018-08-22 03:43+0200\n"
 "PO-Revision-Date: 2018-06-07 19:03+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Akan <ak@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2018-08-18 04:31+0000\n"
+"X-Launchpad-Export-Date: 2018-08-22 04:31+0000\n"
 "X-Generator: Launchpad (build 18752)\n"
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -5480,10 +5480,6 @@ msgstr ""
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
-msgid ""
-"Opening the bug report failed. Please report manually using this website:"
-msgstr ""
-
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -5531,6 +5527,10 @@ msgstr ""
 msgid "Include all stack traces."
 msgstr ""
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
 msgid "Your current version of JOSM is {0}"
 msgstr ""
@@ -28203,9 +28203,6 @@ msgstr ""
 msgid "(No elevation data)"
 msgstr ""
-msgid "Can not save preferences"
-msgstr ""
-
 msgid "Epsilon multiplier"
 msgstr ""

i18n/po/am.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-18 03:39+0200\n"
+"POT-Creation-Date: 2018-08-22 03:43+0200\n"
 "PO-Revision-Date: 2018-05-18 08:09+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Amharic <am@li.org>\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2018-08-18 04:32+0000\n"
+"X-Launchpad-Export-Date: 2018-08-22 04:32+0000\n"
 "X-Generator: Launchpad (build 18752)\n"
 "Language: am\n"
@@ -5481,10 +5481,6 @@ msgstr ""
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
-msgid ""
-"Opening the bug report failed. Please report manually using this website:"
-msgstr ""
-
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -5532,6 +5528,10 @@ msgstr ""
 msgid "Include all stack traces."
 msgstr ""
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
 msgid "Your current version of JOSM is {0}"
 msgstr ""
@@ -28204,9 +28204,6 @@ msgstr ""
 msgid "(No elevation data)"
 msgstr ""
-msgid "Can not save preferences"
-msgstr ""
-
 msgid "Epsilon multiplier"
 msgstr ""

i18n/po/ar.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-08-18 03:39+0200\n"
+"POT-Creation-Date: 2018-08-22 03:43+0200\n"
 "PO-Revision-Date: 2018-07-23 20:54+0000\n"
 "Last-Translator: J H <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2018-08-18 04:33+0000\n"
+"X-Launchpad-Export-Date: 2018-08-22 04:33+0000\n"
 "X-Generator: Launchpad (build 18752)\n"
 "Language: ar\n"
@@ -5551,10 +5551,6 @@ msgstr ""
 msgid "The current value isn''t a valid tile index for the given zoom level"
 msgstr ""
-msgid ""
-"Opening the bug report failed. Please report manually using this website:"
-msgstr ""
-
 msgid "You have encountered a bug in JOSM"
 msgstr ""
@@ -5602,6 +5598,10 @@ msgstr ""
 msgid "Include all stack traces."
 msgstr ""
+msgid ""
+"Opening the bug report failed. Please report manually using this website:"
+msgstr ""
+
 msgid "Your current version of JOSM is {0}"
 msgstr ""
@@ -28293,9 +28293,6 @@ msgstr ""
 msgid "(No elevation data)"
 msgstr ""
-msgid "Can not save preferences"
-msgstr ""
-
 msgid "Epsilon multiplier"
 msgstr ""