Skip to content
Commits on Source (5)
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
kind="dir"
path="trunk"
revision="13478"
kind="dir">
revision="13500">
<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="13478">
revision="13500">
<author>Don-vip</author>
<date>2018-03-01T09:08:48.913064Z</date>
<date>2018-03-04T15:20:37.045626Z</date>
</commit>
</entry>
</info>
......@@ -33,7 +33,6 @@
<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" />
<property name="java.lang.version" value="1.8" />
<property name="jacoco.includes" value="org.openstreetmap.josm.*" />
<property name="jacoco.inclbootstrapclasses" value="false" />
......@@ -48,6 +47,14 @@
<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>
<!-- Disable error_prone 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>
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
......@@ -376,6 +383,7 @@ Build-Date: ${build.tstamp}
<link href="http://docs.oracle.com/javase/8/docs/api"/>
<doctitle><![CDATA[<h2>JOSM - Javadoc</h2>]]></doctitle>
<bottom><![CDATA[<a href="https://josm.openstreetmap.de/">JOSM</a>]]></bottom>
<arg value="-html5" if:set="isJava9" />
<arg value="--add-exports" if:set="isJava9" />
<arg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
<arg value="--add-exports" if:set="isJava9" />
......
This diff is collapsed.
josm (0.0.svn13500+dfsg-1) unstable; urgency=medium
* New hotfix tested snapshot.
* Refresh patches.
-- Bas Couwenberg <sebastic@debian.org> Sun, 04 Mar 2018 19:02:35 +0100
josm (0.0.svn13478+dfsg-1) unstable; urgency=medium
* New tested snapshot.
......
......@@ -19,9 +19,9 @@ 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"/>
@@ -48,6 +49,19 @@
<condition property="isJava9">
<matches string="${ant.java.version}" pattern="(1.)?(9|1[0-9])" />
@@ -55,6 +56,19 @@
<condition property="javac.compiler" value="modern" else="com.google.errorprone.ErrorProneAntCompilerAdapter">
<isset property="isJava10"/>
</condition>
+ <!-- Java classpath addition (all jar files to compile tests with this) -->
+ <path id="classpath">
......@@ -39,7 +39,7 @@ Forwarded: not-needed
<path id="test.classpath">
<fileset dir="${test.dir}/lib">
<include name="**/*.jar"/>
@@ -110,10 +124,9 @@
@@ -117,10 +131,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>
@@ -124,8 +137,10 @@
@@ -131,8 +144,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>
<!--
@@ -145,7 +160,7 @@ Build-Date: ${build.tstamp}
@@ -152,7 +167,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>
@@ -155,6 +170,8 @@ Build-Date: ${build.tstamp}
@@ -162,6 +177,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" />
@@ -229,43 +246,21 @@ Build-Date: ${build.tstamp}
@@ -236,43 +253,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"/>
@@ -286,21 +281,15 @@ Build-Date: ${build.tstamp}
@@ -293,21 +288,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"/>
@@ -314,19 +303,14 @@ Build-Date: ${build.tstamp}
@@ -321,19 +310,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"/>
......@@ -175,7 +175,7 @@ Forwarded: not-needed
<compilerarg value="-Xlint:cast"/>
<compilerarg value="-Xlint:deprecation"/>
<compilerarg value="-Xlint:dep-ann"/>
@@ -340,13 +324,6 @@ Build-Date: ${build.tstamp}
@@ -347,13 +331,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"/>
......@@ -189,7 +189,7 @@ Forwarded: not-needed
<compilerarg line="-Xmaxwarns 1000"/>
<exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
</javac>
@@ -361,6 +338,7 @@ Build-Date: ${build.tstamp}
@@ -368,6 +345,7 @@ Build-Date: ${build.tstamp}
</uptodate>
<mkdir dir="${build.dir}"/>
<mkdir dir="${dist.dir}"/>
......@@ -197,7 +197,7 @@ Forwarded: not-needed
</target>
<target name="javadoc" depends="init-properties">
<javadoc destdir="javadoc"
@@ -394,6 +372,7 @@ Build-Date: ${build.tstamp}
@@ -402,6 +380,7 @@ Build-Date: ${build.tstamp}
<delete dir="${src.dir}/org/openstreetmap/josm/data/imagery/types"/>
<delete file="${epsg.output}"/>
<delete file="${pmd.dir}/cache"/>
......@@ -205,7 +205,7 @@ Forwarded: not-needed
</target>
<macrodef name="init-test-preferences">
<attribute name="testfamily"/>
@@ -905,6 +884,7 @@ Build-Date: ${build.tstamp}
@@ -913,6 +892,7 @@ Build-Date: ${build.tstamp}
<pathelement path="${base.dir}"/>
<pathelement path="${proj-classpath}"/>
<pathelement path="${proj-build.dir}"/>
......
......@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -180,7 +180,6 @@ Debian-Release: ${debian.version}
@@ -187,7 +187,6 @@ Debian-Release: ${debian.version}
<zipfileset dir="images" prefix="images"/>
<zipfileset dir="data" prefix="data"/>
<zipfileset dir="styles" prefix="styles"/>
......
......@@ -8,7 +8,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -165,7 +165,7 @@ Debian-Release: ${debian.version}
@@ -172,7 +172,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"/>
......
......@@ -6,7 +6,7 @@ Forwarded: not-needed
--- a/build.xml
+++ b/build.xml
@@ -177,9 +177,6 @@ Debian-Release: ${debian.version}
@@ -184,9 +184,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" />
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2018-02-04 17:22+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: 2018-03-01 04:33+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:30+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: af\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4119,6 +4119,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr ""
 
