Skip to content
Commits on Source (7)
Show whitespace changes
Inline Side-by-side
.checkstyle
View file @ d8f3dd83
......@@ -10,7 +10,6 @@
<filter name="DerivedFiles" enabled="true"/>
<filter name="FilesFromPackage" enabled="true">
<filter-data value="src/com"/>
<filter-data value="src/gnu"/>
<filter-data value="src/javax"/>
<filter-data value="src/oauth"/>
<filter-data value="src/org/apache"/>
......
README
View file @ d8f3dd83
......@@ -203,9 +203,6 @@ There are some third party libraries which are directly included in the source c
* Signpost: OAuth library
src/oauth, src/com/google
-> https://github.com/mttkay/signpost
* GNU getopt Java port: Command line argument processing library
src/gnu/getopt
-> https://github.com/arenn/java-getopt
* MultiSplitPane: Small lib for GUI layout management
src/org/openstreetmap/josm/gui/MultiSplitLayout.java, MultiSplitPane.java
-> https://github.com/floscher/multi-split
......
REVISION
View file @ d8f3dd83
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
kind="dir"
path="trunk"
revision="14382"
kind="dir">
revision="14460">
<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="14382">
revision="14460">
<author>Don-vip</author>
<date>2018-10-28T21:27:31.020528Z</date>
<date>2018-11-28T00:09:01.043023Z</date>
</commit>
</entry>
</info>
build.xml
View file @ d8f3dd83
......@@ -273,7 +273,7 @@ Build-Date: ${build.tstamp}
</target>
<target name="compile-cots" depends="init">
<!-- COTS -->
<javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
<javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**" nowarn="on" encoding="iso-8859-1"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -328,7 +328,7 @@ Build-Date: ${build.tstamp}
<target name="compile-jmapviewer" depends="init">
<!-- JMapViewer -->
<javac sourcepath="" srcdir="${src.dir}" fork="yes"
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
<compilerarg line="-XDcompilePolicy=simple"/>
......@@ -354,7 +354,7 @@ Build-Date: ${build.tstamp}
<target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
<!-- JOSM -->
<javac sourcepath="" srcdir="${src.dir}" fork="yes"
excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
<compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
<compilerarg line="-XDcompilePolicy=simple"/>
......@@ -710,8 +710,8 @@ Build-Date: ${build.tstamp}
<regexp pattern="${deprecated-plugins}"/>
</linecontainsregexp>
<linecontainsregexp negate="true" unless:set="isJava10">
<!-- Skip openjfx on Java 8/9, built for Java 10+ only -->
<regexp pattern="openjfx"/>
<!-- Skip javafx on Java 8/9, built for Java 10+ only -->
<regexp pattern="javafx.*"/>
</linecontainsregexp>
<tokenfilter>
<replaceregex pattern="^.*;" replace="" flags="gi"/>
......@@ -1006,7 +1006,7 @@ Build-Date: ${build.tstamp}
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-spi.jar" includes="org/openstreetmap/josm/spi/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/josm-tools.jar" includes="org/openstreetmap/josm/tools/**/*.class"/>
<exec executable="jdeps" dir="${modules.dir}">
<arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|gnu.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
<arg line="-f 'java.*|org.xml.*|org.w3c.*|sun.*|com.*|oauth.*|org.apache.*|org.glassfish.*|org.jdesktop.*|org.openstreetmap.gui.*'"/>
<arg line="-dotoutput dots *.jar"/>
</exec>
<exec executable="dot" dir="${modules.dir}/dots">
......@@ -1016,7 +1016,6 @@ Build-Date: ${build.tstamp}
<!-- Direct dependencies -->
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/metadata-extractor.jar" includes="com/drew/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/svgSalamander.jar" includes="com/kitfox/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/gnu-getopt.jar" includes="gnu/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/javax-json.jar" includes="javax/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/oauth-signpost.jar" includes="oauth/**/*.class"/>
<jar basedir="${build.dir}" level="${clevel}" destfile="${modules.dir}/commons-compress.jar" includes="org/apache/commons/compress/**/*.class"/>
......
data/defaultpresets.xml
View file @ d8f3dd83
Source diff could not be displayed: it is too large. Options to address this: view the blob.
data/validator/deprecated.mapcss
View file @ d8f3dd83
......@@ -686,30 +686,18 @@ relation[/^..$/][!to] {
fixAdd: "sport=billiards";
}
/* see #11499 */
/* see #11499, #16928 */
*[payment:credit_cards=yes] {
throwWarning: tr("{0} is inaccurate", "{0.tag}");
suggestAlternative: "payment:mastercard=yes";
suggestAlternative: "payment:visa=yes";
suggestAlternative: "...";
throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:mastercard=yes", "payment:visa=yes");
}
*[payment:debit_cards=yes] {
throwWarning: tr("{0} is inaccurate", "{0.tag}");
suggestAlternative: "payment:maestro=yes";
suggestAlternative: "payment:girocard=yes";
suggestAlternative: "...";
throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:maestro=yes", "payment:girocard=yes");
}
*[payment:electronic_purses=yes] {
throwWarning: tr("{0} is inaccurate", "{0.tag}");
suggestAlternative: "payment:ep_geldkarte=yes";
suggestAlternative: "payment:ep_quick=yes";
suggestAlternative: "...";
throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:ep_geldkarte=yes", "payment:ep_quick=yes");
}
*[payment:cryptocurrencies=yes] {
throwWarning: tr("{0} is inaccurate", "{0.tag}");
suggestAlternative: "payment:bitcoin=yes";
suggestAlternative: "payment:litecoin=yes";
suggestAlternative: "...";
throwWarning: tr("{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}.", "{0.tag}", "payment:bitcoin=yes", "payment:litecoin=yes");
}
/* defunct payment cards */
......@@ -1308,3 +1296,44 @@ way[power=busbar] {
fixAdd: "power=line";
fixAdd: "line=busbar";
}
/* #16924 */
*[man_made=MDF],
*[man_made=telephone_exchange] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "telecom=exchange";
fixAdd: "telecom=exchange";
fixRemove: "man_made";
group: tr("deprecated tagging");
}
*[building=central_office] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "telecom=exchange";
fixAdd: "telecom=exchange";
fixAdd: "building=yes";
group: tr("deprecated tagging");
}
*[telecom=central_office] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "telecom=exchange";
fixAdd: "telecom=exchange";
group: tr("deprecated tagging");
}
/* #16925 */
node[communication=outdoor_dslam],
node[man_made=outdoor_dslam],
node[street_cabinet=outdoor_dslam] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "telecom=service_device";
fixAdd: "telecom=service_device";
fixRemove: "{0.key}";
group: tr("deprecated tagging");
}
node[telecom=dslam],
node[telecom=outdoor_dslam] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "telecom=service_device";
fixAdd: "telecom=service_device";
group: tr("deprecated tagging");
}
data/validator/geometry.mapcss
View file @ d8f3dd83
......@@ -92,6 +92,7 @@ node[restriction] {
/* {0} on a way, should be a node */
way[entrance],
way[door],
way[railway=subway_entrance],
way[man_made=survey_point],
way[aeroway=holding_position],
......@@ -283,7 +284,7 @@ way[highway] > node[tourism=information][information=guidepost] {
set guidepost;
throwOther: tr("{0} node connected to a highway", "{1.tag}");
}
way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal|weighbridge)$/],
way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal|weighbridge|taxi)$/],
way[highway] > node[building][!entrance],
way[highway] > node[leisure][!entrance][leisure!=slipway],
way[highway] > node[office][!entrance],
......
data_nodist/trans/it.lang
View file @ d8f3dd83
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
debian/changelog
View file @ d8f3dd83
josm (0.0.svn14460+dfsg-1) unstable; urgency=medium
* New tested snapshot.
* Drop license & copyright for gnu/getopt sources, removed upstream.
* Refresh patches.
* Update filenames for desktop file, icons, etc.
-- Bas Couwenberg <sebastic@debian.org> Wed, 28 Nov 2018 08:01:38 +0100
josm (0.0.svn14382+dfsg-2) unstable; urgency=medium
* Re-enable OpenJFX support, available for OpenJDK 11 again.
......
debian/copyright
View file @ d8f3dd83
......@@ -84,11 +84,6 @@ Files: src/com/kitfox/*
Copyright: 2004-2005, Mark McKay
License: BSD-2-Clause
Files: src/gnu/*
Copyright: 1987-1997, Free Software Foundation, Inc.
1998, Aaron M. Renn <arenn@urbanophile.com>
License: LGPL-2.1+
Files: src/org/apache/commons/jcs/*
Copyright: 2001-2015, The Apache Software Foundation.
License: Apache-2.0
......
debian/patches/00-build.patch
View file @ d8f3dd83
......@@ -103,8 +103,8 @@ Forwarded: not-needed
</target>
<target name="compile-cots" depends="init">
<!-- COTS -->
- <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
+ <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**,gnu/**" nowarn="on" encoding="iso-8859-1"
- <javac srcdir="${src.dir}" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**" nowarn="on" encoding="iso-8859-1"
+ <javac srcdir="${src.dir}" classpathref="classpath" includes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/tukaani/**" nowarn="on" encoding="iso-8859-1"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeAntRuntime="false" createMissingPackageInfoClass="false">
<!-- get rid of "internal proprietary API" warning -->
<compilerarg value="-XDignore.symbol.file"/>
......@@ -148,8 +148,8 @@ Forwarded: not-needed
<target name="compile-jmapviewer" depends="init">
<!-- JMapViewer -->
- <javac sourcepath="" srcdir="${src.dir}" fork="yes"
+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**,gnu/**"
+ <javac sourcepath="" srcdir="${src.dir}" fork="yes" classpathref="classpath"
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/Demo.java,org/openstreetmap/gui/jmapviewer/JMapViewerTree.java,org/openstreetmap/gui/jmapviewer/checkBoxTree/**,org/openstreetmap/josm/**,org/tukaani/**"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
- <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
- <compilerarg line="-XDcompilePolicy=simple"/>
......@@ -169,8 +169,8 @@ Forwarded: not-needed
<target name="compile" depends="init,javacc,compile-cots,compile-jmapviewer">
<!-- JOSM -->
- <javac sourcepath="" srcdir="${src.dir}" fork="yes"
+ <javac sourcepath="" srcdir="${src.dir}" classpathref="classpath"
excludes="com/**,javax/**,gnu/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
+ <javac sourcepath="" srcdir="${src.dir}" fork="yes" classpathref="classpath"
excludes="com/**,javax/**,oauth/**,org/apache/commons/**,org/glassfish/**,org/openstreetmap/gui/jmapviewer/**,org/tukaani/**"
destdir="${build.dir}" target="${java.lang.version}" source="${java.lang.version}" debug="on" includeantruntime="false" createMissingPackageInfoClass="false" encoding="UTF-8">
- <compilerarg value="-J-Xbootclasspath/p:${error_prone_javac.jar}" unless:set="isJava9"/>
- <compilerarg line="-XDcompilePolicy=simple"/>
......
debian/patches/01-bts.patch
View file @ d8f3dd83
......@@ -28,7 +28,7 @@ Forwarded: not-needed
"<p>" + tr("Java Version {0}", Utils.getSystemProperty("java.version")) + "</p>" +
--- a/src/org/openstreetmap/josm/data/Version.java
+++ b/src/org/openstreetmap/josm/data/Version.java
@@ -40,6 +40,7 @@ public class Version {
@@ -42,6 +42,7 @@ public class Version {
private int version;
private String releaseDescription;
......@@ -36,7 +36,7 @@ Forwarded: not-needed
private String time;
private String buildName;
private boolean isLocalBuild;
@@ -75,6 +76,8 @@ public class Version {
@@ -77,6 +78,8 @@ public class Version {
version = JOSM_UNKNOWN_VERSION;
}
......@@ -45,7 +45,7 @@ Forwarded: not-needed
// the last changed data
//
time = properties.getProperty("Last Changed Date");
@@ -127,6 +130,10 @@ public class Version {
@@ -142,6 +145,10 @@ public class Version {
return version == 0 ? tr("UNKNOWN") : Integer.toString(version);
}
......
debian/patches/06-move_data_out_of_jar.patch
View file @ d8f3dd83
......@@ -26,7 +26,7 @@ Forwarded: not-needed
import java.nio.charset.StandardCharsets;
import java.nio.file.InvalidPathException;
import java.text.MessageFormat;
@@ -315,7 +316,11 @@ public final class I18n {
@@ -325,7 +326,11 @@ public final class I18n {
}
private static URL getTranslationFile(String lang) {
......@@ -41,26 +41,47 @@ Forwarded: not-needed
/**
--- a/src/org/openstreetmap/josm/io/CachedFile.java
+++ b/src/org/openstreetmap/josm/io/CachedFile.java
@@ -225,11 +225,17 @@ public class CachedFile implements Close
File file = getFile();
@@ -226,24 +226,29 @@ public class CachedFile implements Close
if (file == null) {
if (name != null && name.startsWith("resource://")) {
- InputStream is = getClass().getResourceAsStream(
- name.substring("resource:/".length()));
- if (is == null)
- throw new IOException(tr("Failed to open input stream for resource ''{0}''", name));
- return is;
+ String path = name.substring("resource://".length());
+ File fileRes = new File("/usr/share/josm/" + path);
String resourceName = name.substring("resource:/".length());
- InputStream is = null;
- try {
- is = getClass().getResourceAsStream(resourceName);
- } catch (InvalidPathException e) {
- Logging.error("Cannot open {0}: {1}", resourceName, e.getMessage());
- Logging.trace(e);
- }
- if (is == null) {
- URL resource = getClass().getResource(resourceName);
- if (resource != null) {
- // More robust way to open stream
- is = Utils.openStream(resource);
+ File fileRes = new File("/usr/share/josm/" + resourceName);
+ if (fileRes.exists()) {
+ file = fileRes;
+ } else {
+ InputStream is = getClass().getResourceAsStream(
+ name.substring("resource:/".length()));
+ if (is == null)
+ InputStream is = null;
+ try {
+ is = getClass().getResourceAsStream(resourceName);
+ } catch (InvalidPathException e) {
+ Logging.error("Cannot open {0}: {1}", resourceName, e.getMessage());
+ Logging.trace(e);
}
if (is == null) {
- throw new IOException(tr("Failed to open input stream for resource ''{0}''", name));
+ URL resource = getClass().getResource(resourceName);
+ if (resource != null) {
+ // More robust way to open stream
+ is = Utils.openStream(resource);
+ }
+ if (is == null) {
+ throw new IOException(tr("Failed to open input stream for resource ''{0}''", name));
+ return is;
+ }
}
+ return is;
}
- return is;
} else {
throw new IOException("No file found for: "+name);
}
debian/rules
View file @ d8f3dd83
......@@ -48,14 +48,14 @@ override_dh_auto_install:
for size in 512x512 256x256 192x192 128x128 96x96 80x80 72x72 64x64 48x48 42x42 40x40 36x36 32x32 24x24 22x22 16x16 8x8; do \
install -o root -g root -d $(CURDIR)/debian/josm/usr/share/icons/hicolor/$${size}/apps ; \
install -o root -g root -m 644 $(CURDIR)/linux/tested/usr/share/icons/hicolor/$${size}/apps/josm.png $(CURDIR)/debian/josm/usr/share/icons/hicolor/$${size}/apps/josm.png ; \
install -o root -g root -m 644 $(CURDIR)/linux/tested/usr/share/icons/hicolor/$${size}/apps/org.openstreetmap.josm.png $(CURDIR)/debian/josm/usr/share/icons/hicolor/$${size}/apps/org.openstreetmap.josm.png ; \
done
install -o root -g root -d $(CURDIR)/debian/josm/usr/share/icons/hicolor/scalable/apps
install -o root -g root -m 644 $(CURDIR)/linux/tested/usr/share/icons/hicolor/scalable/apps/josm.svg $(CURDIR)/debian/josm/usr/share/icons/hicolor/scalable/apps/josm.svg
install -o root -g root -m 644 $(CURDIR)/linux/tested/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg $(CURDIR)/debian/josm/usr/share/icons/hicolor/scalable/apps/org.openstreetmap.josm.svg
install -m 644 $(CURDIR)/linux/tested/usr/share/pixmaps/josm.png $(CURDIR)/debian/josm/usr/share/pixmaps/josm.png
install -m 644 $(CURDIR)/linux/tested/usr/share/applications/josm.desktop $(CURDIR)/debian/josm/usr/share/applications/josm.desktop
install -m 644 $(CURDIR)/linux/tested/usr/share/metainfo/josm.appdata.xml $(CURDIR)/debian/josm/usr/share/metainfo/josm.appdata.xml
install -m 644 $(CURDIR)/linux/tested/usr/share/pixmaps/org.openstreetmap.josm.png $(CURDIR)/debian/josm/usr/share/pixmaps/org.openstreetmap.josm.png
install -m 644 $(CURDIR)/linux/tested/usr/share/applications/org.openstreetmap.josm.desktop $(CURDIR)/debian/josm/usr/share/applications/org.openstreetmap.josm.desktop
install -m 644 $(CURDIR)/linux/tested/usr/share/metainfo/org.openstreetmap.josm.appdata.xml $(CURDIR)/debian/josm/usr/share/metainfo/org.openstreetmap.josm.appdata.xml
override_dh_install:
dh_install
......
i18n/po/af.po
View file @ d8f3dd83
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-28 22:47+0100\n"
"POT-Creation-Date: 2018-11-28 01:35+0100\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Afrikaans <af@li.org>\n"
......@@ -15,40 +15,10 @@ 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-10-29 04:30+0000\n"
"X-Generator: Launchpad (build 18810)\n"
"X-Launchpad-Export-Date: 2018-11-28 04:31+0000\n"
"X-Generator: Launchpad (build 18826)\n"
"Language: af\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}{2}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: unrecognized option ''--{1}''"
msgstr ""
msgid "{0}: unrecognized option ''{1}{2}''"
msgstr ""
msgid "{0}: illegal option -- {1}"
msgstr ""
msgid "{0}: invalid option -- {1}"
msgstr ""
msgid "{0}: option requires an argument -- {1}"
msgstr ""
msgid "Invalid value {0} for parameter ''has_arg''"
msgstr ""
msgid "Background Terms of Use"
msgstr ""
 
......@@ -173,8 +143,7 @@ msgstr ""
msgid "Select"
msgstr ""
 
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgid "Selects those elements on the map which are chosen on the list above."
msgstr ""
 
msgid "Select WMS layers"
......@@ -307,6 +276,9 @@ msgstr ""
msgid "Toggle visibility of Changeset Manager window"
msgstr ""
 
msgid "Close open changesets..."
msgstr ""
msgid "Close open changesets"
msgstr ""
 
......@@ -460,12 +432,15 @@ msgid ""
"* Three nodes."
msgstr ""
 
msgid "Download data"
msgid "Download data..."
msgstr ""
 
msgid "Download map data from a server of your choice"
msgstr ""
 
msgid "Download data"
msgstr ""
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
"wish<br>to continue?</html>"
......@@ -537,6 +512,14 @@ msgstr ""
msgid "Export GPX file"
msgstr ""
 
msgid "Hatch area outside download"
msgstr ""
msgid ""
"Enable/disable hatched background rendering of areas outside of the "
"downloaded areas."
msgstr ""
msgid "Help"
msgstr "Hulp"
 
......@@ -1345,7 +1328,7 @@ msgstr ""
msgid "Segment {0}: {1}"
msgstr ""
 
msgid "Search preset"
msgid "Search preset..."
msgstr ""
 
msgid "Show preset search dialog"
......@@ -1514,12 +1497,15 @@ msgstr ""
msgid "Selection empty"
msgstr ""
 
msgid "Upload data"
msgid "Upload data..."
msgstr ""
 
msgid "Upload all changes in the active data layer to the OSM server"
msgstr ""
 
msgid "Upload data"
msgstr ""
msgid ""
"<html>The data to be uploaded participates in unresolved conflicts of layer "
"''{0}''.<br>You have to resolve them first.</html>"
......@@ -1553,12 +1539,15 @@ msgstr ""
msgid "Uploading notes to server"
msgstr ""
 
msgid "Upload selection"
msgid "Upload selection..."
msgstr ""
 
msgid "Upload all changes in the current selection to the OSM server."
msgstr ""
 
msgid "Upload selection"
msgstr ""
msgid "Checking parents for deleted objects"
msgstr ""
 
......@@ -2281,6 +2270,9 @@ msgid ""
"last member, successively continuing to the first."
msgstr ""
 
msgid "based on osm route relation data, timestamps are synthetic"
msgstr ""
msgid "Selected Relations"
msgstr ""
 
......@@ -4265,12 +4257,6 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
 
msgid "No outer way for boundary"
msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
msgid "No area style for multipolygon"
msgstr ""
 
......@@ -4324,7 +4310,7 @@ msgstr ""
msgid "Multipolygon outer way shares segment(s) with other ring"
msgstr ""
 
msgid "No useful role for multipolygon member"
msgid "Role for multipolygon way member should be inner or outer"
msgstr ""
 
msgid "Non-Way in boundary"
......@@ -4395,9 +4381,6 @@ msgid ""
"than one way."
msgstr ""
 
msgid "Areas share segment"
msgstr ""
msgid "Highways share segment with area"
msgstr ""
 
......@@ -4447,6 +4430,9 @@ msgstr ""
msgid "Checks for errors in relations."
msgstr ""
 
msgid "Relation is empty"
msgstr ""
msgid ""
"Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
msgstr ""
......@@ -4454,9 +4440,6 @@ msgstr ""
msgid "Relation type is unknown"
msgstr ""
 
msgid "Relation is empty"
msgstr ""
msgid ""
"Role of relation member does not match expression ''{0}'' in template {1}"
msgstr ""
......@@ -7598,12 +7581,36 @@ msgstr ""
msgid "Gamma"
msgstr ""
 
msgctxt "image sharpness"
msgid "blurred"
msgstr ""
msgctxt "image sharpness"
msgid "normal"
msgstr ""
msgctxt "image sharpness"
msgid "sharp"
msgstr ""
msgid "Adjust sharpness/blur value of the layer."
msgstr ""
 
msgid "Sharpness"
msgstr ""
 
msgctxt "image colorfulness"
msgid "less"
msgstr ""
msgctxt "image colorfulness"
msgid "normal"
msgstr ""
msgctxt "image colorfulness"
msgid "more"
msgstr ""
msgid "Adjust colorfulness of the layer."
msgstr ""
 
......@@ -8367,11 +8374,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
 
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
msgid "Open this dialog on startup"
msgstr ""
 
......@@ -8391,6 +8393,9 @@ msgstr ""
msgid "Click to download the currently selected area"
msgstr ""
 
msgid "Click to download the currently selected area into a new data layer"
msgstr ""
msgid "Download referrers (parent relations)"
msgstr ""
 
......@@ -9955,7 +9960,7 @@ msgstr ""
msgid "Do not show this message again"
msgstr ""
 
msgid "Hide this message and never show it again"
msgid "Hide this message"
msgstr ""
 
msgid "Unable to create directory {0}, autosave will be disabled"
......@@ -12379,6 +12384,9 @@ msgstr ""
msgid "Header value"
msgstr ""
 
msgid "Imagery preferences..."
msgstr ""
msgid "Modify list of imagery layers displayed in the Imagery menu"
msgstr ""
 
......@@ -14597,6 +14605,9 @@ msgid_plural "Click to continue without these plugins"
msgstr[0] ""
msgstr[1] ""
 
msgid "Plugin {0} must be run on a {1} platform."
msgstr ""
msgid ""
"Plugin {0} requires Java version {1}. The current Java version is {2}. You "
"have to update Java in order to use this plugin."
......@@ -15104,12 +15115,31 @@ msgid ""
"Currently you have {1,number,#}MB memory allocated for JOSM"
msgstr ""
 
msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
msgid "Opening URL: {0}"
msgstr ""
 
msgid "Opening URL: {0}"
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: option ''{1}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}'' is required"
msgstr ""
msgid "{0}: option ''{1}'' may not appear multiple times"
msgstr ""
msgid "{0}: Error while handling option ''{1}''"
msgstr ""
msgid "{0}: Invalid value {2} for option ''{1}''"
msgstr ""
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
msgid "{0}: unrecognized option ''{1}''"
msgstr ""
 
msgid "URL does not contain {0}/{1}/{2}"
......@@ -18437,6 +18467,9 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
 
msgid "Biogas"
msgstr ""
msgid "Additives:"
msgstr ""
 
......@@ -24101,7 +24134,8 @@ msgstr ""
msgid "uncommon short key"
msgstr ""
 
msgid "{0} is inaccurate"
msgid ""
"{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}."
msgstr ""
 
msgid "{0} is deprecated for {1}"
......@@ -24509,13 +24543,19 @@ msgid ""
"floating glacier tongues. (true color)"
msgstr ""
 
msgid "IGN topographical map (TMS)"
msgid "National Geographic Institute Argenmap (TMS)"
msgstr ""
msgid "National Geographic Institute Argenmap (WMTS)"
msgstr ""
msgid "National Geographic Institute (WMS)"
msgstr ""
 
msgid "IGN topographical map (WMTS)"
msgid "Córdoba SDI (WMS)"
msgstr ""
 
msgid "IGN topographical map (WMS)"
msgid "Córdoba SDI - Demarcaciones (TMS)"
msgstr ""
 
msgid "IGN orthophoto AMBA a (WMTS)"
......@@ -24828,6 +24868,9 @@ msgstr ""
msgid "URBIS 2017 aerial imagery"
msgstr ""
 
msgid "URBIS 2018 aerial imagery"
msgstr ""
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
 
......@@ -26641,10 +26684,10 @@ msgstr ""
msgid "USGS Topographic Maps"
msgstr ""
 
msgid "USGS Large Scale Imagery"
msgid "USGS Imagery"
msgstr ""
 
msgid "TIGER Roads 2012"
msgid "Public domain aerial imagery, mostly NAIP"
msgstr ""
 
msgid "TIGER Roads 2014"
......@@ -26664,6 +26707,9 @@ msgid ""
"OpenStreetMap"
msgstr ""
 
msgid "TIGER Roads 2018"
msgstr ""
msgid "MassGIS L3 Parcels"
msgstr ""
 
......@@ -27605,9 +27651,6 @@ msgstr ""
msgid "Public Transport (ÖPNV)"
msgstr ""
 
msgid "Hike & Bike"
msgstr ""
msgid "OpenSnowMap overlay"
msgstr ""
 
......@@ -32899,6 +32942,10 @@ msgstr ""
msgid "Download OSM data corresponding to the current data set."
msgstr ""
 
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
msgid "Diff"
msgstr ""
 
......@@ -34428,6 +34475,11 @@ msgstr ""
msgid "Enter the ID of the changeset that should be reverted"
msgstr ""
 
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
msgid "Reverted changeset"
msgstr ""
 
......
i18n/po/ak.po
View file @ d8f3dd83
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
"POT-Creation-Date: 2018-10-28 22:47+0100\n"
"POT-Creation-Date: 2018-11-28 01:35+0100\n"
"PO-Revision-Date: 2018-06-07 19:03+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Akan <ak@li.org>\n"
......@@ -15,38 +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-10-29 04:31+0000\n"
"X-Generator: Launchpad (build 18810)\n"
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}{2}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: unrecognized option ''--{1}''"
msgstr ""
msgid "{0}: unrecognized option ''{1}{2}''"
msgstr ""
msgid "{0}: illegal option -- {1}"
msgstr ""
msgid "{0}: invalid option -- {1}"
msgstr ""
msgid "{0}: option requires an argument -- {1}"
msgstr ""
msgid "Invalid value {0} for parameter ''has_arg''"
msgstr ""
"X-Launchpad-Export-Date: 2018-11-28 04:31+0000\n"
"X-Generator: Launchpad (build 18826)\n"
 
msgid "Background Terms of Use"
msgstr ""
......@@ -169,8 +139,7 @@ msgstr ""
msgid "Select"
msgstr ""
 
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgid "Selects those elements on the map which are chosen on the list above."
msgstr ""
 
msgid "Select WMS layers"
......@@ -303,6 +272,9 @@ msgstr ""
msgid "Toggle visibility of Changeset Manager window"
msgstr ""
 
msgid "Close open changesets..."
msgstr ""
msgid "Close open changesets"
msgstr ""
 
......@@ -456,12 +428,15 @@ msgid ""
"* Three nodes."
msgstr ""
 
msgid "Download data"
msgid "Download data..."
msgstr ""
 
msgid "Download map data from a server of your choice"
msgstr ""
 
msgid "Download data"
msgstr ""
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
"wish<br>to continue?</html>"
......@@ -533,6 +508,14 @@ msgstr ""
msgid "Export GPX file"
msgstr ""
 
msgid "Hatch area outside download"
msgstr ""
msgid ""
"Enable/disable hatched background rendering of areas outside of the "
"downloaded areas."
msgstr ""
msgid "Help"
msgstr ""
 
......@@ -1341,7 +1324,7 @@ msgstr ""
msgid "Segment {0}: {1}"
msgstr ""
 
msgid "Search preset"
msgid "Search preset..."
msgstr ""
 
msgid "Show preset search dialog"
......@@ -1510,12 +1493,15 @@ msgstr ""
msgid "Selection empty"
msgstr ""
 
msgid "Upload data"
msgid "Upload data..."
msgstr ""
 
msgid "Upload all changes in the active data layer to the OSM server"
msgstr ""
 
msgid "Upload data"
msgstr ""
msgid ""
"<html>The data to be uploaded participates in unresolved conflicts of layer "
"''{0}''.<br>You have to resolve them first.</html>"
......@@ -1549,12 +1535,15 @@ msgstr ""
msgid "Uploading notes to server"
msgstr ""
 
msgid "Upload selection"
msgid "Upload selection..."
msgstr ""
 
msgid "Upload all changes in the current selection to the OSM server."
msgstr ""
 
msgid "Upload selection"
msgstr ""
msgid "Checking parents for deleted objects"
msgstr ""
 
......@@ -2277,6 +2266,9 @@ msgid ""
"last member, successively continuing to the first."
msgstr ""
 
msgid "based on osm route relation data, timestamps are synthetic"
msgstr ""
msgid "Selected Relations"
msgstr ""
 
......@@ -4261,12 +4253,6 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
 
msgid "No outer way for boundary"
msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
msgid "No area style for multipolygon"
msgstr ""
 
......@@ -4320,7 +4306,7 @@ msgstr ""
msgid "Multipolygon outer way shares segment(s) with other ring"
msgstr ""
 
msgid "No useful role for multipolygon member"
msgid "Role for multipolygon way member should be inner or outer"
msgstr ""
 
msgid "Non-Way in boundary"
......@@ -4391,9 +4377,6 @@ msgid ""
"than one way."
msgstr ""
 
msgid "Areas share segment"
msgstr ""
msgid "Highways share segment with area"
msgstr ""
 
......@@ -4443,6 +4426,9 @@ msgstr ""
msgid "Checks for errors in relations."
msgstr ""
 
msgid "Relation is empty"
msgstr ""
msgid ""
"Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
msgstr ""
......@@ -4450,9 +4436,6 @@ msgstr ""
msgid "Relation type is unknown"
msgstr ""
 
msgid "Relation is empty"
msgstr ""
msgid ""
"Role of relation member does not match expression ''{0}'' in template {1}"
msgstr ""
......@@ -7594,12 +7577,36 @@ msgstr ""
msgid "Gamma"
msgstr ""
 
msgctxt "image sharpness"
msgid "blurred"
msgstr ""
msgctxt "image sharpness"
msgid "normal"
msgstr ""
msgctxt "image sharpness"
msgid "sharp"
msgstr ""
msgid "Adjust sharpness/blur value of the layer."
msgstr ""
 
msgid "Sharpness"
msgstr ""
 
msgctxt "image colorfulness"
msgid "less"
msgstr ""
msgctxt "image colorfulness"
msgid "normal"
msgstr ""
msgctxt "image colorfulness"
msgid "more"
msgstr ""
msgid "Adjust colorfulness of the layer."
msgstr ""
 
......@@ -8363,11 +8370,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
 
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
msgid "Open this dialog on startup"
msgstr ""
 
......@@ -8387,6 +8389,9 @@ msgstr ""
msgid "Click to download the currently selected area"
msgstr ""
 
msgid "Click to download the currently selected area into a new data layer"
msgstr ""
msgid "Download referrers (parent relations)"
msgstr ""
 
......@@ -9951,7 +9956,7 @@ msgstr ""
msgid "Do not show this message again"
msgstr ""
 
msgid "Hide this message and never show it again"
msgid "Hide this message"
msgstr ""
 
msgid "Unable to create directory {0}, autosave will be disabled"
......@@ -12375,6 +12380,9 @@ msgstr ""
msgid "Header value"
msgstr ""
 
msgid "Imagery preferences..."
msgstr ""
msgid "Modify list of imagery layers displayed in the Imagery menu"
msgstr ""
 
......@@ -14593,6 +14601,9 @@ msgid_plural "Click to continue without these plugins"
msgstr[0] ""
msgstr[1] ""
 
msgid "Plugin {0} must be run on a {1} platform."
msgstr ""
msgid ""
"Plugin {0} requires Java version {1}. The current Java version is {2}. You "
"have to update Java in order to use this plugin."
......@@ -15100,12 +15111,31 @@ msgid ""
"Currently you have {1,number,#}MB memory allocated for JOSM"
msgstr ""
 
msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
msgid "Opening URL: {0}"
msgstr ""
 
msgid "Opening URL: {0}"
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: option ''{1}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}'' is required"
msgstr ""
msgid "{0}: option ''{1}'' may not appear multiple times"
msgstr ""
msgid "{0}: Error while handling option ''{1}''"
msgstr ""
msgid "{0}: Invalid value {2} for option ''{1}''"
msgstr ""
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
msgid "{0}: unrecognized option ''{1}''"
msgstr ""
 
msgid "URL does not contain {0}/{1}/{2}"
......@@ -18433,6 +18463,9 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
 
msgid "Biogas"
msgstr ""
msgid "Additives:"
msgstr ""
 
......@@ -24097,7 +24130,8 @@ msgstr ""
msgid "uncommon short key"
msgstr ""
 
msgid "{0} is inaccurate"
msgid ""
"{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}."
msgstr ""
 
msgid "{0} is deprecated for {1}"
......@@ -24505,13 +24539,19 @@ msgid ""
"floating glacier tongues. (true color)"
msgstr ""
 
msgid "IGN topographical map (TMS)"
msgid "National Geographic Institute Argenmap (TMS)"
msgstr ""
msgid "National Geographic Institute Argenmap (WMTS)"
msgstr ""
msgid "National Geographic Institute (WMS)"
msgstr ""
 
msgid "IGN topographical map (WMTS)"
msgid "Córdoba SDI (WMS)"
msgstr ""
 
msgid "IGN topographical map (WMS)"
msgid "Córdoba SDI - Demarcaciones (TMS)"
msgstr ""
 
msgid "IGN orthophoto AMBA a (WMTS)"
......@@ -24824,6 +24864,9 @@ msgstr ""
msgid "URBIS 2017 aerial imagery"
msgstr ""
 
msgid "URBIS 2018 aerial imagery"
msgstr ""
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
 
......@@ -26637,10 +26680,10 @@ msgstr ""
msgid "USGS Topographic Maps"
msgstr ""
 
msgid "USGS Large Scale Imagery"
msgid "USGS Imagery"
msgstr ""
 
msgid "TIGER Roads 2012"
msgid "Public domain aerial imagery, mostly NAIP"
msgstr ""
 
msgid "TIGER Roads 2014"
......@@ -26660,6 +26703,9 @@ msgid ""
"OpenStreetMap"
msgstr ""
 
msgid "TIGER Roads 2018"
msgstr ""
msgid "MassGIS L3 Parcels"
msgstr ""
 
......@@ -27601,9 +27647,6 @@ msgstr ""
msgid "Public Transport (ÖPNV)"
msgstr ""
 
msgid "Hike & Bike"
msgstr ""
msgid "OpenSnowMap overlay"
msgstr ""
 
......@@ -32895,6 +32938,10 @@ msgstr ""
msgid "Download OSM data corresponding to the current data set."
msgstr ""
 
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
msgid "Diff"
msgstr ""
 
......@@ -34424,6 +34471,11 @@ msgstr ""
msgid "Enter the ID of the changeset that should be reverted"
msgstr ""
 
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
msgid "Reverted changeset"
msgstr ""
 
......
i18n/po/am.po
View file @ d8f3dd83
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-28 22:47+0100\n"
"POT-Creation-Date: 2018-11-28 01:35+0100\n"
"PO-Revision-Date: 2018-05-18 08:09+0000\n"
"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
"Language-Team: Amharic <am@li.org>\n"
......@@ -15,40 +15,10 @@ 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-10-29 04:32+0000\n"
"X-Generator: Launchpad (build 18810)\n"
"X-Launchpad-Export-Date: 2018-11-28 04:32+0000\n"
"X-Generator: Launchpad (build 18826)\n"
"Language: am\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}{2}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: unrecognized option ''--{1}''"
msgstr ""
msgid "{0}: unrecognized option ''{1}{2}''"
msgstr ""
msgid "{0}: illegal option -- {1}"
msgstr ""
msgid "{0}: invalid option -- {1}"
msgstr ""
msgid "{0}: option requires an argument -- {1}"
msgstr ""
msgid "Invalid value {0} for parameter ''has_arg''"
msgstr ""
msgid "Background Terms of Use"
msgstr ""
 
......@@ -170,8 +140,7 @@ msgstr ""
msgid "Select"
msgstr ""
 
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgid "Selects those elements on the map which are chosen on the list above."
msgstr ""
 
msgid "Select WMS layers"
......@@ -304,6 +273,9 @@ msgstr ""
msgid "Toggle visibility of Changeset Manager window"
msgstr ""
 
msgid "Close open changesets..."
msgstr ""
msgid "Close open changesets"
msgstr ""
 
......@@ -457,12 +429,15 @@ msgid ""
"* Three nodes."
msgstr ""
 
msgid "Download data"
msgid "Download data..."
msgstr ""
 
msgid "Download map data from a server of your choice"
msgstr ""
 
msgid "Download data"
msgstr ""
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
"wish<br>to continue?</html>"
......@@ -534,6 +509,14 @@ msgstr ""
msgid "Export GPX file"
msgstr ""
 
msgid "Hatch area outside download"
msgstr ""
msgid ""
"Enable/disable hatched background rendering of areas outside of the "
"downloaded areas."
msgstr ""
msgid "Help"
msgstr ""
 
......@@ -1342,7 +1325,7 @@ msgstr ""
msgid "Segment {0}: {1}"
msgstr ""
 
msgid "Search preset"
msgid "Search preset..."
msgstr ""
 
msgid "Show preset search dialog"
......@@ -1511,12 +1494,15 @@ msgstr ""
msgid "Selection empty"
msgstr ""
 
msgid "Upload data"
msgid "Upload data..."
msgstr ""
 
msgid "Upload all changes in the active data layer to the OSM server"
msgstr ""
 
msgid "Upload data"
msgstr ""
msgid ""
"<html>The data to be uploaded participates in unresolved conflicts of layer "
"''{0}''.<br>You have to resolve them first.</html>"
......@@ -1550,12 +1536,15 @@ msgstr ""
msgid "Uploading notes to server"
msgstr ""
 
msgid "Upload selection"
msgid "Upload selection..."
msgstr ""
 
msgid "Upload all changes in the current selection to the OSM server."
msgstr ""
 
msgid "Upload selection"
msgstr ""
msgid "Checking parents for deleted objects"
msgstr ""
 
......@@ -2278,6 +2267,9 @@ msgid ""
"last member, successively continuing to the first."
msgstr ""
 
msgid "based on osm route relation data, timestamps are synthetic"
msgstr ""
msgid "Selected Relations"
msgstr ""
 
......@@ -4262,12 +4254,6 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
 
msgid "No outer way for boundary"
msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
msgid "No area style for multipolygon"
msgstr ""
 
......@@ -4321,7 +4307,7 @@ msgstr ""
msgid "Multipolygon outer way shares segment(s) with other ring"
msgstr ""
 
msgid "No useful role for multipolygon member"
msgid "Role for multipolygon way member should be inner or outer"
msgstr ""
 
msgid "Non-Way in boundary"
......@@ -4392,9 +4378,6 @@ msgid ""
"than one way."
msgstr ""
 
msgid "Areas share segment"
msgstr ""
msgid "Highways share segment with area"
msgstr ""
 
......@@ -4444,6 +4427,9 @@ msgstr ""
msgid "Checks for errors in relations."
msgstr ""
 
msgid "Relation is empty"
msgstr ""
msgid ""
"Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
msgstr ""
......@@ -4451,9 +4437,6 @@ msgstr ""
msgid "Relation type is unknown"
msgstr ""
 
msgid "Relation is empty"
msgstr ""
msgid ""
"Role of relation member does not match expression ''{0}'' in template {1}"
msgstr ""
......@@ -7595,12 +7578,36 @@ msgstr ""
msgid "Gamma"
msgstr ""
 
msgctxt "image sharpness"
msgid "blurred"
msgstr ""
msgctxt "image sharpness"
msgid "normal"
msgstr ""
msgctxt "image sharpness"
msgid "sharp"
msgstr ""
msgid "Adjust sharpness/blur value of the layer."
msgstr ""
 
msgid "Sharpness"
msgstr ""
 
msgctxt "image colorfulness"
msgid "less"
msgstr ""
msgctxt "image colorfulness"
msgid "normal"
msgstr ""
msgctxt "image colorfulness"
msgid "more"
msgstr ""
msgid "Adjust colorfulness of the layer."
msgstr ""
 
......@@ -8364,11 +8371,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
 
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
msgid "Open this dialog on startup"
msgstr ""
 
......@@ -8388,6 +8390,9 @@ msgstr ""
msgid "Click to download the currently selected area"
msgstr ""
 
msgid "Click to download the currently selected area into a new data layer"
msgstr ""
msgid "Download referrers (parent relations)"
msgstr ""
 
......@@ -9952,7 +9957,7 @@ msgstr ""
msgid "Do not show this message again"
msgstr ""
 
msgid "Hide this message and never show it again"
msgid "Hide this message"
msgstr ""
 
msgid "Unable to create directory {0}, autosave will be disabled"
......@@ -12376,6 +12381,9 @@ msgstr ""
msgid "Header value"
msgstr ""
 
msgid "Imagery preferences..."
msgstr ""
msgid "Modify list of imagery layers displayed in the Imagery menu"
msgstr ""
 
......@@ -14594,6 +14602,9 @@ msgid_plural "Click to continue without these plugins"
msgstr[0] ""
msgstr[1] ""
 
msgid "Plugin {0} must be run on a {1} platform."
msgstr ""
msgid ""
"Plugin {0} requires Java version {1}. The current Java version is {2}. You "
"have to update Java in order to use this plugin."
......@@ -15101,12 +15112,31 @@ msgid ""
"Currently you have {1,number,#}MB memory allocated for JOSM"
msgstr ""
 
msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
msgid "Opening URL: {0}"
msgstr ""
 
msgid "Opening URL: {0}"
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: option ''{1}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}'' is required"
msgstr ""
msgid "{0}: option ''{1}'' may not appear multiple times"
msgstr ""
msgid "{0}: Error while handling option ''{1}''"
msgstr ""
msgid "{0}: Invalid value {2} for option ''{1}''"
msgstr ""
msgid "{0}: option ''{1}'' is ambiguous"
msgstr ""
msgid "{0}: unrecognized option ''{1}''"
msgstr ""
 
msgid "URL does not contain {0}/{1}/{2}"
......@@ -18434,6 +18464,9 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
 
msgid "Biogas"
msgstr ""
msgid "Additives:"
msgstr ""
 
......@@ -24098,7 +24131,8 @@ msgstr ""
msgid "uncommon short key"
msgstr ""
 
msgid "{0} is inaccurate"
msgid ""
"{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}."
msgstr ""
 
msgid "{0} is deprecated for {1}"
......@@ -24506,13 +24540,19 @@ msgid ""
"floating glacier tongues. (true color)"
msgstr ""
 
msgid "IGN topographical map (TMS)"
msgid "National Geographic Institute Argenmap (TMS)"
msgstr ""
msgid "National Geographic Institute Argenmap (WMTS)"
msgstr ""
msgid "National Geographic Institute (WMS)"
msgstr ""
 
msgid "IGN topographical map (WMTS)"
msgid "Córdoba SDI (WMS)"
msgstr ""
 
msgid "IGN topographical map (WMS)"
msgid "Córdoba SDI - Demarcaciones (TMS)"
msgstr ""
 
msgid "IGN orthophoto AMBA a (WMTS)"
......@@ -24825,6 +24865,9 @@ msgstr ""
msgid "URBIS 2017 aerial imagery"
msgstr ""
 
msgid "URBIS 2018 aerial imagery"
msgstr ""
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
 
......@@ -26638,10 +26681,10 @@ msgstr ""
msgid "USGS Topographic Maps"
msgstr ""
 
msgid "USGS Large Scale Imagery"
msgid "USGS Imagery"
msgstr ""
 
msgid "TIGER Roads 2012"
msgid "Public domain aerial imagery, mostly NAIP"
msgstr ""
 
msgid "TIGER Roads 2014"
......@@ -26661,6 +26704,9 @@ msgid ""
"OpenStreetMap"
msgstr ""
 
msgid "TIGER Roads 2018"
msgstr ""
msgid "MassGIS L3 Parcels"
msgstr ""
 
......@@ -27602,9 +27648,6 @@ msgstr ""
msgid "Public Transport (ÖPNV)"
msgstr ""
 
msgid "Hike & Bike"
msgstr ""
msgid "OpenSnowMap overlay"
msgstr ""
 
......@@ -32896,6 +32939,10 @@ msgstr ""
msgid "Download OSM data corresponding to the current data set."
msgstr ""
 
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
msgid "Diff"
msgstr ""
 
......@@ -34425,6 +34472,11 @@ msgstr ""
msgid "Enter the ID of the changeset that should be reverted"
msgstr ""
 
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
msgid "Reverted changeset"
msgstr ""
 
......
i18n/po/ar.po
View file @ d8f3dd83
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-10-28 22:47+0100\n"
"POT-Creation-Date: 2018-11-28 01:35+0100\n"
"PO-Revision-Date: 2018-07-23 20:54+0000\n"
"Last-Translator: J H <Unknown>\n"
"Language-Team: Arabic <ar@li.org>\n"
......@@ -16,40 +16,10 @@ 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-10-29 04:32+0000\n"
"X-Generator: Launchpad (build 18810)\n"
"X-Launchpad-Export-Date: 2018-11-28 04:33+0000\n"
"X-Generator: Launchpad (build 18826)\n"
"Language: ar\n"
 
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}:خيارات ''{1}'' غير دقيقة"
msgid "{0}: option ''--{1}'' does not allow an argument"
msgstr "{0} خيار '' - {1} '' لا يسمح بوسيطة"
msgid "{0}: option ''{1}{2}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: unrecognized option ''--{1}''"
msgstr "{0}: خيار مجهول \"--{1}''"
msgid "{0}: unrecognized option ''{1}{2}''"
msgstr "{0} الخيار غير المعترف بها '' {1} {2} ''"
msgid "{0}: illegal option -- {1}"
msgstr "{0} الخيار غير شرعي - {1}"
msgid "{0}: invalid option -- {1}"
msgstr "{1}--خيار غير صلاح:{0}"
msgid "{0}: option requires an argument -- {1}"
msgstr "{0}الخاصية تحتاج الى وسيطة-- {1}"
msgid "Invalid value {0} for parameter ''has_arg''"
msgstr "قيمة غير صالحة {0} للمعلم ''has_arg''"
msgid "Background Terms of Use"
msgstr "خلفية شروط الاستخدام"
 
......@@ -204,10 +174,8 @@ msgstr "لا يوجد طبقات مستهدفة"
msgid "Select"
msgstr "إختر"
 
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgid "Selects those elements on the map which are chosen on the list above."
msgstr ""
"إضبط العناصر المحددة في الخريطة على العناصر المحددة على القائمة أعلاه."
 
msgid "Select WMS layers"
msgstr "تحديد طبقات خدمة خرائط الويب"
......@@ -340,6 +308,9 @@ msgstr "إدارة مجموعة التغييرات"
msgid "Toggle visibility of Changeset Manager window"
msgstr "تبديل ظهور نافذة إدارة مجموعة التغييرات"
 
msgid "Close open changesets..."
msgstr ""
msgid "Close open changesets"
msgstr "أغلق حزمات التغييرات المفتوحة"
 
......@@ -501,12 +472,15 @@ msgstr ""
"* خط واحد ذاتي التقاطع مع اثنين من عقده على الأكثر؛\n"
"* ثلاث عقد."
 
msgid "Download data"
msgstr "بيانات محملة"
msgid "Download data..."
msgstr ""
 
msgid "Download map data from a server of your choice"
msgstr "تحميل بيانات الخريطة من خادم من اختيارك"
 
msgid "Download data"
msgstr "بيانات محملة"
msgid ""
"<html>This action will require {0} individual<br>download requests. Do you "
"wish<br>to continue?</html>"
......@@ -580,6 +554,14 @@ msgstr "لا شيء للتصدير. إحصل على بعض المعطيات أو
msgid "Export GPX file"
msgstr "تصدير ملف GPX"
 
msgid "Hatch area outside download"
msgstr ""
msgid ""
"Enable/disable hatched background rendering of areas outside of the "
"downloaded areas."
msgstr ""
msgid "Help"
msgstr "مساعدة"
 
......@@ -1396,7 +1378,7 @@ msgstr " [id: {0}]"
msgid "Segment {0}: {1}"
msgstr ""
 
msgid "Search preset"
msgid "Search preset..."
msgstr ""
 
msgid "Show preset search dialog"
......@@ -1565,12 +1547,15 @@ msgstr ""
msgid "Selection empty"
msgstr ""
 
msgid "Upload data"
msgid "Upload data..."
msgstr ""
 
msgid "Upload all changes in the active data layer to the OSM server"
msgstr ""
 
msgid "Upload data"
msgstr ""
msgid ""
"<html>The data to be uploaded participates in unresolved conflicts of layer "
"''{0}''.<br>You have to resolve them first.</html>"
......@@ -1604,12 +1589,15 @@ msgstr ""
msgid "Uploading notes to server"
msgstr ""
 
msgid "Upload selection"
msgid "Upload selection..."
msgstr ""
 
msgid "Upload all changes in the current selection to the OSM server."
msgstr ""
 
msgid "Upload selection"
msgstr ""
msgid "Checking parents for deleted objects"
msgstr ""
 
......@@ -2332,6 +2320,9 @@ msgid ""
"last member, successively continuing to the first."
msgstr ""
 
msgid "based on osm route relation data, timestamps are synthetic"
msgstr ""
msgid "Selected Relations"
msgstr ""
 
......@@ -4333,12 +4324,6 @@ msgstr ""
msgid "Area style way is not closed"
msgstr ""
 
msgid "No outer way for boundary"
msgstr ""
msgid "No outer way for multipolygon"
msgstr ""
msgid "No area style for multipolygon"
msgstr ""
 
......@@ -4392,7 +4377,7 @@ msgstr ""
msgid "Multipolygon outer way shares segment(s) with other ring"
msgstr ""
 
msgid "No useful role for multipolygon member"
msgid "Role for multipolygon way member should be inner or outer"
msgstr ""
 
msgid "Non-Way in boundary"
......@@ -4463,9 +4448,6 @@ msgid ""
"than one way."
msgstr ""
 
msgid "Areas share segment"
msgstr ""
msgid "Highways share segment with area"
msgstr ""
 
......@@ -4515,6 +4497,9 @@ msgstr ""
msgid "Checks for errors in relations."
msgstr ""
 
msgid "Relation is empty"
msgstr ""
msgid ""
"Route scheme is unspecified. Add {0} ({1}=public_transport; {2}=legacy)"
msgstr ""
......@@ -4522,9 +4507,6 @@ msgstr ""
msgid "Relation type is unknown"
msgstr ""
 
msgid "Relation is empty"
msgstr ""
msgid ""
"Role of relation member does not match expression ''{0}'' in template {1}"
msgstr ""
......@@ -7669,12 +7651,36 @@ msgstr ""
msgid "Gamma"
msgstr ""
 
msgctxt "image sharpness"
msgid "blurred"
msgstr ""
msgctxt "image sharpness"
msgid "normal"
msgstr ""
msgctxt "image sharpness"
msgid "sharp"
msgstr ""
msgid "Adjust sharpness/blur value of the layer."
msgstr ""
 
msgid "Sharpness"
msgstr ""
 
msgctxt "image colorfulness"
msgid "less"
msgstr ""
msgctxt "image colorfulness"
msgid "normal"
msgstr ""
msgctxt "image colorfulness"
msgid "more"
msgstr ""
msgid "Adjust colorfulness of the layer."
msgstr ""
 
......@@ -8438,11 +8444,6 @@ msgstr ""
msgid "Value for longitude in range [-180,180] required."
msgstr ""
 
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
msgid "Open this dialog on startup"
msgstr ""
 
......@@ -8462,6 +8463,9 @@ msgstr ""
msgid "Click to download the currently selected area"
msgstr ""
 
msgid "Click to download the currently selected area into a new data layer"
msgstr ""
msgid "Download referrers (parent relations)"
msgstr ""
 
......@@ -10031,7 +10035,7 @@ msgstr ""
msgid "Do not show this message again"
msgstr ""
 
msgid "Hide this message and never show it again"
msgid "Hide this message"
msgstr ""
 
msgid "Unable to create directory {0}, autosave will be disabled"
......@@ -12461,6 +12465,9 @@ msgstr ""
msgid "Header value"
msgstr ""
 
msgid "Imagery preferences..."
msgstr ""
msgid "Modify list of imagery layers displayed in the Imagery menu"
msgstr ""
 
......@@ -14683,6 +14690,9 @@ msgid_plural "Click to continue without these plugins"
msgstr[0] ""
msgstr[1] ""
 
msgid "Plugin {0} must be run on a {1} platform."
msgstr ""
msgid ""
"Plugin {0} requires Java version {1}. The current Java version is {2}. You "
"have to update Java in order to use this plugin."
......@@ -15190,12 +15200,31 @@ msgid ""
"Currently you have {1,number,#}MB memory allocated for JOSM"
msgstr ""
 
msgid ""
"Failed to open URL. There is currently no platform set. Please set a "
"platform first."
msgid "Opening URL: {0}"
msgstr ""
 
msgid "Opening URL: {0}"
msgid "{0}: option ''{1}'' requires an argument"
msgstr ""
msgid "{0}: option ''{1}'' does not allow an argument"
msgstr ""
msgid "{0}: option ''{1}'' is required"
msgstr ""
msgid "{0}: option ''{1}'' may not appear multiple times"
msgstr ""
msgid "{0}: Error while handling option ''{1}''"
msgstr ""
msgid "{0}: Invalid value {2} for option ''{1}''"
msgstr ""
msgid "{0}: option ''{1}'' is ambiguous"
msgstr "{0}:خيارات ''{1}'' غير دقيقة"
msgid "{0}: unrecognized option ''{1}''"
msgstr ""
 
msgid "URL does not contain {0}/{1}/{2}"
......@@ -18523,6 +18552,9 @@ msgstr ""
msgid "1/50 mix (mofa/moped)"
msgstr ""
 
msgid "Biogas"
msgstr ""
msgid "Additives:"
msgstr ""
 
......@@ -24187,7 +24219,8 @@ msgstr ""
msgid "uncommon short key"
msgstr ""
 
msgid "{0} is inaccurate"
msgid ""
"{0} is inaccurate. Use separate tags for each specific type, e.g. {1} or {2}."
msgstr ""
 
msgid "{0} is deprecated for {1}"
......@@ -24595,13 +24628,19 @@ msgid ""
"floating glacier tongues. (true color)"
msgstr ""
 
msgid "IGN topographical map (TMS)"
msgid "National Geographic Institute Argenmap (TMS)"
msgstr ""
msgid "National Geographic Institute Argenmap (WMTS)"
msgstr ""
 
msgid "IGN topographical map (WMTS)"
msgid "National Geographic Institute (WMS)"
msgstr ""
 
msgid "IGN topographical map (WMS)"
msgid "Córdoba SDI (WMS)"
msgstr ""
msgid "Córdoba SDI - Demarcaciones (TMS)"
msgstr ""
 
msgid "IGN orthophoto AMBA a (WMTS)"
......@@ -24914,6 +24953,9 @@ msgstr ""
msgid "URBIS 2017 aerial imagery"
msgstr ""
 
msgid "URBIS 2018 aerial imagery"
msgstr ""
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
 
......@@ -26727,10 +26769,10 @@ msgstr ""
msgid "USGS Topographic Maps"
msgstr ""
 
msgid "USGS Large Scale Imagery"
msgid "USGS Imagery"
msgstr ""
 
msgid "TIGER Roads 2012"
msgid "Public domain aerial imagery, mostly NAIP"
msgstr ""
 
msgid "TIGER Roads 2014"
......@@ -26750,6 +26792,9 @@ msgid ""
"OpenStreetMap"
msgstr ""
 
msgid "TIGER Roads 2018"
msgstr ""
msgid "MassGIS L3 Parcels"
msgstr ""
 
......@@ -27691,9 +27736,6 @@ msgstr ""
msgid "Public Transport (ÖPNV)"
msgstr ""
 
msgid "Hike & Bike"
msgstr ""
msgid "OpenSnowMap overlay"
msgstr ""
 
......@@ -32985,6 +33027,11 @@ msgstr ""
msgid "Download OSM data corresponding to the current data set."
msgstr ""
 
msgid ""
"Set the selected elements on the map to the selected items in the list above."
msgstr ""
"إضبط العناصر المحددة في الخريطة على العناصر المحددة على القائمة أعلاه."
msgid "Diff"
msgstr ""
 
......@@ -34514,6 +34561,11 @@ msgstr "إسترجع"
msgid "Enter the ID of the changeset that should be reverted"
msgstr ""
 
msgid ""
"<html>Select to download data into a new data layer.<br>Unselect to download "
"into the currently active data layer.</html>"
msgstr ""
msgid "Reverted changeset"
msgstr ""
 
......