.travis.yml

+language: java
+os:
+  - linux
+  - osx
+matrix:
+  include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      jdk:
+        - oraclejdk9
+        - oraclejdk8
+        - openjdk8
+    - os: osx
+      osx_image: xcode9.2
+before_install:
+  - >
+    case "${TRAVIS_OS_NAME:-linux}" in
+    linux)
+      ;;
+    osx)
+      brew update
+      brew install ant
+      ;;
+    esac;

CONTRIBUTION

@@ -62,8 +62,8 @@ is from Stuart D. Gathman and licensed with GPL.
 The Ellipsoid code (http://www.i3s.unice.fr/~johan/gps/)
 is from Johan Montagnat and licensed with GPL.
 
-The JSON code (https://java.net/projects/jsonp/)
-is from Oracle (RI for JSR 353: Java API for JSON Processing) 
+The JSON code (https://javaee.github.io/jsonp/)
+is from Oracle (RI for JSR 374: Java API for JSON Processing) 
 and licensed with GPL / classpath exception.
 
 The opening hour validation uses code from opening_hour.js

REVISION

@@ -2,7 +2,7 @@
 <info>
 <entry
    path="trunk"
-   revision="13170"
+   revision="13265"
    kind="dir">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="13170">
+   revision="13265">
 <author>Don-vip</author>
-<date>2017-11-26T13:31:59.499887Z</date>
+<date>2017-12-31T02:09:43.768156Z</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
+test_script:
+  - ant test
+after_test:
+  - ps: |
+        $wc = New-Object 'System.Net.WebClient'
+        Get-ChildItem . -Name -Recurse 'TEST-*.xml'  |
+        Foreach-Object {
+            $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path $_))
+        }
+artifacts:
+  - path: dist\josm-custom.*
+  - path: checkstyle-josm.xml
+  - path: pmd-josm.xml
+  - path: spotbugs-josm.xml
+  - path: javadoc
+    type: zip
+  - path: test\report
+    type: zip
+  - path: hs_err_pid*.log

build.xml

@@ -20,13 +20,17 @@
         <property name="src.dir" location="${base.dir}/src"/>
         <property name="build.dir" location="${base.dir}/build"/>
         <property name="dist.dir" location="${base.dir}/dist"/>
-        <property name="javacc.home" location="${base.dir}/tools"/>
+        <property name="tools.dir" location="${base.dir}/tools"/>
+        <property name="pmd.dir" location="${tools.dir}/pmd"/>
+        <property name="checkstyle.dir" location="${tools.dir}/checkstyle"/>
+        <property name="spotbugs.dir" location="${tools.dir}/spotbugs"/>
+        <property name="javacc.home" location="${tools.dir}"/>
         <property name="mapcss.dir" location="${src.dir}/org/openstreetmap/josm/gui/mappaint/mapcss"/>
         <property name="proj-build.dir" location="${base.dir}/build2"/>
         <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
         <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
-        <property name="groovy.jar" location="${base.dir}/tools/groovy-all.jar"/>
-        <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant.jar"/>
+        <property name="groovy.jar" location="${tools.dir}/groovy-all.jar"/>
+        <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"/>
         <property name="javac.compiler" value="com.google.errorprone.ErrorProneAntCompilerAdapter" />
@@ -50,10 +54,10 @@
             </fileset>
             <pathelement path="${dist.jar}"/>
             <pathelement path="${groovy.jar}"/>
-            <pathelement path="tools/spotbugs/spotbugs-annotations.jar"/>
+            <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
         </path>
         <path id="pmd.classpath">
-            <fileset dir="${base.dir}/tools/pmd/">
+            <fileset dir="${pmd.dir}">
                 <include name="*.jar"/>
             </fileset>
         </path>
@@ -165,7 +169,7 @@ Build-Date: ${build.tstamp}
     <!-- Mac OS X target -->
     <target name="mac" depends="init-properties">
         <!-- Using https://bitbucket.org/infinitekind/appbundler to create mac application bundle -->
-        <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="tools/appbundler-1.0ea.jar"/>
+        <taskdef name="bundleapp" classname="com.oracle.appbundler.AppBundlerTask" classpath="${tools.dir}/appbundler-1.0ea.jar"/>
         <!-- create MacOS X application bundle -->
         <bundleapp outputdirectory="${bundle.outdir}" name="JOSM" displayname="JOSM" executablename="JOSM" identifier="org.openstreetmap.josm"
                    mainclassname="org.openstreetmap.josm.gui.MainApplication"
@@ -195,7 +199,7 @@ Build-Date: ${build.tstamp}
         </bundleapp>
 
         <!-- appbundler lacks the possibility of defining our own keys or using a template, so update the .plist manually -->
-        <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="tools/xmltask.jar"/>
+        <taskdef name="xmltask" classname="com.oopsconsultancy.xmltask.ant.XmlTask" classpath="${tools.dir}/xmltask.jar"/>
 
         <xmltask source="${bundle.outdir}/JOSM.app/Contents/Info.plist" dest="${bundle.outdir}/JOSM.app/Contents/Info.plist" indent="false">
             <!-- remove empty CFBundleDocumentTypes definition -->
@@ -317,7 +321,7 @@ Build-Date: ${build.tstamp}
     <target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
         <!-- JOSM -->
         <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
-            excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,gnu/**"
+            excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
             destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
             <compilerclasspath>
                 <pathelement location="${error_prone_ant.jar}"/>
@@ -387,6 +391,7 @@ Build-Date: ${build.tstamp}
         <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
         <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
         <delete file="${epsg.output}"/>
+        <delete file="${pmd.dir}/cache"/>
     </target>
     <macrodef name="init-test-preferences">
         <attribute name="testfamily"/>
@@ -405,7 +410,7 @@ Build-Date: ${build.tstamp}
         <init-test-preferences testfamily="unit"/>
         <init-test-preferences testfamily="functional"/>
         <init-test-preferences testfamily="performance"/>
-        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="tools/jacocoant.jar" />
+        <taskdef uri="antlib:org.jacoco.ant" resource="org/jacoco/ant/antlib.xml" classpath="${tools.dir}/jacocoant.jar" />
     </target>
     <target name="test-clean" depends="init-properties">
         <delete dir="${test.dir}/build"/>
@@ -543,7 +548,7 @@ Build-Date: ${build.tstamp}
         </jacoco:report>
     </target>
     <target name="dist-optimized" depends="dist">
-        <taskdef resource="proguard/ant/task.properties" classpath="tools/proguard.jar"/>
+        <taskdef resource="proguard/ant/task.properties" classpath="${tools.dir}/proguard.jar"/>
         <proguard>
         -injars ${dist.jar}
         -outjars ${dist-optimized.jar}
@@ -598,7 +603,7 @@ Build-Date: ${build.tstamp}
     <target name="dist-optimized-report" depends="dist-optimized" unless="isJava9">
         <!-- generate difference report between optimized jar and normal one -->
         <exec executable="perl" dir="${basedir}">
-            <arg value="tools/japicc/japi-compliance-checker.pl"/>
+            <arg value="${tools.dir}/japicc/japi-compliance-checker.pl"/>
             <arg value="--lib=JOSM"/>
             <arg value="--keep-internal"/>
             <arg value="--v1=${version.entry.commit.revision}"/>
@@ -613,7 +618,7 @@ Build-Date: ${build.tstamp}
         <local name="plugins"/>
         <property name="dir" value="plugin-check"/>
         <typedef uri="antlib:org.codehaus.mojo.animal_sniffer">
-            <classpath path="tools/animal-sniffer-ant-tasks.jar"/>
+            <classpath path="${tools.dir}/animal-sniffer-ant-tasks.jar"/>
         </typedef>
         <mkdir dir="${dir}"/>
         <!-- List of deprecated plugins -->
@@ -744,7 +749,7 @@ Build-Date: ${build.tstamp}
         <attribute name="output"/>
         <sequential>
             <echo message="Generating Taginfo for type @{type} to @{output}"/>
-            <groovy src="${taginfoextract}" classpath="${dist.jar}:tools/spotbugs/spotbugs-annotations.jar">
+            <groovy src="${taginfoextract}" classpath="${dist.jar}:${spotbugs.dir}/spotbugs-annotations.jar">
                 <arg value="-t"/>
                 <arg value="@{type}"/>
                 <arg value="--noexit"/>
@@ -758,7 +763,7 @@ Build-Date: ${build.tstamp}
     </macrodef>
 
     <target name="taginfo" depends="dist">
-        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};tools/commons-cli-1.3.1.jar"/>
+        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
         <property name="taginfoextract" value="scripts/TagInfoExtract.groovy"/>
         <property name="imgurlprefix" value="http://josm.openstreetmap.de/download/taginfo/taginfo-img"/>
         <_taginfo type="mappaint" output="taginfo_style.json"/>
@@ -767,7 +772,7 @@ Build-Date: ${build.tstamp}
     </target>
 
     <target name="imageryindex" depends="init-properties">
-        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};tools/commons-cli-1.3.1.jar"/>
+        <taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};${tools.dir}/commons-cli-1.3.1.jar"/>
         <echo message="Checking editor imagery difference"/>
         <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.jar}">
                 <arg value="-noeli"/>
@@ -802,16 +807,16 @@ Build-Date: ${build.tstamp}
 
     <target name="checkstyle-compile" depends="init-properties">
         <mkdir dir="${checkstyle-build.dir}"/>
-        <javac sourcepath="" srcdir="${base.dir}/tools/checkstyle/src" failonerror="true"
+        <javac sourcepath="" srcdir="${checkstyle.dir}/src" failonerror="true"
             destdir="${checkstyle-build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on"
             includeantruntime="false" createMissingPackageInfoClass="false"
-            encoding="UTF-8" classpath="tools/checkstyle/checkstyle-all.jar">
+            encoding="UTF-8" classpath="${checkstyle.dir}/checkstyle-all.jar">
         </javac>
     </target>
     <target name="checkstyle" depends="checkstyle-compile">
         <taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
-             classpath="tools/checkstyle/checkstyle-all.jar:${checkstyle-build.dir}"/>
-        <checkstyle config="tools/checkstyle/josm_checks.xml">
+             classpath="${checkstyle.dir}/checkstyle-all.jar:${checkstyle-build.dir}"/>
+        <checkstyle config="${checkstyle.dir}/josm_checks.xml">
             <fileset dir="${base.dir}/src/org/openstreetmap/josm" includes="**/*.java"
                 excludes="gui/mappaint/mapcss/parsergen/*.java"/>
             <fileset dir="${base.dir}/test" includes="**/*.java"/>
@@ -821,9 +826,9 @@ Build-Date: ${build.tstamp}
     </target>
 
     <target name="spotbugs" depends="dist">
-        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="tools/spotbugs/spotbugs-ant.jar"/>
+        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${spotbugs.dir}/spotbugs-ant.jar"/>
         <path id="spotbugs-classpath">
-            <fileset dir="${base.dir}/tools/spotbugs/">
+            <fileset dir="${spotbugs.dir}">
                 <include name="*.jar"/>
             </fileset>
         </path>
@@ -832,7 +837,7 @@ Build-Date: ${build.tstamp}
                 outputFile="spotbugs-josm.xml"
                 classpath="${spotbugs-classpath}"
                 pluginList=""
-                excludeFilter="tools/spotbugs/josm-filter.xml"
+                excludeFilter="${spotbugs.dir}/josm-filter.xml"
                 effort="max"
                 reportLevel="low"
                 >
@@ -843,9 +848,9 @@ Build-Date: ${build.tstamp}
 
     <target name="pmd" depends="init-properties">
         <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask" classpath="${toString:pmd.classpath}"/>
-        <pmd shortFilenames="true" encoding="UTF-8">
+        <pmd shortFilenames="true" cacheLocation="${pmd.dir}/cache" encoding="UTF-8">
             <sourceLanguage name="java" version="${java.lang.version}" />
-            <ruleset>${base.dir}/tools/pmd/josm-ruleset.xml</ruleset>
+            <ruleset>${pmd.dir}/josm-ruleset.xml</ruleset>
             <formatter type="text" toConsole="true" />
             <formatter type="xml" toFile="pmd-josm.xml">
                 <param name="encoding" value="UTF-8" />
@@ -881,7 +886,7 @@ Build-Date: ${build.tstamp}
       ** generate projection list.
     -->
     <target name="epsg" depends="epsg-compile">
-        <touch file="${epsg.output}"/>
+        <touch file="${epsg.output}" mkdirs="true"/>
         <java classname="BuildProjectionDefinitions" failonerror="true" fork="true">
             <sysproperty key="java.awt.headless" value="true"/>
             <classpath>

data/validator/deprecated.mapcss

@@ -1162,4 +1162,12 @@ way[direction=down][incline][incline!=down] {
   throwWarning: tr("{0} is deprecated", "{0.tag}");
   suggestAlternative: "incline";
   group: tr("deprecated tagging");
+}
+
+way[building=y],
+way[building=1] {
+  throwError: tr("{0}", "{0.tag}");
+  suggestAlternative: "building=yes";
+  group: tr("misspelled value");
+  fixAdd: "building=yes";
 }
\ No newline at end of file

data/validator/geometry.mapcss

@@ -111,7 +111,8 @@ way[highway=motorway_junction] {
   throwWarning: tr("{0} on a way. Should be used on a node.", "{0.tag}"); 
 }
 
-/* {0} on a way, should be a relation; see #10252, #14288 */
+/* {0} on a way, should be a relation; see #15642, #10252, #14288 */
+way[restriction][restriction =~ /^(no_right_turn|no_left_turn|no_u_turn|no_straight_on|only_right_turn|only_left_turn|only_straight_on|no_entry|no_exit)$/],
 way[type=multipolygon],
 way[route=bus] {
   throwError: tr("{0} on a way. Should be used in a relation", "{0.tag}"); 

debian/changelog

+josm (0.0.svn13265+dfsg-1) UNRELEASED; urgency=medium
+
+  * New tested snapshot.
+  * Update copyright years for JSON sources.
+  * Refresh patches.
+  * Bump Standards-Version to 4.1.2, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 31 Dec 2017 20:21:38 +0100
+
 josm (0.0.svn13170+dfsg-2) unstable; urgency=medium
 
   * Bump minimum required jmapviewer version to 2.4.

debian/control

@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9~),
                libsvgsalamander-java,
                libterm-readkey-perl,
                openjfx
-Standards-Version: 4.1.1
+Standards-Version: 4.1.2
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm.git
 Homepage: https://josm.openstreetmap.de

debian/copyright

@@ -124,7 +124,7 @@ License: LGPL-2.1+
 
 Files: src/javax/json/*
  src/org/glassfish/json/*
-Copyright: 2011-2013, Oracle and/or its affiliates
+Copyright: 2011-2017, Oracle and/or its affiliates
 Comment: The contents of this file are subject to the terms of either the GNU
  General Public License Version 2 only ("GPL") or the Common Development
  and Distribution License("CDDL") (collectively, the "License").  You

debian/patches/00-build.patch

@@ -9,17 +9,17 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -25,7 +25,8 @@
+@@ -29,7 +29,8 @@
          <property name="proj-build.dir" location="${base.dir}/build2"/>
          <property name="checkstyle-build.dir" location="${base.dir}/build2"/>
          <property name="epsg.output" location="${base.dir}/data/projection/custom-epsg"/>
--        <property name="groovy.jar" location="${base.dir}/tools/groovy-all.jar"/>
+-        <property name="groovy.jar" location="${tools.dir}/groovy-all.jar"/>
 +        <property name="groovy.jar" location="/usr/share/java/groovy-all.jar"/>
 +        <property name="antcontrib.jar" value="/usr/share/java/ant-contrib.jar"/>
-         <property name="error_prone_ant.jar" location="${base.dir}/tools/error_prone_ant.jar"/>
+         <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"/>
-@@ -44,6 +45,19 @@
+@@ -48,6 +49,19 @@
          <condition property="isJava9">
              <matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
          </condition>
@@ -39,7 +39,7 @@ Forwarded: not-needed
          <path id="test.classpath">
              <fileset dir="${test.dir}/lib">
                  <include name="**/*.jar"/>
-@@ -106,10 +120,9 @@
+@@ -110,10 +124,9 @@
      <!--
        ** Creates the REVISION file to be included in the distribution
      -->
@@ -52,7 +52,7 @@ Forwarded: not-needed
          <tstamp>
              <format property="build.tstamp" pattern="yyyy-MM-dd HH:mm:ss"/>
          </tstamp>
-@@ -120,8 +133,10 @@
+@@ -124,8 +137,10 @@
          <echo file="${revision.dir}/REVISION">
  # automatically generated by JOSM build.xml - do not edit
  Revision: ${version.entry.commit.revision}
@@ -64,7 +64,7 @@ Forwarded: not-needed
  </echo>
      </target>
      <!--
-@@ -141,7 +156,7 @@ Build-Date: ${build.tstamp}
+@@ -145,7 +160,7 @@ Build-Date: ${build.tstamp}
          <copy file="README" todir="${build.dir}"/>
          <copy file="LICENSE" todir="${build.dir}"/>
          <!-- create josm-custom.jar -->
@@ -73,7 +73,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>
-@@ -151,6 +166,8 @@ Build-Date: ${build.tstamp}
+@@ -155,6 +170,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"/>
@@ -82,7 +82,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" />
-@@ -225,43 +242,21 @@ Build-Date: ${build.tstamp}
+@@ -229,43 +246,21 @@ Build-Date: ${build.tstamp}
      </target>
      <target name="javacc" depends="init" unless="javacc.notRequired">
          <mkdir dir="${mapcss.dir}/parsergen"/>
@@ -129,7 +129,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"/>
-@@ -282,21 +277,15 @@ Build-Date: ${build.tstamp}
+@@ -286,21 +281,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/**"/>
@@ -154,7 +154,7 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -310,18 +299,14 @@ Build-Date: ${build.tstamp}
+@@ -314,18 +303,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"/>
@@ -166,7 +166,7 @@ Forwarded: not-needed
          <!-- JOSM -->
 -        <javac compiler="${javac.compiler}" sourcepath="" srcdir="${src.dir}"
 +        <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
-             excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,gnu/**"
+             excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**"
              destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
 -            <compilerclasspath>
 -                <pathelement location="${error_prone_ant.jar}"/>
@@ -174,7 +174,7 @@ Forwarded: not-needed
              <compilerarg value="-Xlint:cast"/>
              <compilerarg value="-Xlint:deprecation"/>
              <compilerarg value="-Xlint:dep-ann"/>
-@@ -335,12 +320,6 @@ Build-Date: ${build.tstamp}
+@@ -339,12 +324,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"/>
@@ -187,7 +187,7 @@ Forwarded: not-needed
              <compilerarg line="-Xmaxwarns 1000"/>
              <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
          </javac>
-@@ -355,6 +334,7 @@ Build-Date: ${build.tstamp}
+@@ -359,6 +338,7 @@ Build-Date: ${build.tstamp}
          </uptodate>
          <mkdir dir="${build.dir}"/>
          <mkdir dir="${dist.dir}"/>
@@ -195,15 +195,15 @@ Forwarded: not-needed
      </target>
      <target name="javadoc" depends="init-properties">
          <javadoc destdir="javadoc"
-@@ -387,6 +367,7 @@ Build-Date: ${build.tstamp}
-         <delete file="${src.dir}/org/w3/_2001/xmlschema/Adapter1.java"/>
+@@ -392,6 +372,7 @@ Build-Date: ${build.tstamp}
          <delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
          <delete file="${epsg.output}"/>
+         <delete file="${pmd.dir}/cache"/>
 +        <ant target="clean" dir="i18n"/>
      </target>
      <macrodef name="init-test-preferences">
          <attribute name="testfamily"/>
-@@ -888,6 +869,7 @@ Build-Date: ${build.tstamp}
+@@ -893,6 +874,7 @@ Build-Date: ${build.tstamp}
                  <pathelement path="${base.dir}"/>
                  <pathelement path="${proj-classpath}"/>
                  <pathelement path="${proj-build.dir}"/>

debian/patches/04-use_system_jmapviewer.patch

@@ -5,7 +5,7 @@ Forwarded: not-needed
 
 --- a/build.xml
 +++ b/build.xml
-@@ -176,7 +176,6 @@ Debian-Release: ${debian.version}
+@@ -180,7 +180,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
-@@ -161,7 +161,7 @@ Debian-Release: ${debian.version}
+@@ -165,7 +165,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
-@@ -173,9 +173,6 @@ Debian-Release: ${debian.version}
+@@ -177,9 +177,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" />
@@ -18,15 +18,15 @@ Forwarded: not-needed
      <!-- Mac OS X target -->
 --- a/src/org/openstreetmap/josm/tools/I18n.java
 +++ b/src/org/openstreetmap/josm/tools/I18n.java
-@@ -9,6 +9,7 @@ import java.io.InputStream;
+@@ -8,6 +8,7 @@ import java.io.InputStream;
  import java.lang.annotation.Retention;
  import java.lang.annotation.RetentionPolicy;
  import java.net.URL;
 +import java.net.MalformedURLException;
  import java.nio.charset.StandardCharsets;
- import java.text.MessageFormat;
- import java.util.ArrayList;
-@@ -312,7 +313,11 @@ public final class I18n {
+ import java.nio.file.Files;
+ import java.nio.file.InvalidPathException;
+@@ -313,7 +314,11 @@ public final class I18n {
      }
  
      private static URL getTranslationFile(String lang) {
@@ -41,7 +41,7 @@ Forwarded: not-needed
      /**
 --- a/src/org/openstreetmap/josm/io/CachedFile.java
 +++ b/src/org/openstreetmap/josm/io/CachedFile.java
-@@ -208,11 +208,17 @@ public class CachedFile implements Close
+@@ -207,11 +207,17 @@ public class CachedFile implements Close
          File file = getFile();
          if (file == null) {
              if (name != null && name.startsWith("resource://")) {

i18n/convmaps.pl

@@ -38,12 +38,14 @@ for my $line (@lines)
   {
     my $val = $1;
     $val =~ s/&/&/g;
+    $val =~ s/"/\\"/g;
     print "tr(\"$val\"); /* $line */\n";
   }
   elsif($line =~ /<description +lang=['"]en['"]>(.*)<\/description>/)
   {
     my $val = $1;
     $val =~ s/&amp;/&/g;
+    $val =~ s/"/\\"/g;
     print "tr(\"$val\"); /* $line */\n";
   }
   elsif($line =~ /^[ \t]*$/)

i18n/po/af.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-26 00:06+0100\n"
+"POT-Creation-Date: 2017-12-31 03:42+0100\n"
 "PO-Revision-Date: 2011-10-13 02:39+0000\n"
 "Last-Translator: Grant Slater <Unknown>\n"
 "Language-Team: Afrikaans <af@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2017-11-26 04:33+0000\n"
-"X-Generator: Launchpad (build 18509)\n"
+"X-Launchpad-Export-Date: 2017-12-31 04:33+0000\n"
+"X-Generator: Launchpad (build 18521)\n"
 "Language: af\n"
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -953,6 +953,12 @@ msgstr ""
 msgid "Select if the data should be downloaded into a new layer"
 msgstr ""
+msgid "Zoom to downloaded data"
+msgstr ""
+
+msgid "Select to zoom to entire newly downloaded data."
+msgstr ""
+
 msgid "Download Location"
 msgstr ""
@@ -2225,6 +2231,31 @@ msgstr[1] ""
 msgid "Confirmation"
 msgstr ""
+msgid "Export GPX file starting from first member"
+msgstr ""
+
+msgid "Export GPX file starting from last member"
+msgstr ""
+
+msgid "Convert to GPX layer starting from first member"
+msgstr ""
+
+msgid "Convert to GPX layer starting from last member"
+msgstr ""
+
+msgid ""
+"Flatten this relation to a single gpx track recursively, starting with the "
+"first member(s), successively continuing to the last."
+msgstr ""
+
+msgid ""
+"Flatten this relation to a single gpx track recursively, starting with the "
+"last member(s), successively continuing to the first."
+msgstr ""
+
+msgid "Selected Relations"
+msgstr ""
+
 msgid "List of recent relations"
 msgstr ""
@@ -3028,18 +3059,6 @@ msgstr ""
 msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
-msgid "Decimal Degrees"
-msgstr ""
-
-msgid "deg° min'' sec\""
-msgstr ""
-
-msgid "deg° min'' (Nautical)"
-msgstr ""
-
-msgid "Projected Coordinates"
-msgstr ""
-
 msgctxt "compass"
 msgid "S"
 msgstr ""
@@ -3056,9 +3075,21 @@ msgctxt "compass"
 msgid "E"
 msgstr ""
+msgid "deg° min'' sec\""
+msgstr ""
+
+msgid "Decimal Degrees"
+msgstr ""
+
 msgid "Unable to parse as coordinate value: ''{0}''"
 msgstr ""
+msgid "deg° min'' (Nautical)"
+msgstr ""
+
+msgid "Projected Coordinates"
+msgstr ""
+
 msgid "Date of imagery: {0}"
 msgstr ""
@@ -8231,12 +8262,6 @@ msgid ""
 "started.<br>You can open it manually from File menu or toolbar.</html>"
 msgstr ""
-msgid "Zoom to downloaded data"
-msgstr ""
-
-msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
-
 msgid ""
 "Use left click&drag to select area, arrows or right mouse button to scroll "
 "map, wheel or +/- to zoom."
@@ -9730,6 +9755,12 @@ msgstr ""
 msgid "Load tile"
 msgstr ""
+msgid "Get tile status"
+msgstr ""
+
+msgid "Force tile rendering"
+msgstr ""
+
 msgid "Failed to create tile source"
 msgstr ""
@@ -9834,8 +9865,8 @@ msgstr ""
 msgid "Description: {0}"
 msgstr ""
-msgid "{0} track"
-msgid_plural "{0} tracks"
+msgid "{0} track, {1} track segments"
+msgid_plural "{0} tracks, {1} track segments"
 msgstr[0] ""
 msgstr[1] ""
@@ -9845,6 +9876,9 @@ msgstr ""
 msgid "Length"
 msgstr ""
+msgid "Number of<br/>Segments"
+msgstr ""
+
 msgid "Length: {0}"
 msgstr ""
@@ -9858,14 +9892,37 @@ msgid_plural "{0} waypoints"
 msgstr[0] ""
 msgstr[1] ""
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid " ({0} segment)"
+msgid_plural " ({0} segments)"
 msgstr[0] ""
 msgstr[1] ""
 msgid "Save GPX file"
 msgstr ""
+msgid "Collect segments of all tracks and combine in a single track."
+msgstr ""
+
+msgid "Combine tracks of this layer"
+msgstr ""
+
+msgid "Split multiple track segments of one track into multiple tracks."
+msgstr ""
+
+msgid "Split track segments to tracks"
+msgstr ""
+
+msgid "Split the tracks of this layer to one new layer each."
+msgstr ""
+
+msgid "Split tracks to new layers"
+msgstr ""
+
 msgid "Id"
 msgstr ""
@@ -9908,6 +9965,16 @@ msgstr ""
 msgid "Trying to set a read only data layer as edit layer"
 msgstr ""
+msgid ""
+"Trying to delete the layer with background upload. Please wait until the "
+"upload is finished."
+msgstr ""
+
+msgid ""
+"A background upload is already in progress. Cannot reset state until the "
+"upload is finished."
+msgstr ""
+
 msgid "{0} note"
 msgid_plural "{0} notes"
 msgstr[0] ""
@@ -10236,40 +10303,40 @@ msgstr ""
 msgid "Display geotagged images"
 msgstr ""
-msgid "Previous"
+msgid "Next"
 msgstr ""
-msgid "Show previous Image"
+msgid "Show next Image"
 msgstr ""
 msgid "Geoimage: {0}"
 msgstr ""
-msgid "Remove photo from layer"
+msgid "Previous"
 msgstr ""
-msgid "Delete File from disk"
+msgid "Show previous Image"
 msgstr ""
-msgid "Copy image path"
+msgid "Show first Image"
 msgstr ""
-msgid "Next"
+msgid "Show last Image"
 msgstr ""
-msgid "Show next Image"
+msgid "Center view"
 msgstr ""
-msgid "Show first Image"
+msgid "Zoom best fit and 1:1"
 msgstr ""
-msgid "Show last Image"
+msgid "Remove photo from layer"
 msgstr ""
-msgid "Center view"
+msgid "Delete File from disk"
 msgstr ""
-msgid "Zoom best fit and 1:1"
+msgid "Copy image path"
 msgstr ""
 msgid "Move dialog to the side pane"
@@ -13356,8 +13423,8 @@ msgid "Deleted node {0} is part of way {1}"
 msgstr ""
 msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"Way {0} with {1} nodes is incomplete because at least one node was missing "
+"in the loaded data."
 msgstr ""
 msgid ""
@@ -14020,6 +14087,12 @@ msgstr ""
 msgid "Do you want to allow this?"
 msgstr ""
+msgid "Yes, always"
+msgstr ""
+
+msgid "Yes, once"
+msgstr ""
+
 msgid "Confirm Remote Control action"
 msgstr ""
@@ -19448,6 +19521,12 @@ msgstr ""
 msgid "Recycling Centre"
 msgstr ""
+msgid "trash"
+msgstr ""
+
+msgid "dog_excrement"
+msgstr ""
+
 msgid "Waste Disposal/Dumpster"
 msgstr ""
@@ -23423,6 +23502,12 @@ msgstr ""
 msgid "Hike & Bike"
 msgstr ""
+msgid "OpenSnowMap overlay"
+msgstr ""
+
+msgid "Overlay imagery for piste mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
@@ -23743,7 +23828,8 @@ msgstr ""
 msgid "basemap.at Orthofoto"
 msgstr ""
-msgid "Orthofoto layer provided by basemap.at. "
+msgid ""
+"Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery."
 msgstr ""
 msgid "Geoimage.at MaxRes"
@@ -24166,6 +24252,12 @@ msgstr ""
 msgid "Estonia Forestry (Maaamet)"
 msgstr ""
+msgid "Nordic snowmobile overlay"
+msgstr ""
+
+msgid "Kelkkareitit.fi snowmobile trails from OSM (Nordic coverage)"
+msgstr ""
+
 msgid "BANO"
 msgstr ""
@@ -24252,9 +24344,6 @@ msgid ""
 "- 1 m"
 msgstr ""
-msgid "Hamburg (40 cm)"
-msgstr ""
-
 msgid "Hamburg (20 cm)"
 msgstr ""
@@ -24282,10 +24371,10 @@ msgstr ""
 msgid "Berlin aerial photograph 2017"
 msgstr ""
-msgid "Deutsche Bahn VzG lines Nov 2013"
+msgid "Deutsche Bahn VzG lines Nov 2015"
 msgstr ""
-msgid "Deutsche Bahn VzG lines Nov 2015"
+msgid "Deutsche Bahn VzG lines January 2017"
 msgstr ""
 msgid "Erlangen aerial imagery (2016 5.0 cm)"
@@ -24684,18 +24773,6 @@ msgstr ""
 msgid "geoportail.lu ortho latest"
 msgstr ""
-msgid "geoportail.lu ortho 2016"
-msgstr ""
-
-msgid "Luxembourg Inspire Railway"
-msgstr ""
-
-msgid "Luxembourg Inspire Roads"
-msgstr ""
-
-msgid "Luxembourg Inspire Water"
-msgstr ""
-
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
@@ -24719,7 +24796,157 @@ msgstr ""
 msgid "LINZ NZ Topo50 Gridless Maps"
 msgstr ""
-msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "Kartverket N50 topo"
+msgstr ""
+
+msgid "Topographic map N50, equivalent to Norway 1:50.000 paper map series."
+msgstr ""
+
+msgid "Kartverket Hillshade overlay"
+msgstr ""
+
+msgid "Hillshade for Norway"
+msgstr ""
+
+msgid "Kartverket Nautical Charts"
+msgstr ""
+
+msgid ""
+"Norwegian nautical charts (includes Spitsbergen/Svalbard and Antarctica). "
+"Raster representation of paper charts. Updated biweekly."
+msgstr ""
+
+msgid "Kartverket Road Network overlay"
+msgstr ""
+
+msgid ""
+"Norwegian road network from the National Road database (NVDB), also used in "
+"Vbase and Elveg. Colours represent national, county, municipal, private and "
+"forest roads + footways/cycleways."
+msgstr ""
+
+msgid "Kartverket Trails overlay"
+msgstr ""
+
+msgid ""
+"Trails from the Norwegian database of `Tur og Friluftsruter´. Selectable "
+"categories for foot, bike and ski trails."
+msgstr ""
+
+msgid "Kartverket Place Names overlay"
+msgstr ""
+
+msgid ""
+"Official Norwegian place names from the SSR database. Selectable categories."
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
+msgid "Kartverket DTM Digital Terrain Model"
+msgstr ""
+
+msgid ""
+"Shaded relief representation of open Norwegian Digital Terrain Model (DTM) "
+"projects, i.e. earth surface without trees, buildings and other objects. "
+"Please visit hoydedata.no to determine project year."
+msgstr ""
+
+msgid "Kartverket DOM Digital Surface Model"
+msgstr ""
+
+msgid ""
+"Shaded relief representation of open Norwegian Digital Surface Model (DOM) "
+"projects, i.e. earth surface including trees, buildings and other objects on "
+"top of it. Please visit hoydedata.no to determine project year."
+msgstr ""
+
+msgid "Kartverket Historic maps"
+msgstr ""
+
+msgid "Historic maps - for the time being `Amtskartserien´ 1826-1917."
+msgstr ""
+
+msgid "Kartverket Economic Maps (historic)"
+msgstr ""
+
+msgid ""
+"1st edition of historic Economic maps for Norway 1960-90s (`Økonomisk "
+"kartverk´). Available from zoom 16. Please correct local imagery offset."
+msgstr ""
+
+msgid "Kartverket Administrative Boundaries overlay"
+msgstr ""
+
+msgid ""
+"Official administrative boundaries at the national, county and municipality "
+"levels"
+msgstr ""
+
+msgid "Kartverket Cadastral overlay"
+msgstr ""
+
+msgid ""
+"Real estate boundaries from the official land register (`matrikkelen´). "
+"Monthly update."
+msgstr ""
+
+msgid "Kartverket Aviation Obstructions overlay"
+msgstr ""
+
+msgid ""
+"Vertical obstructions to aircrafts, above 15m in rural areas and 30m in "
+"urban areas (e.g. masts, towers, high buildings, power lines)"
+msgstr ""
+
+msgid "NVE Electricity Network overlay"
+msgstr ""
+
+msgid ""
+"Power lines (high voltage network) including transformers, submarine cables "
+"and pylons. Local distribution network is not included."
+msgstr ""
+
+msgid "NVE Hydropower Plants overlay"
+msgstr ""
+
+msgid ""
+"Hydropower plants including waterways (tunnel, canal, pipeline) and dams"
+msgstr ""
+
+msgid "NVE Wind Power Plants overlay"
+msgstr ""
+
+msgid ""
+"Wind power turbines, farms and concession areas. Red colour = concession "
+"denied."
+msgstr ""
+
+msgid "NPD Offshore Installations overlay"
+msgstr ""
+
+msgid ""
+"Production platforms and oil/natural gas fields on the Norwegian continental "
+"shelf"
+msgstr ""
+
+msgid "Miljødirektoratet Protected Areas overlay"
+msgstr ""
+
+msgid ""
+"Norwegian national parks, nature reserves and other protected areas and "
+"objects from Naturbase, including Svalbard/Spitsbergen"
+msgstr ""
+
+msgid "NP Svalbard Orthophoto"
+msgstr ""
+
+msgid ""
+"Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
@@ -24781,10 +25008,10 @@ msgstr ""
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
-msgid "Geoportal 2: Ortofotomapa (aerial image)"
+msgid "Geoportal 2: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Geoportal 2: Ortofotomapa (aerial image) WMTS"
+msgid "Geoportal 2: Orthophotomap (aerial image) WMTS"
 msgstr ""
 msgid "Geoportal 2: PRNG (geo names)"
@@ -24793,118 +25020,127 @@ msgstr ""
 msgid "Geoportal 2: ISOK hillshade"
 msgstr ""
-msgid "Będzin: Ortofotomapa 2013 (aerial image)"
+msgid "polska.e-mapa.net: Buildings"
 msgstr ""
-msgid "Będzin: Budynki (buildings)"
+msgid "Będzin: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Bytom: Ortofotomapa 2012 (aerial image)"
+msgid "Będzin: Buildings"
+msgstr ""
+
+msgid "Bytom: Orthophotomap 2012 (aerial image)"
 msgstr ""
 msgid "Bytom: Fotoplan 2014 (aerial image)"
 msgstr ""
-msgid "Bytom: Budynki (buildings)"
+msgid "Bytom: Buildings"
+msgstr ""
+
+msgid "Chorzów: Buildings"
 msgstr ""
-msgid "Chorzów: Budynki (buildings)"
+msgid "Częstochowa: Buildings"
 msgstr ""
-msgid "Częstochowa: Budynki (buildings)"
+msgid "Częstochowa: Orthophotomap 2011 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
+msgid "Częstochowa: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2013 (aerial image)"
+msgid "Częstochowa: Orthophotomap 2014 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2014 (aerial image)"
+msgid "Gliwice: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
+msgid "Gliwice: Buildings"
 msgstr ""
-msgid "Gliwice: Budynki (buildings)"
+msgid "Katowice: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Katowice: Ortofotomapa (aerial image)"
+msgid "Katowice: Buildings"
 msgstr ""
-msgid "Katowice: Budynki (buildings)"
+msgid "Łódź: Buildings"
 msgstr ""
-msgid "Łódź: Budynki (buildings)"
+msgid "Łódź: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Łódź: Ortofotomapa (aerial image)"
+msgid "Powiat dębicki: Buildings"
 msgstr ""
-msgid "Powiat dębicki: Budynki (buildings)"
+msgid "Powiat lubaczowski: Buildings"
 msgstr ""
-msgid "Powiat lubaczowski: Budynki (buildings)"
+msgid "Powiat łańcucki: Buildings"
 msgstr ""
-msgid "Powiat łańcucki: Budynki (buildings)"
+msgid "Powiat poznański: Buildings"
 msgstr ""
-msgid "Powiat poznański: Budynki (buildings)"
+msgid "Powiat poznański: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Powiat poznański: Ortofotomapa (Aerial image)"
+msgid "Powiat ropczycko-sędziszowski: Buildings"
 msgstr ""
-msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgid "Powiat rzeszowski: Buildings"
 msgstr ""
-msgid "Powiat rzeszowski: Budynki (buildings)"
+msgid "Powiat rzeszowski: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Powiat rzeszowski: Ortofotomapa (Aerial image)"
+msgid "Powiat stalowowolski: Buildings"
 msgstr ""
-msgid "Powiat stalowowolski: Budynki (buildings)"
+msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
-msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgid "Przemyśl: Buildings"
 msgstr ""
-msgid "Przemyśl: Budynki (buildings)"
+msgid "Przemyśl: Ortophotomap (aerial image)"
 msgstr ""
-msgid "Przemyśl: Ortofotomapa (aerial image)"
+msgid "Ruda Śląska: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Ruda Śląska: Ortofotomapa (aerial image)"
+msgid "Rzeszów: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Rzeszów: Ortofotomapa (aerial image)"
+msgid "Rzeszów: Buildings"
 msgstr ""
-msgid "Rzeszów: Budynki (buildings)"
+msgid "Siemianowice Śląskie: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
+msgid "Siemianowice Śląskie: Buildings"
 msgstr ""
-msgid "Siemianowice Śląskie: Budynki (buildings)"
+msgid "Świętochłowice: Orthophotomap 2008 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2008 (aerial image)"
+msgid "Świętochłowice: Orthophotomap 2009 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
+msgid "Świętochłowice: Orthophotomap 2012 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2012 (aerial image)"
+msgid "Zabrze: Orthophotomap 2011 (aerial image)"
 msgstr ""
-msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
+msgid "Wrocław: Orthophotomap 2015 (aerial image)"
 msgstr ""
-msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
+msgid "Ortofotos DGRF 2004-2006 (WMS)"
+msgstr ""
+
+msgid "Ortofotos Litoral DGT 2014-2015 (WMS)"
 msgstr ""
 msgid "ScanEx IRS"
@@ -25041,6 +25277,18 @@ msgstr ""
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
+msgid "Economic Maps (historic)"
+msgstr ""
+
+msgid "Scan of ´Economic maps´ ca 1950-1980"
+msgstr ""
+
+msgid "Snowmobile map Sweden"
+msgstr ""
+
+msgid "Snowmobile trails"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
@@ -27569,15 +27817,12 @@ msgstr ""
 msgid "Displays the layer displaying the map objects detected by Mapillary"
 msgstr ""
-msgid "Start Mapillary layer"
+msgid "Open Mapillary layer"
 msgstr ""
 msgid "Mapillary"
 msgstr ""
-msgid "Create Mapillary layer"
-msgstr ""
-
 msgid "Download Mapillary images in current view"
 msgstr ""
@@ -27636,13 +27881,7 @@ msgid ""
 "issue with the internet connection."
 msgstr ""
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
+msgid "Upload Mapillary images"
 msgstr ""
 msgid "Walk mode"
@@ -27678,15 +27917,12 @@ msgstr ""
 msgid "Rewrite imported images"
 msgstr ""
-msgid "Select a folder"
+msgid "Select a directory"
 msgstr ""
 msgid "Explore"
 msgstr ""
-msgid "Select a directory"
-msgstr ""
-
 msgid "Speed limit"
 msgstr ""
@@ -27819,6 +28055,11 @@ msgstr ""
 msgid "Cut off sequences at download bounds"
 msgstr ""
+msgid ""
+"When opening Mapillary image in web browser, show the blur editor instead of "
+"the image viewer"
+msgstr ""
+
 msgid "Enable experimental beta-features (might be unstable)"
 msgstr ""
@@ -32245,6 +32486,10 @@ msgstr ""
 msgid "Unable to process file ''{0}'':"
 msgstr ""
+msgid ""
+"Writing position information to image files... Estimated time left: {0}"
+msgstr ""
+
 msgid "File could not be deleted!"
 msgstr ""
@@ -33725,9 +33970,6 @@ msgstr ""
 msgid "SUMO Export"
 msgstr ""
-msgid "Export"
-msgstr ""
-
 msgid "AutoSave LiveData"
 msgstr ""

i18n/po/am.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-26 00:06+0100\n"
+"POT-Creation-Date: 2017-12-31 03:42+0100\n"
 "PO-Revision-Date: 2010-03-30 12:09+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Amharic <am@li.org>\n"
@@ -15,8 +15,8 @@ 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: 2017-11-26 04:34+0000\n"
-"X-Generator: Launchpad (build 18509)\n"
+"X-Launchpad-Export-Date: 2017-12-31 04:34+0000\n"
+"X-Generator: Launchpad (build 18521)\n"
 "Language: am\n"
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -953,6 +953,12 @@ msgstr ""
 msgid "Select if the data should be downloaded into a new layer"
 msgstr ""
+msgid "Zoom to downloaded data"
+msgstr ""
+
+msgid "Select to zoom to entire newly downloaded data."
+msgstr ""
+
 msgid "Download Location"
 msgstr ""
@@ -2225,6 +2231,31 @@ msgstr[1] ""
 msgid "Confirmation"
 msgstr ""
+msgid "Export GPX file starting from first member"
+msgstr ""
+
+msgid "Export GPX file starting from last member"
+msgstr ""
+
+msgid "Convert to GPX layer starting from first member"
+msgstr ""
+
+msgid "Convert to GPX layer starting from last member"
+msgstr ""
+
+msgid ""
+"Flatten this relation to a single gpx track recursively, starting with the "
+"first member(s), successively continuing to the last."
+msgstr ""
+
+msgid ""
+"Flatten this relation to a single gpx track recursively, starting with the "
+"last member(s), successively continuing to the first."
+msgstr ""
+
+msgid "Selected Relations"
+msgstr ""
+
 msgid "List of recent relations"
 msgstr ""
@@ -3028,18 +3059,6 @@ msgstr ""
 msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
-msgid "Decimal Degrees"
-msgstr ""
-
-msgid "deg° min'' sec\""
-msgstr ""
-
-msgid "deg° min'' (Nautical)"
-msgstr ""
-
-msgid "Projected Coordinates"
-msgstr ""
-
 msgctxt "compass"
 msgid "S"
 msgstr ""
@@ -3056,9 +3075,21 @@ msgctxt "compass"
 msgid "E"
 msgstr ""
+msgid "deg° min'' sec\""
+msgstr ""
+
+msgid "Decimal Degrees"
+msgstr ""
+
 msgid "Unable to parse as coordinate value: ''{0}''"
 msgstr ""
+msgid "deg° min'' (Nautical)"
+msgstr ""
+
+msgid "Projected Coordinates"
+msgstr ""
+
 msgid "Date of imagery: {0}"
 msgstr ""
@@ -8231,12 +8262,6 @@ msgid ""
 "started.<br>You can open it manually from File menu or toolbar.</html>"
 msgstr ""
-msgid "Zoom to downloaded data"
-msgstr ""
-
-msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
-
 msgid ""
 "Use left click&drag to select area, arrows or right mouse button to scroll "
 "map, wheel or +/- to zoom."
@@ -9730,6 +9755,12 @@ msgstr ""
 msgid "Load tile"
 msgstr ""
+msgid "Get tile status"
+msgstr ""
+
+msgid "Force tile rendering"
+msgstr ""
+
 msgid "Failed to create tile source"
 msgstr ""
@@ -9834,8 +9865,8 @@ msgstr ""
 msgid "Description: {0}"
 msgstr ""
-msgid "{0} track"
-msgid_plural "{0} tracks"
+msgid "{0} track, {1} track segments"
+msgid_plural "{0} tracks, {1} track segments"
 msgstr[0] ""
 msgstr[1] ""
@@ -9845,6 +9876,9 @@ msgstr ""
 msgid "Length"
 msgstr ""
+msgid "Number of<br/>Segments"
+msgstr ""
+
 msgid "Length: {0}"
 msgstr ""
@@ -9858,14 +9892,37 @@ msgid_plural "{0} waypoints"
 msgstr[0] ""
 msgstr[1] ""
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid " ({0} segment)"
+msgid_plural " ({0} segments)"
 msgstr[0] ""
 msgstr[1] ""
 msgid "Save GPX file"
 msgstr ""
+msgid "Collect segments of all tracks and combine in a single track."
+msgstr ""
+
+msgid "Combine tracks of this layer"
+msgstr ""
+
+msgid "Split multiple track segments of one track into multiple tracks."
+msgstr ""
+
+msgid "Split track segments to tracks"
+msgstr ""
+
+msgid "Split the tracks of this layer to one new layer each."
+msgstr ""
+
+msgid "Split tracks to new layers"
+msgstr ""
+
 msgid "Id"
 msgstr ""
@@ -9908,6 +9965,16 @@ msgstr ""
 msgid "Trying to set a read only data layer as edit layer"
 msgstr ""
+msgid ""
+"Trying to delete the layer with background upload. Please wait until the "
+"upload is finished."
+msgstr ""
+
+msgid ""
+"A background upload is already in progress. Cannot reset state until the "
+"upload is finished."
+msgstr ""
+
 msgid "{0} note"
 msgid_plural "{0} notes"
 msgstr[0] ""
@@ -10236,40 +10303,40 @@ msgstr ""
 msgid "Display geotagged images"
 msgstr ""
-msgid "Previous"
+msgid "Next"
 msgstr ""
-msgid "Show previous Image"
+msgid "Show next Image"
 msgstr ""
 msgid "Geoimage: {0}"
 msgstr ""
-msgid "Remove photo from layer"
+msgid "Previous"
 msgstr ""
-msgid "Delete File from disk"
+msgid "Show previous Image"
 msgstr ""
-msgid "Copy image path"
+msgid "Show first Image"
 msgstr ""
-msgid "Next"
+msgid "Show last Image"
 msgstr ""
-msgid "Show next Image"
+msgid "Center view"
 msgstr ""
-msgid "Show first Image"
+msgid "Zoom best fit and 1:1"
 msgstr ""
-msgid "Show last Image"
+msgid "Remove photo from layer"
 msgstr ""
-msgid "Center view"
+msgid "Delete File from disk"
 msgstr ""
-msgid "Zoom best fit and 1:1"
+msgid "Copy image path"
 msgstr ""
 msgid "Move dialog to the side pane"
@@ -13356,8 +13423,8 @@ msgid "Deleted node {0} is part of way {1}"
 msgstr ""
 msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"Way {0} with {1} nodes is incomplete because at least one node was missing "
+"in the loaded data."
 msgstr ""
 msgid ""
@@ -14020,6 +14087,12 @@ msgstr ""
 msgid "Do you want to allow this?"
 msgstr ""
+msgid "Yes, always"
+msgstr ""
+
+msgid "Yes, once"
+msgstr ""
+
 msgid "Confirm Remote Control action"
 msgstr ""
@@ -19448,6 +19521,12 @@ msgstr ""
 msgid "Recycling Centre"
 msgstr ""
+msgid "trash"
+msgstr ""
+
+msgid "dog_excrement"
+msgstr ""
+
 msgid "Waste Disposal/Dumpster"
 msgstr ""
@@ -23423,6 +23502,12 @@ msgstr ""
 msgid "Hike & Bike"
 msgstr ""
+msgid "OpenSnowMap overlay"
+msgstr ""
+
+msgid "Overlay imagery for piste mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
@@ -23743,7 +23828,8 @@ msgstr ""
 msgid "basemap.at Orthofoto"
 msgstr ""
-msgid "Orthofoto layer provided by basemap.at. "
+msgid ""
+"Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery."
 msgstr ""
 msgid "Geoimage.at MaxRes"
@@ -24166,6 +24252,12 @@ msgstr ""
 msgid "Estonia Forestry (Maaamet)"
 msgstr ""
+msgid "Nordic snowmobile overlay"
+msgstr ""
+
+msgid "Kelkkareitit.fi snowmobile trails from OSM (Nordic coverage)"
+msgstr ""
+
 msgid "BANO"
 msgstr ""
@@ -24252,9 +24344,6 @@ msgid ""
 "- 1 m"
 msgstr ""
-msgid "Hamburg (40 cm)"
-msgstr ""
-
 msgid "Hamburg (20 cm)"
 msgstr ""
@@ -24282,10 +24371,10 @@ msgstr ""
 msgid "Berlin aerial photograph 2017"
 msgstr ""
-msgid "Deutsche Bahn VzG lines Nov 2013"
+msgid "Deutsche Bahn VzG lines Nov 2015"
 msgstr ""
-msgid "Deutsche Bahn VzG lines Nov 2015"
+msgid "Deutsche Bahn VzG lines January 2017"
 msgstr ""
 msgid "Erlangen aerial imagery (2016 5.0 cm)"
@@ -24684,18 +24773,6 @@ msgstr ""
 msgid "geoportail.lu ortho latest"
 msgstr ""
-msgid "geoportail.lu ortho 2016"
-msgstr ""
-
-msgid "Luxembourg Inspire Railway"
-msgstr ""
-
-msgid "Luxembourg Inspire Roads"
-msgstr ""
-
-msgid "Luxembourg Inspire Water"
-msgstr ""
-
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
@@ -24719,7 +24796,157 @@ msgstr ""
 msgid "LINZ NZ Topo50 Gridless Maps"
 msgstr ""
-msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "Kartverket N50 topo"
+msgstr ""
+
+msgid "Topographic map N50, equivalent to Norway 1:50.000 paper map series."
+msgstr ""
+
+msgid "Kartverket Hillshade overlay"
+msgstr ""
+
+msgid "Hillshade for Norway"
+msgstr ""
+
+msgid "Kartverket Nautical Charts"
+msgstr ""
+
+msgid ""
+"Norwegian nautical charts (includes Spitsbergen/Svalbard and Antarctica). "
+"Raster representation of paper charts. Updated biweekly."
+msgstr ""
+
+msgid "Kartverket Road Network overlay"
+msgstr ""
+
+msgid ""
+"Norwegian road network from the National Road database (NVDB), also used in "
+"Vbase and Elveg. Colours represent national, county, municipal, private and "
+"forest roads + footways/cycleways."
+msgstr ""
+
+msgid "Kartverket Trails overlay"
+msgstr ""
+
+msgid ""
+"Trails from the Norwegian database of `Tur og Friluftsruter´. Selectable "
+"categories for foot, bike and ski trails."
+msgstr ""
+
+msgid "Kartverket Place Names overlay"
+msgstr ""
+
+msgid ""
+"Official Norwegian place names from the SSR database. Selectable categories."
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
+msgid "Kartverket DTM Digital Terrain Model"
+msgstr ""
+
+msgid ""
+"Shaded relief representation of open Norwegian Digital Terrain Model (DTM) "
+"projects, i.e. earth surface without trees, buildings and other objects. "
+"Please visit hoydedata.no to determine project year."
+msgstr ""
+
+msgid "Kartverket DOM Digital Surface Model"
+msgstr ""
+
+msgid ""
+"Shaded relief representation of open Norwegian Digital Surface Model (DOM) "
+"projects, i.e. earth surface including trees, buildings and other objects on "
+"top of it. Please visit hoydedata.no to determine project year."
+msgstr ""
+
+msgid "Kartverket Historic maps"
+msgstr ""
+
+msgid "Historic maps - for the time being `Amtskartserien´ 1826-1917."
+msgstr ""
+
+msgid "Kartverket Economic Maps (historic)"
+msgstr ""
+
+msgid ""
+"1st edition of historic Economic maps for Norway 1960-90s (`Økonomisk "
+"kartverk´). Available from zoom 16. Please correct local imagery offset."
+msgstr ""
+
+msgid "Kartverket Administrative Boundaries overlay"
+msgstr ""
+
+msgid ""
+"Official administrative boundaries at the national, county and municipality "
+"levels"
+msgstr ""
+
+msgid "Kartverket Cadastral overlay"
+msgstr ""
+
+msgid ""
+"Real estate boundaries from the official land register (`matrikkelen´). "
+"Monthly update."
+msgstr ""
+
+msgid "Kartverket Aviation Obstructions overlay"
+msgstr ""
+
+msgid ""
+"Vertical obstructions to aircrafts, above 15m in rural areas and 30m in "
+"urban areas (e.g. masts, towers, high buildings, power lines)"
+msgstr ""
+
+msgid "NVE Electricity Network overlay"
+msgstr ""
+
+msgid ""
+"Power lines (high voltage network) including transformers, submarine cables "
+"and pylons. Local distribution network is not included."
+msgstr ""
+
+msgid "NVE Hydropower Plants overlay"
+msgstr ""
+
+msgid ""
+"Hydropower plants including waterways (tunnel, canal, pipeline) and dams"
+msgstr ""
+
+msgid "NVE Wind Power Plants overlay"
+msgstr ""
+
+msgid ""
+"Wind power turbines, farms and concession areas. Red colour = concession "
+"denied."
+msgstr ""
+
+msgid "NPD Offshore Installations overlay"
+msgstr ""
+
+msgid ""
+"Production platforms and oil/natural gas fields on the Norwegian continental "
+"shelf"
+msgstr ""
+
+msgid "Miljødirektoratet Protected Areas overlay"
+msgstr ""
+
+msgid ""
+"Norwegian national parks, nature reserves and other protected areas and "
+"objects from Naturbase, including Svalbard/Spitsbergen"
+msgstr ""
+
+msgid "NP Svalbard Orthophoto"
+msgstr ""
+
+msgid ""
+"Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
@@ -24781,10 +25008,10 @@ msgstr ""
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
-msgid "Geoportal 2: Ortofotomapa (aerial image)"
+msgid "Geoportal 2: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Geoportal 2: Ortofotomapa (aerial image) WMTS"
+msgid "Geoportal 2: Orthophotomap (aerial image) WMTS"
 msgstr ""
 msgid "Geoportal 2: PRNG (geo names)"
@@ -24793,118 +25020,127 @@ msgstr ""
 msgid "Geoportal 2: ISOK hillshade"
 msgstr ""
-msgid "Będzin: Ortofotomapa 2013 (aerial image)"
+msgid "polska.e-mapa.net: Buildings"
 msgstr ""
-msgid "Będzin: Budynki (buildings)"
+msgid "Będzin: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Bytom: Ortofotomapa 2012 (aerial image)"
+msgid "Będzin: Buildings"
+msgstr ""
+
+msgid "Bytom: Orthophotomap 2012 (aerial image)"
 msgstr ""
 msgid "Bytom: Fotoplan 2014 (aerial image)"
 msgstr ""
-msgid "Bytom: Budynki (buildings)"
+msgid "Bytom: Buildings"
+msgstr ""
+
+msgid "Chorzów: Buildings"
 msgstr ""
-msgid "Chorzów: Budynki (buildings)"
+msgid "Częstochowa: Buildings"
 msgstr ""
-msgid "Częstochowa: Budynki (buildings)"
+msgid "Częstochowa: Orthophotomap 2011 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
+msgid "Częstochowa: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2013 (aerial image)"
+msgid "Częstochowa: Orthophotomap 2014 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2014 (aerial image)"
+msgid "Gliwice: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
+msgid "Gliwice: Buildings"
 msgstr ""
-msgid "Gliwice: Budynki (buildings)"
+msgid "Katowice: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Katowice: Ortofotomapa (aerial image)"
+msgid "Katowice: Buildings"
 msgstr ""
-msgid "Katowice: Budynki (buildings)"
+msgid "Łódź: Buildings"
 msgstr ""
-msgid "Łódź: Budynki (buildings)"
+msgid "Łódź: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Łódź: Ortofotomapa (aerial image)"
+msgid "Powiat dębicki: Buildings"
 msgstr ""
-msgid "Powiat dębicki: Budynki (buildings)"
+msgid "Powiat lubaczowski: Buildings"
 msgstr ""
-msgid "Powiat lubaczowski: Budynki (buildings)"
+msgid "Powiat łańcucki: Buildings"
 msgstr ""
-msgid "Powiat łańcucki: Budynki (buildings)"
+msgid "Powiat poznański: Buildings"
 msgstr ""
-msgid "Powiat poznański: Budynki (buildings)"
+msgid "Powiat poznański: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Powiat poznański: Ortofotomapa (Aerial image)"
+msgid "Powiat ropczycko-sędziszowski: Buildings"
 msgstr ""
-msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgid "Powiat rzeszowski: Buildings"
 msgstr ""
-msgid "Powiat rzeszowski: Budynki (buildings)"
+msgid "Powiat rzeszowski: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Powiat rzeszowski: Ortofotomapa (Aerial image)"
+msgid "Powiat stalowowolski: Buildings"
 msgstr ""
-msgid "Powiat stalowowolski: Budynki (buildings)"
+msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
-msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgid "Przemyśl: Buildings"
 msgstr ""
-msgid "Przemyśl: Budynki (buildings)"
+msgid "Przemyśl: Ortophotomap (aerial image)"
 msgstr ""
-msgid "Przemyśl: Ortofotomapa (aerial image)"
+msgid "Ruda Śląska: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Ruda Śląska: Ortofotomapa (aerial image)"
+msgid "Rzeszów: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Rzeszów: Ortofotomapa (aerial image)"
+msgid "Rzeszów: Buildings"
 msgstr ""
-msgid "Rzeszów: Budynki (buildings)"
+msgid "Siemianowice Śląskie: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
+msgid "Siemianowice Śląskie: Buildings"
 msgstr ""
-msgid "Siemianowice Śląskie: Budynki (buildings)"
+msgid "Świętochłowice: Orthophotomap 2008 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2008 (aerial image)"
+msgid "Świętochłowice: Orthophotomap 2009 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
+msgid "Świętochłowice: Orthophotomap 2012 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2012 (aerial image)"
+msgid "Zabrze: Orthophotomap 2011 (aerial image)"
 msgstr ""
-msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
+msgid "Wrocław: Orthophotomap 2015 (aerial image)"
 msgstr ""
-msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
+msgid "Ortofotos DGRF 2004-2006 (WMS)"
+msgstr ""
+
+msgid "Ortofotos Litoral DGT 2014-2015 (WMS)"
 msgstr ""
 msgid "ScanEx IRS"
@@ -25041,6 +25277,18 @@ msgstr ""
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
+msgid "Economic Maps (historic)"
+msgstr ""
+
+msgid "Scan of ´Economic maps´ ca 1950-1980"
+msgstr ""
+
+msgid "Snowmobile map Sweden"
+msgstr ""
+
+msgid "Snowmobile trails"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
@@ -27569,15 +27817,12 @@ msgstr ""
 msgid "Displays the layer displaying the map objects detected by Mapillary"
 msgstr ""
-msgid "Start Mapillary layer"
+msgid "Open Mapillary layer"
 msgstr ""
 msgid "Mapillary"
 msgstr ""
-msgid "Create Mapillary layer"
-msgstr ""
-
 msgid "Download Mapillary images in current view"
 msgstr ""
@@ -27636,13 +27881,7 @@ msgid ""
 "issue with the internet connection."
 msgstr ""
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
+msgid "Upload Mapillary images"
 msgstr ""
 msgid "Walk mode"
@@ -27678,15 +27917,12 @@ msgstr ""
 msgid "Rewrite imported images"
 msgstr ""
-msgid "Select a folder"
+msgid "Select a directory"
 msgstr ""
 msgid "Explore"
 msgstr ""
-msgid "Select a directory"
-msgstr ""
-
 msgid "Speed limit"
 msgstr ""
@@ -27819,6 +28055,11 @@ msgstr ""
 msgid "Cut off sequences at download bounds"
 msgstr ""
+msgid ""
+"When opening Mapillary image in web browser, show the blur editor instead of "
+"the image viewer"
+msgstr ""
+
 msgid "Enable experimental beta-features (might be unstable)"
 msgstr ""
@@ -32245,6 +32486,10 @@ msgstr ""
 msgid "Unable to process file ''{0}'':"
 msgstr ""
+msgid ""
+"Writing position information to image files... Estimated time left: {0}"
+msgstr ""
+
 msgid "File could not be deleted!"
 msgstr ""
@@ -33725,9 +33970,6 @@ msgstr ""
 msgid "SUMO Export"
 msgstr ""
-msgid "Export"
-msgstr ""
-
 msgid "AutoSave LiveData"
 msgstr ""

i18n/po/ar.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-11-26 00:06+0100\n"
+"POT-Creation-Date: 2017-12-31 03:42+0100\n"
 "PO-Revision-Date: 2017-06-05 02:55+0000\n"
 "Last-Translator: Chdoula <chdoula@gmail.com>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -16,8 +16,8 @@ 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: 2017-11-26 04:34+0000\n"
-"X-Generator: Launchpad (build 18509)\n"
+"X-Launchpad-Export-Date: 2017-12-31 04:34+0000\n"
+"X-Generator: Launchpad (build 18521)\n"
 "Language: ar\n"
 msgid "{0}: option ''{1}'' is ambiguous"
@@ -967,6 +967,12 @@ msgstr "طبقة منفصلة"
 msgid "Select if the data should be downloaded into a new layer"
 msgstr "إختار إذا يجب تحميل البيانات إلى طبقة جديدة"
+msgid "Zoom to downloaded data"
+msgstr ""
+
+msgid "Select to zoom to entire newly downloaded data."
+msgstr ""
+
 msgid "Download Location"
 msgstr "موقع التنزيل"
@@ -2243,6 +2249,31 @@ msgstr[1] ""
 msgid "Confirmation"
 msgstr ""
+msgid "Export GPX file starting from first member"
+msgstr ""
+
+msgid "Export GPX file starting from last member"
+msgstr ""
+
+msgid "Convert to GPX layer starting from first member"
+msgstr ""
+
+msgid "Convert to GPX layer starting from last member"
+msgstr ""
+
+msgid ""
+"Flatten this relation to a single gpx track recursively, starting with the "
+"first member(s), successively continuing to the last."
+msgstr ""
+
+msgid ""
+"Flatten this relation to a single gpx track recursively, starting with the "
+"last member(s), successively continuing to the first."
+msgstr ""
+
+msgid "Selected Relations"
+msgstr ""
+
 msgid "List of recent relations"
 msgstr ""
@@ -3047,18 +3078,6 @@ msgstr ""
 msgid "Already registered a conflict for primitive ''{0}''."
 msgstr ""
-msgid "Decimal Degrees"
-msgstr "درجات عشرية"
-
-msgid "deg° min'' sec\""
-msgstr ""
-
-msgid "deg° min'' (Nautical)"
-msgstr ""
-
-msgid "Projected Coordinates"
-msgstr ""
-
 msgctxt "compass"
 msgid "S"
 msgstr "ج."
@@ -3075,9 +3094,21 @@ msgctxt "compass"
 msgid "E"
 msgstr "ش."
+msgid "deg° min'' sec\""
+msgstr ""
+
+msgid "Decimal Degrees"
+msgstr "درجات عشرية"
+
 msgid "Unable to parse as coordinate value: ''{0}''"
 msgstr ""
+msgid "deg° min'' (Nautical)"
+msgstr ""
+
+msgid "Projected Coordinates"
+msgstr ""
+
 msgid "Date of imagery: {0}"
 msgstr ""
@@ -8269,12 +8300,6 @@ msgid ""
 "started.<br>You can open it manually from File menu or toolbar.</html>"
 msgstr ""
-msgid "Zoom to downloaded data"
-msgstr ""
-
-msgid "Select to zoom to entire newly downloaded data."
-msgstr ""
-
 msgid ""
 "Use left click&drag to select area, arrows or right mouse button to scroll "
 "map, wheel or +/- to zoom."
@@ -9771,6 +9796,12 @@ msgstr ""
 msgid "Load tile"
 msgstr ""
+msgid "Get tile status"
+msgstr ""
+
+msgid "Force tile rendering"
+msgstr ""
+
 msgid "Failed to create tile source"
 msgstr ""
@@ -9875,8 +9906,8 @@ msgstr "الإسم: {0}"
 msgid "Description: {0}"
 msgstr "الوصف: {0}"
-msgid "{0} track"
-msgid_plural "{0} tracks"
+msgid "{0} track, {1} track segments"
+msgid_plural "{0} tracks, {1} track segments"
 msgstr[0] ""
 msgstr[1] ""
@@ -9886,6 +9917,9 @@ msgstr ""
 msgid "Length"
 msgstr ""
+msgid "Number of<br/>Segments"
+msgstr ""
+
 msgid "Length: {0}"
 msgstr ""
@@ -9899,14 +9933,37 @@ msgid_plural "{0} waypoints"
 msgstr[0] ""
 msgstr[1] ""
-msgid "{0} track, "
-msgid_plural "{0} tracks, "
+msgid "{0} track"
+msgid_plural "{0} tracks"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid " ({0} segment)"
+msgid_plural " ({0} segments)"
 msgstr[0] ""
 msgstr[1] ""
 msgid "Save GPX file"
 msgstr "إحفظ ملف GPX"
+msgid "Collect segments of all tracks and combine in a single track."
+msgstr ""
+
+msgid "Combine tracks of this layer"
+msgstr ""
+
+msgid "Split multiple track segments of one track into multiple tracks."
+msgstr ""
+
+msgid "Split track segments to tracks"
+msgstr ""
+
+msgid "Split the tracks of this layer to one new layer each."
+msgstr ""
+
+msgid "Split tracks to new layers"
+msgstr ""
+
 msgid "Id"
 msgstr ""
@@ -9949,6 +10006,16 @@ msgstr "إحفظ الطبقة"
 msgid "Trying to set a read only data layer as edit layer"
 msgstr ""
+msgid ""
+"Trying to delete the layer with background upload. Please wait until the "
+"upload is finished."
+msgstr ""
+
+msgid ""
+"A background upload is already in progress. Cannot reset state until the "
+"upload is finished."
+msgstr ""
+
 msgid "{0} note"
 msgid_plural "{0} notes"
 msgstr[0] ""
@@ -10277,40 +10344,40 @@ msgstr ""
 msgid "Display geotagged images"
 msgstr ""
-msgid "Previous"
+msgid "Next"
 msgstr ""
-msgid "Show previous Image"
+msgid "Show next Image"
 msgstr ""
 msgid "Geoimage: {0}"
 msgstr ""
-msgid "Remove photo from layer"
+msgid "Previous"
 msgstr ""
-msgid "Delete File from disk"
+msgid "Show previous Image"
 msgstr ""
-msgid "Copy image path"
+msgid "Show first Image"
 msgstr ""
-msgid "Next"
+msgid "Show last Image"
 msgstr ""
-msgid "Show next Image"
+msgid "Center view"
 msgstr ""
-msgid "Show first Image"
+msgid "Zoom best fit and 1:1"
 msgstr ""
-msgid "Show last Image"
+msgid "Remove photo from layer"
 msgstr ""
-msgid "Center view"
+msgid "Delete File from disk"
 msgstr ""
-msgid "Zoom best fit and 1:1"
+msgid "Copy image path"
 msgstr ""
 msgid "Move dialog to the side pane"
@@ -13407,8 +13474,8 @@ msgid "Deleted node {0} is part of way {1}"
 msgstr ""
 msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+"Way {0} with {1} nodes is incomplete because at least one node was missing "
+"in the loaded data."
 msgstr ""
 msgid ""
@@ -14071,6 +14138,12 @@ msgstr ""
 msgid "Do you want to allow this?"
 msgstr "هل تريد السماح بذلك ؟"
+msgid "Yes, always"
+msgstr ""
+
+msgid "Yes, once"
+msgstr ""
+
 msgid "Confirm Remote Control action"
 msgstr ""
@@ -19499,6 +19572,12 @@ msgstr ""
 msgid "Recycling Centre"
 msgstr ""
+msgid "trash"
+msgstr ""
+
+msgid "dog_excrement"
+msgstr ""
+
 msgid "Waste Disposal/Dumpster"
 msgstr ""
@@ -23474,6 +23553,12 @@ msgstr ""
 msgid "Hike & Bike"
 msgstr ""
+msgid "OpenSnowMap overlay"
+msgstr ""
+
+msgid "Overlay imagery for piste mapping in OSM. Updated daily."
+msgstr ""
+
 msgid "skobbler"
 msgstr ""
@@ -23794,7 +23879,8 @@ msgstr ""
 msgid "basemap.at Orthofoto"
 msgstr ""
-msgid "Orthofoto layer provided by basemap.at. "
+msgid ""
+"Orthofoto layer provided by basemap.at. \"Successor\" of geoimage.at imagery."
 msgstr ""
 msgid "Geoimage.at MaxRes"
@@ -24217,6 +24303,12 @@ msgstr ""
 msgid "Estonia Forestry (Maaamet)"
 msgstr ""
+msgid "Nordic snowmobile overlay"
+msgstr ""
+
+msgid "Kelkkareitit.fi snowmobile trails from OSM (Nordic coverage)"
+msgstr ""
+
 msgid "BANO"
 msgstr ""
@@ -24303,9 +24395,6 @@ msgid ""
 "- 1 m"
 msgstr ""
-msgid "Hamburg (40 cm)"
-msgstr ""
-
 msgid "Hamburg (20 cm)"
 msgstr ""
@@ -24333,10 +24422,10 @@ msgstr ""
 msgid "Berlin aerial photograph 2017"
 msgstr ""
-msgid "Deutsche Bahn VzG lines Nov 2013"
+msgid "Deutsche Bahn VzG lines Nov 2015"
 msgstr ""
-msgid "Deutsche Bahn VzG lines Nov 2015"
+msgid "Deutsche Bahn VzG lines January 2017"
 msgstr ""
 msgid "Erlangen aerial imagery (2016 5.0 cm)"
@@ -24735,18 +24824,6 @@ msgstr ""
 msgid "geoportail.lu ortho latest"
 msgstr ""
-msgid "geoportail.lu ortho 2016"
-msgstr ""
-
-msgid "Luxembourg Inspire Railway"
-msgstr ""
-
-msgid "Luxembourg Inspire Roads"
-msgstr ""
-
-msgid "Luxembourg Inspire Water"
-msgstr ""
-
 msgid "Niger Delta Oct 2012 Landsat"
 msgstr ""
@@ -24770,7 +24847,157 @@ msgstr ""
 msgid "LINZ NZ Topo50 Gridless Maps"
 msgstr ""
-msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
+msgid "Kartverket N50 topo"
+msgstr ""
+
+msgid "Topographic map N50, equivalent to Norway 1:50.000 paper map series."
+msgstr ""
+
+msgid "Kartverket Hillshade overlay"
+msgstr ""
+
+msgid "Hillshade for Norway"
+msgstr ""
+
+msgid "Kartverket Nautical Charts"
+msgstr ""
+
+msgid ""
+"Norwegian nautical charts (includes Spitsbergen/Svalbard and Antarctica). "
+"Raster representation of paper charts. Updated biweekly."
+msgstr ""
+
+msgid "Kartverket Road Network overlay"
+msgstr ""
+
+msgid ""
+"Norwegian road network from the National Road database (NVDB), also used in "
+"Vbase and Elveg. Colours represent national, county, municipal, private and "
+"forest roads + footways/cycleways."
+msgstr ""
+
+msgid "Kartverket Trails overlay"
+msgstr ""
+
+msgid ""
+"Trails from the Norwegian database of `Tur og Friluftsruter´. Selectable "
+"categories for foot, bike and ski trails."
+msgstr ""
+
+msgid "Kartverket Place Names overlay"
+msgstr ""
+
+msgid ""
+"Official Norwegian place names from the SSR database. Selectable categories."
+msgstr ""
+
+msgid "MTBmap.no"
+msgstr ""
+
+msgid ""
+"Norwegian mountain biking map from OSM (max zoom 14-16, varies per region)"
+msgstr ""
+
+msgid "Kartverket DTM Digital Terrain Model"
+msgstr ""
+
+msgid ""
+"Shaded relief representation of open Norwegian Digital Terrain Model (DTM) "
+"projects, i.e. earth surface without trees, buildings and other objects. "
+"Please visit hoydedata.no to determine project year."
+msgstr ""
+
+msgid "Kartverket DOM Digital Surface Model"
+msgstr ""
+
+msgid ""
+"Shaded relief representation of open Norwegian Digital Surface Model (DOM) "
+"projects, i.e. earth surface including trees, buildings and other objects on "
+"top of it. Please visit hoydedata.no to determine project year."
+msgstr ""
+
+msgid "Kartverket Historic maps"
+msgstr ""
+
+msgid "Historic maps - for the time being `Amtskartserien´ 1826-1917."
+msgstr ""
+
+msgid "Kartverket Economic Maps (historic)"
+msgstr ""
+
+msgid ""
+"1st edition of historic Economic maps for Norway 1960-90s (`Økonomisk "
+"kartverk´). Available from zoom 16. Please correct local imagery offset."
+msgstr ""
+
+msgid "Kartverket Administrative Boundaries overlay"
+msgstr ""
+
+msgid ""
+"Official administrative boundaries at the national, county and municipality "
+"levels"
+msgstr ""
+
+msgid "Kartverket Cadastral overlay"
+msgstr ""
+
+msgid ""
+"Real estate boundaries from the official land register (`matrikkelen´). "
+"Monthly update."
+msgstr ""
+
+msgid "Kartverket Aviation Obstructions overlay"
+msgstr ""
+
+msgid ""
+"Vertical obstructions to aircrafts, above 15m in rural areas and 30m in "
+"urban areas (e.g. masts, towers, high buildings, power lines)"
+msgstr ""
+
+msgid "NVE Electricity Network overlay"
+msgstr ""
+
+msgid ""
+"Power lines (high voltage network) including transformers, submarine cables "
+"and pylons. Local distribution network is not included."
+msgstr ""
+
+msgid "NVE Hydropower Plants overlay"
+msgstr ""
+
+msgid ""
+"Hydropower plants including waterways (tunnel, canal, pipeline) and dams"
+msgstr ""
+
+msgid "NVE Wind Power Plants overlay"
+msgstr ""
+
+msgid ""
+"Wind power turbines, farms and concession areas. Red colour = concession "
+"denied."
+msgstr ""
+
+msgid "NPD Offshore Installations overlay"
+msgstr ""
+
+msgid ""
+"Production platforms and oil/natural gas fields on the Norwegian continental "
+"shelf"
+msgstr ""
+
+msgid "Miljødirektoratet Protected Areas overlay"
+msgstr ""
+
+msgid ""
+"Norwegian national parks, nature reserves and other protected areas and "
+"objects from Naturbase, including Svalbard/Spitsbergen"
+msgstr ""
+
+msgid "NP Svalbard Orthophoto"
+msgstr ""
+
+msgid ""
+"Orthophoto for Svalbard/Spitsbergen from the Norwegian Polar Institute"
 msgstr ""
 msgid "imagico.de OSM images for mapping: Svalbard mosaic"
@@ -24832,10 +25059,10 @@ msgstr ""
 msgid "Pangasinán/Bulacan (Philippines HiRes)"
 msgstr ""
-msgid "Geoportal 2: Ortofotomapa (aerial image)"
+msgid "Geoportal 2: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Geoportal 2: Ortofotomapa (aerial image) WMTS"
+msgid "Geoportal 2: Orthophotomap (aerial image) WMTS"
 msgstr ""
 msgid "Geoportal 2: PRNG (geo names)"
@@ -24844,118 +25071,127 @@ msgstr ""
 msgid "Geoportal 2: ISOK hillshade"
 msgstr ""
-msgid "Będzin: Ortofotomapa 2013 (aerial image)"
+msgid "polska.e-mapa.net: Buildings"
 msgstr ""
-msgid "Będzin: Budynki (buildings)"
+msgid "Będzin: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Bytom: Ortofotomapa 2012 (aerial image)"
+msgid "Będzin: Buildings"
+msgstr ""
+
+msgid "Bytom: Orthophotomap 2012 (aerial image)"
 msgstr ""
 msgid "Bytom: Fotoplan 2014 (aerial image)"
 msgstr ""
-msgid "Bytom: Budynki (buildings)"
+msgid "Bytom: Buildings"
+msgstr ""
+
+msgid "Chorzów: Buildings"
 msgstr ""
-msgid "Chorzów: Budynki (buildings)"
+msgid "Częstochowa: Buildings"
 msgstr ""
-msgid "Częstochowa: Budynki (buildings)"
+msgid "Częstochowa: Orthophotomap 2011 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2011 (aerial image)"
+msgid "Częstochowa: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2013 (aerial image)"
+msgid "Częstochowa: Orthophotomap 2014 (aerial image)"
 msgstr ""
-msgid "Częstochowa: Ortofotomapa 2014 (aerial image)"
+msgid "Gliwice: Orthophotomap 2013 (aerial image)"
 msgstr ""
-msgid "Gliwice: Ortofotomapa 2013 (aerial image)"
+msgid "Gliwice: Buildings"
 msgstr ""
-msgid "Gliwice: Budynki (buildings)"
+msgid "Katowice: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Katowice: Ortofotomapa (aerial image)"
+msgid "Katowice: Buildings"
 msgstr ""
-msgid "Katowice: Budynki (buildings)"
+msgid "Łódź: Buildings"
 msgstr ""
-msgid "Łódź: Budynki (buildings)"
+msgid "Łódź: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Łódź: Ortofotomapa (aerial image)"
+msgid "Powiat dębicki: Buildings"
 msgstr ""
-msgid "Powiat dębicki: Budynki (buildings)"
+msgid "Powiat lubaczowski: Buildings"
 msgstr ""
-msgid "Powiat lubaczowski: Budynki (buildings)"
+msgid "Powiat łańcucki: Buildings"
 msgstr ""
-msgid "Powiat łańcucki: Budynki (buildings)"
+msgid "Powiat poznański: Buildings"
 msgstr ""
-msgid "Powiat poznański: Budynki (buildings)"
+msgid "Powiat poznański: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Powiat poznański: Ortofotomapa (Aerial image)"
+msgid "Powiat ropczycko-sędziszowski: Buildings"
 msgstr ""
-msgid "Powiat ropczycko-sędziszowski: Budynki (buildings)"
+msgid "Powiat rzeszowski: Buildings"
 msgstr ""
-msgid "Powiat rzeszowski: Budynki (buildings)"
+msgid "Powiat rzeszowski: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Powiat rzeszowski: Ortofotomapa (Aerial image)"
+msgid "Powiat stalowowolski: Buildings"
 msgstr ""
-msgid "Powiat stalowowolski: Budynki (buildings)"
+msgid "Poznań: Orthophotomap 2014 (aerial image)"
 msgstr ""
-msgid "Poznań: Ortofotomapa 2014 (aerial image)"
+msgid "Przemyśl: Buildings"
 msgstr ""
-msgid "Przemyśl: Budynki (buildings)"
+msgid "Przemyśl: Ortophotomap (aerial image)"
 msgstr ""
-msgid "Przemyśl: Ortofotomapa (aerial image)"
+msgid "Ruda Śląska: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Ruda Śląska: Ortofotomapa (aerial image)"
+msgid "Rzeszów: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Rzeszów: Ortofotomapa (aerial image)"
+msgid "Rzeszów: Buildings"
 msgstr ""
-msgid "Rzeszów: Budynki (buildings)"
+msgid "Siemianowice Śląskie: Orthophotomap (aerial image)"
 msgstr ""
-msgid "Siemianowice Śląskie: Ortofotomapa (aerial image)"
+msgid "Siemianowice Śląskie: Buildings"
 msgstr ""
-msgid "Siemianowice Śląskie: Budynki (buildings)"
+msgid "Świętochłowice: Orthophotomap 2008 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2008 (aerial image)"
+msgid "Świętochłowice: Orthophotomap 2009 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2009 (aerial image)"
+msgid "Świętochłowice: Orthophotomap 2012 (aerial image)"
 msgstr ""
-msgid "Świętochłowice: Ortofotomapa 2012 (aerial image)"
+msgid "Zabrze: Orthophotomap 2011 (aerial image)"
 msgstr ""
-msgid "Zabrze: Ortofotomapa 2011 (aerial image)"
+msgid "Wrocław: Orthophotomap 2015 (aerial image)"
 msgstr ""
-msgid "Wrocław: Ortofotomapa 2015 (aerial image)"
+msgid "Ortofotos DGRF 2004-2006 (WMS)"
+msgstr ""
+
+msgid "Ortofotos Litoral DGT 2014-2015 (WMS)"
 msgstr ""
 msgid "ScanEx IRS"
@@ -25092,6 +25328,18 @@ msgstr ""
 msgid "Supplementing incomplete coverage in other sources (true color)"
 msgstr ""
+msgid "Economic Maps (historic)"
+msgstr ""
+
+msgid "Scan of ´Economic maps´ ca 1950-1980"
+msgstr ""
+
+msgid "Snowmobile map Sweden"
+msgstr ""
+
+msgid "Snowmobile trails"
+msgstr ""
+
 msgid "Kanton Aargau 25cm (AGIS 2011)"
 msgstr ""
@@ -27620,15 +27868,12 @@ msgstr ""
 msgid "Displays the layer displaying the map objects detected by Mapillary"
 msgstr ""
-msgid "Start Mapillary layer"
+msgid "Open Mapillary layer"
 msgstr ""
 msgid "Mapillary"
 msgstr ""
-msgid "Create Mapillary layer"
-msgstr ""
-
 msgid "Download Mapillary images in current view"
 msgstr ""
@@ -27687,13 +27932,7 @@ msgid ""
 "issue with the internet connection."
 msgstr ""
-msgid "Upload pictures"
-msgstr ""
-
-msgid "Upload Mapillary pictures"
-msgstr ""
-
-msgid "Upload pictures."
+msgid "Upload Mapillary images"
 msgstr ""
 msgid "Walk mode"
@@ -27729,15 +27968,12 @@ msgstr ""
 msgid "Rewrite imported images"
 msgstr ""
-msgid "Select a folder"
+msgid "Select a directory"
 msgstr ""
 msgid "Explore"
 msgstr ""
-msgid "Select a directory"
-msgstr ""
-
 msgid "Speed limit"
 msgstr ""
@@ -27870,6 +28106,11 @@ msgstr ""
 msgid "Cut off sequences at download bounds"
 msgstr ""
+msgid ""
+"When opening Mapillary image in web browser, show the blur editor instead of "
+"the image viewer"
+msgstr ""
+
 msgid "Enable experimental beta-features (might be unstable)"
 msgstr ""
@@ -32296,6 +32537,10 @@ msgstr ""
 msgid "Unable to process file ''{0}'':"
 msgstr ""
+msgid ""
+"Writing position information to image files... Estimated time left: {0}"
+msgstr ""
+
 msgid "File could not be deleted!"
 msgstr ""
@@ -33776,9 +34021,6 @@ msgstr ""
 msgid "SUMO Export"
 msgstr ""
-msgid "Export"
-msgstr ""
-
 msgid "AutoSave LiveData"
 msgstr ""