......@@ -13623,6 +13626,10 @@ msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr ""
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+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: 2018-03-01 04:34+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:31+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: am\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4119,6 +4119,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr ""
 
......@@ -13623,6 +13626,10 @@ msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr ""
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2018-02-17 12:12+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: 2018-03-01 04:35+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:32+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: ar\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4154,6 +4154,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr ""
 
......@@ -13676,6 +13679,10 @@ msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr ""
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2017-11-12 10:06+0000\n"
"Last-Translator: Don-vip <Unknown>\n"
"Language-Team: Asturian <ast@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: 2018-03-01 04:36+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:33+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: ast\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4472,6 +4472,9 @@ msgstr "Etiquetes d''Internet"
msgid "Checks for errors in internet-related tags."
msgstr "Busca erros n''etiquetes rellacionaes a Internet."
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr "''{0}'': {1}"
 
......@@ -14928,6 +14931,10 @@ msgstr ""
"Formatu inesperáu de nueva versión de primitiva ''{0}'' modificada. Llogróse "
"''{1}''."
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr "Creando conxuntu de cambeos..."
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2016-12-17 13:38+0000\n"
"Last-Translator: iAZISS <iss-sash@mail.ru>\n"
"Language-Team: Azerbaijani <az@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: 2018-03-01 04:36+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:34+0000\n"
"X-Generator: Launchpad (build 18566)\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
......@@ -4118,6 +4118,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr ""
 
......@@ -13622,6 +13625,10 @@ msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr ""
 
......
......@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2018-01-27 14:39+0000\n"
"Last-Translator: Darafei Praliaskouski <komzpa@gmail.com>\n"
"Language-Team: Belarusian <i18n@mova.org>\n"
......@@ -19,8 +19,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Launchpad-Export-Date: 2018-03-01 04:37+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:35+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: be\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4501,6 +4501,9 @@ msgstr "Інтэрнэт-тэгі"
msgid "Checks for errors in internet-related tags."
msgstr "Праверка на памылкі ў тэгах, злучаных з Інтэрнэтам."
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr "''{0}'': {1}"
 
......@@ -15008,6 +15011,10 @@ msgid ""
msgstr ""
"Нечаканы фармат новай версіі змененага элемента \"{0}\". Атрымана \"{1}\""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr "Стварэнне пакета правак..."
 
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2018-02-15 10:09+0000\n"
"Last-Translator: Hb <Unknown>\n"
"Language-Team: Bulgarian <bg@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: 2018-03-01 04:39+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:37+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: bg\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4257,6 +4257,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr "''{0}'': {1}"
 
......@@ -13885,6 +13888,10 @@ msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr "Създаване на списък с промени ..."
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2015-04-03 09:24+0000\n"
"Last-Translator: Md Alamgir <alamgircu@hotmail.com>\n"
"Language-Team: Bengali <bn@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: 2018-03-01 04:37+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:35+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: bn\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4122,6 +4122,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr ""
 
......@@ -13626,6 +13629,10 @@ msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr ""
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2011-10-17 12:11+0000\n"
"Last-Translator: Fulup <Unknown>\n"
"Language-Team: Breton <br@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: 2018-03-01 04:38+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:36+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: br\n"
 
msgid "License"
......@@ -4119,6 +4119,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr ""
 
......@@ -13623,6 +13626,10 @@ msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr ""
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2012-11-03 23:07+0000\n"
"Last-Translator: Alen Mahovic <eyeofthestorm@windowslive.com>\n"
"Language-Team: Bosnian <bs@li.org>\n"
......@@ -16,8 +16,8 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
"X-Launchpad-Export-Date: 2018-03-01 04:38+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:36+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: bs\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4122,6 +4122,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr ""
 
......@@ -13626,6 +13629,10 @@ msgid ""
"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
msgstr ""
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr ""
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2017-10-16 08:35+0000\n"
"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
"Language-Team: el_libre - - www.catmidia.cat\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: 2018-03-01 04:39+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 04:37+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: ca\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4488,6 +4488,9 @@ msgstr "Etiquetes d''Internet"
msgid "Checks for errors in internet-related tags."
msgstr "Verifica si hi ha errors a les etiquetes relacionades amb Internet"
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr "''{0}'': {1}"
 
......@@ -15005,6 +15008,10 @@ msgstr ""
"Format no esperat de la nova versió de l''objecte modificat ''{0}''. El seu "
"valor és ''{1}''."
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr "Creant un conjunt de canvis...."
 
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-03-01 03:48+0100\n"
"POT-Creation-Date: 2018-03-04 03:44+0100\n"
"PO-Revision-Date: 2015-04-25 18:52+0000\n"
"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
"Language-Team: el_libre - - www.catmidia.cat\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: 2018-03-01 05:13+0000\n"
"X-Generator: Launchpad (build 18561)\n"
"X-Launchpad-Export-Date: 2018-03-04 05:14+0000\n"
"X-Generator: Launchpad (build 18566)\n"
"Language: ca@valencia\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -4437,6 +4437,9 @@ msgstr ""
msgid "Checks for errors in internet-related tags."
msgstr ""
 
msgid "URL contains backslashes instead of slashes"
msgstr ""
msgid "''{0}'': {1}"
msgstr ""
 
......@@ -14814,6 +14817,10 @@ msgstr ""
"Format no esperat de la nova versió de l''objecte modificat ''{0}''. El seu "
"valor és ''{1}''."
 
msgid ""
"Unexpected format of new version of deleted primitive ''{0}''. Got ''{1}''."
msgstr ""
msgid "Creating changeset..."
msgstr "Creant un conjunt de canvis...."
 
......